X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=init.c;h=753135ec42b0a5fe46080de7afcf3602ad16beb1;hp=0ac3c4d6a8abb4ecc84408644d34cc929b6cc44a;hb=c4ceca3db9ebbe10460f7442fbeeb961a3816758;hpb=f9edfc51515853c21418c1d55b681a71681a748c

diff --git a/init.c b/init.c
index 0ac3c4d..753135e 100644
--- a/init.c
+++ b/init.c
@@ -23,9 +23,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;
@@ -72,15 +72,6 @@ void initialise(void)
         game.hintlc[i] = 0;
     }
 
-    /* Define some handy mnemonics. */
-
-    /* Some action verbs. */
-    FIND = VOCWRD(WORD_FIND, 2);
-    INVENT = VOCWRD(WORD_INVENT, 2);
-    LOCK = VOCWRD(WORD_LOCK, 2);
-    SAY = VOCWRD(WORD_SAY, 2);
-    THROW = VOCWRD(WORD_THROW, 2);
-
     /*  Initialise the dwarves.  game.dloc is loc of dwarves,
      *  hard-wired in.  game.odloc is prior loc of each dwarf,
      *  initially garbage.  DALTLC is alternate initial loc for dwarf,