projects
/
open-adventure.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
d998965
)
Add some word-type checking where it's needed.
author
Eric S. Raymond
<esr@thyrsus.com>
Thu, 20 Jul 2017 11:02:35 +0000
(07:02 -0400)
committer
Eric S. Raymond
<esr@thyrsus.com>
Thu, 20 Jul 2017 11:02:35 +0000
(07:02 -0400)
main.c
patch
|
blob
|
history
diff --git
a/main.c
b/main.c
index 192d1299464e338ebaf56bbf39c2af720830e90f..7f03ab2a391611784b417d16b53f0c6edf31270c 100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-1129,14
+1129,16
@@
Lclearobj:
goto Lclearobj;
}
goto Lclearobj;
}
- if (command.id1 == ENTER && command.id2 != WORD_NOT_FOUND && command.id2 != WORD_EMPTY) {
+
+ /* Ugly translationms to get around word polyvalence. */
+ if (command.type1 == ACTION && command.id1 == ENTER && command.id2 != WORD_NOT_FOUND && command.id2 != WORD_EMPTY) {
command.id1 = command.id2;
command.type1 = command.type2;
strncpy(command.raw1, command.raw2, LINESIZE - 1);
command.id2 = WORD_EMPTY;
command.type2 = NO_WORD_TYPE;
strncpy(command.raw2, "", LINESIZE - 1);
command.id1 = command.id2;
command.type1 = command.type2;
strncpy(command.raw1, command.raw2, LINESIZE - 1);
command.id2 = WORD_EMPTY;
command.type2 = NO_WORD_TYPE;
strncpy(command.raw2, "", LINESIZE - 1);
- } else {
+ } else
if (command.type1 == OBJECT)
{
if (!((command.id1 != WATER && command.id1 != OIL) || (command.id2 != PLANT && command.id2 != DOOR))) {
if (AT(command.id2)) {
command.id2 = POUR;
if (!((command.id1 != WATER && command.id1 != OIL) || (command.id2 != PLANT && command.id2 != DOOR))) {
if (AT(command.id2)) {
command.id2 = POUR;
@@
-1152,6
+1154,7
@@
Lclearobj:
command.wd1 = token_to_packed("CATCH");
}
}
command.wd1 = token_to_packed("CATCH");
}
}
+
Lookup:
if (strncasecmp(command.raw1, "west", sizeof("west")) == 0) {
if (++game.iwest == 10)
Lookup:
if (strncasecmp(command.raw1, "west", sizeof("west")) == 0) {
if (++game.iwest == 10)