summaryrefslogtreecommitdiff
path: root/src/input
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-08-23 20:47:15 +0300
committerAndrei Karas <akaras@inbox.ru>2014-08-23 20:47:15 +0300
commite6d02447113b137ce37f2331ae674371c3968e28 (patch)
treee659f4b159c991d8cbd0b167ec74486de06ae91e /src/input
parent051b5fc10eaec4f4aec1de8e79f2feae60f0e084 (diff)
downloadmanaverse-e6d02447113b137ce37f2331ae674371c3968e28.tar.gz
manaverse-e6d02447113b137ce37f2331ae674371c3968e28.tar.bz2
manaverse-e6d02447113b137ce37f2331ae674371c3968e28.tar.xz
manaverse-e6d02447113b137ce37f2331ae674371c3968e28.zip
Move chat command /who into actions.
Diffstat (limited to 'src/input')
-rw-r--r--src/input/inputaction.h1
-rw-r--r--src/input/inputactionmap.h9
-rw-r--r--src/input/pages/other.cpp6
3 files changed, 16 insertions, 0 deletions
diff --git a/src/input/inputaction.h b/src/input/inputaction.h
index f0f999d2e..8d4051fc0 100644
--- a/src/input/inputaction.h
+++ b/src/input/inputaction.h
@@ -346,6 +346,7 @@ namespace InputAction
CHAT_ANNOUNCE,
IPC_TOGGLE,
WHERE,
+ WHO,
TOTAL
};
} // namespace InputAction
diff --git a/src/input/inputactionmap.h b/src/input/inputactionmap.h
index 241ed632a..b7a7fcff7 100644
--- a/src/input/inputactionmap.h
+++ b/src/input/inputactionmap.h
@@ -2883,6 +2883,15 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
InputAction::NO_VALUE, 50,
InputCondition::INGAME,
"where",
+ false},
+ {"keyWho",
+ InputType::UNKNOWN, InputAction::NO_VALUE,
+ InputType::UNKNOWN, InputAction::NO_VALUE,
+ Input::GRP_DEFAULT,
+ &Actions::who,
+ InputAction::NO_VALUE, 50,
+ InputCondition::INGAME,
+ "who",
false}
};
diff --git a/src/input/pages/other.cpp b/src/input/pages/other.cpp
index d1a7d0bfd..e60b2addd 100644
--- a/src/input/pages/other.cpp
+++ b/src/input/pages/other.cpp
@@ -203,6 +203,12 @@ SetupActionData setupActionDataOther[] =
},
{
// TRANSLATORS: input action name
+ N_("Show online players number in chat"),
+ InputAction::WHO,
+ "",
+ },
+ {
+ // TRANSLATORS: input action name
N_("Show onscreen keyboard"),
InputAction::SHOW_KEYBOARD,
"",