From 9a40e1202946e3384500da28668a52d28ad377f4 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 17 Oct 2014 22:11:13 +0300 Subject: Add static in inventoryhandler. --- src/net/ea/inventoryhandler.cpp | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) (limited to 'src/net/ea/inventoryhandler.cpp') diff --git a/src/net/ea/inventoryhandler.cpp b/src/net/ea/inventoryhandler.cpp index 2c8c64cda..f4250efc5 100644 --- a/src/net/ea/inventoryhandler.cpp +++ b/src/net/ea/inventoryhandler.cpp @@ -88,14 +88,22 @@ const Equipment::Slot EQUIP_CONVERT[] = namespace Ea { -InventoryHandler::InventoryHandler() : - mEquips(), - mInventoryItems(), - mStorage(nullptr), - mStorageWindow(nullptr), - mDebugInventory(true), - mSentPickups() +EquipBackend InventoryHandler::mEquips; +InventoryItems InventoryHandler::mInventoryItems; +Inventory *InventoryHandler::mStorage = nullptr; +InventoryWindow *InventoryHandler::mStorageWindow = nullptr; +PickupQueue InventoryHandler::mSentPickups; +bool InventoryHandler::mDebugInventory = true; + +InventoryHandler::InventoryHandler() { + mEquips.clear(); + mInventoryItems.clear(); + mStorage = nullptr; + mStorageWindow = nullptr; + while (!mSentPickups.empty()) + mSentPickups.pop(); + mDebugInventory = true; } InventoryHandler::~InventoryHandler() -- cgit v1.2.3-60-g2f50