X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;ds=sidebyside;f=main.c;h=0eab6e8d19bacb4b49d0e89a655fed530f4633e9;hb=87c6d3fb1e583e4d2fa6fd9532287b34b3948d77;hp=7437c81d61ad6fa7b9056ddadf0ee9506fcc545b;hpb=2d618410b8e385f385dd81676442e51cfb51ea3b;p=open-adventure.git

diff --git a/main.c b/main.c
index 7437c81..0eab6e8 100644
--- a/main.c
+++ b/main.c
@@ -1121,18 +1121,30 @@ Lclearobj:
                     command.word[0].id = ENTRANCE;
                 }
             }
-            if (!((command.word[0].id != WATER && command.word[0].id != OIL) || (command.word[1].id != PLANT && command.word[1].id != DOOR))) {
+            if ((command.word[0].id == WATER || command.word[0].id == OIL) && (command.word[1].id == PLANT || command.word[1].id == DOOR)) {
                 if (AT(command.word[1].id)) {
-                    command.word[1].id = POUR;
-                    command.word[1].type = ACTION;
-                    strncpy(command.word[1].raw, "POUR", LINESIZE - 1);
+		    memcpy(&command.word[1], &command.word[0],
+			   sizeof(command_word_t));
+		    command.word[0].id = POUR;
+                    command.word[0].type = ACTION;
+                    strncpy(command.word[0].raw, "pour", LINESIZE - 1);
                 }
             }
             if (command.word[0].id == CAGE && command.word[1].id == BIRD && HERE(CAGE) && HERE(BIRD)) {
                 command.word[0].id = CARRY;
                 command.word[0].type = ACTION;
-                strncpy(command.word[1].raw, "CATCH", LINESIZE - 1);
             }
+
+	    /* From OV to VO form */
+	    if (command.word[0].type==OBJECT && command.word[1].type==ACTION) {
+		command_word_t stage;
+		memcpy(&stage, &command.word[0],
+			   sizeof(command_word_t));
+		memcpy(&command.word[0], &command.word[1],
+			   sizeof(command_word_t));
+		memcpy(&command.word[1], &stage,
+			   sizeof(command_word_t));
+	    }
         }
 
 Lookup: