X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Frocketexplosion.cpp;h=dcc612014dfcb71ff891eca5ade00a6832adf122;hb=0222881aae90660c925ea2733cd8c80be7ac837b;hp=c5f32aa96abedd021bb73712be14a06cea5ade06;hpb=07ddaed2a657e4d2a3d038fed223fc5827159caf;p=supertux.git diff --git a/src/badguy/rocketexplosion.cpp b/src/badguy/rocketexplosion.cpp index c5f32aa96..dcc612014 100644 --- a/src/badguy/rocketexplosion.cpp +++ b/src/badguy/rocketexplosion.cpp @@ -24,11 +24,8 @@ static const float EXPLOSIONTIME = 1; RocketExplosion::RocketExplosion(const Vector& pos, Direction dir) + : BadGuy(pos, "images/creatures/mr_rocket/explosion.sprite") { - start_position = pos; - bbox.set_pos(pos); - bbox.set_size(31.8, 31.8); - sprite = sprite_manager->create("images/creatures/mr_rocket/explosion.sprite"); this->dir = dir; countMe = false; explode(); @@ -52,7 +49,7 @@ RocketExplosion::collision_solid(GameObject& , const CollisionHit& hit) HitResponse RocketExplosion::collision_player(Player& player, const CollisionHit& ) { - player.kill(Player::SHRINK); + player.kill(false); return ABORT_MOVE; }