LocalPlayer::accelerateHorizontal: cleanups

[oweals/minetest.git] / src / mapnode.cpp

diff --git a/src/mapnode.cpp b/src/mapnode.cpp
index f1a7f3e6173cbb31d26b9a57168e5007ca0780bc..fd28910ff6848f00a148bdf8829a8ff5f8daefe7 100644 (file)
--- a/src/mapnode.cpp
+++ b/src/mapnode.cpp
@@ -55,6 +55,15 @@ MapNode::MapNode(INodeDefManager *ndef, const std::string &name,
        param2 = a_param2;
 }
 
+void MapNode::getColor(const ContentFeatures &f, video::SColor *color) const
+{
+       if (f.palette) {
+               *color = (*f.palette)[param2];
+               return;
+       }
+       *color = f.color;
+}
+
 void MapNode::setLight(enum LightBank bank, u8 a_light, const ContentFeatures &f)
 {
        // If node doesn't contain light data, ignore this
@@ -146,7 +155,8 @@ bool MapNode::getLightBanks(u8 &lightday, u8 &lightnight, INodeDefManager *nodem
 u8 MapNode::getFaceDir(INodeDefManager *nodemgr) const
 {
        const ContentFeatures &f = nodemgr->get(*this);
-       if(f.param_type_2 == CPT2_FACEDIR)
+       if (f.param_type_2 == CPT2_FACEDIR ||
+                       f.param_type_2 == CPT2_COLORED_FACEDIR)
                return (getParam2() & 0x1F) % 24;
        return 0;
 }
@@ -154,7 +164,8 @@ u8 MapNode::getFaceDir(INodeDefManager *nodemgr) const
 u8 MapNode::getWallMounted(INodeDefManager *nodemgr) const
 {
        const ContentFeatures &f = nodemgr->get(*this);
-       if(f.param_type_2 == CPT2_WALLMOUNTED)
+       if (f.param_type_2 == CPT2_WALLMOUNTED ||
+                       f.param_type_2 == CPT2_COLORED_WALLMOUNTED)
                return getParam2() & 0x07;
        return 0;
 }
@@ -176,7 +187,7 @@ void MapNode::rotateAlongYAxis(INodeDefManager *nodemgr, Rotation rot)
 {
        ContentParamType2 cpt2 = nodemgr->get(*this).param_type_2;
 
-       if (cpt2 == CPT2_FACEDIR) {
+       if (cpt2 == CPT2_FACEDIR || cpt2 == CPT2_COLORED_FACEDIR) {
                static const u8 rotate_facedir[24 * 4] = {
                        // Table value = rotated facedir
                        // Columns: 0, 90, 180, 270 degrees rotation around vertical axis
@@ -216,7 +227,8 @@ void MapNode::rotateAlongYAxis(INodeDefManager *nodemgr, Rotation rot)
                u8 index = facedir * 4 + rot;
                param2 &= ~31;
                param2 |= rotate_facedir[index];
-       } else if (cpt2 == CPT2_WALLMOUNTED) {
+       } else if (cpt2 == CPT2_WALLMOUNTED ||
+                       cpt2 == CPT2_COLORED_WALLMOUNTED) {
                u8 wmountface = (param2 & 7);
                if (wmountface <= 1)
                        return;
@@ -646,7 +658,7 @@ void MapNode::serializeBulk(std::ostream &os, int version,
                const MapNode *nodes, u32 nodecount,
                u8 content_width, u8 params_width, bool compressed)
 {
-       if(!ser_ver_supported(version))
+       if (!ser_ver_supported(version))
                throw VersionMismatchException("ERROR: MapNode format not supported");
 
        sanity_check(content_width == 2);
@@ -654,38 +666,33 @@ void MapNode::serializeBulk(std::ostream &os, int version,
 
        // 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)
+       if (version < 24)
                throw SerializationError("MapNode::serializeBulk: serialization to "
                                "version < 24 not possible");
 
-       SharedBuffer<u8> databuf(nodecount * (content_width + params_width));
-
-       // Serialize content
-       for(u32 i=0; i<nodecount; i++)
-               writeU16(&databuf[i*2], nodes[i].param0);
+       size_t databuf_size = nodecount * (content_width + params_width);
+       u8 *databuf = new u8[databuf_size];
 
-       // Serialize param1
        u32 start1 = content_width * nodecount;
-       for(u32 i=0; i<nodecount; i++)
-               writeU8(&databuf[start1 + i], nodes[i].param1);
-
-       // Serialize param2
        u32 start2 = (content_width + 1) * nodecount;
-       for(u32 i=0; i<nodecount; i++)
+
+       // Serialize content
+       for (u32 i = 0; i < nodecount; i++) {
+               writeU16(&databuf[i * 2], nodes[i].param0);
+               writeU8(&databuf[start1 + i], nodes[i].param1);
                writeU8(&databuf[start2 + i], nodes[i].param2);
+       }
 
        /*
                Compress data to output stream
        */
 
-       if(compressed)
-       {
-               compressZlib(databuf, os);
-       }
+       if (compressed)
+               compressZlib(databuf, databuf_size, os);
        else
-       {
-               os.write((const char*) &databuf[0], databuf.getSize());
-       }
+               os.write((const char*) &databuf[0], databuf_size);
+
+       delete [] databuf;
 }
 
 // Deserialize bulk node data