Initialize dwarf locations in YAML, not C.

[open-adventure.git] / init.c

diff --git a/init.c b/init.c
index c384f7106f84e685de34eb36ea91c5221daae591..aabd1cb3f5791910b6072100415503213f342c79 100644 (file)
--- a/init.c
+++ b/init.c
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <stdbool.h>
 #include <time.h>
+#include <assert.h>
 
 #include "advent.h"
 
@@ -21,17 +22,10 @@ struct settings_t settings = {
 };
 
 struct game_t game = {
-    .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
+    /*  Last 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. */
-    .dwarves[6].loc = LOC_MAZEEND12,
     .chloc   = LOC_MAZEEND12,
     .chloc2  = LOC_DEADEND13,
     .abbnum  = 5,
@@ -52,6 +46,11 @@ int initialise(void)
     int seedval = (int)rand();
     set_seed(seedval);
 
+    assert(NDWARVES == NDWARFLOCS);
+    for (int i = 1; i <= NDWARFLOCS; i++) {
+        game.dwarves[i].loc = dwarflocs[i-1];
+    }
+
     for (int i = 1; i <= NOBJECTS; i++) {
         game.objects[i].place = LOC_NOWHERE;
     }
@@ -84,14 +83,15 @@ int initialise(void)
             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.objects[treasure].prop = STATE_NOTFOUND;
-            game.tally = game.tally - game.objects[treasure].prop;
+                PROP_SET_NOT_FOUND(treasure);
         }
     }
     game.conds = setbit(COND_HBASE);