X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=init.c;h=b890fbacc078c9f38efa51b9f990112a788eca54;hb=786832210eba05e5fbc926b2ed850acb599c53ef;hp=be5c3fb271c0da846c96422c6c5e2f4ba6574894;hpb=0e540429b017c950702aee6644f17058f6f338fb;p=open-adventure.git

diff --git a/init.c b/init.c
index be5c3fb..b890fba 100644
--- a/init.c
+++ b/init.c
@@ -1,3 +1,11 @@
+/*
+ * Initialisation
+ *
+ * Copyright (c) 1977, 2005 by Will Crowther and Don Woods
+ * Copyright (c) 2017 by Eric S. Raymond
+ * SPDX-License-Identifier: BSD-2-clause
+ */
+
 #include <unistd.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -6,10 +14,6 @@
 
 #include "advent.h"
 
-/*
- * Initialisation
- */
-
 struct settings_t settings = {
     .logfp = NULL,
     .oldstyle = false,
@@ -27,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,
@@ -37,21 +41,15 @@ struct game_t game = {
     .loc     = LOC_START,
     .limit   = GAMELIMIT,
     .foobar  = WORD_EMPTY,
-
-    /* Initialize our LCG PRNG with parameters tested against
-     * Knuth vol. 2. by the original authors */
-    .lcg_a = 1093,
-    .lcg_c = 221587,
-    .lcg_m = 1048576,
 };
 
-long initialise(void)
+int initialise(void)
 {
     if (settings.oldstyle)
         printf("Initialising...\n");
 
     srand(time(NULL));
-    long seedval = (long)rand();
+    int seedval = (int)rand();
     set_seed(seedval);
 
     for (int i = 1; i <= NOBJECTS; i++) {
@@ -62,7 +60,7 @@ long 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);
         }
     }
@@ -97,7 +95,7 @@ long initialise(void)
             game.tally = game.tally - game.prop[treasure];
         }
     }
-    game.conds = setbit(11);
+    game.conds = setbit(COND_HBASE);
 
     return seedval;
 }