From 593cccb16074fe9269dd2f278bd79859769eb1fd Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 8 Sep 2012 00:17:45 +0300 Subject: Improve constructors in some classes. --- src/net/tmwa/adminhandler.cpp | 3 ++- src/net/tmwa/beinghandler.cpp | 3 ++- src/net/tmwa/buysellhandler.cpp | 4 +++- src/net/tmwa/charserverhandler.cpp | 4 +++- src/net/tmwa/chathandler.cpp | 4 +++- src/net/tmwa/gamehandler.cpp | 4 +++- src/net/tmwa/generalhandler.cpp | 3 ++- src/net/tmwa/guildhandler.cpp | 4 +++- src/net/tmwa/inventoryhandler.cpp | 4 +++- src/net/tmwa/itemhandler.cpp | 4 +++- src/net/tmwa/loginhandler.cpp | 4 +++- src/net/tmwa/messageout.cpp | 4 ++-- src/net/tmwa/network.cpp | 3 ++- src/net/tmwa/npchandler.cpp | 2 ++ src/net/tmwa/partyhandler.cpp | 1 + src/net/tmwa/playerhandler.cpp | 4 +++- src/net/tmwa/questhandler.cpp | 3 ++- src/net/tmwa/specialhandler.cpp | 4 +++- src/net/tmwa/tradehandler.cpp | 4 +++- 19 files changed, 48 insertions(+), 18 deletions(-) (limited to 'src/net/tmwa') 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[] = { -- cgit v1.2.3-70-g09d2