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

Change YES() to take const char* arguments.

Browse source
This commit is contained in:
Jason S. Ninneman 2017-06-18 19:51:59 -07:00
parent 9229fdf2a3
commit 624ba16aad
5 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

8
main.c
View file

@ -148,7 +148,7 @@ int main(int argc, char *argv[])
game.loc = LOC_START;
game.limit = 330;
if (!rfp) {
game.novice = YES(WELCOME_YOU, CAVE_NEARBY, NO_MESSAGE);
game.novice = YES(arbitrary_messages[WELCOME_YOU], arbitrary_messages[CAVE_NEARBY], arbitrary_messages[NO_MESSAGE]);
if (game.novice)game.limit = 1000;
} else {
restore(rfp);
@ -264,11 +264,11 @@ static void checkhints(void)
/* Fall through to hint display */
game.hintlc[hint] = 0;
if (!YES(HINTS[hint][3], NO_MESSAGE, OK_MAN))
if (!YES(arbitrary_messages[HINTS[hint][3]], arbitrary_messages[NO_MESSAGE], arbitrary_messages[OK_MAN]))
return;
SETPRM(1, HINTS[hint][2], HINTS[hint][2]);
RSPEAK(HINT_COST);
game.hinted[hint] = YES(WANT_HINT, HINTS[hint][4], OK_MAN);
game.hinted[hint] = YES(arbitrary_messages[WANT_HINT], arbitrary_messages[HINTS[hint][4]], arbitrary_messages[OK_MAN]);
if (game.hinted[hint] && game.limit > WARNTIME)
game.limit += WARNTIME * HINTS[hint][2];
}
@ -498,7 +498,7 @@ static void croak(void)
terminate(endgame);
}
/* FIXME: Arithmetic on message numbers */
else if (game.numdie == MAXDIE || !YES(WATCH_IT + game.numdie * 2, WHICH_WAY + game.numdie * 2, OK_MAN))
else if (game.numdie == MAXDIE || !YES(arbitrary_messages[WATCH_IT + game.numdie * 2], arbitrary_messages[WHICH_WAY + game.numdie * 2], arbitrary_messages[OK_MAN]))
terminate(endgame);
else {
game.place[WATER] = game.place[OIL] = NOWHERE;