]> git.lizzy.rs Git - dragonfireclient.git/blobdiff - src/guiMainMenu.cpp
Replace constant red hurt screen with fade out red
[dragonfireclient.git] / src / guiMainMenu.cpp
index 40f51f97c4c7d95b8fff6b82c31511002ba6d2e5..d7c3f54ff957c7eb75e5da5330f1f3a9193ab352 100644 (file)
@@ -3,16 +3,16 @@ Minetest-c55
 Copyright (C) 2010-12 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.
 */
@@ -36,8 +36,10 @@ 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"
 
 struct CreateWorldDestMainMenu : public CreateWorldDest
 {
@@ -46,6 +48,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;
@@ -53,18 +71,21 @@ struct CreateWorldDestMainMenu : public CreateWorldDest
 
 struct ConfirmDestDeleteWorld : public ConfirmDest
 {
-       ConfirmDestDeleteWorld(WorldSpec spec, GUIMainMenu *menu):
+       ConfirmDestDeleteWorld(WorldSpec spec, GUIMainMenu *menu,
+                       const std::vector<std::string> &paths):
                m_spec(spec),
-               m_menu(menu)
+               m_menu(menu),
+               m_paths(paths)
        {}
        void answer(bool answer)
        {
                if(answer == false)
                        return;
-               m_menu->deleteWorld(m_spec);
+               m_menu->deleteWorld(m_paths);
        }
        WorldSpec m_spec;
        GUIMainMenu *m_menu;
+       std::vector<std::string> m_paths;
 };
 
 enum
@@ -77,6 +98,12 @@ 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_DAMAGE_CB,
        GUI_ID_CREATIVE_CB,
        GUI_ID_JOIN_GAME_BUTTON,
@@ -93,6 +120,7 @@ enum
        TAB_SINGLEPLAYER=0,
        TAB_MULTIPLAYER,
        TAB_ADVANCED,
+       TAB_SETTINGS,
        TAB_CREDITS
 };
 
@@ -175,12 +203,12 @@ void GUIMainMenu::regenerateGui(v2u32 screensize)
        changeCtype("");
 
        // Version
-       if(m_data->selected_tab != TAB_CREDITS)
+       //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);
        }
 
@@ -190,18 +218,18 @@ void GUIMainMenu::regenerateGui(v2u32 screensize)
        m_topleft_client = c800 + v2s32(90, 70+50+30);
        m_size_client = v2s32(620, 270);
 
-       m_topleft_server = c800 + v2s32(90, 70+30+50+290);
        m_size_server = v2s32(620, 140);
-       
+
        if(m_data->selected_tab == TAB_ADVANCED)
        {
-               m_topleft_client = c800 + v2s32(90, 20+50+30);
-               m_size_client = v2s32(620, 270);
+               m_topleft_client = c800 + v2s32(90, 70+50+30);
+               m_size_client = v2s32(620, 200);
 
-               m_topleft_server = c800 + v2s32(90, 20+30+50+290);
                m_size_server = v2s32(620, 140);
        }
 
+       m_topleft_server = m_topleft_client + v2s32(0, m_size_client.Y+20);
+       
        // Tabs
 #if 1
        {
@@ -209,10 +237,11 @@ void GUIMainMenu::regenerateGui(v2u32 screensize)
                rect += m_topleft_client + v2s32(0, -30);
                gui::IGUITabControl *e = Environment->addTabControl(
                                rect, this, true, true, GUI_ID_TAB_CONTROL);
-               e->addTab(L"Singleplayer");
-               e->addTab(L"Multiplayer");
-               e->addTab(L"Advanced");
-               e->addTab(L"Credits");
+               e->addTab(wgettext("Singleplayer"));
+               e->addTab(wgettext("Multiplayer"));
+               e->addTab(wgettext("Advanced"));
+               e->addTab(wgettext("Settings"));
+               e->addTab(wgettext("Credits"));
                e->setActiveTab(m_data->selected_tab);
        }
 #endif
