Coverage -- attack bird after game closed

[open-adventure.git] / init.c

diff --git a/init.c b/init.c
index 0f81fe15cb52e79fdc2692a9e8d9d005f19c9af9..2fffc279c1ee7f691efa0d35eeac8ef9d34c5499 100644 (file)
--- a/init.c
+++ b/init.c
@@ -10,6 +10,12 @@
  * Initialisation
  */
 
+struct settings_t settings = {
+    .logfp = NULL,
+    .oldstyle = false,
+    .prompt = true
+};
+
 struct game_t game = {
     .dloc[1] = LOC_KINGHALL,
     .dloc[2] = LOC_WESTBANK,
@@ -27,7 +33,6 @@ struct game_t game = {
     .abbnum  = 5,
     .clock1  = WARNTIME,
     .clock2  = FLASHTIME,
-    .blklin  = true,
     .newloc  = LOC_START,
     .loc     = LOC_START,
     .limit   = GAMELIMIT,
@@ -41,7 +46,7 @@ struct game_t game = {
 
 long initialise(void)
 {
-    if (oldstyle)
+    if (settings.oldstyle)
         printf("Initialising...\n");
 
     srand(time(NULL));
@@ -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;
 }