X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=main.c;h=748a18eee24a8d41db938915b6c38436a1db12fc;hp=c9aca31658a69ad3a3cc5716b950fdbda8e32a3e;hb=52723acb7207fe8487d931151a5df1d36f6db75d;hpb=9b585f40d815b2f7ff0bfa8bed7892002bd7014f

diff --git a/main.c b/main.c
index c9aca31..748a18e 100644
--- a/main.c
+++ b/main.c
@@ -137,7 +137,7 @@ static bool fallback_handler(struct command_t command)
 /* fallback handler for commands not handled by FORTRANish parser */
 {
     long sv;
-    char buf[LINESIZE];
+    char buf[DIM(command.raw1) + DIM(command.raw2) + 1];
     sprintf(buf, "%s %s", command.raw1, command.raw2);
 
     if (sscanf(buf, "seed %ld", &sv) == 1) {
@@ -146,6 +146,10 @@ static bool fallback_handler(struct command_t command)
         // autogenerated, so don't charge user time for it.
         --game.turns;
         return true;
+    } else if (sscanf(buf, "waste %ld", &sv) == 1) {
+        game.limit -= sv;
+        printf("Game limit is now %ld\n", game.limit);
+        return true;
     }
     return false;
 }
@@ -223,9 +227,8 @@ static void checkhints(void)
                         break;
                     game.hintlc[hint] = 0;
                     return;
-                default:
+                default: // LCOV_EXCL_LINE
                     BUG(HINT_NUMBER_EXCEEDS_GOTO_LIST); // LCOV_EXCL_LINE
-                    break;
                 }
 
                 /* Fall through to hint display */
@@ -448,7 +451,7 @@ static bool dwarfmove(void)
         rspeak(stick > 1 ? MULTIPLE_HITS : (stick == 1 ? ONE_HIT : NONE_HIT), stick);
     } else {
         rspeak(KNIFE_THROWN);
-        rspeak(MISSES_YOU);
+        rspeak(stick ? GETS_YOU : MISSES_YOU);
     }
     if (stick == 0)
         return true;
@@ -756,7 +759,7 @@ static void playermove( int motion)
                         croak();
                         return;
                     }
-                default:
+                default: // LCOV_EXCL_LINE
                     BUG(SPECIAL_TRAVEL_500_GT_L_GT_300_EXCEEDS_GOTO_LIST); // LCOV_EXCL_LINE
                 }
             }
@@ -904,8 +907,14 @@ static void lampcheck(void)
         if (HERE(BATTERY) && game.prop[BATTERY] == FRESH_BATTERIES && HERE(LAMP)) {
             rspeak(REPLACE_BATTERIES);
             game.prop[BATTERY] = DEAD_BATTERIES;
+#ifdef __unused__
+            /* This code from the original game seems to have been faulty.
+             * No tests ever passed the guard, and with the guard removed
+             * the game hangs when the lamp limit is reached.
+             */
             if (TOTING(BATTERY))
                 drop(BATTERY, game.loc);
+#endif
             game.limit += BATTERYLIFE;
             game.lmwarn = false;
         } else if (!game.lmwarn && HERE(LAMP)) {
@@ -1120,31 +1129,32 @@ Lclearobj:
 
             goto Lclearobj;
         }
