voxelcoreprojects/voxelcore
1
0
Fork 0
mirror of https://github.com/MihailRis/voxelcore.git synced 2026-10-06 11:31:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merge remote-tracking branch 'upstream/main'

Browse source
This commit is contained in:
DanielProl1xy 2024-02-19 10:23:29 +03:00
commit 0e38698dae
154 changed files with 6818 additions and 2760 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/objects/Player.h
View file

@ -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_ */