summaryrefslogtreecommitdiff
path: root/src/net/tmwa
diff options
context:
space:
mode:
Diffstat (limited to 'src/net/tmwa')
-rw-r--r--src/net/tmwa/elementalhandler.h3
-rw-r--r--src/net/tmwa/generalhandler.cpp10
-rw-r--r--src/net/tmwa/generalhandler.h2
3 files changed, 10 insertions, 5 deletions
diff --git a/src/net/tmwa/elementalhandler.h b/src/net/tmwa/elementalhandler.h
index 0f4e8b7d3..bacb7260e 100644
--- a/src/net/tmwa/elementalhandler.h
+++ b/src/net/tmwa/elementalhandler.h
@@ -21,6 +21,8 @@
#ifndef NET_TMWA_ELEMENTALHANDLER_H
#define NET_TMWA_ELEMENTALHANDLER_H
+#ifdef EATHENA_SUPPORT
+
#include "net/elementalhandler.h"
#include "net/tmwa/messagehandler.h"
@@ -40,4 +42,5 @@ class ElementalHandler final : public MessageHandler,
} // namespace TmwAthena
+#endif // EATHENA_SUPPORT
#endif // NET_TMWA_ELEMENTALHANDLER_H
diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp
index 1739aef45..bf36f1fc3 100644
--- a/src/net/tmwa/generalhandler.cpp
+++ b/src/net/tmwa/generalhandler.cpp
@@ -111,12 +111,12 @@ GeneralHandler::GeneralHandler() :
mBankHandler(new BankHandler),
mBuyingStoreHandler(new BuyingStoreHandler),
mCashShopHandler(new CashShopHandler),
+ mElementalHandler(new ElementalHandler),
#endif
mFamilyHandler(new FamilyHandler),
mMercenaryHandler(new MercenaryHandler),
mHomunculusHandler(new HomunculusHandler),
mFriendsHandler(new FriendsHandler),
- mElementalHandler(new ElementalHandler),
mMarketHandler(new MarketHandler),
mVendingHandler(new VendingHandler),
mSearchStoreHandler(new SearchStoreHandler)
@@ -236,15 +236,17 @@ void GeneralHandler::load()
mNetwork->registerHandler(mPetHandler);
mNetwork->registerHandler(mQuestHandler);
mNetwork->registerHandler(mMailHandler);
+#ifdef EATHENA_SUPPORT
mNetwork->registerHandler(mAuctionHandler);
+ mNetwork->registerHandler(mBankHandler);
+ mNetwork->registerHandler(mBuyingStoreHandler);
mNetwork->registerHandler(mCashShopHandler);
+ mNetwork->registerHandler(mElementalHandler);
+#endif
mNetwork->registerHandler(mFamilyHandler);
- mNetwork->registerHandler(mBankHandler);
mNetwork->registerHandler(mMercenaryHandler);
- mNetwork->registerHandler(mBuyingStoreHandler);
mNetwork->registerHandler(mHomunculusHandler);
mNetwork->registerHandler(mFriendsHandler);
- mNetwork->registerHandler(mElementalHandler);
mNetwork->registerHandler(mMarketHandler);
mNetwork->registerHandler(mVendingHandler);
mNetwork->registerHandler(mSearchStoreHandler);
diff --git a/src/net/tmwa/generalhandler.h b/src/net/tmwa/generalhandler.h
index 292ce6dd7..08ef109a9 100644
--- a/src/net/tmwa/generalhandler.h
+++ b/src/net/tmwa/generalhandler.h
@@ -87,12 +87,12 @@ class GeneralHandler final : public MessageHandler,
MessageHandlerPtr mBankHandler;
MessageHandlerPtr mBuyingStoreHandler;
MessageHandlerPtr mCashShopHandler;
+ MessageHandlerPtr mElementalHandler;
#endif
MessageHandlerPtr mFamilyHandler;
MessageHandlerPtr mMercenaryHandler;
MessageHandlerPtr mHomunculusHandler;
MessageHandlerPtr mFriendsHandler;
- MessageHandlerPtr mElementalHandler;
MessageHandlerPtr mMarketHandler;
MessageHandlerPtr mVendingHandler;
MessageHandlerPtr mSearchStoreHandler;