From e2dd0a205bd07716ce8cfa0625fe6a5f20d8917a Mon Sep 17 00:00:00 2001 From: Tobias Markus Date: Fri, 23 Aug 2013 16:18:38 +0200 Subject: [PATCH] Checking if badguy is active before double-killing in a few more places --- src/badguy/badguy.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/badguy/badguy.cpp b/src/badguy/badguy.cpp index 8cbec1db3..0cca9f588 100644 --- a/src/badguy/badguy.cpp +++ b/src/badguy/badguy.cpp @@ -359,6 +359,8 @@ BadGuy::collision_bullet(Bullet& bullet, const CollisionHit& hit) void BadGuy::kill_squished(GameObject& object) { + if (!is_active()) return; + sound_manager->play("sounds/squish.wav", get_pos()); physic.enable_gravity(true); physic.set_velocity_x(0); @@ -377,6 +379,8 @@ BadGuy::kill_squished(GameObject& object) void BadGuy::kill_fall() { + if (!is_active()) return; + sound_manager->play("sounds/fall.wav", get_pos()); physic.set_velocity_y(0); physic.set_acceleration_y(0); -- 2.11.0