diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-08-26 15:05:48 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-08-26 15:05:48 +0300 |
| commit | b44ae759ff5a848b7c6d15dc80bba4e7a6948575 (patch) | |
| tree | 17a577d75124c622fb00b516c95f15cc350b374a /src/input | |
| parent | ce0c0778675908f7be557b1c115de3eabb828079 (diff) | |
| download | manaplus-b44ae759ff5a848b7c6d15dc80bba4e7a6948575.tar.gz manaplus-b44ae759ff5a848b7c6d15dc80bba4e7a6948575.tar.bz2 manaplus-b44ae759ff5a848b7c6d15dc80bba4e7a6948575.tar.xz manaplus-b44ae759ff5a848b7c6d15dc80bba4e7a6948575.zip | |
Move chat command /trade into actions.
Diffstat (limited to 'src/input')
| -rw-r--r-- | src/input/inputaction.h | 3 | ||||
| -rw-r--r-- | src/input/inputactionmap.h | 9 | ||||
| -rw-r--r-- | src/input/pages/basic.cpp | 8 |
3 files changed, 18 insertions, 2 deletions
diff --git a/src/input/inputaction.h b/src/input/inputaction.h index dae8cbf53..d278e9799 100644 --- a/src/input/inputaction.h +++ b/src/input/inputaction.h @@ -57,7 +57,7 @@ namespace InputAction HIDE_WINDOWS, SIT, SCREENSHOT, - TRADE, + CHANGE_TRADE, PATHFIND, OK, QUIT, @@ -379,6 +379,7 @@ namespace InputAction NAVIGATE, IMITATION, SEND_MAIL, + TRADE, TOTAL }; } // namespace InputAction diff --git a/src/input/inputactionmap.h b/src/input/inputactionmap.h index 6657b0909..58688fc27 100644 --- a/src/input/inputactionmap.h +++ b/src/input/inputactionmap.h @@ -3180,6 +3180,15 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::INGAME, "mail", + true}, + {"keyTradeCommand", + InputType::UNKNOWN, InputAction::NO_VALUE, + InputType::UNKNOWN, InputAction::NO_VALUE, + Input::GRP_DEFAULT, + &Actions::trade, + InputAction::NO_VALUE, 50, + InputCondition::INGAME, + "trade", true} }; diff --git a/src/input/pages/basic.cpp b/src/input/pages/basic.cpp index 2c784d804..ee65d48fe 100644 --- a/src/input/pages/basic.cpp +++ b/src/input/pages/basic.cpp @@ -162,7 +162,7 @@ SetupActionData setupActionDataBasic[] = { // TRANSLATORS: input action name N_("Enable/Disable Trading"), - InputAction::TRADE, + InputAction::CHANGE_TRADE, "", }, { @@ -173,6 +173,12 @@ SetupActionData setupActionDataBasic[] = }, { // TRANSLATORS: input action name + N_("Start trade with target"), + InputAction::TRADE, + "", + }, + { + // TRANSLATORS: input action name N_("Follow selected player"), InputAction::FOLLOW, "", |