Fix remnants of s32 enable_shaders

kahrl · kahrl · commit af490330e7f7 · 2013-09-04T00:16:33.000+02:00
diff --git 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
@@ -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)

Original file line number	Diff line number	Diff line change
`@@ -1294,7 +1294,7 @@ MapBlockMesh::~MapBlockMesh()`
`1294`	`1294`
`1295`	`1295`	`bool MapBlockMesh::animate(bool faraway, float time, int crack, u32 daynight_ratio)`
`1296`	`1296`	`{`
`1297`		`- bool enable_shaders = (g_settings->getS32("enable_shaders") > 0);`
	`1297`	`+ bool enable_shaders = g_settings->getBool("enable_shaders");`
`1298`	`1298`	`bool enable_bumpmapping = g_settings->getBool("enable_bumpmapping");`
`1299`	`1299`
`1300`	`1300`	`if(!m_has_animation)`