]> 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 38ceaea91da41ba9c42e7c053ad3cc92c93ce302..d7c3f54ff957c7eb75e5da5330f1f3a9193ab352 100644 (file)
@@ -36,9 +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
 {
@@ -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,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,
@@ -185,7 +208,7 @@ void GUIMainMenu::regenerateGui(v2u32 screensize)
                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);
        }
 
@@ -563,6 +586,53 @@ 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 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);
@@ -586,14 +656,14 @@ void GUIMainMenu::regenerateGui(v2u32 screensize)
                        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);
+                       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"
+                       "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);
                }
        }
@@ -743,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)
@@ -929,3 +1035,7 @@ int GUIMainMenu::getTab()
        return TAB_SINGLEPLAYER; // Default
 }
 
+void GUIMainMenu::displayMessageMenu(std::wstring msg)
+{
+       (new GUIMessageMenu(env, parent, -1, menumgr, msg))->drop();
+}