X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=main.c;h=ee2291298fa388fe5265efac343ac7f23b1239aa;hp=1a1f25d63bf90f02ae97554860138ddc12159bdb;hb=2aa35a6d84725df2f39736233c3be916c3efbe33;hpb=4e01669e06cebde88437935fd2b2938406cddcb5

diff --git a/main.c b/main.c
index 1a1f25d..ee22912 100644
--- a/main.c
+++ b/main.c
@@ -989,8 +989,6 @@ 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 (;;) {
@@ -1012,10 +1010,8 @@ static bool get_command_input(struct command_t *command)
 
     tokenize(inputbuf, command);
 
-    packed_to_token(command->wd1, word1);
-    packed_to_token(command->wd2, word2);
-    get_vocab_metadata(word1, &(command->id1), &(command->type1));
-    get_vocab_metadata(word2, &(command->id2), &(command->type2));
+    get_vocab_metadata(command->raw1, &(command->id1), &(command->type1));
+    get_vocab_metadata(command->raw2, &(command->id2), &(command->type2));
 
     return true;
 }
@@ -1024,7 +1020,6 @@ static bool do_command()
 /* Get and execute a command */
 {
     static struct command_t command;
-    char word1[TOKLEN + 1];
 
     command.verb = 0;
 
@@ -1131,19 +1126,32 @@ Lclearobj:
         }
 
         if (command.type1 == OBJECT) {
-            if (!((command.id1 != WATER && command.id1 != OIL) || (command.id2 != PLANT && command.id2 != DOOR))) {
+	    if (command.id1 == GRATE) {
+		command.type1 = MOTION;
+		if (game.loc == LOC_START ||
+		    game.loc == LOC_VALLEY ||
+		    game.loc == LOC_SLIT) {
+		    command.id1 = DEPRESSION;
+		}
+		if (game.loc == LOC_COBBLE ||
+		    game.loc == LOC_DEBRIS ||
+		    game.loc == LOC_AWKWARD ||
+		    game.loc == LOC_BIRD ||
+		    game.loc == LOC_PITTOP) {
+		    command.id1 = ENTRANCE;
+		}
+	    }
+	    if (!((command.id1 != WATER && command.id1 != OIL) || (command.id2 != PLANT && command.id2 != DOOR))) {
                 if (AT(command.id2)) {
                     command.id2 = POUR;
                     command.type2 = ACTION;
                     strncpy(command.raw2, "POUR", LINESIZE - 1);
-                    command.wd2 = token_to_packed("POUR");
                 }
             }
             if (command.id1 == CAGE && command.id2 == BIRD && HERE(CAGE) && HERE(BIRD)) {
                 command.id1 = CARRY;
                 command.type1 = ACTION;
                 strncpy(command.raw2, "CATCH", LINESIZE - 1);
-                command.wd1 = token_to_packed("CATCH");
             }
         }
 
@@ -1156,10 +1164,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;
@@ -1167,7 +1171,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);
@@ -1178,7 +1182,7 @@ Lookup:
             break;
         case ACTION:
             command.part = intransitive;
-            command.verb = defn;
+            command.verb = command.id1;
             break;
         case SPECIAL:
             speak(specials[command.id1].message);
@@ -1200,7 +1204,6 @@ Lookup:
             command.id1 = command.id2;
             command.type1 = command.type2;
             strncpy(command.raw1, command.raw2, LINESIZE - 1);
-            command.wd1 = command.wd2;
             command.id2 = WORD_EMPTY;
             command.type2 = NO_WORD_TYPE;
             command.raw2[0] = '\0';