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/ea/adminhandler.cpp | 14 +++++++------- src/net/ea/buysellhandler.cpp | 8 ++++---- 2 files changed, 11 insertions(+), 11 deletions(-) (limited to 'src/net/ea') 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); } -- cgit v1.2.3-70-g09d2