summaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-02-26 01:19:03 +0300
committerAndrei Karas <akaras@inbox.ru>2016-02-26 01:19:03 +0300
commit8fcd2e6f3002db388b1273ee3904285eb3ce8c54 (patch)
treeb27f88fff1c61916603a6094ea5c4184562e6d0e /src/net
parentcc3e067e9fdf2a1306e62d13dea0fdb315a925c9 (diff)
downloadmv-8fcd2e6f3002db388b1273ee3904285eb3ce8c54.tar.gz
mv-8fcd2e6f3002db388b1273ee3904285eb3ce8c54.tar.bz2
mv-8fcd2e6f3002db388b1273ee3904285eb3ce8c54.tar.xz
mv-8fcd2e6f3002db388b1273ee3904285eb3ce8c54.zip
Add chat command /unjail. Also add it to player context menu.
Diffstat (limited to 'src/net')
-rw-r--r--src/net/adminhandler.h2
-rw-r--r--src/net/eathena/adminhandler.cpp5
-rw-r--r--src/net/eathena/adminhandler.h2
-rw-r--r--src/net/tmwa/adminhandler.cpp4
-rw-r--r--src/net/tmwa/adminhandler.h2
5 files changed, 15 insertions, 0 deletions
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