projects
/
open-adventure.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prevent game from uttering solecisms about the "floor" when outside.
[open-adventure.git]
/
main.c
diff --git
a/main.c
b/main.c
index 10d284500d80ec2cd91d84d5b639a9ac3fb74f84..8f3549e97dfc975c91ca4d76d6861b5fd91f5e46 100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-397,7
+397,8
@@
static bool dwarfmove(void)
else if (j > 1 && game.newloc == tk[j - 1])
continue;
else if (j >= DIM(tk) - 1)
else if (j > 1 && game.newloc == tk[j - 1])
continue;
else if (j >= DIM(tk) - 1)
- continue;
+ /* This can't actually happen. */
+ continue; // LCOV_EXCL_LINE
else if (game.newloc == game.dloc[i])
continue;
else if (FORCED(game.newloc))
else if (game.newloc == game.dloc[i])
continue;
else if (FORCED(game.newloc))
@@
-1136,11
+1137,11
@@
Lclosecheck:
command.wd1 = token_to_packed("CATCH");
}
Lookup:
command.wd1 = token_to_packed("CATCH");
}
Lookup:
- if (
wordeq(command.wd1, token_to_packed("WEST"))
) {
+ if (
strncasecmp(command.raw1, "west", sizeof("west")) == 0
) {
if (++game.iwest == 10)
rspeak(W_IS_WEST);
}
if (++game.iwest == 10)
rspeak(W_IS_WEST);
}
- if (
wordeq(command.wd1, token_to_packed("GO"))
&& !wordempty(command.wd2)) {
+ if (
strncasecmp(command.raw1, "go", sizeof("go")) == 0
&& !wordempty(command.wd2)) {
if (++game.igo == 10)
rspeak(GO_UNNEEDED);
}
if (++game.igo == 10)
rspeak(GO_UNNEEDED);
}