From 9a32f4c7703929f6bc5bd5021fdcadbb343936da Mon Sep 17 00:00:00 2001 From: Peje Nilsson Date: Fri, 16 Jun 2017 10:06:01 +0200 Subject: [PATCH] Fix more arithmetic on locations & messages --- actions.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/actions.c b/actions.c index e88773e..baebd0c 100644 --- a/actions.c +++ b/actions.c @@ -78,7 +78,7 @@ static int attack(FILE *input, long verb, token_t obj) game.dseen[i]=false; } } - spk=spk+1+1/k; /* FIXME: Arithmetic on message numbers */ + spk=k == 2 ? OGRE_PANIC1 : OGRE_PANIC2; RSPEAK(spk); return GO_CLEAROBJ; } @@ -1018,8 +1018,8 @@ int action(FILE *input, enum speechpart part, long verb, token_t obj) else if (obj == GRATE) { if (game.loc == LOC_START || game.loc == LOC_VALLEY || game.loc == LOC_SLIT) obj=DPRSSN; - /* FIXME: Arithmetic on location numbers */ - if (game.loc > LOC_BELOWGRATE && game.loc < LOC_MISTHALL) + if (game.loc == LOC_COBBLE || game.loc == LOC_DEBRIS || game.loc == LOC_AWKWARD || + game.loc == LOC_BIRD || game.loc == LOC_PITTOP) obj=ENTRNC; if (obj != GRATE) return GO_MOVE; -- 2.31.1