summaryrefslogtreecommitdiff
path: root/src/input
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-08-27 16:36:30 +0300
committerAndrei Karas <akaras@inbox.ru>2014-08-27 16:36:30 +0300
commit7891954d9767df4fc4ecf1c44830ca9c18a34e10 (patch)
tree992a91b8b90139a1fd59495ea0ad684645bfddbb /src/input
parent60c983e043b9ec502b65785306887003f5bcb27b (diff)
downloadplus-7891954d9767df4fc4ecf1c44830ca9c18a34e10.tar.gz
plus-7891954d9767df4fc4ecf1c44830ca9c18a34e10.tar.bz2
plus-7891954d9767df4fc4ecf1c44830ca9c18a34e10.tar.xz
plus-7891954d9767df4fc4ecf1c44830ca9c18a34e10.zip
Move chat command /gm into actions.
Diffstat (limited to 'src/input')
-rw-r--r--src/input/inputaction.h1
-rw-r--r--src/input/inputactionmap.h11
2 files changed, 11 insertions, 1 deletions
diff --git a/src/input/inputaction.h b/src/input/inputaction.h
index 93a3a48a7..aa4fd8c6e 100644
--- a/src/input/inputaction.h
+++ b/src/input/inputaction.h
@@ -421,6 +421,7 @@ namespace InputAction
UPLOAD_CONFIG,
UPLOAD_SERVER_CONFIG,
UPLOAD_LOG,
+ GM,
TOTAL
};
} // namespace InputAction
diff --git a/src/input/inputactionmap.h b/src/input/inputactionmap.h
index aa9432b06..27d47a707 100644
--- a/src/input/inputactionmap.h
+++ b/src/input/inputactionmap.h
@@ -3566,7 +3566,16 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
InputAction::NO_VALUE, 50,
InputCondition::INGAME,
"uploadlog",
- false}
+ false},
+ {"keyGm",
+ InputType::UNKNOWN, InputAction::NO_VALUE,
+ InputType::UNKNOWN, InputAction::NO_VALUE,
+ Input::GRP_DEFAULT,
+ &Actions::gm,
+ InputAction::NO_VALUE, 50,
+ InputCondition::INGAME,
+ "gm",
+ true}
};
#endif // INPUT_INPUTACTIONMAP_H