Nothing but FOO can start a magic-word sequence,

100% coverage ans oldcompare passes.

diff --git a/actions.c b/actions.c
index 5d763b98c33893238615f5f83b4f42aebde8b41d..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) ||

diff --git a/tests/magicwords.chk b/tests/magicwords.chk
index 726387004b1706acdb5bf7d47ade3bbeee8c24f2..54ab5a5206bd60bdfea3c1c5b0b0b7ca63c16506 100644 (file)
--- a/tests/magicwords.chk
+++ b/tests/magicwords.chk
@@ -13,6 +13,14 @@ Seed set to 1838473132
 
 You're in front of building.
 
+> foo
+
+Nothing happens.
+
+> say foo
+
+Nothing happens.
+
 > in
 
 You are inside a building, a well house for a large spring.
@@ -1863,7 +1871,7 @@ OK
 What's the matter, can't you read?  Now you'd best start over.
 
 > 
-You scored 253 out of a possible 430, using 313 turns.
+You scored 253 out of a possible 430, using 315 turns.
 
 You have reached "Junior Master" status.
 

diff --git a/tests/magicwords.log b/tests/magicwords.log
index 0f93defaaf0efbb06da305174c234c0441559656..f636711172ce151456aab79628d058a4f9128697 100644 (file)
--- a/tests/magicwords.log
+++ b/tests/magicwords.log
@@ -33,8 +33,8 @@
 n
 seed 1838473132
 # Test isolated 'foo' word
-#foo
-#say foo
+foo
+say foo
 in
 # Say bigwords ending with foo when not in Giant's Room
 say fee
@@ -48,7 +48,7 @@ say fie
 say foe
 #say fum
 z
-#find foo
+find foo
 z
 take lamp
 xyzzy