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 388071a17ad7d1c69321190990df71460b263831..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,7 @@ 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
@@ -104,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);
@@ -164,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;
@@ -190,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;
 
@@ -516,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.
@@ -563,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);