X-Git-Url: https://git.yukkurigames.com/?p=python-bulletml.git;a=blobdiff_plain;f=bulletml-runner;fp=bulletml-runner;h=7c262b02ba3d0ce9bf01e9d4bea0be7507a67213;hp=25fa50b595f0590921d6b0db8d43ac5c0d9be143;hb=7b73a60799150ec3df407a8a1620a613aad5f59c;hpb=e360de79a855c7c2a1dc80ae940aad00962175ad

diff --git a/bulletml-runner b/bulletml-runner
index 25fa50b..7c262b0 100755
--- a/bulletml-runner
+++ b/bulletml-runner
@@ -8,7 +8,7 @@ import pygame
 
 import bulletml
 import bulletml.bulletyaml
-from bulletml.collision import collides
+from bulletml.collision import collides_all
 
 try:
     import yaml
@@ -16,7 +16,7 @@ except ImportError:
     yaml = None
 
 try:
-    import psyco
+    import psycox
 except ImportError:
     pass
 else:
@@ -94,7 +94,8 @@ def main(argv):
                         or not (-50 < obj.x < 350)
                         or not (-50 < obj.y < 350)):
                         active.remove(obj)
-                    collides(obj, lactive[0])
+                if lactive:
+                    collides_all(lactive[0], lactive)
                 elapsed = time.time() - start
 
                 frames += 1