Magic-number elimination.

[open-adventure.git] / init.c

diff --git a/init.c b/init.c
index a4a77aaabbff65d71b06c8cdb8612d6ede5f04a8..9333df3be8e90d6a7549447cd565e6da20e4f57d 100644 (file)
--- a/init.c
+++ b/init.c
@@ -31,8 +31,8 @@ struct game_t game = {
      *  chest's eventual location inside the maze. This loc is saved
      *  in chloc for ref. The dead end in the other maze has its
      *  loc stored in chloc2. */
-    .dloc[6] = LOC_DEADEND12,
-    .chloc   = LOC_DEADEND12,
+    .dloc[6] = LOC_MAZEEND12,
+    .chloc   = LOC_MAZEEND12,
     .chloc2  = LOC_DEADEND13,
     .abbnum  = 5,
     .clock1  = WARNTIME,
@@ -60,7 +60,7 @@ int initialise(void)
         if (!(locations[i].description.big == 0 ||
               tkey[i] == 0)) {
             int k = tkey[i];
-            if (T_TERMINATE(travel[k]))
+            if (travel[k].motion == HERE)
                 conditions[i] |= (1 << COND_FORCED);
         }
     }