@@ -221,15 +250,13 @@ void GUIMainMenu::regenerateGui(v2u32 screensize)
        {
                // HYBRID
                {
-                       /*core::rect<s32> rect(0, 0, 20, 125);
-                       rect += m_topleft_client + v2s32(15, 80);
-                       const wchar_t *text = L"H\nY\nB\nR\nI\nD";*/
-                       core::rect<s32> rect(0, 0, 20, 300);
-                       rect += m_topleft_client + v2s32(15, 15);
+                       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";
-                       //gui::IGUIStaticText *t =
-                       Environment->addStaticText(text, rect, false, true, this, -1);
-                       //t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_UPPERLEFT);
+                       gui::IGUIStaticText *t =
+                       Environment->addStaticText(text, rect, false, false, this, -1);
+                       t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_CENTER);
                }
                u32 bs = 5;
                // World selection listbox
@@ -286,13 +313,13 @@ void GUIMainMenu::regenerateGui(v2u32 screensize)
                }
                // Start game button
                {
-                       /*core::rect<s32> rect(0, 0, 120, 30);
-                       rect += m_topleft_client + v2s32(m_size_client.X-120-30,
-                                       m_size_client.Y-30-20-30-5);*/
                        /*core::rect<s32> rect(0, 0, world_button_w, 30);
                        rect += m_topleft_client + v2s32(world_sel_x+(world_button_w+bs)*3,
                                        world_sel_y+world_sel_h+0);*/
                        u32 bw = 160;
+                       /*core::rect<s32> rect(0, 0, bw, 30);
+                       rect += m_topleft_client + v2s32(m_size_client.X-bw-30,
+                                       m_size_client.Y-30-15);*/
                        core::rect<s32> rect(0, 0, bw, 30);
                        rect += m_topleft_client + v2s32(world_sel_x+world_sel_w-bw,
                                        world_sel_y+world_sel_h+30+bs);
@@ -300,54 +327,22 @@ void GUIMainMenu::regenerateGui(v2u32 screensize)
                                        GUI_ID_JOIN_GAME_BUTTON, wgettext("Play"));
                }
                // Options
-               //s32 option_x = 450;
                s32 option_x = 50;
+               //s32 option_x = 50+world_sel_w+20;
                s32 option_y = 30;
+               u32 option_w = 150;
                {
-                       core::rect<s32> rect(0, 0, 250, 30);
-                       rect += m_topleft_client + v2s32(option_x, option_y);
-                       Environment->addCheckBox(m_data->fancy_trees, rect, this,
-                                       GUI_ID_FANCYTREE_CB, wgettext("Fancy trees")); 
-               }
-               {
-                       core::rect<s32> rect(0, 0, 250, 30);
-                       rect += m_topleft_client + v2s32(option_x, option_y+20);
-                       Environment->addCheckBox(m_data->smooth_lighting, rect, this,
-                                       GUI_ID_SMOOTH_LIGHTING_CB, wgettext("Smooth Lighting"));
-               }
-               {
-                       core::rect<s32> rect(0, 0, 250, 30);
-                       rect += m_topleft_client + v2s32(option_x, option_y+20*2);
-                       Environment->addCheckBox(m_data->clouds_3d, rect, this,
-                                       GUI_ID_3D_CLOUDS_CB, wgettext("3D Clouds"));
-               }
-               {
-                       core::rect<s32> rect(0, 0, 250, 30);
-                       rect += m_topleft_client + v2s32(option_x, option_y+20*3);
-                       Environment->addCheckBox(m_data->opaque_water, rect, this,
-                                       GUI_ID_OPAQUE_WATER_CB, wgettext("Opaque water"));
-               }
-               {
-                       core::rect<s32> rect(0, 0, 250, 30);
-                       rect += m_topleft_client + v2s32(option_x, option_y+20*4);
+                       core::rect<s32> rect(0, 0, option_w, 30);
+                       rect += m_topleft_client + v2s32(option_x, option_y+20*0);
                        Environment->addCheckBox(m_data->creative_mode, rect, this,
                                        GUI_ID_CREATIVE_CB, wgettext("Creative Mode"));
                }
                {
-                       core::rect<s32> rect(0, 0, 250, 30);
-                       rect += m_topleft_client + v2s32(option_x, option_y+20*5);
+                       core::rect<s32> rect(0, 0, option_w, 30);
+                       rect += m_topleft_client + v2s32(option_x, option_y+20*1);
                        Environment->addCheckBox(m_data->enable_damage, rect, this,
                                        GUI_ID_DAMAGE_CB, wgettext("Enable Damage"));
                }
