projects
/
open-adventure.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove duplicative phase code.
[open-adventure.git]
/
main.c
diff --git
a/main.c
b/main.c
index a20d9dc2e5114210594fc126f7ba0c0323dd1ebb..41bbe9564b04e9e047af2e046d4e71959c4e32ed 100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-1051,8
+1051,7
@@
Lclearobj:
game.knfloc = 0;
/* Preserve state from last command for reuse when required */
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))
// Get command input from user
if (!get_command_input(&command))
@@
-1123,8
+1122,7
@@
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)) {
}
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 = POUR;
command.word[0].type = ACTION;
strncpy(command.word[0].raw, "pour", LINESIZE - 1);
@@
-1134,6
+1132,13
@@
Lclearobj:
command.word[0].id = CARRY;
command.word[0].type = ACTION;
}
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:
}
Lookup:
@@
-1194,7
+1199,6
@@
Lookup:
sspeak(DO_WHAT, command.word[0].raw);
command.obj = 0;
// Fallthrough
sspeak(DO_WHAT, command.word[0].raw);
command.obj = 0;
// Fallthrough
- case GO_CHECKHINT: // Fallthrough
case GO_CLEAROBJ:
goto Lclearobj;
case GO_DWARFWAKE:
case GO_CLEAROBJ:
goto Lclearobj;
case GO_DWARFWAKE: