From 3a7313c027407e3b35360a021c72fe78f181d81d Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 17 Sep 2014 00:55:22 +0300 Subject: Remove getter for chatHandler. --- src/net/chathandler.h | 2 ++ src/net/ea/adminhandler.cpp | 14 +++++++------- src/net/ea/buysellhandler.cpp | 8 ++++---- src/net/eathena/pethandler.cpp | 2 +- src/net/net.cpp | 6 +----- src/net/net.h | 2 -- src/net/tmwa/adminhandler.cpp | 6 +++--- src/net/tmwa/pethandler.cpp | 2 +- 8 files changed, 19 insertions(+), 23 deletions(-) (limited to 'src/net') diff --git a/src/net/chathandler.h b/src/net/chathandler.h index 86ff5eecd..bf4863b66 100644 --- a/src/net/chathandler.h +++ b/src/net/chathandler.h @@ -76,4 +76,6 @@ class ChatHandler notfinal } // namespace Net +extern Net::ChatHandler *chatHandler; + #endif // NET_CHATHANDLER_H diff --git a/src/net/ea/adminhandler.cpp b/src/net/ea/adminhandler.cpp index 71ca80846..550e96065 100644 --- a/src/net/ea/adminhandler.cpp +++ b/src/net/ea/adminhandler.cpp @@ -37,7 +37,7 @@ namespace Ea void AdminHandler::kickName(const std::string &name) const { - Net::getChatHandler()->talk("@kick " + name, GENERAL_CHANNEL); + chatHandler->talk("@kick " + name, GENERAL_CHANNEL); } void AdminHandler::ban(const int playerId A_UNUSED) const @@ -47,7 +47,7 @@ void AdminHandler::ban(const int playerId A_UNUSED) const void AdminHandler::banName(const std::string &name) const { - Net::getChatHandler()->talk("@ban " + name, GENERAL_CHANNEL); + chatHandler->talk("@ban " + name, GENERAL_CHANNEL); } void AdminHandler::unban(const int playerId A_UNUSED) const @@ -57,17 +57,17 @@ void AdminHandler::unban(const int playerId A_UNUSED) const void AdminHandler::unbanName(const std::string &name) const { - Net::getChatHandler()->talk("@unban " + name, GENERAL_CHANNEL); + chatHandler->talk("@unban " + name, GENERAL_CHANNEL); } void AdminHandler::reviveName(const std::string &name) const { - Net::getChatHandler()->talk("@revive " + name, GENERAL_CHANNEL); + chatHandler->talk("@revive " + name, GENERAL_CHANNEL); } void AdminHandler::ipcheckName(const std::string &name) const { - Net::getChatHandler()->talk("@ipcheck " + name, GENERAL_CHANNEL); + chatHandler->talk("@ipcheck " + name, GENERAL_CHANNEL); } void AdminHandler::createItems(const int id, const int color, @@ -75,12 +75,12 @@ void AdminHandler::createItems(const int id, const int color, { if (!Net::getServerFeatures()->haveItemColors()) { - Net::getChatHandler()->talk(strprintf("@item %d %d", + chatHandler->talk(strprintf("@item %d %d", id, amount), GENERAL_CHANNEL); } else { - Net::getChatHandler()->talk(strprintf("@item %d %d %d", + chatHandler->talk(strprintf("@item %d %d %d", id, color, amount), GENERAL_CHANNEL); } } diff --git a/src/net/ea/buysellhandler.cpp b/src/net/ea/buysellhandler.cpp index 0e3687aa3..6bdc33305 100644 --- a/src/net/ea/buysellhandler.cpp +++ b/src/net/ea/buysellhandler.cpp @@ -66,7 +66,7 @@ void BuySellHandler::requestSellList(const std::string &nick) const if (config.getBoolValue("hideShopMessages")) { - Net::getChatHandler()->privateMessage(nick, data); + chatHandler->privateMessage(nick, data); } else { @@ -85,7 +85,7 @@ void BuySellHandler::requestBuyList(const std::string &nick) const if (config.getBoolValue("hideShopMessages")) { - Net::getChatHandler()->privateMessage(nick, data); + chatHandler->privateMessage(nick, data); } else { @@ -107,7 +107,7 @@ void BuySellHandler::sendBuyRequest(const std::string &nick, item->getId(), item->getPrice(), amount); if (config.getBoolValue("hideShopMessages")) - Net::getChatHandler()->privateMessage(nick, data); + chatHandler->privateMessage(nick, data); else chatWindow->addWhisper(nick, data, ChatMsgType::BY_PLAYER); } @@ -126,7 +126,7 @@ void BuySellHandler::sendSellRequest(const std::string &nick, item->getId(), item->getPrice(), amount); if (config.getBoolValue("hideShopMessages")) - Net::getChatHandler()->privateMessage(nick, data); + chatHandler->privateMessage(nick, data); else chatWindow->addWhisper(nick, data, ChatMsgType::BY_PLAYER); } diff --git a/src/net/eathena/pethandler.cpp b/src/net/eathena/pethandler.cpp index bf453055e..1485c1de0 100644 --- a/src/net/eathena/pethandler.cpp +++ b/src/net/eathena/pethandler.cpp @@ -82,7 +82,7 @@ void PetHandler::emote(const uint8_t emoteId, const int petId A_UNUSED) if (mRandCounter > 10000) mRandCounter = 1000; - Net::getChatHandler()->talk(strprintf("\302\202\302e%dz%d", + chatHandler->talk(strprintf("\302\202\302e%dz%d", static_cast(emoteId), mRandCounter), GENERAL_CHANNEL); } diff --git a/src/net/net.cpp b/src/net/net.cpp index f4736a01c..aa89e39fe 100644 --- a/src/net/net.cpp +++ b/src/net/net.cpp @@ -45,6 +45,7 @@ namespace Net class BuySellHandler; class CashShopHandler; class CharServerHandler; + class ChatHandler; } Net::AdminHandler *adminHandler = nullptr; @@ -70,11 +71,6 @@ Net::CashShopHandler *cashShopHandler = nullptr; Net::FamilyHandler *familyHandler = nullptr; Net::BankHandler *bankHandler = nullptr; -Net::ChatHandler *Net::getChatHandler() -{ - return chatHandler; -} - Net::GameHandler *Net::getGameHandler() { return gameHandler; diff --git a/src/net/net.h b/src/net/net.h index 56c091924..11f605252 100644 --- a/src/net/net.h +++ b/src/net/net.h @@ -36,7 +36,6 @@ namespace Net { -class ChatHandler; class FamilyHandler; class GameHandler; class GeneralHandler; @@ -52,7 +51,6 @@ class SkillHandler; class TradeHandler; class ServerFeatures; -ChatHandler *getChatHandler() A_WARN_UNUSED; GameHandler *getGameHandler() A_WARN_UNUSED; GeneralHandler *getGeneralHandler() A_WARN_UNUSED; GuildHandler *getGuildHandler() A_WARN_UNUSED; diff --git a/src/net/tmwa/adminhandler.cpp b/src/net/tmwa/adminhandler.cpp index 19238f2ef..44b6f9038 100644 --- a/src/net/tmwa/adminhandler.cpp +++ b/src/net/tmwa/adminhandler.cpp @@ -106,7 +106,7 @@ void AdminHandler::kickAll() const void AdminHandler::warp(const std::string &map, const int x, const int y) const { - Net::getChatHandler()->talk(strprintf( + chatHandler->talk(strprintf( "@warp %s %d %d", map.c_str(), x, y), GENERAL_CHANNEL); } @@ -120,12 +120,12 @@ void AdminHandler::resetSkills() const void AdminHandler::gotoName(const std::string &name) const { - Net::getChatHandler()->talk("@goto " + name, GENERAL_CHANNEL); + chatHandler->talk("@goto " + name, GENERAL_CHANNEL); } void AdminHandler::recallName(const std::string &name) const { - Net::getChatHandler()->talk("@recall " + name, GENERAL_CHANNEL); + chatHandler->talk("@recall " + name, GENERAL_CHANNEL); } void AdminHandler::mute(const Being *const being A_UNUSED, diff --git a/src/net/tmwa/pethandler.cpp b/src/net/tmwa/pethandler.cpp index 0ca5f7c63..a071d1289 100644 --- a/src/net/tmwa/pethandler.cpp +++ b/src/net/tmwa/pethandler.cpp @@ -70,7 +70,7 @@ void PetHandler::emote(const uint8_t emoteId, const int petId A_UNUSED) if (mRandCounter > 10000) mRandCounter = 1000; - Net::getChatHandler()->talk(strprintf("\302\202\302e%dz%d", + chatHandler->talk(strprintf("\302\202\302e%dz%d", static_cast(emoteId), mRandCounter), GENERAL_CHANNEL); } -- cgit v1.2.3-70-g09d2