From df8346ef4d70ba7c717c4c7b9c783df876378ca8 Mon Sep 17 00:00:00 2001
From: Perttu Ahola <celeron55@gmail.com>
Date: Wed, 16 Nov 2011 14:08:31 +0200
Subject: Do not expose CONTENT_* stuff in content_mapnode.h and use a name
 converter wrapper in old code

---
 src/mapgen.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/mapgen.h')

diff --git a/src/mapgen.h b/src/mapgen.h
index 5caee2efa..55aede099 100644
--- a/src/mapgen.h
+++ b/src/mapgen.h
@@ -43,7 +43,8 @@ namespace mapgen
 	void add_random_objects(MapBlock *block);
 
 	// Add a tree
-	void make_tree(ManualMapVoxelManipulator &vmanip, v3s16 p0, bool is_apple_tree);
+	void make_tree(ManualMapVoxelManipulator &vmanip, v3s16 p0,
+			bool is_apple_tree, INodeDefManager *ndef);
 	
 	/*
 		These are used by FarMesh
@@ -59,7 +60,7 @@ namespace mapgen
 		u64 seed;
 		v3s16 blockpos;
 		UniqueQueue<v3s16> transforming_liquid;
-		INodeDefManager *nodemgr; // Destructor deletes
+		INodeDefManager *nodedef; // Destructor deletes
 
 		BlockMakeData();
 		~BlockMakeData();
-- 
cgit v1.2.3