summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/actions/windows.cpp2
-rw-r--r--src/game.cpp2
-rw-r--r--src/gui/widgets/itemcontainer.cpp2
-rw-r--r--src/gui/windows/inventorywindow.cpp10
4 files changed, 16 insertions, 0 deletions
diff --git a/src/actions/windows.cpp b/src/actions/windows.cpp
index 91d965748..cbf18125c 100644
--- a/src/actions/windows.cpp
+++ b/src/actions/windows.cpp
@@ -286,7 +286,9 @@ impHandler0(cartWindowShow)
return false;
}
+#ifdef EATHENA_SUPPORT
showHideWindow(cartWindow);
+#endif
return true;
}
diff --git a/src/game.cpp b/src/game.cpp
index 6d14184b8..00f07d2b6 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -319,7 +319,9 @@ static void destroyGuiWindows()
delete2(statusWindow)
delete2(miniStatusWindow)
delete2(inventoryWindow)
+#ifdef EATHENA_SUPPORT
delete2(cartWindow)
+#endif
delete2(shopWindow)
delete2(skillDialog)
delete2(minimap)
diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp
index 0ca5231e1..915116491 100644
--- a/src/gui/widgets/itemcontainer.cpp
+++ b/src/gui/widgets/itemcontainer.cpp
@@ -545,6 +545,7 @@ void ItemContainer::mouseReleased(MouseEvent &event)
dstContainer = InventoryType::INVENTORY;
inventory = PlayerInfo::getStorageInventory();
}
+#ifdef EATHENA_SUPPORT
if (src == DRAGDROP_SOURCE_INVENTORY
&& dst == DRAGDROP_SOURCE_CART)
{
@@ -573,6 +574,7 @@ void ItemContainer::mouseReleased(MouseEvent &event)
dstContainer = InventoryType::CART;
inventory = PlayerInfo::getStorageInventory();
}
+#endif
if (src == DRAGDROP_SOURCE_INVENTORY
&& dst == DRAGDROP_SOURCE_TRADE)
{
diff --git a/src/gui/windows/inventorywindow.cpp b/src/gui/windows/inventorywindow.cpp
index e85207ec5..0a6c4c37f 100644
--- a/src/gui/windows/inventorywindow.cpp
+++ b/src/gui/windows/inventorywindow.cpp
@@ -402,11 +402,13 @@ void InventoryWindow::action(const ActionEvent &event)
ItemAmountWindow::showWindow(ItemAmountWindow::StoreAdd,
this, item);
}
+#ifdef EATHENA_SUPPORT
else if (cartWindow)
{
ItemAmountWindow::showWindow(ItemAmountWindow::CartAdd,
this, item);
}
+#endif
}
else if (eventId == "sort")
{
@@ -447,6 +449,7 @@ void InventoryWindow::action(const ActionEvent &event)
item->getInvIndex(), item->getQuantity(),
InventoryType::STORAGE);
}
+#ifdef EATHENA_SUPPORT
else if (cartWindow)
{
inventoryHandler->moveItem2(InventoryType::INVENTORY,
@@ -454,6 +457,7 @@ void InventoryWindow::action(const ActionEvent &event)
InventoryType::CART);
}
else
+#endif
{
if (PlayerInfo::isItemProtected(item->getId()))
return;
@@ -482,11 +486,13 @@ void InventoryWindow::action(const ActionEvent &event)
ItemAmountWindow::showWindow(ItemAmountWindow::StoreRemove,
this, item);
}
+#ifdef EATHENA_SUPPORT
else if (cartWindow)
{
ItemAmountWindow::showWindow(ItemAmountWindow::CartRemove,
this, item);
}
+#endif
}
}
@@ -827,7 +833,11 @@ void InventoryWindow::updateDropButton()
if (!mDropButton)
return;
+#ifdef EATHENA_SUPPORT
if (isStorageActive() || cartWindow)
+#else
+ if (isStorageActive())
+#endif
{
// TRANSLATORS: inventory button
mDropButton->setCaption(_("Store"));