From 4e97da8e138b21a5f5bea75e6a8d3211e4f28594 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Thu, 24 Mar 2016 23:29:04 +0300
Subject: Add enum for item types.

---
 src/resources/inventory/complexinventory.cpp |  2 +-
 src/resources/inventory/complexinventory.h   |  2 +-
 src/resources/inventory/inventory.cpp        | 32 ++++++++++++++++++++++------
 src/resources/inventory/inventory.h          |  6 ++++--
 4 files changed, 31 insertions(+), 11 deletions(-)

(limited to 'src/resources/inventory')

diff --git a/src/resources/inventory/complexinventory.cpp b/src/resources/inventory/complexinventory.cpp
index 60f6092e6..724b89762 100644
--- a/src/resources/inventory/complexinventory.cpp
+++ b/src/resources/inventory/complexinventory.cpp
@@ -116,7 +116,7 @@ bool ComplexInventory::addVirtualItem(const Item *const item,
 
 void ComplexInventory::setItem(const int index,
                                const int id,
-                               const int type,
+                               const ItemTypeT type,
                                const int quantity,
                                const uint8_t refine,
                                const ItemColor color,
diff --git a/src/resources/inventory/complexinventory.h b/src/resources/inventory/complexinventory.h
index 95183cb7f..996212d18 100644
--- a/src/resources/inventory/complexinventory.h
+++ b/src/resources/inventory/complexinventory.h
@@ -51,7 +51,7 @@ class ComplexInventory final : public Inventory
 
         void setItem(const int index,
                      const int id,
-                     const int type,
+                     const ItemTypeT type,
                      const int quantity,
                      const uint8_t refine,
                      const ItemColor color,
diff --git a/src/resources/inventory/inventory.cpp b/src/resources/inventory/inventory.cpp
index 7d78605dc..d732874be 100644
--- a/src/resources/inventory/inventory.cpp
+++ b/src/resources/inventory/inventory.cpp
@@ -54,7 +54,8 @@ namespace
     };
 }  // namespace
 
-Inventory::Inventory(const InventoryTypeT type, const int size1) :
+Inventory::Inventory(const InventoryTypeT type,
+                     const int size1) :
     mInventoryListeners(),
     mVirtualRemove(),
     mType(type),
@@ -109,7 +110,7 @@ Item *Inventory::findItem(const int itemId,
 }
 
 int Inventory::addItem(const int id,
-                       const int type,
+                       const ItemTypeT type,
                        const int quantity,
                        const uint8_t refine,
                        const ItemColor color,
@@ -120,14 +121,23 @@ int Inventory::addItem(const int id,
                        const Equipped equipped)
 {
     const int slot = getFreeSlot();
-    setItem(slot, id, type, quantity, refine, color,
-        identified, damaged, favorite, equipment, equipped);
+    setItem(slot,
+        id,
+        type,
+        quantity,
+        refine,
+        color,
+        identified,
+        damaged,
+        favorite,
+        equipment,
+        equipped);
     return slot;
 }
 
 void Inventory::setItem(const int index,
                         const int id,
-                        const int type,
+                        const ItemTypeT type,
                         const int quantity,
                         const uint8_t refine,
                         const ItemColor color,
@@ -146,8 +156,16 @@ void Inventory::setItem(const int index,
     Item *const item1 = mItems[index];
     if (!item1 && id > 0)
     {
-        Item *const item = new Item(id, type, quantity, refine, color,
-            identified, damaged, favorite, equipment, equipped);
+        Item *const item = new Item(id,
+            type,
+            quantity,
+            refine,
+            color,
+            identified,
+            damaged,
+            favorite,
+            equipment,
+            equipped);
         item->setInvIndex(index);
         mItems[index] = item;
         mUsed++;
diff --git a/src/resources/inventory/inventory.h b/src/resources/inventory/inventory.h
index 9186fbd73..f687339cb 100644
--- a/src/resources/inventory/inventory.h
+++ b/src/resources/inventory/inventory.h
@@ -25,6 +25,8 @@
 
 #include "enums/inventorytype.h"
 
+#include "enums/resources/itemtype.h"
+
 #include "enums/simpletypes/beingtypeid.h"
 #include "enums/simpletypes/damaged.h"
 #include "enums/simpletypes/equipm.h"
@@ -90,7 +92,7 @@ class Inventory notfinal
          * Adds a new item in a free slot.
          */
         int addItem(const int id,
-                    const int type,
+                    const ItemTypeT type,
                     const int quantity,
                     const uint8_t refine,
                     const ItemColor color,
@@ -105,7 +107,7 @@ class Inventory notfinal
          */
         virtual void setItem(const int index,
                              const int id,
-                             const int type,
+                             const ItemTypeT type,
                              const int quantity,
                              const uint8_t refine,
                              const ItemColor color,
-- 
cgit v1.2.3-60-g2f50