summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-02-27 00:30:34 +0300
committerAndrei Karas <akaras@inbox.ru>2015-02-27 01:51:13 +0300
commit5b9f5605671f09849e1bc59fa862e2e7e9b9e0a8 (patch)
tree6d693d8d52e0ec6b779bea0377dca04dc1f89fbb
parent2327e221128fb7c0b4a46cb71cf2cff8f3772654 (diff)
downloadmv-5b9f5605671f09849e1bc59fa862e2e7e9b9e0a8.tar.gz
mv-5b9f5605671f09849e1bc59fa862e2e7e9b9e0a8.tar.bz2
mv-5b9f5605671f09849e1bc59fa862e2e7e9b9e0a8.tar.xz
mv-5b9f5605671f09849e1bc59fa862e2e7e9b9e0a8.zip
Build buyingstorehandler only if eathena enabled.
-rw-r--r--src/CMakeLists.txt5
-rw-r--r--src/Makefile.am6
-rw-r--r--src/actions/actions.cpp2
-rw-r--r--src/net/buyingstorehandler.h3
-rw-r--r--src/net/tmwa/buyingstorehandler.h3
5 files changed, 14 insertions, 5 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1167ba997..99bd0a3ab 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1324,8 +1324,6 @@ SET(SRCS_TMWA
net/tmwa/cashshophandler.h
net/tmwa/beinghandler.cpp
net/tmwa/beinghandler.h
- net/tmwa/buyingstorehandler.cpp
- net/tmwa/buyingstorehandler.h
net/tmwa/buysellhandler.cpp
net/tmwa/buysellhandler.h
net/tmwa/charserverhandler.cpp
@@ -1414,10 +1412,13 @@ SET(SRCS_EATHENA
listeners/vendingslotslistener.h
net/auctionhandler.h
net/bankhandler.h
+ net/buyingstorehandler.h
net/tmwa/auctionhandler.cpp
net/tmwa/auctionhandler.h
net/tmwa/bankhandler.cpp
net/tmwa/bankhandler.h
+ net/tmwa/buyingstorehandler.cpp
+ net/tmwa/buyingstorehandler.h
net/eathena/adminhandler.cpp
net/eathena/adminhandler.h
net/eathena/auctionhandler.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index b8046e64b..80d4128c5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -647,7 +647,6 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
net/adminhandler.h \
net/cashshophandler.h \
net/beinghandler.h \
- net/buyingstorehandler.h \
net/buysellhandler.h \
net/character.h \
net/charserverhandler.cpp \
@@ -1259,8 +1258,6 @@ manaplus_SOURCES += \
net/tmwa/cashshophandler.h \
net/tmwa/beinghandler.cpp \
net/tmwa/beinghandler.h \
- net/tmwa/buyingstorehandler.cpp \
- net/tmwa/buyingstorehandler.h \
net/tmwa/buysellhandler.cpp \
net/tmwa/buysellhandler.h \
net/tmwa/charserverhandler.cpp \
@@ -1350,10 +1347,13 @@ manaplus_SOURCES += gui/windows/bankwindow.cpp \
listeners/vendingslotslistener.h \
net/auctionhandler.h \
net/bankhandler.h \
+ net/buyingstorehandler.h \
net/tmwa/auctionhandler.cpp \
net/tmwa/auctionhandler.h \
net/tmwa/bankhandler.cpp \
net/tmwa/bankhandler.h \
+ net/tmwa/buyingstorehandler.cpp \
+ net/tmwa/buyingstorehandler.h \
net/eathena/adminhandler.cpp \
net/eathena/adminhandler.h \
net/eathena/auctionhandler.cpp \
diff --git a/src/actions/actions.cpp b/src/actions/actions.cpp
index 965702539..f673d43b4 100644
--- a/src/actions/actions.cpp
+++ b/src/actions/actions.cpp
@@ -672,9 +672,11 @@ impHandler(sell)
}
else if (being->getType() == ActorType::Player)
{
+#ifdef EATHENA_SUPPORT
if (serverFeatures->haveVending())
buyingStoreHandler->open(being);
else
+#endif
buySellHandler->requestBuyList(being->getName());
return true;
}
diff --git a/src/net/buyingstorehandler.h b/src/net/buyingstorehandler.h
index 321cd9ec1..324dea271 100644
--- a/src/net/buyingstorehandler.h
+++ b/src/net/buyingstorehandler.h
@@ -21,6 +21,8 @@
#ifndef NET_BUYINGSTOREHANDLER_H
#define NET_BUYINGSTOREHANDLER_H
+#ifdef EATHENA_SUPPORT
+
#include <string>
#include <vector>
@@ -58,4 +60,5 @@ class BuyingStoreHandler notfinal
extern Net::BuyingStoreHandler *buyingStoreHandler;
+#endif // EATHENA_SUPPORT
#endif // NET_BUYINGSTOREHANDLER_H
diff --git a/src/net/tmwa/buyingstorehandler.h b/src/net/tmwa/buyingstorehandler.h
index 381fe5c1a..dc1b408bb 100644
--- a/src/net/tmwa/buyingstorehandler.h
+++ b/src/net/tmwa/buyingstorehandler.h
@@ -21,6 +21,8 @@
#ifndef NET_TMWA_BUYINGSTOREHANDLER_H
#define NET_TMWA_BUYINGSTOREHANDLER_H
+#ifdef EATHENA_SUPPORT
+
#include "net/buyingstorehandler.h"
#include "net/tmwa/messagehandler.h"
@@ -55,4 +57,5 @@ class BuyingStoreHandler final : public MessageHandler,
} // namespace TmwAthena
+#endif // EATHENA_SUPPORT
#endif // NET_TMWA_BUYINGSTOREHANDLER_H