projects
/
open-adventure.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
596a154
)
Replace some uses of wd[12] with id[12].
author
Jason S. Ninneman
<jsn@mbar.us>
Wed, 12 Jul 2017 20:54:14 +0000
(13:54 -0700)
committer
Jason S. Ninneman
<jsn@mbar.us>
Fri, 14 Jul 2017 16:18:55 +0000
(09:18 -0700)
main.c
patch
|
blob
|
history
diff --git
a/main.c
b/main.c
index 0fd81a391ee0201e1d8d32398b782533e9d3dc21..b2a36352ab3d548394c407585d1908faff76bda4 100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-1151,7
+1151,7
@@
Lookup:
if (++game.iwest == 10)
rspeak(W_IS_WEST);
}
if (++game.iwest == 10)
rspeak(W_IS_WEST);
}
- if (strncasecmp(command.raw1, "go", sizeof("go")) == 0 &&
!wordempty(command.wd2)
) {
+ if (strncasecmp(command.raw1, "go", sizeof("go")) == 0 &&
command.id2 != WORD_EMPTY
) {
if (++game.igo == 10)
rspeak(GO_UNNEEDED);
}
if (++game.igo == 10)
rspeak(GO_UNNEEDED);
}
@@
-1169,18
+1169,18
@@
Lookup:
switch (type) {
case NO_WORD_TYPE: // FIXME: treating NO_WORD_TYPE as a motion word is confusing
case MOTION:
switch (type) {
case NO_WORD_TYPE: // FIXME: treating NO_WORD_TYPE as a motion word is confusing
case MOTION:
- playermove(
defn
);
+ playermove(
command.id1
);
return true;
case OBJECT:
command.part = unknown;
return true;
case OBJECT:
command.part = unknown;
- command.obj =
defn
;
+ command.obj =
command.id1
;
break;
case ACTION:
command.part = intransitive;
command.verb = defn;
break;
case SPECIAL:
break;
case ACTION:
command.part = intransitive;
command.verb = defn;
break;
case SPECIAL:
- speak(specials[
defn
].message);
+ speak(specials[
command.id1
].message);
goto Lclearobj;
default:
BUG(VOCABULARY_TYPE_N_OVER_1000_NOT_BETWEEN_0_AND_3); // LCOV_EXCL_LINE
goto Lclearobj;
default:
BUG(VOCABULARY_TYPE_N_OVER_1000_NOT_BETWEEN_0_AND_3); // LCOV_EXCL_LINE