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

Gut and rebuild YES() with cleaner approach that doesn't rely on packing.

Browse source 
The new support functions get_input() and echo_input() (and others not made yet) will eventually replace GETIN() and MAPLIN().
This commit is contained in:
Jason S. Ninneman 2017-06-18 13:37:51 -07:00
parent 0dd961701f
commit 550734fd3f
6 changed files with 116 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

4
actions.c
View file

@ -792,7 +792,7 @@ static int pour(token_t verb, token_t obj)
static int quit(FILE *input)
/* Quit. Intransitive only. Verify intent and exit if that's what he wants. */
{
if (YES(input, REALLY_QUIT, OK_MAN, OK_MAN))
if (YES(REALLY_QUIT, OK_MAN, OK_MAN))
terminate(quitgame);
return GO_CLEAROBJ;
}
@ -820,7 +820,7 @@ static int read(FILE *input, token_t verb, token_t obj)
return GO_CLEAROBJ;
}
if (obj == OYSTER && !game.clshnt) {
game.clshnt = YES(input, CLUE_QUERY, WAYOUT_CLUE, OK_MAN);
game.clshnt = YES(CLUE_QUERY, WAYOUT_CLUE, OK_MAN);
return GO_CLEAROBJ;
}
PSPEAK(obj, OBJTXT[obj] + game.prop[obj]);