diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-02-28 22:22:27 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-02-28 22:57:47 +0300 |
| commit | 631e52266a80983046a61d68648becd9f3656ff7 (patch) | |
| tree | 7dd0519126de551fba03966dae97ab25b3d8a690 /src/net/tmwa | |
| parent | 22bb94a2587fa16d808ec966f01d07dc27d9f5d9 (diff) | |
| download | manaplus-631e52266a80983046a61d68648becd9f3656ff7.tar.gz manaplus-631e52266a80983046a61d68648becd9f3656ff7.tar.bz2 manaplus-631e52266a80983046a61d68648becd9f3656ff7.tar.xz manaplus-631e52266a80983046a61d68648becd9f3656ff7.zip | |
Build searchstorehandler only if eathena enabled.
Diffstat (limited to 'src/net/tmwa')
| -rw-r--r-- | src/net/tmwa/generalhandler.cpp | 6 | ||||
| -rw-r--r-- | src/net/tmwa/generalhandler.h | 2 | ||||
| -rw-r--r-- | src/net/tmwa/searchstorehandler.h | 3 |
3 files changed, 7 insertions, 4 deletions
diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp index 9205db800..3326ae3e7 100644 --- a/src/net/tmwa/generalhandler.cpp +++ b/src/net/tmwa/generalhandler.cpp @@ -117,9 +117,9 @@ GeneralHandler::GeneralHandler() : mMailHandler(new MailHandler), mMarketHandler(new MarketHandler), mMercenaryHandler(new MercenaryHandler), + mSearchStoreHandler(new SearchStoreHandler), #endif - mVendingHandler(new VendingHandler), - mSearchStoreHandler(new SearchStoreHandler) + mVendingHandler(new VendingHandler) { static const uint16_t _messages[] = { @@ -247,9 +247,9 @@ void GeneralHandler::load() mNetwork->registerHandler(mMailHandler); mNetwork->registerHandler(mMarketHandler); mNetwork->registerHandler(mMercenaryHandler); + mNetwork->registerHandler(mSearchStoreHandler); #endif mNetwork->registerHandler(mVendingHandler); - mNetwork->registerHandler(mSearchStoreHandler); } void GeneralHandler::reload() diff --git a/src/net/tmwa/generalhandler.h b/src/net/tmwa/generalhandler.h index c037da7c2..69208b4db 100644 --- a/src/net/tmwa/generalhandler.h +++ b/src/net/tmwa/generalhandler.h @@ -92,10 +92,10 @@ class GeneralHandler final : public MessageHandler, MessageHandlerPtr mHomunculusHandler; MessageHandlerPtr mMailHandler; MessageHandlerPtr mMarketHandler; + MessageHandlerPtr mSearchStoreHandler; #endif MessageHandlerPtr mMercenaryHandler; MessageHandlerPtr mVendingHandler; - MessageHandlerPtr mSearchStoreHandler; }; } // namespace TmwAthena diff --git a/src/net/tmwa/searchstorehandler.h b/src/net/tmwa/searchstorehandler.h index 4f2f9a6de..b0217d3cb 100644 --- a/src/net/tmwa/searchstorehandler.h +++ b/src/net/tmwa/searchstorehandler.h @@ -21,6 +21,8 @@ #ifndef NET_TMWA_SEARCHSTOREHANDLER_H #define NET_TMWA_SEARCHSTOREHANDLER_H +#ifdef EATHENA_SUPPORT + #include "net/searchstorehandler.h" #include "net/tmwa/messagehandler.h" @@ -53,4 +55,5 @@ class SearchStoreHandler final : public MessageHandler, } // namespace TmwAthena +#endif // EATHENA_SUPPORT #endif // NET_TMWA_SEARCHSTOREHANDLER_H |