archives/open-adventure
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Magic-number elimination. Fix possible glitch in troll-bridge death.

Browse source
This commit is contained in:
Eric S. Raymond 2017-06-19 11:00:23 -04:00
parent 28f9fd59bb
commit d46407d327
2 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
advent.h
View file

@ -5,17 +5,18 @@
#include "common.h" #include "common.h"
#define LINESIZE 100 #define LINESIZE 100
#define NDWARVES 6 #define NDWARVES 6 /* number of dwarves */
#define PIRATE NDWARVES /* must be NDWARVES-1 when zero-origin */ #define PIRATE NDWARVES /* must be NDWARVES-1 when zero-origin */
#define DALTLC LOC_NUGGET /* alternate dwarf location */ #define DALTLC LOC_NUGGET /* alternate dwarf location */
#define MINTRS 50 #define MINTRS 50 /* index of lowest reasure */
#define MAXTRS 79 #define MAXTRS 79 /* index of highest reasure */
#define MAXPARMS 25 #define MAXPARMS 25 /* Max parameters for speak() */
#define INVLIMIT 7 #define INVLIMIT 7 /* inverntory limit (# of objects) */
#define INTRANSITIVE -1 /* illegal object number */ #define INTRANSITIVE -1 /* illegal object number */
#define SPECIALBASE 300 /* base number of special rooms */ #define SPECIALBASE 300 /* base number of special rooms */
#define WARNTIME 30 /* late game starts at game.limit-this */ #define WARNTIME 30 /* late game starts at game.limit-this */
#define PANICTIME 15 /* time left after closing */ #define PANICTIME 15 /* time left after closing */
#define BATTERYLIFE 2500 /* turn limit increment from batteries */
typedef long token_t; /* word token - someday this will be char[TOKLEN+1] */ typedef long token_t; /* word token - someday this will be char[TOKLEN+1] */
typedef long vocab_t; /* index into a vocabulary array */ typedef long vocab_t; /* index into a vocabulary array */

7
main.c
View file

@ -619,7 +619,7 @@ static bool playermove(token_t verb, int motion)
do { do {
/* /*
* (ESR) This special-travel loop may have to be repeated if it includes * (ESR) This special-travel loop may have to be repeated if it includes
* the plover passage. Same deal for any future cases wgerw we beed to * the plover passage. Same deal for any future cases where we need to
* block travel and then redo it once the blocking condition has been * block travel and then redo it once the blocking condition has been
* removed. * removed.
*/ */
@ -652,7 +652,7 @@ static bool playermove(token_t verb, int motion)
if (!SPECIAL(game.newloc)) if (!SPECIAL(game.newloc))
return true; return true;
if (game.newloc <= 500) { if (game.newloc <= 500) {
game.newloc = game.newloc - SPECIALBASE; game.newloc -= SPECIALBASE;
switch (game.newloc) { switch (game.newloc) {
case 1: case 1:
/* Travel 301. Plover-alcove passage. Can carry only /* 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.prop[BEAR] = 3;
game.oldlc2 = game.newloc; game.oldlc2 = game.newloc;
croak(); 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; game.prop[BATTERY] = 1;
if (TOTING(BATTERY)) if (TOTING(BATTERY))
DROP(BATTERY, game.loc); DROP(BATTERY, game.loc);
game.limit = game.limit + 2500; game.limit += BATTERYLIFE;
game.lmwarn = false; game.lmwarn = false;
} else if (game.limit == 0) { } else if (game.limit == 0) {
game.limit = -1; game.limit = -1;