[Super-tux-commit] supertux/src badguy.cpp,1.66,1.67

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

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

Modified Files:
	badguy.cpp 
Log Message:
if a stalactite hits a Mr. Bomb, explode, instead of falling.
Do you agree with this behavior?

Index: badguy.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/badguy.cpp,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- badguy.cpp	6 May 2004 02:12:36 -0000	1.66
+++ badguy.cpp	8 May 2004 23:21:21 -0000	1.67
@@ -988,7 +988,16 @@
       /* Kill any badguys that get hit by stalactite */
       else if (kind == BAD_STALACTITE && dying == DYING_NOT)
       {
-        pbad_c->kill_me(50);
+        if (pbad_c->kind == BAD_MRBOMB)
+        {
+          // mrbomb transforms into a bomb now
+          World::current()->add_bad_guy(pbad_c->base.x, pbad_c->base.y,
+                                        BAD_BOMB);
+          pbad_c->remove_me();
+          return;
+        }
+        else
+          pbad_c->kill_me(50);
       }
 
       /* When enemies run into eachother, make them change directions */