summaryrefslogtreecommitdiff
path: root/src/gui/windows
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/windows
parent3920b2449e3e55c396b3a5a46f37d965d71de42e (diff)
downloadplus-b7bbb09d62b55bed26d432a6a2af9831c6ec9143.tar.gz
plus-b7bbb09d62b55bed26d432a6a2af9831c6ec9143.tar.bz2
plus-b7bbb09d62b55bed26d432a6a2af9831c6ec9143.tar.xz
plus-b7bbb09d62b55bed26d432a6a2af9831c6ec9143.zip
Change ItemType into strong typed enum.
Diffstat (limited to 'src/gui/windows')
-rw-r--r--src/gui/windows/buydialog.cpp4
-rw-r--r--src/gui/windows/inventorywindow.cpp3
2 files changed, 4 insertions, 3 deletions
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;