summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-02-16 20:40:13 +0300
committerAndrei Karas <akaras@inbox.ru>2015-02-16 20:40:13 +0300
commitcd25589ba6143591389095eb25a260e350edc699 (patch)
treef89bf5fda1cbd82e5303963ad3e08338aae55de4 /src
parentc6fa5a35e1ed48b6dcb8cc83c7de9563fdca8a71 (diff)
downloadmv-cd25589ba6143591389095eb25a260e350edc699.tar.gz
mv-cd25589ba6143591389095eb25a260e350edc699.tar.bz2
mv-cd25589ba6143591389095eb25a260e350edc699.tar.xz
mv-cd25589ba6143591389095eb25a260e350edc699.zip
Build buyingstoremodelistener only if eathena support enabled.
Diffstat (limited to 'src')
-rw-r--r--src/CMakeLists.txt4
-rw-r--r--src/Makefile.am4
-rw-r--r--src/gui/windows/shopwindow.cpp4
-rw-r--r--src/gui/windows/shopwindow.h4
-rw-r--r--src/listeners/buyingstoremodelistener.h3
5 files changed, 15 insertions, 4 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f69652617..f023a835c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -812,8 +812,6 @@ SET(SRCS
listeners/awaylistener.cpp
listeners/awaylistener.h
listeners/baselistener.hpp
- listeners/buyingstoremodelistener.cpp
- listeners/buyingstoremodelistener.h
listeners/buyingstoreslotslistener.cpp
listeners/buyingstoreslotslistener.h
listeners/charrenamelistener.cpp
@@ -1414,6 +1412,8 @@ SET(SRCS_EATHENA
gui/windows/eggselectiondialog.h
listeners/banklistener.cpp
listeners/banklistener.h
+ listeners/buyingstoremodelistener.cpp
+ listeners/buyingstoremodelistener.h
net/eathena/adminhandler.cpp
net/eathena/adminhandler.h
net/eathena/auctionhandler.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 3ab999fbc..2a7c7ea97 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -941,8 +941,6 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
listeners/awaylistener.cpp \
listeners/awaylistener.h \
listeners/baselistener.hpp \
- listeners/buyingstoremodelistener.cpp \
- listeners/buyingstoremodelistener.h \
listeners/buyingstoreslotslistener.cpp \
listeners/buyingstoreslotslistener.h \
listeners/charrenamelistener.cpp \
@@ -1350,6 +1348,8 @@ manaplus_SOURCES += gui/windows/bankwindow.cpp \
gui/windows/eggselectiondialog.h \
listeners/banklistener.cpp \
listeners/banklistener.h \
+ listeners/buyingstoremodelistener.cpp \
+ listeners/buyingstoremodelistener.h \
net/eathena/adminhandler.cpp \
net/eathena/adminhandler.h \
net/eathena/auctionhandler.cpp \
diff --git a/src/gui/windows/shopwindow.cpp b/src/gui/windows/shopwindow.cpp
index 8f858b0fe..32580454d 100644
--- a/src/gui/windows/shopwindow.cpp
+++ b/src/gui/windows/shopwindow.cpp
@@ -88,7 +88,9 @@ ShopWindow::ShopWindow() :
SelectionListener(),
VendingModeListener(),
VendingSlotsListener(),
+#ifdef EATHENA_SUPPORT
BuyingStoreModeListener(),
+#endif
BuyingStoreSlotsListener(),
// TRANSLATORS: shop window button
mCloseButton(new Button(this, _("Close"), "close", this)),
@@ -1078,6 +1080,7 @@ void ShopWindow::buyingStoreSlotsChanged(const int slots)
updateButtonsAndLabels();
}
+#ifdef EATHENA_SUPPORT
void ShopWindow::buyingStoreEnabled(const bool b)
{
mEnableBuyingStore = b;
@@ -1086,3 +1089,4 @@ void ShopWindow::buyingStoreEnabled(const bool b)
mBuyShopSize = 0;
updateButtonsAndLabels();
}
+#endif
diff --git a/src/gui/windows/shopwindow.h b/src/gui/windows/shopwindow.h
index 313d3b4fb..8cf1cecd5 100644
--- a/src/gui/windows/shopwindow.h
+++ b/src/gui/windows/shopwindow.h
@@ -51,7 +51,9 @@ class ShopWindow final : public Window,
public SelectionListener,
public VendingModeListener,
public VendingSlotsListener,
+#ifdef EATHENA_SUPPORT
public BuyingStoreModeListener,
+#endif
public BuyingStoreSlotsListener
{
public:
@@ -151,7 +153,9 @@ class ShopWindow final : public Window,
void vendingEnabled(const bool b) override final;
+#ifdef EATHENA_SUPPORT
void buyingStoreEnabled(const bool b) override final;
+#endif
void setShopName(const std::string &name);
diff --git a/src/listeners/buyingstoremodelistener.h b/src/listeners/buyingstoremodelistener.h
index 36d402d59..7cd989127 100644
--- a/src/listeners/buyingstoremodelistener.h
+++ b/src/listeners/buyingstoremodelistener.h
@@ -21,6 +21,8 @@
#ifndef LISTENERS_BUYINGSTOREMODELISTENER_H
#define LISTENERS_BUYINGSTOREMODELISTENER_H
+#ifdef EATHENA_SUPPORT
+
#include "listeners/baselistener.hpp"
#include "localconsts.h"
@@ -35,4 +37,5 @@ class BuyingStoreModeListener notfinal
defineListenerHeader(BuyingStoreModeListener)
};
+#endif // EATHENA_SUPPORT
#endif // LISTENERS_BUYINGSTOREMODELISTENER_H