summaryrefslogtreecommitdiff
path: root/src/net/tmwa
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-02-27 00:45:20 +0300
committerAndrei Karas <akaras@inbox.ru>2015-02-27 01:51:18 +0300
commite13a1fc1d45c009badc10b4ec4a72bbbcf6fe592 (patch)
tree1d6fe1bcab60fb7a7ec2f6911d069394db3b6126 /src/net/tmwa
parentccd272519ec38b15fa5ec24fe4c6daa6eb45e3da (diff)
downloadmanaplus-e13a1fc1d45c009badc10b4ec4a72bbbcf6fe592.tar.gz
manaplus-e13a1fc1d45c009badc10b4ec4a72bbbcf6fe592.tar.bz2
manaplus-e13a1fc1d45c009badc10b4ec4a72bbbcf6fe592.tar.xz
manaplus-e13a1fc1d45c009badc10b4ec4a72bbbcf6fe592.zip
Build cashshophandler only if eathena enabled.
Diffstat (limited to 'src/net/tmwa')
-rw-r--r--src/net/tmwa/cashshophandler.h3
-rw-r--r--src/net/tmwa/generalhandler.cpp6
-rw-r--r--src/net/tmwa/generalhandler.h6
3 files changed, 9 insertions, 6 deletions
diff --git a/src/net/tmwa/cashshophandler.h b/src/net/tmwa/cashshophandler.h
index ef003cf32..e1a38e1c3 100644
--- a/src/net/tmwa/cashshophandler.h
+++ b/src/net/tmwa/cashshophandler.h
@@ -21,6 +21,8 @@
#ifndef NET_TMWA_CASHSHOPHANDLER_H
#define NET_TMWA_CASHSHOPHANDLER_H
+#ifdef EATHENA_SUPPORT
+
#include "net/cashshophandler.h"
#include "net/tmwa/messagehandler.h"
@@ -46,4 +48,5 @@ class CashShopHandler final : public MessageHandler,
} // namespace TmwAthena
+#endif // EATHENA_SUPPORT
#endif // NET_TMWA_CASHSHOPHANDLER_H
diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp
index 9a0ccd921..1739aef45 100644
--- a/src/net/tmwa/generalhandler.cpp
+++ b/src/net/tmwa/generalhandler.cpp
@@ -108,12 +108,12 @@ GeneralHandler::GeneralHandler() :
mMailHandler(new MailHandler),
#ifdef EATHENA_SUPPORT
mAuctionHandler(new AuctionHandler),
-#endif
+ mBankHandler(new BankHandler),
+ mBuyingStoreHandler(new BuyingStoreHandler),
mCashShopHandler(new CashShopHandler),
+#endif
mFamilyHandler(new FamilyHandler),
- mBankHandler(new BankHandler),
mMercenaryHandler(new MercenaryHandler),
- mBuyingStoreHandler(new BuyingStoreHandler),
mHomunculusHandler(new HomunculusHandler),
mFriendsHandler(new FriendsHandler),
mElementalHandler(new ElementalHandler),
diff --git a/src/net/tmwa/generalhandler.h b/src/net/tmwa/generalhandler.h
index 1acc42a9e..292ce6dd7 100644
--- a/src/net/tmwa/generalhandler.h
+++ b/src/net/tmwa/generalhandler.h
@@ -84,12 +84,12 @@ class GeneralHandler final : public MessageHandler,
MessageHandlerPtr mMailHandler;
#ifdef EATHENA_SUPPORT
MessageHandlerPtr mAuctionHandler;
-#endif
+ MessageHandlerPtr mBankHandler;
+ MessageHandlerPtr mBuyingStoreHandler;
MessageHandlerPtr mCashShopHandler;
+#endif
MessageHandlerPtr mFamilyHandler;
- MessageHandlerPtr mBankHandler;
MessageHandlerPtr mMercenaryHandler;
- MessageHandlerPtr mBuyingStoreHandler;
MessageHandlerPtr mHomunculusHandler;
MessageHandlerPtr mFriendsHandler;
MessageHandlerPtr mElementalHandler;