Clean out some disused variables.

diff --git a/dungeon.c b/dungeon.c
index 0ffebe1e1eb6f522314bbbac222ff7401cd553b9..0fbd17e29c86a8df4f27b02221e785938600f4ab 100644 (file)
--- 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 0e52a32c5ce3d66b35f0cf3743d0675c07e32d3a..d7789ad7ce85aa17a9f23bb4b0d9165107a26e7e 100644 (file)
--- 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 1b326af0d897308f2e0745d0309a19b0e529f606..233417e6d4802b25f623ed6a8877333256b8c8fc 100644 (file)
--- 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) {