1 files changed, 28 insertions, 35 deletions

diff --git a/src/Mobs/Monster.h b/src/Mobs/Monster.h
index 0fa620b3a..96c2a6bdd 100644
--- a/src/Mobs/Monster.h
+++ b/src/Mobs/Monster.h
@@ -25,9 +25,6 @@ class cMonster :
 	typedef cPawn super;
 public:
 
-	//Depreciated
-	typedef eMonsterType eType;
-
 	enum eFamily
 	{
 		mfHostile  = 0,  // Spider, Zombies ...
@@ -38,12 +35,12 @@ public:
 		mfNoSpawn,
 		mfUnhandled,  // Nothing. Be sure this is the last and the others are in order
 	} ;
-	
+
 	// tolua_end
-	
+
 	enum MState{ATTACKING, IDLE, CHASING, ESCAPING} m_EMState;
 	enum MPersonality{PASSIVE, AGGRESSIVE, COWARDLY} m_EMPersonality;
-	
+
 	/** Creates the mob object.
 	If a_ConfigName is not empty, the configuration is loaded using GetMonsterConfig()
 	a_MobType is the type of the mob (also used in the protocol ( http://wiki.vg/Entities#Mobs 2012_12_22))
@@ -52,47 +49,47 @@ public:
 	cMonster(const AString & a_ConfigName, eMonsterType a_MobType, const AString & a_SoundHurt, const AString & a_SoundDeath, double a_Width, double a_Height);
 
 	CLASS_PROTODEF(cMonster)
-	
+
 	virtual void SpawnOn(cClientHandle & a_ClientHandle) override;
 
 	virtual void Tick(float a_Dt, cChunk & a_Chunk) override;
 
 	virtual bool DoTakeDamage(TakeDamageInfo & a_TDI) override;
-	
+
 	virtual void KilledBy(TakeDamageInfo & a_TDI) override;
 
 	virtual void OnRightClicked(cPlayer & a_Player) override;
 
 	virtual void MoveToPosition(const Vector3d & a_Position);  // tolua_export
 	virtual bool ReachedDestination(void);
-	
+
 	// tolua_begin
 	eMonsterType GetMobType(void) const { return m_MobType; }
 	eFamily GetMobFamily(void) const;
 	// tolua_end
-	
+
 	virtual void CheckEventSeePlayer(void);
 	virtual void EventSeePlayer(cEntity * a_Player);
-	
+
 	/// Reads the monster configuration for the specified monster name and assigns it to this object.
 	void GetMonsterConfig(const AString & a_Name);
-	
+
 	/** Returns whether this mob is undead (skeleton, zombie, etc.) */
 	virtual bool IsUndead(void);
-	
+
 	virtual void EventLosePlayer(void);
 	virtual void CheckEventLostPlayer(void);
-	
+
 	virtual void InStateIdle    (float a_Dt);
 	virtual void InStateChasing (float a_Dt);
 	virtual void InStateEscaping(float a_Dt);
-	
-	int GetAttackRate() { return (int)m_AttackRate; }
+
+	int GetAttackRate() { return static_cast<int>(m_AttackRate); }
 	void SetAttackRate(float a_AttackRate) { m_AttackRate = a_AttackRate; }
 	void SetAttackRange(int a_AttackRange) { m_AttackRange = a_AttackRange; }
 	void SetAttackDamage(int a_AttackDamage) { m_AttackDamage = a_AttackDamage; }
 	void SetSightDistance(int a_SightDistance) { m_SightDistance = a_SightDistance; }
-	
+
 	float GetDropChanceWeapon() { return m_DropChanceWeapon; }
 	float GetDropChanceHelmet() { return m_DropChanceHelmet; }
 	float GetDropChanceChestplate() { return m_DropChanceChestplate; }
@@ -105,7 +102,7 @@ public:
 	void SetDropChanceLeggings(float a_DropChanceLeggings) { m_DropChanceLeggings = a_DropChanceLeggings; }
 	void SetDropChanceBoots(float a_DropChanceBoots) { m_DropChanceBoots = a_DropChanceBoots; }
 	void SetCanPickUpLoot(bool a_CanPickUpLoot) { m_CanPickUpLoot = a_CanPickUpLoot; }
