\10Cleaned up do_command() a little

[open-adventure.git] / main.c

diff --git a/main.c b/main.c
index e2fdadb60ba0a2219d51cd1030f3d686c18f4e80..c23b46747c5f99e45029d46de4ca2d7451ef435c 100644 (file)
--- a/main.c
+++ b/main.c
@@ -970,15 +970,46 @@ 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 inputbuf[LINESIZE];
     char word1[TOKLEN + 1];
-    char word2[TOKLEN + 1];
 
     command.verb = 0;
 
@@ -1062,35 +1093,11 @@ 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;
-
-        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);
         
-        //command = get_command_input();
+        // Get command input from user
+        if(!get_command_input(&command)) 
+            return false;
+
 L2607:
         ++game.turns;
 
@@ -1103,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;
@@ -1125,8 +1126,6 @@ L2607:
             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 {
@@ -1139,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(command))
                 continue;
+            /* Gee, I don't understand. */
             sspeak(DONT_KNOW, command.raw1);
             goto L2600;
         }
@@ -1179,8 +1177,7 @@ Lookup:
         default:
             BUG(VOCABULARY_TYPE_N_OVER_1000_NOT_BETWEEN_0_AND_3); // LCOV_EXCL_LINE
         }
-
-Laction:
+        
         switch (action(&command)) {
         case GO_TERMINATE:
             return true;
@@ -1203,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()). */