Move keys to constants

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

diff --git a/naja/scenes/game.py b/naja/scenes/game.py
index 9d8b29046a5c8b7ee81f79b5702a5b994973519c..5b24347a4670c2ba572fb1cc66377d8689c38ed9 100644 (file)
--- a/naja/scenes/game.py
+++ b/naja/scenes/game.py
@@ -4,12 +4,14 @@ Gameboard scene.
 
 import pygame.locals as pgl
 
+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.widgets.robot import RobotWidget
 
 
 class GameScene(Scene):
@@ -19,13 +21,14 @@ class GameScene(Scene):
 
     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)))
+        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_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):
+        if ev.type == pgl.KEYUP and ev.key in KEYS.QUIT:
             SceneChangeEvent.post(MenuScene)
             return