Update inventory texture too

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

diff --git a/src/content_mapnode.h b/src/content_mapnode.h
index 8f44126cf6d94bc9073eb7e1ad4f04fdff15435f..ace30be7b89ec81103226a6ba38056604a7b0f47 100644 (file)
--- a/src/content_mapnode.h
+++ b/src/content_mapnode.h
@@ -21,11 +21,25 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define CONTENT_MAPNODE_HEADER
 
 #include "mapnode.h"
+class ITextureSource;
+class IWritableNodeDefManager;
 
-void content_mapnode_init();
+/*
+       Initialize default node definitions
 
-extern content_t trans_table_19[21][2];
+       This accesses tsrc; if it is non-NULL, textures are set
+       for the nodes.
+
+       Client first calls this with tsrc=NULL to run some
+       unit tests and stuff, then it runs this again with tsrc
+       defined to get the textures.
 
+       Server only calls this once with tsrc=NULL.
+*/
+void content_mapnode_init(ITextureSource *tsrc, IWritableNodeDefManager *nodemgr);
+
+// Backwards compatibility for non-extended content types in v19
+extern content_t trans_table_19[21][2];
 MapNode mapnode_translate_from_internal(MapNode n_from, u8 version);
 MapNode mapnode_translate_to_internal(MapNode n_from, u8 version);
 
@@ -37,16 +51,25 @@ MapNode mapnode_translate_to_internal(MapNode n_from, u8 version);
 // 0x000...0x07f (0...127): param2 is fully usable
 // 126 and 127 are reserved.
 // Use these sparingly, only when the extra space in param2 might be needed.
+// Add a space when there is unused space between numbers.
 #define CONTENT_STONE 0
+
 #define CONTENT_WATER 2
 #define CONTENT_TORCH 3
+
 #define CONTENT_WATERSOURCE 9
+
 #define CONTENT_SIGN_WALL 14
 #define CONTENT_CHEST 15
 #define CONTENT_FURNACE 16
+#define CONTENT_LOCKABLE_CHEST 17
+
 #define CONTENT_FENCE 21
+
 #define CONTENT_RAIL 30
 #define CONTENT_LADDER 31
+#define CONTENT_LAVA 32
+#define CONTENT_LAVASOURCE 33
 
 // 0x800...0xfff (2048...4095): higher 4 bytes of param2 are not usable
 #define CONTENT_GRASS 0x800 //1
@@ -75,7 +98,8 @@ MapNode mapnode_translate_to_internal(MapNode n_from, u8 version);
 #define CONTENT_JUNGLEGRASS 0x816
 #define CONTENT_NC 0x817
 #define CONTENT_NC_RB 0x818
-
+#define CONTENT_APPLE 0x819
+#define CONTENT_SAPLING 0x820
 
 #endif