summaryrefslogtreecommitdiff
path: root/src/input
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-08-24 20:40:00 +0300
committerAndrei Karas <akaras@inbox.ru>2014-08-24 20:40:00 +0300
commit4b5a38945c47d492fe8e4581b2d92956a689612e (patch)
treec55f181245e4c675fe2d8c78478bc2dce54d844e /src/input
parent1ceb3b90a9a00cae73cecb2b81ca3b6bd043f816 (diff)
downloadplus-4b5a38945c47d492fe8e4581b2d92956a689612e.tar.gz
plus-4b5a38945c47d492fe8e4581b2d92956a689612e.tar.bz2
plus-4b5a38945c47d492fe8e4581b2d92956a689612e.tar.xz
plus-4b5a38945c47d492fe8e4581b2d92956a689612e.zip
Move chat command /neutral into actions.
Diffstat (limited to 'src/input')
-rw-r--r--src/input/inputaction.h1
-rw-r--r--src/input/inputactionmap.h9
2 files changed, 10 insertions, 0 deletions
diff --git a/src/input/inputaction.h b/src/input/inputaction.h
index eb6e8c881..74ac06c13 100644
--- a/src/input/inputaction.h
+++ b/src/input/inputaction.h
@@ -354,6 +354,7 @@ namespace InputAction
UNIGNORE,
FRIEND,
DISREGARD,
+ NEUTRAL,
TOTAL
};
} // namespace InputAction
diff --git a/src/input/inputactionmap.h b/src/input/inputactionmap.h
index a8e27d04f..4ee1113e6 100644
--- a/src/input/inputactionmap.h
+++ b/src/input/inputactionmap.h
@@ -2955,6 +2955,15 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
InputAction::NO_VALUE, 50,
InputCondition::INGAME,
"disregard",
+ true},
+ {"keyNeutral",
+ InputType::UNKNOWN, InputAction::NO_VALUE,
+ InputType::UNKNOWN, InputAction::NO_VALUE,
+ Input::GRP_DEFAULT,
+ &Actions::chatNeutral,
+ InputAction::NO_VALUE, 50,
+ InputCondition::INGAME,
+ "neutral",
true}
};