projects
/
open-adventure.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Squash a compiler warning.
[open-adventure.git]
/
main.c
diff --git
a/main.c
b/main.c
index 00a138f1160156223c6685b609d825b86d7e0575..66ad24707d752ebe0bc0a2490bec5fd112bf3518 100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-417,8
+417,8
@@
static bool dwarfmove(void)
if (game.dloc[i] == 0)
continue;
/* Fill tk array with all the places this dwarf might go. */
if (game.dloc[i] == 0)
continue;
/* Fill tk array with all the places this dwarf might go. */
- int j = 1;
- kk = KEY[game.dloc[i]];
+
unsigned
int j = 1;
+ kk =
T
KEY[game.dloc[i]];
if (kk != 0)
do {
game.newloc = T_DESTINATION(TRAVEL[kk]);
if (kk != 0)
do {
game.newloc = T_DESTINATION(TRAVEL[kk]);
@@
-541,7
+541,7
@@
static void croak(void)
static bool playermove(token_t verb, int motion)
{
static bool playermove(token_t verb, int motion)
{
- int scratchloc, k2, kk = KEY[game.loc];
+ int scratchloc, k2, kk =
T
KEY[game.loc];
game.newloc = game.loc;
if (kk == 0)
BUG(LOCATION_HAS_NO_TRAVEL_ENTRIES);
game.newloc = game.loc;
if (kk == 0)
BUG(LOCATION_HAS_NO_TRAVEL_ENTRIES);
@@
-564,7
+564,7
@@
static bool playermove(token_t verb, int motion)
scratchloc = T_DESTINATION(TRAVEL[kk]);
if (scratchloc != motion) {
if (!SPECIAL(scratchloc)) {
scratchloc = T_DESTINATION(TRAVEL[kk]);
if (scratchloc != motion) {
if (!SPECIAL(scratchloc)) {
- if (FORCED(scratchloc) && T_DESTINATION(TRAVEL[KEY[scratchloc]]) == motion)
+ if (FORCED(scratchloc) && T_DESTINATION(TRAVEL[
T
KEY[scratchloc]]) == motion)
k2 = kk;
}
if (TRAVEL[kk] >= 0) {
k2 = kk;
}
if (TRAVEL[kk] >= 0) {
@@
-580,7
+580,7
@@
static bool playermove(token_t verb, int motion)
}
motion = T_MOTION(TRAVEL[kk]);
}
motion = T_MOTION(TRAVEL[kk]);
- kk = KEY[game.loc];
+ kk =
T
KEY[game.loc];
break; /* fall through to ordinary travel */
}
} else {
break; /* fall through to ordinary travel */
}
} else {