Deduplicate code and use stdlib in string functions

[minetest.git] / src / mapnode.cpp

diff --git a/src/mapnode.cpp b/src/mapnode.cpp
index 33644cf5cc84f671d4df1f9385e5c5ceb47b9a22..4e8feb047762cdee2a377ba0cee5d6911ecdf21a 100644 (file)
--- a/src/mapnode.cpp
+++ b/src/mapnode.cpp
@@ -25,6 +25,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "content_mapnode.h" // For mapnode_translate_*_internal
 #include "serialization.h" // For ser_ver_supported
 #include "util/serialize.h"
+#include "log.h"
+#include "util/numeric.h"
 #include <string>
 #include <sstream>
 
@@ -76,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
@@ -353,15 +356,36 @@ 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);
        return transformNodeBox(*this, f.selection_box, nodemgr);
 }
 
+u8 MapNode::getMaxLevel(INodeDefManager *nodemgr) const
+{
+       const ContentFeatures &f = nodemgr->get(*this);
+       // todo: after update in all games leave only if (f.param_type_2 ==
+       if( f.liquid_type == LIQUID_FLOWING || f.param_type_2 == CPT2_FLOWINGLIQUID)
+               return LIQUID_LEVEL_MAX;
+       if(f.leveled || f.param_type_2 == CPT2_LEVELED)
+               return LEVELED_MAX;
+       return 0;
+}
+
 u8 MapNode::getLevel(INodeDefManager *nodemgr) const
 {
        const ContentFeatures &f = nodemgr->get(*this);
+       // todo: after update in all games leave only if (f.param_type_2 ==
        if(f.liquid_type == LIQUID_SOURCE)
                return LIQUID_LEVEL_SOURCE;
        if (f.param_type_2 == CPT2_FLOWINGLIQUID)
@@ -370,13 +394,68 @@ u8 MapNode::getLevel(INodeDefManager *nodemgr) const
                return getParam2() & LIQUID_LEVEL_MASK;
        if(f.leveled || f.param_type_2 == CPT2_LEVELED) {
                 u8 level = getParam2() & LEVELED_MASK;
-                if(level) return level;
-                if(f.leveled > LEVELED_MAX) return LEVELED_MAX;
+                if(level)
+                       return level;
+                if(f.leveled > LEVELED_MAX)
+                       return LEVELED_MAX;
                 return f.leveled; //default
        }
        return 0;
 }
 
+u8 MapNode::setLevel(INodeDefManager *nodemgr, s8 level)
+{
+       u8 rest = 0;
+       if (level < 1) {
+               setContent(CONTENT_AIR);
+               return 0;
+       }
+       const ContentFeatures &f = nodemgr->get(*this);
+       if (f.param_type_2 == CPT2_FLOWINGLIQUID
+               || f.liquid_type == LIQUID_FLOWING
+               || f.liquid_type == LIQUID_SOURCE) {
+               if (level >= LIQUID_LEVEL_SOURCE) {
+                       rest = level - LIQUID_LEVEL_SOURCE;
+                       setContent(nodemgr->getId(f.liquid_alternative_source));
+               } else {
+                       setContent(nodemgr->getId(f.liquid_alternative_flowing));
+                       setParam2(level & LIQUID_LEVEL_MASK);
+               }
+       } else if (f.leveled || f.param_type_2 == CPT2_LEVELED) {
+               if (level > LEVELED_MAX) {
+                       rest = level - LEVELED_MAX;
+                       level = LEVELED_MAX;
+               }
+               setParam2(level & LEVELED_MASK);
+       }
+       return rest;
+}
+
+u8 MapNode::addLevel(INodeDefManager *nodemgr, s8 add)
+{
+       s8 level = getLevel(nodemgr);
+       if (add == 0) level = 1;
+       level += 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))
@@ -421,8 +500,7 @@ void MapNode::deSerialize(u8 *source, u8 version)
                param0 = readU16(source+0);
                param1 = readU8(source+2);
                param2 = readU8(source+3);
-       }
-       else{
+       }else{
                param0 = readU8(source+0);
                param1 = readU8(source+1);
                param2 = readU8(source+2);