Fix bouncing snowball and captain snowball collision solid when inactive

Author: Brockengespenst

src/badguy/bouncing_snowball.cpp

@@ -131,15 +131,16 @@ BouncingSnowball::collision_squished(MovingObject& object)
 void
 BouncingSnowball::collision_solid(const CollisionHit& hit)
 {
-  if (m_sprite->get_action() == "squished")
-    return;
-
-  if (m_frozen)
+  if (m_frozen || !is_active())
   {
     BadGuy::collision_solid(hit);
     return;
   }
 
+  if (m_sprite->get_action() == "squished")
+    return;
+
+
   if (hit.bottom) {
     if (get_state() == STATE_ACTIVE) {
       float bounce_speed = -m_physic.get_velocity_y()*0.8f;

src/badguy/captainsnowball.cpp

@@ -87,7 +87,10 @@ CaptainSnowball::collision_solid(const CollisionHit& hit)
     walk_speed = CAPTAIN_WALK_SPEED;
     m_physic.set_velocity_x(m_dir == Direction::LEFT ? -walk_speed : walk_speed);
   }
-  WalkingBadguy::collision_solid(hit);
+  if (!is_active())
+    BadGuy::collision_solid(hit);
+  else
+    WalkingBadguy::collision_solid(hit);
 }
 
 bool