Fix for Yeti killing you when he jumps. (probably won't affect other badguys)
authorMathnerd314 <man.is.allan@gmail.com>
Sat, 27 Feb 2010 12:57:54 +0000 (12:57 +0000)
committerMathnerd314 <man.is.allan@gmail.com>
Sat, 27 Feb 2010 12:57:54 +0000 (12:57 +0000)
SVN-Revision: 6415

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