X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=main.c;h=6457d055068984a423d0cf575d5a167c8039bbd3;hp=7e165a70040e3c8047f6eac763f65eab257b859b;hb=926a806db950bdb13fd24c8e85f93946c9ad7ee4;hpb=7d690e0b95e5a0eea6df9c2bcc026a5f5f7c18a8

diff --git a/main.c b/main.c
index 7e165a7..6457d05 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)
@@ -509,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);
 }
@@ -548,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) {
@@ -604,25 +604,38 @@ static void playermove( int motion)
         if (travel[travel_entry].stop) {
             /*  Couldn't find an entry matching the motion word passed
              *  in.  Various messages depending on word given. */
-            int spk = CANT_APPLY;
-            if (motion >= EAST && motion <= NW)
-                spk = BAD_DIRECTION;
-            if (motion == UP ||
-                motion == DOWN)
-                spk = BAD_DIRECTION;
-            if (motion == FORWARD ||
-                motion == LEFT ||
-                motion == RIGHT)
-                spk = UNSURE_FACING;
-            if (motion == OUTSIDE ||
-                motion == INSIDE)
-                spk = NO_INOUT_HERE;
-            if (motion == XYZZY ||
-                motion == PLUGH)
-                spk = NOTHING_HAPPENS;
-            if (motion == CRAWL)
-                spk = WHICH_WAY;
-            rspeak(spk);
+            switch (motion) {
+            case EAST:
+            case WEST:
+            case SOUTH:
+            case NORTH:
+            case NE:
+            case NW:
+            case SW:
+            case SE:
+            case UP:
+            case DOWN:
+                rspeak(BAD_DIRECTION);
+                break;
+            case FORWARD:
+            case LEFT:
+            case RIGHT:
+                rspeak(UNSURE_FACING);
+                break;
+            case OUTSIDE:
+            case INSIDE:
+                rspeak(NO_INOUT_HERE);
+                break;
+            case XYZZY:
+            case PLUGH:
+                rspeak(NOTHING_HAPPENS);
+                break;
+            case CRAWL:
+                rspeak(WHICH_WAY);
+                break;
+            default:
+                rspeak(CANT_APPLY);
+            }
             return;
         }
         ++travel_entry;
@@ -635,7 +648,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) {
@@ -667,7 +680,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;
@@ -879,28 +892,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);
-        }
     }
 }
 
@@ -1183,7 +1197,7 @@ Laction:
         case GO_WORD2:
             /* Get second word for analysis. */
             command.wd1 = command.wd2;
-            strcpy(command.raw1, command.raw2);
+            strncpy(command.raw1, command.raw2, LINESIZE - 1);
             wordclear(&command.wd2);
             command.raw2[0] = '\0';
             goto L2620;