X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=actions.c;h=4c2fcdbad111c600cfe745544de3898eb95c09f4;hb=ca5b6975dcb7cc88e74ed85faecb4d792a2a4faf;hp=a2105f83a60a867ef5355c886e518f6c151d75f7;hpb=d32021262288346da36d861a494006da360c9395;p=open-adventure.git

diff --git a/actions.c b/actions.c
index a2105f8..4c2fcdb 100644
--- a/actions.c
+++ b/actions.c
@@ -1,5 +1,5 @@
 /*
- * Actions for the duneon-running code.
+ * Actions for the dungeon-running code.
  *
  * Copyright (c) 1977, 2005 by Will Crowther and Don Woods
  * Copyright (c) 2017 by Eric S. Raymond
@@ -192,11 +192,13 @@ static phase_codes_t bigwords(vocab_t id)
  * 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) ||
-        (game.foobar == FIE && id == FOE) ||
-        (game.foobar == FOE && id == FOO) ||
-        (game.foobar == FOE && id == FUM)) {
+    int foobar = abs(game.foobar);
+
+    if ((foobar == WORD_EMPTY && id == FEE) ||
+        (foobar == FEE && id == FIE) ||
+        (foobar == FIE && id == FOE) ||
+        (foobar == FOE && id == FOO) ||
+        (foobar == FOE && id == FUM)) {
         game.foobar = id;
         if ((id != FOO) && (id != FUM)) {
             rspeak(OK_MAN);
@@ -226,7 +228,7 @@ static phase_codes_t bigwords(vocab_t id)
         }
     } else {
 fum:
-        if (game.loc == LOC_GIANTROOM) {
+        if (game.loc == LOC_GIANTROOM || settings.oldstyle) {
             rspeak(START_OVER);
         } else {
             /* This is new behavior in Open Adventure - sounds better when
@@ -929,7 +931,7 @@ static phase_codes_t light(verb_t verb, obj_t obj)
 }
 
 static phase_codes_t listen(void)
-/*  Listen.  Intransitive only.  Print stuff based on object sound proprties. */
+/*  Listen.  Intransitive only.  Print stuff based on object sound properties. */
 {
     bool soundlatch = false;
     vocab_t sound = locations[game.loc].sound;