Add more error checking to l_register_ore

[dragonfireclient.git] / src / nodemetadata.h

diff --git a/src/nodemetadata.h b/src/nodemetadata.h
index 7fe5e2f504ee0c8c9cf4ce6212d106302e60f4df..5af10d0f0ef8133a9fad5d177c1026fcdb6060cf 100644 (file)
--- a/src/nodemetadata.h
+++ b/src/nodemetadata.h
@@ -1,18 +1,18 @@
 /*
-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.
 */
@@ -20,7 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef NODEMETADATA_HEADER
 #define NODEMETADATA_HEADER
 
-#include "irrlichttypes.h"
+#include "irrlichttypes_bloated.h"
 #include <string>
 #include <iostream>
 #include <map>
@@ -55,7 +55,7 @@ class NodeMetadata
                i = m_stringvars.find(name);
                if(i == m_stringvars.end())
                        return "";
-               return i->second;
+               return resolveString(i->second);
        }
        void setString(const std::string &name, const std::string &var)
        {
@@ -64,62 +64,27 @@ class NodeMetadata
                else
                        m_stringvars[name] = var;
        }
-
-       // The inventory
-       Inventory* getInventory()
-       {
-               return m_inventory;
-       }
-       
-       // If non-empty, player can interact by using an inventory view
-       // See format in guiInventoryMenu.cpp.
-       std::string getInventoryDrawSpec() const
-       {
-               return m_inventorydrawspec;
-       }
-       void setInventoryDrawSpec(const std::string &text)
-       {
-               m_inventorydrawspec = text;
-       }
-       
-       // If non-empty, player can interact by using an form view
-       // See format in guiFormMenu.cpp.
-       std::string getFormSpec() const
+       // support variable names in values
+       std::string resolveString(const std::string &str) const
        {
-               return m_formspec;
+               if(str.substr(0,2) == "${" && str[str.length()-1] == '}')
+                       return resolveString(getString(str.substr(2,str.length()-3)));
+               return str;
        }
-       void setFormSpec(const std::string &text)
+       std::map<std::string, std::string> getStrings() const
        {
-               m_formspec = text;
+               return m_stringvars;
        }
-       
-       // Called on client-side; shown on screen when pointed at
-       std::string getInfoText() const
-       {
-               return m_infotext;
-       }
-       void setInfoText(const std::string &text)
-       {
-               m_infotext = text;
-       }
-       
-       // Whether the related node and this metadata can be removed
-       bool getAllowRemoval() const
-       {
-               return m_allow_removal;
-       }
-       void setAllowRemoval(bool b)
+
+       // The inventory
+       Inventory* getInventory()
        {
-               m_allow_removal = b;
+               return m_inventory;
        }
 
 private:
        std::map<std::string, std::string> m_stringvars;
        Inventory *m_inventory;
-       std::string m_inventorydrawspec;
-       std::string m_formspec;
-       std::string m_infotext;
-       bool m_allow_removal;
 };