1 files changed, 40 insertions, 33 deletions

diff --git a/source/World.h b/source/World.h
index 359fbe68e..a91007b17 100644
--- a/source/World.h
+++ b/source/World.h
@@ -91,20 +91,13 @@ public:
 	} ;

 	

 

-	// tolua_begin

-

-	static const char * GetClassStatic(void)

+	static const char * GetClassStatic(void)  // Needed for ManualBindings's ForEach templates

 	{

 		return "cWorld";

 	}

 	

-	/// Return time in seconds

-	inline static float GetTime(void)

-	{

-		LOGWARNING("cWorld:GetTime() is obsolete, use GetWorldAge() or GetTimeOfDay() for a specific world instead.");

-		return 0;

-	}

-	

+	// tolua_begin

+

 	int GetTicksUntilWeatherChange(void) const { return m_WeatherInterval; }

 	Int64 GetWorldAge(void)  const { return m_WorldAge; }

 	Int64 GetTimeOfDay(void) const { return m_TimeOfDay; }

@@ -121,12 +114,6 @@ public:
 		BroadcastTimeUpdate();

 	}

 	

-	void SetWorldTime(Int64 a_TimeOfDay)

-	{

-		LOGWARNING("cWorld:SetWorldTime() is obsolete, use SetTimeOfDay() instead");

-		SetTimeOfDay(a_TimeOfDay);

-	}

-	

 	/// Returns the current game mode. Partly OBSOLETE, you should use IsGameModeXXX() functions wherever applicable

 	eGameMode GetGameMode(void) const { return m_GameMode; }

 

@@ -335,10 +322,15 @@ public:
 	void       SetBlockMeta      (int a_BlockX, int a_BlockY, int a_BlockZ, NIBBLETYPE a_MetaData);

 	NIBBLETYPE GetBlockSkyLight  (int a_BlockX, int a_BlockY, int a_BlockZ);

 	NIBBLETYPE GetBlockBlockLight(int a_BlockX, int a_BlockY, int a_BlockZ);

-	bool       GetBlockTypeMeta  (int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta);

-	bool       GetBlockInfo      (int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE & a_BlockType, NIBBLETYPE & a_Meta, NIBBLETYPE & a_SkyLight, NIBBLETYPE & a_BlockLight);

+	

+	// tolua_end

+	

+	bool GetBlockTypeMeta  (int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta);  // TODO: Exported in ManualBindings.cpp

+	bool GetBlockInfo      (int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE & a_BlockType, NIBBLETYPE & a_Meta, NIBBLETYPE & a_SkyLight, NIBBLETYPE & a_BlockLight);  // TODO: Exported in ManualBindings.cpp

 	// TODO: NIBBLETYPE GetBlockActualLight(int a_BlockX, int a_BlockY, int a_BlockZ);

 

+	// tolua_begin

+	

 	// Vector3i variants:

 	void       FastSetBlock(const Vector3i & a_Pos, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta ) { FastSetBlock( a_Pos.x, a_Pos.y, a_Pos.z, a_BlockType, a_BlockMeta ); }

 	BLOCKTYPE  GetBlock    (const Vector3i & a_Pos ) { return GetBlock( a_Pos.x, a_Pos.y, a_Pos.z ); }

@@ -439,21 +431,26 @@ public:
 	bool DoWithFurnaceAt(int a_BlockX, int a_BlockY, int a_BlockZ, cFurnaceCallback & a_Callback);  // Exported in ManualBindings.cpp

 	

 	/// Retrieves the test on the sign at the specified coords; returns false if there's no sign at those coords, true if found

-	bool GetSignLines (int a_BlockX, int a_BlockY, int a_BlockZ, AString & a_Line1, AString & a_Line2, AString & a_Line3, AString & a_Line4);  // tolua_export

