X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=naja%2Fscenes%2Fgame.py;h=32285cd4dedbb02f0538478b1cbda34e06d4cc0a;hb=5ef59d0391e208e0ef9d4fa998b3a8e653cc57bf;hp=e37b63efd4c5daf9af2c8464a27ea1656104afa7;hpb=0c2f24f460b34fc558eedbd448a4c35415cb60d6;p=naja.git diff --git a/naja/scenes/game.py b/naja/scenes/game.py index e37b63e..32285cd 100644 --- a/naja/scenes/game.py +++ b/naja/scenes/game.py @@ -4,16 +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 - class GameScene(Scene): """ @@ -22,12 +19,13 @@ 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))) + self.add(BoardWidget((0, 60))) + self.add(GameBitsWidget((0, 540))) + self.add(InfoAreaWidget((480, 0))) - 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(MenuScene) return