A menu that works (but doesn't show the selection)

[naja.git] / naja / scenes / game.py

diff --git a/naja/scenes/game.py b/naja/scenes/game.py
index b96120bd7690e307504895127c07d6423f588941..9d8b29046a5c8b7ee81f79b5702a5b994973519c 100644 (file)
--- a/naja/scenes/game.py
+++ b/naja/scenes/game.py
@@ -4,30 +4,28 @@ 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
-
 
 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.widgets.append(PlayerBitsWidget((0, 0)))
+        self.widgets.append(BoardWidget((0, 60)))
+        self.widgets.append(GameBitsWidget((0, 540)))
+        self.widgets.append(InfoAreaWidget((480, 0)))
 
     def handle_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