diff options
author | Andrei Karas <akaras@inbox.ru> | 2014-08-27 14:52:10 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2014-08-27 14:52:10 +0300 |
commit | 45949cf0fbade4f211520926c5e839c68cd01fbb (patch) | |
tree | df264bef9f6876c65d3e1905e374b15739c8f655 /src/input | |
parent | d003da4b7bbf1b37f95c2e8e761fbe3e54b25c7a (diff) | |
download | mv-45949cf0fbade4f211520926c5e839c68cd01fbb.tar.gz mv-45949cf0fbade4f211520926c5e839c68cd01fbb.tar.bz2 mv-45949cf0fbade4f211520926c5e839c68cd01fbb.tar.xz mv-45949cf0fbade4f211520926c5e839c68cd01fbb.zip |
Move chat command /testsdlfont into actions.
Diffstat (limited to 'src/input')
-rw-r--r-- | src/input/inputaction.h | 1 | ||||
-rw-r--r-- | src/input/inputactionmap.h | 19 | ||||
-rw-r--r-- | src/input/pages/other.cpp | 8 |
3 files changed, 27 insertions, 1 deletions
diff --git a/src/input/inputaction.h b/src/input/inputaction.h index c0c91d7f8..48508b0fb 100644 --- a/src/input/inputaction.h +++ b/src/input/inputaction.h @@ -407,6 +407,7 @@ namespace InputAction URL, OPEN_URL, EXECUTE, + TEST_SDL_FONT, TOTAL }; } // namespace InputAction diff --git a/src/input/inputactionmap.h b/src/input/inputactionmap.h index 0e16c866c..e2d123b73 100644 --- a/src/input/inputactionmap.h +++ b/src/input/inputactionmap.h @@ -3432,7 +3432,24 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::INGAME, "execute", - true} + true}, + {"keyTestSdlFont", + InputType::UNKNOWN, InputAction::NO_VALUE, + InputType::UNKNOWN, InputAction::NO_VALUE, + Input::GRP_DEFAULT, +#if defined USE_OPENGL && defined DEBUG_SDLFONT + &Actions::testSdlFont, +#else + nullptr, +#endif + InputAction::NO_VALUE, 50, + InputCondition::INGAME, +#if defined USE_OPENGL && defined DEBUG_SDLFONT + "testsdlfont", +#else + "", +#endif + false} }; #endif // INPUT_INPUTACTIONMAP_H diff --git a/src/input/pages/other.cpp b/src/input/pages/other.cpp index 06ce2c348..61c6a5a9f 100644 --- a/src/input/pages/other.cpp +++ b/src/input/pages/other.cpp @@ -327,6 +327,14 @@ SetupActionData setupActionDataOther[] = InputAction::DUMP_OGL, "", }, +#if defined USE_OPENGL && defined DEBUG_SDLFONT + { + // TRANSLATORS: input action name + N_("Test SDL font speed"), + InputAction::TEST_SDL_FONT, + "", + }, +#endif { "", InputAction::NO_VALUE, |