X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=actions.c;h=fc85e0e7e33c99ea6631885fa6b37bbe946c531a;hb=865e10e6d0d15df04ac6209990394277ba1da2a7;hp=09f7836b616fa9727ee7235c0338ff645e1bdc77;hpb=46e1595cb0b6711d13ad8db0d610aadbe98a4036;p=open-adventure.git

diff --git a/actions.c b/actions.c
index 09f7836..fc85e0e 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) ||
@@ -206,6 +207,8 @@ static phase_codes_t bigwords(vocab_t id)
             (TOTING(EGGS) && game.loc == objects[EGGS].plac)) {
             rspeak(NOTHING_HAPPENS);
             return GO_CLEAROBJ;
+	} else if (id == FUM) {
+	    goto fum;
         } else {
             /*  Bring back troll if we steal the eggs back from him before
              *  crossing. */
@@ -222,12 +225,13 @@ static phase_codes_t bigwords(vocab_t id)
             return GO_CLEAROBJ;
         }
     } else {
+    fum:
         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;
@@ -857,8 +861,10 @@ static phase_codes_t fly(verb_t verb, obj_t obj)
         game.newloc = LOC_CLIFF;
         rspeak(RUG_RETURNS);
     } else {
+// LCOV_EXCL_START
 	/* should never happen */
 	rspeak(NOTHING_HAPPENS);
+// LCOV_EXCL_STOP
     }
     return GO_TERMINATE;
 }