Update GUI texts

diff --git a/src/game.cpp b/src/game.cpp
index 194658f1f7fb257fe14fe1fd9e1d800648ee0fc7..9cd4609223baac42e840ca347c4094259200984c 100644 (file)
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -1214,7 +1214,7 @@ void the_game(
 
        // First line of debug text
        gui::IGUIStaticText *guitext = guienv->addStaticText(
-                       L"Minetest-c55",
+                       L"Minetest",
                        core::rect<s32>(5, 5, 795, 5+text_height),
                        false, false);
        // Second line of debug text
@@ -2607,7 +2607,7 @@ void the_game(
                //TimeTaker guiupdatetimer("Gui updating");
                
                const char program_name_and_version[] =
-                       "Minetest-c55 " VERSION_STRING;
+                       "Minetest " VERSION_STRING;
 
                if(show_debug)
                {

diff --git a/src/guiMainMenu.cpp b/src/guiMainMenu.cpp
index c711577b037600b939f777a945ce9044710e857c..d7c3f54ff957c7eb75e5da5330f1f3a9193ab352 100644 (file)
--- a/src/guiMainMenu.cpp
+++ b/src/guiMainMenu.cpp
@@ -208,7 +208,7 @@ void GUIMainMenu::regenerateGui(v2u32 screensize)
                core::rect<s32> rect(0, 0, size.X, 40);
                rect += v2s32(4, 0);
                Environment->addStaticText(narrow_to_wide(
-                               "Minetest-c55 " VERSION_STRING).c_str(),
+                               "Minetest " VERSION_STRING).c_str(),
                                rect, false, true, this, -1);
        }
 
@@ -659,11 +659,11 @@ void GUIMainMenu::regenerateGui(v2u32 screensize)
                        core::rect<s32> rect(0, 0, 454, 250);
                        rect += m_topleft_client + v2s32(110, 50+35);
                        Environment->addStaticText(narrow_to_wide(
-                       "Minetest-c55 " VERSION_STRING "\n"
+                       "Minetest " VERSION_STRING "\n"
                        "http://minetest.net/\n"
                        "\n"
                        "by Perttu Ahola <celeron55@gmail.com>\n"
-                       "and contributors: tango_, kahrl (kaaaaaahrl?), erlehmann (the hippie), SpeedProg, JacobF (sqlite worlds), teddydestodes, marktraceur, darkrose, Jonathan Neuschäfer (who the hell?), Felix Krausse (broke liquids, IIRC), sfan5... and >10 more random people."
+                       "and contributors: PilzAdam, Taoki, tango_, kahrl (kaaaaaahrl?), darkrose, matttpt, erlehmann, SpeedProg, JacobF, teddydestodes, marktraceur, Jonathan Neuschäfer, thexyz, VanessaE, sfan5... and tens of more random people."
                        ).c_str(), rect, false, true, this, -1);
                }
        }

diff --git a/src/guiPauseMenu.cpp b/src/guiPauseMenu.cpp
index 96fd7d67676b3b10fd517f9f9928119384d53db5..c800cf9529e76eb65657fe687bf8200dbe2b8dd8 100644 (file)
--- a/src/guiPauseMenu.cpp
+++ b/src/guiPauseMenu.cpp
@@ -169,23 +169,8 @@ void GUIPauseMenu::regenerateGui(v2u32 screensize)
                        max_texture_size = driver->getMaxTextureSize();\r
                }\r
 \r
-               /*wchar_t text[200];\r
-               swprintf(text, 200,\r
-                               L"Minetest-c55\n"\r
-                               L"by Perttu Ahola\n"\r
-                               L"celeron55@gmail.com\n\n"\r
-                               SWPRINTF_CHARSTRING L"\n"\r
-                               L"userdata path = "\r
-                               SWPRINTF_CHARSTRING\r
-                               ,\r
-                               BUILD_INFO,\r
-                               porting::path_user.c_str()\r
-               );*/\r
-\r
                std::ostringstream os;\r
                os<<"Minetest\n";\r
-               os<<"by Perttu Ahola and contributors\n";\r
-               os<<"celeron55@gmail.com\n";\r
                os<<BUILD_INFO<<"\n";\r
                os<<"path_user = "<<wrap_rows(porting::path_user, 20)<<"\n";\r
        \r