X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fbomb.cpp;h=9495abc92a33913cf2f47a6997641ce3ef7ef364;hb=7bbb0ef907ebec48718560425a0147b31307f7fd;hp=c7445a2783dd7d5ff689a9c8fbca6cab556ec913;hpb=3510a03c0e807c7a0ddde3cdf07ba91bda9393c4;p=supertux.git diff --git a/src/badguy/bomb.cpp b/src/badguy/bomb.cpp index c7445a278..9495abc92 100644 --- a/src/badguy/bomb.cpp +++ b/src/badguy/bomb.cpp @@ -44,7 +44,8 @@ Bomb::collision_player(Player& player, const CollisionHit& ) HitResponse Bomb::collision_badguy(BadGuy& badguy, const CollisionHit& ) { - badguy.kill_fall(); + if(state == 1) + badguy.kill_fall(); return ABORT_MOVE; } @@ -56,6 +57,8 @@ Bomb::active_action(float ) if(timer.check()) { state = 1; sprite->set_action("explosion"); + SoundManager::get()->play_sound(IDToSound(SND_EXPLODE), get_pos(), + Sector::current()->player->get_pos()); timer.start(EXPLOSIONTIME); } break; @@ -71,3 +74,4 @@ void Bomb::kill_fall() { } +