Use numeric indices and raw table access with LUA_REGISTRYINDEX

[minetest.git] / src / mapnode.cpp

diff --git a/src/mapnode.cpp b/src/mapnode.cpp
index 4e8feb047762cdee2a377ba0cee5d6911ecdf21a..732237833c4e391abb5d7281824e1fd09a141d62 100644 (file)
--- a/src/mapnode.cpp
+++ b/src/mapnode.cpp
@@ -20,7 +20,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "irrlichttypes_extrabloated.h"
 #include "mapnode.h"
 #include "porting.h"
-#include "main.h" // For g_settings
 #include "nodedef.h"
 #include "content_mapnode.h" // For mapnode_translate_*_internal
 #include "serialization.h" // For ser_ver_supported
@@ -71,7 +70,23 @@ void MapNode::setLight(enum LightBank bank, u8 a_light, INodeDefManager *nodemgr
                param1 |= (a_light & 0x0f)<<4;
        }
        else
-               assert(0);
+               assert("Invalid light bank" == NULL);
+}
+
+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
@@ -88,7 +103,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);
@@ -119,7 +134,7 @@ u8 MapNode::getFaceDir(INodeDefManager *nodemgr) const
 {
        const ContentFeatures &f = nodemgr->get(*this);
        if(f.param_type_2 == CPT2_FACEDIR)
-               return getParam2() & 0x1F;
+               return (getParam2() & 0x1F) % 24;
        return 0;
 }
 
@@ -148,6 +163,9 @@ void MapNode::rotateAlongYAxis(INodeDefManager *nodemgr, Rotation rot) {
        ContentParamType2 cpt2 = nodemgr->get(*this).param_type_2;
 
        if (cpt2 == CPT2_FACEDIR) {
+               if (param2 >= 4)
+                       return;
+
                u8 newrot = param2 & 3;
                param2 &= ~3;
                param2 |= (newrot + rot) & 3;
@@ -155,7 +173,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];
@@ -174,7 +192,7 @@ static std::vector<aabb3f> transformNodeBox(const MapNode &n,
                facedir&=0x03;
                for(std::vector<aabb3f>::const_iterator
                                i = fixed.begin();
-                               i != fixed.end(); i++)
+                               i != fixed.end(); ++i)
                {
                        aabb3f box = *i;
 
@@ -439,28 +457,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)
@@ -474,13 +475,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);
@@ -489,7 +490,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);
@@ -517,8 +518,8 @@ void MapNode::serializeBulk(std::ostream &os, int version,
        if(!ser_ver_supported(version))
                throw VersionMismatchException("ERROR: MapNode format not supported");
 
-       assert(content_width == 2);
-       assert(params_width == 2);
+       sanity_check(content_width == 2);
+       sanity_check(params_width == 2);
 
        // Can't do this anymore; we have 16-bit dynamically allocated node IDs
        // in memory; conversion just won't work in this direction.
@@ -564,9 +565,10 @@ void MapNode::deSerializeBulk(std::istream &is, int version,
        if(!ser_ver_supported(version))
                throw VersionMismatchException("ERROR: MapNode format not supported");
 
-       assert(version >= 22);
-       assert(content_width == 1 || content_width == 2);
-       assert(params_width == 2);
+       if (version < 22
+                       || (content_width != 1 && content_width != 2)
+                       || params_width != 2)
+               FATAL_ERROR("Deserialize bulk node data error");
 
        // Uncompress or read data
        u32 len = nodecount * (content_width + params_width);
@@ -651,7 +653,7 @@ void MapNode::deSerialize_pre22(u8 *source, u8 version)
                        param2 &= 0x0f;
                }
        }
-       
+
        // Convert special values from old version to new
        if(version <= 19)
        {