X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=init.c;h=03c93f12a2a0c68eb5f2ca05a6eecfe8287b6f2b;hb=6c6c72f327b7559f5b430b486a1a98137789e8ea;hp=0e52a32c5ce3d66b35f0cf3743d0675c07e32d3a;hpb=c84d37091899d4bfcd747dd4afd182d81c3720b3;p=open-adventure.git

diff --git a/init.c b/init.c
index 0e52a32..03c93f1 100644
--- a/init.c
+++ b/init.c
@@ -5,7 +5,6 @@
 
 #include "advent.h"
 #include "database.h"
-#include "newdb.h"
 
 /*
  * Initialisation
@@ -185,7 +184,8 @@ void initialise(void)
         game.abbrev[i] = 0;
         if (!(locations[i].description.big == 0 || KEY[i] == 0)) {
             int k = KEY[i];
-            if (MOD(labs(TRAVEL[k]), 1000) == 1)COND[i] = 2;
+            if (MOD(labs(TRAVEL[k]), 1000) == 1)
+		conditions[i] |= (1 << COND_FORCED);
         }
         game.atloc[i] = 0;
     }
@@ -226,7 +226,7 @@ void initialise(void)
     /*  Clear the hint stuff.  game.hintlc[i] is how long he's been at LOC
      *  with cond bit i.  game.hinted[i] is true iff hint i has been
      *  used. */
-    for (int i = 1; i <= HNTMAX; i++) {
+    for (int i = 0; i < HINT_COUNT; i++) {
         game.hinted[i] = false;
         game.hintlc[i] = 0;
     }
@@ -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;