From 8fcd2e6f3002db388b1273ee3904285eb3ce8c54 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 26 Feb 2016 01:19:03 +0300 Subject: Add chat command /unjail. Also add it to player context menu. --- src/net/adminhandler.h | 2 ++ src/net/eathena/adminhandler.cpp | 5 +++++ src/net/eathena/adminhandler.h | 2 ++ src/net/tmwa/adminhandler.cpp | 4 ++++ src/net/tmwa/adminhandler.h | 2 ++ 5 files changed, 15 insertions(+) (limited to 'src/net') diff --git a/src/net/adminhandler.h b/src/net/adminhandler.h index 1ea6cb325..000938240 100644 --- a/src/net/adminhandler.h +++ b/src/net/adminhandler.h @@ -160,6 +160,8 @@ class AdminHandler notfinal virtual void kill(const std::string &name) const = 0; virtual void jail(const std::string &name) const = 0; + + virtual void unjail(const std::string &name) const = 0; }; } // namespace Net diff --git a/src/net/eathena/adminhandler.cpp b/src/net/eathena/adminhandler.cpp index 92cb06531..1ee373043 100644 --- a/src/net/eathena/adminhandler.cpp +++ b/src/net/eathena/adminhandler.cpp @@ -320,4 +320,9 @@ void AdminHandler::jail(const std::string &name) const Gm::runCommand("jail", name); } +void AdminHandler::unjail(const std::string &name) const +{ + Gm::runCommand("unjail", name); +} + } // namespace EAthena diff --git a/src/net/eathena/adminhandler.h b/src/net/eathena/adminhandler.h index 23419ad27..995669f76 100644 --- a/src/net/eathena/adminhandler.h +++ b/src/net/eathena/adminhandler.h @@ -136,6 +136,8 @@ class AdminHandler final : public Ea::AdminHandler void jail(const std::string &name) const override final; + void unjail(const std::string &name) const override final; + protected: static std::string mStatsName; }; diff --git a/src/net/tmwa/adminhandler.cpp b/src/net/tmwa/adminhandler.cpp index 488a9d05c..7de0cb247 100644 --- a/src/net/tmwa/adminhandler.cpp +++ b/src/net/tmwa/adminhandler.cpp @@ -253,4 +253,8 @@ void AdminHandler::jail(const std::string &name A_UNUSED) const { } +void AdminHandler::unjail(const std::string &name A_UNUSED) const +{ +} + } // namespace TmwAthena diff --git a/src/net/tmwa/adminhandler.h b/src/net/tmwa/adminhandler.h index 8b5c65dec..c45437113 100644 --- a/src/net/tmwa/adminhandler.h +++ b/src/net/tmwa/adminhandler.h @@ -148,6 +148,8 @@ class AdminHandler final : public Ea::AdminHandler void kill(const std::string &name) const override final; void jail(const std::string &name) const override final; + + void unjail(const std::string &name) const override final; }; } // namespace TmwAthena -- cgit v1.2.3-60-g2f50