From a5199d9d9af28d7a2b5472b02c72445c25a5a3f9 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Tue, 9 Sep 2014 12:43:54 +0300
Subject: Move AdminHandler::warp from ea namespace into eathena and tmwa.

---
 src/net/ea/adminhandler.cpp      | 10 ++--------
 src/net/ea/adminhandler.h        |  3 ---
 src/net/eathena/adminhandler.cpp | 11 +++++++++++
 src/net/eathena/adminhandler.h   |  3 +++
 src/net/tmwa/adminhandler.cpp    | 11 +++++++++++
 src/net/tmwa/adminhandler.h      |  3 +++
 6 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/src/net/ea/adminhandler.cpp b/src/net/ea/adminhandler.cpp
index f024394db..a995594d2 100644
--- a/src/net/ea/adminhandler.cpp
+++ b/src/net/ea/adminhandler.cpp
@@ -22,6 +22,8 @@
 
 #include "net/ea/adminhandler.h"
 
+#include "gui/chatconsts.h"
+
 #include "net/chathandler.h"
 #include "net/net.h"
 
@@ -34,8 +36,6 @@ extern int serverVersion;
 namespace Ea
 {
 
-const std::string GENERAL_CHANNEL;
-
 void AdminHandler::kickName(const std::string &name) const
 {
     Net::getChatHandler()->talk("@kick " + name, GENERAL_CHANNEL);
@@ -67,12 +67,6 @@ void AdminHandler::mute(const int playerId A_UNUSED, const int type A_UNUSED,
     return;
 }
 
-void AdminHandler::warp(const std::string &map, const int x, const int y) const
-{
-    Net::getChatHandler()->talk(strprintf(
-        "@warp %s %d %d", map.c_str(), x, y), GENERAL_CHANNEL);
-}
-
 void AdminHandler::gotoName(const std::string &name) const
 {
     Net::getChatHandler()->talk("@goto " + name, GENERAL_CHANNEL);
diff --git a/src/net/ea/adminhandler.h b/src/net/ea/adminhandler.h
index 6bf7c4b13..1762ff665 100644
--- a/src/net/ea/adminhandler.h
+++ b/src/net/ea/adminhandler.h
@@ -54,9 +54,6 @@ class AdminHandler notfinal : public Net::AdminHandler
         virtual void mute(const int playerId, const int type,
                           const int limit) const override final;
 
-        virtual void warp(const std::string &map,
-                          const int x, const int y) const override final;
-
         void gotoName(const std::string &name) const;
 
         void recallName(const std::string &name) const override final;
diff --git a/src/net/eathena/adminhandler.cpp b/src/net/eathena/adminhandler.cpp
index 504addbd8..1fbc30ee1 100644
--- a/src/net/eathena/adminhandler.cpp
+++ b/src/net/eathena/adminhandler.cpp
@@ -24,6 +24,11 @@
 
 #include "notifymanager.h"
 
+#include "gui/chatconsts.h"
+
+#include "net/chathandler.h"
+#include "net/net.h"
+
 #include "net/eathena/messageout.h"
 #include "net/eathena/protocol.h"
 
@@ -92,4 +97,10 @@ void AdminHandler::kick(const int playerId) const
     outMsg.writeInt32(playerId, "account id");
 }
 
+void AdminHandler::warp(const std::string &map, const int x, const int y) const
+{
+    Net::getChatHandler()->talk(strprintf(
+        "@warp %s %d %d", map.c_str(), x, y), GENERAL_CHANNEL);
+}
+
 }  // namespace EAthena
diff --git a/src/net/eathena/adminhandler.h b/src/net/eathena/adminhandler.h
index b7b48fcbb..28f0ac1e8 100644
--- a/src/net/eathena/adminhandler.h
+++ b/src/net/eathena/adminhandler.h
@@ -46,6 +46,9 @@ class AdminHandler final : public MessageHandler, public Ea::AdminHandler
         void hide(const bool h) const override final;
 
         void kick(const int playerId) const override final;
+
+        void warp(const std::string &map,
+                  const int x, const int y) const override final;
 };
 
 }  // namespace EAthena
diff --git a/src/net/tmwa/adminhandler.cpp b/src/net/tmwa/adminhandler.cpp
index 6cb0601f4..a890ea5fc 100644
--- a/src/net/tmwa/adminhandler.cpp
+++ b/src/net/tmwa/adminhandler.cpp
@@ -24,6 +24,11 @@
 
 #include "notifymanager.h"
 
+#include "gui/chatconsts.h"
+
+#include "net/chathandler.h"
+#include "net/net.h"
+
 #include "net/tmwa/messageout.h"
 #include "net/tmwa/protocol.h"
 
@@ -94,4 +99,10 @@ void AdminHandler::kick(const int playerId) const
     outMsg.writeInt32(playerId, "account id");
 }
 
+void AdminHandler::warp(const std::string &map, const int x, const int y) const
+{
+    Net::getChatHandler()->talk(strprintf(
+        "@warp %s %d %d", map.c_str(), x, y), GENERAL_CHANNEL);
+}
+
 }  // namespace TmwAthena
diff --git a/src/net/tmwa/adminhandler.h b/src/net/tmwa/adminhandler.h
index ad3475a44..c511ebd01 100644
--- a/src/net/tmwa/adminhandler.h
+++ b/src/net/tmwa/adminhandler.h
@@ -46,6 +46,9 @@ class AdminHandler final : public MessageHandler, public Ea::AdminHandler
         void hide(const bool h) const override final;
 
         void kick(const int playerId) const override final;
+
+        void warp(const std::string &map,
+                  const int x, const int y) const override final;
 };
 
 }  // namespace TmwAthena
-- 
cgit v1.2.3-70-g09d2