shader.cpp: don't test twice if shader programs are present

[dragonfireclient.git] / src / nodemetadata.h

diff --git a/src/nodemetadata.h b/src/nodemetadata.h
index 7fe5e2f504ee0c8c9cf4ce6212d106302e60f4df..8d1298212d9e702eab99f1c6c457b5179273aea8 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,10 +20,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef NODEMETADATA_HEADER
 #define NODEMETADATA_HEADER
 
-#include "irrlichttypes.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.
@@ -35,91 +35,38 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 */
 
 class Inventory;
-class IGameDef;
+class IItemDefManager;
 
 class NodeMetadata
 {
 public:
-       NodeMetadata(IGameDef *gamedef);
+       NodeMetadata(IItemDefManager *item_def_mgr);
        ~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 i->second;
-       }
-       void setString(const std::string &name, const std::string &var)
+       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
        {
-               if(var.empty())
-                       m_stringvars.erase(name);
-               else
-                       m_stringvars[name] = var;
+               return m_stringvars;
        }
 
        // The inventory
-       Inventory* getInventory()
+       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
-       {
-               return m_formspec;
-       }
-       void setFormSpec(const std::string &text)
-       {
-               m_formspec = text;
-       }
-       
-       // 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)
-       {
-               m_allow_removal = b;
-       }
 
 private:
-       std::map<std::string, std::string> m_stringvars;
+       StringMap m_stringvars;
        Inventory *m_inventory;
-       std::string m_inventorydrawspec;
-       std::string m_formspec;
-       std::string m_infotext;
-       bool m_allow_removal;
 };
 
 
@@ -133,19 +80,21 @@ class NodeMetadataList
        ~NodeMetadataList();
 
        void serialize(std::ostream &os) const;
-       void deSerialize(std::istream &is, IGameDef *gamedef);
-       
+       void deSerialize(std::istream &is, IItemDefManager *item_def_mgr);
+
+       // 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