X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=main.c;h=f89afcc194ba5a3d7f99ccfe90a2defa070647c6;hb=386ca2b8d2004201ceee7c8556b38ec6647aa4bb;hp=0b3663940c05c75d82b28918742a752864c3067c;hpb=1cbc3d827bda4a29085302ba64af9486552a17cf;p=open-adventure.git

diff --git a/main.c b/main.c
index 0b36639..f89afcc 100644
--- a/main.c
+++ b/main.c
@@ -384,7 +384,7 @@ static bool dwarfmove(void)
         kk = tkey[game.dloc[i]];
         if (kk != 0)
             do {
-		enum desttype_t desttype = travel[kk].desttype;
+                enum desttype_t desttype = travel[kk].desttype;
                 game.newloc = travel[kk].destval;
                 /* Have we avoided a dwarf encounter? */
                 if (desttype != dest_goto)
@@ -501,8 +501,7 @@ static void croak(void)
                 drop(i, (i == LAMP) ? LOC_START : game.oldlc2);
             }
         }
-        game.loc = LOC_BUILDING;
-        game.oldloc = game.loc;
+        game.oldloc = game.loc = game.newloc = LOC_BUILDING;
     }
 }
 
@@ -510,8 +509,8 @@ static bool traveleq(long a, long b)
 /* Are two travel entries equal for purposes of skip after failed condition? */
 {
     return (travel[a].condtype == travel[b].condtype)
-	   && (travel[a].condarg1 == travel[b].condarg1)
-	   && (travel[a].condarg2 == travel[b].condarg2)
+           && (travel[a].condarg1 == travel[b].condarg1)
+           && (travel[a].condarg2 == travel[b].condarg2)
            && (travel[a].desttype == travel[b].desttype)
            && (travel[a].destval == travel[b].destval);
 }
@@ -549,7 +548,7 @@ static void playermove( int motion)
         if (spk == 0) {
             int te_tmp = 0;
             for (;;) {
-		enum desttype_t desttype = travel[travel_entry].desttype;
+                enum desttype_t desttype = travel[travel_entry].desttype;
                 scratchloc = travel[travel_entry].destval;
                 if (desttype != dest_goto || scratchloc != motion) {
                     if (desttype == dest_goto) {
@@ -636,7 +635,7 @@ static void playermove( int motion)
     do {
         for (;;) { /* L12 loop */
             for (;;) {
-		enum condtype_t condtype = travel[travel_entry].condtype;
+                enum condtype_t condtype = travel[travel_entry].condtype;
                 long condarg1 = travel[travel_entry].condarg1;
                 long condarg2 = travel[travel_entry].condarg2;
                 if (condtype < cond_not) {
@@ -648,8 +647,8 @@ static void playermove( int motion)
                         /* else fall through */
                     }
                     /* YAML [with OBJ] clause */
-                    if (TOTING(condarg1) ||
-                        (condtype == cond_with && AT(condarg1)))
+                    else if (TOTING(condarg1) ||
+                             (condtype == cond_with && AT(condarg1)))
                         break;
                     /* else fall through to check [not OBJ STATE] */
                 } else if (game.prop[condarg1] != condarg2)
@@ -668,7 +667,7 @@ static void playermove( int motion)
             }
 
             /* Found an eligible rule, now execute it */
-	    enum desttype_t desttype = travel[travel_entry].desttype;
+            enum desttype_t desttype = travel[travel_entry].desttype;
             game.newloc = travel[travel_entry].destval;
             if (desttype == dest_goto)
                 return;
@@ -880,28 +879,29 @@ static void lampcheck(void)
      *  here, in which case we replace the batteries and continue.
      *  Second is for other cases of lamp dying.  Eve after it goes
      *  out, he can explore outside for a while if desired. */
-    if (game.limit <= WARNTIME && HERE(BATTERY) && game.prop[BATTERY] == FRESH_BATTERIES && HERE(LAMP)) {
-        rspeak(REPLACE_BATTERIES);
-        game.prop[BATTERY] = DEAD_BATTERIES;
-        if (TOTING(BATTERY))
-            drop(BATTERY, game.loc);
-        game.limit += BATTERYLIFE;
-        game.lmwarn = false;
-    } else if (game.limit == 0) {
+    if (game.limit <= WARNTIME) {
+        if (HERE(BATTERY) && game.prop[BATTERY] == FRESH_BATTERIES && HERE(LAMP)) {
+            rspeak(REPLACE_BATTERIES);
+            game.prop[BATTERY] = DEAD_BATTERIES;
+            if (TOTING(BATTERY))
+                drop(BATTERY, game.loc);
+            game.limit += BATTERYLIFE;
+            game.lmwarn = false;
+        } else if (!game.lmwarn && HERE(LAMP)) {
+            game.lmwarn = true;
+            if (game.prop[BATTERY] == DEAD_BATTERIES)
+                rspeak(MISSING_BATTERIES);
+            else if (game.place[BATTERY] == LOC_NOWHERE)
+                rspeak(LAMP_DIM);
+            else
+                rspeak(GET_BATTERIES);
+        }
+    }
+    if (game.limit == 0) {
         game.limit = -1;
         game.prop[LAMP] = LAMP_DARK;
         if (HERE(LAMP))
             rspeak(LAMP_OUT);
-    } else if (game.limit <= WARNTIME) {
-        if (!game.lmwarn && HERE(LAMP)) {
-            game.lmwarn = true;
-            int spk = GET_BATTERIES;
-            if (game.place[BATTERY] == LOC_NOWHERE)
-                spk = LAMP_DIM;
-            if (game.prop[BATTERY] == DEAD_BATTERIES)
-                spk = MISSING_BATTERIES;
-            rspeak(spk);
-        }
     }
 }