super-tux-commit

[Ricardo C. <rm...@us...>]

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

Modified Files:
	badguy.cpp 
Log Message:
Ice fire destroys flame.

Index: badguy.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/badguy.cpp,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -d -r1.114 -r1.115
--- badguy.cpp	14 Aug 2004 11:50:58 -0000	1.114
+++ badguy.cpp	29 Aug 2004 17:29:32 -0000	1.115
@@ -1211,9 +1211,9 @@
         }
       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;