summaryrefslogtreecommitdiff
path: root/src/input
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-08-24 21:32:16 +0300
committerAndrei Karas <akaras@inbox.ru>2014-08-24 21:32:16 +0300
commit9522e88dbdb425211f68e94518dcfb63dc74f306 (patch)
treefcef589c7eeb62042baa162b8afc2a21a74c01f2 /src/input
parent4b5a38945c47d492fe8e4581b2d92956a689612e (diff)
downloadmanaverse-9522e88dbdb425211f68e94518dcfb63dc74f306.tar.gz
manaverse-9522e88dbdb425211f68e94518dcfb63dc74f306.tar.bz2
manaverse-9522e88dbdb425211f68e94518dcfb63dc74f306.tar.xz
manaverse-9522e88dbdb425211f68e94518dcfb63dc74f306.zip
Move chat command /blacklist 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 74ac06c13..69027cda0 100644
--- a/src/input/inputaction.h
+++ b/src/input/inputaction.h
@@ -355,6 +355,7 @@ namespace InputAction
FRIEND,
DISREGARD,
NEUTRAL,
+ BLACKLIST,
TOTAL
};
} // namespace InputAction
diff --git a/src/input/inputactionmap.h b/src/input/inputactionmap.h
index 4ee1113e6..df00c1a25 100644
--- a/src/input/inputactionmap.h
+++ b/src/input/inputactionmap.h
@@ -2964,6 +2964,15 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
InputAction::NO_VALUE, 50,
InputCondition::INGAME,
"neutral",
+ true},
+ {"keyBlacklist",
+ InputType::UNKNOWN, InputAction::NO_VALUE,
+ InputType::UNKNOWN, InputAction::NO_VALUE,
+ Input::GRP_DEFAULT,
+ &Actions::chatBlackList,
+ InputAction::NO_VALUE, 50,
+ InputCondition::INGAME,
+ "blacklist",
true}
};