X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=main.c;h=41bbe9564b04e9e047af2e046d4e71959c4e32ed;hb=refs%2Ftags%2F1.4;hp=a57694e3fb110e5e01a1ee73ae90d3cb85de9375;hpb=0468da2cdf37b2f424a68c859ac88c31d67534a2;p=open-adventure.git

diff --git a/main.c b/main.c
index a57694e..41bbe95 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))
@@ -1123,15 +1122,23 @@ Lclearobj:
             }
             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;
             }
+
+	    /* 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:
@@ -1192,7 +1199,6 @@ Lookup:
             sspeak(DO_WHAT, command.word[0].raw);
             command.obj = 0;
         // Fallthrough
-        case GO_CHECKHINT: // Fallthrough
         case GO_CLEAROBJ:
             goto Lclearobj;
         case GO_DWARFWAKE: