ActionDef: Append based on parsing the subelement, not the element.

[python-bulletml.git] / bulletml / parser.py

diff --git a/bulletml/parser.py b/bulletml/parser.py
index 0af6694..187fa86 100644 (file)
--- a/bulletml/parser.py
+++ b/bulletml/parser.py
@@ -181,10 +181,8 @@ class Accel(object):
 
     def __call__(self, params, rank):
         frames = self.term(params, rank)
-        horizontal = self.horizontal and (
-            self.horizontal(params, rank), self.horizontal.type)
-        vertical = self.vertical and (
-            self.vertical(params, rank), self.vertical.type)
+        horizontal = self.horizontal and self.horizontal(params, rank)
+        vertical = self.vertical and self.vertical(params, rank)
         return frames, horizontal, vertical
 
     def __repr__(self):
@@ -207,9 +205,9 @@ class BulletDef(object):
             elif tag == "speed":
                 self.speed = Speed(doc, subelem)
             elif tag == "action":
-                self.actions.append(ActionDef(doc, element))
+                self.actions.append(ActionDef(doc, subelem))
             elif tag == "actionRef":
-                self.actions.append(ActionRef(doc, element))
+                self.actions.append(ActionRef(doc, subelem))
 
     def __call__(self, params, rank):
         actions = []
@@ -296,7 +294,7 @@ class FireDef(object):
         for subelem in element.getchildren():
             tag = realtag(subelem)
             if tag == "direction":
-                self.direction = Direction(doc, subelem)
+                self.direction = Direction(doc, subelem, "aim")
             elif tag == "speed":
                 self.speed = Speed(doc, subelem)
             elif tag == "bullet":