Gain more roaches

[koperkapel.git] / koperkapel / scenes / base.py

diff --git a/koperkapel/scenes/base.py b/koperkapel/scenes/base.py
index 26ee7819007dd06b132525175cb9fd2c84627193..14998034ce7557a883bb14ee478f5c6e67bab647 100644 (file)
--- a/koperkapel/scenes/base.py
+++ b/koperkapel/scenes/base.py
@@ -20,6 +20,7 @@ class Engine:
         self._app = app
         self._scene = scene
         self._world = world
+        self._update_vehicle = False
 
     def _apply_events(self, events):
         if not events:
@@ -42,6 +43,9 @@ class Engine:
     def move_screen(self, offset):
         self._scene.move_screen(offset)
 
+    def add_roach(self):
+        self._world.add_new_roach()
+
     @apply_events
     def update(self, dt):
         return self._scene.update(self._world.proxy(), self, dt)
@@ -106,6 +110,11 @@ class MoveViewportEvent(Event):
 
     ENGINE_METHOD = "move_screen"
 
+class AddRoachEvent(Event):
+    """ Change to a new scene. """
+
+    ENGINE_METHOD = "add_roach"
+
 
 class Layer:
     """ A single layer of actors. """
@@ -165,7 +174,17 @@ class Actors:
     def draw(self, screen):
         for lvl, name in self._ordered_layers:
             for actor in self._layers[name]:
-                actor.draw()  # TODO: allow an option screen to be passed in
+                # actor.draw doesn't allow blitting to anything other than
+                # the game scene
+                screen.blit(actor._surf, actor.topleft)
+
+
+def defer_to_update(f):
+    """ Defers a function until the next update run. """
+    @functools.wraps(f)
+    def wrapper(self, *args, **kw):
+        self._deferred_updates.append((f, args, kw))
+    return wrapper
 
 
 class Scene:
@@ -174,6 +193,7 @@ class Scene:
     def __init__(self):
         self.actors = Actors()
         self.viewport = (0, 0)
+        self._deferred_updates = []
 
     def move_screen(self, offset):
         self.viewport = (self.viewport[0] + offset[0],
@@ -190,7 +210,9 @@ class Scene:
         pass
 
     def update(self, world, engine, dt):
-        pass
+        deferred_updates, self._deferred_updates = self._deferred_updates, []
+        for f, args, kw in deferred_updates:
+            f(self, world, *args, **kw)
 
     def draw(self, screen):
         screen.clear()