Replace std::list by std::vector into ServerMap::listAllLoadableBlocks ServerMap...

[minetest.git] / src / nodemetadata.cpp

diff --git a/src/nodemetadata.cpp b/src/nodemetadata.cpp
index c76ad1f4be4054ee02ab826c8edf8e1367a55fb5..1e40a1630ea7c03c5c152546174cb0c42d31897c 100644 (file)
--- a/src/nodemetadata.cpp
+++ b/src/nodemetadata.cpp
@@ -1,29 +1,30 @@
 /*
-Minetest-c55
-Copyright (C) 2010-2011 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+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 General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
 (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU Lesser General Public License for more details.
 
-You should have received a copy of the GNU General Public License along
+You should have received a copy of the GNU Lesser General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
 #include "nodemetadata.h"
-#include "utility.h"
 #include "exceptions.h"
 #include "gamedef.h"
 #include "inventory.h"
-#include <sstream>
 #include "log.h"
+#include "util/serialize.h"
+#include "constants.h" // MAP_BLOCKSIZE
+#include <sstream>
 
 /*
        NodeMetadata
@@ -31,11 +32,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 NodeMetadata::NodeMetadata(IGameDef *gamedef):
        m_stringvars(),
-       m_inventory(new Inventory(gamedef->idef())),
-       m_inventorydrawspec(""),
-       m_formspec(""),
-       m_infotext(""),
-       m_allow_removal(true)
+       m_inventory(new Inventory(gamedef->idef()))
 {
 }
 
@@ -55,10 +52,6 @@ void NodeMetadata::serialize(std::ostream &os) const
        }
 
        m_inventory->serialize(os);
-       os<<serializeString(m_inventorydrawspec);
-       os<<serializeString(m_formspec);
-       os<<serializeString(m_infotext);
-       writeU8(os, m_allow_removal);
 }
 
 void NodeMetadata::deSerialize(std::istream &is)
@@ -72,20 +65,12 @@ void NodeMetadata::deSerialize(std::istream &is)
        }
 
        m_inventory->deSerialize(is);
-       m_inventorydrawspec = deSerializeString(is);
-       m_formspec = deSerializeString(is);
-       m_infotext = deSerializeString(is);
-       m_allow_removal = readU8(is);
 }
 
 void NodeMetadata::clear()
 {
        m_stringvars.clear();
        m_inventory->clear();
-       m_inventorydrawspec = "";
-       m_formspec = "";
-       m_infotext = "";
-       m_allow_removal = true;
 }
 
 /*
@@ -98,7 +83,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;
        }
@@ -124,10 +109,10 @@ void NodeMetadataList::serialize(std::ostream &os) const
 
 void NodeMetadataList::deSerialize(std::istream &is, IGameDef *gamedef)
 {
-       m_data.clear();
+       clear();
 
        u8 version = readU8(is);
-       
+
        if(version == 0){
                // Nothing
                return;
@@ -145,12 +130,12 @@ void NodeMetadataList::deSerialize(std::istream &is, IGameDef *gamedef)
        {
                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())
                {
@@ -206,3 +191,34 @@ void NodeMetadataList::clear()
        }
        m_data.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()) {
+               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;
+}
+