projects
/
open-adventure.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replace macros with condition bits.
[open-adventure.git]
/
init.c
diff --git
a/init.c
b/init.c
index 220f9cbe197aa6084376683dda0da8934995c9bb..03c93f12a2a0c68eb5f2ca05a6eecfe8287b6f2b 100644
(file)
--- a/
init.c
+++ b/
init.c
@@
-184,7
+184,8
@@
void initialise(void)
game.abbrev[i] = 0;
if (!(locations[i].description.big == 0 || KEY[i] == 0)) {
int k = KEY[i];
game.abbrev[i] = 0;
if (!(locations[i].description.big == 0 || KEY[i] == 0)) {
int k = KEY[i];
- if (MOD(labs(TRAVEL[k]), 1000) == 1)COND[i] = 2;
+ if (MOD(labs(TRAVEL[k]), 1000) == 1)
+ conditions[i] |= (1 << COND_FORCED);
}
game.atloc[i] = 0;
}
}
game.atloc[i] = 0;
}
@@
-225,7
+226,7
@@
void initialise(void)
/* Clear the hint stuff. game.hintlc[i] is how long he's been at LOC
* with cond bit i. game.hinted[i] is true iff hint i has been
* used. */
/* Clear the hint stuff. game.hintlc[i] is how long he's been at LOC
* with cond bit i. game.hinted[i] is true iff hint i has been
* used. */
- for (int i =
1; i <=
HINT_COUNT; i++) {
+ for (int i =
0; i <
HINT_COUNT; i++) {
game.hinted[i] = false;
game.hintlc[i] = 0;
}
game.hinted[i] = false;
game.hintlc[i] = 0;
}