archives/open-adventure
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix more arithmetic on locations & messages

Browse source
This commit is contained in:
Peje Nilsson 2017-06-16 10:06:01 +02:00
parent 0d5f9064c7
commit 9a32f4c770
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
actions.c
View file

@ -78,7 +78,7 @@ static int attack(FILE *input, long verb, token_t obj)
game.dseen[i]=false; game.dseen[i]=false;
} }
} }
spk=spk+1+1/k; /* FIXME: Arithmetic on message numbers */ spk=k == 2 ? OGRE_PANIC1 : OGRE_PANIC2;
RSPEAK(spk); RSPEAK(spk);
return GO_CLEAROBJ; return GO_CLEAROBJ;
} }
@ -1018,8 +1018,8 @@ int action(FILE *input, enum speechpart part, long verb, token_t obj)
else if (obj == GRATE) { else if (obj == GRATE) {
if (game.loc == LOC_START || game.loc == LOC_VALLEY || game.loc == LOC_SLIT) if (game.loc == LOC_START || game.loc == LOC_VALLEY || game.loc == LOC_SLIT)
obj=DPRSSN; obj=DPRSSN;
/* FIXME: Arithmetic on location numbers */ if (game.loc == LOC_COBBLE || game.loc == LOC_DEBRIS || game.loc == LOC_AWKWARD ||
if (game.loc > LOC_BELOWGRATE && game.loc < LOC_MISTHALL) game.loc == LOC_BIRD || game.loc == LOC_PITTOP)
obj=ENTRNC; obj=ENTRNC;
if (obj != GRATE) if (obj != GRATE)
return GO_MOVE; return GO_MOVE;