From df22a0dfb16eeeadb90ef9944c97b5d49303a306 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 11 Sep 2014 16:48:18 +0300 Subject: Move gotoName 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 a995594d2..700aadbed 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::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); diff --git a/src/net/ea/adminhandler.h b/src/net/ea/adminhandler.h index 1762ff665..86582ee9e 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 gotoName(const std::string &name) const; - void recallName(const std::string &name) const override final; void reviveName(const std::string &name) const override final; diff --git a/src/net/eathena/adminhandler.cpp b/src/net/eathena/adminhandler.cpp index 10d573cf8..f470753e9 100644 --- a/src/net/eathena/adminhandler.cpp +++ b/src/net/eathena/adminhandler.cpp @@ -122,4 +122,8 @@ void AdminHandler::resetSkills() const outMsg.writeInt16(1, "flag"); } +void AdminHandler::gotoName(const std::string &name) const +{ +} + } // namespace EAthena diff --git a/src/net/eathena/adminhandler.h b/src/net/eathena/adminhandler.h index 7c8f3d650..c0209324a 100644 --- a/src/net/eathena/adminhandler.h +++ b/src/net/eathena/adminhandler.h @@ -55,6 +55,8 @@ class AdminHandler final : public MessageHandler, public Ea::AdminHandler void resetStats() const override final; void resetSkills() const override final; + + void gotoName(const std::string &name) const override final; }; } // namespace EAthena diff --git a/src/net/tmwa/adminhandler.cpp b/src/net/tmwa/adminhandler.cpp index a227652be..f24b05b24 100644 --- a/src/net/tmwa/adminhandler.cpp +++ b/src/net/tmwa/adminhandler.cpp @@ -117,4 +117,9 @@ void AdminHandler::resetSkills() const { } +void AdminHandler::gotoName(const std::string &name) const +{ + Net::getChatHandler()->talk("@goto " + name, GENERAL_CHANNEL); +} + } // namespace TmwAthena diff --git a/src/net/tmwa/adminhandler.h b/src/net/tmwa/adminhandler.h index ac11e7c34..5b277bf62 100644 --- a/src/net/tmwa/adminhandler.h +++ b/src/net/tmwa/adminhandler.h @@ -55,6 +55,8 @@ class AdminHandler final : public MessageHandler, public Ea::AdminHandler void resetStats() const override final; void resetSkills() const override final; + + void gotoName(const std::string &name) const override final; }; } // namespace TmwAthena -- cgit v1.2.3-60-g2f50