Magic-number elimination.

[open-adventure.git] / init.c

diff --git a/init.c b/init.c
index 812e943e6dc69589758c19739a388f7903aa0fd1..87a51616877d9de7468079d260709b50ac0fdb2a 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,
@@ -41,7 +47,7 @@ struct game_t game = {
 
 long initialise(void)
 {
-    if (oldstyle)
+    if (settings.oldstyle)
         printf("Initialising...\n");
 
     srand(time(NULL));
@@ -86,7 +92,7 @@ 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] = NOT_YET_FOUND;
             game.tally = game.tally - game.prop[treasure];
         }
     }