voxelcoreprojects/voxelcore
1
0
Fork 0
mirror of https://github.com/MihailRis/voxelcore.git synced 2026-10-04 18:41:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'main' into heightmaps

Browse source
This commit is contained in:
MihailRis 2024-10-03 19:12:37 +03:00
commit ea9ad08bfd
64 changed files with 3473 additions and 733 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/objects/Player.cpp
View file

@ -4,7 +4,7 @@
#include <glm/glm.hpp>
#include <utility>
#include "content/ContentLUT.hpp"
#include "content/ContentReport.hpp"
#include "items/Inventory.hpp"
#include "Entities.hpp"
#include "rigging.hpp"
@ -308,17 +308,17 @@ void Player::deserialize(const dv::value& src) {
}
}
void Player::convert(dv::value& data, const ContentLUT* lut) {
void Player::convert(dv::value& data, const ContentReport* report) {
if (data.has("players")) {
auto& players = data["players"];
for (uint i = 0; i < players.size(); i++) {
auto& playerData = players[i];
if (playerData.has("inventory")) {
Inventory::convert(playerData["inventory"], lut);
Inventory::convert(playerData["inventory"], report);
}
}
} else if (data.has("inventory")){
Inventory::convert(data["inventory"], lut);
Inventory::convert(data["inventory"], report);
}
}