summaryrefslogtreecommitdiff
path: root/src/input
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-08-27 15:50:50 +0300
committerAndrei Karas <akaras@inbox.ru>2014-08-27 15:50:50 +0300
commitfda230f1a8a6399c2507c7e39cd714d8aefc712d (patch)
tree9d974937357862a1d5d9b4ec83fc97a90719f7b4 /src/input
parentabdc57a4acfa490ee34985b56b2d985266ccc7e4 (diff)
downloadmv-fda230f1a8a6399c2507c7e39cd714d8aefc712d.tar.gz
mv-fda230f1a8a6399c2507c7e39cd714d8aefc712d.tar.bz2
mv-fda230f1a8a6399c2507c7e39cd714d8aefc712d.tar.xz
mv-fda230f1a8a6399c2507c7e39cd714d8aefc712d.zip
Move chat command /testparticle into actions.
Diffstat (limited to 'src/input')
-rw-r--r--src/input/inputaction.h1
-rw-r--r--src/input/inputactionmap.h11
-rw-r--r--src/input/pages/other.cpp6
3 files changed, 17 insertions, 1 deletions
diff --git a/src/input/inputaction.h b/src/input/inputaction.h
index 2cd802ce0..dcd1e2552 100644
--- a/src/input/inputaction.h
+++ b/src/input/inputaction.h
@@ -414,6 +414,7 @@ namespace InputAction
REMOVE_NAME,
DISABLE_AWAY,
ENABLE_AWAY,
+ TEST_PARTICLE,
TOTAL
};
} // namespace InputAction
diff --git a/src/input/inputactionmap.h b/src/input/inputactionmap.h
index f3ce27a76..56853f0c8 100644
--- a/src/input/inputactionmap.h
+++ b/src/input/inputactionmap.h
@@ -3503,7 +3503,16 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
InputAction::NO_VALUE, 50,
InputCondition::INGAME,
"enableaway",
- false}
+ false},
+ {"keyTestParticle",
+ InputType::UNKNOWN, InputAction::NO_VALUE,
+ InputType::UNKNOWN, InputAction::NO_VALUE,
+ Input::GRP_DEFAULT,
+ &Actions::testParticle,
+ InputAction::NO_VALUE, 50,
+ InputCondition::INGAME,
+ "testparticle",
+ true}
};
#endif // INPUT_INPUTACTIONMAP_H
diff --git a/src/input/pages/other.cpp b/src/input/pages/other.cpp
index 61c6a5a9f..aaa0067e0 100644
--- a/src/input/pages/other.cpp
+++ b/src/input/pages/other.cpp
@@ -269,6 +269,12 @@ SetupActionData setupActionDataOther[] =
},
{
// TRANSLATORS: input action name
+ N_("Disable debug particle"),
+ InputAction::TEST_PARTICLE,
+ "",
+ },
+ {
+ // TRANSLATORS: input action name
N_("Print configured directories in chat"),
InputAction::DIRS,
"",