summaryrefslogtreecommitdiff
path: root/src/input
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-08-24 17:59:08 +0300
committerAndrei Karas <akaras@inbox.ru>2014-08-24 17:59:08 +0300
commit1ceb3b90a9a00cae73cecb2b81ca3b6bd043f816 (patch)
tree910a3ec3ec9529908b93eb1b0de8b44304d5882d /src/input
parentefa45459a4d79cf1adba3327f6dad02fc5aa55cd (diff)
downloadmv-1ceb3b90a9a00cae73cecb2b81ca3b6bd043f816.tar.gz
mv-1ceb3b90a9a00cae73cecb2b81ca3b6bd043f816.tar.bz2
mv-1ceb3b90a9a00cae73cecb2b81ca3b6bd043f816.tar.xz
mv-1ceb3b90a9a00cae73cecb2b81ca3b6bd043f816.zip
Move chat command /disregard 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 8abf6f65d..eb6e8c881 100644
--- a/src/input/inputaction.h
+++ b/src/input/inputaction.h
@@ -353,6 +353,7 @@ namespace InputAction
IGNORE,
UNIGNORE,
FRIEND,
+ DISREGARD,
TOTAL
};
} // namespace InputAction
diff --git a/src/input/inputactionmap.h b/src/input/inputactionmap.h
index f94af5e9e..a8e27d04f 100644
--- a/src/input/inputactionmap.h
+++ b/src/input/inputactionmap.h
@@ -2946,6 +2946,15 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
InputAction::NO_VALUE, 50,
InputCondition::INGAME,
"friend|befriend",
+ true},
+ {"keyDisregard",
+ InputType::UNKNOWN, InputAction::NO_VALUE,
+ InputType::UNKNOWN, InputAction::NO_VALUE,
+ Input::GRP_DEFAULT,
+ &Actions::chatDisregard,
+ InputAction::NO_VALUE, 50,
+ InputCondition::INGAME,
+ "disregard",
true}
};