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?

diff --git a/actions.c b/actions.c
index 4c2fcdbad111c600cfe745544de3898eb95c09f4..5d763b98c33893238615f5f83b4f42aebde8b41d 100644 (file)
--- 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 f5116bce0cbba8a3e70154c393cc074b02e78e64..83585654039a0dd17cb8f9945c32d1ac9f65fa66 100644 (file)
--- 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 597c64c0afc298908f06c1b1fb6b7808dfc3a684..1b1a1587ecea9d0fbf0682345ea7a78b96fa8418 100644 (file)
--- 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