X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=init.c;h=d22da5ebe8d3b6c1af0bfd34c8fd2007d143669e;hb=da27ae1932d1311887ad3a677b10b87610e31854;hp=d3823db5c33e63e03fb80b61fe53509e70f38065;hpb=7dc88392493951baa8071c7318e6c0b086c531e9;p=open-adventure.git

diff --git a/init.c b/init.c
index d3823db..d22da5e 100644
--- a/init.c
+++ b/init.c
@@ -4,7 +4,6 @@
 #include <stdbool.h>
 
 #include "advent.h"
-#include "database.h"
 
 /*
  * Initialisation
@@ -23,9 +22,9 @@ void initialise(void)
 
     for (int i = 1; i <= NLOCATIONS; i++) {
         game.abbrev[i] = 0;
-        if (!(locations[i].description.big == 0 || TKEY[i] == 0)) {
-            int k = TKEY[i];
-            if (MOD(labs(TRAVEL[k]), 1000) == 1)
+        if (!(locations[i].description.big == 0 || tkey[i] == 0)) {
+            int k = tkey[i];
+            if (T_TERMINATE(travel[k]))
 		conditions[i] |= (1 << COND_FORCED);
         }
         game.atloc[i] = 0;