projects
/
open-adventure.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Magic-number elimination.
[open-adventure.git]
/
main.c
diff --git
a/main.c
b/main.c
index 16d8f915f5660e9b8415168f9a32a82b499763ba..db804060408f4263907d2f47cb7c2deda8e19c1d 100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-619,7
+619,7
@@
static bool playermove(token_t verb, int motion)
do {
/*
* (ESR) This special-travel loop may have to be repeated if it includes
do {
/*
* (ESR) This special-travel loop may have to be repeated if it includes
- * the plover passage. Same deal for any future cases w
gerw we b
eed to
+ * the plover passage. Same deal for any future cases w
here we n
eed to
* block travel and then redo it once the blocking condition has been
* removed.
*/
* block travel and then redo it once the blocking condition has been
* removed.
*/
@@
-652,7
+652,7
@@
static bool playermove(token_t verb, int motion)
if (!SPECIAL(game.newloc))
return true;
if (game.newloc <= 500) {
if (!SPECIAL(game.newloc))
return true;
if (game.newloc <= 500) {
- game.newloc
= game.newloc -
SPECIALBASE;
+ game.newloc
-=
SPECIALBASE;
switch (game.newloc) {
case 1:
/* Travel 301. Plover-alcove passage. Can carry only
switch (game.newloc) {
case 1:
/* Travel 301. Plover-alcove passage. Can carry only
@@
-711,6
+711,7
@@
static bool playermove(token_t verb, int motion)
game.prop[BEAR] = 3;
game.oldlc2 = game.newloc;
croak();
game.prop[BEAR] = 3;
game.oldlc2 = game.newloc;
croak();
+ return true;
}
}
BUG(SPECIAL_TRAVEL_500_GT_L_GT_300_EXCEEDS_GOTO_LIST);
}
}
BUG(SPECIAL_TRAVEL_500_GT_L_GT_300_EXCEEDS_GOTO_LIST);
@@
-856,7
+857,7
@@
static void lampcheck(void)
game.prop[BATTERY] = 1;
if (TOTING(BATTERY))
DROP(BATTERY, game.loc);
game.prop[BATTERY] = 1;
if (TOTING(BATTERY))
DROP(BATTERY, game.loc);
- game.limit
= game.limit + 2500
;
+ game.limit
+= BATTERYLIFE
;
game.lmwarn = false;
} else if (game.limit == 0) {
game.limit = -1;
game.lmwarn = false;
} else if (game.limit == 0) {
game.limit = -1;
@@
-982,7
+983,8
@@
static bool do_command(FILE *cmdin)
else
continue; /* back to top of main interpreter loop */
}
else
continue; /* back to top of main interpreter loop */
}
- if (game.loc == 33 && PCT(25) && !game.closng)RSPEAK(SAYS_PLUGH);
+ if (game.loc == LOC_Y2 && PCT(25) && !game.closng)
+ RSPEAK(SAYS_PLUGH);
listobjects();
listobjects();