3 files changed, 17 insertions, 28 deletions

diff --git a/src/Entities/Pickup.cpp b/src/Entities/Pickup.cpp
index 001e386a7..55c878b57 100644
--- a/src/Entities/Pickup.cpp
+++ b/src/Entities/Pickup.cpp
@@ -6,30 +6,24 @@
 #endif
 
 #include "Pickup.h"
+#include "Player.h"
 #include "../ClientHandle.h"
-#include "../Inventory.h"
 #include "../World.h"
-#include "../Simulator/FluidSimulator.h"
 #include "../Server.h"
-#include "Player.h"
 #include "../Bindings/PluginManager.h"
-#include "../Item.h"
 #include "../Root.h"
 #include "../Chunk.h"
 
-#include "../Vector3d.h"
-#include "../Vector3f.h"
-
 
 
 
 
 cPickup::cPickup(double a_PosX, double a_PosY, double a_PosZ, const cItem & a_Item, bool IsPlayerCreated, float a_SpeedX /* = 0.f */, float a_SpeedY /* = 0.f */, float a_SpeedZ /* = 0.f */)
 	:	cEntity(etPickup, a_PosX, a_PosY, a_PosZ, 0.2, 0.2)
-	, m_Timer( 0.f )
+	, m_Timer(0.f)
 	, m_Item(a_Item)
-	, m_bCollected( false )
-	, m_bIsPlayerCreated( IsPlayerCreated )
+	, m_bCollected(false)
+	, m_bIsPlayerCreated(IsPlayerCreated)
 {
 	SetGravity(-10.5f);
 	SetMaxHealth(5);
diff --git a/src/Mobs/Monster.cpp b/src/Mobs/Monster.cpp
index bd7894bf9..3b453552b 100644
--- a/src/Mobs/Monster.cpp
+++ b/src/Mobs/Monster.cpp
@@ -74,13 +74,12 @@ cMonster::cMonster(const AString & a_ConfigName, eType a_MobType, const AString
 	, m_AttackRate(3)
 	, m_IdleInterval(0)
 	, m_bMovingToDestination(false)
-	, m_DestinationTime( 0 )
-	, m_DestroyTimer( 0 )
+	, m_DestroyTimer(0)
 	, m_MobType(a_MobType)
 	, m_SoundHurt(a_SoundHurt)
 	, m_SoundDeath(a_SoundDeath)
-	, m_AttackDamage(1.0f)
-	, m_AttackRange(2.0f)
+	, m_AttackDamage(1)
+	, m_AttackRange(2)
 	, m_AttackInterval(0)
 	, m_BurnsInDaylight(false)
 {
@@ -492,7 +491,7 @@ void cMonster::KilledBy(cEntity * a_Killer)
 void cMonster::CheckEventSeePlayer(void)
 {
 	// TODO: Rewrite this to use cWorld's DoWithPlayers()
-	cPlayer * Closest = m_World->FindClosestPlayer(GetPosition(), m_SightDistance);
+	cPlayer * Closest = m_World->FindClosestPlayer(GetPosition(), (float)m_SightDistance);
 
 	if (Closest != NULL)
 	{
diff --git a/src/Mobs/Monster.h b/src/Mobs/Monster.h
index 5f32650cf..c8129e63d 100644
--- a/src/Mobs/Monster.h
+++ b/src/Mobs/Monster.h
@@ -168,6 +168,11 @@ protected:
 		If current Y is nonsolid, goes down to try to find a solid block, then returns that + 1
 		If current Y is solid, goes up to find first nonsolid block, and returns that */
 	int FindFirstNonAirBlockPosition(double a_PosX, double a_PosZ);
+	/** Returns if a monster can actually reach a given height by jumping */
+	inline bool IsNextYPosReachable(int a_PosY)
+	{
+		return (a_PosY > (int)floor(GetPosY())) && (a_PosY == (int)floor(GetPosY()) + 1);
+	}
 
 	/** A semi-temporary list to store the traversed coordinates during active pathfinding so we don't visit them again */
 	std::vector<Vector3i> m_TraversedCoordinates;
@@ -188,14 +193,9 @@ protected:
 
 	/* ===========================*/
 
-	float m_AttackRate;
-	float m_IdleInterval;
-
 	
-	bool m_bPassiveAggressive;
-
-	float m_DestinationTime;
 
+	float m_IdleInterval;
 	float m_DestroyTimer;
 
 	eType m_MobType;
@@ -203,20 +203,16 @@ protected:
 	AString m_SoundHurt;
 	AString m_SoundDeath;
 
+	float m_AttackRate;	
 	int m_AttackDamage;
 	int m_AttackRange;
 	float m_AttackInterval;
 	int m_SightDistance;
 	
+	void HandleDaylightBurning(cChunk & a_Chunk);
 	bool m_BurnsInDaylight;
 
-	void AddRandomDropItem(cItems & a_Drops, unsigned int a_Min, unsigned int a_Max, short a_Item, short a_ItemHealth = 0);
-	
-	void HandleDaylightBurning(cChunk & a_Chunk);
-	inline bool IsNextYPosReachable(int a_PosY)
-	{
-		return (a_PosY > (int)floor(GetPosY())) && (a_PosY == (int)floor(GetPosY()) + 1);
-	}
+	void AddRandomDropItem(cItems & a_Drops, unsigned int a_Min, unsigned int a_Max, short a_Item, short a_ItemHealth = 0);	
 
 } ; // tolua_export