In the invincible mode, don't bump/squish enemies, just kill them!

SVN-Revision: 855

diff --git a/src/world.cpp b/src/world.cpp
index 1c18756..f087b80 100644 (file)
--- a/src/world.cpp
+++ b/src/world.cpp
@@ -374,7 +374,8 @@ World::collision_handler()
           // functions of the collided objects.
           if (tux.previous_base.y < tux.base.y &&
               tux.previous_base.y + tux.previous_base.height 
-              < (*i)->base.y + (*i)->base.height/2)
+              < (*i)->base.y + (*i)->base.height/2
+              && !tux.invincible_timer.started())
             {
               (*i)->collision(&tux, CO_PLAYER, COLLISION_SQUISH);
             }