summaryrefslogtreecommitdiff
path: root/src/input
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-06-15 20:37:18 +0300
committerAndrei Karas <akaras@inbox.ru>2017-06-15 20:37:18 +0300
commitf6cb5519a2cc4452055ff0bfb6f38990bc3e9e65 (patch)
treea4b22c43caebdccb79969dc95356f8745600d36c /src/input
parentacc395f67dbe683787f1aeb0bf96fe0a16f62c5e (diff)
downloadmv-f6cb5519a2cc4452055ff0bfb6f38990bc3e9e65.tar.gz
mv-f6cb5519a2cc4452055ff0bfb6f38990bc3e9e65.tar.bz2
mv-f6cb5519a2cc4452055ff0bfb6f38990bc3e9e65.tar.xz
mv-f6cb5519a2cc4452055ff0bfb6f38990bc3e9e65.zip
Allow open server info window from game.
Diffstat (limited to 'src/input')
-rw-r--r--src/input/inputactionmap.h6
-rw-r--r--src/input/pages/windows.cpp6
2 files changed, 12 insertions, 0 deletions
diff --git a/src/input/inputactionmap.h b/src/input/inputactionmap.h
index d593011b0..0de10a4e4 100644
--- a/src/input/inputactionmap.h
+++ b/src/input/inputactionmap.h
@@ -5690,6 +5690,12 @@ static const InputActionData inputActionData
"ipcheck|checkip",
UseArgs_true,
Protected_true},
+ {"keyWindowServerInfo",
+ defaultAction(&Actions::serverInfoWindowShow),
+ InputCondition::GAME | InputCondition::NOTARGET,
+ "serverinfo|infoserver",
+ UseArgs_false,
+ Protected_false},
};
#undef defaultAction
diff --git a/src/input/pages/windows.cpp b/src/input/pages/windows.cpp
index b9d64acbc..ca232f914 100644
--- a/src/input/pages/windows.cpp
+++ b/src/input/pages/windows.cpp
@@ -67,6 +67,12 @@ SetupActionData setupActionDataWindows[] =
},
{
// TRANSLATORS: input action name
+ N_("Server Info Window"),
+ InputAction::WINDOW_SERVER_INFO,
+ "",
+ },
+ {
+ // TRANSLATORS: input action name
N_("Status Window"),
InputAction::WINDOW_STATUS,
"",