Stop looping sounds for all offscreen badguys

SuperTux · Aug 14, 2023 · a03ed1c · a03ed1c
1 parent eee7c16
commit a03ed1c
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 9 deletions.
diff --git a/src/badguy/badguy.cpp b/src/badguy/badguy.cpp
@@ -666,13 +666,15 @@ BadGuy::set_state(State state_)
       break;
     case STATE_ACTIVE:
       set_group(m_colgroup_active);
+      play_looping_sounds();
       //bbox.set_pos(start_position);
       break;
     case STATE_INACTIVE:
       // Was the badguy dead anyway?
       if (laststate == STATE_SQUISHED || laststate == STATE_FALLING) {
         remove_me();
       }
+      stop_looping_sounds();
       set_group(COLGROUP_DISABLED);
       break;
     case STATE_FALLING:

diff --git a/src/badguy/haywire.cpp b/src/badguy/haywire.cpp
@@ -226,14 +226,6 @@ Haywire::active_update(float dt_sec)
   }
 }
 
-void
-Haywire::deactivate()
-{
-  // Stop ticking/grunting sounds, in case we are deactivated before actually
-  // exploding (see https://github.com/SuperTux/supertux/issues/1260).
-  stop_looping_sounds();
-}
-
 void
 Haywire::draw(DrawingContext& context)
 {

diff --git a/src/badguy/haywire.hpp b/src/badguy/haywire.hpp
@@ -31,7 +31,6 @@ class Haywire final : public WalkingBadguy
   virtual void ignite() override;
 
   virtual void active_update(float dt_sec) override;
-  virtual void deactivate() override;
   virtual void draw(DrawingContext& context) override;
 
   virtual bool is_freezable() const override;