-               // Key change button
-               {
-                       core::rect<s32> rect(0, 0, 120, 30);
-                       /*rect += m_topleft_client + v2s32(m_size_client.X-120-30,
-                                       m_size_client.Y-30-20);*/
-                       rect += m_topleft_client + v2s32(option_x, option_y+20*6+20);
-                       Environment->addButton(rect, this,
-                                       GUI_ID_CHANGE_KEYS_BUTTON, wgettext("Change keys"));
-               }
                changeCtype("C");
        }
        else if(m_data->selected_tab == TAB_MULTIPLAYER)
@@ -355,12 +350,12 @@ void GUIMainMenu::regenerateGui(v2u32 screensize)
                changeCtype("");
                // CLIENT
                {
-                       core::rect<s32> rect(0, 0, 20, 125);
-                       rect += m_topleft_client + v2s32(15, 80);
+                       core::rect<s32> rect(0, 0, 10, m_size_client.Y);
+                       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, true, this, -1);
-                       //t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_UPPERLEFT);
+                       gui::IGUIStaticText *t =
+                       Environment->addStaticText(text, rect, false, false, this, -1);
+                       t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_CENTER);
                }
                // Nickname + password
                {
@@ -413,43 +408,11 @@ void GUIMainMenu::regenerateGui(v2u32 screensize)
                                        this, GUI_ID_PORT_INPUT);
                }
                changeCtype("");
-               {
-                       core::rect<s32> rect(0, 0, 250, 30);
-                       rect += m_topleft_client + v2s32(35+30, 150);
-                       Environment->addCheckBox(m_data->fancy_trees, rect, this, GUI_ID_FANCYTREE_CB,
-                               wgettext("Fancy trees")); 
-               }
-               {
-                       core::rect<s32> rect(0, 0, 250, 30);
-                       rect += m_topleft_client + v2s32(35+30, 150+20);
-                       Environment->addCheckBox(m_data->smooth_lighting, rect, this, GUI_ID_SMOOTH_LIGHTING_CB,
-                                       wgettext("Smooth Lighting"));
-               }
-               {
-                       core::rect<s32> rect(0, 0, 250, 30);
-                       rect += m_topleft_client + v2s32(35+30, 150+40);
-                       Environment->addCheckBox(m_data->clouds_3d, rect, this, GUI_ID_3D_CLOUDS_CB,
-                                       wgettext("3D Clouds"));
-               }
-               {
-                       core::rect<s32> rect(0, 0, 250, 30);
-                       rect += m_topleft_client + v2s32(35+30, 150+60);
-                       Environment->addCheckBox(m_data->opaque_water, rect, this, GUI_ID_OPAQUE_WATER_CB,
-                                       wgettext("Opaque water"));
-               }
-               // Key change button
-               {
-                       core::rect<s32> rect(0, 0, 120, 30);
-                       rect += m_topleft_client + v2s32(m_size_client.X-180-30-120-20,
-                                       m_size_client.Y-30-20);
-                       Environment->addButton(rect, this, GUI_ID_CHANGE_KEYS_BUTTON,
-                               wgettext("Change keys"));
-               }
                // 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-20);
+                                       m_size_client.Y-30-15);
                        Environment->addButton(rect, this, GUI_ID_JOIN_GAME_BUTTON,
                                wgettext("Start Game / Connect"));
                }
