From b86d4afd20fe109863c778d360eb1e9b6333db70 Mon Sep 17 00:00:00 2001 From: "Eric S. Raymond" Date: Sun, 2 Apr 2023 17:53:09 -0400 Subject: [PATCH] Back out the behavior change to magic words outside the Giant's Room. There are twi reasons for this. One is to decompolicate verifying the fix for issue $85: revisiting "fee fie foe foo" and "fum". The other is because I'm now convinced that the test should notr be "Are you in the Giant's Room" but :Have you read the grafitti there? --- actions.c | 8 +------- notes.adoc | 5 ----- tests/magicwords.chk | 6 +++--- 3 files changed, 4 insertions(+), 15 deletions(-) diff --git a/actions.c b/actions.c index 4c2fcdb..5d763b9 100644 --- a/actions.c +++ b/actions.c @@ -228,13 +228,7 @@ static phase_codes_t bigwords(vocab_t id) } } else { fum: - if (game.loc == LOC_GIANTROOM || settings.oldstyle) { - rspeak(START_OVER); - } else { - /* This is new behavior in Open Adventure - sounds better when - * player isn't in the Giant Room. */ - rspeak(NOTHING_HAPPENS); - } + rspeak(START_OVER); game.foobar = WORD_EMPTY; return GO_CLEAROBJ; } diff --git a/notes.adoc b/notes.adoc index f5116bc..8358565 100644 --- a/notes.adoc +++ b/notes.adoc @@ -53,11 +53,6 @@ Bug fixes: * Response to an attempt to unlock the oyster while carrying it was incorrect. -* 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 "Nothing happens." - The -o option reverts this change. - * Attempting to extinguish an unlit urn caused it to lose its oil. * "A crystal bridge now spans the fissure." (progressive present) was diff --git a/tests/magicwords.chk b/tests/magicwords.chk index 597c64c..1b1a158 100644 --- a/tests/magicwords.chk +++ b/tests/magicwords.chk @@ -15,11 +15,11 @@ You're in front of building. > foo -Nothing happens. +What's the matter, can't you read? Now you'd best start over. > say foo -Nothing happens. +What's the matter, can't you read? Now you'd best start over. > in @@ -75,7 +75,7 @@ OK > find foo -Nothing happens. +What's the matter, can't you read? Now you'd best start over. > z -- 2.31.1