summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/windows/shopwindow.cpp20
-rw-r--r--src/gui/windows/shopwindow.h4
2 files changed, 12 insertions, 12 deletions
diff --git a/src/gui/windows/shopwindow.cpp b/src/gui/windows/shopwindow.cpp
index c4795dd9e..512cb6d54 100644
--- a/src/gui/windows/shopwindow.cpp
+++ b/src/gui/windows/shopwindow.cpp
@@ -84,9 +84,9 @@ ShopWindow::DialogList ShopWindow::instances;
ShopWindow::ShopWindow() :
// TRANSLATORS: shop window name
Window(_("Personal Shop"), false, nullptr, "shop.xml"),
- VendingModeListener(),
VendingSlotsListener(),
#ifdef EATHENA_SUPPORT
+ VendingModeListener(),
BuyingStoreModeListener(),
BuyingStoreSlotsListener(),
#endif
@@ -1044,15 +1044,6 @@ void ShopWindow::vendingSlotsChanged(const int slots)
updateButtonsAndLabels();
}
-void ShopWindow::vendingEnabled(const bool b)
-{
- mEnableVending = b;
- localPlayer->enableShop(b);
- if (!b)
- mSellShopSize = 0;
- updateButtonsAndLabels();
-}
-
void ShopWindow::updateShopName()
{
if (mSellShopName.empty())
@@ -1075,6 +1066,15 @@ void ShopWindow::setShopName(const std::string &name)
}
#ifdef EATHENA_SUPPORT
+void ShopWindow::vendingEnabled(const bool b)
+{
+ mEnableVending = b;
+ localPlayer->enableShop(b);
+ if (!b)
+ mSellShopSize = 0;
+ updateButtonsAndLabels();
+}
+
void ShopWindow::buyingStoreSlotsChanged(const int slots)
{
mBuyShopSize = slots;
diff --git a/src/gui/windows/shopwindow.h b/src/gui/windows/shopwindow.h
index 500d67727..3b418a6da 100644
--- a/src/gui/windows/shopwindow.h
+++ b/src/gui/windows/shopwindow.h
@@ -47,9 +47,9 @@ class TabStrip;
* \ingroup Interface
*/
class ShopWindow final : public Window,
- public VendingModeListener,
public VendingSlotsListener,
#ifdef EATHENA_SUPPORT
+ public VendingModeListener,
public BuyingStoreModeListener,
public BuyingStoreSlotsListener,
#endif
@@ -149,9 +149,9 @@ class ShopWindow final : public Window,
void vendingSlotsChanged(const int slots) override final;
+#ifdef EATHENA_SUPPORT
void vendingEnabled(const bool b) override final;
-#ifdef EATHENA_SUPPORT
void buyingStoreEnabled(const bool b) override final;
void buyingStoreSlotsChanged(const int slots) override final;