Tooltips: Unify the tooltip[] and list[] description tooltip display functions (...

[oweals/minetest.git] / src / mapnode.h

diff --git a/src/mapnode.h b/src/mapnode.h
index a3c20e8ffea300bb9ec18e96e85e75bb99fb4f7e..9c56a7e170c9b4b73d8b5217041356e27ee328d1 100644 (file)
--- a/src/mapnode.h
+++ b/src/mapnode.h
@@ -20,9 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef MAPNODE_HEADER
 #define MAPNODE_HEADER
 
-#include "irrlichttypes.h"
-#include "irr_v3d.h"
-#include "irr_aabb3d.h"
+#include "irrlichttypes_bloated.h"
 #include "light.h"
 #include <string>
 #include <vector>
@@ -143,11 +141,6 @@ struct MapNode
        MapNode()
        { }
 
-       MapNode(const MapNode & n)
-       {
-               *this = n;
-       }
-
        MapNode(content_t content, u8 a_param1=0, u8 a_param2=0)
                : param0(content),
                  param1(a_param1),
@@ -192,6 +185,14 @@ struct MapNode
                param2 = p;
        }
 
+       /*!
+        * Returns the color of the node.
+        *
+        * \param f content features of this node
+        * \param color output, contains the node's color.
+        */
+       void getColor(const ContentFeatures &f, video::SColor *color) const;
+
        void setLight(enum LightBank bank, u8 a_light, const ContentFeatures &f);
 
        void setLight(enum LightBank bank, u8 a_light, INodeDefManager *nodemgr);