From f3a0d6144fbfc731f6437221c1bf57ee73bd4a48 Mon Sep 17 00:00:00 2001
From: Mathnerd314 <man.is.allan@gmail.com>
Date: Sat, 27 Feb 2010 12:57:54 +0000
Subject: [PATCH] Fix for Yeti killing you when he jumps. (probably won't
 affect other badguys)

SVN-Revision: 6415
---
 src/badguy/badguy.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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;
       }
     }
 
-- 
2.11.0