Clean out some disused variables.

This commit is contained in:
Jason S. Ninneman 2017-06-20 15:46:25 -07:00 committed by Eric S. Raymond
parent acc07e1287
commit 1e59d6b476
3 changed files with 1 additions and 16 deletions

View file

@ -523,7 +523,6 @@ static void write_file(FILE* header_file)
fprintf(header_file, "\n"); fprintf(header_file, "\n");
// content variables // content variables
write_0d(header_file, TRNVLS, "TRNVLS");
write_0d(header_file, HNTMAX, "HNTMAX"); write_0d(header_file, HNTMAX, "HNTMAX");
write_1d(header_file, OBJSND, NOBJECTS + 1, "OBJSND"); write_1d(header_file, OBJSND, NOBJECTS + 1, "OBJSND");
write_1d(header_file, OBJTXT, NOBJECTS + 1, "OBJTXT"); write_1d(header_file, OBJTXT, NOBJECTS + 1, "OBJTXT");
@ -531,7 +530,6 @@ static void write_file(FILE* header_file)
write_1d(header_file, KEY, LOCSIZ + 1, "KEY"); write_1d(header_file, KEY, LOCSIZ + 1, "KEY");
write_1d(header_file, LOCSND, LOCSIZ + 1, "LOCSND"); write_1d(header_file, LOCSND, LOCSIZ + 1, "LOCSND");
write_1d(header_file, CVAL, CLSMAX + 1, "CVAL"); write_1d(header_file, CVAL, CLSMAX + 1, "CVAL");
write_1d(header_file, TRNVAL, TRNSIZ + 1, "TRNVAL");
write_1d(header_file, TRAVEL, TRVSIZ + 1, "TRAVEL"); write_1d(header_file, TRAVEL, TRVSIZ + 1, "TRAVEL");
write_1d(header_file, KTAB, TABSIZ + 1, "KTAB"); write_1d(header_file, KTAB, TABSIZ + 1, "KTAB");
write_1d(header_file, ATAB, TABSIZ + 1, "ATAB"); write_1d(header_file, ATAB, TABSIZ + 1, "ATAB");

6
init.c
View file

@ -352,16 +352,10 @@ void initialise(void)
* game.limit Lifetime of lamp (not set here) * game.limit Lifetime of lamp (not set here)
* maximum_deaths Number of reincarnation messages available (up to 5) * maximum_deaths Number of reincarnation messages available (up to 5)
* game.numdie Number of times killed so far * game.numdie Number of times killed so far
* game.thresh Next #turns threshhold (-1 if none)
* game.trndex Index in TRNVAL of next threshold (db section 14)
* game.trnluz # points lost so far due to number of turns used * game.trnluz # points lost so far due to number of turns used
* game.turns Tallies how many commands he's given (ignores yes/no) * game.turns Tallies how many commands he's given (ignores yes/no)
* Logicals were explained earlier */ * Logicals were explained earlier */
game.turns = 0; game.turns = 0;
game.trndex = 1;
game.thresh = -1;
if (TRNVLS > 0)
game.thresh = MOD(TRNVAL[1], 100000) + 1;
game.trnluz = 0; game.trnluz = 0;
game.lmwarn = false; game.lmwarn = false;
game.iwest = 0; game.iwest = 0;

9
main.c
View file

@ -1035,14 +1035,7 @@ L2607:
speak(turn_thresholds[i].message); speak(turn_thresholds[i].message);
} }
} }
/* if (game.turns == game.thresh) { */
/* speak(turn_threshold_messages[game.trndex]); */
/* game.trnluz = game.trnluz + TRNVAL[game.trndex] / 100000; */
/* ++game.trndex; */
/* game.thresh = -1; */
/* if (game.trndex <= TRNVLS) */
/* game.thresh = MOD(TRNVAL[game.trndex], 100000) + 1; */
/* } */
if (command.verb == SAY && WD2 > 0) if (command.verb == SAY && WD2 > 0)
command.verb = 0; command.verb = 0;
if (command.verb == SAY) { if (command.verb == SAY) {