Eliminate last logic guard on a packed value.

[open-adventure.git] / main.c

diff --git a/main.c b/main.c
index 7f03ab2a391611784b417d16b53f0c6edf31270c..1a1f25d63bf90f02ae97554860138ddc12159bdb 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
@@ -1130,15 +1130,7 @@ Lclearobj:
             goto Lclearobj;
         }
 
-       /* Ugly translationms to get around word polyvalence. */
-       if (command.type1 == ACTION && command.id1 == ENTER && command.id2 != WORD_NOT_FOUND && command.id2 != WORD_EMPTY) {
-            command.id1 = command.id2;
-            command.type1 = command.type2;
-            strncpy(command.raw1, command.raw2, LINESIZE - 1);
-            command.id2 = WORD_EMPTY;
-            command.type2 = NO_WORD_TYPE;
-            strncpy(command.raw2, "", LINESIZE - 1);
-        } else if (command.type1 == OBJECT) {
+        if (command.type1 == OBJECT) {
             if (!((command.id1 != WATER && command.id1 != OIL) || (command.id2 != PLANT && command.id2 != DOOR))) {
                 if (AT(command.id2)) {
                     command.id2 = POUR;
@@ -1203,8 +1195,6 @@ Lookup:
             return true;
         case GO_TOP:
             continue;  /* back to top of main interpreter loop */
-        case GO_LOOKUP:
-            goto Lookup;
         case GO_WORD2:
             /* Get second word for analysis. */
             command.id1 = command.id2;
@@ -1214,7 +1204,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