Fixed two typo's in commit 615fd498bc

[oweals/minetest.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index dcc47cd6b8cae56a75f5148bd9ed1be0040e8e4e..ede9f63b06477308d091263809190ade2e934259 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1349,7 +1349,13 @@ int main(int argc, char *argv[])
        skin->setColor(gui::EGDC_3D_SHADOW, video::SColor(255,0,0,0));
        skin->setColor(gui::EGDC_HIGH_LIGHT, video::SColor(255,70,100,50));
        skin->setColor(gui::EGDC_HIGH_LIGHT_TEXT, video::SColor(255,255,255,255));
-       
+
+#if (IRRLICHT_VERSION_MAJOR >= 1 && IRRLICHT_VERSION_MINOR >= 8) || IRRLICHT_VERSION_MAJOR >= 2
+       // Irrlicht 1.8 input colours
+       skin->setColor(gui::EGDC_EDITABLE, video::SColor(255,128,128,128));
+       skin->setColor(gui::EGDC_FOCUSED_EDITABLE, video::SColor(255,96,134,49));
+#endif
+
        /*
                GUI stuff
        */
@@ -1440,6 +1446,8 @@ int main(int argc, char *argv[])
                                menudata.anisotropic_filter = g_settings->getBool("anisotropic_filter");
                                menudata.bilinear_filter = g_settings->getBool("bilinear_filter");
                                menudata.trilinear_filter = g_settings->getBool("trilinear_filter");
+                               menudata.enable_shaders = g_settings->getS32("enable_shaders");
+                               menudata.preload_item_visuals = g_settings->getBool("preload_item_visuals");
                                driver->setTextureCreationFlag(video::ETCF_CREATE_MIP_MAPS, menudata.mip_map);
                                menudata.creative_mode = g_settings->getBool("creative_mode");
                                menudata.enable_damage = g_settings->getBool("enable_damage");
@@ -1560,6 +1568,9 @@ int main(int argc, char *argv[])
                                g_settings->set("bilinear_filter", itos(menudata.bilinear_filter));
                                g_settings->set("trilinear_filter", itos(menudata.trilinear_filter));
 
+                               g_settings->setS32("enable_shaders", menudata.enable_shaders);
+                               g_settings->set("preload_item_visuals", itos(menudata.preload_item_visuals));
+
                                g_settings->set("creative_mode", itos(menudata.creative_mode));
                                g_settings->set("enable_damage", itos(menudata.enable_damage));
                                g_settings->set("name", playername);