From: Ricardo Cruz <rick2@aeiou.pt>
Date: Thu, 29 Apr 2004 23:23:20 +0000 (+0000)
Subject: In the invincible mode, don't bump/squish enemies, just kill them!
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=71a096adb412a9695efdd55c049030754919a4db;p=supertux.git

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 1c1875686..f087b8019 100644
--- 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);
             }