summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-04-17 18:26:38 +0300
committerAndrei Karas <akaras@inbox.ru>2015-04-17 18:26:38 +0300
commite4abfb651d51670fcf85093b55189065c151cc14 (patch)
tree2cb0f32630dce231c2b49263992b927549a9ad66 /src
parent55d8a042bb195d3c020a3296233b698ef6b109df (diff)
downloadmv-e4abfb651d51670fcf85093b55189065c151cc14.tar.gz
mv-e4abfb651d51670fcf85093b55189065c151cc14.tar.bz2
mv-e4abfb651d51670fcf85093b55189065c151cc14.tar.xz
mv-e4abfb651d51670fcf85093b55189065c151cc14.zip
Add eathena defines into inventorytype enum.
Diffstat (limited to 'src')
-rw-r--r--src/enums/inventorytype.h2
-rw-r--r--src/gui/popups/popupmenu.cpp2
-rw-r--r--src/gui/widgets/itemcontainer.cpp4
-rw-r--r--src/gui/windows/inventorywindow.cpp8
-rw-r--r--src/inventory.cpp2
5 files changed, 18 insertions, 0 deletions
diff --git a/src/enums/inventorytype.h b/src/enums/inventorytype.h
index 136a80734..a492de2ce 100644
--- a/src/enums/inventorytype.h
+++ b/src/enums/inventorytype.h
@@ -32,7 +32,9 @@ namespace InventoryType
CART,
TRADE,
NPC,
+#ifdef EATHENA_SUPPORT
VENDING,
+#endif
TYPE_END
};
} // namespace InventoryType
diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp
index a458cf17d..9c808b40c 100644
--- a/src/gui/popups/popupmenu.cpp
+++ b/src/gui/popups/popupmenu.cpp
@@ -1710,7 +1710,9 @@ void PopupMenu::showPopup(Window *const parent,
case InventoryType::CART:
case InventoryType::TRADE:
case InventoryType::NPC:
+#ifdef EATHENA_SUPPORT
case InventoryType::VENDING:
+#endif
case InventoryType::TYPE_END:
default:
break;
diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp
index 9728c0e7f..6d2c72c5c 100644
--- a/src/gui/widgets/itemcontainer.cpp
+++ b/src/gui/widgets/itemcontainer.cpp
@@ -422,7 +422,9 @@ void ItemContainer::mousePressed(MouseEvent &event)
src = DRAGDROP_SOURCE_CART;
break;
default:
+#ifdef EATHENA_SUPPORT
case InventoryType::VENDING:
+#endif
case InventoryType::TYPE_END:
break;
}
@@ -522,7 +524,9 @@ void ItemContainer::mouseReleased(MouseEvent &event)
dst = DRAGDROP_SOURCE_CART;
break;
default:
+#ifdef EATHENA_SUPPORT
case InventoryType::VENDING:
+#endif
case InventoryType::TYPE_END:
break;
}
diff --git a/src/gui/windows/inventorywindow.cpp b/src/gui/windows/inventorywindow.cpp
index a2c08f819..28367d2c0 100644
--- a/src/gui/windows/inventorywindow.cpp
+++ b/src/gui/windows/inventorywindow.cpp
@@ -118,7 +118,9 @@ InventoryWindow::InventoryWindow(Inventory *const inventory) :
case InventoryType::INVENTORY:
case InventoryType::TRADE:
case InventoryType::NPC:
+#ifdef EATHENA_SUPPORT
case InventoryType::VENDING:
+#endif
case InventoryType::TYPE_END:
default:
mSortDropDown->setSelected(config.getIntValue(
@@ -299,7 +301,9 @@ InventoryWindow::InventoryWindow(Inventory *const inventory) :
default:
case InventoryType::TRADE:
case InventoryType::NPC:
+#ifdef EATHENA_SUPPORT
case InventoryType::VENDING:
+#endif
case InventoryType::TYPE_END:
break;
};
@@ -356,7 +360,9 @@ void InventoryWindow::storeSortOrder() const
case InventoryType::INVENTORY:
case InventoryType::TRADE:
case InventoryType::NPC:
+#ifdef EATHENA_SUPPORT
case InventoryType::VENDING:
+#endif
case InventoryType::TYPE_END:
default:
config.setValue("inventorySortOrder",
@@ -800,7 +806,9 @@ void InventoryWindow::close()
default:
case InventoryType::TRADE:
case InventoryType::NPC:
+#ifdef EATHENA_SUPPORT
case InventoryType::VENDING:
+#endif
case InventoryType::TYPE_END:
break;
}
diff --git a/src/inventory.cpp b/src/inventory.cpp
index 7f05a2472..c2e9daf1e 100644
--- a/src/inventory.cpp
+++ b/src/inventory.cpp
@@ -291,7 +291,9 @@ std::string Inventory::getName() const
switch (mType)
{
case InventoryType::INVENTORY:
+#ifdef EATHENA_SUPPORT
case InventoryType::VENDING:
+#endif
case InventoryType::TYPE_END:
default:
{