From 1e59d6b476a7f7f7b169a99e4918a4a2a1afb9cb Mon Sep 17 00:00:00 2001 From: "Jason S. Ninneman" Date: Tue, 20 Jun 2017 15:46:25 -0700 Subject: [PATCH] Clean out some disused variables. --- dungeon.c | 2 -- init.c | 6 ------ main.c | 9 +-------- 3 files changed, 1 insertion(+), 16 deletions(-) diff --git a/dungeon.c b/dungeon.c index 0ffebe1..0fbd17e 100644 --- a/dungeon.c +++ b/dungeon.c @@ -523,7 +523,6 @@ static void write_file(FILE* header_file) fprintf(header_file, "\n"); // content variables - write_0d(header_file, TRNVLS, "TRNVLS"); write_0d(header_file, HNTMAX, "HNTMAX"); write_1d(header_file, OBJSND, NOBJECTS + 1, "OBJSND"); 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, LOCSND, LOCSIZ + 1, "LOCSND"); 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, KTAB, TABSIZ + 1, "KTAB"); write_1d(header_file, ATAB, TABSIZ + 1, "ATAB"); diff --git a/init.c b/init.c index 0e52a32..d7789ad 100644 --- a/init.c +++ b/init.c @@ -352,16 +352,10 @@ void initialise(void) * game.limit Lifetime of lamp (not set here) * maximum_deaths Number of reincarnation messages available (up to 5) * 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.turns Tallies how many commands he's given (ignores yes/no) * Logicals were explained earlier */ game.turns = 0; - game.trndex = 1; - game.thresh = -1; - if (TRNVLS > 0) - game.thresh = MOD(TRNVAL[1], 100000) + 1; game.trnluz = 0; game.lmwarn = false; game.iwest = 0; diff --git a/main.c b/main.c index 1b326af..233417e 100644 --- a/main.c +++ b/main.c @@ -1035,14 +1035,7 @@ L2607: 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) command.verb = 0; if (command.verb == SAY) { -- 2.31.1