aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPerttu Ahola <celeron55@gmail.com>2012-12-06 21:01:45 +0200
committerPerttu Ahola <celeron55@gmail.com>2012-12-06 21:02:02 +0200
commitfd9e226b794fd644e5dce578db206ddc804bd578 (patch)
treef24d9951fa8b9f5d5a675fccba126f4ce634b62f
parent7d2f0d7b1b088813cb473cc4637cc19498ef8f23 (diff)
downloadminetest-fd9e226b794fd644e5dce578db206ddc804bd578.tar.gz
minetest-fd9e226b794fd644e5dce578db206ddc804bd578.tar.bz2
minetest-fd9e226b794fd644e5dce578db206ddc804bd578.zip
Update GUI texts
-rw-r--r--src/game.cpp4
-rw-r--r--src/guiMainMenu.cpp6
-rw-r--r--src/guiPauseMenu.cpp15
3 files changed, 5 insertions, 20 deletions
diff --git a/src/game.cpp b/src/game.cpp
index 194658f1f..9cd460922 100644
--- 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 c711577b0..d7c3f54ff 100644
--- 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 96fd7d676..c800cf952 100644
--- a/src/guiPauseMenu.cpp
+++ b/src/guiPauseMenu.cpp
@@ -169,23 +169,8 @@ void GUIPauseMenu::regenerateGui(v2u32 screensize)
max_texture_size = driver->getMaxTextureSize();
}
- /*wchar_t text[200];
- swprintf(text, 200,
- L"Minetest-c55\n"
- L"by Perttu Ahola\n"
- L"celeron55@gmail.com\n\n"
- SWPRINTF_CHARSTRING L"\n"
- L"userdata path = "
- SWPRINTF_CHARSTRING
- ,
- BUILD_INFO,
- porting::path_user.c_str()
- );*/
-
std::ostringstream os;
os<<"Minetest\n";
- os<<"by Perttu Ahola and contributors\n";
- os<<"celeron55@gmail.com\n";
os<<BUILD_INFO<<"\n";
os<<"path_user = "<<wrap_rows(porting::path_user, 20)<<"\n";