KEYDOWN everywhere

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

diff --git a/naja/scenes/game.py b/naja/scenes/game.py
index d6d558c068668503591f9cb1c4ec481b895e684d..0d35b7b24a017b43a7492ed98c84f1a2fa4a5cda 100644 (file)
--- a/naja/scenes/game.py
+++ b/naja/scenes/game.py
@@ -4,15 +4,14 @@ Gameboard scene.
 
 import pygame.locals as pgl
 
-from .scene import Scene
-from .menu import MenuScene
-
+from naja.constants import KEYS
+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 +19,16 @@ class GameScene(Scene):
     Gameboard scene.
     """
 
-    def __init__(self):
-        super(GameScene, self).__init__()
-        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):
-        if ev.type == pgl.KEYUP and ev.key in (pgl.K_q, pgl.K_ESCAPE):
+    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), state))
+        self.add(RobotWidget(state))
+
+    def handle_scene_event(self, ev):
+        from naja.scenes.menu import MenuScene
+        if ev.type == pgl.KEYDOWN and ev.key in KEYS.QUIT:
             SceneChangeEvent.post(MenuScene)
             return