Merge remote-tracking branch 'upstream/main'

src/objects/Player.h

@@ -49,7 +49,7 @@ public:
 
     glm::vec2 cam = {};
 
-    Player(glm::vec3 position, float speed);
+    Player(glm::vec3 position, float speed, std::shared_ptr<Inventory> inv);
     ~Player();
 
     void teleport(glm::vec3 position);
@@ -71,6 +71,10 @@ public:
     void deserialize(dynamic::Map *src) override;
 
     static void convert(dynamic::Map* data, const ContentLUT* lut);
+
+    inline int getId() const {
+        return 1;
+    }
 };
 
 #endif /* SRC_OBJECTS_PLAYER_H_ */