@@ -460,24 +423,24 @@ void GUIMainMenu::regenerateGui(v2u32 screensize)
                changeCtype("");
                // CLIENT
                {
-                       core::rect<s32> rect(0, 0, 20, 125);
-                       rect += m_topleft_client + v2s32(15, 80);
+                       core::rect<s32> rect(0, 0, 10, m_size_client.Y);
+                       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, true, this, -1);
-                       //t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_UPPERLEFT);
+                       gui::IGUIStaticText *t =
+                       Environment->addStaticText(text, rect, false, false, 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(35+30, 35+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);
+                       rect += m_topleft_client + v2s32(160+30, 35);
                        gui::IGUIElement *e = 
                        Environment->addEditBox(m_data->name.c_str(), rect, true, this, GUI_ID_NAME_INPUT);
                        if(m_data->name == L"")
@@ -485,7 +448,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, 35);
                        gui::IGUIEditBox *e =
                        Environment->addEditBox(L"", rect, true, this, 264);
                        e->setPasswordBox(true);
@@ -497,14 +460,14 @@ void GUIMainMenu::regenerateGui(v2u32 screensize)
                // Address + port
                {
                        core::rect<s32> rect(0, 0, 110, 20);
-                       rect += m_topleft_client + v2s32(35+30, 100+6);
+                       rect += m_topleft_client + v2s32(35+30, 75+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);
+                       rect += m_topleft_client + v2s32(160+30, 75);
                        gui::IGUIElement *e = 
                        Environment->addEditBox(m_data->address.c_str(), rect, true,
                                        this, GUI_ID_ADDRESS_INPUT);
@@ -513,49 +476,17 @@ 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(m_size_client.X-60-100, 75);
                        Environment->addEditBox(m_data->port.c_str(), rect, true,
                                        this, GUI_ID_PORT_INPUT);
                }
                changeCtype("");
                {
                        core::rect<s32> rect(0, 0, 400, 20);
-                       rect += m_topleft_client + v2s32(160+30, 100+35);
+                       rect += m_topleft_client + v2s32(160+30, 75+35);
                        Environment->addStaticText(wgettext("Leave address blank to start a local server."),
                                rect, false, true, this, -1);
                }
-               {
-                       core::rect<s32> rect(0, 0, 250, 30);
-                       rect += m_topleft_client + v2s32(35+30, 150);
-                       Environment->addCheckBox(m_data->fancy_trees, rect, this, GUI_ID_FANCYTREE_CB,
-                               wgettext("Fancy trees")); 
-               }
-               {
-                       core::rect<s32> rect(0, 0, 250, 30);
-                       rect += m_topleft_client + v2s32(35+30, 150+20);
-                       Environment->addCheckBox(m_data->smooth_lighting, rect, this, GUI_ID_SMOOTH_LIGHTING_CB,
-                                       wgettext("Smooth Lighting"));
-               }
-               {
-                       core::rect<s32> rect(0, 0, 250, 30);
-                       rect += m_topleft_client + v2s32(35+30, 150+40);
-                       Environment->addCheckBox(m_data->clouds_3d, rect, this, GUI_ID_3D_CLOUDS_CB,
-                                       wgettext("3D Clouds"));
-               }
-               {
-                       core::rect<s32> rect(0, 0, 250, 30);
-                       rect += m_topleft_client + v2s32(35+30, 150+60);
-                       Environment->addCheckBox(m_data->opaque_water, rect, this, GUI_ID_OPAQUE_WATER_CB,
-                                       wgettext("Opaque water"));
-               }
-               // Key change button
-               {
-                       core::rect<s32> rect(0, 0, 120, 30);
-                       rect += m_topleft_client + v2s32(m_size_client.X-180-30-120-20,
-                                       m_size_client.Y-30-20);
-                       Environment->addButton(rect, this, GUI_ID_CHANGE_KEYS_BUTTON,
-                               wgettext("Change keys"));
-               }
                // Start game button
                {
                        core::rect<s32> rect(0, 0, 180, 30);
@@ -569,12 +500,12 @@ void GUIMainMenu::regenerateGui(v2u32 screensize)
                */
                // SERVER
                {
-                       core::rect<s32> rect(0, 0, 20, 125);
-                       rect += m_topleft_server + v2s32(15, 15);
+                       core::rect<s32> rect(0, 0, 10, m_size_server.Y);
+                       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, true, this, -1);
-                       //t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_UPPERLEFT);
+                       gui::IGUIStaticText *t =
+                       Environment->addStaticText(text, rect, false, false, this, -1);
+                       t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_CENTER);
                }
                // Server parameters
                {
@@ -618,26 +549,121 @@ void GUIMainMenu::regenerateGui(v2u32 screensize)
                }
                changeCtype("C");
        }
