X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fcontent_mapnode.h;h=003b7edd7e32e61551fb5fa8088f548e1b590fb3;hb=54917e306256d4d39b95335986fce93b8c56a6e3;hp=02c604c60d3279971a6dbdafe14275b553d00e40;hpb=2587bb361cfc96b3a695d1476e39b9c0ecaa6553;p=minetest.git

diff --git a/src/content_mapnode.h b/src/content_mapnode.h
index 02c604c60..003b7edd7 100644
--- a/src/content_mapnode.h
+++ b/src/content_mapnode.h
@@ -22,53 +22,24 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "mapnode.h"
 
-void content_mapnode_init();
-
-MapNode mapnode_translate_from_internal(MapNode n_from, u8 version);
-MapNode mapnode_translate_to_internal(MapNode n_from, u8 version);
-
 /*
-	Node content type IDs
-	Ranges:
+	Legacy node definitions
 */
 
-// 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.
-#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_FENCE 21
-#define CONTENT_RAIL 30
+// 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);
 
-// 0x800...0xfff (2048...4095): higher 4 bytes of param2 are not usable
-#define CONTENT_GRASS 0x800 //1
-#define CONTENT_TREE 0x801 //4
-#define CONTENT_LEAVES 0x802 //5
-#define CONTENT_GRASS_FOOTSTEPS 0x803 //6
-#define CONTENT_MESE 0x804 //7
-#define CONTENT_MUD 0x805 //8
-// Pretty much useless, clouds won't be drawn this way
-#define CONTENT_CLOUD 0x806 //10
-#define CONTENT_COALSTONE 0x807 //11
-#define CONTENT_WOOD 0x808 //12
-#define CONTENT_SAND 0x809 //13
-#define CONTENT_COBBLE 0x80a //18
-#define CONTENT_STEEL 0x80b //19
-#define CONTENT_GLASS 0x80c //20
-#define CONTENT_MOSSYCOBBLE 0x80d //22
-#define CONTENT_GRAVEL 0x80e //23
-#define CONTENT_SANDSTONE 0x80f //24
-#define CONTENT_CACTUS 0x810 //25
-#define CONTENT_BRICK 0x811 //26
-#define CONTENT_CLAY 0x812 //27
-#define CONTENT_PAPYRUS 0x813 //28
-#define CONTENT_BOOKSHELF 0x814 //29
+// Get legacy node name mapping for loading old blocks
+class NameIdMapping;
+void content_mapnode_get_name_id_mapping(NameIdMapping *nimap);
 
+// Convert "CONTENT_STONE"-style names to dynamic ids
+std::string content_mapnode_get_new_name(const std::string &oldname);
+class INodeDefManager;
+content_t legacy_get_id(const std::string &oldname, INodeDefManager *ndef);
+#define LEGN(ndef, oldname) legacy_get_id(oldname, ndef)
 
 #endif