Little optimization on getAdded/Removed activeobjects per player loop.

[minetest.git] / src / nodemetadata.h

diff --git a/src/nodemetadata.h b/src/nodemetadata.h
index 1602ef937ebaa3bd92efe042377ba6b3ca10c0bb..8e84e5af30a15cf9bed380de3b0a3969ab5e9b36 100644 (file)
--- a/src/nodemetadata.h
+++ b/src/nodemetadata.h
@@ -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
@@ -20,10 +20,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef NODEMETADATA_HEADER
 #define NODEMETADATA_HEADER
 
-#include "irrlichttypes_bloated.h"
-#include <string>
+#include "irr_v3d.h"
 #include <iostream>
-#include <map>
+#include <vector>
+#include "util/string.h"
 
 /*
        NodeMetadata stores arbitary amounts of data for special blocks.
@@ -42,48 +42,30 @@ class NodeMetadata
 public:
        NodeMetadata(IGameDef *gamedef);
        ~NodeMetadata();
-       
+
        void serialize(std::ostream &os) const;
        void deSerialize(std::istream &is);
-       
+
        void clear();
 
        // Generic key/value store
-       std::string getString(const std::string &name) const
-       {
-               std::map<std::string, std::string>::const_iterator i;
-               i = m_stringvars.find(name);
-               if(i == m_stringvars.end())
-                       return "";
-               return resolveString(i->second);
-       }
-       void setString(const std::string &name, const std::string &var)
-       {
-               if(var.empty())
-                       m_stringvars.erase(name);
-               else
-                       m_stringvars[name] = var;
-       }
-       // support variable names in values
-       std::string resolveString(const std::string &str) const
-       {
-               if(str.substr(0,2) == "${" && str[str.length()-1] == '}')
-                       return resolveString(getString(str.substr(2,str.length()-3)));
-               return str;
-       }
-       std::map<std::string, std::string> getStrings() const
+       std::string getString(const std::string &name, unsigned short recursion = 0) const;
+       void setString(const std::string &name, const std::string &var);
+       // Support variable names in values
+       std::string resolveString(const std::string &str, unsigned short recursion = 0) const;
+       StringMap getStrings() const
        {
                return m_stringvars;
        }
 
        // The inventory
-       Inventory* getInventory()
+       Inventory *getInventory()
        {
                return m_inventory;
        }
 
 private:
-       std::map<std::string, std::string> m_stringvars;
+       StringMap m_stringvars;
        Inventory *m_inventory;
 };
 
@@ -99,18 +81,20 @@ class NodeMetadataList
 
        void serialize(std::ostream &os) const;
        void deSerialize(std::istream &is, IGameDef *gamedef);
-       
+
+       // Add all keys in this list to the vector keys
+       std::vector<v3s16> getAllKeys();
        // Get pointer to data
-       NodeMetadata* get(v3s16 p);
+       NodeMetadata *get(v3s16 p);
        // Deletes data
        void remove(v3s16 p);
        // Deletes old data and sets a new one
        void set(v3s16 p, NodeMetadata *d);
        // Deletes all
        void clear();
-       
+
 private:
-       std::map<v3s16, NodeMetadata*> m_data;
+       std::map<v3s16, NodeMetadata *> m_data;
 };
 
 #endif