Add '/clearobjects quick'

[minetest.git] / src / nodemetadata.cpp

diff --git a/src/nodemetadata.cpp b/src/nodemetadata.cpp
index bd54d225688d1c99755d3db07c7b38ca5e9a9bf0..126889ecf28752ec1ded7fd21a4a3bffc83d50b0 100644 (file)
--- a/src/nodemetadata.cpp
+++ b/src/nodemetadata.cpp
@@ -30,9 +30,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
        NodeMetadata
 */
 
-NodeMetadata::NodeMetadata(IGameDef *gamedef):
+NodeMetadata::NodeMetadata(IItemDefManager *item_def_mgr):
        m_stringvars(),
-       m_inventory(new Inventory(gamedef->idef()))
+       m_inventory(new Inventory(item_def_mgr))
 {
 }
 
@@ -45,10 +45,11 @@ void NodeMetadata::serialize(std::ostream &os) const
 {
        int num_vars = m_stringvars.size();
        writeU32(os, num_vars);
-       for(std::map<std::string, std::string>::const_iterator
-                       i = m_stringvars.begin(); i != m_stringvars.end(); i++){
-               os<<serializeString(i->first);
-               os<<serializeLongString(i->second);
+       for (StringMap::const_iterator
+                       it = m_stringvars.begin();
+                       it != m_stringvars.end(); ++it) {
+               os << serializeString(it->first);
+               os << serializeLongString(it->second);
        }
 
        m_inventory->serialize(os);
@@ -95,39 +96,39 @@ void NodeMetadataList::serialize(std::ostream &os) const
 
        for(std::map<v3s16, NodeMetadata*>::const_iterator
                        i = m_data.begin();
-                       i != m_data.end(); i++)
+                       i != m_data.end(); ++i)
        {
                v3s16 p = i->first;
                NodeMetadata *data = i->second;
 
-               u16 p16 = p.Z*MAP_BLOCKSIZE*MAP_BLOCKSIZE + p.Y*MAP_BLOCKSIZE + p.X;
+               u16 p16 = p.Z * MAP_BLOCKSIZE * MAP_BLOCKSIZE + p.Y * MAP_BLOCKSIZE + p.X;
                writeU16(os, p16);
 
                data->serialize(os);
        }
 }
 
-void NodeMetadataList::deSerialize(std::istream &is, IGameDef *gamedef)
+void NodeMetadataList::deSerialize(std::istream &is, IItemDefManager *item_def_mgr)
 {
        clear();
 
        u8 version = readU8(is);
 
-       if(version == 0){
+       if (version == 0) {
                // Nothing
                return;
        }
 
-       if(version != 1){
-               infostream<<__FUNCTION_NAME<<": version "<<version<<" not supported"
-                               <<std::endl;
-               throw SerializationError("NodeMetadataList::deSerialize");
+       if (version != 1) {
+               std::string err_str = std::string(FUNCTION_NAME)
+                       + ": version " + itos(version) + " not supported";
+               infostream << err_str << std::endl;
+               throw SerializationError(err_str);
        }
 
        u16 count = readU16(is);
 
-       for(u16 i=0; i<count; i++)
-       {
+       for (u16 i=0; i < count; i++) {
                u16 p16 = readU16(is);
 
                v3s16 p;
@@ -137,16 +138,15 @@ void NodeMetadataList::deSerialize(std::istream &is, IGameDef *gamedef)
                p16 &= MAP_BLOCKSIZE - 1;
                p.X = p16;
 
-               if(m_data.find(p) != m_data.end())
-               {
-                       infostream<<"WARNING: NodeMetadataList::deSerialize(): "
+               if (m_data.find(p) != m_data.end()) {
+                       warningstream<<"NodeMetadataList::deSerialize(): "
                                        <<"already set data at position"
                                        <<"("<<p.X<<","<<p.Y<<","<<p.Z<<"): Ignoring."
                                        <<std::endl;
                        continue;
                }
 
-               NodeMetadata *data = new NodeMetadata(gamedef);
+               NodeMetadata *data = new NodeMetadata(item_def_mgr);
                data->deSerialize(is);
                m_data[p] = data;
        }
@@ -203,11 +203,10 @@ void NodeMetadataList::clear()
 std::string NodeMetadata::getString(const std::string &name,
        unsigned short recursion) const
 {
-       std::map<std::string, std::string>::const_iterator it;
-       it = m_stringvars.find(name);
-       if (it == m_stringvars.end()) {
+       StringMap::const_iterator it = m_stringvars.find(name);
+       if (it == m_stringvars.end())
                return "";
-       }
+
        return resolveString(it->second, recursion);
 }