Fix remnants of s32 enable_shaders

diff --git a/minetest.conf.example b/minetest.conf.example
index aeeff82232e77497d6c97a129081d0babb598f44..929f39aa40c2c890edd068f472a3b05b58e31e1d 100644 (file)
--- a/minetest.conf.example
+++ b/minetest.conf.example
@@ -166,10 +166,8 @@
 #trilinear_filter = false
 # Set to true to pre-generate all item visuals
 #preload_item_visuals = true
-# 0: disable shaders
-# (1: low level shaders; not implemented)
-# 2: enable high level shaders
-#enable_shaders = 2
+# Set to true to enable shaders. Disable them if video_driver = direct3d9/8.
+#enable_shaders = true
 # Set to true to enable textures bumpmapping. Requires shaders enabled.
 #enable_bumpmapping = false
 # The time in seconds it takes between repeated

diff --git a/src/mapblock_mesh.cpp b/src/mapblock_mesh.cpp
index b70b25eabffadedb160190371e2743198473a4ff..6cbc2c5219c2f54404ab6e845611ba05b34a0744 100644 (file)
--- a/src/mapblock_mesh.cpp
+++ b/src/mapblock_mesh.cpp
@@ -1294,7 +1294,7 @@ MapBlockMesh::~MapBlockMesh()
 
 bool MapBlockMesh::animate(bool faraway, float time, int crack, u32 daynight_ratio)
 {
-       bool enable_shaders = (g_settings->getS32("enable_shaders") > 0);
+       bool enable_shaders = g_settings->getBool("enable_shaders");
        bool enable_bumpmapping = g_settings->getBool("enable_bumpmapping");
        
        if(!m_has_animation)