projects
/
open-adventure.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change the name of the KEY array to avoid an upcoming macro clash.
[open-adventure.git]
/
init.c
diff --git
a/init.c
b/init.c
index 194abe3488aa6d7255982bec0eec30b3fa7d986b..5ad3a80b7225c9fe72ea74c2cecdbc2ef1c2cd30 100644
(file)
--- a/
init.c
+++ b/
init.c
@@
-23,8
+23,8
@@
void initialise(void)
for (int i = 1; i <= NLOCATIONS; i++) {
game.abbrev[i] = 0;
for (int i = 1; i <= NLOCATIONS; i++) {
game.abbrev[i] = 0;
- if (!(locations[i].description.big == 0 || KEY[i] == 0)) {
- int k = KEY[i];
+ if (!(locations[i].description.big == 0 ||
T
KEY[i] == 0)) {
+ int k =
T
KEY[i];
if (MOD(labs(TRAVEL[k]), 1000) == 1)
conditions[i] |= (1 << COND_FORCED);
}
if (MOD(labs(TRAVEL[k]), 1000) == 1)
conditions[i] |= (1 << COND_FORCED);
}
@@
-40,8
+40,8
@@
void initialise(void)
* described last, we'll drop them first. */
for (int i = NOBJECTS; i >= 1; i--) {
if (object_descriptions[i].fixd > 0) {
* described last, we'll drop them first. */
for (int i = NOBJECTS; i >= 1; i--) {
if (object_descriptions[i].fixd > 0) {
-
DROP
(i + NOBJECTS, object_descriptions[i].fixd);
-
DROP
(i, object_descriptions[i].plac);
+
drop
(i + NOBJECTS, object_descriptions[i].fixd);
+
drop
(i, object_descriptions[i].plac);
}
}
}
}
@@
-49,7
+49,7
@@
void initialise(void)
int k = NOBJECTS + 1 - i;
game.fixed[k] = object_descriptions[k].fixd;
if (object_descriptions[k].plac != 0 && object_descriptions[k].fixd <= 0)
int k = NOBJECTS + 1 - i;
game.fixed[k] = object_descriptions[k].fixd;
if (object_descriptions[k].plac != 0 && object_descriptions[k].fixd <= 0)
-
DROP
(k, object_descriptions[k].plac);
+
drop
(k, object_descriptions[k].plac);
}
/* Treasure props are initially -1, and are set to 0 the first time
}
/* Treasure props are initially -1, and are set to 0 the first time
@@
-191,7
+191,7
@@
void initialise(void)
game.bonus = 0;
game.clock1 = WARNTIME;
game.clock2 = FLASHTIME;
game.bonus = 0;
game.clock1 = WARNTIME;
game.clock2 = FLASHTIME;
- game.conds =
SETBIT
(11);
+ game.conds =
setbit
(11);
game.saved = 0;
game.closng = false;
game.panic = false;
game.saved = 0;
game.closng = false;
game.panic = false;