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/tmwa/adminhandler.cpp | 6 +++--- src/net/tmwa/pethandler.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/net/tmwa') 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