]> git.lizzy.rs Git - minetest.git/blobdiff - src/guiMainMenu.cpp
Don't erase modified_blocks
[minetest.git] / src / guiMainMenu.cpp
index f38e491a421fdb119c6125808da44d06150a8368..79170d99a5c34504a0b4eedc05320c676e5f3b00 100644 (file)
@@ -1,18 +1,18 @@
 /*
-Minetest-c55
-Copyright (C) 2010-12 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2010-2013 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
 (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU Lesser General Public License for more details.
 
-You should have received a copy of the GNU General Public License along
+You should have received a copy of the GNU Lesser General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
@@ -20,6 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "guiMainMenu.h"
 #include "guiKeyChangeMenu.h"
 #include "guiCreateWorld.h"
+#include "guiConfigureWorld.h"
 #include "guiMessageMenu.h"
 #include "guiConfirmMenu.h"
 #include "debug.h"
@@ -36,9 +37,44 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 // For IGameCallback
 #include "guiPauseMenu.h"
 #include "gettext.h"
-#include "utility.h"
 #include "tile.h" // getTexturePath
 #include "filesys.h"
+#include "util/string.h"
+#include "subgame.h"
+
+#define ARRAYLEN(x) (sizeof(x) / sizeof((x)[0]))
+
+const wchar_t *contrib_core_strs[] = {
+       L"Perttu Ahola (celeron55) <celeron55@gmail.com>",
+       L"Ryan Kwolek (kwolekr) <kwolekr@minetest.net>",
+       L"PilzAdam <pilzadam@minetest.net>",
+       L"Ilya Zhuravlev (thexyz) <xyz@minetest.net>",
+       L"Lisa Milne (darkrose) <lisa@ltmnet.com>"
+};
+
+const wchar_t *contrib_active_strs[] = {
+       L"RealBadAngel <mk@realbadangel.pl>",
+       L"sfan5 <sfan5@live.de>",
+       L"sapier <sapier@gmx.net>",
+       L"proller <proler@gmail.com>",
+       L"Vanessa Ezekowitz (VanessaE) <vanessaezekowitz@gmail.com>",
+       L"Jurgen Doser (doserj) <jurgen.doser@gmail.com>",
+       L"ShadowNinja",
+       L"dannydark <the_skeleton_of_a_child@yahoo.co.uk>",
+       L"Jeija <jeija@mesecons.net>",
+       L"MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>"
+};
+
+const wchar_t *contrib_previous_strs[] = {
+       L"kahrl <kahrl@gmx.net>",
+       L"Giuseppe Bilotta (Oblomov) <giuseppe.bilotta@gmail.com>",
+       L"Jonathan Neuschafer <j.neuschaefer@gmx.net>",
+       L"Nils Dagsson Moskopp (erlehmann) <nils@dieweltistgarnichtso.net>",
+       L"Constantin Wenger (SpeedProg) <constantin.wenger@googlemail.com>",
+       L"matttpt <matttpt@gmail.com>",
+       L"JacobF <queatz@gmail.com>" 
+};
+
 
 struct CreateWorldDestMainMenu : public CreateWorldDest
 {
@@ -47,6 +83,22 @@ struct CreateWorldDestMainMenu : public CreateWorldDest
        {}
        void accepted(std::wstring name, std::string gameid)
        {
+               std::string name_narrow = wide_to_narrow(name);
+               if(!string_allowed_blacklist(name_narrow, WORLDNAME_BLACKLISTED_CHARS))
+               {
+                       m_menu->displayMessageMenu(wgettext("Cannot create world: Name contains invalid characters"));
+                       return;
+               }
+               std::vector<WorldSpec> worlds = getAvailableWorlds();
+               for(std::vector<WorldSpec>::iterator i = worlds.begin();
+                   i != worlds.end(); i++)
+               {
+                       if((*i).name == name_narrow)
+                       {
+                               m_menu->displayMessageMenu(wgettext("Cannot create world: A world by this name already exists"));
+                               return;
+                       }
+               }
                m_menu->createNewWorld(name, gameid);
        }
        GUIMainMenu *m_menu;
@@ -81,8 +133,16 @@ enum
        GUI_ID_SMOOTH_LIGHTING_CB,
        GUI_ID_3D_CLOUDS_CB,
        GUI_ID_OPAQUE_WATER_CB,
+       GUI_ID_MIPMAP_CB,
+       GUI_ID_ANISOTROPIC_CB,
+       GUI_ID_BILINEAR_CB,
+       GUI_ID_TRILINEAR_CB,
+       GUI_ID_SHADERS_CB,
+       GUI_ID_PRELOAD_ITEM_VISUALS_CB,
+       GUI_ID_ENABLE_PARTICLES_CB,
        GUI_ID_DAMAGE_CB,
        GUI_ID_CREATIVE_CB,
+       GUI_ID_PUBLIC_CB,
        GUI_ID_JOIN_GAME_BUTTON,
        GUI_ID_CHANGE_KEYS_BUTTON,
        GUI_ID_DELETE_WORLD_BUTTON,
@@ -90,6 +150,9 @@ enum
        GUI_ID_CONFIGURE_WORLD_BUTTON,
        GUI_ID_WORLD_LISTBOX,
        GUI_ID_TAB_CONTROL,
+       GUI_ID_SERVERLIST,
+       GUI_ID_SERVERLIST_TOGGLE,
+       GUI_ID_SERVERLIST_DELETE,
 };
 
 enum
@@ -180,17 +243,16 @@ void GUIMainMenu::regenerateGui(v2u32 screensize)
        changeCtype("");
 
        // Version
-       //if(m_data->selected_tab != TAB_CREDITS)
        {
                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);
        }
 
        //v2s32 center(size.X/2, size.Y/2);
-       v2s32 c800(size.X/2-400, size.Y/2-300);
+       v2s32 c800(size.X/2-400, size.Y/2-270);
        
        m_topleft_client = c800 + v2s32(90, 70+50+30);
        m_size_client = v2s32(620, 270);
@@ -208,7 +270,6 @@ void GUIMainMenu::regenerateGui(v2u32 screensize)
        m_topleft_server = m_topleft_client + v2s32(0, m_size_client.Y+20);
        
        // Tabs
-#if 1
        {
                core::rect<s32> rect(0, 0, m_size_client.X, 30);
                rect += m_topleft_client + v2s32(0, -30);
@@ -221,7 +282,6 @@ void GUIMainMenu::regenerateGui(v2u32 screensize)
                e->addTab(wgettext("Credits"));
                e->setActiveTab(m_data->selected_tab);
        }
-#endif
        
        if(m_data->selected_tab == TAB_SINGLEPLAYER)
        {
@@ -230,9 +290,9 @@ void GUIMainMenu::regenerateGui(v2u32 screensize)
                        core::rect<s32> rect(0, 0, 10, m_size_client.Y);
                        rect += m_topleft_client + v2s32(15, 0);
                        //const wchar_t *text = L"H\nY\nB\nR\nI\nD";
-                       const wchar_t *text = L"T\nA\nP\nE\n\nA\nN\nD\n\nG\nL\nU\nE";
+                       const wchar_t *text = L"S\nI\nN\nG\nL\nE\n \nP\nL\nA\nY\nE\nR\n";
                        gui::IGUIStaticText *t =
-                       Environment->addStaticText(text, rect, false, false, this, -1);
+                       Environment->addStaticText(text, rect, false, true, this, -1);
                        t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_CENTER);
                }
                u32 bs = 5;
@@ -331,20 +391,20 @@ void GUIMainMenu::regenerateGui(v2u32 screensize)
                        rect += m_topleft_client + v2s32(15, 0);
                        const wchar_t *text = L"C\nL\nI\nE\nN\nT";
                        gui::IGUIStaticText *t =
-                       Environment->addStaticText(text, rect, false, false, this, -1);
+                       Environment->addStaticText(text, rect, false, true, this, -1);
                        t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_CENTER);
                }
                // Nickname + password
                {
                        core::rect<s32> rect(0, 0, 110, 20);
-                       rect += m_topleft_client + v2s32(35+30, 50+6);
+                       rect += m_topleft_client + v2s32(m_size_client.X-60-100, 10+6);
                        Environment->addStaticText(wgettext("Name/Password"), 
                                rect, false, true, this, -1);
                }
                changeCtype("C");
                {
-                       core::rect<s32> rect(0, 0, 230, 30);
-                       rect += m_topleft_client + v2s32(160+30, 50);
+                       core::rect<s32> rect(0, 0, 120, 30);
+                       rect += m_topleft_client + v2s32(m_size_client.X-60-100, 50);
                        gui::IGUIElement *e = 
                        Environment->addEditBox(m_data->name.c_str(), rect, true, this, GUI_ID_NAME_INPUT);
                        if(m_data->name == L"")
@@ -352,7 +412,7 @@ void GUIMainMenu::regenerateGui(v2u32 screensize)
                }
                {
                        core::rect<s32> rect(0, 0, 120, 30);
-                       rect += m_topleft_client + v2s32(m_size_client.X-60-100, 50);
+                       rect += m_topleft_client + v2s32(m_size_client.X-60-100, 90);
                        gui::IGUIEditBox *e =
                        Environment->addEditBox(L"", rect, true, this, 264);
                        e->setPasswordBox(true);
@@ -361,17 +421,29 @@ void GUIMainMenu::regenerateGui(v2u32 screensize)
 
                }
                changeCtype("");
+               // Server List
+               {
+                       core::rect<s32> rect(0, 0, 390, 160);
+                       rect += m_topleft_client + v2s32(50, 10);
+                       gui::IGUIListBox *e = Environment->addListBox(rect, this,
+                                       GUI_ID_SERVERLIST);
+                       e->setDrawBackground(true);
+                       if (m_data->serverlist_show_available == false)
+                               m_data->servers = ServerList::getLocal();
+                       updateGuiServerList();
+                       e->setSelected(0);
+               }
                // Address + port
                {
                        core::rect<s32> rect(0, 0, 110, 20);
-                       rect += m_topleft_client + v2s32(35+30, 100+6);
+                       rect += m_topleft_client + v2s32(50, m_size_client.Y-50-15+6);
                        Environment->addStaticText(wgettext("Address/Port"),
                                rect, false, true, this, -1);
                }
                changeCtype("C");
                {
-                       core::rect<s32> rect(0, 0, 230, 30);
-                       rect += m_topleft_client + v2s32(160+30, 100);
+                       core::rect<s32> rect(0, 0, 260, 30);
+                       rect += m_topleft_client + v2s32(50, m_size_client.Y-25-15);
                        gui::IGUIElement *e = 
                        Environment->addEditBox(m_data->address.c_str(), rect, true,
                                        this, GUI_ID_ADDRESS_INPUT);
@@ -380,18 +452,43 @@ void GUIMainMenu::regenerateGui(v2u32 screensize)
                }
                {
                        core::rect<s32> rect(0, 0, 120, 30);
-                       rect += m_topleft_client + v2s32(m_size_client.X-60-100, 100);
+                       rect += m_topleft_client + v2s32(50+260+10, m_size_client.Y-25-15);
                        Environment->addEditBox(m_data->port.c_str(), rect, true,
                                        this, GUI_ID_PORT_INPUT);
                }
                changeCtype("");
+               #if USE_CURL
+               // Toggle Serverlist (Favorites/Online)
+               {
+                       core::rect<s32> rect(0, 0, 260, 30);
+                       rect += m_topleft_client + v2s32(50,
+                                       180);
+                       gui::IGUIButton *e = Environment->addButton(rect, this, GUI_ID_SERVERLIST_TOGGLE,
+                               wgettext("Show Public"));
+                       e->setIsPushButton(true);
+                       if (m_data->serverlist_show_available)
+                       {
+                               e->setText(wgettext("Show Favorites"));
+                               e->setPressed();
+                       }
+               }
+               #endif
+               // Delete Local Favorite
+               {
+                       core::rect<s32> rect(0, 0, 120, 30);
+                       rect += m_topleft_client + v2s32(50+260+10, 180);
+                       gui::IGUIButton *e = Environment->addButton(rect, this, GUI_ID_SERVERLIST_DELETE,
+                               wgettext("Delete"));
+                       if (m_data->serverlist_show_available) // Hidden on Show-Online mode
+                               e->setVisible(false);
+               }
                // Start game button
                {
-                       core::rect<s32> rect(0, 0, 180, 30);
-                       rect += m_topleft_client + v2s32(m_size_client.X-180-30,
-                                       m_size_client.Y-30-15);
+                       core::rect<s32> rect(0, 0, 120, 30);
+                       rect += m_topleft_client + v2s32(m_size_client.X-130-30,
+                                       m_size_client.Y-25-15);
                        Environment->addButton(rect, this, GUI_ID_JOIN_GAME_BUTTON,
-                               wgettext("Start Game / Connect"));
+                               wgettext("Connect"));
                }
                changeCtype("C");
        }
@@ -404,7 +501,7 @@ void GUIMainMenu::regenerateGui(v2u32 screensize)
                        rect += m_topleft_client + v2s32(15, 0);
                        const wchar_t *text = L"C\nL\nI\nE\nN\nT";
                        gui::IGUIStaticText *t =
-                       Environment->addStaticText(text, rect, false, false, this, -1);
+                       Environment->addStaticText(text, rect, false, true, this, -1);
                        t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_CENTER);
                }
                // Nickname + password
@@ -481,7 +578,7 @@ void GUIMainMenu::regenerateGui(v2u32 screensize)
                        rect += m_topleft_server + v2s32(15, 0);
                        const wchar_t *text = L"S\nE\nR\nV\nE\nR";
                        gui::IGUIStaticText *t =
-                       Environment->addStaticText(text, rect, false, false, this, -1);
+                       Environment->addStaticText(text, rect, false, true, this, -1);
                        t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_CENTER);
                }
                // Server parameters
@@ -497,6 +594,14 @@ void GUIMainMenu::regenerateGui(v2u32 screensize)
                        Environment->addCheckBox(m_data->enable_damage, rect, this, GUI_ID_DAMAGE_CB,
                                wgettext("Enable Damage"));
                }
+               #if USE_CURL
+               {
+                       core::rect<s32> rect(0, 0, 250, 30);
+                       rect += m_topleft_server + v2s32(30+20+250+20, 60);
+                       Environment->addCheckBox(m_data->enable_public, rect, this, GUI_ID_PUBLIC_CB,
+                               wgettext("Public"));
+               }
+               #endif
                // Delete world button
                {
                        core::rect<s32> rect(0, 0, 130, 30);
@@ -533,7 +638,7 @@ void GUIMainMenu::regenerateGui(v2u32 screensize)
                        rect += m_topleft_client + v2s32(15, 0);
                        const wchar_t *text = L"S\nE\nT\nT\nI\nN\nG\nS";
                        gui::IGUIStaticText *t =
-                       Environment->addStaticText(text, rect, false, false, this, -1);
+                       Environment->addStaticText(text, rect, false, true, this, -1);
                        t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_CENTER);
                }
                s32 option_x = 70;
@@ -563,6 +668,60 @@ void GUIMainMenu::regenerateGui(v2u32 screensize)
                        Environment->addCheckBox(m_data->opaque_water, rect, this,
                                        GUI_ID_OPAQUE_WATER_CB, wgettext("Opaque water"));
                }
+
+
+               // Anisotropic/mipmap/bi-/trilinear settings
+
+               {
+                       core::rect<s32> rect(0, 0, option_w+20, 30);
+                       rect += m_topleft_client + v2s32(option_x+175, option_y);
+                       Environment->addCheckBox(m_data->mip_map, rect, this,
+                                      GUI_ID_MIPMAP_CB, wgettext("Mip-Mapping"));
+               }
+
+               {
+                       core::rect<s32> rect(0, 0, option_w+20, 30);
+                       rect += m_topleft_client + v2s32(option_x+175, option_y+20);
+                       Environment->addCheckBox(m_data->anisotropic_filter, rect, this,
+                                      GUI_ID_ANISOTROPIC_CB, wgettext("Anisotropic Filtering"));
+               }
+
+               {
+                       core::rect<s32> rect(0, 0, option_w+20, 30);
+                       rect += m_topleft_client + v2s32(option_x+175, option_y+20*2);
+                       Environment->addCheckBox(m_data->bilinear_filter, rect, this,
+                                      GUI_ID_BILINEAR_CB, wgettext("Bi-Linear Filtering"));
+               }
+
+               {
+                       core::rect<s32> rect(0, 0, option_w+20, 30);
+                       rect += m_topleft_client + v2s32(option_x+175, option_y+20*3);
+                       Environment->addCheckBox(m_data->trilinear_filter, rect, this,
+                                      GUI_ID_TRILINEAR_CB, wgettext("Tri-Linear Filtering"));
+               }
+
+               // shader/on demand image loading/particles settings
+               {
+                       core::rect<s32> rect(0, 0, option_w+20, 30);
+                       rect += m_topleft_client + v2s32(option_x+175*2, option_y);
+                       Environment->addCheckBox(m_data->enable_shaders, rect, this,
+                                       GUI_ID_SHADERS_CB, wgettext("Shaders"));
+               }
+
+               {
+                       core::rect<s32> rect(0, 0, option_w+20+20, 30);
+                       rect += m_topleft_client + v2s32(option_x+175*2, option_y+20);
+                       Environment->addCheckBox(m_data->preload_item_visuals, rect, this,
+                                       GUI_ID_PRELOAD_ITEM_VISUALS_CB, wgettext("Preload item visuals"));
+               }
+
+               {
+                       core::rect<s32> rect(0, 0, option_w+20+20, 30);
+                       rect += m_topleft_client + v2s32(option_x+175*2, option_y+20*2);
+                       Environment->addCheckBox(m_data->enable_particles, rect, this,
+                                       GUI_ID_ENABLE_PARTICLES_CB, wgettext("Enable Particles"));
+               }
+
                // Key change button
                {
                        core::rect<s32> rect(0, 0, 120, 30);
@@ -578,23 +737,42 @@ void GUIMainMenu::regenerateGui(v2u32 screensize)
        {
                // CREDITS
                {
-                       core::rect<s32> rect(0, 0, 10, m_size_client.Y);
+                       core::rect<s32> rect(0, 0, 9, m_size_client.Y);
                        rect += m_topleft_client + v2s32(15, 0);
                        const wchar_t *text = L"C\nR\nE\nD\nI\nT\nS";
                        gui::IGUIStaticText *t =
-                       Environment->addStaticText(text, rect, false, false, this, -1);
+                       Environment->addStaticText(text, rect, false, true, this, -1);
                        t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_CENTER);
                }
                {
-                       core::rect<s32> rect(0, 0, 620, 250);
-                       rect += m_topleft_client + v2s32(130+14, 50+35);
-                       Environment->addStaticText(narrow_to_wide(
-                       "Minetest-c55 " VERSION_STRING "\n"
-                       "http://minetest.net/\n"
-                       "\n"
-                       "by Perttu Ahola <celeron55@gmail.com>\n"
-                       "and contributors"
-                       ).c_str(), rect, false, true, this, -1);
+                       core::rect<s32> rect(0, 0, 130, 70);
+                       rect += m_topleft_client + v2s32(35, 160);
+                       Environment->addStaticText(
+                               L"Minetest " VERSION_STRING "\nhttp://minetest.net/",
+                                rect, false, true, this, -1);
+               }
+               {
+                       video::SColor yellow(255, 255, 255, 0);
+                       core::rect<s32> rect(0, 0, 450, 260);
+                       rect += m_topleft_client + v2s32(168, 5);
+                       
+                       irr::gui::IGUIListBox *list = Environment->addListBox(rect, this);
+                       
+                       list->addItem(L"Core Developers");
+                       list->setItemOverrideColor(list->getItemCount() - 1, yellow);
+                       for (int i = 0; i != ARRAYLEN(contrib_core_strs); i++)
+                               list->addItem(contrib_core_strs[i]);
+                       list->addItem(L"");
+                       list->addItem(L"Active Contributors");
+                       list->setItemOverrideColor(list->getItemCount() - 1, yellow);
+                       for (int i = 0; i != ARRAYLEN(contrib_active_strs); i++)
+                               list->addItem(contrib_active_strs[i]);
+                       list->addItem(L"");
+                       list->addItem(L"Previous Contributors");
+                       list->setItemOverrideColor(list->getItemCount() - 1, yellow);
+                       for (int i = 0; i != ARRAYLEN(contrib_previous_strs); i++)
+                               list->addItem(contrib_previous_strs[i]);
+                       list->addItem(L"");
                }
        }
 
@@ -658,15 +836,15 @@ void GUIMainMenu::drawMenu()
                        driver->draw2DRectangle(bgcolor, rect, &AbsoluteClippingRect);
                }
                video::ITexture *logotexture =
-                               driver->getTexture(getTexturePath("menulogo.png").c_str());
+                               driver->getTexture(getTexturePath("logo.png").c_str());
                if(logotexture)
                {
                        v2s32 logosize(logotexture->getOriginalSize().Width,
                                        logotexture->getOriginalSize().Height);
-                       logosize *= 2;
+
                        core::rect<s32> rect(0,0,logosize.X,logosize.Y);
                        rect += AbsoluteRect.UpperLeftCorner + m_topleft_client;
-                       rect += v2s32(130, 50);
+                       rect += v2s32(50, 60);
                        driver->draw2DImage(logotexture, rect,
                                core::rect<s32>(core::position2d<s32>(0,0),
                                core::dimension2di(logotexture->getSize())),
@@ -722,6 +900,11 @@ void GUIMainMenu::readInput(MainMenuData *dst)
                if(e != NULL && e->getType() == gui::EGUIET_CHECK_BOX)
                        dst->enable_damage = ((gui::IGUICheckBox*)e)->isChecked();
        }
+       {
+               gui::IGUIElement *e = getElementFromId(GUI_ID_PUBLIC_CB);
+               if(e != NULL && e->getType() == gui::EGUIET_CHECK_BOX)
+                       dst->enable_public = ((gui::IGUICheckBox*)e)->isChecked();
+       }
        {
                gui::IGUIElement *e = getElementFromId(GUI_ID_FANCYTREE_CB);
                if(e != NULL && e->getType() == gui::EGUIET_CHECK_BOX)
@@ -743,11 +926,59 @@ void GUIMainMenu::readInput(MainMenuData *dst)
                        dst->opaque_water = ((gui::IGUICheckBox*)e)->isChecked();
        }
 
+       {
+               gui::IGUIElement *e = getElementFromId(GUI_ID_MIPMAP_CB);
+               if(e != NULL && e->getType() == gui::EGUIET_CHECK_BOX)
+                       dst->mip_map = ((gui::IGUICheckBox*)e)->isChecked();
+       }
+
+       {
+               gui::IGUIElement *e = getElementFromId(GUI_ID_ANISOTROPIC_CB);
+               if(e != NULL && e->getType() == gui::EGUIET_CHECK_BOX)
+                       dst->anisotropic_filter = ((gui::IGUICheckBox*)e)->isChecked();
+       }
+
+       {
+               gui::IGUIElement *e = getElementFromId(GUI_ID_BILINEAR_CB);
+               if(e != NULL && e->getType() == gui::EGUIET_CHECK_BOX)
+                       dst->bilinear_filter = ((gui::IGUICheckBox*)e)->isChecked();
+       }
+
+       {
+               gui::IGUIElement *e = getElementFromId(GUI_ID_TRILINEAR_CB);
+               if(e != NULL && e->getType() == gui::EGUIET_CHECK_BOX)
+                       dst->trilinear_filter = ((gui::IGUICheckBox*)e)->isChecked();
+       }
+
+       {
+               gui::IGUIElement *e = getElementFromId(GUI_ID_SHADERS_CB);
+               if(e != NULL && e->getType() == gui::EGUIET_CHECK_BOX)
+                       dst->enable_shaders = ((gui::IGUICheckBox*)e)->isChecked() ? 2 : 0;
+       }
+
+       {
+               gui::IGUIElement *e = getElementFromId(GUI_ID_PRELOAD_ITEM_VISUALS_CB);
+               if(e != NULL && e->getType() == gui::EGUIET_CHECK_BOX)
+                       dst->preload_item_visuals = ((gui::IGUICheckBox*)e)->isChecked();
+       }
+
+       {
+               gui::IGUIElement *e = getElementFromId(GUI_ID_ENABLE_PARTICLES_CB);
+               if(e != NULL && e->getType() == gui::EGUIET_CHECK_BOX)
+                       dst->enable_particles = ((gui::IGUICheckBox*)e)->isChecked();
+       }
+
        {
                gui::IGUIElement *e = getElementFromId(GUI_ID_WORLD_LISTBOX);
                if(e != NULL && e->getType() == gui::EGUIET_LIST_BOX)
                        dst->selected_world = ((gui::IGUIListBox*)e)->getSelected();
        }
+       {
+               ServerListSpec server =
+               getServerListSpec(wide_to_narrow(dst->address), wide_to_narrow(dst->port));
+               dst->servername = server["name"].asString();
+               dst->serverdescription = server["description"].asString();
+       }
 }
 
 void GUIMainMenu::acceptInput()
@@ -792,6 +1023,11 @@ bool GUIMainMenu::OnEvent(const SEvent& event)
                                regenerateGui(m_screensize_old);
                        return true;
                }
+               if(event.GUIEvent.EventType==gui::EGET_LISTBOX_CHANGED && event.GUIEvent.Caller->getID() == GUI_ID_SERVERLIST)
+               {
+                       serverListOnSelected();
+                       return true;
+               }
                if(event.GUIEvent.EventType==gui::EGET_BUTTON_CLICKED)
                {
                        switch(event.GUIEvent.Caller->getID())
@@ -799,7 +1035,8 @@ bool GUIMainMenu::OnEvent(const SEvent& event)
                        case GUI_ID_JOIN_GAME_BUTTON: {
                                MainMenuData cur;
                                readInput(&cur);
-                               if(cur.address == L"" && getTab() == TAB_MULTIPLAYER){
+                               if (getTab() == TAB_MULTIPLAYER && cur.address == L"")
+                               {
                                        (new GUIMessageMenu(env, parent, -1, menumgr,
                                                        wgettext("Address required."))
                                                        )->drop();
@@ -861,12 +1098,62 @@ bool GUIMainMenu::OnEvent(const SEvent& event)
                                return true;
                        }
                        case GUI_ID_CONFIGURE_WORLD_BUTTON: {
-                               GUIMessageMenu *menu = new GUIMessageMenu(env, parent,
-                                               -1, menumgr,
-                                               wgettext("Nothing here"));
-                               menu->drop();
+                               MainMenuData cur;
+                               readInput(&cur);
+                               if(cur.selected_world == -1)
+                               {
+                                       (new GUIMessageMenu(env, parent, -1, menumgr,
+                                                       wgettext("Cannot configure world: Nothing selected"))
+                                                       )->drop();
+                               } 
+                               else 
+                               {
+                                       WorldSpec wspec = m_data->worlds[cur.selected_world];
+                                       GUIConfigureWorld *menu = new GUIConfigureWorld(env, parent,
+                                                                               -1, menumgr, wspec);
+                                       menu->drop();
+                               }
                                return true;
                        }
+                       case GUI_ID_SERVERLIST_DELETE: {
+                               gui::IGUIListBox *serverlist = (gui::IGUIListBox*)getElementFromId(GUI_ID_SERVERLIST);
+                               s32 selected = ((gui::IGUIListBox*)serverlist)->getSelected();
+                               if (selected == -1) return true;
+                               ServerList::deleteEntry(m_data->servers[selected]);
+                               m_data->servers = ServerList::getLocal();
+                               updateGuiServerList();
+                               if (selected > 0)
+                                       selected -= 1;
+                               serverlist->setSelected(selected);
+                               serverListOnSelected();
+                               return true;
+                       }
+                       #if USE_CURL
+                       case GUI_ID_SERVERLIST_TOGGLE: {
+                               gui::IGUIElement *togglebutton = getElementFromId(GUI_ID_SERVERLIST_TOGGLE);
+                               gui::IGUIElement *deletebutton = getElementFromId(GUI_ID_SERVERLIST_DELETE);
+                               gui::IGUIListBox *serverlist = (gui::IGUIListBox*)getElementFromId(GUI_ID_SERVERLIST);
+                               if (m_data->serverlist_show_available) // switch to favorite list
+                               {
+                                       m_data->servers = ServerList::getLocal();
+                                       togglebutton->setText(wgettext("Show Public"));
+                                       deletebutton->setVisible(true);
+                                       updateGuiServerList();
+                                       serverlist->setSelected(0);
+                               }
+                               else // switch to online list
+                               {
+                                       m_data->servers = ServerList::getOnline();
+                                       togglebutton->setText(wgettext("Show Favorites"));
+                                       deletebutton->setVisible(false);
+                                       updateGuiServerList();
+                                       serverlist->setSelected(0);
+                               }
+                               serverListOnSelected();
+
+                               m_data->serverlist_show_available = !m_data->serverlist_show_available;
+                       }
+                       #endif
                        }
                }
                if(event.GUIEvent.EventType==gui::EGET_EDITBOX_ENTER)
@@ -889,6 +1176,14 @@ bool GUIMainMenu::OnEvent(const SEvent& event)
                                        m_data->address = L""; // Force local game
                                quitMenu();
                                return true;
+                       case GUI_ID_SERVERLIST:
+                               gui::IGUIListBox *serverlist = (gui::IGUIListBox*)getElementFromId(GUI_ID_SERVERLIST);
+                               if (serverlist->getSelected() > -1)
+                               {
+                                       acceptInput();
+                                       quitMenu();
+                                       return true;
+                               }
                        }
                }
        }
@@ -929,3 +1224,77 @@ int GUIMainMenu::getTab()
        return TAB_SINGLEPLAYER; // Default
 }
 
+void GUIMainMenu::displayMessageMenu(std::wstring msg)
+{
+       (new GUIMessageMenu(env, parent, -1, menumgr, msg))->drop();
+}
+
+void GUIMainMenu::updateGuiServerList()
+{
+       gui::IGUIListBox *serverlist = (gui::IGUIListBox *)getElementFromId(GUI_ID_SERVERLIST);
+       serverlist->clear();
+
+       for(std::vector<ServerListSpec>::iterator i = m_data->servers.begin();
+               i != m_data->servers.end(); i++)
+       {
+               std::string text;
+
+               if ((*i)["clients"].asString().size())
+                       text += (*i)["clients"].asString();
+               if ((*i)["clients_max"].asString().size())
+                       text += "/" + (*i)["clients_max"].asString();
+               text += " ";
+               if ((*i)["version"].asString().size())
+                       text += (*i)["version"].asString() + " ";
+               if ((*i)["password"].asString().size())
+                       text += "*";
+               if ((*i)["creative"].asString().size())
+                       text += "C";
+               if ((*i)["damage"].asString().size())
+                       text += "D";
+               if ((*i)["pvp"].asString().size())
+                       text += "P";
+               text += " ";
+
+               if ((*i)["name"] != "" && (*i)["description"] != "")
+                       text += (*i)["name"].asString() + " (" +  (*i)["description"].asString() + ")";
+               else if ((*i)["name"] !="")
+                       text += (*i)["name"].asString();
+               else
+                       text += (*i)["address"].asString() + ":" + (*i)["port"].asString();
+               
+               serverlist->addItem(narrow_to_wide(text).c_str());
+       }
+}
+
+void GUIMainMenu::serverListOnSelected()
+{
+       if (!m_data->servers.empty())
+       {
+               gui::IGUIListBox *serverlist = (gui::IGUIListBox*)getElementFromId(GUI_ID_SERVERLIST);
+               u16 id = serverlist->getSelected();
+               //if (id < 0) return; // u16>0!
+               ((gui::IGUIEditBox*)getElementFromId(GUI_ID_ADDRESS_INPUT))
+               ->setText(narrow_to_wide(m_data->servers[id]["address"].asString()).c_str());
+               ((gui::IGUIEditBox*)getElementFromId(GUI_ID_PORT_INPUT))
+               ->setText(narrow_to_wide(m_data->servers[id]["port"].asString()).c_str());
+       }
+}
+
+ServerListSpec GUIMainMenu::getServerListSpec(std::string address, std::string port)
+{
+       ServerListSpec server;
+       server["address"] = address;
+       server["port"] = port;
+       for(std::vector<ServerListSpec>::iterator i = m_data->servers.begin();
+               i != m_data->servers.end(); i++)
+       {
+               if ((*i)["address"] == address && (*i)["port"] == port)
+               {
+                       server["description"] = (*i)["description"];
+                       server["name"] = (*i)["name"];
+                       break;
+               }
+       }
+       return server;
+}