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

diff --git a/main.c b/main.c
index f89afcc..e2fdadb 100644
--- a/main.c
+++ b/main.c
@@ -134,10 +134,13 @@ int main(int argc, char *argv[])
     terminate(quitgame);
 }
 
-static bool fallback_handler(char *buf)
+static bool fallback_handler(struct command_t command)
 /* fallback handler for commands not handled by FORTRANish parser */
 {
     long sv;
+    char buf[LINESIZE];
+    sprintf(buf, "%s %s", command.raw1, command.raw2);
+
     if (sscanf(buf, "seed %ld", &sv) == 1) {
         set_seed(sv);
         printf("Seed set to %ld\n", sv);
@@ -433,9 +436,7 @@ static bool dwarfmove(void)
         }
     }
 
-    /*  Now we know what's happening.  Let's tell the poor sucker about it.
-     *  Note that various of the "knife" messages must have specific relative
-     *  positions in the rspeak database. */
+    /*  Now we know what's happening.  Let's tell the poor sucker about it. */
     if (game.dtotal == 0)
         return true;
     rspeak(game.dtotal == 1 ? DWARF_SINGLE : DWARF_PACK, game.dtotal);
@@ -604,25 +605,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;
@@ -962,6 +976,10 @@ static bool do_command()
     long kmod, defn;
     static long igo = 0;
     static struct command_t command;
+    char inputbuf[LINESIZE];
+    char word1[TOKLEN + 1];
+    char word2[TOKLEN + 1];
+
     command.verb = 0;
 
     /*  Can't leave cave once it's closing (except by main office). */
@@ -1023,7 +1041,7 @@ static bool do_command()
 
         listobjects();
 
-L2012:
+Lclearobj:
         game.oldobj = command.obj;
 
 L2600:
@@ -1047,7 +1065,6 @@ L2600:
 
         /* This is where we get a new command from the user */
         char* input;
-        char inputbuf[LINESIZE];
 
         for (;;) {
             input = get_input();
@@ -1068,13 +1085,12 @@ L2600:
 
         tokenize(inputbuf, &command);
 
-        char word1[TOKLEN + 1];
-        char word2[TOKLEN + 1];
         packed_to_token(command.wd1, word1);
         packed_to_token(command.wd2, word2);
         command.id1 = get_vocab_id(word1);
         command.id2 = get_vocab_id(word2);
-
+        
+        //command = get_command_input();
 L2607:
         ++game.turns;
 
@@ -1106,7 +1122,7 @@ L2607:
             } else {
                 rspeak(WHERE_QUERY);
             }
-            goto L2012;
+            goto Lclearobj;
         }
         if (command.id1 == ENTER && command.id2 != WORD_NOT_FOUND && command.id2 != WORD_EMPTY) {
             /* command.wd1 = command.wd2; */
@@ -1138,7 +1154,7 @@ Lookup:
         defn = get_vocab_id(word1);
         if (defn == WORD_NOT_FOUND) {
             /* Gee, I don't understand. */
-            if (fallback_handler(inputbuf))
+            if (fallback_handler(command))
                 continue;
             sspeak(DONT_KNOW, command.raw1);
             goto L2600;
@@ -1159,7 +1175,7 @@ Lookup:
             break;
         case 3:
             speak(specials[kmod].message);
-            goto L2012;
+            goto Lclearobj;
         default:
             BUG(VOCABULARY_TYPE_N_OVER_1000_NOT_BETWEEN_0_AND_3); // LCOV_EXCL_LINE
         }
@@ -1174,7 +1190,7 @@ Laction:
         case GO_TOP:
             continue;	/* back to top of main interpreter loop */
         case GO_CLEAROBJ:
-            goto L2012;
+            goto Lclearobj;
         case GO_CHECKHINT:
             goto L2600;
         case GO_CHECKFOO:
@@ -1184,7 +1200,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;