diff options
Diffstat (limited to 'src/nodemetadata.cpp')
| -rw-r--r-- | src/nodemetadata.cpp | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/src/nodemetadata.cpp b/src/nodemetadata.cpp index bab7a96af..b84ffc8cb 100644 --- a/src/nodemetadata.cpp +++ b/src/nodemetadata.cpp @@ -31,10 +31,9 @@ with this program; if not, write to the Free Software Foundation, Inc., NodeMetadata */ -NodeMetadata::NodeMetadata(IItemDefManager *item_def_mgr) : - m_inventory(new Inventory(item_def_mgr)) -{ -} +NodeMetadata::NodeMetadata(IItemDefManager *item_def_mgr): + m_inventory(new Inventory(item_def_mgr)) +{} NodeMetadata::~NodeMetadata() { @@ -63,7 +62,7 @@ void NodeMetadata::deSerialize(std::istream &is, u8 version) { clear(); int num_vars = readU32(is); - for (int i = 0; i < num_vars; i++) { + for(int i=0; i<num_vars; i++){ std::string name = deSerializeString(is); std::string var = deSerializeLongString(is); m_stringvars[name] = var; @@ -88,6 +87,7 @@ bool NodeMetadata::empty() const return Metadata::empty() && m_inventory->getLists().empty(); } + void NodeMetadata::markPrivate(const std::string &name, bool set) { if (set) @@ -112,8 +112,8 @@ int NodeMetadata::countNonPrivate() const NodeMetadataList */ -void NodeMetadataList::serialize( - std::ostream &os, u8 blockver, bool disk, bool absolute_pos) 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." @@ -129,7 +129,9 @@ void NodeMetadataList::serialize( writeU8(os, version); writeU16(os, count); - for (NodeMetadataMap::const_iterator i = m_data.begin(); i != m_data.end(); ++i) { + for (NodeMetadataMap::const_iterator + i = m_data.begin(); + i != m_data.end(); ++i) { v3s16 p = i->first; NodeMetadata *data = i->second; if (data->empty()) @@ -148,8 +150,8 @@ void NodeMetadataList::serialize( } } -void NodeMetadataList::deSerialize( - std::istream &is, IItemDefManager *item_def_mgr, bool absolute_pos) +void NodeMetadataList::deSerialize(std::istream &is, + IItemDefManager *item_def_mgr, bool absolute_pos) { clear(); @@ -161,8 +163,8 @@ void NodeMetadataList::deSerialize( } if (version > 2) { - std::string err_str = std::string(FUNCTION_NAME) + ": version " + - itos(version) + " not supported"; + std::string err_str = std::string(FUNCTION_NAME) + + ": version " + itos(version) + " not supported"; infostream << err_str << std::endl; throw SerializationError(err_str); } @@ -185,8 +187,8 @@ void NodeMetadataList::deSerialize( } if (m_data.find(p) != m_data.end()) { warningstream << "NodeMetadataList::deSerialize(): " - << "already set data at position " << PP(p) - << ": Ignoring." << std::endl; + << "already set data at position " << PP(p) + << ": Ignoring." << std::endl; continue; } |