-        if (command.id1 == ENTER && command.id2 != WORD_NOT_FOUND && command.id2 != WORD_EMPTY) {
+
+	/* Ugly translationms to get around word polyvalence. */
+	if (command.type1 == ACTION && command.id1 == ENTER && command.id2 != WORD_NOT_FOUND && command.id2 != WORD_EMPTY) {
             command.id1 = command.id2;
-	    command.type1 = command.type2;
-	    strncpy(command.raw1, command.raw2, LINESIZE - 1);
+            command.type1 = command.type2;
+            strncpy(command.raw1, command.raw2, LINESIZE - 1);
             command.id2 = WORD_EMPTY;
-	    command.type2 = NO_WORD_TYPE;
-	    strncpy(command.raw2, "", LINESIZE - 1);
-        } else {
+            command.type2 = NO_WORD_TYPE;
+            strncpy(command.raw2, "", LINESIZE - 1);
+        } else if (command.type1 == OBJECT) {
             if (!((command.id1 != WATER && command.id1 != OIL) || (command.id2 != PLANT && command.id2 != DOOR))) {
-                if (AT(command.id2))
-		  {
-		    command.id2 = POUR;
-		    command.type2 = ACTION;
-		    strncpy(command.raw2, "POUR", LINESIZE - 1);
+                if (AT(command.id2)) {
+                    command.id2 = POUR;
+                    command.type2 = ACTION;
+                    strncpy(command.raw2, "POUR", LINESIZE - 1);
                     command.wd2 = token_to_packed("POUR");
-		  }
+                }
             }
-            if (command.id1 == CAGE && command.id2 == BIRD && HERE(CAGE) && HERE(BIRD))
-	      {
-		command.id1 = CARRY;
-		command.type1 = ACTION;
-		strncpy(command.raw2, "CATCH", LINESIZE - 1);
+            if (command.id1 == CAGE && command.id2 == BIRD && HERE(CAGE) && HERE(BIRD)) {
+                command.id1 = CARRY;
+                command.type1 = ACTION;
+                strncpy(command.raw2, "CATCH", LINESIZE - 1);
                 command.wd1 = token_to_packed("CATCH");
-	      }
+            }
         }
+
 Lookup:
         if (strncasecmp(command.raw1, "west", sizeof("west")) == 0) {
             if (++game.iwest == 10)
@@ -1155,9 +1165,9 @@ Lookup:
                 rspeak(GO_UNNEEDED);
         }
         packed_to_token(command.wd1, word1);
-	long defn;
-	enum wordtype type;
-	get_vocab_metadata(word1, &defn, &type);
+        long defn;
+        enum wordtype type;
+        get_vocab_metadata(word1, &defn, &type);
         if (command.id1 == WORD_NOT_FOUND) {
             if (fallback_handler(command))
                 continue;
@@ -1181,7 +1191,7 @@ Lookup:
         case SPECIAL:
             speak(specials[command.id1].message);
             goto Lclearobj;
-        default:
+        default: // LCOV_EXCL_LINE
             BUG(VOCABULARY_TYPE_N_OVER_1000_NOT_BETWEEN_0_AND_3); // LCOV_EXCL_LINE
         }
 
@@ -1197,14 +1207,13 @@ Lookup:
             goto Lookup;
         case GO_WORD2:
             /* Get second word for analysis. */
-	    command.id1 = command.id2;
-	    command.type1 = command.type2;
-	    strncpy(command.raw1, command.raw2, LINESIZE - 1);
-	    command.wd1 = command.wd2;
-	    command.id2 = WORD_EMPTY;
-	    command.type2 = NO_WORD_TYPE;
-	    command.raw2[0] = '\0';
-            wordclear(&command.wd2);
+            command.id1 = command.id2;
+            command.type1 = command.type2;
+            strncpy(command.raw1, command.raw2, LINESIZE - 1);
+            command.wd1 = command.wd2;
+            command.id2 = WORD_EMPTY;
+            command.type2 = NO_WORD_TYPE;
+            command.raw2[0] = '\0';
             goto Lookup;
         case GO_UNKNOWN:
             /*  Random intransitive verbs come here.  Clear obj just in case
@@ -1220,7 +1229,7 @@ Lookup:
             /*  Oh dear, he's disturbed the dwarves. */
             rspeak(DWARVES_AWAKEN);
             terminate(endgame);
-        default:
+        default: // LCOV_EXCL_LINE
             BUG(ACTION_RETURNED_PHASE_CODE_BEYOND_END_OF_SWITCH); // LCOV_EXCL_LINE
         }
     }