super-tux-commit

[Matze B. <mat...@us...>]

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

Modified Files:
	gameloop.cpp 
Log Message:
fix timeup issues when endsequence triggered

Index: gameloop.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/gameloop.cpp,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -d -r1.118 -r1.119
--- gameloop.cpp	2 May 2004 15:51:12 -0000	1.118
+++ gameloop.cpp	3 May 2004 12:39:19 -0000	1.119
@@ -611,7 +611,8 @@
         }
 
       /* Handle time: */
-      if (!time_left.check() && world->get_tux()->dying == DYING_NOT)
+      if (!time_left.check() && world->get_tux()->dying == DYING_NOT
+              && !end_sequence)
         world->get_tux()->kill(Player::KILL);
 
       /* Handle music: */
@@ -671,12 +672,14 @@
       white_text->draw("Press ESC To Return",0,20,1);
     }
 
-  if(!time_left.check()) {
-    white_text->draw("TIME'S UP", 224, 0, 1);
-  } else if (time_left.get_left() > TIME_WARNING || (global_frame_counter % 10) < 5) {
-    sprintf(str, "%d", time_left.get_left() / 1000 );
-    white_text->draw("TIME", 224, 0, 1);
-    gold_text->draw(str, 304, 0, 1);
+  if(!end_sequence) {
+    if(!time_left.check()) {
+      white_text->draw("TIME'S UP", 224, 0, 1);
+    } else if (time_left.get_left() > TIME_WARNING || (global_frame_counter % 10) < 5) {
+      sprintf(str, "%d", time_left.get_left() / 1000 );
+      white_text->draw("TIME", 224, 0, 1);
+      gold_text->draw(str, 304, 0, 1);
+    }
   }
 
   sprintf(str, "%d", player_status.distros);