[Super-tux-commit] supertux/src gameloop.cpp,1.95,1.96

[Ricardo C. <rm...@us...>]

Update of /cvsroot/super-tux/supertux/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15873/src

Modified Files:
	gameloop.cpp 
Log Message:
Just fixed two small bugs in the gameplay during pause:
- don't show the menu, neither quit to level editor;
- when any event happen, the timer would continue (fixed).

Index: gameloop.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/gameloop.cpp,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -d -r1.95 -r1.96
--- gameloop.cpp	22 Apr 2004 20:14:33 -0000	1.95
+++ gameloop.cpp	23 Apr 2004 16:37:38 -0000	1.96
@@ -173,6 +173,9 @@
 void
 GameSession::on_escape_press()
 {
+  if(game_pause)
+    return;
+
   if(st_gl_mode == ST_GL_TEST)
     {
       exit_status = LEVEL_ABORT;
@@ -216,7 +219,8 @@
             {
               Player& tux = *world->get_tux();
   
-              st_pause_ticks_stop();
+              if(!game_pause)
+                st_pause_ticks_stop();
 
               switch(event.type)
                 {