X-Git-Url: https://git.yukkurigames.com/?p=python-bulletml.git;a=blobdiff_plain;f=bulletml%2Fparser.py;h=529876b449af43932677d2c3bf5980ce3bef446b;hp=0af66943893632fedcd3f5dac68a7defc216cb75;hb=97141cbfbbae18076db7a1185ea46f23c412b620;hpb=9104092535823794c1b00f3c0fb16f5181992a00

diff --git a/bulletml/parser.py b/bulletml/parser.py
index 0af6694..529876b 100644
--- 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):
@@ -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":