-	
+
 	/// Sets whether the mob burns in daylight. Only evaluated at next burn-decision tick
 	void SetBurnsInDaylight(bool a_BurnsInDaylight) { m_BurnsInDaylight = a_BurnsInDaylight; }
 
@@ -116,7 +113,7 @@ public:
 	virtual bool IsBaby    (void) const { return false; }
 	virtual bool IsTame    (void) const { return false; }
 	virtual bool IsSitting (void) const { return false; }
-	
+
 	// tolua_begin
 
 	/** Returns true if the monster has a custom name. */
@@ -138,10 +135,10 @@ public:
 
 	/// Translates MobType enum to a string, empty string if unknown
 	static AString MobTypeToString(eMonsterType a_MobType);
-	
+
 	/// Translates MobType string to the enum, mtInvalidType if not recognized
 	static eMonsterType StringToMobType(const AString & a_MobTypeName);
-	
+
 	/// Returns the mob family based on the type
 	static eFamily FamilyFromType(eMonsterType a_MobType);
 
@@ -149,7 +146,7 @@ public:
 	static int GetSpawnDelay(cMonster::eFamily a_MobFamily);
 
 	// tolua_end
-	
+
 	/** Creates a new object of the specified mob.
 	a_MobType is the type of the mob to be created
 	Asserts and returns null if mob type is not specified
@@ -157,7 +154,7 @@ public:
 	static cMonster * NewMonsterFromType(eMonsterType a_MobType);
 
 protected:
-	
+
 	/* ======= PATHFINDING ======= */
 
 	/** A pointer to the entity this mobile is aiming to reach */
@@ -171,7 +168,7 @@ protected:
 
 	/** Stores if mobile is currently moving towards the ultimate, final destination */
 	bool m_bMovingToDestination;
-	
+
 	/** Finds the first non-air block position (not the highest, as cWorld::GetHeight does)
 		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 */
@@ -230,14 +227,14 @@ protected:
 	int m_AttackRange;
 	float m_AttackInterval;
 	int m_SightDistance;
-	
+
 	float m_DropChanceWeapon;
 	float m_DropChanceHelmet;
 	float m_DropChanceChestplate;
 	float m_DropChanceLeggings;
 	float m_DropChanceBoots;
 	bool m_CanPickUpLoot;
-	
+
 	void HandleDaylightBurning(cChunk & a_Chunk);
 	bool m_BurnsInDaylight;
 
@@ -245,22 +242,18 @@ protected:
 
 	/** Adds a random number of a_Item between a_Min and a_Max to itemdrops a_Drops*/
 	void AddRandomDropItem(cItems & a_Drops, unsigned int a_Min, unsigned int a_Max, short a_Item, short a_ItemHealth = 0);
-	
+
 	/** Adds a item a_Item with the chance of a_Chance (in percent) to itemdrops a_Drops*/
 	void AddRandomUncommonDropItem(cItems & a_Drops, float a_Chance, short a_Item, short a_ItemHealth = 0);
-	
+
 	/** Adds one rare item out of the list of rare items a_Items modified by the looting level a_LootingLevel(I-III or custom) to the itemdrop a_Drops*/
 	void AddRandomRareDropItem(cItems & a_Drops, cItems & a_Items, short a_LootingLevel);
-	
+
 	/** Adds armor that is equipped with the chance saved in m_DropChance[...] (this will be greter than 1 if piccked up or 0.085 + (0.01 per LootingLevel) if born with) to the drop*/
 	void AddRandomArmorDropItem(cItems & a_Drops, short a_LootingLevel);
-	
+
 	/** Adds weapon that is equipped with the chance saved in m_DropChance[...] (this will be greter than 1 if piccked up or 0.085 + (0.01 per LootingLevel) if born with) to the drop*/
 	void AddRandomWeaponDropItem(cItems & a_Drops, short a_LootingLevel);
-	
-
-} ;  // tolua_export
-
-
 
 
+} ;  // tolua_export