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

Name another magic number.

Browse source
This commit is contained in:
Eric S. Raymond 2017-06-15 17:34:06 -04:00
parent d2b226b34c
commit ec031b0417
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
advent.h
View file

@ -12,7 +12,8 @@
#define MAXPARMS 25 #define MAXPARMS 25
#define INVLIMIT 7 #define INVLIMIT 7
#define INTRANSITIVE -1 /* illegal object number */ #define INTRANSITIVE -1 /* illegal object number */
#define SPECIALBASE 300 /* base umber of special rooms */ #define SPECIALBASE 300 /* base number of special rooms */
#define WARNTIME 30 /* late game starts at game.limit-this */
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 */

8
main.c
View file

@ -248,8 +248,8 @@ static void checkhints(FILE *cmdin)
SETPRM(1,HINTS[hint][2],HINTS[hint][2]); SETPRM(1,HINTS[hint][2],HINTS[hint][2]);
RSPEAK(HINT_COST); RSPEAK(HINT_COST);
game.hinted[hint]=YES(cmdin,WANT_HINT,HINTS[hint][4],OK_MAN); game.hinted[hint]=YES(cmdin,WANT_HINT,HINTS[hint][4],OK_MAN);
if (game.hinted[hint] && game.limit > 30) if (game.hinted[hint] && game.limit > WARNTIME)
game.limit=game.limit+30*HINTS[hint][2]; game.limit += WARNTIME*HINTS[hint][2];
} }
} }
} }
@ -831,7 +831,7 @@ static void lampcheck(void)
* Second is for other cases of lamp dying. 12400 is when it * Second is for other cases of lamp dying. 12400 is when it
* goes out. Even then, he can explore outside for a while * goes out. Even then, he can explore outside for a while
* if desired. */ * if desired. */
if (game.limit<=30 && HERE(BATTER) && game.prop[BATTER]==0 && HERE(LAMP)) if (game.limit <= WARNTIME && HERE(BATTER) && game.prop[BATTER]==0 && HERE(LAMP))
{ {
RSPEAK(REPLACE_BATTERIES); RSPEAK(REPLACE_BATTERIES);
game.prop[BATTER]=1; game.prop[BATTER]=1;
@ -844,7 +844,7 @@ static void lampcheck(void)
game.prop[LAMP]=0; game.prop[LAMP]=0;
if (HERE(LAMP)) if (HERE(LAMP))
RSPEAK(LAMP_OUT); RSPEAK(LAMP_OUT);
} else if (game.limit <= 30) { } else if (game.limit <= WARNTIME) {
if (!game.lmwarn && HERE(LAMP)) { if (!game.lmwarn && HERE(LAMP)) {
game.lmwarn=true; game.lmwarn=true;
int spk=GET_BATTERIES; int spk=GET_BATTERIES;