X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;ds=sidebyside;f=main.c;h=fd8a29817a63a8b4d81a04163b259718fb5d6735;hb=78ba0fac6a7ca5596c8fe65aeb32d9f5d66d1a08;hp=748a18eee24a8d41db938915b6c38436a1db12fc;hpb=52723acb7207fe8487d931151a5df1d36f6db75d;p=open-adventure.git

diff --git a/main.c b/main.c
index 748a18e..fd8a298 100644
--- a/main.c
+++ b/main.c
@@ -1024,7 +1024,6 @@ static bool do_command()
 /* Get and execute a command */
 {
     static struct command_t command;
-    char word1[TOKLEN + 1];
 
     command.verb = 0;
 
@@ -1120,8 +1119,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 +1129,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;
@@ -1164,10 +1155,6 @@ Lookup:
             if (++game.igo == 10)
                 rspeak(GO_UNNEEDED);
         }
-        packed_to_token(command.wd1, word1);
-        long defn;
-        enum wordtype type;
-        get_vocab_metadata(word1, &defn, &type);
         if (command.id1 == WORD_NOT_FOUND) {
             if (fallback_handler(command))
                 continue;
@@ -1175,7 +1162,7 @@ Lookup:
             sspeak(DONT_KNOW, command.raw1);
             goto Lclearobj;
         }
-        switch (type) {
+        switch (command.type1) {
         case NO_WORD_TYPE: // FIXME: treating NO_WORD_TYPE as a motion word is confusing
         case MOTION:
             playermove(command.id1);
@@ -1186,7 +1173,7 @@ Lookup:
             break;
         case ACTION:
             command.part = intransitive;
-            command.verb = defn;
+            command.verb = command.id1;
             break;
         case SPECIAL:
             speak(specials[command.id1].message);
@@ -1203,8 +1190,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;