[Pingus-CVS] r3229 - in trunk/pingus: . src/gui

[jsalmon3]

Author: jsalmon3
Date: 2007-09-22 06:52:19 +0200 (Sat, 22 Sep 2007)
New Revision: 3229

Modified:
   trunk/pingus/TODO
   trunk/pingus/src/gui/screen_manager.cpp
Log:
pop_screen can be called more than once when pressing escape repeatedly

Modified: trunk/pingus/TODO
===================================================================
--- trunk/pingus/TODO   2007-09-22 04:38:03 UTC (rev 3228)
+++ trunk/pingus/TODO   2007-09-22 04:52:19 UTC (rev 3229)
@@ -95,12 +95,6 @@
 
 - "core/misc/404sprite" should be returned for missing graphics
 
-- main menu crashes when you click a little wildely:
-
-  decide whether to ignore cached_action != CA_NONE in
-  ScreenManager::pop_screen. This causes the game to crash if [ESC] is
-  quickly pressed repeatedly
-
 - disable fade-over when fast-mode is active
 
 - rewrite Config file support, make game automatically write a default
@@ -113,7 +107,7 @@
 
 - bridging gets more complicated has graphical error (background?!)
   surface background doesn't handle larger res due to the Playfield
-  being offsetted (might be solveable with new DrawingContext that
+  being offsetted (might be solvable with new DrawingContext that
   features Rect)
 
 - rework command line parsing so that it actually works properly and
@@ -154,8 +148,6 @@
 
 - action-axis doesn't handle analog (do we even need this or could we do with 
axis-button?)
 
-- fix memory leaks in input/ (Controller doesn't clean up)
-
 - remove SceneContext from Credits, replace with DrawingContext
 
 - sv.po, Swedish is incomplete, lacks level and story text

Modified: trunk/pingus/src/gui/screen_manager.cpp
===================================================================
--- trunk/pingus/src/gui/screen_manager.cpp     2007-09-22 04:38:03 UTC (rev 
3228)
+++ trunk/pingus/src/gui/screen_manager.cpp     2007-09-22 04:52:19 UTC (rev 
3229)
@@ -180,7 +180,7 @@
 void
 ScreenManager::pop_screen ()
 {
-  assert (cached_action == CA_NONE);
+  assert (cached_action == CA_NONE || cached_action == CA_POP);
   cached_action = CA_POP;
 }