+       else if(m_data->selected_tab == TAB_SETTINGS)
+       {
+               {
+                       core::rect<s32> rect(0, 0, 10, m_size_client.Y);
+                       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);
+                       t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_CENTER);
+               }
+               s32 option_x = 70;
+               s32 option_y = 50;
+               u32 option_w = 150;
+               {
+                       core::rect<s32> rect(0, 0, option_w, 30);
+                       rect += m_topleft_client + v2s32(option_x, option_y);
+                       Environment->addCheckBox(m_data->fancy_trees, rect, this,
+                                       GUI_ID_FANCYTREE_CB, wgettext("Fancy trees")); 
+               }
+               {
+                       core::rect<s32> rect(0, 0, option_w, 30);
+                       rect += m_topleft_client + v2s32(option_x, option_y+20);
+                       Environment->addCheckBox(m_data->smooth_lighting, rect, this,
+                                       GUI_ID_SMOOTH_LIGHTING_CB, wgettext("Smooth Lighting"));
+               }
+               {
+                       core::rect<s32> rect(0, 0, option_w, 30);
+                       rect += m_topleft_client + v2s32(option_x, option_y+20*2);
+                       Environment->addCheckBox(m_data->clouds_3d, rect, this,
+                                       GUI_ID_3D_CLOUDS_CB, wgettext("3D Clouds"));
+               }
+               {
+                       core::rect<s32> rect(0, 0, option_w, 30);
+                       rect += m_topleft_client + v2s32(option_x, option_y+20*3);
+                       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 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"));
+               }
+
+               // Key change button
+               {
+                       core::rect<s32> rect(0, 0, 120, 30);
+                       /*rect += m_topleft_client + v2s32(m_size_client.X-120-30,
+                                       m_size_client.Y-30-20);*/
+                       rect += m_topleft_client + v2s32(option_x, option_y+120);
+                       Environment->addButton(rect, this,
+                                       GUI_ID_CHANGE_KEYS_BUTTON, wgettext("Change keys"));
+               }
+               changeCtype("C");
+       }
        else if(m_data->selected_tab == TAB_CREDITS)
        {
                // CREDITS
                {
-                       core::rect<s32> rect(0, 0, 20, 200);
-                       rect += m_topleft_client + v2s32(15, 60);
+                       core::rect<s32> rect(0, 0, 10, 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, true, this, -1);
-                       //t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_UPPERLEFT);
+                       gui::IGUIStaticText *t =
+                       Environment->addStaticText(text, rect, false, false, this, -1);
+                       t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_CENTER);
                }
                {
-                       core::rect<s32> rect(0, 0, 620, 250);
-                       rect += m_topleft_client + v2s32(150+14, 50+35);
+                       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"
-                       "http://c55.me/minetest/\n"
+                       "Minetest " VERSION_STRING "\n"
+                       "http://minetest.net/\n"
                        "\n"
                        "by Perttu Ahola <celeron55@gmail.com>\n"
-                       "and contributors"
+                       "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);
                }
        }
@@ -686,6 +712,14 @@ void GUIMainMenu::drawMenu()
                        driver->draw2DRectangle(bgcolor, rect, &AbsoluteClippingRect);
                }
        }
