Nothing but FOO can start a magic-word sequence,

[open-adventure.git] / actions.c

diff --git a/actions.c b/actions.c
index 4c2fcdbad111c600cfe745544de3898eb95c09f4..936e4d80978d9aeebfc135a6576e2be9c109d7f2 100644 (file)
--- a/actions.c
+++ b/actions.c
@@ -194,6 +194,11 @@ static phase_codes_t bigwords(vocab_t id)
 {
     int foobar = abs(game.foobar);
 
+    if ((foobar == WORD_EMPTY) && (id == FIE || id == FOE || id == FOO || id == FUM)) {
+       rspeak(NOTHING_HAPPENS);
+       return GO_CLEAROBJ;
+    }
+    
     if ((foobar == WORD_EMPTY && id == FEE) ||
         (foobar == FEE && id == FIE) ||
         (foobar == FIE && id == FOE) ||
@@ -228,13 +233,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;
     }