PulseStudio/VoxelEngine
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

'dynamic' namespace refactor (step 1/2)

Browse Source
This commit is contained in:
MihailRis
2024-05-07 16:00:52 +03:00
parent 80e7bcb203
commit d33edd4cd9
16 changed files with 248 additions and 392 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/items/Inventory.cpp
+4 -4
View File
@@ -50,7 +50,7 @@ void Inventory::move(
}
void Inventory::deserialize(dynamic::Map* src) {
id = src->getNum("id", 1);
id = src->get("id", 1);
auto slotsarr = src->list("slots");
size_t slotscount = slotsarr->size();
while (slots.size() < slotscount) {
@@ -58,8 +58,8 @@ void Inventory::deserialize(dynamic::Map* src) {
}
for (size_t i = 0; i < slotscount; i++) {
auto item = slotsarr->map(i);
itemid_t id = item->getInt("id", ITEM_EMPTY);
itemcount_t count = item->getInt("count", 0);
itemid_t id = item->get("id", ITEM_EMPTY);
itemcount_t count = item->get("count", 0);
auto& slot = slots[i];
slot.set(ItemStack(id, count));
}
@@ -88,7 +88,7 @@ void Inventory::convert(dynamic::Map* data, const ContentLUT* lut) {
auto slotsarr = data->list("slots");
for (size_t i = 0; i < slotsarr->size(); i++) {
auto item = slotsarr->map(i);
itemid_t id = item->getInt("id", ITEM_EMPTY);
itemid_t id = item->get("id", ITEM_EMPTY);
itemid_t replacement = lut->getItemId(id);
item->put("id", replacement);
if (replacement == 0 && item->has("count")) {