From ae0cd07c5d94e3696a072bdd9f9aa58223cae75c Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 11 Sep 2014 17:13:43 +0300 Subject: Move mute from ea namespace into eathena and tmwa. --- src/net/ea/adminhandler.cpp | 6 ------ src/net/ea/adminhandler.h | 3 --- src/net/eathena/adminhandler.cpp | 6 ++++++ src/net/eathena/adminhandler.h | 5 +++++ src/net/tmwa/adminhandler.cpp | 6 ++++++ src/net/tmwa/adminhandler.h | 4 ++++ 6 files changed, 21 insertions(+), 9 deletions(-) (limited to 'src/net') diff --git a/src/net/ea/adminhandler.cpp b/src/net/ea/adminhandler.cpp index 8f5e4ddf3..23dacccbf 100644 --- a/src/net/ea/adminhandler.cpp +++ b/src/net/ea/adminhandler.cpp @@ -61,12 +61,6 @@ void AdminHandler::unbanName(const std::string &name) const Net::getChatHandler()->talk("@unban " + name, GENERAL_CHANNEL); } -void AdminHandler::mute(const int playerId A_UNUSED, const int type A_UNUSED, - const int limit A_UNUSED) const -{ - return; -} - 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 a55daf7a0..0228f9bd0 100644 --- a/src/net/ea/adminhandler.h +++ b/src/net/ea/adminhandler.h @@ -51,9 +51,6 @@ class AdminHandler notfinal : public Net::AdminHandler virtual void unbanName(const std::string &name) const override final; - virtual void mute(const int playerId, const int type, - const int limit) 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 6e3dd5eca..2ec6919c2 100644 --- a/src/net/eathena/adminhandler.cpp +++ b/src/net/eathena/adminhandler.cpp @@ -134,4 +134,10 @@ void AdminHandler::recallName(const std::string &name) const outMsg.writeString(name, 24, "name"); } +void AdminHandler::mute(const int playerId A_UNUSED, const int type A_UNUSED, + const int limit A_UNUSED) const +{ + return; +} + } // namespace EAthena diff --git a/src/net/eathena/adminhandler.h b/src/net/eathena/adminhandler.h index 2af956a13..80357657f 100644 --- a/src/net/eathena/adminhandler.h +++ b/src/net/eathena/adminhandler.h @@ -59,6 +59,11 @@ class AdminHandler final : public MessageHandler, public Ea::AdminHandler void gotoName(const std::string &name) const override final; void recallName(const std::string &name) const override final; + + void mute(const int playerId, + const int type, + const int limit) const override final; + }; } // namespace EAthena diff --git a/src/net/tmwa/adminhandler.cpp b/src/net/tmwa/adminhandler.cpp index 3c8762f13..9bb8d80bb 100644 --- a/src/net/tmwa/adminhandler.cpp +++ b/src/net/tmwa/adminhandler.cpp @@ -127,4 +127,10 @@ void AdminHandler::recallName(const std::string &name) const Net::getChatHandler()->talk("@recall " + name, GENERAL_CHANNEL); } +void AdminHandler::mute(const int playerId A_UNUSED, const int type A_UNUSED, + const int limit A_UNUSED) const +{ + return; +} + } // namespace TmwAthena diff --git a/src/net/tmwa/adminhandler.h b/src/net/tmwa/adminhandler.h index fe1fb5fc3..46b629d6e 100644 --- a/src/net/tmwa/adminhandler.h +++ b/src/net/tmwa/adminhandler.h @@ -59,6 +59,10 @@ class AdminHandler final : public MessageHandler, public Ea::AdminHandler void gotoName(const std::string &name) const override final; void recallName(const std::string &name) const override final; + + void mute(const int playerId, + const int type, + const int limit) const override final; }; } // namespace TmwAthena -- cgit v1.2.3-70-g09d2