Replace constant red hurt screen with fade out red

[dragonfireclient.git] / src / guiMainMenu.cpp

diff --git a/src/guiMainMenu.cpp b/src/guiMainMenu.cpp
index 0bdb44e5d80b5959a77ba1456f1252785597d027..d7c3f54ff957c7eb75e5da5330f1f3a9193ab352 100644 (file)
--- a/src/guiMainMenu.cpp
+++ b/src/guiMainMenu.cpp
@@ -102,6 +102,8 @@ enum
        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,
@@ -206,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);
        }
 
@@ -616,6 +618,21 @@ void GUIMainMenu::regenerateGui(v2u32 screensize)
                                       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);
@@ -642,11 +659,11 @@ void GUIMainMenu::regenerateGui(v2u32 screensize)
                        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: tango_, kahrl (kaaaaaahrl?), erlehmann (the hippie), SpeedProg, JacobF (sqlite worlds), teddydestodes, marktraceur, darkrose, Jonathan Neuschäfer (who the hell?), Felix Krausse (broke liquids, IIRC), sfan5... and >10 more random people."
+                       "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);
                }
        }
@@ -820,6 +837,18 @@ void GUIMainMenu::readInput(MainMenuData *dst)
                        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)