From: Christoph Sommer <mail@christoph-sommer.de>
Date: Wed, 16 Aug 2006 23:25:39 +0000 (+0000)
Subject: Fixed squished Skullyhops looking healthy again after hitting the floor
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=77d1f9df76daf2e6eefba86d7232c2bfdefe6245;p=supertux.git

Fixed squished Skullyhops looking healthy again after hitting the floor

SVN-Revision: 4192
---

diff --git a/src/badguy/skullyhop.cpp b/src/badguy/skullyhop.cpp
index a1fab8462..8d2dbca60 100644
--- a/src/badguy/skullyhop.cpp
+++ b/src/badguy/skullyhop.cpp
@@ -94,6 +94,11 @@ SkullyHop::collision_squished(Player& player)
 void
 SkullyHop::collision_solid(const CollisionHit& hit)
 {
+  // just default behaviour (i.e. stop at floor/walls) when squished
+  if (BadGuy::get_state() == STATE_SQUISHED) {
+    BadGuy::collision_solid(hit);
+  }
+
   // ignore collisions while standing still
   if(state != JUMPING)
     return;