summaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-02-25 20:25:03 +0300
committerAndrei Karas <akaras@inbox.ru>2016-02-25 20:25:03 +0300
commit64a067458ea169b9ff5b9a78ed1a011da86e8bdf (patch)
tree0bae841148a69a2bd160b914d3d17ed0b4ac3421 /src/net
parent704b5b31fea63483c81f0744d88e46a856573424 (diff)
downloadmanaplus-64a067458ea169b9ff5b9a78ed1a011da86e8bdf.tar.gz
manaplus-64a067458ea169b9ff5b9a78ed1a011da86e8bdf.tar.bz2
manaplus-64a067458ea169b9ff5b9a78ed1a011da86e8bdf.tar.xz
manaplus-64a067458ea169b9ff5b9a78ed1a011da86e8bdf.zip
Add chat command /killable. 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 ae8a55e73..6814f36ea 100644
--- a/src/net/adminhandler.h
+++ b/src/net/adminhandler.h
@@ -144,6 +144,8 @@ class AdminHandler notfinal
virtual void gotoNpc(const std::string &name) const = 0;
virtual void killer(const std::string &name) const = 0;
+
+ virtual void killable(const std::string &name) const = 0;
};
} // namespace Net
diff --git a/src/net/eathena/adminhandler.cpp b/src/net/eathena/adminhandler.cpp
index 25104c076..270c20070 100644
--- a/src/net/eathena/adminhandler.cpp
+++ b/src/net/eathena/adminhandler.cpp
@@ -275,4 +275,9 @@ void AdminHandler::killer(const std::string &name) const
Gm::runCharCommand("killer", name);
}
+void AdminHandler::killable(const std::string &name) const
+{
+ Gm::runCharCommand("killable", name);
+}
+
} // namespace EAthena
diff --git a/src/net/eathena/adminhandler.h b/src/net/eathena/adminhandler.h
index 24dbf9b8a..6e6906fcf 100644
--- a/src/net/eathena/adminhandler.h
+++ b/src/net/eathena/adminhandler.h
@@ -118,6 +118,8 @@ class AdminHandler final : public Ea::AdminHandler
void killer(const std::string &name) const override final;
+ void killable(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 1b2d2919a..5b3645786 100644
--- a/src/net/tmwa/adminhandler.cpp
+++ b/src/net/tmwa/adminhandler.cpp
@@ -215,4 +215,8 @@ void AdminHandler::killer(const std::string &name A_UNUSED) const
{
}
+void AdminHandler::killable(const std::string &name A_UNUSED) const
+{
+}
+
} // namespace TmwAthena
diff --git a/src/net/tmwa/adminhandler.h b/src/net/tmwa/adminhandler.h
index 22deeeb08..607ea8ed1 100644
--- a/src/net/tmwa/adminhandler.h
+++ b/src/net/tmwa/adminhandler.h
@@ -130,6 +130,8 @@ class AdminHandler final : public Ea::AdminHandler
void gotoNpc(const std::string &name) const override final A_CONST;
void killer(const std::string &name) const override final A_CONST;
+
+ void killable(const std::string &name) const override final A_CONST;
};
} // namespace TmwAthena