Fix for Yeti killing you when he jumps. (probably won't affect other badguys)
authormathnerd314 <mathnerd314@837edb03-e0f3-0310-88ca-d4d4e8b29345>
Sat, 27 Feb 2010 12:57:54 +0000 (12:57 +0000)
committermathnerd314 <mathnerd314@837edb03-e0f3-0310-88ca-d4d4e8b29345>
Sat, 27 Feb 2010 12:57:54 +0000 (12:57 +0000)
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6415 837edb03-e0f3-0310-88ca-d4d4e8b29345

src/badguy/badguy.cpp

index 9e5c545..0b51f71 100644 (file)
@@ -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;
       }
     }