Merge branch 'main' into entities

src/objects/Player.cpp

@@ -293,4 +293,4 @@ void Player::convert(dynamic::Map* data, const ContentLUT* lut) {
             Inventory::convert(inventory.get(), lut);
         }
     }
-}
+}

src/objects/Player.hpp

@@ -104,4 +104,4 @@ public:
     }
 };
 
-#endif // SRC_OBJECTS_PLAYER_HPP_
+#endif // SRC_OBJECTS_PLAYER_HPP_