summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-08-26 22:12:34 +0300
committerAndrei Karas <akaras@inbox.ru>2014-08-26 22:12:34 +0300
commitf2849928b3eca83581ba77be8bf3b002085fdc9a (patch)
tree8e9acff94a1f17726828fabd28e40543535c15dd
parent8c53409bb625415ddc6fe131061c7e540d56a67e (diff)
downloadplus-f2849928b3eca83581ba77be8bf3b002085fdc9a.tar.gz
plus-f2849928b3eca83581ba77be8bf3b002085fdc9a.tar.bz2
plus-f2849928b3eca83581ba77be8bf3b002085fdc9a.tar.xz
plus-f2849928b3eca83581ba77be8bf3b002085fdc9a.zip
Move chat command /addignoreattack into actions.
-rw-r--r--src/actions/commands.cpp13
-rw-r--r--src/actions/commands.h1
-rw-r--r--src/commands.cpp13
-rw-r--r--src/commands.h6
-rw-r--r--src/input/inputaction.h1
-rw-r--r--src/input/inputactionmap.h9
6 files changed, 25 insertions, 18 deletions
diff --git a/src/actions/commands.cpp b/src/actions/commands.cpp
index b4ab52ba8..80e7493da 100644
--- a/src/actions/commands.cpp
+++ b/src/actions/commands.cpp
@@ -511,4 +511,17 @@ impHandler(removeAttack)
return true;
}
+impHandler(addIgnoreAttack)
+{
+ if (!actorManager || actorManager->isInIgnoreAttackList(event.args))
+ return false;
+
+ actorManager->removeAttackMob(event.args);
+ actorManager->addIgnoreAttackMob(event.args);
+
+ if (socialWindow)
+ socialWindow->updateAttackFilter();
+ return true;
+}
+
} // namespace Actions
diff --git a/src/actions/commands.h b/src/actions/commands.h
index 9686b59d2..8b02a7322 100644
--- a/src/actions/commands.h
+++ b/src/actions/commands.h
@@ -54,6 +54,7 @@ namespace Actions
decHandler(addPriorityAttack);
decHandler(addAttack);
decHandler(removeAttack);
+ decHandler(addIgnoreAttack);
} // namespace Actions
#undef decHandler
diff --git a/src/commands.cpp b/src/commands.cpp
index 6ba4789c9..fe49d64d6 100644
--- a/src/commands.cpp
+++ b/src/commands.cpp
@@ -157,19 +157,6 @@ impHandler(hack)
return true;
}
-impHandler(addIgnoreAttack)
-{
- if (!actorManager || actorManager->isInIgnoreAttackList(event.args))
- return false;
-
- actorManager->removeAttackMob(event.args);
- actorManager->addIgnoreAttackMob(event.args);
-
- if (socialWindow)
- socialWindow->updateAttackFilter();
- return true;
-}
-
impHandler0(serverIgnoreAll)
{
Net::getChatHandler()->ignoreAll();
diff --git a/src/commands.h b/src/commands.h
index 4976e7596..7e675d642 100644
--- a/src/commands.h
+++ b/src/commands.h
@@ -52,7 +52,6 @@ struct CommandInfo final
namespace Commands
{
decHandler(hack);
- decHandler(addIgnoreAttack);
decHandler(serverIgnoreAll);
decHandler(serverUnIgnoreAll);
decHandler(setDrop);
@@ -89,9 +88,7 @@ namespace Commands
enum
{
- COMMAND_REMOVEIGNOREATTACK = 0,
- COMMAND_ADDIGNOREATTACK,
- COMMAND_DUMP,
+ COMMAND_DUMP = 0,
COMMAND_SERVERIGNOREALL,
COMMAND_SERVERUNIGNOREALL,
COMMAND_SETDROP,
@@ -127,7 +124,6 @@ enum
static const CommandInfo commands[] =
{
- {"addignoreattack", &Commands::addIgnoreAttack, -1, true},
{"dump", &Commands::dump, -1, false},
{"serverignoreall", &Commands::serverIgnoreAll, -1, false},
{"serverunignoreall", &Commands::serverUnIgnoreAll, -1, false},
diff --git a/src/input/inputaction.h b/src/input/inputaction.h
index e4b9be2f9..292f5a812 100644
--- a/src/input/inputaction.h
+++ b/src/input/inputaction.h
@@ -392,6 +392,7 @@ namespace InputAction
ADD_PRIORITY_ATTACK,
ADD_ATTACK,
REMOVE_ATTACK,
+ ADD_IGNORE_ATTACK,
TOTAL
};
} // namespace InputAction
diff --git a/src/input/inputactionmap.h b/src/input/inputactionmap.h
index 9a6b4d576..65cf48391 100644
--- a/src/input/inputactionmap.h
+++ b/src/input/inputactionmap.h
@@ -3297,6 +3297,15 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
InputAction::NO_VALUE, 50,
InputCondition::INGAME,
"removeattack|removeignoreattack",
+ true},
+ {"keyAddIgnoreAttack",
+ InputType::UNKNOWN, InputAction::NO_VALUE,
+ InputType::UNKNOWN, InputAction::NO_VALUE,
+ Input::GRP_DEFAULT,
+ &Actions::addIgnoreAttack,
+ InputAction::NO_VALUE, 50,
+ InputCondition::INGAME,
+ "addignoreattack",
true}
};