diff options
Diffstat (limited to 'src/net/tmwa')
-rw-r--r-- | src/net/tmwa/friendshandler.h | 3 | ||||
-rw-r--r-- | src/net/tmwa/generalhandler.cpp | 4 | ||||
-rw-r--r-- | src/net/tmwa/generalhandler.h | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/src/net/tmwa/friendshandler.h b/src/net/tmwa/friendshandler.h index b5abdf8c4..2021352e4 100644 --- a/src/net/tmwa/friendshandler.h +++ b/src/net/tmwa/friendshandler.h @@ -21,6 +21,8 @@ #ifndef NET_TMWA_FRIENDSHANDLER_H #define NET_TMWA_FRIENDSHANDLER_H +#ifdef EATHENA_SUPPORT + #include "net/friendshandler.h" #include "net/tmwa/messagehandler.h" @@ -49,4 +51,5 @@ class FriendsHandler final : public MessageHandler, } // namespace TmwAthena +#endif // EATHENA_SUPPORT #endif // NET_TMWA_FRIENDSHANDLER_H diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp index 7008a70f8..e525d5b85 100644 --- a/src/net/tmwa/generalhandler.cpp +++ b/src/net/tmwa/generalhandler.cpp @@ -113,10 +113,10 @@ GeneralHandler::GeneralHandler() : mCashShopHandler(new CashShopHandler), mElementalHandler(new ElementalHandler), mFamilyHandler(new FamilyHandler), + mFriendsHandler(new FriendsHandler), #endif mMercenaryHandler(new MercenaryHandler), mHomunculusHandler(new HomunculusHandler), - mFriendsHandler(new FriendsHandler), mMarketHandler(new MarketHandler), mVendingHandler(new VendingHandler), mSearchStoreHandler(new SearchStoreHandler) @@ -243,10 +243,10 @@ void GeneralHandler::load() mNetwork->registerHandler(mCashShopHandler); mNetwork->registerHandler(mElementalHandler); mNetwork->registerHandler(mFamilyHandler); + mNetwork->registerHandler(mFriendsHandler); #endif mNetwork->registerHandler(mMercenaryHandler); mNetwork->registerHandler(mHomunculusHandler); - mNetwork->registerHandler(mFriendsHandler); mNetwork->registerHandler(mMarketHandler); mNetwork->registerHandler(mVendingHandler); mNetwork->registerHandler(mSearchStoreHandler); diff --git a/src/net/tmwa/generalhandler.h b/src/net/tmwa/generalhandler.h index 7f4d4793c..2075702ef 100644 --- a/src/net/tmwa/generalhandler.h +++ b/src/net/tmwa/generalhandler.h @@ -89,10 +89,10 @@ class GeneralHandler final : public MessageHandler, MessageHandlerPtr mCashShopHandler; MessageHandlerPtr mElementalHandler; MessageHandlerPtr mFamilyHandler; + MessageHandlerPtr mFriendsHandler; #endif MessageHandlerPtr mMercenaryHandler; MessageHandlerPtr mHomunculusHandler; - MessageHandlerPtr mFriendsHandler; MessageHandlerPtr mMarketHandler; MessageHandlerPtr mVendingHandler; MessageHandlerPtr mSearchStoreHandler; |