[Super-tux-commit] supertux/src collision_grid.h,1.1,1.2 gameloop.cpp,1.208,1.209

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

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

Modified Files:
	collision_grid.h gameloop.cpp 
Log Message:
incorporated another patch from Ondra Hosek which fixes tux not getting killed on timeup, and adds sound to bomb again. Additionally fixed mrbomb not getting squishsound when jumped on and ticking bombs already killing enemies

Index: collision_grid.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/collision_grid.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- collision_grid.h	29 Nov 2004 16:03:31 -0000	1.1
+++ collision_grid.h	1 Dec 2004 15:58:38 -0000	1.2
@@ -6,6 +6,8 @@
 
 using namespace SuperTux;
 
+class CollisionGridIterator;
+
 /**
  * A rectangular grid to keep track of all moving game objects. It allows fast
  * queries for all objects in a rectangular area.

Index: gameloop.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/gameloop.cpp,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -d -r1.208 -r1.209
--- gameloop.cpp	29 Nov 2004 16:24:09 -0000	1.208
+++ gameloop.cpp	1 Dec 2004 15:58:38 -0000	1.209
@@ -765,12 +765,11 @@
     //frame_rate.update();
     
     /* Handle time: */
-    if (time_left.check() && currentsector->player->dying == DYING_NOT
-        && !end_sequence)
+    if (time_left.check() && !end_sequence)
       currentsector->player->kill(Player::KILL);
     
     /* Handle music: */
-    if(currentsector->player->invincible_timer.started() && !end_sequence)
+    if (currentsector->player->invincible_timer.started() && !end_sequence)
     {
       currentsector->play_music(HERRING_MUSIC);
     }
@@ -850,7 +849,7 @@
           LEFT_ALLIGN, LAYER_FOREGROUND1);
     }
 
-  if(time_left.check()) {
+  if(time_left.get_timeleft() < 0) {
     context.draw_text(white_text, _("TIME's UP"), Vector(screen->w/2, 0),
         CENTER_ALLIGN, LAYER_FOREGROUND1);
   } else if (time_left.get_timeleft() > TIME_WARNING