Merge branch 'upstream/master'

[oweals/minetest.git] / src / guiPauseMenu.cpp

diff --git a/src/guiPauseMenu.cpp b/src/guiPauseMenu.cpp
index 5f40a4820462decaea4dad57a86c502c470a1cac..c704cd3fb574148ff36dd071a30894e05f0ee737 100644 (file)
--- a/src/guiPauseMenu.cpp
+++ b/src/guiPauseMenu.cpp
@@ -106,35 +106,39 @@ void GUIPauseMenu::regenerateGui(v2u32 screensize)
        {\r
                core::rect<s32> rect(0, 0, 140, btn_height);\r
                rect = rect + v2s32(size.X/2-140/2, btn_y);\r
-               Environment->addButton(rect, this, 256, chartowchar_t(gettext("Continue")));\r
+               Environment->addButton(rect, this, 256,\r
+                       chartowchar_t(gettext("Continue")));\r
        }\r
        btn_y += btn_height + btn_gap;\r
        {\r
                core::rect<s32> rect(0, 0, 140, btn_height);\r
                rect = rect + v2s32(size.X/2-140/2, btn_y);\r
-               Environment->addButton(rect, this, 261, chartowchar_t(gettext("Change Password")));\r
+               Environment->addButton(rect, this, 261,\r
+                       chartowchar_t(gettext("Change Password")));\r
        }\r
        btn_y += btn_height + btn_gap;\r
        {\r
                core::rect<s32> rect(0, 0, 140, btn_height);\r
                rect = rect + v2s32(size.X/2-140/2, btn_y);\r
-               Environment->addButton(rect, this, 260, chartowchar_t(gettext("Disconnect")));\r
+               Environment->addButton(rect, this, 260,\r
+                       chartowchar_t(gettext("Disconnect")));\r
        }\r
        btn_y += btn_height + btn_gap;\r
        {\r
                core::rect<s32> rect(0, 0, 140, btn_height);\r
                rect = rect + v2s32(size.X/2-140/2, btn_y);\r
-               Environment->addButton(rect, this, 257, chartowchar_t(gettext("Exit to OS")));\r
+               Environment->addButton(rect, this, 257,\r
+                       chartowchar_t(gettext("Exit to OS")));\r
        }\r
 \r
        {\r
                core::rect<s32> rect(0, 0, 180, 240);\r
                rect = rect + v2s32(size.X/2 + 90, size.Y/2-rect.getHeight()/2);\r
                Environment->addStaticText(chartowchar_t(gettext(\r
-               "Keys:\n"\r
+               "Default Controls:\n"\r
                "- WASD: Walk\n"\r
-               "- Mouse left: dig blocks\n"\r
-               "- Mouse right: place blocks\n"\r
+               "- Mouse left: dig/hit\n"\r
+               "- Mouse right: place/use\n"\r
                "- Mouse wheel: select item\n"\r
                "- 0...9: select item\n"\r
                "- Shift: sneak\n"\r