From eb1925b3840c38d48a0704799f0f2027b3b414b8 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 11 Sep 2014 16:56:35 +0300 Subject: Move recallName from ea namespace into eathena and tmwa. --- src/net/ea/adminhandler.cpp | 5 ----- src/net/ea/adminhandler.h | 2 -- src/net/eathena/adminhandler.cpp | 4 ++++ src/net/eathena/adminhandler.h | 2 ++ src/net/tmwa/adminhandler.cpp | 5 +++++ src/net/tmwa/adminhandler.h | 2 ++ 6 files changed, 13 insertions(+), 7 deletions(-) (limited to 'src/net') diff --git a/src/net/ea/adminhandler.cpp b/src/net/ea/adminhandler.cpp index 700aadbed..8f5e4ddf3 100644 --- a/src/net/ea/adminhandler.cpp +++ b/src/net/ea/adminhandler.cpp @@ -67,11 +67,6 @@ void AdminHandler::mute(const int playerId A_UNUSED, const int type A_UNUSED, return; } -void AdminHandler::recallName(const std::string &name) const -{ - Net::getChatHandler()->talk("@recall " + name, GENERAL_CHANNEL); -} - void AdminHandler::reviveName(const std::string &name) const { Net::getChatHandler()->talk("@revive " + name, GENERAL_CHANNEL); diff --git a/src/net/ea/adminhandler.h b/src/net/ea/adminhandler.h index 86582ee9e..a55daf7a0 100644 --- a/src/net/ea/adminhandler.h +++ b/src/net/ea/adminhandler.h @@ -54,8 +54,6 @@ class AdminHandler notfinal : public Net::AdminHandler virtual void mute(const int playerId, const int type, const int limit) const override final; - void recallName(const std::string &name) const override final; - void reviveName(const std::string &name) const override final; void ipcheckName(const std::string &name) const override final; diff --git a/src/net/eathena/adminhandler.cpp b/src/net/eathena/adminhandler.cpp index a64374a38..4dfbe47bf 100644 --- a/src/net/eathena/adminhandler.cpp +++ b/src/net/eathena/adminhandler.cpp @@ -128,4 +128,8 @@ void AdminHandler::gotoName(const std::string &name) const outMsg.writeString(name, 24, "name"); } +void AdminHandler::recallName(const std::string &name) const +{ +} + } // namespace EAthena diff --git a/src/net/eathena/adminhandler.h b/src/net/eathena/adminhandler.h index c0209324a..2af956a13 100644 --- a/src/net/eathena/adminhandler.h +++ b/src/net/eathena/adminhandler.h @@ -57,6 +57,8 @@ class AdminHandler final : public MessageHandler, public Ea::AdminHandler void resetSkills() const override final; void gotoName(const std::string &name) const override final; + + void recallName(const std::string &name) const override final; }; } // namespace EAthena diff --git a/src/net/tmwa/adminhandler.cpp b/src/net/tmwa/adminhandler.cpp index f24b05b24..3c8762f13 100644 --- a/src/net/tmwa/adminhandler.cpp +++ b/src/net/tmwa/adminhandler.cpp @@ -122,4 +122,9 @@ void AdminHandler::gotoName(const std::string &name) const Net::getChatHandler()->talk("@goto " + name, GENERAL_CHANNEL); } +void AdminHandler::recallName(const std::string &name) const +{ + Net::getChatHandler()->talk("@recall " + name, GENERAL_CHANNEL); +} + } // namespace TmwAthena diff --git a/src/net/tmwa/adminhandler.h b/src/net/tmwa/adminhandler.h index 5b277bf62..fe1fb5fc3 100644 --- a/src/net/tmwa/adminhandler.h +++ b/src/net/tmwa/adminhandler.h @@ -57,6 +57,8 @@ class AdminHandler final : public MessageHandler, public Ea::AdminHandler void resetSkills() const override final; void gotoName(const std::string &name) const override final; + + void recallName(const std::string &name) const override final; }; } // namespace TmwAthena -- cgit v1.2.3-70-g09d2