X-Git-Url: https://git.yukkurigames.com/?p=python-bulletml.git;a=blobdiff_plain;f=bulletml%2Fimpl.py;h=dad560104ac190f58c792ea269b572d5cbca7b98;hp=d6753e3aafb78a3c778868fe1fecd72156138970;hb=175db2e60dd44cb95cd5e162ec134488439df26d;hpb=4aea8f4247626c42d3ca429f97aa1e23c3aa3f74

diff --git a/bulletml/impl.py b/bulletml/impl.py
index d6753e3..dad5601 100644
--- a/bulletml/impl.py
+++ b/bulletml/impl.py
@@ -4,7 +4,7 @@ from __future__ import division
 
 from math import atan2, sin, cos
 
-from bulletml import parser
+from bulletml.parser import ActionDef, ActionRef
 
 __all__ = ["Action", "Bullet"]
 
@@ -74,8 +74,6 @@ class Action(object):
 
     def step(self, owner, created):
         """Advance by one frame."""
-        s_params = self.params
-        rank = owner.rank
 
         if self.speed_frames > 0:
             self.speed_frames -= 1
@@ -101,6 +99,9 @@ class Action(object):
             self.wait_frames -= 1
             return
 
+        s_params = self.params
+        rank = owner.rank
+
         while True:
             self.pc += 1
 
@@ -119,9 +120,8 @@ class Action(object):
                     self.pc = 0
                     action = self.actions[self.pc]
 
-            if isinstance(action, (parser.ActionDef, parser.ActionRef)):
-                actions, params = action(s_params, rank)
-                child = self.__class__(self, actions, params, rank)
+            if isinstance(action, (ActionDef, ActionRef)):
+                child = self.Child(action, s_params, rank)
                 owner.replace(self, child)
                 child.step(owner, created)
                 break
@@ -249,9 +249,11 @@ class Bullet(object):
         for action in self.actions:
             action.step(self, created)
 
+        speed = self.speed
+        direction = self.direction
         self.px = self.x
         self.py = self.y
-        self.x += self.mx + sin(self.direction) * self.speed
-        self.y += -self.my + cos(self.direction) * self.speed
+        self.x += self.mx + sin(direction) * speed
+        self.y += -self.my + cos(direction) * speed
 
         return created