2 files changed, 12 insertions, 7 deletions

diff --git a/source/World.cpp b/source/World.cpp
index 882cf90d2..c36c614b1 100644
--- a/source/World.cpp
+++ b/source/World.cpp
@@ -1093,7 +1093,7 @@ void cWorld::GrowTree(int a_X, int a_Y, int a_Z)
 
 
 
-void cWorld::GrowTreeFromSapling(int a_X, int a_Y, int a_Z, char a_SaplingMeta)
+void cWorld::GrowTreeFromSapling(int a_X, int a_Y, int a_Z, NIBBLETYPE a_SaplingMeta)
 {
 	cNoise Noise(m_Generator.GetSeed());
 	sSetBlockVector Logs, Other;
@@ -1345,7 +1345,7 @@ void cWorld::GrowCactus(int a_BlockX, int a_BlockY, int a_BlockZ, int a_NumBlock
 
 
 
-void cWorld::GrowMelonPumpkin(int a_BlockX, int a_BlockY, int a_BlockZ, char a_BlockType)
+void cWorld::GrowMelonPumpkin(int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE a_BlockType)
 {
 	MTRand Rand;
 	m_ChunkMap->GrowMelonPumpkin(a_BlockX, a_BlockY, a_BlockZ, a_BlockType, Rand);
diff --git a/source/World.h b/source/World.h
index eacc772b7..dac30e6aa 100644
--- a/source/World.h
+++ b/source/World.h
@@ -438,13 +438,18 @@ public:
 	/// Calls the callback for the chunk specified, with ChunkMapCS locked; returns false if the chunk doesn't exist, otherwise returns the same value as the callback

 	bool DoWithChunk(int a_ChunkX, int a_ChunkZ, cChunkCallback & a_Callback);

 

-	void GrowTree           (int a_BlockX, int a_BlockY, int a_BlockZ);                           // tolua_export

-	void GrowTreeFromSapling(int a_BlockX, int a_BlockY, int a_BlockZ, char a_SaplingMeta);       // tolua_export

-	void GrowTreeByBiome    (int a_BlockX, int a_BlockY, int a_BlockZ);                           // tolua_export

-	

 	void GrowTreeImage(const sSetBlockVector & a_Blocks);

 	

 	// tolua_begin

+

+	/// Grows a tree at the specified coords, either from a sapling there, or based on the biome

+	void GrowTree           (int a_BlockX, int a_BlockY, int a_BlockZ);

+	

+	/// Grows a tree at the specified coords, based on the sapling meta provided

+	void GrowTreeFromSapling(int a_BlockX, int a_BlockY, int a_BlockZ, NIBBLETYPE a_SaplingMeta);

+	

+	/// Grows a tree at the specified coords, based on the biome in the place

+	void GrowTreeByBiome    (int a_BlockX, int a_BlockY, int a_BlockZ);

 	

 	/// Grows the plant at the specified block to its ripe stage (bonemeal used); returns false if the block is not growable. If a_IsBonemeal is true, block is not grown if not allowed in world.ini

 	bool GrowRipePlant(int a_BlockX, int a_BlockY, int a_BlockZ, bool a_IsByBonemeal = false);

@@ -453,7 +458,7 @@ public:
 	void GrowCactus(int a_BlockX, int a_BlockY, int a_BlockZ, int a_NumBlocksToGrow);

 

 	/// Grows a melon or a pumpkin next to the block specified (assumed to be the stem)

-	void GrowMelonPumpkin(int a_BlockX, int a_BlockY, int a_BlockZ, char a_BlockType);

+	void GrowMelonPumpkin(int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE a_BlockType);

 

 	/// Grows a sugarcane present at the block specified by the amount of blocks specified, up to the max height specified in the config

 	void GrowSugarcane(int a_BlockX, int a_BlockY, int a_BlockZ, int a_NumBlocksToGrow);