summaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
Diffstat (limited to 'src/net')
-rw-r--r--src/net/ea/charserverhandler.cpp3
-rw-r--r--src/net/ea/loginhandler.cpp5
-rw-r--r--src/net/eathena/adminhandler.cpp3
-rw-r--r--src/net/eathena/beinghandler.cpp1
-rw-r--r--src/net/eathena/buysellhandler.cpp4
-rw-r--r--src/net/eathena/charserverhandler.cpp4
-rw-r--r--src/net/eathena/chathandler.cpp4
-rw-r--r--src/net/eathena/gamehandler.cpp4
-rw-r--r--src/net/eathena/generalhandler.cpp3
-rw-r--r--src/net/eathena/guildhandler.cpp4
-rw-r--r--src/net/eathena/inventoryhandler.cpp4
-rw-r--r--src/net/eathena/itemhandler.cpp4
-rw-r--r--src/net/eathena/loginhandler.cpp4
-rw-r--r--src/net/eathena/messageout.cpp4
-rw-r--r--src/net/eathena/network.cpp3
-rw-r--r--src/net/eathena/npchandler.cpp4
-rw-r--r--src/net/eathena/partyhandler.cpp1
-rw-r--r--src/net/eathena/playerhandler.cpp4
-rw-r--r--src/net/eathena/specialhandler.cpp4
-rw-r--r--src/net/eathena/tradehandler.cpp4
-rw-r--r--src/net/tmwa/adminhandler.cpp3
-rw-r--r--src/net/tmwa/beinghandler.cpp3
-rw-r--r--src/net/tmwa/buysellhandler.cpp4
-rw-r--r--src/net/tmwa/charserverhandler.cpp4
-rw-r--r--src/net/tmwa/chathandler.cpp4
-rw-r--r--src/net/tmwa/gamehandler.cpp4
-rw-r--r--src/net/tmwa/generalhandler.cpp3
-rw-r--r--src/net/tmwa/guildhandler.cpp4
-rw-r--r--src/net/tmwa/inventoryhandler.cpp4
-rw-r--r--src/net/tmwa/itemhandler.cpp4
-rw-r--r--src/net/tmwa/loginhandler.cpp4
-rw-r--r--src/net/tmwa/messageout.cpp4
-rw-r--r--src/net/tmwa/network.cpp3
-rw-r--r--src/net/tmwa/npchandler.cpp2
-rw-r--r--src/net/tmwa/partyhandler.cpp1
-rw-r--r--src/net/tmwa/playerhandler.cpp4
-rw-r--r--src/net/tmwa/questhandler.cpp3
-rw-r--r--src/net/tmwa/specialhandler.cpp4
-rw-r--r--src/net/tmwa/tradehandler.cpp4
39 files changed, 99 insertions, 38 deletions
diff --git a/src/net/ea/charserverhandler.cpp b/src/net/ea/charserverhandler.cpp
index 7e0a5106d..b4708b3f7 100644
--- a/src/net/ea/charserverhandler.cpp
+++ b/src/net/ea/charserverhandler.cpp
@@ -42,7 +42,8 @@ extern Net::CharHandler *charHandler;
namespace Ea
{
-CharServerHandler::CharServerHandler()
+CharServerHandler::CharServerHandler() :
+ Net::CharHandler()
{
}
diff --git a/src/net/ea/loginhandler.cpp b/src/net/ea/loginhandler.cpp
index 09a4066e0..c00301c7a 100644
--- a/src/net/ea/loginhandler.cpp
+++ b/src/net/ea/loginhandler.cpp
@@ -36,8 +36,9 @@ namespace Ea
{
LoginHandler::LoginHandler() :
- mVersionResponse(false),
- mRegistrationEnabled(true)
+ Net::LoginHandler(),
+ mVersionResponse(false),
+ mRegistrationEnabled(true)
{
mToken.clear();
}
diff --git a/src/net/eathena/adminhandler.cpp b/src/net/eathena/adminhandler.cpp
index 56b636b3b..0f9d373df 100644
--- a/src/net/eathena/adminhandler.cpp
+++ b/src/net/eathena/adminhandler.cpp
@@ -42,7 +42,8 @@ extern Net::AdminHandler *adminHandler;
namespace EAthena
{
-AdminHandler::AdminHandler()
+AdminHandler::AdminHandler() :
+ MessageHandler()
{
static const uint16_t _messages[] =
{
diff --git a/src/net/eathena/beinghandler.cpp b/src/net/eathena/beinghandler.cpp
index eb2ce5f74..857a0a8fb 100644
--- a/src/net/eathena/beinghandler.cpp
+++ b/src/net/eathena/beinghandler.cpp
@@ -58,6 +58,7 @@ namespace EAthena
{
BeingHandler::BeingHandler(bool enableSync):
+ MessageHandler(),
Ea::BeingHandler(enableSync)
{
static const uint16_t _messages[] =
diff --git a/src/net/eathena/buysellhandler.cpp b/src/net/eathena/buysellhandler.cpp
index 4dbc90e4b..3294bc1c8 100644
--- a/src/net/eathena/buysellhandler.cpp
+++ b/src/net/eathena/buysellhandler.cpp
@@ -52,7 +52,9 @@ extern Net::BuySellHandler *buySellHandler;
namespace EAthena
{
-BuySellHandler::BuySellHandler()
+BuySellHandler::BuySellHandler() :
+ MessageHandler(),
+ Ea::BuySellHandler()
{
static const uint16_t _messages[] =
{
diff --git a/src/net/eathena/charserverhandler.cpp b/src/net/eathena/charserverhandler.cpp
index 69ccc59a4..fcec75364 100644
--- a/src/net/eathena/charserverhandler.cpp
+++ b/src/net/eathena/charserverhandler.cpp
@@ -50,7 +50,9 @@ namespace EAthena
extern ServerInfo charServer;
extern ServerInfo mapServer;
-CharServerHandler::CharServerHandler()
+CharServerHandler::CharServerHandler() :
+ MessageHandler(),
+ Ea::CharServerHandler()
{
static const uint16_t _messages[] =
{
diff --git a/src/net/eathena/chathandler.cpp b/src/net/eathena/chathandler.cpp
index 77cf50acd..bd516ef26 100644
--- a/src/net/eathena/chathandler.cpp
+++ b/src/net/eathena/chathandler.cpp
@@ -45,7 +45,9 @@ extern Net::ChatHandler *chatHandler;
namespace EAthena
{
-ChatHandler::ChatHandler()
+ChatHandler::ChatHandler() :
+ MessageHandler(),
+ Ea::ChatHandler()
{
static const uint16_t _messages[] =
{
diff --git a/src/net/eathena/gamehandler.cpp b/src/net/eathena/gamehandler.cpp
index 09e6e4121..2ea687a88 100644
--- a/src/net/eathena/gamehandler.cpp
+++ b/src/net/eathena/gamehandler.cpp
@@ -39,7 +39,9 @@ namespace EAthena
extern ServerInfo mapServer;
-GameHandler::GameHandler()
+GameHandler::GameHandler() :
+ MessageHandler(),
+ Ea::GameHandler()
{
static const uint16_t _messages[] =
{
diff --git a/src/net/eathena/generalhandler.cpp b/src/net/eathena/generalhandler.cpp
index 82c52e943..b95991f55 100644
--- a/src/net/eathena/generalhandler.cpp
+++ b/src/net/eathena/generalhandler.cpp
@@ -72,7 +72,8 @@ namespace EAthena
ServerInfo charServer;
ServerInfo mapServer;
-GeneralHandler::GeneralHandler():
+GeneralHandler::GeneralHandler() :
+ MessageHandler(),
mAdminHandler(new AdminHandler),
mBeingHandler(new BeingHandler(config.getBoolValue("EnableSync"))),
mBuySellHandler(new BuySellHandler),
diff --git a/src/net/eathena/guildhandler.cpp b/src/net/eathena/guildhandler.cpp
index 4e22fe691..74a14f132 100644
--- a/src/net/eathena/guildhandler.cpp
+++ b/src/net/eathena/guildhandler.cpp
@@ -35,7 +35,9 @@ extern Net::GuildHandler *guildHandler;
namespace EAthena
{
-GuildHandler::GuildHandler()
+GuildHandler::GuildHandler() :
+ Ea::GuildHandler(),
+ MessageHandler()
{
static const uint16_t _messages[] =
{
diff --git a/src/net/eathena/inventoryhandler.cpp b/src/net/eathena/inventoryhandler.cpp
index 9f4b18ab2..e655920c1 100644
--- a/src/net/eathena/inventoryhandler.cpp
+++ b/src/net/eathena/inventoryhandler.cpp
@@ -33,7 +33,9 @@ extern Net::InventoryHandler *inventoryHandler;
namespace EAthena
{
-InventoryHandler::InventoryHandler()
+InventoryHandler::InventoryHandler() :
+ MessageHandler(),
+ Ea::InventoryHandler()
{
static const uint16_t _messages[] =
{
diff --git a/src/net/eathena/itemhandler.cpp b/src/net/eathena/itemhandler.cpp
index 8eedb8562..1aad83027 100644
--- a/src/net/eathena/itemhandler.cpp
+++ b/src/net/eathena/itemhandler.cpp
@@ -29,7 +29,9 @@
namespace EAthena
{
-ItemHandler::ItemHandler()
+ItemHandler::ItemHandler() :
+ MessageHandler(),
+ Ea::ItemHandler()
{
static const uint16_t _messages[] =
{
diff --git a/src/net/eathena/loginhandler.cpp b/src/net/eathena/loginhandler.cpp
index 1aeef1c09..21da4ba9f 100644
--- a/src/net/eathena/loginhandler.cpp
+++ b/src/net/eathena/loginhandler.cpp
@@ -41,7 +41,9 @@ namespace EAthena
extern ServerInfo charServer;
-LoginHandler::LoginHandler()
+LoginHandler::LoginHandler() :
+ MessageHandler(),
+ Ea::LoginHandler()
{
static const uint16_t _messages[] =
{
diff --git a/src/net/eathena/messageout.cpp b/src/net/eathena/messageout.cpp
index 6e35c50c4..bef5ff817 100644
--- a/src/net/eathena/messageout.cpp
+++ b/src/net/eathena/messageout.cpp
@@ -40,9 +40,9 @@ namespace EAthena
{
MessageOut::MessageOut(short id):
- Net::MessageOut(id)
+ Net::MessageOut(id),
+ mNetwork(EAthena::Network::instance())
{
- mNetwork = EAthena::Network::instance();
mNetwork->fixSendBuffer();
mData = mNetwork->mOutBuffer + mNetwork->mOutSize;
diff --git a/src/net/eathena/network.cpp b/src/net/eathena/network.cpp
index 475aaa72e..8a9a010f8 100644
--- a/src/net/eathena/network.cpp
+++ b/src/net/eathena/network.cpp
@@ -110,7 +110,8 @@ short packet_lengths[] =
Network *Network::mInstance = nullptr;
-Network::Network()
+Network::Network() :
+ Ea::Network()
{
mInstance = this;
}
diff --git a/src/net/eathena/npchandler.cpp b/src/net/eathena/npchandler.cpp
index aa77a23e5..4eaa00191 100644
--- a/src/net/eathena/npchandler.cpp
+++ b/src/net/eathena/npchandler.cpp
@@ -40,7 +40,9 @@ extern Net::NpcHandler *npcHandler;
namespace EAthena
{
-NpcHandler::NpcHandler()
+NpcHandler::NpcHandler() :
+ MessageHandler(),
+ Ea::NpcHandler()
{
static const uint16_t _messages[] =
{
diff --git a/src/net/eathena/partyhandler.cpp b/src/net/eathena/partyhandler.cpp
index e1052d50d..c452d2ae0 100644
--- a/src/net/eathena/partyhandler.cpp
+++ b/src/net/eathena/partyhandler.cpp
@@ -38,6 +38,7 @@ namespace EAthena
{
PartyHandler::PartyHandler() :
+ MessageHandler(),
Ea::PartyHandler()
{
static const uint16_t _messages[] =
diff --git a/src/net/eathena/playerhandler.cpp b/src/net/eathena/playerhandler.cpp
index 633bb12e4..0d4a51bc9 100644
--- a/src/net/eathena/playerhandler.cpp
+++ b/src/net/eathena/playerhandler.cpp
@@ -38,7 +38,9 @@ extern Net::PlayerHandler *playerHandler;
namespace EAthena
{
-PlayerHandler::PlayerHandler()
+PlayerHandler::PlayerHandler() :
+ MessageHandler(),
+ Ea::PlayerHandler()
{
static const uint16_t _messages[] =
{
diff --git a/src/net/eathena/specialhandler.cpp b/src/net/eathena/specialhandler.cpp
index 77bb5a1d2..668a67519 100644
--- a/src/net/eathena/specialhandler.cpp
+++ b/src/net/eathena/specialhandler.cpp
@@ -33,7 +33,9 @@ extern Net::SpecialHandler *specialHandler;
namespace EAthena
{
-SpecialHandler::SpecialHandler()
+SpecialHandler::SpecialHandler() :
+ MessageHandler(),
+ Ea::SpecialHandler()
{
static const uint16_t _messages[] =
{
diff --git a/src/net/eathena/tradehandler.cpp b/src/net/eathena/tradehandler.cpp
index a9416f8cd..cf33aa3cd 100644
--- a/src/net/eathena/tradehandler.cpp
+++ b/src/net/eathena/tradehandler.cpp
@@ -36,7 +36,9 @@ extern Net::TradeHandler *tradeHandler;
namespace EAthena
{
-TradeHandler::TradeHandler()
+TradeHandler::TradeHandler() :
+ MessageHandler(),
+ Ea::TradeHandler()
{
static const uint16_t _messages[] =
{
diff --git a/src/net/tmwa/adminhandler.cpp b/src/net/tmwa/adminhandler.cpp
index ae45d44d6..d7fc78d1d 100644
--- a/src/net/tmwa/adminhandler.cpp
+++ b/src/net/tmwa/adminhandler.cpp
@@ -42,7 +42,8 @@ extern Net::AdminHandler *adminHandler;
namespace TmwAthena
{
-AdminHandler::AdminHandler()
+AdminHandler::AdminHandler() :
+ MessageHandler()
{
static const uint16_t _messages[] =
{
diff --git a/src/net/tmwa/beinghandler.cpp b/src/net/tmwa/beinghandler.cpp
index 37ce67213..5bf0bc1d6 100644
--- a/src/net/tmwa/beinghandler.cpp
+++ b/src/net/tmwa/beinghandler.cpp
@@ -57,7 +57,8 @@ extern Net::BeingHandler *beingHandler;
namespace TmwAthena
{
-BeingHandler::BeingHandler(bool enableSync):
+BeingHandler::BeingHandler(bool enableSync) :
+ MessageHandler(),
Ea::BeingHandler(enableSync)
{
static const uint16_t _messages[] =
diff --git a/src/net/tmwa/buysellhandler.cpp b/src/net/tmwa/buysellhandler.cpp
index f3021207b..6d94370c7 100644
--- a/src/net/tmwa/buysellhandler.cpp
+++ b/src/net/tmwa/buysellhandler.cpp
@@ -53,7 +53,9 @@ extern int serverVersion;
namespace TmwAthena
{
-BuySellHandler::BuySellHandler()
+BuySellHandler::BuySellHandler() :
+ MessageHandler(),
+ Ea::BuySellHandler()
{
static const uint16_t _messages[] =
{
diff --git a/src/net/tmwa/charserverhandler.cpp b/src/net/tmwa/charserverhandler.cpp
index 4261887fb..4e3763042 100644
--- a/src/net/tmwa/charserverhandler.cpp
+++ b/src/net/tmwa/charserverhandler.cpp
@@ -50,7 +50,9 @@ namespace TmwAthena
extern ServerInfo charServer;
extern ServerInfo mapServer;
-CharServerHandler::CharServerHandler()
+CharServerHandler::CharServerHandler() :
+ MessageHandler(),
+ Ea::CharServerHandler()
{
static const uint16_t _messages[] =
{
diff --git a/src/net/tmwa/chathandler.cpp b/src/net/tmwa/chathandler.cpp
index 6bf00aecc..3c9f335a9 100644
--- a/src/net/tmwa/chathandler.cpp
+++ b/src/net/tmwa/chathandler.cpp
@@ -45,7 +45,9 @@ extern Net::ChatHandler *chatHandler;
namespace TmwAthena
{
-ChatHandler::ChatHandler()
+ChatHandler::ChatHandler() :
+ MessageHandler(),
+ Ea::ChatHandler()
{
static const uint16_t _messages[] =
{
diff --git a/src/net/tmwa/gamehandler.cpp b/src/net/tmwa/gamehandler.cpp
index 15a4477ff..2515a45d3 100644
--- a/src/net/tmwa/gamehandler.cpp
+++ b/src/net/tmwa/gamehandler.cpp
@@ -39,7 +39,9 @@ namespace TmwAthena
extern ServerInfo mapServer;
-GameHandler::GameHandler()
+GameHandler::GameHandler() :
+ MessageHandler(),
+ Ea::GameHandler()
{
static const uint16_t _messages[] =
{
diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp
index 2a38fcefe..33ccfe819 100644
--- a/src/net/tmwa/generalhandler.cpp
+++ b/src/net/tmwa/generalhandler.cpp
@@ -73,7 +73,8 @@ namespace TmwAthena
ServerInfo charServer;
ServerInfo mapServer;
-GeneralHandler::GeneralHandler():
+GeneralHandler::GeneralHandler() :
+ MessageHandler(),
mAdminHandler(new AdminHandler),
mBeingHandler(new BeingHandler(config.getBoolValue("EnableSync"))),
mBuySellHandler(new BuySellHandler),
diff --git a/src/net/tmwa/guildhandler.cpp b/src/net/tmwa/guildhandler.cpp
index c8886283a..5ecd9096a 100644
--- a/src/net/tmwa/guildhandler.cpp
+++ b/src/net/tmwa/guildhandler.cpp
@@ -35,7 +35,9 @@ extern Net::GuildHandler *guildHandler;
namespace TmwAthena
{
-GuildHandler::GuildHandler()
+GuildHandler::GuildHandler() :
+ Ea::GuildHandler(),
+ MessageHandler()
{
static const uint16_t _messages[] =
{
diff --git a/src/net/tmwa/inventoryhandler.cpp b/src/net/tmwa/inventoryhandler.cpp
index 5838bae1c..f5768f8c5 100644
--- a/src/net/tmwa/inventoryhandler.cpp
+++ b/src/net/tmwa/inventoryhandler.cpp
@@ -33,7 +33,9 @@ extern Net::InventoryHandler *inventoryHandler;
namespace TmwAthena
{
-InventoryHandler::InventoryHandler()
+InventoryHandler::InventoryHandler() :
+ MessageHandler(),
+ Ea::InventoryHandler()
{
static const uint16_t _messages[] =
{
diff --git a/src/net/tmwa/itemhandler.cpp b/src/net/tmwa/itemhandler.cpp
index 4e6a9bfa1..7612b638e 100644
--- a/src/net/tmwa/itemhandler.cpp
+++ b/src/net/tmwa/itemhandler.cpp
@@ -29,7 +29,9 @@
namespace TmwAthena
{
-ItemHandler::ItemHandler()
+ItemHandler::ItemHandler() :
+ MessageHandler(),
+ Ea::ItemHandler()
{
static const uint16_t _messages[] =
{
diff --git a/src/net/tmwa/loginhandler.cpp b/src/net/tmwa/loginhandler.cpp
index d4741538d..f8daecf20 100644
--- a/src/net/tmwa/loginhandler.cpp
+++ b/src/net/tmwa/loginhandler.cpp
@@ -41,7 +41,9 @@ namespace TmwAthena
extern ServerInfo charServer;
-LoginHandler::LoginHandler()
+LoginHandler::LoginHandler() :
+ MessageHandler(),
+ Ea::LoginHandler()
{
static const uint16_t _messages[] =
{
diff --git a/src/net/tmwa/messageout.cpp b/src/net/tmwa/messageout.cpp
index 1a291a9b7..3c6a180c5 100644
--- a/src/net/tmwa/messageout.cpp
+++ b/src/net/tmwa/messageout.cpp
@@ -40,9 +40,9 @@ namespace TmwAthena
{
MessageOut::MessageOut(short id):
- Net::MessageOut(id)
+ Net::MessageOut(id),
+ mNetwork(TmwAthena::Network::instance())
{
- mNetwork = TmwAthena::Network::instance();
mNetwork->fixSendBuffer();
mData = mNetwork->mOutBuffer + mNetwork->mOutSize;
diff --git a/src/net/tmwa/network.cpp b/src/net/tmwa/network.cpp
index 1a7a46e95..15200fa50 100644
--- a/src/net/tmwa/network.cpp
+++ b/src/net/tmwa/network.cpp
@@ -88,7 +88,8 @@ short packet_lengths[] =
Network *Network::mInstance = nullptr;
-Network::Network()
+Network::Network() :
+ Ea::Network()
{
mInstance = this;
}
diff --git a/src/net/tmwa/npchandler.cpp b/src/net/tmwa/npchandler.cpp
index 7b74ad91f..856b67828 100644
--- a/src/net/tmwa/npchandler.cpp
+++ b/src/net/tmwa/npchandler.cpp
@@ -42,6 +42,8 @@ namespace TmwAthena
{
NpcHandler::NpcHandler() :
+ MessageHandler(),
+ Ea::NpcHandler(),
mRequestLang(false)
{
static const uint16_t _messages[] =
diff --git a/src/net/tmwa/partyhandler.cpp b/src/net/tmwa/partyhandler.cpp
index 77bfbb8fb..e23629bc2 100644
--- a/src/net/tmwa/partyhandler.cpp
+++ b/src/net/tmwa/partyhandler.cpp
@@ -38,6 +38,7 @@ namespace TmwAthena
{
PartyHandler::PartyHandler() :
+ MessageHandler(),
Ea::PartyHandler()
{
static const uint16_t _messages[] =
diff --git a/src/net/tmwa/playerhandler.cpp b/src/net/tmwa/playerhandler.cpp
index dae4f8eeb..963f4839d 100644
--- a/src/net/tmwa/playerhandler.cpp
+++ b/src/net/tmwa/playerhandler.cpp
@@ -38,7 +38,9 @@ extern Net::PlayerHandler *playerHandler;
namespace TmwAthena
{
-PlayerHandler::PlayerHandler()
+PlayerHandler::PlayerHandler() :
+ MessageHandler(),
+ Ea::PlayerHandler()
{
static const uint16_t _messages[] =
{
diff --git a/src/net/tmwa/questhandler.cpp b/src/net/tmwa/questhandler.cpp
index d3209cb9e..bd03dc7a2 100644
--- a/src/net/tmwa/questhandler.cpp
+++ b/src/net/tmwa/questhandler.cpp
@@ -37,7 +37,8 @@
namespace TmwAthena
{
-QuestHandler::QuestHandler()
+QuestHandler::QuestHandler() :
+ MessageHandler()
{
static const uint16_t _messages[] =
{
diff --git a/src/net/tmwa/specialhandler.cpp b/src/net/tmwa/specialhandler.cpp
index 58424cadc..ab37aba97 100644
--- a/src/net/tmwa/specialhandler.cpp
+++ b/src/net/tmwa/specialhandler.cpp
@@ -33,7 +33,9 @@ extern Net::SpecialHandler *specialHandler;
namespace TmwAthena
{
-SpecialHandler::SpecialHandler()
+SpecialHandler::SpecialHandler() :
+ MessageHandler(),
+ Ea::SpecialHandler()
{
static const uint16_t _messages[] =
{
diff --git a/src/net/tmwa/tradehandler.cpp b/src/net/tmwa/tradehandler.cpp
index 14614e62d..4fc099f27 100644
--- a/src/net/tmwa/tradehandler.cpp
+++ b/src/net/tmwa/tradehandler.cpp
@@ -36,7 +36,9 @@ extern Net::TradeHandler *tradeHandler;
namespace TmwAthena
{
-TradeHandler::TradeHandler()
+TradeHandler::TradeHandler() :
+ MessageHandler(),
+ Ea::TradeHandler()
{
static const uint16_t _messages[] =
{