X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=newdungeon.py;h=b27e5c71db6293ff9aa99b3de2bec10130135513;hb=2aa5f1dd6114eb021535eff7e4891874efe82095;hp=ff48caef108a9a06af49d587b0ec3bd805320a24;hpb=4d212476431be635c2b757816c20f6fe8936f334;p=open-adventure.git

diff --git a/newdungeon.py b/newdungeon.py
index ff48cae..b27e5c7 100755
--- a/newdungeon.py
+++ b/newdungeon.py
@@ -105,8 +105,8 @@ extern const turn_threshold_t turn_thresholds[];
 extern const obituary_t obituaries[];
 extern const hint_t hints[];
 extern long conditions[];
-extern const long actspk[];
 extern const motion_t motions[];
+extern const action_t actions[];
 
 #define NLOCATIONS	{}
 #define NOBJECTS	{}
@@ -180,11 +180,6 @@ long conditions[] = {{
 {}
 }};
 
-const long actspk[] = {{
-    NO_MESSAGE,
-{}
-}};
-
 const motion_t motions[] = {{
 {}
 }};
@@ -411,12 +406,6 @@ def recompose(type_word, value):
         sys.stderr.write("%s is not a known word classifier\n" % attrs["type"])
         sys.exit(1)
 
-def get_actspk(actspk):
-    res = ""
-    for (i, word) in actspk.items():
-        res += "    %s,\n" % word
-    return res
-
 def buildtravel(locs, objs, voc):
     ltravel = []
     lkeys = []
@@ -542,7 +531,6 @@ if __name__ == "__main__":
         get_obituaries(db["obituaries"]),
         get_hints(db["hints"], db["arbitrary_messages"]),
         get_condbits(db["locations"]),
-        get_actspk(db["actspk"]),
         get_motions(db["motions"]),
         get_actions(db["actions"]),
     )
@@ -554,7 +542,7 @@ if __name__ == "__main__":
         len(db["classes"])-1,
         len(db["obituaries"]),
         len(db["turn_thresholds"]),
-        len(db["actspk"]),
+        len(db["actions"]),
         len(travel),
         get_refs(db["arbitrary_messages"]),
         get_refs(db["locations"]),