BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Show game name instead of game ID of selected game

Browse Source
This commit is contained in:
PilzAdam 2013-05-02 19:57:03 +02:00
parent ee8067f7cf
commit b75505e6b2
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/guiMainMenu.cpp
View File

@ -258,9 +258,9 @@ 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);
std::string t = "Minetest " VERSION_STRING; std::string t = "Minetest " VERSION_STRING;
if(m_data->selected_game != ""){ if(m_data->selected_game_name != ""){
t += "/"; t += "/";
t += m_data->selected_game; t += m_data->selected_game_name;
} }
Environment->addStaticText(narrow_to_wide(t).c_str(), Environment->addStaticText(narrow_to_wide(t).c_str(),
rect, false, true, this, -1); rect, false, true, this, -1);
@ -1356,6 +1356,8 @@ bool GUIMainMenu::OnEvent(const SEvent& event)
eid <= GUI_ID_GAME_BUTTON_MAX){ eid <= GUI_ID_GAME_BUTTON_MAX){
m_data->selected_game = m_data->selected_game =
m_data->games[eid - GUI_ID_GAME_BUTTON_FIRST].id; m_data->games[eid - GUI_ID_GAME_BUTTON_FIRST].id;
m_data->selected_game_name =
m_data->games[eid - GUI_ID_GAME_BUTTON_FIRST].name;
regenerateGui(m_screensize_old); regenerateGui(m_screensize_old);
} }
} }

2
src/guiMainMenu.h
View File

@ -40,6 +40,7 @@ struct MainMenuData
// Generic // Generic
int selected_tab; int selected_tab;
std::string selected_game; std::string selected_game;
std::string selected_game_name;
// Client options // Client options
std::string servername; std::string servername;
std::string serverdescription; std::string serverdescription;
@ -80,6 +81,7 @@ struct MainMenuData
// Generic // Generic
selected_tab(0), selected_tab(0),
selected_game("minetest"), selected_game("minetest"),
selected_game_name("Minetest"),
// Client opts // Client opts
fancy_trees(false), fancy_trees(false),
smooth_lighting(false), smooth_lighting(false),

4
src/main.cpp
View File

@ -1501,8 +1501,10 @@ int main(int argc, char *argv[])
menudata.selected_tab = g_settings->getS32("selected_mainmenu_tab"); menudata.selected_tab = g_settings->getS32("selected_mainmenu_tab");
if(g_settings->exists("selected_serverlist")) if(g_settings->exists("selected_serverlist"))
menudata.selected_serverlist = g_settings->getS32("selected_serverlist"); menudata.selected_serverlist = g_settings->getS32("selected_serverlist");
if(g_settings->exists("selected_mainmenu_game")) if(g_settings->exists("selected_mainmenu_game")){
menudata.selected_game = g_settings->get("selected_mainmenu_game"); menudata.selected_game = g_settings->get("selected_mainmenu_game");
menudata.selected_game_name = findSubgame(menudata.selected_game).name;
}
menudata.address = narrow_to_wide(address); menudata.address = narrow_to_wide(address);
menudata.name = narrow_to_wide(playername); menudata.name = narrow_to_wide(playername);
menudata.port = narrow_to_wide(itos(port)); menudata.port = narrow_to_wide(itos(port));