evert/osb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PlayerInventory: fix bag loading issue

Browse Source
This commit is contained in:
Kae 2024-10-04 13:44:07 +10:00
parent 25f3edbae3
commit 03b7e3a22b
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source/game/StarPlayerInventory.cpp
View File

@ -781,19 +781,14 @@ void PlayerInventory::load(Json const& store) {
//reuse ItemBags so the Inventory pane still works after load()'ing into the same PlayerInventory again (from swap) //reuse ItemBags so the Inventory pane still works after load()'ing into the same PlayerInventory again (from swap)
auto itemBags = store.get("itemBags").toObject(); auto itemBags = store.get("itemBags").toObject();
eraseWhere(m_bags, [&](auto const& p) { return !itemBags.contains(p.first); });
m_inventoryLoadOverflow.clear(); m_inventoryLoadOverflow.clear();
for (auto const& p : itemBags) { for (auto const& p : itemBags) {
auto& bagType = p.first; auto& bagType = p.first;
auto newBag = ItemBag::loadStore(p.second); auto newBag = ItemBag::loadStore(p.second);
if (m_bags.contains(bagType)) { if (m_bags.contains(bagType)) {
auto& bag = m_bags[bagType]; auto& bag = m_bags.at(bagType);
auto size = bag->size(); m_inventoryLoadOverflow.appendAll(newBag.resize(bag->size()));
if (bag) *bag = std::move(newBag);
*bag = std::move(newBag);
else
bag = make_shared<ItemBag>(std::move(newBag));
m_inventoryLoadOverflow.appendAll(bag->resize(size));
} else { } else {
m_inventoryLoadOverflow.appendAll(newBag.items()); m_inventoryLoadOverflow.appendAll(newBag.items());
} }