X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=init.c;h=a4a77aaabbff65d71b06c8cdb8612d6ede5f04a8;hp=0f81fe15cb52e79fdc2692a9e8d9d005f19c9af9;hb=7d0b15ef897d7a066998fa0a44fb7be958c60cd8;hpb=f815299a2a97656b0f4ea0793c2207c2437888f6

diff --git a/init.c b/init.c
index 0f81fe1..a4a77aa 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,9 +14,11 @@
 
 #include "advent.h"
 
-/*
- * Initialisation
- */
+struct settings_t settings = {
+    .logfp = NULL,
+    .oldstyle = false,
+    .prompt = true
+};
 
 struct game_t game = {
     .dloc[1] = LOC_KINGHALL,
@@ -27,25 +37,19 @@ struct game_t game = {
     .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++) {
@@ -53,7 +57,8 @@ 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]))
                 conditions[i] |= (1 << COND_FORCED);
@@ -86,14 +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] = -1;
+                game.prop[treasure] = STATE_NOTFOUND;
             game.tally = game.tally - game.prop[treasure];
         }
     }
     game.conds = setbit(11);
 
-    /*  Start-up, dwarf stuff */
-    make_zzword(game.zzword);
-
     return seedval;
 }