Fix BSD iconv declaration

[dragonfireclient.git] / src / nodemetadata.cpp

diff --git a/src/nodemetadata.cpp b/src/nodemetadata.cpp
index 6447c8785b9919fec4fb6028aacd595fc951b47b..b5052c3b8754122460330bd87f17b10661155973 100644 (file)
--- a/src/nodemetadata.cpp
+++ b/src/nodemetadata.cpp
@@ -113,13 +113,13 @@ int NodeMetadata::countNonPrivate() const
 */
 
 void NodeMetadataList::serialize(std::ostream &os, u8 blockver, bool disk,
-       bool absolute_pos) const
+       bool absolute_pos, bool include_empty) const
 {
        /*
                Version 0 is a placeholder for "nothing to see here; go away."
        */
 
-       u16 count = countNonEmpty();
+       u16 count = include_empty ? m_data.size() : countNonEmpty();
        if (count == 0) {
                writeU8(os, 0); // version
                return;
@@ -134,7 +134,7 @@ void NodeMetadataList::serialize(std::ostream &os, u8 blockver, bool disk,
                        i != m_data.end(); ++i) {
                v3s16 p = i->first;
                NodeMetadata *data = i->second;
-               if (data->empty())
+               if (!include_empty && data->empty())
                        continue;
 
                if (absolute_pos) {
@@ -206,10 +206,9 @@ NodeMetadataList::~NodeMetadataList()
 std::vector<v3s16> NodeMetadataList::getAllKeys()
 {
        std::vector<v3s16> keys;
-
-       NodeMetadataMap::const_iterator it;
-       for (it = m_data.begin(); it != m_data.end(); ++it)
-               keys.push_back(it->first);
+       keys.reserve(m_data.size());
+       for (const auto &it : m_data)
+               keys.push_back(it.first);
 
        return keys;
 }
@@ -218,7 +217,7 @@ NodeMetadata *NodeMetadataList::get(v3s16 p)
 {
        NodeMetadataMap::const_iterator n = m_data.find(p);
        if (n == m_data.end())
-               return NULL;
+               return nullptr;
        return n->second;
 }
 
@@ -235,7 +234,7 @@ void NodeMetadataList::remove(v3s16 p)
 void NodeMetadataList::set(v3s16 p, NodeMetadata *d)
 {
        remove(p);
-       m_data.insert(std::make_pair(p, d));
+       m_data.emplace(p, d);
 }
 
 void NodeMetadataList::clear()
@@ -251,9 +250,8 @@ void NodeMetadataList::clear()
 int NodeMetadataList::countNonEmpty() const
 {
        int n = 0;
-       NodeMetadataMap::const_iterator it;
-       for (it = m_data.begin(); it != m_data.end(); ++it) {
-               if (!it->second->empty())
+       for (const auto &it : m_data) {
+               if (!it.second->empty())
                        n++;
        }
        return n;