summaryrefslogtreecommitdiff
path: root/src/nodedef.cpp
diff options
context:
space:
mode:
authorRealBadAngel <maciej.kasatkin@o2.pl>2015-06-28 12:17:36 +0200
committerRealBadAngel <maciej.kasatkin@o2.pl>2015-06-28 12:17:36 +0200
commitb160f8dfe7e3bf8176e3f9f64dc2d9a9868d7fce (patch)
tree7e304916a01c146352c4c9b851224acb97e2bab1 /src/nodedef.cpp
parent420125debd3d010fcd3e7738c43f25c8f407ab63 (diff)
downloadminetest-b160f8dfe7e3bf8176e3f9f64dc2d9a9868d7fce.tar.gz
minetest-b160f8dfe7e3bf8176e3f9f64dc2d9a9868d7fce.tar.bz2
minetest-b160f8dfe7e3bf8176e3f9f64dc2d9a9868d7fce.zip
Minimap update
Diffstat (limited to 'src/nodedef.cpp')
-rw-r--r--src/nodedef.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/nodedef.cpp b/src/nodedef.cpp
index ba1ca2c65..e392f477a 100644
--- a/src/nodedef.cpp
+++ b/src/nodedef.cpp
@@ -787,6 +787,7 @@ void CNodeDefManager::updateTextures(IGameDef *gamedef,
bool enable_bumpmapping = g_settings->getBool("enable_bumpmapping");
bool enable_parallax_occlusion = g_settings->getBool("enable_parallax_occlusion");
bool enable_mesh_cache = g_settings->getBool("enable_mesh_cache");
+ bool enable_minimap = g_settings->getBool("enable_minimap");
bool use_normal_texture = enable_shaders &&
(enable_bumpmapping || enable_parallax_occlusion);
@@ -797,7 +798,7 @@ void CNodeDefManager::updateTextures(IGameDef *gamedef,
ContentFeatures *f = &m_content_features[i];
// minimap pixel color - the average color of a texture
- if (f->tiledef[0].name != "")
+ if (enable_minimap && f->tiledef[0].name != "")
f->minimap_color = tsrc->getTextureAverageColor(f->tiledef[0].name);
// Figure out the actual tiles to use