X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=main.c;h=2790696de2ca7f7e5af4ce43d0c1d32f3a5c6910;hp=c2c4daa79a5029c26dfe06705b1cba99403d17a8;hb=16a175bbabffe66a68eeab1ca4ac0703553fdf56;hpb=f03bde268ebb52455d4ca728ce043e2bddedae22

diff --git a/main.c b/main.c
index c2c4daa..2790696 100644
--- a/main.c
+++ b/main.c
@@ -20,6 +20,7 @@
 #include <getopt.h>
 #include <signal.h>
 #include <string.h>
+#include <ctype.h>
 #include "advent.h"
 #include "dungeon.h"
 
@@ -945,7 +946,6 @@ static void listobjects(void)
 static bool do_command()
 /* Get and execute a command */
 {
-    long V1, V2;
     long kmod, defn;
     static long igo = 0;
     static struct command_t command;
@@ -1056,6 +1056,13 @@ 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);
+
         /*  Every input, check "game.foobar" flag.  If zero, nothing's
          *  going on.  If pos, make neg.  If neg, he skipped a word,
          *  so make it zero. */
@@ -1072,7 +1079,7 @@ L2607:
             }
         }
 
-        if (command.verb == SAY && command.wd2 > 0)
+        if (command.verb == SAY && command.id2 != WORD_NOT_FOUND && command.id2 != WORD_EMPTY)
             command.verb = 0;
         if (command.verb == SAY) {
             command.part = transitive;
@@ -1084,14 +1091,8 @@ L2607:
         } else
             lampcheck();
 
-        char word1[TOKLEN+1];
-        char word2[TOKLEN+1];
-        packed_to_token(command.wd1, word1);
-        packed_to_token(command.wd2, word2);
-        V1 = get_vocab_id(word1);
-        V2 = get_vocab_id(word2);
-        if (V1 == ENTER && (V2 == STREAM ||
-                            V2 == PROMOTE_WORD(WATER))) {
+        if (command.id1 == ENTER && (command.id2 == STREAM ||
+                            command.id2 == PROMOTE_WORD(WATER))) {
             if (LIQLOC(game.loc) == WATER) {
                 rspeak(FEET_WET);
             } else {
@@ -1099,18 +1100,19 @@ L2607:
             }
             goto L2012;
         }
-        if (V1 == ENTER && command.wd2 > 0) {
-            command.wd1 = command.wd2;
-            command.wd1x = command.wd2x;
-            wordclear(&command.wd2);
+        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 {
             /* FIXME: Magic numbers related to vocabulary */
-            if (!((V1 != PROMOTE_WORD(WATER) && V1 != PROMOTE_WORD(OIL)) ||
-                  (V2 != PROMOTE_WORD(PLANT) && V2 != PROMOTE_WORD(DOOR)))) {
-                if (AT(DEMOTE_WORD(V2)))
+            if (!((command.id1 != PROMOTE_WORD(WATER) && command.id1 != PROMOTE_WORD(OIL)) ||
+                  (command.id2 != PROMOTE_WORD(PLANT) && command.id2 != PROMOTE_WORD(DOOR)))) {
+                if (AT(DEMOTE_WORD(command.id2)))
                     command.wd2 = token_to_packed("POUR");
             }
-            if (V1 == PROMOTE_WORD(CAGE) && V2 == PROMOTE_WORD(BIRD) && HERE(CAGE) && HERE(BIRD))
+            if (command.id1 == PROMOTE_WORD(CAGE) && command.id2 == PROMOTE_WORD(BIRD) && HERE(CAGE) && HERE(BIRD))
                 command.wd1 = token_to_packed("CATCH");
         }
 L2620:
@@ -1126,11 +1128,11 @@ L2620:
 Lookup:
         packed_to_token(command.wd1, word1);
         defn = get_vocab_id(word1);
-        if (defn == -1) {
+        if (defn == WORD_NOT_FOUND) {
             /* Gee, I don't understand. */
             if (fallback_handler(inputbuf))
                 continue;
-            rspeak(DONT_KNOW, command.wd1, command.wd1x);
+            sspeak(DONT_KNOW, command.raw1);
             goto L2600;
         }
         /* FIXME: magic numbers related to vocabulary */
@@ -1174,13 +1176,15 @@ Laction:
         case GO_WORD2:
             /* Get second word for analysis. */
             command.wd1 = command.wd2;
-            command.wd1x = command.wd2x;
+	    strcpy(command.raw1, command.raw2);
             wordclear(&command.wd2);
+	    command.raw2[0] = '\0';
             goto L2620;
         case GO_UNKNOWN:
             /*  Random intransitive verbs come here.  Clear obj just in case
              *  (see attack()). */
-            rspeak(DO_WHAT, command.wd1, command.wd1x);
+	    command.raw1[0] = toupper(command.raw1[0]);
+            sspeak(DO_WHAT, command.raw1);
             command.obj = 0;
             goto L2600;
         case GO_DWARFWAKE: