Ice fire destroys flame.

SVN-Revision: 1852

diff --git a/src/badguy.cpp b/src/badguy.cpp
index 5b762bb..8d26afb 100644 (file)
--- 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;