diff options
Diffstat (limited to 'source/game/StarPlayerInventory.cpp')
-rw-r--r-- | source/game/StarPlayerInventory.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/game/StarPlayerInventory.cpp b/source/game/StarPlayerInventory.cpp index 7c4ca3e..d7ba6a1 100644 --- a/source/game/StarPlayerInventory.cpp +++ b/source/game/StarPlayerInventory.cpp @@ -215,7 +215,7 @@ ItemPtr PlayerInventory::addItems(ItemPtr items) { m_equipment[EquipmentSlot::Back] = items->take(1); // Then, finally the bags - return addToBags(move(items)); + return addToBags(std::move(items)); } ItemPtr PlayerInventory::addToBags(ItemPtr items) { @@ -776,9 +776,9 @@ void PlayerInventory::load(Json const& store) { auto newBag = ItemBag::loadStore(p.second); auto& bagPtr = m_bags[bagType]; if (bagPtr) - *bagPtr = move(newBag); + *bagPtr = std::move(newBag); else - bagPtr = make_shared<ItemBag>(move(newBag)); + bagPtr = make_shared<ItemBag>(std::move(newBag)); } m_swapSlot = itemDatabase->diskLoad(store.get("swapSlot")); @@ -838,7 +838,7 @@ Json PlayerInventory::store() const { {"trashSlot", itemDatabase->diskStore(m_trashSlot)}, {"currencies", jsonFromMap(m_currencies)}, {"customBarGroup", m_customBarGroup}, - {"customBar", move(customBar)}, + {"customBar", std::move(customBar)}, {"selectedActionBar", jsonFromSelectedActionBarLocation(m_selectedActionBar)}, {"beamAxe", itemDatabase->diskStore(m_essential.value(EssentialItem::BeamAxe))}, {"wireTool", itemDatabase->diskStore(m_essential.value(EssentialItem::WireTool))}, @@ -848,7 +848,7 @@ Json PlayerInventory::store() const { } void PlayerInventory::forEveryItem(function<void(InventorySlot const&, ItemPtr&)> function) { - auto checkedFunction = [function = move(function)](InventorySlot const& slot, ItemPtr& item) { + auto checkedFunction = [function = std::move(function)](InventorySlot const& slot, ItemPtr& item) { if (item) function(slot, item); }; @@ -864,7 +864,7 @@ void PlayerInventory::forEveryItem(function<void(InventorySlot const&, ItemPtr&) } void PlayerInventory::forEveryItem(function<void(InventorySlot const&, ItemPtr const&)> function) const { - return const_cast<PlayerInventory*>(this)->forEveryItem([function = move(function)](InventorySlot const& slot, ItemPtr& item) { + return const_cast<PlayerInventory*>(this)->forEveryItem([function = std::move(function)](InventorySlot const& slot, ItemPtr& item) { function(slot, item); }); } |