Improved word type checking.

[open-adventure.git] / main.c

diff --git a/main.c b/main.c
index 7f03ab2a391611784b417d16b53f0c6edf31270c..66f63f993dc32a845689dd817851acd570a9dcb7 100644 (file)
--- a/main.c
+++ b/main.c
@@ -1120,8 +1120,8 @@ Lclearobj:
         } else
             lampcheck();
 
-        if (command.id1 == ENTER && (command.id2 == STREAM ||
-                                     command.id2 == WATER)) {
+        if (command.type1 == MOTION && command.id1 == ENTER
+           && (command.id2 == STREAM || command.id2 == WATER)) {
             if (LIQLOC(game.loc) == WATER)
                 rspeak(FEET_WET);
             else
@@ -1131,7 +1131,8 @@ Lclearobj:
         }
 
        /* Ugly translationms to get around word polyvalence. */
-       if (command.type1 == ACTION && command.id1 == ENTER && command.id2 != WORD_NOT_FOUND && command.id2 != WORD_EMPTY) {
+       if (command.type1 == ACTION && command.id1 == SAY
+               && command.id2 != WORD_NOT_FOUND && command.id2 != WORD_EMPTY) {
             command.id1 = command.id2;
             command.type1 = command.type2;
             strncpy(command.raw1, command.raw2, LINESIZE - 1);
@@ -1214,7 +1215,6 @@ Lookup:
             command.id2 = WORD_EMPTY;
             command.type2 = NO_WORD_TYPE;
             command.raw2[0] = '\0';
-            wordclear(&command.wd2);
             goto Lookup;
         case GO_UNKNOWN:
             /*  Random intransitive verbs come here.  Clear obj just in case