X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=init.c;h=dbdfb11f9bed3b397c6b8254f60fe7f134034d67;hb=25230068fe3afb9d1faa9c606413784294700cef;hp=87a51616877d9de7468079d260709b50ac0fdb2a;hpb=346bcf9458c408b5bd2a6fb5679a2e86bd3952fb;p=open-adventure.git

diff --git a/init.c b/init.c
index 87a5161..dbdfb11 100644
--- a/init.c
+++ b/init.c
@@ -1,3 +1,11 @@
+/*
+ * Initialisation
+ *
+ * SPDX-FileCopyrightText: 1977, 2005 by Will Crowther and Don Woods
+ * SPDX-FileCopyrightText: 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,31 +31,25 @@ 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,
     .clock2  = FLASHTIME,
-    .blklin  = true,
     .newloc  = LOC_START,
     .loc     = LOC_START,
     .limit   = GAMELIMIT,
-
-    /* Initialize our LCG PRNG with parameters tested against
-     * Knuth vol. 2. by the original authors */
-    .lcg_a = 1093,
-    .lcg_c = 221587,
-    .lcg_m = 1048576,
+    .foobar  = WORD_EMPTY,
 };
 
-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++) {
@@ -59,9 +57,10 @@ long initialise(void)
     }
 
     for (int i = 1; i <= NLOCATIONS; i++) {
-        if (!(locations[i].description.big == 0 || tkey[i] == 0)) {
+        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);
         }
     }
@@ -92,11 +91,11 @@ long initialise(void)
     for (int treasure = 1; treasure <= NOBJECTS; treasure++) {
         if (objects[treasure].is_treasure) {
             if (objects[treasure].inventory != 0)
-                game.prop[treasure] = NOT_YET_FOUND;
+                game.prop[treasure] = STATE_NOTFOUND;
             game.tally = game.tally - game.prop[treasure];
         }
     }
-    game.conds = setbit(11);
+    game.conds = setbit(COND_HBASE);
 
     return seedval;
 }