From 22bb94a2587fa16d808ec966f01d07dc27d9f5d9 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 28 Feb 2015 21:53:24 +0300 Subject: Build mercenaryhandler only if eathena enabled. --- src/net/tmwa/generalhandler.cpp | 4 ++-- src/net/tmwa/mercenaryhandler.h | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'src/net/tmwa') diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp index 5acf3040c..9205db800 100644 --- a/src/net/tmwa/generalhandler.cpp +++ b/src/net/tmwa/generalhandler.cpp @@ -116,8 +116,8 @@ GeneralHandler::GeneralHandler() : mHomunculusHandler(new HomunculusHandler), mMailHandler(new MailHandler), mMarketHandler(new MarketHandler), -#endif mMercenaryHandler(new MercenaryHandler), +#endif mVendingHandler(new VendingHandler), mSearchStoreHandler(new SearchStoreHandler) { @@ -246,8 +246,8 @@ void GeneralHandler::load() mNetwork->registerHandler(mHomunculusHandler); mNetwork->registerHandler(mMailHandler); mNetwork->registerHandler(mMarketHandler); -#endif mNetwork->registerHandler(mMercenaryHandler); +#endif mNetwork->registerHandler(mVendingHandler); mNetwork->registerHandler(mSearchStoreHandler); } diff --git a/src/net/tmwa/mercenaryhandler.h b/src/net/tmwa/mercenaryhandler.h index 5833ab68c..1d5a40b8a 100644 --- a/src/net/tmwa/mercenaryhandler.h +++ b/src/net/tmwa/mercenaryhandler.h @@ -21,6 +21,8 @@ #ifndef NET_TMWA_MERCENARYHANDLER_H #define NET_TMWA_MERCENARYHANDLER_H +#ifdef EATHENA_SUPPORT + #include "net/mercenaryhandler.h" #include "net/tmwa/messagehandler.h" @@ -57,4 +59,5 @@ class MercenaryHandler final : public MessageHandler, } // namespace TmwAthena +#endif // EATHENA_SUPPORT #endif // NET_TMWA_MERCENARYHANDLER_H -- cgit v1.2.3-70-g09d2