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))
}
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)) {
- memcpy(&command.word[1], &command.word[0],
- sizeof(command_word_t));
+ command.word[1] = command.word[0];
command.word[0].id = POUR;
command.word[0].type = ACTION;
strncpy(command.word[0].raw, "pour", LINESIZE - 1);
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:
sspeak(DO_WHAT, command.word[0].raw);
command.obj = 0;
// Fallthrough
- case GO_CHECKHINT: // Fallthrough
case GO_CLEAROBJ:
goto Lclearobj;
case GO_DWARFWAKE: