From f98d0433f9a72c09eddad319763e750e2deb19a3 Mon Sep 17 00:00:00 2001 From: proller Date: Sat, 23 Mar 2013 17:37:50 +0400 Subject: Random guest name and finite liquid checkbox --- src/guiMainMenu.cpp | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'src/guiMainMenu.cpp') diff --git a/src/guiMainMenu.cpp b/src/guiMainMenu.cpp index 79170d99a..9e6b01dd6 100644 --- a/src/guiMainMenu.cpp +++ b/src/guiMainMenu.cpp @@ -140,6 +140,7 @@ enum GUI_ID_SHADERS_CB, GUI_ID_PRELOAD_ITEM_VISUALS_CB, GUI_ID_ENABLE_PARTICLES_CB, + GUI_ID_LIQUID_FINITE_CB, GUI_ID_DAMAGE_CB, GUI_ID_CREATIVE_CB, GUI_ID_PUBLIC_CB, @@ -430,6 +431,10 @@ void GUIMainMenu::regenerateGui(v2u32 screensize) e->setDrawBackground(true); if (m_data->serverlist_show_available == false) m_data->servers = ServerList::getLocal(); +#if USE_CURL + else + m_data->servers = ServerList::getOnline(); +#endif updateGuiServerList(); e->setSelected(0); } @@ -722,6 +727,13 @@ void GUIMainMenu::regenerateGui(v2u32 screensize) GUI_ID_ENABLE_PARTICLES_CB, wgettext("Enable Particles")); } + { + core::rect rect(0, 0, option_w+20+20, 30); + rect += m_topleft_client + v2s32(option_x+175*2, option_y+20*3); + Environment->addCheckBox(m_data->liquid_finite, rect, this, + GUI_ID_LIQUID_FINITE_CB, wgettext("Finite liquid")); + } + // Key change button { core::rect rect(0, 0, 120, 30); @@ -968,6 +980,12 @@ void GUIMainMenu::readInput(MainMenuData *dst) dst->enable_particles = ((gui::IGUICheckBox*)e)->isChecked(); } + { + gui::IGUIElement *e = getElementFromId(GUI_ID_LIQUID_FINITE_CB); + if(e != NULL && e->getType() == gui::EGUIET_CHECK_BOX) + dst->liquid_finite = ((gui::IGUICheckBox*)e)->isChecked(); + } + { gui::IGUIElement *e = getElementFromId(GUI_ID_WORLD_LISTBOX); if(e != NULL && e->getType() == gui::EGUIET_LIST_BOX) -- cgit v1.2.3