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 ---
 2 files changed, 2 insertions(+), 11 deletions(-)

(limited to 'src/net/ea')

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;
-- 
cgit v1.2.3-70-g09d2