1 files changed, 15 insertions, 6 deletions

diff --git a/source/World.h b/source/World.h
index 25bc0b338..c4fd06d0b 100644
--- a/source/World.h
+++ b/source/World.h
@@ -42,6 +42,7 @@ class cChunkGenerator;  // The thread responsible for generating chunks
 class cChestEntity;

 class cDispenserEntity;

 class cFurnaceEntity;

+class cMobCensus;

 

 typedef std::list< cPlayer * > cPlayerList;

 

@@ -347,10 +348,10 @@ public:
 	// tolua_begin

 

 	/// Spawns item pickups for each item in the list. May compress pickups if too many entities:

-	void SpawnItemPickups(const cItems & a_Pickups, double a_BlockX, double a_BlockY, double a_BlockZ, double a_FlyAwaySpeed = 1.0);

+	void SpawnItemPickups(const cItems & a_Pickups, double a_BlockX, double a_BlockY, double a_BlockZ, double a_FlyAwaySpeed = 1.0, bool IsPlayerCreated = false);

 	

 	/// Spawns item pickups for each item in the list. May compress pickups if too many entities. All pickups get the speed specified:

-	void SpawnItemPickups(const cItems & a_Pickups, double a_BlockX, double a_BlockY, double a_BlockZ, double a_SpeedX, double a_SpeedY, double a_SpeedZ);

+	void SpawnItemPickups(const cItems & a_Pickups, double a_BlockX, double a_BlockY, double a_BlockZ, double a_SpeedX, double a_SpeedY, double a_SpeedZ, bool IsPlayerCreated = false);

 	

 	/// Spawns a new primed TNT entity at the specified block coords and specified fuse duration. Initial velocity is given based on the relative coefficient provided

 	void SpawnPrimedTNT(double a_X, double a_Y, double a_Z, double a_FuseTimeInSec, double a_InitialVelocityCoeff = 1);

@@ -580,6 +581,7 @@ public:
 	

 	/// Spawns a mob of the specified type. Returns the mob's EntityID if recognized and spawned, <0 otherwise

 	int SpawnMob(double a_PosX, double a_PosY, double a_PosZ, cMonster::eType a_MonsterType);  // tolua_export

+	int SpawnMobFinalize(cMonster* a_Monster);

 	

 	/// Creates a projectile of the specified type. Returns the projectile's EntityID if successful, <0 otherwise

 	int CreateProjectile(double a_PosX, double a_PosY, double a_PosZ, cProjectileEntity::eKind a_Kind, cEntity * a_Creator, const Vector3d * a_Speed = NULL);  // tolua_export

@@ -590,6 +592,9 @@ public:
 	/// Appends all usernames starting with a_Text (case-insensitive) into Results

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

 

+	/// Get the current darkness level based on the time

+	NIBBLETYPE GetSkyDarkness() { return m_SkyDarkness; }

+

 private:

 

 	friend class cRoot;

@@ -632,7 +637,9 @@ private:
 	Int64  m_LastTimeUpdate;    // The tick in which the last time update has been sent.

 	Int64  m_LastUnload;        // The last WorldAge (in ticks) in which unloading was triggerred

 	Int64  m_LastSave;          // The last WorldAge (in ticks) in which save-all was triggerred

-	Int64  m_LastSpawnMonster;  // The last WorldAge (in ticks) in which a monster was spawned

+	std::map<cMonster::eFamily,Int64> m_LastSpawnMonster; // The last WorldAge (in ticks) in which a monster was spawned (for each megatype of monster) // MG TODO : find a way to optimize without creating unmaintenability (if mob IDs are becoming unrowed)

+

+	NIBBLETYPE m_SkyDarkness;

 

 	eGameMode m_GameMode;

 	bool m_bEnabledPVP;

@@ -662,7 +669,7 @@ private:
 	cChunkMap * m_ChunkMap;

 

 	bool m_bAnimals;

-	Int64 m_SpawnMonsterRate;

+	std::set<cMonster::eType> m_AllowedMobs;

 

 	eWeather m_Weather;

 	int m_WeatherInterval;

@@ -717,14 +724,16 @@ private:
 	/// Handles the weather in each tick

 	void TickWeather(float a_Dt);

 	

-	/// Handles the mob spawning each tick

-	void TickSpawnMobs(float a_Dt);

+	/// Handles the mob spawning/moving/destroying each tick

+	void TickMobs(float a_Dt);

 	

 	/// Executes all tasks queued onto the tick thread

 	void TickQueuedTasks(void);

 	

 	/// Ticks all clients that are in this world

 	void TickClients(float a_Dt);

+

+	void UpdateSkyDarkness();

 	

 	/// Creates a new fluid simulator, loads its settings from the inifile (a_FluidName section)

 	cFluidSimulator * InitializeFluidSimulator(cIniFile & a_IniFile, const char * a_FluidName, BLOCKTYPE a_SimulateBlock, BLOCKTYPE a_StationaryBlock);