+	bool GetSignLines (int a_BlockX, int a_BlockY, int a_BlockZ, AString & a_Line1, AString & a_Line2, AString & a_Line3, AString & a_Line4);  // Exported in ManualBindings.cpp

 	

 	/// a_Player is using block entity at [x, y, z], handle that:

-	void UseBlockEntity(cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ) {m_ChunkMap->UseBlockEntity(a_Player, a_BlockX, a_BlockY, a_BlockZ); }

+	void UseBlockEntity(cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ) {m_ChunkMap->UseBlockEntity(a_Player, a_BlockX, a_BlockY, a_BlockZ); }  // tolua_export

 	

 	/// 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);

@@ -462,7 +459,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);

@@ -506,13 +503,13 @@ public:
 	}

 

 	/// Saves all chunks immediately. Dangerous interface, may deadlock, use QueueSaveAllChunks() instead

-	void SaveAllChunks(void);  // tolua_export

+	void SaveAllChunks(void);

 	

 	/// Queues a task to save all chunks onto the tick thread. The prefferred way of saving chunks from external sources

 	void QueueSaveAllChunks(void);  // tolua_export

 	

 	/// Queues a task onto the tick thread. The task object will be deleted once the task is finished

-	void QueueTask(cTask * a_Task);

+	void QueueTask(cTask * a_Task);  // Exported in ManualBindings.cpp

 

 	/// Returns the number of chunks loaded	

 	int GetNumChunks() const;  // tolua_export

@@ -534,17 +531,19 @@ public:
 	/// Stops threads that belong to this world (part of deinit)

 	void Stop(void);

 	

-	void TickQueuedBlocks(float a_Dt);

+	/// Processes the blocks queued for ticking with a delay (m_BlockTickQueue[])

+	void TickQueuedBlocks(void);

 

 	struct BlockTickQueueItem

 	{

 		int X;

 		int Y;

 		int Z;

-		float ToWait;

+		int TicksToWait;

 	};

 

-	void QueueBlockForTick(int a_BlockX, int a_BlockY, int a_BlockZ, float a_TimeToWait);  // tolua_export

+	/// Queues the block to be ticked after the specified number of game ticks

+	void QueueBlockForTick(int a_BlockX, int a_BlockY, int a_BlockZ, int a_TicksToWait);  // tolua_export

 

 	// tolua_begin

 	/// Casts a thunderbolt at the specified coords

@@ -556,8 +555,16 @@ public:
 	/// Forces a weather change in the next game tick

 	void ChangeWeather  (void);

 	

-	/// Returns the current weather

+	/// Returns the current weather. Instead of comparing values directly to the weather constants, use IsWeatherXXX() functions, if possible

 	eWeather GetWeather     (void) const { return m_Weather; };

+	

+	bool IsWeatherSunny(void) const { return (m_Weather == wSunny); }

+	bool IsWeatherRain (void) const { return (m_Weather == wRain); }

+	bool IsWeatherStorm(void) const { return (m_Weather == wStorm); }

+	

+	/// Returns true if the current weather has any precipitation - rain or storm

+	bool IsWeatherWet  (void) const { return (m_Weather != wSunny); }

+	

 	// tolua_end

 

 	cChunkGenerator & GetGenerator(void) { return m_Generator; }

@@ -584,7 +591,7 @@ public:
 	

 	/// Appends all usernames starting with a_Text (case-insensitive) into Results

 	void TabCompleteUserName(const AString & a_Text, AStringVector & a_Results);

-	

+

 private:

 

 	friend class cRoot;

@@ -638,7 +645,7 @@ private:
 	std::vector<int> m_RSList;

 	

 	std::vector<BlockTickQueueItem *> m_BlockTickQueue;

-	std::vector<BlockTickQueueItem *> m_BlockTickQueueCopy;	//Second is for safely removing the objects from the queue

+	std::vector<BlockTickQueueItem *> m_BlockTickQueueCopy;	 // Second is for safely removing the objects from the queue

 

 	cSimulatorManager *  m_SimulatorManager;

 	cSandSimulator *     m_SandSimulator;