X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=main.c;h=f2e107515a70d212a678a7f47757746d7c01562c;hp=7437c81d61ad6fa7b9056ddadf0ee9506fcc545b;hb=26bf324e072c8210ed3d709d6cf5063d3f749b18;hpb=2d618410b8e385f385dd81676442e51cfb51ea3b

diff --git a/main.c b/main.c
index 7437c81..f2e1075 100644
--- a/main.c
+++ b/main.c
@@ -1051,8 +1051,7 @@ Lclearobj:
             game.knfloc = 0;
 
 	/* Preserve state from last command for reuse when required */
-	command_t preserve;
-	memcpy(&preserve, &command, sizeof(command_t));
+	command_t preserve = command;
 
 	// Get command input from user
         if (!get_command_input(&command))
@@ -1121,18 +1120,25 @@ 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);
+		    command.word[1] = command.word[0];
+		    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 = command.word[0];
+		command.word[0] = command.word[1];
+		command.word[1] = stage;
+	    }
         }
 
 Lookup: