rename ContentLUT to ContentReport

This commit is contained in:
MihailRis
2024-09-02 09:40:00 +03:00
parent c1ef4dbe9f
commit 3f826a88d3
13 changed files with 67 additions and 69 deletions
+4 -4
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"
@@ -329,19 +329,19 @@ void Player::deserialize(dynamic::Map* src) {
}
}
void Player::convert(dynamic::Map* data, const ContentLUT* lut) {
void Player::convert(dynamic::Map* data, const ContentReport* report) {
auto players = data->list("players");
if (players) {
for (uint i = 0; i < players->size(); i++) {
auto playerData = players->map(i);
if (auto inventory = playerData->map("inventory")) {
Inventory::convert(inventory.get(), lut);
Inventory::convert(inventory.get(), report);
}
}
} else {
if (auto inventory = data->map("inventory")) {
Inventory::convert(inventory.get(), lut);
Inventory::convert(inventory.get(), report);
}
}
}
+2 -2
View File
@@ -12,7 +12,7 @@
class Camera;
class Inventory;
class ContentLUT;
class ContentReport;
class Level;
struct Hitbox;
struct EngineSettings;
@@ -106,7 +106,7 @@ public:
std::unique_ptr<dynamic::Map> serialize() const override;
void deserialize(dynamic::Map* src) override;
static void convert(dynamic::Map* data, const ContentLUT* lut);
static void convert(dynamic::Map* data, const ContentReport* report);
inline int getId() const {
return objectUID;