From: Ricardo Cruz <rick2@aeiou.pt>
Date: Sat, 8 May 2004 23:21:21 +0000 (+0000)
Subject: if a stalactite hits a Mr. Bomb, explode, instead of falling.
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=7741667c9b26a94353f9f4a1614cae8825c9cf4d;p=supertux.git

if a stalactite hits a Mr. Bomb, explode, instead of falling.
Do you agree with this behavior?

SVN-Revision: 1047
---

diff --git a/src/badguy.cpp b/src/badguy.cpp
index 5e331585b..f852730e1 100644
--- a/src/badguy.cpp
+++ b/src/badguy.cpp
@@ -988,7 +988,16 @@ BadGuy::collision(void *p_c_object, int c_object, CollisionType type)
       /* 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 */