diff options
author | Andrei Karas <akaras@inbox.ru> | 2014-08-27 02:20:56 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2014-08-27 02:20:56 +0300 |
commit | 1b27066e2d98c82b0bf135188ebb57e16af669df (patch) | |
tree | 87460b10e94f0734357d57a95c311522f453647f | |
parent | a714a339ac461943236eb1992c38dfb16821d0a1 (diff) | |
download | manaverse-1b27066e2d98c82b0bf135188ebb57e16af669df.tar.gz manaverse-1b27066e2d98c82b0bf135188ebb57e16af669df.tar.bz2 manaverse-1b27066e2d98c82b0bf135188ebb57e16af669df.tar.xz manaverse-1b27066e2d98c82b0bf135188ebb57e16af669df.zip |
Move chat command /dumpt into actions.
-rw-r--r-- | src/actions/actions.cpp | 7 | ||||
-rw-r--r-- | src/actions/actions.h | 1 | ||||
-rw-r--r-- | src/commands.cpp | 7 | ||||
-rw-r--r-- | src/commands.h | 5 | ||||
-rw-r--r-- | src/input/inputaction.h | 1 | ||||
-rw-r--r-- | src/input/inputactionmap.h | 9 | ||||
-rw-r--r-- | src/input/pages/other.cpp | 6 |
7 files changed, 25 insertions, 11 deletions
diff --git a/src/actions/actions.cpp b/src/actions/actions.cpp index 4717ff6ab..343caedf7 100644 --- a/src/actions/actions.cpp +++ b/src/actions/actions.cpp @@ -953,4 +953,11 @@ impHandler0(dumpEnvironment) return true; } +impHandler(dumpTests) +{ + const std::string str = config.getStringValue("testInfo"); + outStringNormal(event.tab, str, str); + return true; +} + } // namespace Actions diff --git a/src/actions/actions.h b/src/actions/actions.h index 773d34e36..175e2d530 100644 --- a/src/actions/actions.h +++ b/src/actions/actions.h @@ -74,6 +74,7 @@ namespace Actions decHandler(error) __attribute__ ((noreturn)); decHandler(dumpGraphics); decHandler(dumpEnvironment); + decHandler(dumpTests); } // namespace Actions #undef decHandler diff --git a/src/commands.cpp b/src/commands.cpp index 969b73c68..f1eda21ea 100644 --- a/src/commands.cpp +++ b/src/commands.cpp @@ -106,13 +106,6 @@ impHandler(hack) return true; } -impHandler(dumpTests) -{ - const std::string str = config.getStringValue("testInfo"); - outStringNormal(event.tab, str, str); - return true; -} - impHandler(url) { if (event.tab) diff --git a/src/commands.h b/src/commands.h index 826788887..7c74de94f 100644 --- a/src/commands.h +++ b/src/commands.h @@ -54,7 +54,6 @@ namespace Commands decHandler(hack); decHandler(url); decHandler(open); - decHandler(dumpTests); decHandler(dumpOGL); decHandler(dumpGL); decHandler(dumpMods); @@ -81,8 +80,7 @@ namespace Commands enum { - COMMAND_DUMPT = 0, - COMMAND_DUMPOGL, + COMMAND_DUMPOGL = 0, COMMAND_DUMPGL, COMMAND_DUMPMODS, COMMAND_URL, @@ -110,7 +108,6 @@ enum static const CommandInfo commands[] = { - {"dumpt", &Commands::dumpTests, -1, false}, {"dumpogl", &Commands::dumpOGL, -1, false}, {"dumpgl", &Commands::dumpGL, -1, false}, {"dumpmods", &Commands::dumpMods, -1, false}, diff --git a/src/input/inputaction.h b/src/input/inputaction.h index 388898a84..bc819bf1e 100644 --- a/src/input/inputaction.h +++ b/src/input/inputaction.h @@ -400,6 +400,7 @@ namespace InputAction ERROR, DUMP_GRAPHICS, DUMP_ENVIRONMENT, + DUMP_TESTS, TOTAL }; } // namespace InputAction diff --git a/src/input/inputactionmap.h b/src/input/inputactionmap.h index 4cf34d4f3..b363a7ce1 100644 --- a/src/input/inputactionmap.h +++ b/src/input/inputactionmap.h @@ -3369,6 +3369,15 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::INGAME, "dumpe", + false}, + {"keyDumpt", + InputType::UNKNOWN, InputAction::NO_VALUE, + InputType::UNKNOWN, InputAction::NO_VALUE, + Input::GRP_DEFAULT, + &Actions::dumpTests, + InputAction::NO_VALUE, 50, + InputCondition::INGAME, + "dumpt", false} }; diff --git a/src/input/pages/other.cpp b/src/input/pages/other.cpp index bf7666457..e91bd40b4 100644 --- a/src/input/pages/other.cpp +++ b/src/input/pages/other.cpp @@ -299,6 +299,12 @@ SetupActionData setupActionDataOther[] = }, { // TRANSLATORS: input action name + N_("Dump tests info into chat"), + InputAction::DUMP_TESTS, + "", + }, + { + // TRANSLATORS: input action name N_("Dump environments into log"), InputAction::DUMP_ENVIRONMENT, "", |