X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=init.c;h=9104a5915ef9c0c43faa5759caba7e80ddf5c939;hb=ef78c36ddb2c4d3715a3885525bc4106fffb3060;hp=812e943e6dc69589758c19739a388f7903aa0fd1;hpb=85f8334e17b9e3118a73f2e9405e9db5f94ad648;p=open-adventure.git

diff --git a/init.c b/init.c
index 812e943..9104a59 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,61 +14,57 @@
 
 #include "advent.h"
 
-/*
- * Initialisation
- */
+struct settings_t settings = {
+    .logfp = NULL,
+    .oldstyle = false,
+    .prompt = true
+};
 
 struct game_t game = {
-    .dloc[1] = LOC_KINGHALL,
-    .dloc[2] = LOC_WESTBANK,
-    .dloc[3] = LOC_Y2,
-    .dloc[4] = LOC_ALIKE3,
-    .dloc[5] = LOC_COMPLEX,
+    .dwarves[1].loc = LOC_KINGHALL,
+    .dwarves[2].loc = LOC_WESTBANK,
+    .dwarves[3].loc = LOC_Y2,
+    .dwarves[4].loc = LOC_ALIKE3,
+    .dwarves[5].loc = LOC_COMPLEX,
 
     /*  Sixth dwarf is special (the pirate).  He always starts at his
      *  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,
+    .dwarves[6].loc = 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 (oldstyle)
+    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++) {
-        game.place[i] = LOC_NOWHERE;
+        game.objects[i].place = LOC_NOWHERE;
     }
 
     for (int i = 1; i <= NLOCATIONS; i++) {
         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);
         }
     }
 
-    /*  Set up the game.atloc and game.link arrays.
+    /*  Set up the game.locs atloc and game.link arrays.
      *  We'll use the DROP subroutine, which prefaces new objects on the
      *  lists.  Since we want things in the other order, we'll run the
      *  loop backwards.  If the object is in two locs, we drop it twice.
@@ -75,22 +79,23 @@ long initialise(void)
 
     for (int i = 1; i <= NOBJECTS; i++) {
         int k = NOBJECTS + 1 - i;
-        game.fixed[k] = objects[k].fixd;
+        game.objects[k].fixed = objects[k].fixd;
         if (objects[k].plac != 0 && objects[k].fixd <= 0)
             drop(k, objects[k].plac);
     }
 
-    /*  Treasure props are initially -1, and are set to 0 the first time
-     *  they are described.  game.tally keeps track of how many are
-     *  not yet found, so we know when to close the cave. */
+    /*  Treasure props are initially STATE_NOTFOUND, and are set to
+     *  STATE_FOUND the first time they are described.  game.tally
+     *  keeps track of how many are not yet found, so we know when to
+     *  close the cave. */
     for (int treasure = 1; treasure <= NOBJECTS; treasure++) {
         if (objects[treasure].is_treasure) {
+            ++game.tally;
             if (objects[treasure].inventory != 0)
-                game.prop[treasure] = -1;
-            game.tally = game.tally - game.prop[treasure];
+                PROP_SET_NOT_FOUND(treasure);
         }
     }
-    game.conds = setbit(11);
+    game.conds = setbit(COND_HBASE);
 
     return seedval;
 }