From dd5ca233026adaeb5d974ac9f8c7a23e0f5dbd1e Mon Sep 17 00:00:00 2001 From: "Eric S. Raymond" Date: Wed, 6 Apr 2022 14:00:34 -0400 Subject: [PATCH] Second part of fix for "fee fie foe foo" and "fum", with test. --- actions.c | 11 ++++++----- notes.adoc | 3 +-- tests/illformed.chk | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/actions.c b/actions.c index 393c74d..fe6daa1 100644 --- a/actions.c +++ b/actions.c @@ -187,9 +187,10 @@ static phase_codes_t attack(command_t command) } static phase_codes_t bigwords(vocab_t id) -/* FEE FIE FOE FOO (AND FUM). Advance to next state if given in proper order. - * Look up foo in special section of vocab to determine which word we've got. - * Last word zips the eggs back to the giant room (unless already there). */ +/* Only called on FEE FIE FOE FOO (AND FUM). Advance to next state if given + * in proper order. Look up foo in special section of vocab to determine which + * word we've got. Last word zips the eggs back to the giant room (unless + * already there). */ { if ((game.foobar == WORD_EMPTY && id == FEE) || (game.foobar == FEE && id == FIE) || @@ -228,9 +229,9 @@ static phase_codes_t bigwords(vocab_t id) if (game.loc == LOC_GIANTROOM) { rspeak(START_OVER); } else { - /* This is new begavior in Open Adventure - sounds better when + /* This is new behavior in Open Adventure - sounds better when * player isn't in the Giant Room. */ - rspeak(WELL_POINTLESS); + rspeak(NOTHING_HAPPENS); } game.foobar = WORD_EMPTY; return GO_CLEAROBJ; diff --git a/notes.adoc b/notes.adoc index a3304ba..350f493 100644 --- a/notes.adoc +++ b/notes.adoc @@ -53,8 +53,7 @@ Bug fixes: * Behavior when saying the giant's magic words outside his room wasn't quite correct - the game responded as though the player were in - the room ("...can't you read?"). The new message is "Well, that was - remarkably pointless." + the room ("...can't you read?"). The new message is "Nothing happens." * Attempting to extinguish an unlit urn caused it to lose its oil. diff --git a/tests/illformed.chk b/tests/illformed.chk index 03c650c..e18fbf9 100644 --- a/tests/illformed.chk +++ b/tests/illformed.chk @@ -343,7 +343,7 @@ You can't unlock the keys. > find foo -Well, that was remarkably pointless. +Nothing happens. > find bar -- 2.31.1