From 9bbcdebf3f4609e46374da312c36fe97c62b91f9 Mon Sep 17 00:00:00 2001
From: Ricardo Cruz <rick2@aeiou.pt>
Date: Sat, 17 Apr 2004 12:00:31 +0000
Subject: [PATCH] =?utf8?q?Applied=20patch=20from=20Ryan:=20=EF=BF=BD=20Thi?=
 =?utf8?q?s=20patch=20causes=20badguys=20to=20be=20killed=20when=20they=20?=
 =?utf8?q?run=20into=20an=20exploding=20bomb=20or=20get=20hit=20by=20stala?=
 =?utf8?q?ctite=20(as=20suggested=20by=20Ricardo).=20=EF=BF=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

SVN-Revision: 540
---
 src/badguy.cpp | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/src/badguy.cpp b/src/badguy.cpp
index 4c30fe616..2f7940530 100644
--- a/src/badguy.cpp
+++ b/src/badguy.cpp
@@ -973,6 +973,27 @@ BadGuy::collision(void *p_c_object, int c_object, CollisionType type)
           pbad_c->kill_me();
           kill_me();
         }
+
+      /* Kill badguys that run into exploding bomb */
+      else if (kind == BAD_BOMB && dying == DYING_NOT)
+      {
+        if (pbad_c->kind == BAD_MRBOMB)
+        {
+          // FIXME: this is where other MrBombs *should* explode istead of dying
+          pbad_c->kill_me(); 
+        }
+        else if (pbad_c->kind != BAD_BOMB)
+        {
+          pbad_c->kill_me();
+        }
+      }
+
+      /* Kill any badguys that get hit by stalactite */
+      else if (kind == BAD_STALACTITE && dying == DYING_NOT)
+      {
+        pbad_c->kill_me();
+      }
+      
       break;
     }
 }
-- 
2.11.0