Merge branch 'master' into No_movement_mode

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

diff --git a/naja/scenes/game.py b/naja/scenes/game.py
index cca363f797d18b2a4f2774b9f90d530eba0b3260..c0f52a8be47b9eff08aa4568da6102ddf123207e 100644 (file)
--- a/naja/scenes/game.py
+++ b/naja/scenes/game.py
@@ -4,6 +4,7 @@ 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
@@ -21,13 +22,14 @@ class GameScene(Scene):
     def __init__(self, state):
         super(GameScene, self).__init__(state)
         self.add(PlayerBitsWidget((0, 0), state))
-        self.add(BoardWidget((0, 60), state))
+        info = InfoAreaWidget((480, 0), state)
+        self.add(BoardWidget((0, 60), state, info))
         self.add(GameBitsWidget((0, 540), state))
-        self.add(InfoAreaWidget((480, 0), state))
+        self.add(info)
         self.add(RobotWidget(state))
 
     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.KEYDOWN and ev.key in KEYS.QUIT:
             SceneChangeEvent.post(MenuScene)
             return