Exclude vertical mapblock borders when setting light

[minetest.git] / src / mapnode.cpp

diff --git a/src/mapnode.cpp b/src/mapnode.cpp
index d52677be07540def4fc0a15b8b3e0022c6887b4f..3940c58679f1422384be1b175ce7371f084762c7 100644 (file)
--- a/src/mapnode.cpp
+++ b/src/mapnode.cpp
@@ -26,6 +26,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "serialization.h" // For ser_ver_supported
 #include "util/serialize.h"
 #include "log.h"
+#include "util/numeric.h"
 #include <string>
 #include <sstream>
 
@@ -77,19 +78,20 @@ u8 MapNode::getLight(enum LightBank bank, INodeDefManager *nodemgr) const
 {
        // Select the brightest of [light source, propagated light]
        const ContentFeatures &f = nodemgr->get(*this);
-       u8 light = 0;
+
+       u8 light;
        if(f.param_type == CPT_LIGHT)
-       {
-               if(bank == LIGHTBANK_DAY)
-                       light = param1 & 0x0f;
-               else if(bank == LIGHTBANK_NIGHT)
-                       light = (param1>>4)&0x0f;
-               else
-                       assert(0);
-       }
-       if(f.light_source > light)
-               light = f.light_source;
-       return light;
+               light = bank == LIGHTBANK_DAY ? param1 & 0x0f : (param1 >> 4) & 0x0f;
+       else
+               light = 0;
+
+       return MYMAX(f.light_source, light);
+}
+
+u8 MapNode::getLightNoChecks(enum LightBank bank, const ContentFeatures *f)
+{
+       return MYMAX(f->light_source,
+                    bank == LIGHTBANK_DAY ? param1 & 0x0f : (param1 >> 4) & 0x0f);
 }
 
 bool MapNode::getLightBanks(u8 &lightday, u8 &lightnight, INodeDefManager *nodemgr) const
@@ -153,7 +155,7 @@ void MapNode::rotateAlongYAxis(INodeDefManager *nodemgr, Rotation rot) {
                u8 wmountface = (param2 & 7);
                if (wmountface <= 1)
                        return;
-                       
+
                Rotation oldrot = wallmounted_to_rot[wmountface - 2];
                param2 &= ~7;
                param2 |= rot_to_wallmounted[(oldrot - rot) & 3];
@@ -354,6 +356,15 @@ std::vector<aabb3f> MapNode::getNodeBoxes(INodeDefManager *nodemgr) const
        return transformNodeBox(*this, f.node_box, nodemgr);
 }
 
+std::vector<aabb3f> MapNode::getCollisionBoxes(INodeDefManager *nodemgr) const
+{
+       const ContentFeatures &f = nodemgr->get(*this);
+       if (f.collision_box.fixed.empty())
+               return transformNodeBox(*this, f.node_box, nodemgr);
+       else
+               return transformNodeBox(*this, f.collision_box, nodemgr);
+}
+
 std::vector<aabb3f> MapNode::getSelectionBoxes(INodeDefManager *nodemgr) const
 {
        const ContentFeatures &f = nodemgr->get(*this);
@@ -428,28 +439,11 @@ u8 MapNode::addLevel(INodeDefManager *nodemgr, s8 add)
        return setLevel(nodemgr, level);
 }
 
-void MapNode::freezeMelt(INodeDefManager *ndef) {
-       u8 level_was_max = this->getMaxLevel(ndef);
-       u8 level_was = this->getLevel(ndef);
-       this->setContent(ndef->getId(ndef->get(*this).freezemelt));
-       u8 level_now_max = this->getMaxLevel(ndef);
-       if (level_was_max && level_was_max != level_now_max) {
-               u8 want = (float)level_now_max / level_was_max * level_was;
-               if (!want)
-                       want = 1;
-               if (want != level_was)
-                       this->setLevel(ndef, want);
-               //errorstream<<"was="<<(int)level_was<<"/"<<(int)level_was_max<<" nowm="<<(int)want<<"/"<<(int)level_now_max<< " => "<<(int)this->getLevel(ndef)<< std::endl;
-       }
-       if (this->getMaxLevel(ndef) && !this->getLevel(ndef))
-               this->addLevel(ndef);
-}
-
 u32 MapNode::serializedLength(u8 version)
 {
        if(!ser_ver_supported(version))
                throw VersionMismatchException("ERROR: MapNode format not supported");
-               
+
        if(version == 0)
                return 1;
        else if(version <= 9)
@@ -463,13 +457,13 @@ void MapNode::serialize(u8 *dest, u8 version)
 {
        if(!ser_ver_supported(version))
                throw VersionMismatchException("ERROR: MapNode format not supported");
-       
+
        // Can't do this anymore; we have 16-bit dynamically allocated node IDs
        // in memory; conversion just won't work in this direction.
        if(version < 24)
                throw SerializationError("MapNode::serialize: serialization to "
                                "version < 24 not possible");
-               
+
        writeU16(dest+0, param0);
        writeU8(dest+2, param1);
        writeU8(dest+3, param2);
@@ -478,7 +472,7 @@ void MapNode::deSerialize(u8 *source, u8 version)
 {
        if(!ser_ver_supported(version))
                throw VersionMismatchException("ERROR: MapNode format not supported");
-               
+
        if(version <= 21)
        {
                deSerialize_pre22(source, version);
@@ -640,7 +634,7 @@ void MapNode::deSerialize_pre22(u8 *source, u8 version)
                        param2 &= 0x0f;
                }
        }
-       
+
        // Convert special values from old version to new
        if(version <= 19)
        {