Merge pull request #3348 from MatusGuy/fix-player

Fix player hitbox bugs

Author: swagtoy

src/object/player.cpp

@@ -2328,6 +2328,14 @@ Player::collision_tile(uint32_t tile_attributes)
   }
 }
 
+void
+Player::update_hitbox()
+{
+  // Don't use the default MovingSprite hitbox behavior
+  // because this class already has logic for that.
+  // Refer to the adjust_height method.
+}
+
 void
 Player::collision_solid(const CollisionHit& hit)
 {

src/object/player.hpp

@@ -86,6 +86,7 @@ class Player final : public MovingSprite
   virtual void collision_solid(const CollisionHit& hit) override;
   virtual HitResponse collision(MovingObject& other, const CollisionHit& hit) override;
   virtual void collision_tile(uint32_t tile_attributes) override;
+  virtual void update_hitbox() override;
   virtual void on_flip(float height) override;
   virtual bool is_saveable() const override { return false; }
   virtual bool is_singleton() const override { return false; }