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

Minor clarifications.

Browse source
This commit is contained in:
Eric S. Raymond 2017-07-05 02:02:39 -04:00
parent caab2242fc
commit c8f3289828
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
actions.c
View file

@ -303,7 +303,8 @@ static int vcarry(token_t verb, token_t obj)
} }
if (game.fixed[obj] != IS_FREE) { if (game.fixed[obj] != IS_FREE) {
if (obj == PLANT && game.prop[PLANT] <= 0) { // FIXME: magical state assertion /* Next guard tests whether plant is tiny or stashed */
if (obj == PLANT && game.prop[PLANT] <= PLANT_THIRSTY) {
rspeak(DEEP_ROOTS); rspeak(DEEP_ROOTS);
return GO_CLEAROBJ; return GO_CLEAROBJ;
} }
@ -802,10 +803,10 @@ static int fly(token_t verb, token_t obj)
/* FIXME: Arithmetic on location values */ /* FIXME: Arithmetic on location values */
game.newloc = game.place[RUG] + game.fixed[RUG] - game.loc; game.newloc = game.place[RUG] + game.fixed[RUG] - game.loc;
if (game.prop[SAPPH] >= 0) { if (game.prop[SAPPH] == STATE_NOTFOUND) {
rspeak(RUG_RETURNS);
} else {
rspeak(RUG_GOES); rspeak(RUG_GOES);
} else {
rspeak(RUG_RETURNS);
} }
return GO_TERMINATE; return GO_TERMINATE;
} }
@ -868,7 +869,7 @@ static int light(token_t verb, token_t obj)
} }
static int listen(void) static int listen(void)
/* Listen. Intransitive only. Print stuff based on objsnd/locsnd. */ /* Listen. Intransitive only. Print stuff based on object sound proprties. */
{ {
long sound = locations[game.loc].sound; long sound = locations[game.loc].sound;
if (sound != SILENT) { if (sound != SILENT) {