From: Ryan Flegel <rflegel@gmail.com>
Date: Thu, 12 Jun 2008 05:50:20 +0000 (+0000)
Subject: Kicked iceblocks kill badguys that fall on them ("squish" them)
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=820d02c7889290bd446fbaeee9b9bdf182223ec1;p=supertux.git

Kicked iceblocks kill badguys that fall on them ("squish" them)

SVN-Revision: 5564
---

diff --git a/src/badguy/mriceblock.cpp b/src/badguy/mriceblock.cpp
index d224537b4..0b9b9cefb 100644
--- a/src/badguy/mriceblock.cpp
+++ b/src/badguy/mriceblock.cpp
@@ -183,6 +183,15 @@ MrIceBlock::collision_squished(GameObject& object)
 {
   switch(ice_state) {
     case ICESTATE_KICKED:
+      {
+        BadGuy* badguy = dynamic_cast<BadGuy*>(&object);
+        if (badguy) {
+          badguy->kill_fall();
+          break;
+        }
+      }
+
+      // fall through
     case ICESTATE_NORMAL:
       {
         Player* player = dynamic_cast<Player*>(&object);