Fix mapgen using unitialised height map values

[minetest.git] / src / mapnode.cpp

diff --git a/src/mapnode.cpp b/src/mapnode.cpp
index 056b940548240b9d869b02f142fa3b7973ed949e..44525b6443a687a97be728f85bb8eb12196639a9 100644 (file)
--- a/src/mapnode.cpp
+++ b/src/mapnode.cpp
@@ -74,6 +74,22 @@ void MapNode::setLight(enum LightBank bank, u8 a_light, INodeDefManager *nodemgr
                assert(0);
 }
 
+bool MapNode::isLightDayNightEq(INodeDefManager *nodemgr) const
+{
+       const ContentFeatures &f = nodemgr->get(*this);
+       bool isEqual;
+
+       if (f.param_type == CPT_LIGHT) {
+               u8 day   = MYMAX(f.light_source, param1 & 0x0f);
+               u8 night = MYMAX(f.light_source, (param1 >> 4) & 0x0f);
+               isEqual = day == night;
+       } else {
+               isEqual = true;
+       }
+
+       return isEqual;
+}
+
 u8 MapNode::getLight(enum LightBank bank, INodeDefManager *nodemgr) const
 {
        // Select the brightest of [light source, propagated light]
@@ -88,7 +104,7 @@ u8 MapNode::getLight(enum LightBank bank, INodeDefManager *nodemgr) const
        return MYMAX(f.light_source, light);
 }
 
-u8 MapNode::getLightNoChecks(enum LightBank bank, const ContentFeatures *f)
+u8 MapNode::getLightNoChecks(enum LightBank bank, const ContentFeatures *f) const
 {
        return MYMAX(f->light_source,
                     bank == LIGHTBANK_DAY ? param1 & 0x0f : (param1 >> 4) & 0x0f);