minetest
/
minetest
mirror of https://github.com/minetest/minetest.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Update GUI texts

This commit is contained in:
Perttu Ahola 2012-12-06 21:01:45 +02:00
parent 7d2f0d7b1b
commit fd9e226b79
3 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/game.cpp
View File

@ -1214,7 +1214,7 @@ void the_game(
// First line of debug text // First line of debug text
gui::IGUIStaticText *guitext = guienv->addStaticText( gui::IGUIStaticText *guitext = guienv->addStaticText(
L"Minetest-c55", L"Minetest",
core::rect<s32>(5, 5, 795, 5+text_height), core::rect<s32>(5, 5, 795, 5+text_height),
false, false); false, false);
// Second line of debug text // Second line of debug text
@ -2607,7 +2607,7 @@ void the_game(
//TimeTaker guiupdatetimer("Gui updating"); //TimeTaker guiupdatetimer("Gui updating");
const char program_name_and_version[] = const char program_name_and_version[] =
"Minetest-c55 " VERSION_STRING; "Minetest " VERSION_STRING;
if(show_debug) if(show_debug)
{ {

6
src/guiMainMenu.cpp
View File

@ -208,7 +208,7 @@ void GUIMainMenu::regenerateGui(v2u32 screensize)
core::rect<s32> rect(0, 0, size.X, 40); core::rect<s32> rect(0, 0, size.X, 40);
rect += v2s32(4, 0); rect += v2s32(4, 0);
Environment->addStaticText(narrow_to_wide( Environment->addStaticText(narrow_to_wide(
"Minetest-c55 " VERSION_STRING).c_str(), "Minetest " VERSION_STRING).c_str(),
rect, false, true, this, -1); rect, false, true, this, -1);
} }
@ -659,11 +659,11 @@ void GUIMainMenu::regenerateGui(v2u32 screensize)
core::rect<s32> rect(0, 0, 454, 250); core::rect<s32> rect(0, 0, 454, 250);
rect += m_topleft_client + v2s32(110, 50+35); rect += m_topleft_client + v2s32(110, 50+35);
Environment->addStaticText(narrow_to_wide( Environment->addStaticText(narrow_to_wide(
"Minetest-c55 " VERSION_STRING "\n" "Minetest " VERSION_STRING "\n"
"http://minetest.net/\n" "http://minetest.net/\n"
"\n" "\n"
"by Perttu Ahola <celeron55@gmail.com>\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); ).c_str(), rect, false, true, this, -1);
} }
} }

15
src/guiPauseMenu.cpp
View File

@ -169,23 +169,8 @@ void GUIPauseMenu::regenerateGui(v2u32 screensize)
max_texture_size = driver->getMaxTextureSize(); 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; std::ostringstream os;
os<<"Minetest\n"; os<<"Minetest\n";
os<<"by Perttu Ahola and contributors\n";
os<<"celeron55@gmail.com\n";
os<<BUILD_INFO<<"\n"; os<<BUILD_INFO<<"\n";
os<<"path_user = "<<wrap_rows(porting::path_user, 20)<<"\n"; os<<"path_user = "<<wrap_rows(porting::path_user, 20)<<"\n";