Set acceleration only once in falling node

[minetest.git] / src / nodemetadata.cpp

diff --git a/src/nodemetadata.cpp b/src/nodemetadata.cpp
index 56391a39cd2bc007780fd62d0231dcea0bd83e23..126889ecf28752ec1ded7fd21a4a3bffc83d50b0 100644 (file)
--- a/src/nodemetadata.cpp
+++ b/src/nodemetadata.cpp
@@ -1,6 +1,6 @@
 /*
 Minetest
-Copyright (C) 2010-2011 celeron55, Perttu Ahola <celeron55@gmail.com>
+Copyright (C) 2010-2013 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as published by
@@ -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);
@@ -83,7 +84,7 @@ void NodeMetadataList::serialize(std::ostream &os) const
                Version 0 is a placeholder for "nothing to see here; go away."
        */
 
-       if(m_data.size() == 0){
+       if(m_data.empty()){
                writeU8(os, 0); // version
                return;
        }
@@ -95,58 +96,57 @@ 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)
 {
-       m_data.clear();
+       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(0,0,0);
-               p.Z += p16 / MAP_BLOCKSIZE / MAP_BLOCKSIZE;
-               p16 -= p.Z * MAP_BLOCKSIZE * MAP_BLOCKSIZE;
-               p.Y += p16 / MAP_BLOCKSIZE;
-               p16 -= p.Y * MAP_BLOCKSIZE;
-               p.X += p16;
+               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(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;
        }
@@ -157,10 +157,21 @@ NodeMetadataList::~NodeMetadataList()
        clear();
 }
 
-NodeMetadata* NodeMetadataList::get(v3s16 p)
+std::vector<v3s16> NodeMetadataList::getAllKeys()
+{
+       std::vector<v3s16> keys;
+
+       std::map<v3s16, NodeMetadata *>::const_iterator it;
+       for (it = m_data.begin(); it != m_data.end(); ++it)
+               keys.push_back(it->first);
+
+       return keys;
+}
+
+NodeMetadata *NodeMetadataList::get(v3s16 p)
 {
-       std::map<v3s16, NodeMetadata*>::const_iterator n = m_data.find(p);
-       if(n == m_data.end())
+       std::map<v3s16, NodeMetadata *>::const_iterator n = m_data.find(p);
+       if (n == m_data.end())
                return NULL;
        return n->second;
 }
@@ -168,8 +179,7 @@ NodeMetadata* NodeMetadataList::get(v3s16 p)
 void NodeMetadataList::remove(v3s16 p)
 {
        NodeMetadata *olddata = get(p);
-       if(olddata)
-       {
+       if (olddata) {
                delete olddata;
                m_data.erase(p);
        }
@@ -183,11 +193,41 @@ void NodeMetadataList::set(v3s16 p, NodeMetadata *d)
 
 void NodeMetadataList::clear()
 {
-       for(std::map<v3s16, NodeMetadata*>::iterator
-                       i = m_data.begin();
-                       i != m_data.end(); i++)
-       {
-               delete i->second;
+       std::map<v3s16, NodeMetadata*>::iterator it;
+       for (it = m_data.begin(); it != m_data.end(); ++it) {
+               delete it->second;
        }
        m_data.clear();
 }
+
+std::string NodeMetadata::getString(const std::string &name,
+       unsigned short recursion) const
+{
+       StringMap::const_iterator it = m_stringvars.find(name);
+       if (it == m_stringvars.end())
+               return "";
+
+       return resolveString(it->second, recursion);
+}
+
+void NodeMetadata::setString(const std::string &name, const std::string &var)
+{
+       if (var.empty()) {
+               m_stringvars.erase(name);
+       } else {
+               m_stringvars[name] = var;
+       }
+}
+
+std::string NodeMetadata::resolveString(const std::string &str,
+       unsigned short recursion) const
+{
+       if (recursion > 1) {
+               return str;
+       }
+       if (str.substr(0, 2) == "${" && str[str.length() - 1] == '}') {
+               return getString(str.substr(2, str.length() - 3), recursion + 1);
+       }
+       return str;
+}
+