*possible* fix for bugs #453 and #373

[supertux.git] / src / badguy / badguy.cpp

diff --git a/src/badguy/badguy.cpp b/src/badguy/badguy.cpp
index 0e9347e..16e5331 100644 (file)
--- a/src/badguy/badguy.cpp
+++ b/src/badguy/badguy.cpp
@@ -211,7 +211,7 @@ BadGuy::collision(GameObject& other, const CollisionHit& hit)
     // hit from above?
     if (badguy->get_bbox().p2.y < (bbox.p1.y + 16)) {
       if(collision_squished(*badguy)) {
-       return ABORT_MOVE;
+        return ABORT_MOVE;
       }
     }
 
@@ -224,7 +224,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 ABORT_MOVE;
       }
     }
 
@@ -346,6 +346,7 @@ BadGuy::kill_fall()
   sound_manager->play("sounds/fall.wav", get_pos());
   if (countMe) Sector::current()->get_level()->stats.badguys++;
   physic.set_velocity_y(0);
+  physic.set_acceleration_y(0);
   physic.enable_gravity(true);
   set_state(STATE_FALLING);