X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=naja%2Fscenes%2Fgame.py;h=1f95a77402c53333d9a82489d084022d103b09fb;hb=64d53645b30194f114f411364e38d6d3d396f6a9;hp=b96120bd7690e307504895127c07d6423f588941;hpb=0f233e6d450d863f06f5acddee3bd94f53594d08;p=naja.git

diff --git a/naja/scenes/game.py b/naja/scenes/game.py
index b96120b..1f95a77 100644
--- a/naja/scenes/game.py
+++ b/naja/scenes/game.py
@@ -4,15 +4,13 @@ Gameboard scene.
 
 import pygame.locals as pgl
 
-from .scene import Scene
-from .menu import MenuScene
-
+from naja.events import SceneChangeEvent
+from naja.scenes.scene import Scene
 from naja.widgets.board import BoardWidget
 from naja.widgets.player_bits import PlayerBitsWidget
 from naja.widgets.game_bits import GameBitsWidget
 from naja.widgets.info_area import InfoAreaWidget
-
-from naja.events import SceneChangeEvent
+from naja.widgets.robot import RobotWidget
 
 
 class GameScene(Scene):
@@ -20,14 +18,16 @@ class GameScene(Scene):
     Gameboard scene.
     """
 
-    def __init__(self):
-        super(GameScene, self).__init__()
-        self.widgets.append(PlayerBitsWidget())
-        self.widgets.append(BoardWidget())
-        self.widgets.append(GameBitsWidget())
-        self.widgets.append(InfoAreaWidget())
+    def __init__(self, state):
+        super(GameScene, self).__init__(state)
+        self.add(PlayerBitsWidget((0, 0), state))
+        self.add(BoardWidget((0, 60), state))
+        self.add(GameBitsWidget((0, 540), state))
+        self.add(InfoAreaWidget((480, 0)))
+        self.add(RobotWidget(state))
 
-    def handle_event(self, ev):
+    def handle_scene_event(self, ev):
+        from naja.scenes.menu import MenuScene
         if ev.type == pgl.KEYUP and ev.key in (pgl.K_q, pgl.K_ESCAPE):
-            SceneChangeEvent.post(scene=MenuScene())
+            SceneChangeEvent.post(MenuScene)
             return