Simplify some dependencies.

diff --git a/advent.h b/advent.h
index 68890daab28fe44c4b0f88e20a562abd256aef17..394a389541b3ca750e87cdc33cf384791b39253b 100644 (file)
--- a/advent.h
+++ b/advent.h
@@ -21,7 +21,6 @@
 
 #define LINESIZE       1024
 #define TOKLEN         5          // # outputting characters in a token */
-#define NDWARVES       6          // number of dwarves
 #define PIRATE         NDWARVES   // must be NDWARVES-1 when zero-origin
 #define DALTLC         LOC_NUGGET // alternate dwarf location
 #define INVLIMIT       7          // inventory limit (# of objects)

diff --git a/init.c b/init.c
index aabd1cb3f5791910b6072100415503213f342c79..715f3ef7cd31cca5e99cec2f18944100cda0f540 100644 (file)
--- a/init.c
+++ b/init.c
@@ -46,8 +46,7 @@ int initialise(void)
     int seedval = (int)rand();
     set_seed(seedval);
 
-    assert(NDWARVES == NDWARFLOCS);
-    for (int i = 1; i <= NDWARFLOCS; i++) {
+    for (int i = 1; i <= NDWARVES; i++) {
         game.dwarves[i].loc = dwarflocs[i-1];
     }
 

diff --git a/templates/dungeon.c.tpl b/templates/dungeon.c.tpl
index a192adb19a65025d2d64c4671d244e11810efe58..03640d5bbbda33222c3bff86b97c198a43fc18d3 100644 (file)
--- a/templates/dungeon.c.tpl
+++ b/templates/dungeon.c.tpl
@@ -54,6 +54,6 @@ const travelop_t travel[] = {{
 const char *ignore = "{ignore}";
 
 /* Dwarf starting locations */
-const int dwarflocs[NDWARFLOCS] = {{{dwarflocs}}};
+const int dwarflocs[NDWARVES] = {{{dwarflocs}}};
 
 /* end */

diff --git a/templates/dungeon.h.tpl b/templates/dungeon.h.tpl
index 2a26917296c3692a7bb2e3585e3d03578d268b6f..cf637c8ecd1c9fd74c8ce1e383a640378ef4f081 100644 (file)
--- a/templates/dungeon.h.tpl
+++ b/templates/dungeon.h.tpl
@@ -35,9 +35,8 @@ SPDX-License-Identifier: BSD-2-Clause
 #define COND_HOGRE     20      /* Trying to deal with ogre */
 #define COND_HJADE     21      /* Found all treasures except jade */
 
-/* Count of dwarf starting locations */
-#define NDWARFLOCS {ndwarflocs}
-extern const int dwarflocs[NDWARFLOCS];
+#define NDWARVES       {ndwarflocs}          // number of dwarves
+extern const int dwarflocs[NDWARVES];
 
 typedef struct {{
   const char** strs;