projects
/
naja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Note on how to generate sound files on broken Ubuntus.
[naja.git]
/
naja
/
scenes
/
game.py
diff --git
a/naja/scenes/game.py
b/naja/scenes/game.py
index cca363f797d18b2a4f2774b9f90d530eba0b3260..b50065febe42de6526d315cd7573aeadfbc89a5a 100644
(file)
--- a/
naja/scenes/game.py
+++ b/
naja/scenes/game.py
@@
-4,6
+4,7
@@
Gameboard scene.
import pygame.locals as pgl
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.events import SceneChangeEvent
from naja.scenes.scene import Scene
from naja.widgets.board import BoardWidget
@@
-11,6
+12,7
@@
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
from naja.widgets.game_bits import GameBitsWidget
from naja.widgets.info_area import InfoAreaWidget
from naja.widgets.robot import RobotWidget
+from naja.sound import sound
class GameScene(Scene):
class GameScene(Scene):
@@
-21,13
+23,15
@@
class GameScene(Scene):
def __init__(self, state):
super(GameScene, self).__init__(state)
self.add(PlayerBitsWidget((0, 0), state))
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(GameBitsWidget((0, 540), state))
- self.add(
InfoAreaWidget((480, 0), state)
)
+ self.add(
info
)
self.add(RobotWidget(state))
self.add(RobotWidget(state))
+ sound.play_sound('startup.ogg')
def handle_scene_event(self, ev):
from naja.scenes.menu import MenuScene
def handle_scene_event(self, ev):
from naja.scenes.menu import MenuScene
- if ev.type == pgl.KEY
UP and ev.key in (pgl.K_q, pgl.K_ESCAPE)
:
+ if ev.type == pgl.KEY
DOWN and ev.key in KEYS.QUIT
:
SceneChangeEvent.post(MenuScene)
return
SceneChangeEvent.post(MenuScene)
return