Mercurial > skaapsteker

changeset 170:aa154c4086cb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Replace scene .freeze and .thaw methods with .enter and .leave.
author Simon Cross <hodgestar@gmail.com>
date Wed, 06 Apr 2011 00:49:16 +0200
parents b7a8f4a677e1
children 13e10b877f6c
files skaapsteker/levelscene.py skaapsteker/menuscene.py
diffstat 2 files changed, 2 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/skaapsteker/levelscene.py	Wed Apr 06 00:41:19 2011 +0200
+++ b/skaapsteker/levelscene.py	Wed Apr 06 00:49:16 2011 +0200
@@ -23,7 +23,6 @@
         self._level_surface = self._level.get_surface()
         self._clip_rect = None
         self._world = physics.World()
-        self.frozen = False
 
         # hackity, hack, hack
         for sprite in self._level.enemies:
@@ -60,18 +59,15 @@
 
     def _quit(self):
         import menuscene # avoid circular import
-        self.freeze()
         engine.ChangeScene.post(menuscene.MenuScene(self.game_state, self))
 
-    def freeze(self):
+    def leave(self):
         """Freeze the scene, for serialization"""
-        self.frozen = True
         self._world.freeze()
 
-    def thaw(self):
+    def enter(self):
         """Unfreeze"""
         self._world.thaw()
-        self.frozen = False
 
     def draw(self, screen_surface, engine):
         if self._clip_rect is None:
--- a/skaapsteker/menuscene.py	Wed Apr 06 00:41:19 2011 +0200
+++ b/skaapsteker/menuscene.py	Wed Apr 06 00:49:16 2011 +0200
@@ -31,7 +31,6 @@
         if data.startswith('level'):
             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))