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/actions/actions.cpp | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'src/actions')

diff --git a/src/actions/actions.cpp b/src/actions/actions.cpp
index ce53eaed9..2cff275f5 100644
--- a/src/actions/actions.cpp
+++ b/src/actions/actions.cpp
@@ -220,12 +220,12 @@ static Item *getItemByInvIndex(const InputEvent &event, const int invType)
     const Inventory *inv = nullptr;
     switch (invType)
     {
-        case Inventory::STORAGE:
+        case InventoryType::STORAGE:
             inv = PlayerInfo::getStorageInventory();
             break;
 
         default:
-        case Inventory::INVENTORY:
+        case InventoryType::INVENTORY:
             inv = PlayerInfo::getInventory();
             break;
     }
@@ -430,7 +430,7 @@ impHandler(dropItemId)
 
 impHandler(dropItemInv)
 {
-    Item *const item = getItemByInvIndex(event, Inventory::INVENTORY);
+    Item *const item = getItemByInvIndex(event, InventoryType::INVENTORY);
     if (item && !PlayerInfo::isItemProtected(item->getId()))
     {
         ItemAmountWindow::showWindow(ItemAmountWindow::ItemDrop,
@@ -455,7 +455,7 @@ impHandler(dropItemIdAll)
 
 impHandler(dropItemInvAll)
 {
-    Item *const item = getItemByInvIndex(event, Inventory::INVENTORY);
+    Item *const item = getItemByInvIndex(event, InventoryType::INVENTORY);
     if (item && !PlayerInfo::isItemProtected(item->getId()))
         PlayerInfo::dropItem(item, item->getQuantity(), true);
     return true;
@@ -1431,7 +1431,7 @@ impHandler(useItem)
 
 impHandler(useItemInv)
 {
-    Item *const item = getItemByInvIndex(event, Inventory::INVENTORY);
+    Item *const item = getItemByInvIndex(event, InventoryType::INVENTORY);
     PlayerInfo::useEquipItem(item, true);
     return true;
 }
@@ -1439,13 +1439,13 @@ impHandler(useItemInv)
 impHandler(invToStorage)
 {
     Item *item = nullptr;
-    const int amount = getAmountFromEvent(event, item, Inventory::INVENTORY);
+    const int amount = getAmountFromEvent(event, item, InventoryType::INVENTORY);
     if (amount)
     {
-        inventoryHandler->moveItem2(Inventory::INVENTORY,
+        inventoryHandler->moveItem2(InventoryType::INVENTORY,
             item->getInvIndex(),
             amount,
-            Inventory::STORAGE);
+            InventoryType::STORAGE);
     }
     else
     {
@@ -1458,7 +1458,7 @@ impHandler(invToStorage)
 impHandler(tradeAdd)
 {
     Item *item = nullptr;
-    const int amount = getAmountFromEvent(event, item, Inventory::INVENTORY);
+    const int amount = getAmountFromEvent(event, item, InventoryType::INVENTORY);
     if (!item || PlayerInfo::isItemProtected(item->getId()))
         return true;
 
@@ -1477,13 +1477,13 @@ impHandler(tradeAdd)
 impHandler(storageToInv)
 {
     Item *item = nullptr;
-    const int amount = getAmountFromEvent(event, item, Inventory::STORAGE);
+    const int amount = getAmountFromEvent(event, item, InventoryType::STORAGE);
     if (amount)
     {
-        inventoryHandler->moveItem2(Inventory::STORAGE,
+        inventoryHandler->moveItem2(InventoryType::STORAGE,
             item->getInvIndex(),
             amount,
-            Inventory::INVENTORY);
+            InventoryType::INVENTORY);
     }
     else
     {
-- 
cgit v1.2.3-70-g09d2