Revert #10495 and simplify.

[minetest.git] / src / nodemetadata.cpp

diff --git a/src/nodemetadata.cpp b/src/nodemetadata.cpp
index 0e8195c343e78badc4e62f3c403c65875dc25601..6447c8785b9919fec4fb6028aacd595fc951b47b 100644 (file)
--- a/src/nodemetadata.cpp
+++ b/src/nodemetadata.cpp
@@ -44,15 +44,13 @@ void NodeMetadata::serialize(std::ostream &os, u8 version, bool disk) const
 {
        int num_vars = disk ? m_stringvars.size() : countNonPrivate();
        writeU32(os, num_vars);
-       for (StringMap::const_iterator
-                       it = m_stringvars.begin();
-                       it != m_stringvars.end(); ++it) {
-               bool priv = isPrivate(it->first);
+       for (const auto &sv : m_stringvars) {
+               bool priv = isPrivate(sv.first);
                if (!disk && priv)
                        continue;
 
-               os << serializeString(it->first);
-               os << serializeLongString(it->second);
+               os << serializeString16(sv.first);
+               os << serializeString32(sv.second);
                if (version >= 2)
                        writeU8(os, (priv) ? 1 : 0);
        }
@@ -65,8 +63,8 @@ void NodeMetadata::deSerialize(std::istream &is, u8 version)
        clear();
        int num_vars = readU32(is);
        for(int i=0; i<num_vars; i++){
-               std::string name = deSerializeString(is);
-               std::string var = deSerializeLongString(is);
+               std::string name = deSerializeString16(is);
+               std::string var = deSerializeString32(is);
                m_stringvars[name] = var;
                if (version >= 2) {
                        if (readU8(is) == 1)
@@ -86,7 +84,7 @@ void NodeMetadata::clear()
 
 bool NodeMetadata::empty() const
 {
-       return Metadata::empty() && m_inventory->getLists().size() == 0;
+       return Metadata::empty() && m_inventory->getLists().empty();
 }
 
 
@@ -103,10 +101,8 @@ int NodeMetadata::countNonPrivate() const
        // m_privatevars can contain names not actually present
        // DON'T: return m_stringvars.size() - m_privatevars.size();
        int n = 0;
-       for (StringMap::const_iterator
-                       it = m_stringvars.begin();
-                       it != m_stringvars.end(); ++it) {
-               if (isPrivate(it->first) == false)
+       for (const auto &sv : m_stringvars) {
+               if (!isPrivate(sv.first))
                        n++;
        }
        return n;
@@ -116,7 +112,8 @@ int NodeMetadata::countNonPrivate() const
        NodeMetadataList
 */
 
-void NodeMetadataList::serialize(std::ostream &os, u8 blockver, bool disk) const
+void NodeMetadataList::serialize(std::ostream &os, u8 blockver, bool disk,
+       bool absolute_pos) const
 {
        /*
                Version 0 is a placeholder for "nothing to see here; go away."
@@ -132,23 +129,29 @@ void NodeMetadataList::serialize(std::ostream &os, u8 blockver, bool disk) const
        writeU8(os, version);
        writeU16(os, count);
 
-       for(std::map<v3s16, NodeMetadata*>::const_iterator
+       for (NodeMetadataMap::const_iterator
                        i = m_data.begin();
-                       i != m_data.end(); ++i)
-       {
+                       i != m_data.end(); ++i) {
                v3s16 p = i->first;
                NodeMetadata *data = i->second;
                if (data->empty())
                        continue;
 
-               u16 p16 = p.Z * MAP_BLOCKSIZE * MAP_BLOCKSIZE + p.Y * MAP_BLOCKSIZE + p.X;
-               writeU16(os, p16);
-
+               if (absolute_pos) {
+                       writeS16(os, p.X);
+                       writeS16(os, p.Y);
+                       writeS16(os, p.Z);
+               } else {
+                       // Serialize positions within a mapblock
+                       u16 p16 = (p.Z * MAP_BLOCKSIZE + p.Y) * MAP_BLOCKSIZE + p.X;
+                       writeU16(os, p16);
+               }
                data->serialize(os, version, disk);
        }
 }
 
-void NodeMetadataList::deSerialize(std::istream &is, IItemDefManager *item_def_mgr)
+void NodeMetadataList::deSerialize(std::istream &is,
+       IItemDefManager *item_def_mgr, bool absolute_pos)
 {
        clear();
 
@@ -169,15 +172,19 @@ void NodeMetadataList::deSerialize(std::istream &is, IItemDefManager *item_def_m
        u16 count = readU16(is);
 
        for (u16 i = 0; i < count; i++) {
-               u16 p16 = readU16(is);
-
                v3s16 p;
-               p.Z = p16 / MAP_BLOCKSIZE / MAP_BLOCKSIZE;
-               p16 &= MAP_BLOCKSIZE * MAP_BLOCKSIZE - 1;
-               p.Y = p16 / MAP_BLOCKSIZE;
-               p16 &= MAP_BLOCKSIZE - 1;
-               p.X = p16;
-
+               if (absolute_pos) {
+                       p.X = readS16(is);
+                       p.Y = readS16(is);
+                       p.Z = readS16(is);
+               } else {
+                       u16 p16 = readU16(is);
+                       p.X = p16 & (MAP_BLOCKSIZE - 1);
+                       p16 /= MAP_BLOCKSIZE;
+                       p.Y = p16 & (MAP_BLOCKSIZE - 1);
+                       p16 /= MAP_BLOCKSIZE;
+                       p.Z = p16;
+               }
                if (m_data.find(p) != m_data.end()) {
                        warningstream << "NodeMetadataList::deSerialize(): "
                                        << "already set data at position " << PP(p)
@@ -200,7 +207,7 @@ std::vector<v3s16> NodeMetadataList::getAllKeys()
 {
        std::vector<v3s16> keys;
 
-       std::map<v3s16, NodeMetadata *>::const_iterator it;
+       NodeMetadataMap::const_iterator it;
        for (it = m_data.begin(); it != m_data.end(); ++it)
                keys.push_back(it->first);
 
@@ -209,7 +216,7 @@ std::vector<v3s16> NodeMetadataList::getAllKeys()
 
 NodeMetadata *NodeMetadataList::get(v3s16 p)
 {
-       std::map<v3s16, NodeMetadata *>::const_iterator n = m_data.find(p);
+       NodeMetadataMap::const_iterator n = m_data.find(p);
        if (n == m_data.end())
                return NULL;
        return n->second;
@@ -219,7 +226,8 @@ void NodeMetadataList::remove(v3s16 p)
 {
        NodeMetadata *olddata = get(p);
        if (olddata) {
-               delete olddata;
+               if (m_is_metadata_owner)
+                       delete olddata;
                m_data.erase(p);
        }
 }
@@ -232,9 +240,10 @@ void NodeMetadataList::set(v3s16 p, NodeMetadata *d)
 
 void NodeMetadataList::clear()
 {
-       std::map<v3s16, NodeMetadata*>::iterator it;
-       for (it = m_data.begin(); it != m_data.end(); ++it) {
-               delete it->second;
+       if (m_is_metadata_owner) {
+               NodeMetadataMap::const_iterator it;
+               for (it = m_data.begin(); it != m_data.end(); ++it)
+                       delete it->second;
        }
        m_data.clear();
 }
@@ -242,7 +251,7 @@ void NodeMetadataList::clear()
 int NodeMetadataList::countNonEmpty() const
 {
        int n = 0;
-       std::map<v3s16, NodeMetadata*>::const_iterator it;
+       NodeMetadataMap::const_iterator it;
        for (it = m_data.begin(); it != m_data.end(); ++it) {
                if (!it->second->empty())
                        n++;