From 3f5c128b889b4cb41f9782fe1531c55e7d07432f Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sat, 24 Jan 2015 15:31:06 +0300
Subject: Move inventory type into separate file.

---
 src/net/ea/inventoryhandler.cpp | 10 +++++-----
 src/net/ea/inventoryhandler.h   |  6 ------
 2 files changed, 5 insertions(+), 11 deletions(-)

(limited to 'src/net/ea')

diff --git a/src/net/ea/inventoryhandler.cpp b/src/net/ea/inventoryhandler.cpp
index 1be2e5be2..e81b0a490 100644
--- a/src/net/ea/inventoryhandler.cpp
+++ b/src/net/ea/inventoryhandler.cpp
@@ -130,14 +130,14 @@ size_t InventoryHandler::getSize(const int type) const
 {
     switch (type)
     {
-        case Inventory::INVENTORY:
+        case InventoryType::INVENTORY:
             return 100;
-        case Inventory::STORAGE:
+        case InventoryType::STORAGE:
             return 0;  // Comes from server after items
-        case Inventory::TRADE:
+        case InventoryType::TRADE:
             return 12;
         // GUILD_STORAGE
-        case Inventory::TYPE_END:
+        case InventoryType::TYPE_END:
             return 0;  // Comes from server after items
         default:
             return 0;
@@ -248,7 +248,7 @@ void InventoryHandler::processPlayerStorageStatus(Net::MessageIn &msg)
     const int size = msg.readInt16("max size");
 
     if (!mStorage)
-        mStorage = new Inventory(Inventory::STORAGE, size);
+        mStorage = new Inventory(InventoryType::STORAGE, size);
 
     FOR_EACH (Ea::InventoryItems::const_iterator, it, mInventoryItems)
     {
diff --git a/src/net/ea/inventoryhandler.h b/src/net/ea/inventoryhandler.h
index 0b9c208cc..be9fb0e52 100644
--- a/src/net/ea/inventoryhandler.h
+++ b/src/net/ea/inventoryhandler.h
@@ -48,12 +48,6 @@ typedef std::queue<int> PickupQueue;
 class InventoryHandler notfinal : public Net::InventoryHandler
 {
     public:
-        enum
-        {
-            GUILD_STORAGE = Inventory::TYPE_END,
-            CART
-        };
-
         A_DELETE_COPY(InventoryHandler)
 
         virtual ~InventoryHandler();
-- 
cgit v1.2.3-60-g2f50