Refactor: Extract collision logic to handle_collision_logic()

Avoids code duplication between Player::collision_solid and
Player::collision by introducing a new helper function,
handle_collision_logic().

Closes #3209

Author: Filipe2004

src/object/player.cpp

@@ -2307,7 +2307,7 @@ Player::collision_tile(uint32_t tile_attributes)
 }
 
 void
-Player::collision_solid(const CollisionHit& hit)
+Player::handle_collision_logic(const CollisionHit& hit)
 {
   if (hit.bottom) {
     if (m_physic.get_velocity_y() > 0)
@@ -2360,6 +2360,12 @@ Player::collision_solid(const CollisionHit& hit)
     m_boost = 0.f;
 }
 
+void
+Player::collision_solid(const CollisionHit& hit)
+{
+  handle_collision_logic(hit);
+}
+
 HitResponse
 Player::collision(MovingObject& other, const CollisionHit& hit)
 {
@@ -2392,31 +2398,8 @@ Player::collision(MovingObject& other, const CollisionHit& hit)
       return FORCE_MOVE;
     if (m_stone)
       return ABORT_MOVE;
-    if (badguy->is_frozen() && hit.bottom && badguy->get_physic().get_velocity_y() != 0) {
-      if (m_physic.get_velocity_y() > 0)
-        m_physic.set_velocity_y(0);
-
-      m_on_ground_flag = true;
-      m_floor_normal = hit.slope_normal;
-      m_is_slidejump_falling = false;
-      m_slidejumping = false;
-
-      // Butt Jump landed
-      if (m_does_buttjump) {
-        m_does_buttjump = false;
-        m_buttjump_stomp = true;
-        m_physic.set_velocity_y(-300);
-        m_on_ground_flag = false;
-        Sector::get().add<Particles>(
-          m_col.m_bbox.p2(),
-          50, 70, 260, 280, Vector(0, 300), 3,
-          Color(.4f, .4f, .4f), 3, .8f, LAYER_OBJECTS+1);
-        Sector::get().add<Particles>(
-          Vector(m_col.m_bbox.get_left(), m_col.m_bbox.get_bottom()),
-          -70, -50, 260, 280, Vector(0, 300), 3,
-          Color(.4f, .4f, .4f), 3, .8f, LAYER_OBJECTS+1);
-        Sector::get().get_camera().shake(.1f, 0.f, 10.f);
-      }
+    if (badguy->is_frozen() && badguy->get_physic().get_velocity_y() != 0) {
+      handle_collision_logic(hit);
     }
   }
 

src/object/player.hpp

@@ -493,6 +493,9 @@ class Player final : public MovingObject
    */
   void ungrab_object(GameObject* gameobject = nullptr);
 
+  /** Method for shared collision logic */
+  void handle_collision_logic(const CollisionHit& hit);
+
   void next_target();
   void prev_target();