Typo fix.

[open-adventure.git] / templates / dungeon.h.tpl

diff --git a/templates/dungeon.h.tpl b/templates/dungeon.h.tpl
index 8c07ed523f9315063591dcdedd66e7b1d4dcd520..cf637c8ecd1c9fd74c8ce1e383a640378ef4f081 100644 (file)
--- a/templates/dungeon.h.tpl
+++ b/templates/dungeon.h.tpl
@@ -1,3 +1,7 @@
+/*
+SPDX-FileCopyrightText: Copyright Eric S. Raymond <esr@thyrsus.com>
+SPDX-License-Identifier: BSD-2-Clause
+*/
 #ifndef DUNGEON_H
 #define DUNGEON_H
 
@@ -16,18 +20,23 @@
 #define COND_DEEP      6       /* Deep - e.g where dwarves are active */
 #define COND_FOREST    7       /* In the forest */
 #define COND_FORCED    8       /* Only one way in or out of here */
-/* Bits past 10 indicate areas of interest to "hint" routines */
-#define COND_HBASE     10      /* Base for location hint bits */
-#define COND_HCAVE     11      /* Trying to get into cave */
-#define COND_HBIRD     12      /* Trying to catch bird */
-#define COND_HSNAKE    13      /* Trying to deal with snake */
-#define COND_HMAZE     14      /* Lost in maze */
-#define COND_HDARK     15      /* Pondering dark room */
-#define COND_HWITT     16      /* At Witt's End */
-#define COND_HCLIFF    17      /* Cliff with urn */
-#define COND_HWOODS    18      /* Lost in forest */
-#define COND_HOGRE     19      /* Trying to deal with ogre */
-#define COND_HJADE     20      /* Found all treasures except jade */
+#define COND_ALLDIFFERENT      9       /* Room is in maze all different */
+#define COND_ALLALIKE  10      /* Room is in maze all alike */
+/* Bits past 11 indicate areas of interest to "hint" routines */
+#define COND_HBASE     11      /* Base for location hint bits */
+#define COND_HCAVE     12      /* Trying to get into cave */
+#define COND_HBIRD     13      /* Trying to catch bird */
+#define COND_HSNAKE    14      /* Trying to deal with snake */
+#define COND_HMAZE     15      /* Lost in maze */
+#define COND_HDARK     16      /* Pondering dark room */
+#define COND_HWITT     17      /* At Witt's End */
+#define COND_HCLIFF    18      /* Cliff with urn */
+#define COND_HWOODS    19      /* Lost in forest */
+#define COND_HOGRE     20      /* Trying to deal with ogre */
+#define COND_HJADE     21      /* Found all treasures except jade */
+
+#define NDWARVES       {ndwarflocs}          // number of dwarves
+extern const int dwarflocs[NDWARVES];
 
 typedef struct {{
   const char** strs;
@@ -104,13 +113,6 @@ typedef struct {{
   const bool stop;
 }} travelop_t;
 
-/* Abstract out the encoding of words in the travel array.  Gives us
- * some hope of getting to a less cryptic representation than we
- * inherited from FORTRAN, someday. To understand these, read the
- * encoding description for travel.
- */
-#define T_TERMINATE(entry)     ((entry).motion == 1)
-
 extern const location_t locations[];
 extern const object_t objects[];
 extern const char* arbitrary_messages[];