LOCSIZ -> NLOCATIONS, finishing limit-name cleanup.

[open-adventure.git] / newdungeon.py

diff --git a/newdungeon.py b/newdungeon.py
index 89d8db6f794aca63f9e722c1fbc87f04dfdef9c4..3b801da6d50ba0df2e554a971f86837a3b81a981 100755 (executable)
--- a/newdungeon.py
+++ b/newdungeon.py
@@ -69,10 +69,13 @@ extern turn_threshold_t turn_thresholds[];
 extern obituary_t obituaries[];
 extern hint_t hints[];
 extern long conditions[];
-extern const size_t CLSSES;
-extern const int maximum_deaths;
-extern const int turn_threshold_count;
-#define HINT_COUNT {}
+
+#define NLOCATIONS             {}
+#define NOBJECTS       {}
+#define NHINTS         {}
+#define NCLASSES       {}
+#define NDEATHS                {}
+#define NTHRESHOLDS    {}
 
 enum arbitrary_messages_refs {{
 {}
@@ -129,10 +132,6 @@ long conditions[] = {{
 {}
 }};
 
-const size_t CLSSES = {};
-const int maximum_deaths = {};
-const int turn_threshold_count = {};
-
 /* end */
 """
 
@@ -338,13 +337,15 @@ if __name__ == "__main__":
         get_obituaries(db["obituaries"]),
         get_hints(db["hints"], db["arbitrary_messages"]),
         get_condbits(db["locations"]),
-        len(db["classes"]),
-        len(db["obituaries"]),
-        len(db["turn_thresholds"]),
     )
 
     h = h_template.format(
+        len(db["locations"]),
+        len(db["object_descriptions"]),
         len(db["hints"]),
+        len(db["classes"]),
+        len(db["obituaries"]),
+        len(db["turn_thresholds"]),
         get_refs(db["arbitrary_messages"]),
         get_refs(db["locations"]),
         get_refs(db["object_descriptions"]),