Canonicalize OV commands to VO form.

[open-adventure.git] / main.c

diff --git a/main.c b/main.c
index a20d9dc2e5114210594fc126f7ba0c0323dd1ebb..0eab6e8d19bacb4b49d0e89a655fed530f4633e9 100644 (file)
--- a/main.c
+++ b/main.c
@@ -1134,6 +1134,17 @@ Lclearobj:
                 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;
+               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: