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

Remove message pointer math in croak().

Browse source
This commit is contained in:
Jason S. Ninneman 2017-06-18 19:54:48 -07:00
parent 624ba16aad
commit fecc48e6e5
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
main.c
View file

@ -490,6 +490,8 @@ static bool dwarfmove(void)
static void croak(void)
/* Okay, he's dead. Let's get on with it. */
{
const char* query = obituaries[game.numdie].query;
const char* yes_response = obituaries[game.numdie].yes_response;
++game.numdie;
if (game.closng) {
/* He died during closing time. No resurrection. Tally up a
@ -497,8 +499,7 @@ static void croak(void)
RSPEAK(DEATH_CLOSING);
terminate(endgame);
}
/* FIXME: Arithmetic on message numbers */
else if (game.numdie == MAXDIE || !YES(arbitrary_messages[WATCH_IT + game.numdie * 2], arbitrary_messages[WHICH_WAY + game.numdie * 2], arbitrary_messages[OK_MAN]))
else if (game.numdie == maximum_deaths || !YES(query, yes_response, arbitrary_messages[OK_MAN]))
terminate(endgame);
else {
game.place[WATER] = game.place[OIL] = NOWHERE;