From: mathnerd314 <mathnerd314@837edb03-e0f3-0310-88ca-d4d4e8b29345>
Date: Sat, 27 Feb 2010 12:57:54 +0000 (+0000)
Subject: Fix for Yeti killing you when he jumps. (probably won't affect other badguys)
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=37cda076754d587f78d18feb1ed664e9dbe1887e;p=supertux.git

Fix for Yeti killing you when he jumps. (probably won't affect other badguys)

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6415 837edb03-e0f3-0310-88ca-d4d4e8b29345
---

diff --git a/src/badguy/badguy.cpp b/src/badguy/badguy.cpp
index 9e5c545b9..0b51f7196 100644
--- a/src/badguy/badguy.cpp
+++ b/src/badguy/badguy.cpp
@@ -256,7 +256,7 @@ BadGuy::collision(GameObject& other, const CollisionHit& hit)
     // hit from above?
     if (player->get_bbox().p2.y < (bbox.p1.y + 16)) {
       if(collision_squished(*player)) {
-        return ABORT_MOVE;
+        return FORCE_MOVE;
       }
     }