diff options
Diffstat (limited to 'src/net/ea')
-rw-r--r-- | src/net/ea/inventoryhandler.cpp | 2 | ||||
-rw-r--r-- | src/net/ea/inventoryhandler.h | 2 | ||||
-rw-r--r-- | src/net/ea/inventoryrecv.cpp | 6 | ||||
-rw-r--r-- | src/net/ea/inventoryrecv.h | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/net/ea/inventoryhandler.cpp b/src/net/ea/inventoryhandler.cpp index 047e56251..20dbda7c0 100644 --- a/src/net/ea/inventoryhandler.cpp +++ b/src/net/ea/inventoryhandler.cpp @@ -36,7 +36,7 @@ InventoryHandler::InventoryHandler() : Net::InventoryHandler() { InventoryRecv::mEquips.clear(); - InventoryRecv::mInventoryItems.clear(); + InventoryRecv::mStorageItems.clear(); InventoryRecv::mStorage = nullptr; storageWindow = nullptr; while (!InventoryRecv::mSentPickups.empty()) diff --git a/src/net/ea/inventoryhandler.h b/src/net/ea/inventoryhandler.h index 21c5ba397..780795bb2 100644 --- a/src/net/ea/inventoryhandler.h +++ b/src/net/ea/inventoryhandler.h @@ -41,7 +41,7 @@ class InventoryHandler notfinal : public Net::InventoryHandler ~InventoryHandler() override; - void clear() const override final; + void clear() const override; bool canSplit(const Item *const item) const override final A_CONST A_WARN_UNUSED; diff --git a/src/net/ea/inventoryrecv.cpp b/src/net/ea/inventoryrecv.cpp index 9cc43e42a..51ac4c6e5 100644 --- a/src/net/ea/inventoryrecv.cpp +++ b/src/net/ea/inventoryrecv.cpp @@ -50,7 +50,7 @@ namespace Ea namespace InventoryRecv { EquipBackend mEquips; - InventoryItems mInventoryItems; + InventoryItems mStorageItems; Inventory *mStorage = nullptr; PickupQueue mSentPickups; bool mDebugInventory = true; @@ -99,7 +99,7 @@ void InventoryRecv::processPlayerStorageStatus(Net::MessageIn &msg) if (mStorage == nullptr) mStorage = new Inventory(InventoryType::Storage, size); - FOR_EACH (Ea::InventoryItems::const_iterator, it, mInventoryItems) + FOR_EACH (Ea::InventoryItems::const_iterator, it, mStorageItems) { mStorage->setItem((*it).slot, (*it).id, @@ -113,7 +113,7 @@ void InventoryRecv::processPlayerStorageStatus(Net::MessageIn &msg) (*it).equip, Equipped_false); } - mInventoryItems.clear(); + mStorageItems.clear(); if (storageWindow == nullptr) { diff --git a/src/net/ea/inventoryrecv.h b/src/net/ea/inventoryrecv.h index 13c9fc025..2e7de0b49 100644 --- a/src/net/ea/inventoryrecv.h +++ b/src/net/ea/inventoryrecv.h @@ -47,7 +47,7 @@ namespace Ea namespace InventoryRecv { extern EquipBackend mEquips; - extern InventoryItems mInventoryItems; + extern InventoryItems mStorageItems; extern Inventory *mStorage; extern PickupQueue mSentPickups; extern bool mDebugInventory; |