X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fmrbomb.cpp;h=dcd71987dab6c8a64da6e45b1eabdbc551cec044;hb=298fcc1a717a1053f5bfdba796ecc597df4df5c4;hp=0526c95144ff2876eb89ee2b5d4d0d91602d5b4c;hpb=89ecbfcacb9abac599f8feba52792392b8199cf1;p=supertux.git diff --git a/src/badguy/mrbomb.cpp b/src/badguy/mrbomb.cpp index 0526c9514..dcd71987d 100644 --- a/src/badguy/mrbomb.cpp +++ b/src/badguy/mrbomb.cpp @@ -27,7 +27,7 @@ MrBomb::MrBomb(const lisp::Lisp& reader) : WalkingBadguy(reader, "images/creatures/mr_bomb/mr_bomb.sprite", "left", "right") { walk_speed = 80; - max_drop_height = 0; + max_drop_height = 16; grabbed = false; //Check if we need another sprite @@ -47,7 +47,7 @@ MrBomb::MrBomb(const Vector& pos, Direction d) : WalkingBadguy(pos, d, "images/creatures/mr_bomb/mr_bomb.sprite", "left", "right") { walk_speed = 80; - max_drop_height = 0; + max_drop_height = 16; grabbed = false; } @@ -76,11 +76,11 @@ MrBomb::collision_player(Player& player, const CollisionHit& hit) } bool -MrBomb::collision_squished(Player& player) +MrBomb::collision_squished(GameObject& object) { remove_me(); Sector::current()->add_object(new Bomb(get_pos(), dir, sprite_name )); - kill_squished(player); + kill_squished(object); return true; }