X-Git-Url: https://git.yukkurigames.com/?p=python-bulletml.git;a=blobdiff_plain;f=bulletml-runner;h=faaf9e01006fbbf47de14c2f549af7c4d5e628db;hp=62e9fdfe4e29918ffbb30c0bb744d119faa835dd;hb=a14b854db961815ff29962285bd4f632b98b98d9;hpb=957c866b2ee0e135016728c810fb8e802969a519

diff --git a/bulletml-runner b/bulletml-runner
index 62e9fdf..faaf9e0 100755
--- a/bulletml-runner
+++ b/bulletml-runner
@@ -7,6 +7,12 @@ import time
 import pygame
 
 import bulletml
+import bulletml.bulletyaml
+
+try:
+    import yaml
+except ImportError:
+    yaml = None
 
 try:
     import psyco
@@ -31,9 +37,8 @@ def main(argv):
     while True:
         filename = argv[file_idx % len(argv)]
         doc = bulletml.BulletML.FromDocument(open(filename, "rU"))
-        actions = [act([], 0.5) for act in doc.top]
-        source = bulletml.Bullet(
-            x=150, y=150, target=target, actions=actions, rank=0.5)
+        source = bulletml.Bullet.FromDocument(
+            doc, x=150, y=150, target=target, rank=0.5)
                                          
         active = set([source])
         source.vanished = True
@@ -66,7 +71,7 @@ def main(argv):
                     elif event.key == pygame.K_RETURN:
                         newfile = True
                     elif event.key == pygame.K_s:
-                        actions = [act([], 0.5) for act in doc.top]
+                        actions = [act([], 0.5) for act in doc.actions]
                         source = bulletml.Bullet(
                             x=150, y=150, target=target,
                             actions=actions, rank=0.5)