summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-03-24 20:42:22 +0300
committerAndrei Karas <akaras@inbox.ru>2016-03-24 20:42:22 +0300
commitb7bbb09d62b55bed26d432a6a2af9831c6ec9143 (patch)
tree895bf1e0d842088282f79bbc423ca1f825880254 /src/gui
parent3920b2449e3e55c396b3a5a46f37d965d71de42e (diff)
downloadmv-b7bbb09d62b55bed26d432a6a2af9831c6ec9143.tar.gz
mv-b7bbb09d62b55bed26d432a6a2af9831c6ec9143.tar.bz2
mv-b7bbb09d62b55bed26d432a6a2af9831c6ec9143.tar.xz
mv-b7bbb09d62b55bed26d432a6a2af9831c6ec9143.zip
Change ItemType into strong typed enum.
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/popups/itempopup.cpp2
-rw-r--r--src/gui/popups/itempopup.h4
-rw-r--r--src/gui/widgets/itemcontainer.cpp4
-rw-r--r--src/gui/windows/buydialog.cpp4
-rw-r--r--src/gui/windows/inventorywindow.cpp3
5 files changed, 9 insertions, 8 deletions
diff --git a/src/gui/popups/itempopup.cpp b/src/gui/popups/itempopup.cpp
index f0ab5d167..065704cb8 100644
--- a/src/gui/popups/itempopup.cpp
+++ b/src/gui/popups/itempopup.cpp
@@ -325,7 +325,7 @@ std::string ItemPopup::getCardsString(const int *const cards)
return label->setForegroundColorAll(getThemeColor(name2), \
getThemeColor(name2##_OUTLINE)); \
}
-void ItemPopup::setLabelColor(Label *label, const ItemType::Type type) const
+void ItemPopup::setLabelColor(Label *label, const ItemTypeT type) const
{
switch (type)
{
diff --git a/src/gui/popups/itempopup.h b/src/gui/popups/itempopup.h
index 7f5481627..fc0320614 100644
--- a/src/gui/popups/itempopup.h
+++ b/src/gui/popups/itempopup.h
@@ -82,14 +82,14 @@ class ItemPopup final : public Popup
TextBox *mItemEffect A_NONNULLPOINTER;
TextBox *mItemWeight A_NONNULLPOINTER;
TextBox *mItemCards A_NONNULLPOINTER;
- ItemType::Type mItemType;
+ ItemTypeT mItemType;
Icon *mIcon A_NONNULLPOINTER;
std::string mLastName;
int mLastId;
ItemColor mLastColor;
void setLabelColor(Label *label,
- const ItemType::Type type) const A_NONNULL(2);
+ const ItemTypeT type) const A_NONNULL(2);
};
extern ItemPopup *itemPopup;
diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp
index 02ad10ee9..96bdb1dcc 100644
--- a/src/gui/widgets/itemcontainer.cpp
+++ b/src/gui/widgets/itemcontainer.cpp
@@ -158,8 +158,8 @@ namespace
const ItemInfo &info1 = pair1->mItem->getInfo();
const ItemInfo &info2 = pair2->mItem->getInfo();
- const ItemType::Type t1 = info1.getType();
- const ItemType::Type t2 = info2.getType();
+ const ItemTypeT t1 = info1.getType();
+ const ItemTypeT t2 = info2.getType();
if (t1 == t2)
{
return (info1.getName() < info2.getName());
diff --git a/src/gui/windows/buydialog.cpp b/src/gui/windows/buydialog.cpp
index 47ec11db2..c6be959de 100644
--- a/src/gui/windows/buydialog.cpp
+++ b/src/gui/windows/buydialog.cpp
@@ -160,8 +160,8 @@ namespace
if (!item1 || !item2)
return false;
- const ItemType::Type type1 = item1->getInfo().getType();
- const ItemType::Type type2 = item2->getInfo().getType();
+ const ItemTypeT type1 = item1->getInfo().getType();
+ const ItemTypeT type2 = item2->getInfo().getType();
if (type1 == type2)
return item1->getPrice() < item2->getPrice();
return type1 < type2;
diff --git a/src/gui/windows/inventorywindow.cpp b/src/gui/windows/inventorywindow.cpp
index 881e10c1a..5485bd98a 100644
--- a/src/gui/windows/inventorywindow.cpp
+++ b/src/gui/windows/inventorywindow.cpp
@@ -1047,7 +1047,8 @@ void InventoryWindow::combineItems(const int index1,
if (!item2)
return;
- if (item1->getType() != ItemType::CARD)
+ // IT_CARD
+ if (item1->getType() != 6)
{
const Item *tmpItem = item1;
item1 = item2;