summaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-02-28 21:12:15 +0300
committerAndrei Karas <akaras@inbox.ru>2015-02-28 21:12:15 +0300
commitb96242e1d5a6af71e6f884596f77268743945c63 (patch)
tree1fc425037771265a1134956641c466095b7349a1 /src/net
parent0cc662938674c22bb5a3d1e1521fe90eb28121e4 (diff)
downloadplus-b96242e1d5a6af71e6f884596f77268743945c63.tar.gz
plus-b96242e1d5a6af71e6f884596f77268743945c63.tar.bz2
plus-b96242e1d5a6af71e6f884596f77268743945c63.tar.xz
plus-b96242e1d5a6af71e6f884596f77268743945c63.zip
Build homunculushandler only if eathena enabled.
Diffstat (limited to 'src/net')
-rw-r--r--src/net/eathena/homunculushandler.h3
-rw-r--r--src/net/homunculushandler.h3
-rw-r--r--src/net/net.cpp4
-rw-r--r--src/net/tmwa/generalhandler.cpp4
-rw-r--r--src/net/tmwa/generalhandler.h2
-rw-r--r--src/net/tmwa/homunculushandler.h3
6 files changed, 14 insertions, 5 deletions
diff --git a/src/net/eathena/homunculushandler.h b/src/net/eathena/homunculushandler.h
index a8d80fc65..db992b5b3 100644
--- a/src/net/eathena/homunculushandler.h
+++ b/src/net/eathena/homunculushandler.h
@@ -21,6 +21,8 @@
#ifndef NET_EATHENA_HOMUNCULUSHANDLER_H
#define NET_EATHENA_HOMUNCULUSHANDLER_H
+#ifdef EATHENA_SUPPORT
+
#include "net/homunculushandler.h"
#include "net/eathena/messagehandler.h"
@@ -69,4 +71,5 @@ class HomunculusHandler final : public MessageHandler,
} // namespace EAthena
+#endif // EATHENA_SUPPORT
#endif // NET_EATHENA_HOMUNCULUSHANDLER_H
diff --git a/src/net/homunculushandler.h b/src/net/homunculushandler.h
index 31fb65f08..e587a02e8 100644
--- a/src/net/homunculushandler.h
+++ b/src/net/homunculushandler.h
@@ -21,6 +21,8 @@
#ifndef NET_HOMUNCULUSHANDLER_H
#define NET_HOMUNCULUSHANDLER_H
+#ifdef EATHENA_SUPPORT
+
#include <string>
#include "localconsts.h"
@@ -57,4 +59,5 @@ class HomunculusHandler notfinal
extern Net::HomunculusHandler *homunculusHandler;
+#endif // EATHENA_SUPPORT
#endif // NET_HOMUNCULUSHANDLER_H
diff --git a/src/net/net.cpp b/src/net/net.cpp
index 47ab9d8a0..5a6156653 100644
--- a/src/net/net.cpp
+++ b/src/net/net.cpp
@@ -48,6 +48,7 @@ namespace Net
class ElementalHandler;
class FamilyHandler;
class FriendsHandler;
+ class HomunculusHandler;
#endif
class AdminHandler;
class BeingHandler;
@@ -57,7 +58,6 @@ namespace Net
class GameHandler;
class GeneralHandler;
class GuildHandler;
- class HomunculusHandler;
class InventoryHandler;
class MailHandler;
class MarketHandler;
@@ -101,9 +101,9 @@ Net::CashShopHandler *cashShopHandler = nullptr;
Net::ElementalHandler *elementalHandler = nullptr;
Net::FamilyHandler *familyHandler = nullptr;
Net::FriendsHandler *friendsHandler = nullptr;
+Net::HomunculusHandler *homunculusHandler = nullptr;
#endif
Net::QuestHandler *questHandler = nullptr;
-Net::HomunculusHandler *homunculusHandler = nullptr;
Net::MarketHandler *marketHandler = nullptr;
Net::VendingHandler *vendingHandler = nullptr;
Net::SearchStoreHandler *searchStoreHandler = nullptr;
diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp
index e525d5b85..2a353df80 100644
--- a/src/net/tmwa/generalhandler.cpp
+++ b/src/net/tmwa/generalhandler.cpp
@@ -114,9 +114,9 @@ GeneralHandler::GeneralHandler() :
mElementalHandler(new ElementalHandler),
mFamilyHandler(new FamilyHandler),
mFriendsHandler(new FriendsHandler),
+ mHomunculusHandler(new HomunculusHandler),
#endif
mMercenaryHandler(new MercenaryHandler),
- mHomunculusHandler(new HomunculusHandler),
mMarketHandler(new MarketHandler),
mVendingHandler(new VendingHandler),
mSearchStoreHandler(new SearchStoreHandler)
@@ -244,9 +244,9 @@ void GeneralHandler::load()
mNetwork->registerHandler(mElementalHandler);
mNetwork->registerHandler(mFamilyHandler);
mNetwork->registerHandler(mFriendsHandler);
+ mNetwork->registerHandler(mHomunculusHandler);
#endif
mNetwork->registerHandler(mMercenaryHandler);
- mNetwork->registerHandler(mHomunculusHandler);
mNetwork->registerHandler(mMarketHandler);
mNetwork->registerHandler(mVendingHandler);
mNetwork->registerHandler(mSearchStoreHandler);
diff --git a/src/net/tmwa/generalhandler.h b/src/net/tmwa/generalhandler.h
index 2075702ef..746df8460 100644
--- a/src/net/tmwa/generalhandler.h
+++ b/src/net/tmwa/generalhandler.h
@@ -90,9 +90,9 @@ class GeneralHandler final : public MessageHandler,
MessageHandlerPtr mElementalHandler;
MessageHandlerPtr mFamilyHandler;
MessageHandlerPtr mFriendsHandler;
+ MessageHandlerPtr mHomunculusHandler;
#endif
MessageHandlerPtr mMercenaryHandler;
- MessageHandlerPtr mHomunculusHandler;
MessageHandlerPtr mMarketHandler;
MessageHandlerPtr mVendingHandler;
MessageHandlerPtr mSearchStoreHandler;
diff --git a/src/net/tmwa/homunculushandler.h b/src/net/tmwa/homunculushandler.h
index bd39b54bb..5b4272161 100644
--- a/src/net/tmwa/homunculushandler.h
+++ b/src/net/tmwa/homunculushandler.h
@@ -21,6 +21,8 @@
#ifndef NET_TMWA_HOMUNCULUSHANDLER_H
#define NET_TMWA_HOMUNCULUSHANDLER_H
+#ifdef EATHENA_SUPPORT
+
#include "net/homunculushandler.h"
#include "net/tmwa/messagehandler.h"
@@ -59,4 +61,5 @@ class HomunculusHandler final : public MessageHandler,
} // namespace TmwAthena
+#endif // EATHENA_SUPPORT
#endif // NET_TMWA_HOMUNCULUSHANDLER_H