X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fbadguy.cpp;h=16e5331e541816ab955098de35f60bb39cd7e442;hb=2d1bc69993923150eb701d3cacb917ab4e23d5ef;hp=0e9347e789140dab4f2884ccc47942294fd4293a;hpb=af906b173f5e7118644397ce35145e6b88f40be8;p=supertux.git diff --git a/src/badguy/badguy.cpp b/src/badguy/badguy.cpp index 0e9347e78..16e5331e5 100644 --- 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);