diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-02-28 22:56:32 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-02-28 22:57:51 +0300 |
| commit | 2490ef610773ad1c7adf33a28b2fc982b2b8ee7e (patch) | |
| tree | e84fa69940813b4e00966ed6dbf595222120b889 /src/net/tmwa | |
| parent | 631e52266a80983046a61d68648becd9f3656ff7 (diff) | |
| download | manaplus-2490ef610773ad1c7adf33a28b2fc982b2b8ee7e.tar.gz manaplus-2490ef610773ad1c7adf33a28b2fc982b2b8ee7e.tar.bz2 manaplus-2490ef610773ad1c7adf33a28b2fc982b2b8ee7e.tar.xz manaplus-2490ef610773ad1c7adf33a28b2fc982b2b8ee7e.zip | |
Build vendinghandler only if eathena enabled.
Diffstat (limited to 'src/net/tmwa')
| -rw-r--r-- | src/net/tmwa/generalhandler.cpp | 8 | ||||
| -rw-r--r-- | src/net/tmwa/generalhandler.h | 2 | ||||
| -rw-r--r-- | src/net/tmwa/vendinghandler.h | 3 |
3 files changed, 9 insertions, 4 deletions
diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp index 3326ae3e7..921b30f7a 100644 --- a/src/net/tmwa/generalhandler.cpp +++ b/src/net/tmwa/generalhandler.cpp @@ -104,8 +104,8 @@ GeneralHandler::GeneralHandler() : mSkillHandler(new SkillHandler), mTradeHandler(new TradeHandler), mQuestHandler(new QuestHandler), - mServerFeatures(new ServerFeatures), #ifdef EATHENA_SUPPORT + mServerFeatures(new ServerFeatures), mAuctionHandler(new AuctionHandler), mBankHandler(new BankHandler), mBuyingStoreHandler(new BuyingStoreHandler), @@ -118,8 +118,10 @@ GeneralHandler::GeneralHandler() : mMarketHandler(new MarketHandler), mMercenaryHandler(new MercenaryHandler), mSearchStoreHandler(new SearchStoreHandler), -#endif mVendingHandler(new VendingHandler) +#else + mServerFeatures(new ServerFeatures) +#endif { static const uint16_t _messages[] = { @@ -248,8 +250,8 @@ void GeneralHandler::load() mNetwork->registerHandler(mMarketHandler); mNetwork->registerHandler(mMercenaryHandler); mNetwork->registerHandler(mSearchStoreHandler); -#endif mNetwork->registerHandler(mVendingHandler); +#endif } void GeneralHandler::reload() diff --git a/src/net/tmwa/generalhandler.h b/src/net/tmwa/generalhandler.h index 69208b4db..6c30a5d65 100644 --- a/src/net/tmwa/generalhandler.h +++ b/src/net/tmwa/generalhandler.h @@ -93,9 +93,9 @@ class GeneralHandler final : public MessageHandler, MessageHandlerPtr mMailHandler; MessageHandlerPtr mMarketHandler; MessageHandlerPtr mSearchStoreHandler; + MessageHandlerPtr mVendingHandler; #endif MessageHandlerPtr mMercenaryHandler; - MessageHandlerPtr mVendingHandler; }; } // namespace TmwAthena diff --git a/src/net/tmwa/vendinghandler.h b/src/net/tmwa/vendinghandler.h index 22629be1f..ddfe72971 100644 --- a/src/net/tmwa/vendinghandler.h +++ b/src/net/tmwa/vendinghandler.h @@ -21,6 +21,8 @@ #ifndef NET_TMWA_VENDINGHANDLER_H #define NET_TMWA_VENDINGHANDLER_H +#ifdef EATHENA_SUPPORT + #include "net/vendinghandler.h" #include "net/tmwa/messagehandler.h" @@ -58,4 +60,5 @@ class VendingHandler final : public MessageHandler, } // namespace TmwAthena +#endif // EATHENA_SUPPORT #endif // NET_TMWA_VENDINGHANDLER_H |