mirror of
https://github.com/minetest/minetest.git
synced 2024-08-19 21:14:15 +02:00
Do not serialize empty NodeMetadata
This commit fixes #4516, though note that this will gradually fix MapBlocks as they are used/modified and thus re-serialized.
This commit is contained in:
parent
5091cb5ecd
commit
3a57e52500
@ -74,6 +74,11 @@ void NodeMetadata::clear()
|
||||
m_inventory->clear();
|
||||
}
|
||||
|
||||
bool NodeMetadata::empty() const
|
||||
{
|
||||
return m_stringvars.size() == 0 && m_inventory->getLists().size() == 0;
|
||||
}
|
||||
|
||||
/*
|
||||
NodeMetadataList
|
||||
*/
|
||||
@ -84,14 +89,13 @@ void NodeMetadataList::serialize(std::ostream &os) const
|
||||
Version 0 is a placeholder for "nothing to see here; go away."
|
||||
*/
|
||||
|
||||
if(m_data.empty()){
|
||||
u16 count = countNonEmpty();
|
||||
if (count == 0) {
|
||||
writeU8(os, 0); // version
|
||||
return;
|
||||
}
|
||||
|
||||
writeU8(os, 1); // version
|
||||
|
||||
u16 count = m_data.size();
|
||||
writeU16(os, count);
|
||||
|
||||
for(std::map<v3s16, NodeMetadata*>::const_iterator
|
||||
@ -100,6 +104,8 @@ void NodeMetadataList::serialize(std::ostream &os) const
|
||||
{
|
||||
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);
|
||||
@ -200,6 +206,17 @@ void NodeMetadataList::clear()
|
||||
m_data.clear();
|
||||
}
|
||||
|
||||
int NodeMetadataList::countNonEmpty() const
|
||||
{
|
||||
int n = 0;
|
||||
std::map<v3s16, NodeMetadata*>::const_iterator it;
|
||||
for (it = m_data.begin(); it != m_data.end(); ++it) {
|
||||
if (!it->second->empty())
|
||||
n++;
|
||||
}
|
||||
return n;
|
||||
}
|
||||
|
||||
std::string NodeMetadata::getString(const std::string &name,
|
||||
unsigned short recursion) const
|
||||
{
|
||||
|
@ -47,6 +47,7 @@ public:
|
||||
void deSerialize(std::istream &is);
|
||||
|
||||
void clear();
|
||||
bool empty() const;
|
||||
|
||||
// Generic key/value store
|
||||
std::string getString(const std::string &name, unsigned short recursion = 0) const;
|
||||
@ -94,6 +95,8 @@ public:
|
||||
void clear();
|
||||
|
||||
private:
|
||||
int countNonEmpty() const;
|
||||
|
||||
std::map<v3s16, NodeMetadata *> m_data;
|
||||
};
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user