From: Ricardo Cruz <rick2@aeiou.pt>
Date: Sun, 29 Aug 2004 17:29:32 +0000 (+0000)
Subject: Ice fire destroys flame.
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=c894a4e4b44d0fd188c2ea5e4cbabba3754b4295;hp=1028ce017d6809007e39a8f7c034a0d62bfe3052;p=supertux.git

Ice fire destroys flame.

SVN-Revision: 1852
---

diff --git a/src/badguy.cpp b/src/badguy.cpp
index 5b762bb21..8d26afb6d 100644
--- a/src/badguy.cpp
+++ b/src/badguy.cpp
@@ -1211,9 +1211,9 @@ BadGuy::collision(void *p_c_object, int c_object, CollisionType type)
         }
       else if(pbullet_c->kind == ICE_BULLET)
         {
-        //if(kind == BAD_FLAME)
-        //  kill_me(10);
-        //else
+        if(kind == BAD_FLAME)
+          kill_me(10);
+        else
           frozen_timer.start(FROZEN_TIME);
         }
       break;