From d9dc86b8dce433947c81ba87ad0bad83d4bc96f6 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sun, 24 Aug 2014 22:06:47 +0300
Subject: Move chat command /erase into actions.

---
 src/actions/commands.cpp   | 47 ++++++++++++++++++++++++++++++++++++++++++++++
 src/actions/commands.h     |  1 +
 src/commands.cpp           | 44 -------------------------------------------
 src/commands.h             |  5 +----
 src/input/inputaction.h    |  1 +
 src/input/inputactionmap.h |  9 +++++++++
 6 files changed, 59 insertions(+), 48 deletions(-)

(limited to 'src')

diff --git a/src/actions/commands.cpp b/src/actions/commands.cpp
index 5c16d17cc..2b4c40b0e 100644
--- a/src/actions/commands.cpp
+++ b/src/actions/commands.cpp
@@ -184,6 +184,53 @@ impHandler(chatUnignore)
     return true;
 }
 
+impHandler(chatErase)
+{
+    std::string args = event.args;
+    if (args.empty())
+    {
+        WhisperTab *const whisper = dynamic_cast<WhisperTab* const>(event.tab);
+        if (!whisper || whisper->getNick().empty())
+        {
+            // TRANSLATORS: change relation
+            event.tab->chatLog(_("Please specify a name."), ChatMsgType::BY_SERVER);
+            return false;
+        }
+        args = whisper->getNick();
+    }
+
+    if (player_relations.getRelation(args) == PlayerRelation::ERASED)
+    {
+        if (event.tab)
+        {
+            // TRANSLATORS: erase command
+            event.tab->chatLog(_("Player already erased!"), ChatMsgType::BY_SERVER);
+        }
+        return true;
+    }
+    else
+    {
+        player_relations.setRelation(args, PlayerRelation::ERASED);
+    }
+
+    if (event.tab)
+    {
+        if (player_relations.getRelation(args) == PlayerRelation::ERASED)
+        {
+            // TRANSLATORS: erase command
+            event.tab->chatLog(_("Player successfully erased!"),
+                ChatMsgType::BY_SERVER);
+        }
+        else
+        {
+            // TRANSLATORS: erase command
+            event.tab->chatLog(_("Player could not be erased!"),
+                ChatMsgType::BY_SERVER);
+        }
+    }
+    return true;
+}
+
 impHandler(chatFriend)
 {
     // TRANSLATORS: adding friend command
diff --git a/src/actions/commands.h b/src/actions/commands.h
index 306c46cb9..c978cb57b 100644
--- a/src/actions/commands.h
+++ b/src/actions/commands.h
@@ -35,6 +35,7 @@ namespace Actions
     decHandler(chatNeutral);
     decHandler(chatBlackList);
     decHandler(chatEnemy);
+    decHandler(chatErase);
 }  // namespace Actions
 
 #undef decHandler
diff --git a/src/commands.cpp b/src/commands.cpp
index 031bcd0a9..953f2679d 100644
--- a/src/commands.cpp
+++ b/src/commands.cpp
@@ -384,50 +384,6 @@ impHandler0(present)
     return false;
 }
 
-impHandler(erase)
-{
-    if (event.args.empty())
-    {
-        if (event.tab)
-        {
-            // TRANSLATORS: erase command
-            event.tab->chatLog(_("Please specify a name."), ChatMsgType::BY_SERVER);
-        }
-        return true;
-    }
-
-    if (player_relations.getRelation(event.args) == PlayerRelation::ERASED)
-    {
-        if (event.tab)
-        {
-            // TRANSLATORS: erase command
-            event.tab->chatLog(_("Player already erased!"), ChatMsgType::BY_SERVER);
-        }
-        return true;
-    }
-    else
-    {
-        player_relations.setRelation(event.args, PlayerRelation::ERASED);
-    }
-
-    if (event.tab)
-    {
-        if (player_relations.getRelation(event.args) == PlayerRelation::ERASED)
-        {
-            // TRANSLATORS: erase command
-            event.tab->chatLog(_("Player successfully erased!"),
-                ChatMsgType::BY_SERVER);
-        }
-        else
-        {
-            // TRANSLATORS: erase command
-            event.tab->chatLog(_("Player could not be erased!"),
-                ChatMsgType::BY_SERVER);
-        }
-    }
-    return true;
-}
-
 impHandler0(quit)
 {
 //    quit();
diff --git a/src/commands.h b/src/commands.h
index a017eb2ac..9fb8013d2 100644
--- a/src/commands.h
+++ b/src/commands.h
@@ -59,7 +59,6 @@ namespace Commands
     decHandler(me);
     decHandler(toggle);
     decHandler(present);
-    decHandler(erase);
     decHandler(quit);
     decHandler(showAll);
     decHandler(move);
@@ -127,8 +126,7 @@ namespace Commands
 
 enum
 {
-    COMMAND_ERASE = 0,
-    COMMAND_CLEANGRAPHICS,
+    COMMAND_CLEANGRAPHICS = 0,
     COMMAND_CLEANFONTS,
     COMMAND_CREATEPARTY,
     COMMAND_CREATEGUILD,
@@ -203,7 +201,6 @@ enum
 
 static const CommandInfo commands[] =
 {
-    {"erase", &Commands::erase, -1, true},
     {"cleangraphics", &Commands::cleanGraphics, -1, false},
     {"cleanfonts", &Commands::cleanFonts, -1, false},
     {"createparty", &Commands::createParty, -1, true},
diff --git a/src/input/inputaction.h b/src/input/inputaction.h
index 258c3c3e7..3fc39aaf3 100644
--- a/src/input/inputaction.h
+++ b/src/input/inputaction.h
@@ -357,6 +357,7 @@ namespace InputAction
         NEUTRAL,
         BLACKLIST,
         ENEMY,
+        ERASE,
         TOTAL
     };
 }  // namespace InputAction
diff --git a/src/input/inputactionmap.h b/src/input/inputactionmap.h
index e3d17710c..ebadff15d 100644
--- a/src/input/inputactionmap.h
+++ b/src/input/inputactionmap.h
@@ -2982,6 +2982,15 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
         InputAction::NO_VALUE, 50,
         InputCondition::INGAME,
         "enemy",
+        true},
+    {"keyErase",
+        InputType::UNKNOWN, InputAction::NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
+        Input::GRP_DEFAULT,
+        &Actions::chatErase,
+        InputAction::NO_VALUE, 50,
+        InputCondition::INGAME,
+        "erase",
         true}
 };
 
-- 
cgit v1.2.3-70-g09d2