...Make the the server buildable again after the last commit

[minetest.git] / src / guiPauseMenu.cpp

diff --git a/src/guiPauseMenu.cpp b/src/guiPauseMenu.cpp
index 5f40a4820462decaea4dad57a86c502c470a1cac..3cd572387f24de92e02311c1af26d31008269437 100644 (file)
--- a/src/guiPauseMenu.cpp
+++ b/src/guiPauseMenu.cpp
@@ -23,6 +23,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "porting.h"\r
 #include "config.h"\r
 #include "main.h"\r
+#include <IGUICheckBox.h>\r
+#include <IGUIEditBox.h>\r
+#include <IGUIButton.h>\r
+#include <IGUIStaticText.h>\r
+#include <IGUIFont.h>\r
 \r
 #include "gettext.h"\r
 \r
@@ -103,38 +108,43 @@ void GUIPauseMenu::regenerateGui(v2u32 screensize)
        const s32 btn_gap = 20;\r
        const s32 btn_num = 4;\r
        s32 btn_y = size.Y/2-((btn_num*btn_height+(btn_num-1)*btn_gap))/2;\r
+       changeCtype("");\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, 256, chartowchar_t(gettext("Continue")));\r
+               Environment->addButton(rect, this, 256,\r
+                       wgettext("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
+                       wgettext("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
+                       wgettext("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
+                       wgettext("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
@@ -168,7 +178,7 @@ void GUIPauseMenu::regenerateGui(v2u32 screensize)
                );*/\r
 \r
                std::ostringstream os;\r
-               os<<"Minetest-delta\n";\r
+               os<<"Minetest\n";\r
                os<<"by Perttu Ahola and contributors\n";\r
                os<<"celeron55@gmail.com\n";\r
                os<<BUILD_INFO<<"\n";\r
@@ -176,6 +186,7 @@ void GUIPauseMenu::regenerateGui(v2u32 screensize)
        \r
                Environment->addStaticText(narrow_to_wide(os.str()).c_str(), rect, false, true, this, 259);\r
        }\r
+       changeCtype("C");\r
 }\r
 \r
 void GUIPauseMenu::drawMenu()\r