diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-02-27 01:45:13 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-02-27 01:51:18 +0300 |
| commit | cc68aec5ca370dcf190af39f3f8b269706c928b2 (patch) | |
| tree | 57c01b0bcd6233cb720e77b2ee3515a4cc16fb26 /src/net/tmwa | |
| parent | 6901946dcbe81192560a80c20b1e787b11579ebc (diff) | |
| download | plus-cc68aec5ca370dcf190af39f3f8b269706c928b2.tar.gz plus-cc68aec5ca370dcf190af39f3f8b269706c928b2.tar.bz2 plus-cc68aec5ca370dcf190af39f3f8b269706c928b2.tar.xz plus-cc68aec5ca370dcf190af39f3f8b269706c928b2.zip | |
Build familyhandler only if eathena enabled.
Diffstat (limited to 'src/net/tmwa')
| -rw-r--r-- | src/net/tmwa/auctionhandler.h | 1 | ||||
| -rw-r--r-- | src/net/tmwa/familyhandler.h | 3 | ||||
| -rw-r--r-- | src/net/tmwa/generalhandler.cpp | 4 | ||||
| -rw-r--r-- | src/net/tmwa/generalhandler.h | 2 |
4 files changed, 6 insertions, 4 deletions
diff --git a/src/net/tmwa/auctionhandler.h b/src/net/tmwa/auctionhandler.h index 01e1428d7..0cc72f184 100644 --- a/src/net/tmwa/auctionhandler.h +++ b/src/net/tmwa/auctionhandler.h @@ -29,7 +29,6 @@ namespace TmwAthena { - class AuctionHandler final : public MessageHandler, public Net::AuctionHandler { public: diff --git a/src/net/tmwa/familyhandler.h b/src/net/tmwa/familyhandler.h index 56e5d9873..e284312b9 100644 --- a/src/net/tmwa/familyhandler.h +++ b/src/net/tmwa/familyhandler.h @@ -21,6 +21,8 @@ #ifndef NET_TMWA_FAMILYHANDLER_H #define NET_TMWA_FAMILYHANDLER_H +#ifdef EATHENA_SUPPORT + #include "net/familyhandler.h" #include "net/tmwa/messagehandler.h" @@ -45,4 +47,5 @@ class FamilyHandler final : public MessageHandler, } // namespace TmwAthena +#endif // EATHENA_SUPPORT #endif // NET_TMWA_FAMILYHANDLER_H diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp index bf36f1fc3..7008a70f8 100644 --- a/src/net/tmwa/generalhandler.cpp +++ b/src/net/tmwa/generalhandler.cpp @@ -112,8 +112,8 @@ GeneralHandler::GeneralHandler() : mBuyingStoreHandler(new BuyingStoreHandler), mCashShopHandler(new CashShopHandler), mElementalHandler(new ElementalHandler), -#endif mFamilyHandler(new FamilyHandler), +#endif mMercenaryHandler(new MercenaryHandler), mHomunculusHandler(new HomunculusHandler), mFriendsHandler(new FriendsHandler), @@ -242,8 +242,8 @@ void GeneralHandler::load() mNetwork->registerHandler(mBuyingStoreHandler); mNetwork->registerHandler(mCashShopHandler); mNetwork->registerHandler(mElementalHandler); -#endif mNetwork->registerHandler(mFamilyHandler); +#endif mNetwork->registerHandler(mMercenaryHandler); mNetwork->registerHandler(mHomunculusHandler); mNetwork->registerHandler(mFriendsHandler); diff --git a/src/net/tmwa/generalhandler.h b/src/net/tmwa/generalhandler.h index 08ef109a9..7f4d4793c 100644 --- a/src/net/tmwa/generalhandler.h +++ b/src/net/tmwa/generalhandler.h @@ -88,8 +88,8 @@ class GeneralHandler final : public MessageHandler, MessageHandlerPtr mBuyingStoreHandler; MessageHandlerPtr mCashShopHandler; MessageHandlerPtr mElementalHandler; -#endif MessageHandlerPtr mFamilyHandler; +#endif MessageHandlerPtr mMercenaryHandler; MessageHandlerPtr mHomunculusHandler; MessageHandlerPtr mFriendsHandler; |