From c8f3289828e00df3f05f5d84b1cc952baba5b7f2 Mon Sep 17 00:00:00 2001 From: "Eric S. Raymond" Date: Wed, 5 Jul 2017 02:02:39 -0400 Subject: [PATCH] Minor clarifications. --- actions.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/actions.c b/actions.c index 4135fba..686d0a6 100644 --- a/actions.c +++ b/actions.c @@ -303,7 +303,8 @@ static int vcarry(token_t verb, token_t obj) } 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); return GO_CLEAROBJ; } @@ -802,10 +803,10 @@ static int fly(token_t verb, token_t obj) /* FIXME: Arithmetic on location values */ game.newloc = game.place[RUG] + game.fixed[RUG] - game.loc; - if (game.prop[SAPPH] >= 0) { - rspeak(RUG_RETURNS); - } else { + if (game.prop[SAPPH] == STATE_NOTFOUND) { rspeak(RUG_GOES); + } else { + rspeak(RUG_RETURNS); } return GO_TERMINATE; } @@ -868,7 +869,7 @@ static int light(token_t verb, token_t obj) } 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; if (sound != SILENT) { -- 2.31.1