Add shutdown hook interface to Lua API

[minetest.git] / src / guiMainMenu.cpp

diff --git a/src/guiMainMenu.cpp b/src/guiMainMenu.cpp
index cdf1bc7d5690b9f76c9e1bc1cfc8089f526c67f4..0bdb44e5d80b5959a77ba1456f1252785597d027 100644 (file)
--- a/src/guiMainMenu.cpp
+++ b/src/guiMainMenu.cpp
@@ -39,6 +39,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "tile.h" // getTexturePath
 #include "filesys.h"
 #include "util/string.h"
+#include "subgame.h"
 
 struct CreateWorldDestMainMenu : public CreateWorldDest
 {
@@ -47,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;
@@ -81,6 +98,10 @@ 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_DAMAGE_CB,
        GUI_ID_CREATIVE_CB,
        GUI_ID_JOIN_GAME_BUTTON,
@@ -563,6 +584,38 @@ 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"));
+               }
+
                // Key change button
                {
                        core::rect<s32> rect(0, 0, 120, 30);
@@ -743,6 +796,30 @@ 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_WORLD_LISTBOX);
                if(e != NULL && e->getType() == gui::EGUIET_LIST_BOX)
@@ -929,3 +1006,7 @@ int GUIMainMenu::getTab()
        return TAB_SINGLEPLAYER; // Default
 }
 
+void GUIMainMenu::displayMessageMenu(std::wstring msg)
+{
+       (new GUIMessageMenu(env, parent, -1, menumgr, msg))->drop();
+}