X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=make_dungeon.py;h=836d1483a8480d08616df65323613c61d965fb59;hb=0a04293f23d9c3cc2a057c9130c71832d2375e06;hp=4e3c88e219284af62a62de64397d3c7bbfab4f3e;hpb=7be7ac9406512644886fbf4a99d16e1b4f7cefc3;p=open-adventure.git

diff --git a/make_dungeon.py b/make_dungeon.py
index 4e3c88e..836d148 100755
--- a/make_dungeon.py
+++ b/make_dungeon.py
@@ -141,7 +141,7 @@ typedef struct {{
 
 typedef struct {{
   const string_group_t words;
-  const long message;
+  const char* message;
 }} action_t;
 
 typedef struct {{
@@ -444,9 +444,7 @@ def get_objects(obj):
         immovable = attr.get("immovable", False)
         try:
             if type(locs) == str:
-                locs = [locnames.index(locs), -1 if immovable else 0]
-            else:
-                locs = [locnames.index(x) for x in locs]
+                locs = [locs, -1 if immovable else 0]
         except IndexError:
             sys.stderr.write("dungeon: unknown object location in %s\n" % locs)
             sys.exit(1)
@@ -763,7 +761,7 @@ if __name__ == "__main__":
         get_hints(db["hints"], db["arbitrary_messages"]),
         get_condbits(db["locations"]),
         get_motions(db["motions"]),
-        get_actions(db["actions"]),
+        get_specials(db["actions"]),
         get_specials(db["specials"]),
         bigdump(tkey),
         get_travel(travel),