+       else if(getTab() == TAB_SETTINGS)
+       {
+               {
+                       core::rect<s32> rect(0, 0, m_size_client.X, m_size_client.Y);
+                       rect += AbsoluteRect.UpperLeftCorner + m_topleft_client;
+                       driver->draw2DRectangle(bgcolor, rect, &AbsoluteClippingRect);
+               }
+       }
        else if(getTab() == TAB_CREDITS)
        {
                {
@@ -702,7 +736,7 @@ void GUIMainMenu::drawMenu()
                        logosize *= 2;
                        core::rect<s32> rect(0,0,logosize.X,logosize.Y);
                        rect += AbsoluteRect.UpperLeftCorner + m_topleft_client;
-                       rect += v2s32(150, 50);
+                       rect += v2s32(130, 50);
                        driver->draw2DImage(logotexture, rect,
                                core::rect<s32>(core::position2d<s32>(0,0),
                                core::dimension2di(logotexture->getSize())),
@@ -779,6 +813,42 @@ 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_WORLD_LISTBOX);
                if(e != NULL && e->getType() == gui::EGUIET_LIST_BOX)
@@ -859,12 +929,25 @@ bool GUIMainMenu::OnEvent(const SEvent& event)
                                                        )->drop();
                                } else {
                                        WorldSpec spec = m_data->worlds[cur.selected_world];
+                                       // Get files and directories involved
+                                       std::vector<std::string> paths;
+                                       paths.push_back(spec.path);
+                                       fs::GetRecursiveSubPaths(spec.path, paths);
+                                       // Launch confirmation dialog
                                        ConfirmDestDeleteWorld *dest = new
-                                                       ConfirmDestDeleteWorld(spec, this);
+                                                       ConfirmDestDeleteWorld(spec, this, paths);
+                                       std::wstring text = wgettext("Delete world");
+                                       text += L" \"";
+                                       text += narrow_to_wide(spec.name);
+                                       text += L"\"?\n\n";
+                                       text += wgettext("Files to be deleted");
+                                       text += L":\n";
+                                       for(u32 i=0; i<paths.size(); i++){
+                                               if(i == 3){ text += L"..."; break; }
+                                               text += narrow_to_wide(paths[i]) + L"\n";
+                                       }
                                        (new GUIConfirmMenu(env, parent, -1, menumgr, dest,
-                                                       (std::wstring(wgettext("Delete world "))
-                                                       +L"\""+narrow_to_wide(spec.name)+L"\"?").c_str()
-                                                       ))->drop();
+                                                       text.c_str()))->drop();
                                }
                                return true;
                        }
@@ -906,9 +989,10 @@ bool GUIMainMenu::OnEvent(const SEvent& event)
                {
                        switch(event.GUIEvent.Caller->getID())
                        {
-                               case GUI_ID_WORLD_LISTBOX:
+                       case GUI_ID_WORLD_LISTBOX:
                                acceptInput();
-                               m_data->address = L""; // Force local game
+                               if(getTab() != TAB_SINGLEPLAYER)
+                                       m_data->address = L""; // Force local game
                                quitMenu();
                                return true;
                        }
@@ -928,12 +1012,18 @@ void GUIMainMenu::createNewWorld(std::wstring name, std::string gameid)
        quitMenu();
 }
 
-void GUIMainMenu::deleteWorld(WorldSpec spec)
+void GUIMainMenu::deleteWorld(const std::vector<std::string> &paths)
 {
-       if(!spec.isValid())
-               return;
+       // Delete files
+       bool did = fs::DeletePaths(paths);
+       if(!did){
+               GUIMessageMenu *menu = new GUIMessageMenu(env, parent,
+                               -1, menumgr, wgettext("Failed to delete all world files"));
+               menu->drop();
+       }
+       // Quit menu to refresh it
        acceptInput();
-       m_data->delete_world_spec = spec;
+       m_data->only_refresh = true;
        quitMenu();
 }
        
@@ -945,3 +1035,7 @@ int GUIMainMenu::getTab()
        return TAB_SINGLEPLAYER; // Default
 }
 
+void GUIMainMenu::displayMessageMenu(std::wstring msg)
+{
+       (new GUIMessageMenu(env, parent, -1, menumgr, msg))->drop();
+}