summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/CMakeLists.txt6
-rw-r--r--src/Makefile.am8
-rw-r--r--src/net/elementalhandler.h3
-rw-r--r--src/net/net.cpp4
-rw-r--r--src/net/tmwa/elementalhandler.h3
-rw-r--r--src/net/tmwa/generalhandler.cpp10
-rw-r--r--src/net/tmwa/generalhandler.h2
7 files changed, 22 insertions, 14 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 158c9e116..e416c0b01 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -525,7 +525,6 @@ SET(SRCS
net/charserverhandler.cpp
net/charserverhandler.h
net/chathandler.h
- net/elementalhandler.h
net/download.cpp
net/download.h
enums/net/auctionsearchtype.h
@@ -1328,8 +1327,6 @@ SET(SRCS_TMWA
net/tmwa/charserverhandler.h
net/tmwa/chathandler.cpp
net/tmwa/chathandler.h
- net/tmwa/elementalhandler.cpp
- net/tmwa/elementalhandler.h
net/tmwa/familyhandler.cpp
net/tmwa/familyhandler.h
net/tmwa/friendshandler.cpp
@@ -1396,6 +1393,8 @@ SET(SRCS_TMWAEATHENA
net/tmwa/buyingstorehandler.h
net/tmwa/cashshophandler.cpp
net/tmwa/cashshophandler.h
+ net/tmwa/elementalhandler.cpp
+ net/tmwa/elementalhandler.h
)
SET(SRCS_EATHENA
@@ -1423,6 +1422,7 @@ SET(SRCS_EATHENA
net/bankhandler.h
net/buyingstorehandler.h
net/cashshophandler.h
+ net/elementalhandler.h
net/eathena/adminhandler.cpp
net/eathena/adminhandler.h
net/eathena/auctionhandler.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 47f49f8c0..dfc70ca90 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -651,7 +651,6 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
net/charserverhandler.cpp \
net/charserverhandler.h \
net/chathandler.h \
- net/elementalhandler.h \
net/familyhandler.h \
net/friendshandler.h \
net/download.cpp \
@@ -1261,8 +1260,6 @@ manaplus_SOURCES += \
net/tmwa/charserverhandler.h \
net/tmwa/chathandler.cpp \
net/tmwa/chathandler.h \
- net/tmwa/elementalhandler.cpp \
- net/tmwa/elementalhandler.h \
net/tmwa/familyhandler.cpp \
net/tmwa/familyhandler.h \
net/tmwa/friendshandler.cpp \
@@ -1329,7 +1326,9 @@ manaplus_SOURCES += net/tmwa/auctionhandler.cpp \
net/tmwa/buyingstorehandler.cpp \
net/tmwa/buyingstorehandler.h \
net/tmwa/cashshophandler.cpp \
- net/tmwa/cashshophandler.h
+ net/tmwa/cashshophandler.h \
+ net/tmwa/elementalhandler.cpp \
+ net/tmwa/elementalhandler.h
endif
manaplus_CXXFLAGS += -DEATHENA_SUPPORT
@@ -1357,6 +1356,7 @@ manaplus_SOURCES += gui/windows/bankwindow.cpp \
net/bankhandler.h \
net/buyingstorehandler.h \
net/cashshophandler.h \
+ net/elementalhandler.h \
net/eathena/adminhandler.cpp \
net/eathena/adminhandler.h \
net/eathena/auctionhandler.cpp \
diff --git a/src/net/elementalhandler.h b/src/net/elementalhandler.h
index 5c7749eb4..aad35ef6e 100644
--- a/src/net/elementalhandler.h
+++ b/src/net/elementalhandler.h
@@ -21,6 +21,8 @@
#ifndef NET_ELEMENTALHANDLER_H
#define NET_ELEMENTALHANDLER_H
+#ifdef EATHENA_SUPPORT
+
#include <string>
#include "localconsts.h"
@@ -39,4 +41,5 @@ class ElementalHandler notfinal
extern Net::ElementalHandler *elementalHandler;
+#endif // EATHENA_SUPPORT
#endif // NET_ELEMENTALHANDLER_H
diff --git a/src/net/net.cpp b/src/net/net.cpp
index 473ac617b..e421bfe1a 100644
--- a/src/net/net.cpp
+++ b/src/net/net.cpp
@@ -45,13 +45,13 @@ namespace Net
class BankHandler;
class BuyingStoreHandler;
class CashShopHandler;
+ class ElementalHandler;
#endif
class AdminHandler;
class BeingHandler;
class BuySellHandler;
class CharServerHandler;
class ChatHandler;
- class ElementalHandler;
class FamilyHandler;
class FriendsHandler;
class GameHandler;
@@ -98,12 +98,12 @@ Net::AuctionHandler *auctionHandler = nullptr;
Net::BankHandler *bankHandler = nullptr;
Net::BuyingStoreHandler *buyingStoreHandler = nullptr;
Net::CashShopHandler *cashShopHandler = nullptr;
+Net::ElementalHandler *elementalHandler = nullptr;
#endif
Net::FamilyHandler *familyHandler = nullptr;
Net::QuestHandler *questHandler = nullptr;
Net::HomunculusHandler *homunculusHandler = nullptr;
Net::FriendsHandler *friendsHandler = nullptr;
-Net::ElementalHandler *elementalHandler = nullptr;
Net::MarketHandler *marketHandler = nullptr;
Net::VendingHandler *vendingHandler = nullptr;
Net::SearchStoreHandler *searchStoreHandler = nullptr;
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;
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-26 01:06:26 +0000