X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=main.c;h=c23b46747c5f99e45029d46de4ca2d7451ef435c;hp=6457d055068984a423d0cf575d5a167c8039bbd3;hb=4d7858d333057850b7d4635ba51441238f0721e2;hpb=53cb12b4d084bc085fd2b22db886cc172b74e59c

diff --git a/main.c b/main.c
index 6457d05..c23b467 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);
@@ -969,12 +970,47 @@ static void listobjects(void)
     }
 }
 
+static bool get_command_input(struct command_t *command)
+{
+    char inputbuf[LINESIZE];
+    char word1[TOKLEN + 1];
+    char word2[TOKLEN + 1];
+    char* input;
+
+    for (;;) {
+        input = get_input();
+        if (input == NULL)
+            return false;
+        if (word_count(input) > 2) {
+            rspeak(TWO_WORDS);
+            free(input);
+            continue;
+        }
+        if (strcmp(input, "") != 0)
+            break;
+        free(input);
+    }
+
+    strncpy(inputbuf, input, LINESIZE - 1);
+    free(input);
+
+    tokenize(inputbuf, command);
+
+    packed_to_token(command->wd1, word1);
+    packed_to_token(command->wd2, word2);
+    command->id1 = get_vocab_id(word1);
+    command->id2 = get_vocab_id(word2);
+    
+    return true;
+}
+
 static bool do_command()
 /* Get and execute a command */
 {
     long kmod, defn;
-    static long igo = 0;
     static struct command_t command;
+    char word1[TOKLEN + 1];
+
     command.verb = 0;
 
     /*  Can't leave cave once it's closing (except by main office). */
@@ -1036,7 +1072,7 @@ static bool do_command()
 
         listobjects();
 
-L2012:
+Lclearobj:
         game.oldobj = command.obj;
 
 L2600:
@@ -1057,36 +1093,10 @@ L2600:
         game.wzdark = DARK(game.loc);
         if (game.knfloc > 0 && game.knfloc != game.loc)
             game.knfloc = 0;
-
-        /* This is where we get a new command from the user */
-        char* input;
-        char inputbuf[LINESIZE];
-
-        for (;;) {
-            input = get_input();
-            if (input == NULL)
-                return (false);
-            if (word_count(input) > 2) {
-                rspeak(TWO_WORDS);
-                free(input);
-                continue;
-            }
-            if (strcmp(input, "") != 0)
-                break;
-            free(input);
-        }
-
-        strncpy(inputbuf, input, LINESIZE - 1);
-        free(input);
-
-        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);
+        
+        // Get command input from user
+        if(!get_command_input(&command)) 
+            return false;
 
 L2607:
         ++game.turns;
@@ -1100,12 +1110,6 @@ L2607:
             }
         }
 
-        if (command.verb == SAY && command.id2 != WORD_NOT_FOUND && command.id2 != WORD_EMPTY)
-            command.verb = 0;
-        if (command.verb == SAY) {
-            command.part = transitive;
-            goto Laction;
-        }
         if (closecheck()) {
             if (game.closed)
                 return true;
@@ -1119,11 +1123,9 @@ 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; */
-            /* wordclear(&command.wd2); */
             command.id1 = command.id2;
             command.id2 = WORD_EMPTY;
         } else {
@@ -1136,23 +1138,22 @@ L2607:
             if (command.id1 == PROMOTE_WORD(CAGE) && command.id2 == PROMOTE_WORD(BIRD) && HERE(CAGE) && HERE(BIRD))
                 command.wd1 = token_to_packed("CATCH");
         }
-L2620:
+Lmovehint:
         if (wordeq(command.wd1, token_to_packed("WEST"))) {
-            ++game.iwest;
-            if (game.iwest == 10)
+            if (++game.iwest == 10)
                 rspeak(W_IS_WEST);
         }
         if (wordeq(command.wd1, token_to_packed("GO")) && !wordempty(command.wd2)) {
-            if (++igo == 10)
+            if (++game.igo == 10)
                 rspeak(GO_UNNEEDED);
         }
 Lookup:
         packed_to_token(command.wd1, word1);
         defn = get_vocab_id(word1);
         if (defn == WORD_NOT_FOUND) {
-            /* Gee, I don't understand. */
-            if (fallback_handler(inputbuf))
+            if (fallback_handler(command))
                 continue;
+            /* Gee, I don't understand. */
             sspeak(DONT_KNOW, command.raw1);
             goto L2600;
         }
@@ -1172,12 +1173,11 @@ 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
         }
-
-Laction:
+        
         switch (action(&command)) {
         case GO_TERMINATE:
             return true;
@@ -1187,7 +1187,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:
@@ -1200,7 +1200,7 @@ Laction:
             strncpy(command.raw1, command.raw2, LINESIZE - 1);
             wordclear(&command.wd2);
             command.raw2[0] = '\0';
-            goto L2620;
+            goto Lmovehint;
         case GO_UNKNOWN:
             /*  Random intransitive verbs come here.  Clear obj just in case
              *  (see attack()). */