summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-09-11 16:42:47 +0300
committerAndrei Karas <akaras@inbox.ru>2014-09-11 16:42:47 +0300
commit06b7293d0f6b5dab909f108ce9dd38488d8ac48b (patch)
tree456b4c62be469eedcac0a48cba0fefa9c1e49f0c
parent1755745c3486fbed6b92c2ebacddae2fc6086443 (diff)
downloadplus-06b7293d0f6b5dab909f108ce9dd38488d8ac48b.tar.gz
plus-06b7293d0f6b5dab909f108ce9dd38488d8ac48b.tar.bz2
plus-06b7293d0f6b5dab909f108ce9dd38488d8ac48b.tar.xz
plus-06b7293d0f6b5dab909f108ce9dd38488d8ac48b.zip
eathena: add packet CMSG_ADMIN_KICK_ALL 0x00ce.
-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/eathena/protocol.h1
-rw-r--r--src/net/tmwa/adminhandler.cpp4
-rw-r--r--src/net/tmwa/adminhandler.h2
6 files changed, 16 insertions, 0 deletions
diff --git a/src/net/adminhandler.h b/src/net/adminhandler.h
index e5496cdfc..18e7c0fad 100644
--- a/src/net/adminhandler.h
+++ b/src/net/adminhandler.h
@@ -47,6 +47,8 @@ class AdminHandler notfinal
virtual void kickName(const std::string &name) const = 0;
+ virtual void kickAll() const = 0;
+
virtual void ban(const int playerId) const = 0;
virtual void banName(const std::string &name) const = 0;
diff --git a/src/net/eathena/adminhandler.cpp b/src/net/eathena/adminhandler.cpp
index aa4980fb9..10d573cf8 100644
--- a/src/net/eathena/adminhandler.cpp
+++ b/src/net/eathena/adminhandler.cpp
@@ -97,6 +97,11 @@ void AdminHandler::kick(const int playerId) const
outMsg.writeInt32(playerId, "account id");
}
+void AdminHandler::kickAll() const
+{
+ MessageOut outMsg(CMSG_ADMIN_KICK_ALL);
+}
+
void AdminHandler::warp(const std::string &map, const int x, const int y) const
{
MessageOut outMsg(CMSG_PLAYER_MAPMOVE);
diff --git a/src/net/eathena/adminhandler.h b/src/net/eathena/adminhandler.h
index 99b59f135..7c8f3d650 100644
--- a/src/net/eathena/adminhandler.h
+++ b/src/net/eathena/adminhandler.h
@@ -47,6 +47,8 @@ class AdminHandler final : public MessageHandler, public Ea::AdminHandler
void kick(const int playerId) const override final;
+ void kickAll() const override final;
+
void warp(const std::string &map,
const int x, const int y) const override final;
diff --git a/src/net/eathena/protocol.h b/src/net/eathena/protocol.h
index 17b54bbf7..d3e02338e 100644
--- a/src/net/eathena/protocol.h
+++ b/src/net/eathena/protocol.h
@@ -300,6 +300,7 @@
#define CMSG_ADMIN_LOCAL_ANNOUNCE 0x019C
#define CMSG_ADMIN_HIDE 0x019D
#define CMSG_ADMIN_KICK 0x00CC
+#define CMSG_ADMIN_KICK_ALL 0x00ce
#define CMSG_ADMIN_MUTE 0x0149
#define CMSG_ADMIN_RESET_PLAYER 0x0197
diff --git a/src/net/tmwa/adminhandler.cpp b/src/net/tmwa/adminhandler.cpp
index 7ca5e35e4..a227652be 100644
--- a/src/net/tmwa/adminhandler.cpp
+++ b/src/net/tmwa/adminhandler.cpp
@@ -99,6 +99,10 @@ void AdminHandler::kick(const int playerId) const
outMsg.writeInt32(playerId, "account id");
}
+void AdminHandler::kickAll() const
+{
+}
+
void AdminHandler::warp(const std::string &map, const int x, const int y) const
{
Net::getChatHandler()->talk(strprintf(
diff --git a/src/net/tmwa/adminhandler.h b/src/net/tmwa/adminhandler.h
index 111601a24..ac11e7c34 100644
--- a/src/net/tmwa/adminhandler.h
+++ b/src/net/tmwa/adminhandler.h
@@ -47,6 +47,8 @@ class AdminHandler final : public MessageHandler, public Ea::AdminHandler
void kick(const int playerId) const override final;
+ void kickAll() const override final;
+
void warp(const std::string &map,
const int x, const int y) const override final;