Code cleaning and enable wind for many badguys

* All badguys for which it makes sense can interact and be pushed by
wind
* Wind interaction logic put in seperate functions
* Fixed many member variable names in `src/object/rock.hpp` to conform
to the style guide

src/badguy/badguy.cpp

@@ -386,10 +386,7 @@ BadGuy::get_allowed_directions() const
 void
 BadGuy::active_update(float dt_sec)
 {
-  if (m_col.m_colliding_wind.empty()) {
-    m_wind_velocity = Vector(0.f, 0.f);
-    m_wind_acceleration = 0.0;
-  }
+  handle_wind();
 
   if (!is_grabbed())
   {
@@ -412,6 +409,22 @@ BadGuy::active_update(float dt_sec)
   }
 }
 
+void
+BadGuy::handle_wind()
+{
+  if (!m_col.m_colliding_wind.empty())
+  {
+    if (on_ground() && m_wind_velocity.y > 0.f)
+      m_wind_velocity.y = 0.f;
+
+    m_physic.set_velocity(m_physic.get_velocity() + m_wind_velocity);
+  }
+  else {
+    m_wind_velocity = Vector(0.f, 0.f);
+    m_wind_acceleration = 0.0;
+  }
+}
+
 void
 BadGuy::inactive_update(float )
 {

src/badguy/badguy.hpp

@@ -63,6 +63,10 @@ class BadGuy : public MovingSprite,
       state and calls active_update and inactive_update */
   virtual void update(float dt_sec) override;
 
+  /** Called each frame during active_update. Applies velocity from
+   *  wind if the badguy is inside wind and resets it if not. */
+  virtual void handle_wind();
+
   static std::string class_name() { return "badguy"; }
   virtual std::string get_class_name() const override { return class_name(); }
   virtual std::string get_exposed_class_name() const override { return "BadGuy"; }

src/badguy/fish_harmless.cpp

@@ -26,7 +26,12 @@ void
 FishHarmless::initialize()
 {
   FishSwimming::initialize();
-  set_colgroup_active(COLGROUP_MOVING_ONLY_STATIC);
+  set_colgroup_active(COLGROUP_MOVING);
+}
+
+HitResponse
+FishHarmless::collision_player(Player& player, const CollisionHit& hit) {
+  return HitResponse::ABORT_MOVE;
 }
 
 /* EOF */

src/badguy/fish_harmless.hpp

@@ -35,6 +35,7 @@ class FishHarmless final : public FishSwimming
 
 protected:
   virtual void initialize() override;
+  virtual HitResponse collision_player(Player& player, const CollisionHit& hit) override;
 
 private:
   FishHarmless(const FishHarmless&) = delete;

src/badguy/flyingsnowball.cpp

@@ -76,23 +76,24 @@ FlyingSnowBall::active_update(float dt_sec)
 
   float delta = total_time_elapsed * GLOBAL_SPEED_MULT;
 
-  // Put that function in a graphing calculator :
+  // Derivative of the following function (put it in a graphing calculator):
   // sin(x)^3 + sin(3(x - pi/3))/3
   float targetHgt = (
-                        std::pow(std::sin(delta), 3.f) +
-                        std::sin(3.f *
-                            ((delta - math::PI) / 3.f)
-                        ) / 3.f
-                    ) * 100.f;
+    std::cos(3.f * (delta - math::PI/3.f))
+    + std::pow(std::sin(delta), 2.f)
+    * std::cos(delta) * 3.f
+  );
 
-  m_physic.set_velocity_y(m_physic.get_velocity_y() + (targetHgt - prev_height) / dt_sec);
-  prev_height = targetHgt;
+  // Simple damping and then movement
+  m_physic.set_velocity_y(m_physic.get_velocity_y() * pow(0.5f, dt_sec));
+  m_physic.set_velocity_y(m_physic.get_velocity_y() + targetHgt);
 
   m_physic.set_velocity_x(m_physic.get_velocity_x() * pow(0.5f, dt_sec));
 
+  BadGuy::handle_wind();
+
   m_col.set_movement(m_physic.get_movement(dt_sec));
 
-  m_physic.set_velocity_y(0.f);
 
   auto player = get_nearest_player();
   if (player) {

src/badguy/mriceblock.cpp

@@ -138,13 +138,6 @@ MrIceBlock::active_update(float dt_sec)
     return;
   }
 
-  if (!m_col.m_colliding_wind.empty()) {
-    if (on_ground() && m_wind_velocity.y > 0.f)
-      m_wind_velocity.y = 0.f;
-
-    m_physic.set_velocity(m_physic.get_velocity() + m_wind_velocity);
-  }
-
   BadGuy::active_update(dt_sec);
 }
 

src/badguy/stalactite.cpp

@@ -74,6 +74,7 @@ Stalactite::active_update(float dt_sec)
       set_colgroup_active(COLGROUP_MOVING);
     }
   } else if (state == STALACTITE_FALLING) {
+    BadGuy::handle_wind();
     m_col.set_movement(m_physic.get_movement(dt_sec));
   }
 

src/badguy/walking_badguy.cpp

@@ -156,14 +156,6 @@ WalkingBadguy::active_update(float dt_sec, float dest_x_velocity, float modifier
     assert(false);
   }
 
-  if (!m_col.m_colliding_wind.empty()) {
-    if (on_ground() && m_wind_velocity.y > 0.f)
-      m_wind_velocity.y = 0.f;
-
-    m_physic.set_velocity(m_physic.get_velocity() + m_wind_velocity);
-  }
-
-
   if (max_drop_height > -1 && on_ground() && might_fall(max_drop_height+1) && !m_stay_on_platform_overridden)
     turn_around();
   m_stay_on_platform_overridden = false;