From 9be90b76adb1518c4ffe0e365a18c5afcc3158f2 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Tue, 23 Dec 2014 01:27:45 +0300
Subject: Add item type to item object.

---
 src/gui/widgets/itemcontainer.cpp |  3 ++-
 src/gui/widgets/selldialog.cpp    | 21 ++++++++++++++++-----
 src/gui/widgets/selldialog.h      |  7 +++++--
 3 files changed, 23 insertions(+), 8 deletions(-)

(limited to 'src/gui/widgets')

diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp
index 732e9e738..952da11c2 100644
--- a/src/gui/widgets/itemcontainer.cpp
+++ b/src/gui/widgets/itemcontainer.cpp
@@ -552,7 +552,8 @@ void ItemContainer::mouseReleased(MouseEvent &event)
             const Item *const item = inventory->getItem(dragDrop.getTag());
             if (item && !PlayerInfo::isItemProtected(item->getId()))
             {
-                mInventory->addItem(item->getId(), 1, 1, item->getColor(),
+                mInventory->addItem(item->getId(), item->getType(),
+                    1, 1, item->getColor(),
                     item->getIdentified(), item->getDamaged(),
                     item->getFavorite(),
                     false, false);
diff --git a/src/gui/widgets/selldialog.cpp b/src/gui/widgets/selldialog.cpp
index 2d45c39f8..4e289e93e 100644
--- a/src/gui/widgets/selldialog.cpp
+++ b/src/gui/widgets/selldialog.cpp
@@ -182,16 +182,27 @@ void SellDialog::addItem(const Item *const item, const int price)
     if (!item)
         return;
 
-    mShopItems->addItem2(item->getInvIndex(), item->getId(),
-        item->getColor(), item->getQuantity(), price);
+    mShopItems->addItem2(item->getInvIndex(),
+        item->getId(),
+        item->getType(),
+        item->getColor(),
+        item->getQuantity(),
+        price);
 
     mShopItemList->adjustSize();
 }
 
-void SellDialog::addItem(const int id, const unsigned char color,
-                         const int amount, const int price)
+void SellDialog::addItem(const int id,
+                         const int type,
+                         const unsigned char color,
+                         const int amount,
+                         const int price)
 {
-    mShopItems->addItem(id, color, amount, price);
+    mShopItems->addItem(id,
+        type,
+        color,
+        amount,
+        price);
     mShopItemList->adjustSize();
 }
 
diff --git a/src/gui/widgets/selldialog.h b/src/gui/widgets/selldialog.h
index d147947b5..a3f6137fb 100644
--- a/src/gui/widgets/selldialog.h
+++ b/src/gui/widgets/selldialog.h
@@ -90,8 +90,11 @@ class SellDialog notfinal : public Window,
          */
         void setVisible(bool visible) override final;
 
-        void addItem(const int id, const unsigned char color,
-                     const int amount, const int price);
+        void addItem(const int id,
+                     const int type,
+                     const unsigned char color,
+                     const int amount,
+                     const int price);
 
         /**
          * Returns true if any instances exist.
-- 
cgit v1.2.3-70-g09d2