diff options
author | Andrei Karas <akaras@inbox.ru> | 2014-08-27 16:41:00 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2014-08-27 16:41:00 +0300 |
commit | 56178bf525b07582389493158ac90e2ab7721571 (patch) | |
tree | 42a1696e108453eaad3e80ca68151c7f8b10e8fd | |
parent | 7891954d9767df4fc4ecf1c44830ca9c18a34e10 (diff) | |
download | manaverse-56178bf525b07582389493158ac90e2ab7721571.tar.gz manaverse-56178bf525b07582389493158ac90e2ab7721571.tar.bz2 manaverse-56178bf525b07582389493158ac90e2ab7721571.tar.xz manaverse-56178bf525b07582389493158ac90e2ab7721571.zip |
Move chat command /hack into actions.
-rw-r--r-- | src/actions/commands.cpp | 6 | ||||
-rw-r--r-- | src/actions/commands.h | 1 | ||||
-rw-r--r-- | src/commands.cpp | 6 | ||||
-rw-r--r-- | src/commands.h | 5 | ||||
-rw-r--r-- | src/input/inputaction.h | 1 | ||||
-rw-r--r-- | src/input/inputactionmap.h | 9 |
6 files changed, 18 insertions, 10 deletions
diff --git a/src/actions/commands.cpp b/src/actions/commands.cpp index fb4577719..bb174cb07 100644 --- a/src/actions/commands.cpp +++ b/src/actions/commands.cpp @@ -680,4 +680,10 @@ impHandler(gm) return true; } +impHandler(hack) +{ + Net::getChatHandler()->sendRaw(event.args); + return true; +} + } // namespace Actions diff --git a/src/actions/commands.h b/src/actions/commands.h index 06e288d7a..cc9a0e172 100644 --- a/src/actions/commands.h +++ b/src/actions/commands.h @@ -69,6 +69,7 @@ namespace Actions decHandler(talkRaw); decHandler(talkPet); decHandler(gm); + decHandler(hack); } // namespace Actions #undef decHandler diff --git a/src/commands.cpp b/src/commands.cpp index 4839899fb..d6183b42b 100644 --- a/src/commands.cpp +++ b/src/commands.cpp @@ -100,12 +100,6 @@ extern char **environ; namespace Commands { -impHandler(hack) -{ - Net::getChatHandler()->sendRaw(event.args); - return true; -} - static int uploadUpdate(void *ptr, DownloadStatus::Type status, size_t total A_UNUSED, diff --git a/src/commands.h b/src/commands.h index caace74f4..1a6009101 100644 --- a/src/commands.h +++ b/src/commands.h @@ -51,7 +51,6 @@ struct CommandInfo final namespace Commands { - decHandler(hack); decHandler(debugSpawn); void replaceVars(std::string &str); @@ -59,14 +58,12 @@ namespace Commands enum { - COMMAND_HACK = 0, - COMMAND_DEBUGSPAWN, + COMMAND_DEBUGSPAWN = 0, END_COMMANDS }; static const CommandInfo commands[] = { - {"hack", &Commands::hack, -1, true}, {"debugSpawn", &Commands::debugSpawn, -1, true} }; diff --git a/src/input/inputaction.h b/src/input/inputaction.h index aa4fd8c6e..eb1e5e491 100644 --- a/src/input/inputaction.h +++ b/src/input/inputaction.h @@ -422,6 +422,7 @@ namespace InputAction UPLOAD_SERVER_CONFIG, UPLOAD_LOG, GM, + HACK, TOTAL }; } // namespace InputAction diff --git a/src/input/inputactionmap.h b/src/input/inputactionmap.h index 27d47a707..b9455ff2b 100644 --- a/src/input/inputactionmap.h +++ b/src/input/inputactionmap.h @@ -3575,6 +3575,15 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::INGAME, "gm", + true}, + {"keyHack", + InputType::UNKNOWN, InputAction::NO_VALUE, + InputType::UNKNOWN, InputAction::NO_VALUE, + Input::GRP_DEFAULT, + &Actions::hack, + InputAction::NO_VALUE, 50, + InputCondition::INGAME, + "hack", true} }; |