Mercurial > skaapsteker

changeset 165:8d45715c587d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename ._game_state to game_state for consistency with engine and since everyone and their dog has access to it. :)
author Simon Cross <hodgestar@gmail.com>
date Wed, 06 Apr 2011 00:09:56 +0200
parents 6233c0b8bbad
children 0ad313ec564d
files skaapsteker/cutscene.py skaapsteker/engine.py skaapsteker/levelscene.py skaapsteker/menuscene.py
diffstat 4 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/skaapsteker/cutscene.py	Wed Apr 06 00:01:59 2011 +0200
+++ b/skaapsteker/cutscene.py	Wed Apr 06 00:09:56 2011 +0200
@@ -39,7 +39,7 @@
             if ev.key in(K_q, K_ESCAPE):
                 # Avoid circular import...
                 from .menuscene import MenuScene
-                ChangeScene.post(MenuScene(self._game_state))
+                ChangeScene.post(MenuScene(self.game_state))
         super(CutScene, self).dispatch(ev)
 
 
--- a/skaapsteker/engine.py	Wed Apr 06 00:01:59 2011 +0200
+++ b/skaapsteker/engine.py	Wed Apr 06 00:09:56 2011 +0200
@@ -49,7 +49,7 @@
 
     def __init__(self, game_state):
         self.widgets = []
-        self._game_state = game_state
+        self.game_state = game_state
 
     def post(self, ev):
         """Post an event to pygame's event loop."""
--- a/skaapsteker/levelscene.py	Wed Apr 06 00:01:59 2011 +0200
+++ b/skaapsteker/levelscene.py	Wed Apr 06 00:09:56 2011 +0200
@@ -30,7 +30,7 @@
             self._world.add(sprite)
         for sprite in self._level.tiles:
             self._world.add(sprite)
-        for sprite in self._game_state.levels.get(self._level.name, []):
+        for sprite in self.game_state.levels.get(self._level.name, []):
             self._world.add(sprite)
 
         self._world.add(self._player)
@@ -62,7 +62,7 @@
     def _quit(self):
         import menuscene # avoid circular import
         self.freeze()
-        engine.ChangeScene.post(menuscene.MenuScene(self._game_state, self))
+        engine.ChangeScene.post(menuscene.MenuScene(self.game_state, self))
 
     def freeze(self):
         """Freeze the scene, for serialization"""
--- a/skaapsteker/menuscene.py	Wed Apr 06 00:01:59 2011 +0200
+++ b/skaapsteker/menuscene.py	Wed Apr 06 00:09:56 2011 +0200
@@ -29,12 +29,12 @@
     def selected(self, option, data):
         "Callback from menu TextChoice"
         if data.startswith('level'):
-            ChangeScene.post(LevelScene(self._game_state, data))
+            ChangeScene.post(LevelScene(self.game_state, data))
         elif data == 'resume':
             self.cur_game.thaw()
             ChangeScene.post(self.cur_game)
         elif data == 'cutscene':
-            ChangeScene.post(opening_cutscene(self._game_state))
+            ChangeScene.post(opening_cutscene(self.game_state))
         elif data == 'quit':
             pygame.event.post(pygame.event.Event(QUIT))