From 2423fbf2efa39e28cc348acc11b9269e573dcdef Mon Sep 17 00:00:00 2001
From: madmaxoft <github@xoft.cz>
Date: Thu, 17 Jul 2014 22:15:34 +0200
Subject: Normalized comments.

This was mostly done automatically and then visually inspected for obvious errors.
All //-style comments should have a 2-space separation from the code, and 1 space after the comment sign.
---
 src/Mobs/Creeper.cpp  |  2 +-
 src/Mobs/Monster.cpp  | 24 ++++++++++++------------
 src/Mobs/Monster.h    | 14 +++++++-------
 src/Mobs/Sheep.cpp    |  4 ++--
 src/Mobs/Villager.cpp |  4 ++--
 src/Mobs/Villager.h   |  5 ++---
 src/Mobs/Wolf.cpp     |  8 ++++----
 7 files changed, 30 insertions(+), 31 deletions(-)

(limited to 'src/Mobs')

diff --git a/src/Mobs/Creeper.cpp b/src/Mobs/Creeper.cpp
index 8ab09a4c5..495f1dd25 100644
--- a/src/Mobs/Creeper.cpp
+++ b/src/Mobs/Creeper.cpp
@@ -43,7 +43,7 @@ void cCreeper::Tick(float a_Dt, cChunk & a_Chunk)
 		if (m_ExplodingTimer == 30)
 		{
 			m_World->DoExplosionAt((m_bIsCharged ? 5 : 3), GetPosX(), GetPosY(), GetPosZ(), false, esMonster, this);
-			Destroy(); // Just in case we aren't killed by the explosion
+			Destroy();  // Just in case we aren't killed by the explosion
 		}
 	}
 }
diff --git a/src/Mobs/Monster.cpp b/src/Mobs/Monster.cpp
index e36634c73..9e53284b3 100644
--- a/src/Mobs/Monster.cpp
+++ b/src/Mobs/Monster.cpp
@@ -62,7 +62,7 @@ static const struct
 
 
 
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////
 // cMonster:
 
 cMonster::cMonster(const AString & a_ConfigName, eType a_MobType, const AString & a_SoundHurt, const AString & a_SoundDeath, double a_Width, double a_Height)
@@ -120,7 +120,7 @@ void cMonster::TickPathFinding()
 	std::vector<Vector3d> m_PotentialCoordinates;
 	m_TraversedCoordinates.push_back(Vector3i(PosX, PosY, PosZ));
 
-	static const struct // Define which directions to try to move to
+	static const struct  // Define which directions to try to move to
 	{
 		int x, z;
 	} gCrossCoords[] =
@@ -301,12 +301,12 @@ void cMonster::Tick(float a_Dt, cChunk & a_Chunk)
 			if (DoesPosYRequireJump((int)floor(m_Destination.y)))
 			{
 				m_bOnGround = false;
-				AddSpeedY(5.2); // Jump!!
+				AddSpeedY(5.2);  // Jump!!
 			}
 		}
 
 		Vector3f Distance = m_Destination - GetPosition();
-		if(!ReachedDestination() && !ReachedFinalDestination()) // If we haven't reached any sort of destination, move
+		if(!ReachedDestination() && !ReachedFinalDestination())  // If we haven't reached any sort of destination, move
 		{
 			Distance.y = 0;
 			Distance.Normalize();
@@ -325,20 +325,20 @@ void cMonster::Tick(float a_Dt, cChunk & a_Chunk)
 			AddSpeedZ(Distance.z);
 
 			if (m_EMState == ESCAPING)
-			{	//Runs Faster when escaping :D otherwise they just walk away
+			{	// Runs Faster when escaping :D otherwise they just walk away
 				SetSpeedX (GetSpeedX() * 2.f);
 				SetSpeedZ (GetSpeedZ() * 2.f);
 			}
 		}
 		else
 		{
-			if (ReachedFinalDestination()) // If we have reached the ultimate, final destination, stop pathfinding and attack if appropriate
+			if (ReachedFinalDestination())  // If we have reached the ultimate, final destination, stop pathfinding and attack if appropriate
 			{
 				FinishPathFinding();
 			}
 			else
 			{
-				TickPathFinding(); // We have reached the next point in our path, calculate another point
+				TickPathFinding();  // We have reached the next point in our path, calculate another point
 			}
 		}
 	}
@@ -570,8 +570,8 @@ void cMonster::KilledBy(TakeDamageInfo & a_TDI)
 
 
 
-//Checks to see if EventSeePlayer should be fired
-//monster sez: Do I see the player
+// Checks to see if EventSeePlayer should be fired
+// monster sez: Do I see the player
 void cMonster::CheckEventSeePlayer(void)
 {
 	// TODO: Rewrite this to use cWorld's DoWithPlayers()
@@ -631,7 +631,7 @@ void cMonster::InStateIdle(float a_Dt)
 {
 	if (m_bMovingToDestination)
 	{
-		return; // Still getting there
+		return;  // Still getting there
 	}
 
 	m_IdleInterval += a_Dt;
@@ -640,7 +640,7 @@ void cMonster::InStateIdle(float a_Dt)
 	{
 		// At this interval the results are predictable
 		int rem = m_World->GetTickRandomNumber(6) + 1;
-		m_IdleInterval -= 1; // So nothing gets dropped when the server hangs for a few seconds
+		m_IdleInterval -= 1;  // So nothing gets dropped when the server hangs for a few seconds
 
 		Vector3d Dist;
 		Dist.x = (double)m_World->GetTickRandomNumber(10) - 5;
@@ -928,7 +928,7 @@ cMonster * cMonster::NewMonsterFromType(cMonster::eType a_MobType)
 		case mtWitch:         toReturn = new cWitch();                    break;
 		case mtWither:	      toReturn = new cWither();                   break;
 		case mtWolf:          toReturn = new cWolf();                     break;
-		case mtZombie:        toReturn = new cZombie(false);              break; // TODO: Infected zombie parameter
+		case mtZombie:        toReturn = new cZombie(false);              break;  // TODO: Infected zombie parameter
 		case mtZombiePigman:  toReturn = new cZombiePigman();             break;
 		default:
 		{
diff --git a/src/Mobs/Monster.h b/src/Mobs/Monster.h
index 59bcdaa37..96e73b45b 100644
--- a/src/Mobs/Monster.h
+++ b/src/Mobs/Monster.h
@@ -61,13 +61,13 @@ public:
 
 	enum eFamily
 	{
-		mfHostile  = 0, // Spider, Zombies ...
-		mfPassive  = 1, // Cows, Pigs
-		mfAmbient  = 2, // Bats
-		mfWater    = 3, // Squid
+		mfHostile  = 0,  // Spider, Zombies ...
+		mfPassive  = 1,  // Cows, Pigs
+		mfAmbient  = 2,  // Bats
+		mfWater    = 3,  // Squid
 
 		mfNoSpawn,
-		mfUnhandled, // Nothing. Be sure this is the last and the others are in order
+		mfUnhandled,  // Nothing. Be sure this is the last and the others are in order
 	} ;
 	
 	// tolua_end
@@ -93,7 +93,7 @@ public:
 	virtual void KilledBy(TakeDamageInfo & a_TDI) override;
 
 	virtual void MoveToPosition(const Vector3f & a_Position);
-	virtual void MoveToPosition(const Vector3d & a_Position); // tolua_export
+	virtual void MoveToPosition(const Vector3d & a_Position);  // tolua_export
 	virtual bool ReachedDestination(void);
 	
 	// tolua_begin
@@ -265,7 +265,7 @@ protected:
 	void AddRandomWeaponDropItem(cItems & a_Drops, short a_LootingLevel);
 	
 
-} ; // tolua_export
+} ;  // tolua_export
 
 
 
diff --git a/src/Mobs/Sheep.cpp b/src/Mobs/Sheep.cpp
index 019f9e6a2..7335848b7 100644
--- a/src/Mobs/Sheep.cpp
+++ b/src/Mobs/Sheep.cpp
@@ -93,12 +93,12 @@ void cSheep::Tick(float a_Dt, cChunk & a_Chunk)
 
 	if (m_TimeToStopEating > 0)
 	{
-		m_bMovingToDestination = false; // The sheep should not move when he's eating
+		m_bMovingToDestination = false;  // The sheep should not move when he's eating
 		m_TimeToStopEating--;
 
 		if (m_TimeToStopEating == 0)
 		{
-			if (m_World->GetBlock(PosX, PosY, PosZ) == E_BLOCK_GRASS) // Make sure grass hasn't been destroyed in the meantime
+			if (m_World->GetBlock(PosX, PosY, PosZ) == E_BLOCK_GRASS)  // Make sure grass hasn't been destroyed in the meantime
 			{
 				// The sheep ate the grass so we change it to dirt
 				m_World->SetBlock(PosX, PosY, PosZ, E_BLOCK_DIRT, 0);
diff --git a/src/Mobs/Villager.cpp b/src/Mobs/Villager.cpp
index 41283acf4..d183a338f 100644
--- a/src/Mobs/Villager.cpp
+++ b/src/Mobs/Villager.cpp
@@ -138,8 +138,8 @@ void cVillager::HandleFarmerPrepareFarmCrops()
 			m_CropsPos = Vector3i((int) GetPosX() + X - 5, (int) GetPosY() + Y - 3, (int) GetPosZ() + Z - 5);
 			MoveToPosition(Vector3f((float) (m_CropsPos.x + 0.5), (float) m_CropsPos.y, (float) (m_CropsPos.z + 0.5)));
 			return;
-		} // for Y loop.
-	} // Repeat the procces 5 times.
+		}  // for Y loop.
+	}  // Repeat the procces 5 times.
 }
 
 
diff --git a/src/Mobs/Villager.h b/src/Mobs/Villager.h
index abde48407..068dfd835 100644
--- a/src/Mobs/Villager.h
+++ b/src/Mobs/Villager.h
@@ -37,9 +37,8 @@ public:
 	/** return true if the given blocktype are: crops, potatoes or carrots.*/
 	bool IsBlockFarmable(BLOCKTYPE a_BlockType);
 
-	//////////////////////////////////////////////////////////////////
 	// Farmer functions
-	/** It searches in a 11x7x11 area for crops. If it found some it will navigate to them.*/
+	/** Searches in a 11x7x11 area for crops. If it found some it will navigate to them.*/
 	void HandleFarmerPrepareFarmCrops();
 
 	/** Looks if the farmer has reached it's destination, and if it's still crops and the destination is closer then 2 blocks it will harvest them.*/
@@ -49,7 +48,7 @@ public:
 	void HandleFarmerPlaceCrops();
 
 	// Get and set functions.
-	int      GetVilType(void)              const { return m_Type; }	
+	int      GetVilType(void)              const { return m_Type; }
 	Vector3i GetCropsPos(void)             const { return m_CropsPos; }
 	bool     DoesHaveActionActivated(void) const { return m_VillagerAction; }
 
diff --git a/src/Mobs/Wolf.cpp b/src/Mobs/Wolf.cpp
index e6268abc7..5bb97d30e 100644
--- a/src/Mobs/Wolf.cpp
+++ b/src/Mobs/Wolf.cpp
@@ -36,7 +36,7 @@ bool cWolf::DoTakeDamage(TakeDamageInfo & a_TDI)
 	{
 		m_IsAngry = true;
 	}
-	m_World->BroadcastEntityMetadata(*this); // Broadcast health and possibly angry face
+	m_World->BroadcastEntityMetadata(*this);  // Broadcast health and possibly angry face
 	return true;
 }
 
@@ -114,7 +114,7 @@ void cWolf::OnRightClicked(cPlayer & a_Player)
 			}
 			case E_ITEM_DYE:
 			{
-				if (a_Player.GetName() == m_OwnerName) // Is the player the owner of the dog?
+				if (a_Player.GetName() == m_OwnerName)  // Is the player the owner of the dog?
 				{
 					SetCollarColor(15 - a_Player.GetEquippedItem().m_ItemDamage);
 					if (!a_Player.IsGameModeCreative())
@@ -126,7 +126,7 @@ void cWolf::OnRightClicked(cPlayer & a_Player)
 			}
 			default:
 			{
-				if (a_Player.GetName() == m_OwnerName) // Is the player the owner of the dog?
+				if (a_Player.GetName() == m_OwnerName)  // Is the player the owner of the dog?
 				{
 					SetIsSitting(!IsSitting());
 				}
@@ -172,7 +172,7 @@ void cWolf::Tick(float a_Dt, cChunk & a_Chunk)
 					m_World->BroadcastEntityMetadata(*this);
 				}
 
-				m_FinalDestination = a_Closest_Player->GetPosition(); // So that we will look at a player holding food
+				m_FinalDestination = a_Closest_Player->GetPosition();  // So that we will look at a player holding food
 
 				// Don't move to the player if the wolf is sitting.
 				if (!IsSitting())
-- 
cgit v1.2.3


From 52d4c49d5cd2c15078c84a18821761b723833584 Mon Sep 17 00:00:00 2001
From: Howaner <franzi.moos@googlemail.com>
Date: Thu, 17 Jul 2014 22:32:23 +0200
Subject: Fixed many slime bugs. - Fixed slime hurt/death sound - Added slime
 spawning on death. - Fixed the max health. - Fixed the attack damage. -
 Little slimes should not attack players.

---
 src/Mobs/Slime.cpp | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
 src/Mobs/Slime.h   |  8 +++++--
 2 files changed, 73 insertions(+), 3 deletions(-)

(limited to 'src/Mobs')

diff --git a/src/Mobs/Slime.cpp b/src/Mobs/Slime.cpp
index 52a52bb39..d74b66e5b 100644
--- a/src/Mobs/Slime.cpp
+++ b/src/Mobs/Slime.cpp
@@ -2,6 +2,8 @@
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
 #include "Slime.h"
+#include "FastRandom.h"
+#include "World.h"
 
 
 
@@ -9,9 +11,11 @@
 
 /// Creates a slime of the specified size; size is 1 .. 3, with 1 being the smallest
 cSlime::cSlime(int a_Size) :
-	super("Slime", mtSlime, "mob.slime.attack", "mob.slime.attack", 0.6 * a_Size, 0.6 * a_Size),
+	super("Slime", mtSlime, Printf("mob.slime.%s", GetSizeName(a_Size).c_str()), Printf("mob.slime.%s", GetSizeName(a_Size).c_str()), 0.6 * a_Size, 0.6 * a_Size),
 	m_Size(a_Size)
 {
+	SetMaxHealth(a_Size * a_Size);
+	SetAttackDamage(a_Size);
 }
 
 
@@ -25,6 +29,7 @@ void cSlime::GetDrops(cItems & a_Drops, cEntity * a_Killer)
 	{
 		LootingLevel = a_Killer->GetEquippedWeapon().m_Enchantments.GetLevel(cEnchantments::enchLooting);
 	}
+
 	if (GetSize() == 1)
 	{
 		AddRandomDropItem(a_Drops, 0, 2 + LootingLevel, E_ITEM_SLIMEBALL);
@@ -34,3 +39,64 @@ void cSlime::GetDrops(cItems & a_Drops, cEntity * a_Killer)
 
 
 
+
+void cSlime::Attack(float a_Dt)
+{
+	if (m_Size != 1)
+	{
+		// Only slimes with the size 2 and 3 attacks a player.
+		super::Attack(a_Dt);
+	}
+}
+
+
+
+
+
+void cSlime::KilledBy(TakeDamageInfo & a_TDI)
+{
+	if (GetHealth() > 0)
+	{
+		return;
+	}
+
+	if (m_Size != 1)
+	{
+		cFastRandom Random;
+		int SpawnAmount = 2 + Random.NextInt(3);
+
+		for (int i = 0; i < SpawnAmount; ++i)
+		{
+			double AddX = (i % 2 - 0.5) * m_Size / 4.0;
+			double AddZ = (i / 2 - 0.5) * m_Size / 4.0;
+
+			cSlime * NewSlime = new cSlime(m_Size / 2);
+			NewSlime->SetPosition(GetPosX() + AddX, GetPosY() + 0.5, GetPosZ() + AddZ);
+			NewSlime->SetYaw(Random.NextFloat(2.0f) * 360.0f);
+			NewSlime->SetPitch(0.0f);
+
+			m_World->SpawnMobFinalize(NewSlime);
+		}
+	}
+	super::KilledBy(a_TDI);
+}
+
+
+
+
+
+const AString & cSlime::GetSizeName(int a_Size)
+{
+	if (a_Size > 1)
+	{
+		return "big";
+	}
+	else
+	{
+		return "small";
+	}
+}
+
+
+
+
diff --git a/src/Mobs/Slime.h b/src/Mobs/Slime.h
index 782c3113f..1f66d9afb 100644
--- a/src/Mobs/Slime.h
+++ b/src/Mobs/Slime.h
@@ -13,17 +13,21 @@ class cSlime :
 	typedef cAggressiveMonster super;
 	
 public:
-	/// Creates a slime of the specified size; size is 1 .. 3, with 1 being the smallest
+	/** Creates a slime of the specified size; size is 1 .. 3, with 1 being the smallest */
 	cSlime(int a_Size);
 
 	CLASS_PROTODEF(cSlime);
 
 	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
+	virtual void Attack(float a_Dt) override;
+	virtual void KilledBy(TakeDamageInfo & a_TDI) override;
+
 	int GetSize(void) const { return m_Size; }
+	const AString & GetSizeName(int a_Size);
 	
 protected:
 
-	/// Size of the slime, 1 .. 3, with 1 being the smallest
+	/** Size of the slime, 1 .. 3, with 1 being the smallest */
 	int m_Size;
 } ;
 
-- 
cgit v1.2.3


From 5e198c673009cf8ca9d92cf59848999bc96bbc37 Mon Sep 17 00:00:00 2001
From: madmaxoft <github@xoft.cz>
Date: Thu, 17 Jul 2014 22:50:58 +0200
Subject: Basic style fixes.

---
 src/Mobs/AggressiveMonster.cpp | 2 +-
 src/Mobs/Monster.cpp           | 6 +++---
 src/Mobs/Monster.h             | 8 ++++----
 src/Mobs/Villager.cpp          | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/Mobs')

diff --git a/src/Mobs/AggressiveMonster.cpp b/src/Mobs/AggressiveMonster.cpp
index de881f4eb..5f5b1853d 100644
--- a/src/Mobs/AggressiveMonster.cpp
+++ b/src/Mobs/AggressiveMonster.cpp
@@ -42,7 +42,7 @@ void cAggressiveMonster::InStateChasing(float a_Dt)
 			MoveToPosition(m_Target->GetPosition());
 		}
 	}
-} 
+}
 
 
 
diff --git a/src/Mobs/Monster.cpp b/src/Mobs/Monster.cpp
index 9e53284b3..df2572976 100644
--- a/src/Mobs/Monster.cpp
+++ b/src/Mobs/Monster.cpp
@@ -353,13 +353,13 @@ void cMonster::Tick(float a_Dt, cChunk & a_Chunk)
 			// If enemy passive we ignore checks for player visibility
 			InStateIdle(a_Dt);
 			break;
-		}	
+		}
 		case CHASING:
 		{
 			// If we do not see a player anymore skip chasing action
 			InStateChasing(a_Dt);
 			break;
-		}	
+		}
 		case ESCAPING:
 		{
 			InStateEscaping(a_Dt);
@@ -588,7 +588,7 @@ void cMonster::CheckEventSeePlayer(void)
 
 
 void cMonster::CheckEventLostPlayer(void)
-{	
+{
 	if (m_Target != NULL)
 	{
 		if ((m_Target->GetPosition() - GetPosition()).Length() > m_SightDistance)
diff --git a/src/Mobs/Monster.h b/src/Mobs/Monster.h
index 96e73b45b..750040468 100644
--- a/src/Mobs/Monster.h
+++ b/src/Mobs/Monster.h
@@ -233,7 +233,7 @@ protected:
 	AString m_SoundHurt;
 	AString m_SoundDeath;
 
-	float m_AttackRate;	
+	float m_AttackRate;
 	int m_AttackDamage;
 	int m_AttackRange;
 	float m_AttackInterval;
@@ -250,13 +250,13 @@ protected:
 	bool m_BurnsInDaylight;
 
 	/** 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);	
+	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);	
+	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); 
+	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);
diff --git a/src/Mobs/Villager.cpp b/src/Mobs/Villager.cpp
index d183a338f..1cdac7c74 100644
--- a/src/Mobs/Villager.cpp
+++ b/src/Mobs/Villager.cpp
@@ -55,7 +55,7 @@ void cVillager::Tick(float a_Dt, cChunk & a_Chunk)
 		{
 			switch (m_Type)
 			{
-				case vtFarmer: 
+				case vtFarmer:
 				{
 					HandleFarmerPlaceCrops();
 				}
-- 
cgit v1.2.3


From d0cc9aedb3e63d39324c52b6385406f362ab41b7 Mon Sep 17 00:00:00 2001
From: madmaxoft <github@xoft.cz>
Date: Thu, 17 Jul 2014 22:59:02 +0200
Subject: More trailing whitespace fixes.

---
 src/Mobs/Creeper.cpp | 2 +-
 src/Mobs/Horse.cpp   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/Mobs')

diff --git a/src/Mobs/Creeper.cpp b/src/Mobs/Creeper.cpp
index 495f1dd25..02718edf8 100644
--- a/src/Mobs/Creeper.cpp
+++ b/src/Mobs/Creeper.cpp
@@ -37,7 +37,7 @@ void cCreeper::Tick(float a_Dt, cChunk & a_Chunk)
 	{
 		if (m_bIsBlowing)
 		{
-			m_ExplodingTimer += 1;			
+			m_ExplodingTimer += 1;
 		}
 
 		if (m_ExplodingTimer == 30)
diff --git a/src/Mobs/Horse.cpp b/src/Mobs/Horse.cpp
index 9d130301f..67a09d4ab 100644
--- a/src/Mobs/Horse.cpp
+++ b/src/Mobs/Horse.cpp
@@ -63,7 +63,7 @@ void cHorse::Tick(float a_Dt, cChunk & a_Chunk)
 				m_Attachee->Detach();
 				m_bIsRearing = true;
 			}
-		}		
+		}
 		else
 		{
 			m_bIsTame = true;
-- 
cgit v1.2.3


From c03161f75d22a7965aea20fb9843ae580a07079a Mon Sep 17 00:00:00 2001
From: madmaxoft <github@xoft.cz>
Date: Thu, 17 Jul 2014 23:15:53 +0200
Subject: Fixed tabs used for alignment.

---
 src/Mobs/Monster.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/Mobs')

diff --git a/src/Mobs/Monster.cpp b/src/Mobs/Monster.cpp
index df2572976..ba901df4e 100644
--- a/src/Mobs/Monster.cpp
+++ b/src/Mobs/Monster.cpp
@@ -325,7 +325,7 @@ void cMonster::Tick(float a_Dt, cChunk & a_Chunk)
 			AddSpeedZ(Distance.z);
 
 			if (m_EMState == ESCAPING)
-			{	// Runs Faster when escaping :D otherwise they just walk away
+			{  // Runs Faster when escaping :D otherwise they just walk away
 				SetSpeedX (GetSpeedX() * 2.f);
 				SetSpeedZ (GetSpeedZ() * 2.f);
 			}
-- 
cgit v1.2.3


From fba93aac2aa90fa654fef9fe4252042aae53893f Mon Sep 17 00:00:00 2001
From: Howaner <franzi.moos@googlemail.com>
Date: Thu, 17 Jul 2014 23:32:01 +0200
Subject: Split into more lines.

---
 src/Mobs/Slime.cpp | 14 +++++++++-----
 src/Mobs/Slime.h   |  2 +-
 2 files changed, 10 insertions(+), 6 deletions(-)

(limited to 'src/Mobs')

diff --git a/src/Mobs/Slime.cpp b/src/Mobs/Slime.cpp
index d74b66e5b..4e12fca51 100644
--- a/src/Mobs/Slime.cpp
+++ b/src/Mobs/Slime.cpp
@@ -11,7 +11,13 @@
 
 /// Creates a slime of the specified size; size is 1 .. 3, with 1 being the smallest
 cSlime::cSlime(int a_Size) :
-	super("Slime", mtSlime, Printf("mob.slime.%s", GetSizeName(a_Size).c_str()), Printf("mob.slime.%s", GetSizeName(a_Size).c_str()), 0.6 * a_Size, 0.6 * a_Size),
+	super("Slime",
+		mtSlime,
+		Printf("mob.slime.%s", GetSizeName(a_Size).c_str()),
+		Printf("mob.slime.%s", GetSizeName(a_Size).c_str()),
+		0.6 * a_Size,
+		0.6 * a_Size
+	),
 	m_Size(a_Size)
 {
 	SetMaxHealth(a_Size * a_Size);
@@ -72,9 +78,7 @@ void cSlime::KilledBy(TakeDamageInfo & a_TDI)
 
 			cSlime * NewSlime = new cSlime(m_Size / 2);
 			NewSlime->SetPosition(GetPosX() + AddX, GetPosY() + 0.5, GetPosZ() + AddZ);
-			NewSlime->SetYaw(Random.NextFloat(2.0f) * 360.0f);
-			NewSlime->SetPitch(0.0f);
-
+			NewSlime->SetYaw(Random.NextFloat(1.0f) * 360.0f);
 			m_World->SpawnMobFinalize(NewSlime);
 		}
 	}
@@ -85,7 +89,7 @@ void cSlime::KilledBy(TakeDamageInfo & a_TDI)
 
 
 
-const AString & cSlime::GetSizeName(int a_Size)
+const AString cSlime::GetSizeName(int a_Size) const
 {
 	if (a_Size > 1)
 	{
diff --git a/src/Mobs/Slime.h b/src/Mobs/Slime.h
index 1f66d9afb..87c5a8e5e 100644
--- a/src/Mobs/Slime.h
+++ b/src/Mobs/Slime.h
@@ -23,7 +23,7 @@ public:
 	virtual void KilledBy(TakeDamageInfo & a_TDI) override;
 
 	int GetSize(void) const { return m_Size; }
-	const AString & GetSizeName(int a_Size);
+	const AString GetSizeName(int a_Size) const;
 	
 protected:
 
-- 
cgit v1.2.3


From 33bd78dcdd1f080ef5d3b47b0e24099227a8a5d5 Mon Sep 17 00:00:00 2001
From: Howaner <franzi.moos@googlemail.com>
Date: Fri, 18 Jul 2014 01:26:27 +0200
Subject: Skeletons should spawn with a bow in the hand. Fixes #1184

---
 src/Mobs/Skeleton.cpp | 15 +++++++++++++++
 src/Mobs/Skeleton.h   |  2 ++
 2 files changed, 17 insertions(+)

(limited to 'src/Mobs')

diff --git a/src/Mobs/Skeleton.cpp b/src/Mobs/Skeleton.cpp
index 0641a3d57..2f57bedeb 100644
--- a/src/Mobs/Skeleton.cpp
+++ b/src/Mobs/Skeleton.cpp
@@ -4,6 +4,7 @@
 #include "Skeleton.h"
 #include "../World.h"
 #include "../Entities/ArrowEntity.h"
+#include "ClientHandle.h"
 
 
 
@@ -90,3 +91,17 @@ void cSkeleton::Attack(float a_Dt)
 		m_AttackInterval = 0.0;
 	}
 }
+
+
+
+
+
+void cSkeleton::SpawnOn(cClientHandle & a_ClientHandle)
+{
+	super::SpawnOn(a_ClientHandle);
+	a_ClientHandle.SendEntityEquipment(*this, 0, cItem(E_ITEM_BOW));
+}
+
+
+
+
diff --git a/src/Mobs/Skeleton.h b/src/Mobs/Skeleton.h
index 8f31b42e1..229462d63 100644
--- a/src/Mobs/Skeleton.h
+++ b/src/Mobs/Skeleton.h
@@ -20,6 +20,8 @@ public:
 	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
 	virtual void MoveToPosition(const Vector3f & a_Position) override;
 	virtual void Attack(float a_Dt) override;
+	virtual void SpawnOn(cClientHandle & a_ClientHandle) override;
+
 	bool IsWither(void) const { return m_bIsWither; };
 
 private:
-- 
cgit v1.2.3


From 2df5e26d3b7f08ef7d120511705fa0b75a44783e Mon Sep 17 00:00:00 2001
From: madmaxoft <github@xoft.cz>
Date: Fri, 18 Jul 2014 09:57:34 +0200
Subject: Fixed spaces before commas.

---
 src/Mobs/Monster.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/Mobs')

diff --git a/src/Mobs/Monster.h b/src/Mobs/Monster.h
index 750040468..6e14e3b18 100644
--- a/src/Mobs/Monster.h
+++ b/src/Mobs/Monster.h
@@ -76,9 +76,9 @@ public:
 	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))
-	* a_SoundHurt and a_SoundDeath are assigned into m_SoundHurt and m_SoundDeath, respectively
+	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))
+	a_SoundHurt and a_SoundDeath are assigned into m_SoundHurt and m_SoundDeath, respectively
 	*/
 	cMonster(const AString & a_ConfigName, eType a_MobType, const AString & a_SoundHurt, const AString & a_SoundDeath, double a_Width, double a_Height);
 
-- 
cgit v1.2.3


From f1be1eb6743700515de3a522898ba99680cf24c0 Mon Sep 17 00:00:00 2001
From: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Fri, 18 Jul 2014 10:47:00 +0100
Subject: Monster fixes

* Fixes #1203
* Fixes #627
---
 src/Mobs/Monster.cpp  | 27 +--------------------------
 src/Mobs/Monster.h    |  1 -
 src/Mobs/Skeleton.cpp |  2 +-
 src/Mobs/Skeleton.h   |  2 +-
 src/Mobs/Zombie.cpp   |  2 +-
 src/Mobs/Zombie.h     |  2 +-
 6 files changed, 5 insertions(+), 31 deletions(-)

(limited to 'src/Mobs')

diff --git a/src/Mobs/Monster.cpp b/src/Mobs/Monster.cpp
index ba901df4e..1369746df 100644
--- a/src/Mobs/Monster.cpp
+++ b/src/Mobs/Monster.cpp
@@ -115,8 +115,6 @@ void cMonster::TickPathFinding()
 	const int PosY = POSY_TOINT;
 	const int PosZ = POSZ_TOINT;
 
-	m_FinalDestination.y = (double)FindFirstNonAirBlockPosition(m_FinalDestination.x, m_FinalDestination.z);
-
 	std::vector<Vector3d> m_PotentialCoordinates;
 	m_TraversedCoordinates.push_back(Vector3i(PosX, PosY, PosZ));
 
@@ -201,19 +199,6 @@ void cMonster::TickPathFinding()
 
 
 
-void cMonster::MoveToPosition(const Vector3f & a_Position)
-{
-	FinishPathFinding();
-
-	m_FinalDestination = a_Position;
-	m_bMovingToDestination = true;
-	TickPathFinding();
-}
-
-
-
-
-
 void cMonster::MoveToPosition(const Vector3d & a_Position)
 {
 	FinishPathFinding();
@@ -227,15 +212,7 @@ void cMonster::MoveToPosition(const Vector3d & a_Position)
 
 bool cMonster::IsCoordinateInTraversedList(Vector3i a_Coords)
 {
-	for (std::vector<Vector3i>::const_iterator itr = m_TraversedCoordinates.begin(); itr != m_TraversedCoordinates.end(); ++itr)
-	{
-		if (itr->Equals(a_Coords))
-		{
-			return true;
-		}
-	}
-
-	return false;
+	return (std::find(m_TraversedCoordinates.begin(), m_TraversedCoordinates.end(), a_Coords) != m_TraversedCoordinates.end());
 }
 
 
@@ -296,8 +273,6 @@ void cMonster::Tick(float a_Dt, cChunk & a_Chunk)
 	{
 		if (m_bOnGround)
 		{
-			m_Destination.y = FindFirstNonAirBlockPosition(m_Destination.x, m_Destination.z);
-
 			if (DoesPosYRequireJump((int)floor(m_Destination.y)))
 			{
 				m_bOnGround = false;
diff --git a/src/Mobs/Monster.h b/src/Mobs/Monster.h
index 6e14e3b18..4af7cf4f1 100644
--- a/src/Mobs/Monster.h
+++ b/src/Mobs/Monster.h
@@ -92,7 +92,6 @@ public:
 	
 	virtual void KilledBy(TakeDamageInfo & a_TDI) override;
 
-	virtual void MoveToPosition(const Vector3f & a_Position);
 	virtual void MoveToPosition(const Vector3d & a_Position);  // tolua_export
 	virtual bool ReachedDestination(void);
 	
diff --git a/src/Mobs/Skeleton.cpp b/src/Mobs/Skeleton.cpp
index 2f57bedeb..cd707f4bb 100644
--- a/src/Mobs/Skeleton.cpp
+++ b/src/Mobs/Skeleton.cpp
@@ -48,7 +48,7 @@ void cSkeleton::GetDrops(cItems & a_Drops, cEntity * a_Killer)
 
 
 
-void cSkeleton::MoveToPosition(const Vector3f & a_Position)
+void cSkeleton::MoveToPosition(const Vector3d & a_Position)
 {
 	// If the destination is sufficiently skylight challenged AND the skeleton isn't on fire then block the movement
 	if (
diff --git a/src/Mobs/Skeleton.h b/src/Mobs/Skeleton.h
index 229462d63..efb670c83 100644
--- a/src/Mobs/Skeleton.h
+++ b/src/Mobs/Skeleton.h
@@ -18,7 +18,7 @@ public:
 	CLASS_PROTODEF(cSkeleton);
 
 	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
-	virtual void MoveToPosition(const Vector3f & a_Position) override;
+	virtual void MoveToPosition(const Vector3d & a_Position) override;
 	virtual void Attack(float a_Dt) override;
 	virtual void SpawnOn(cClientHandle & a_ClientHandle) override;
 
diff --git a/src/Mobs/Zombie.cpp b/src/Mobs/Zombie.cpp
index 725790ed9..30225c32d 100644
--- a/src/Mobs/Zombie.cpp
+++ b/src/Mobs/Zombie.cpp
@@ -42,7 +42,7 @@ void cZombie::GetDrops(cItems & a_Drops, cEntity * a_Killer)
 
 
 
-void cZombie::MoveToPosition(const Vector3f & a_Position)
+void cZombie::MoveToPosition(const Vector3d & a_Position)
 {
 	// If the destination is sufficiently skylight challenged AND the skeleton isn't on fire then block the movement
 	if (
diff --git a/src/Mobs/Zombie.h b/src/Mobs/Zombie.h
index 1ba368f9c..c56409570 100644
--- a/src/Mobs/Zombie.h
+++ b/src/Mobs/Zombie.h
@@ -17,7 +17,7 @@ public:
 	CLASS_PROTODEF(cZombie);
 	
 	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
-	virtual void MoveToPosition(const Vector3f & a_Position) override;
+	virtual void MoveToPosition(const Vector3d & a_Position) override;
 
 	bool IsVillagerZombie(void) const {return m_IsVillagerZombie; }
 	bool IsConverting    (void) const {return m_IsConverting; }
-- 
cgit v1.2.3


From 509d3d3b62c2dc5b328cf122c0fc5f0595b73721 Mon Sep 17 00:00:00 2001
From: Howaner <franzi.moos@googlemail.com>
Date: Fri, 18 Jul 2014 16:55:28 +0200
Subject: Slime sizes are 1, 2 or 4 and not 1, 2 or 3.

---
 src/Mobs/Monster.cpp | 2 +-
 src/Mobs/Slime.cpp   | 4 ++--
 src/Mobs/Slime.h     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/Mobs')

diff --git a/src/Mobs/Monster.cpp b/src/Mobs/Monster.cpp
index e36634c73..2a796e8eb 100644
--- a/src/Mobs/Monster.cpp
+++ b/src/Mobs/Monster.cpp
@@ -867,7 +867,7 @@ cMonster * cMonster::NewMonsterFromType(cMonster::eType a_MobType)
 		}
 		case mtSlime:
 		{
-			toReturn = new cSlime(Random.NextInt(2) + 1);
+			toReturn = new cSlime(1 << Random.NextInt(3));
 			break;
 		}
 		case mtSkeleton:
diff --git a/src/Mobs/Slime.cpp b/src/Mobs/Slime.cpp
index 4e12fca51..4b123df12 100644
--- a/src/Mobs/Slime.cpp
+++ b/src/Mobs/Slime.cpp
@@ -9,7 +9,6 @@
 
 
 
-/// Creates a slime of the specified size; size is 1 .. 3, with 1 being the smallest
 cSlime::cSlime(int a_Size) :
 	super("Slime",
 		mtSlime,
@@ -36,7 +35,8 @@ void cSlime::GetDrops(cItems & a_Drops, cEntity * a_Killer)
 		LootingLevel = a_Killer->GetEquippedWeapon().m_Enchantments.GetLevel(cEnchantments::enchLooting);
 	}
 
-	if (GetSize() == 1)
+	// Only slimes with the size 1 can drop slimeballs.
+	if (m_Size == 1)
 	{
 		AddRandomDropItem(a_Drops, 0, 2 + LootingLevel, E_ITEM_SLIMEBALL);
 	}
diff --git a/src/Mobs/Slime.h b/src/Mobs/Slime.h
index 87c5a8e5e..b0e2f627c 100644
--- a/src/Mobs/Slime.h
+++ b/src/Mobs/Slime.h
@@ -13,7 +13,7 @@ class cSlime :
 	typedef cAggressiveMonster super;
 	
 public:
-	/** Creates a slime of the specified size; size is 1 .. 3, with 1 being the smallest */
+	/** Creates a slime of the specified size; size can be 1, 2 or 4, with 1 is the smallest and 4 is the tallest. */
 	cSlime(int a_Size);
 
 	CLASS_PROTODEF(cSlime);
-- 
cgit v1.2.3


From 19d012c96ec13498d97d8e43136cc09eca3dca2e Mon Sep 17 00:00:00 2001
From: madmaxoft <github@xoft.cz>
Date: Fri, 18 Jul 2014 23:20:42 +0200
Subject: Fixed slime-related comments.

---
 src/Mobs/Monster.cpp | 4 ++--
 src/Mobs/Slime.cpp   | 4 ++--
 src/Mobs/Slime.h     | 7 ++++++-
 3 files changed, 10 insertions(+), 5 deletions(-)

(limited to 'src/Mobs')

diff --git a/src/Mobs/Monster.cpp b/src/Mobs/Monster.cpp
index 2a796e8eb..19851e064 100644
--- a/src/Mobs/Monster.cpp
+++ b/src/Mobs/Monster.cpp
@@ -867,13 +867,13 @@ cMonster * cMonster::NewMonsterFromType(cMonster::eType a_MobType)
 		}
 		case mtSlime:
 		{
-			toReturn = new cSlime(1 << Random.NextInt(3));
+			toReturn = new cSlime(1 << Random.NextInt(3));  // Size 1, 2 or 4
 			break;
 		}
 		case mtSkeleton:
 		{
 			// TODO: Actual detection of spawning in Nether
-			toReturn = new cSkeleton(Random.NextInt(1) == 0 ? false : true);
+			toReturn = new cSkeleton((Random.NextInt(1) == 0) ? false : true);
 			break;
 		}
 		case mtVillager:
diff --git a/src/Mobs/Slime.cpp b/src/Mobs/Slime.cpp
index 4b123df12..b709ec664 100644
--- a/src/Mobs/Slime.cpp
+++ b/src/Mobs/Slime.cpp
@@ -48,9 +48,9 @@ void cSlime::GetDrops(cItems & a_Drops, cEntity * a_Killer)
 
 void cSlime::Attack(float a_Dt)
 {
-	if (m_Size != 1)
+	if (m_Size > 1)
 	{
-		// Only slimes with the size 2 and 3 attacks a player.
+		// Only slimes larger than size 1 attack a player.
 		super::Attack(a_Dt);
 	}
 }
diff --git a/src/Mobs/Slime.h b/src/Mobs/Slime.h
index b0e2f627c..15ae113dc 100644
--- a/src/Mobs/Slime.h
+++ b/src/Mobs/Slime.h
@@ -18,16 +18,21 @@ public:
 
 	CLASS_PROTODEF(cSlime);
 
+	// cAggressiveMonster overrides:
 	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
 	virtual void Attack(float a_Dt) override;
 	virtual void KilledBy(TakeDamageInfo & a_TDI) override;
 
 	int GetSize(void) const { return m_Size; }
+	
+	/** Returns the text describing the slime's size, as used by the client's resource subsystem for sounds.
+	Returns either "big" or "small". */
 	const AString GetSizeName(int a_Size) const;
 	
 protected:
 
-	/** Size of the slime, 1 .. 3, with 1 being the smallest */
+	/** Size of the slime, with 1 being the smallest.
+	Vanilla uses sizes 1, 2 and 4 only. */
 	int m_Size;
 } ;
 
-- 
cgit v1.2.3


From 2f811fc6a2cf2ddacdcb443049a44ad6481f135a Mon Sep 17 00:00:00 2001
From: archshift <admin@archshift.com>
Date: Thu, 17 Jul 2014 23:55:34 -0700
Subject: Mobs/CMakeLists.txt: Replaced glob with list of files

---
 src/Mobs/CMakeLists.txt | 74 +++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 69 insertions(+), 5 deletions(-)

(limited to 'src/Mobs')

diff --git a/src/Mobs/CMakeLists.txt b/src/Mobs/CMakeLists.txt
index 53c265803..d73a7aafd 100644
--- a/src/Mobs/CMakeLists.txt
+++ b/src/Mobs/CMakeLists.txt
@@ -4,9 +4,73 @@ project (MCServer)
 
 include_directories ("${PROJECT_SOURCE_DIR}/../")
 
-file(GLOB SOURCE
-    "*.cpp"
-    "*.h"
-)
+SET (SRCS
+	AggressiveMonster.cpp
+	Bat.cpp
+	Blaze.cpp
+	CaveSpider.cpp
+	Chicken.cpp
+	Cow.cpp
+	Creeper.cpp
+	EnderDragon.cpp
+	Enderman.cpp
+	Ghast.cpp
+	Giant.cpp
+	Horse.cpp
+	IronGolem.cpp
+	MagmaCube.cpp
+	Monster.cpp
+	Mooshroom.cpp
+	PassiveAggressiveMonster.cpp
+	PassiveMonster.cpp
+	Pig.cpp
+	Sheep.cpp
+	Skeleton.cpp
+	Slime.cpp
+	SnowGolem.cpp
+	Spider.cpp
+	Squid.cpp
+	Villager.cpp
+	Witch.cpp
+	Wither.cpp
+	Wolf.cpp
+	Zombie.cpp
+	ZombiePigman.cpp)
+	
+SET (HDRS
+	AggressiveMonster.h
+	Bat.h
+	Blaze.h
+	CaveSpider.h
+	Chicken.h
+	Cow.h
+	Creeper.h
+	EnderDragon.h
+	Enderman.h
+	Ghast.h
+	Giant.h
+	Horse.h
+	IncludeAllMonsters.h
+	IronGolem.h
+	MagmaCube.h
+	Monster.h
+	Mooshroom.h
+	Ocelot.h
+	PassiveAggressiveMonster.h
+	PassiveMonster.h
+	Pig.h
+	Sheep.h
+	Silverfish.h
+	Skeleton.h
+	Slime.h
+	SnowGolem.h
+	Spider.h
+	Squid.h
+	Villager.h
+	Witch.h
+	Wither.h
+	Wolf.h
+	Zombie.h
+	ZombiePigman.h)
 
-add_library(Mobs ${SOURCE})
+add_library(Mobs ${SRCS} ${HDRS})
-- 
cgit v1.2.3


From 725d1fd1e2995b1720673c280fea1125ac338b3c Mon Sep 17 00:00:00 2001
From: archshift <admin@archshift.com>
Date: Fri, 18 Jul 2014 13:26:43 -0700
Subject: Subdirs: Only add_library if not using MSVC

---
 src/Mobs/CMakeLists.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/Mobs')

diff --git a/src/Mobs/CMakeLists.txt b/src/Mobs/CMakeLists.txt
index d73a7aafd..2c092c15f 100644
--- a/src/Mobs/CMakeLists.txt
+++ b/src/Mobs/CMakeLists.txt
@@ -73,4 +73,6 @@ SET (HDRS
 	Zombie.h
 	ZombiePigman.h)
 
-add_library(Mobs ${SRCS} ${HDRS})
+if(NOT MSVC)
+	add_library(Mobs ${SRCS} ${HDRS})
+endif()
-- 
cgit v1.2.3


From 041bfd5860cd8ef51db42eb6fb4b50b45549feba Mon Sep 17 00:00:00 2001
From: archshift <admin@archshift.com>
Date: Sat, 19 Jul 2014 01:40:29 -0700
Subject: Fixed clamping issues

---
 src/Mobs/Monster.cpp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'src/Mobs')

diff --git a/src/Mobs/Monster.cpp b/src/Mobs/Monster.cpp
index e6c82a448..8d612fbaa 100644
--- a/src/Mobs/Monster.cpp
+++ b/src/Mobs/Monster.cpp
@@ -414,11 +414,7 @@ void cMonster::HandleFalling()
 int cMonster::FindFirstNonAirBlockPosition(double a_PosX, double a_PosZ)
 {
 	int PosY = POSY_TOINT;
-
-	if (PosY < 0)
-		PosY = 0;
-	else if (PosY > cChunkDef::Height)
-		PosY = cChunkDef::Height;
+	PosY = Clamp(PosY, 0, cChunkDef::Height);
 
 	if (!cBlockInfo::IsSolid(m_World->GetBlock((int)floor(a_PosX), PosY, (int)floor(a_PosZ))))
 	{
-- 
cgit v1.2.3


From 00c524519ef6c7ceaf4ac91307617cfd65d7cf21 Mon Sep 17 00:00:00 2001
From: madmaxoft <github@xoft.cz>
Date: Sat, 19 Jul 2014 14:53:41 +0200
Subject: Fixed style: spaces after commas.

---
 src/Mobs/Monster.cpp | 2 +-
 src/Mobs/Monster.h   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/Mobs')

diff --git a/src/Mobs/Monster.cpp b/src/Mobs/Monster.cpp
index 8d612fbaa..db45db5b9 100644
--- a/src/Mobs/Monster.cpp
+++ b/src/Mobs/Monster.cpp
@@ -126,7 +126,7 @@ void cMonster::TickPathFinding()
 		{ 1, 0},
 		{-1, 0},
 		{ 0, 1},
-		{ 0,-1},
+		{ 0, -1},
 	} ;
 	
 	if ((PosY - 1 < 0) || (PosY + 2 > cChunkDef::Height) /* PosY + 1 will never be true if PosY + 2 is not */)
diff --git a/src/Mobs/Monster.h b/src/Mobs/Monster.h
index 4af7cf4f1..bbc3ebd35 100644
--- a/src/Mobs/Monster.h
+++ b/src/Mobs/Monster.h
@@ -73,7 +73,7 @@ public:
 	// tolua_end
 	
 	enum MState{ATTACKING, IDLE, CHASING, ESCAPING} m_EMState;
-	enum MPersonality{PASSIVE,AGGRESSIVE,COWARDLY} m_EMPersonality;
+	enum MPersonality{PASSIVE, AGGRESSIVE, COWARDLY} m_EMPersonality;
 	
 	/** Creates the mob object.
 	If a_ConfigName is not empty, the configuration is loaded using GetMonsterConfig()
-- 
cgit v1.2.3


From ada88a58053e74c910982f7c3ebdfb791161c110 Mon Sep 17 00:00:00 2001
From: archshift <admin@archshift.com>
Date: Sat, 19 Jul 2014 14:35:35 -0700
Subject: Monsters: Made IsUndead overridable by the respective mob classes

---
 src/Mobs/Monster.cpp    | 10 ----------
 src/Mobs/Monster.h      |  2 +-
 src/Mobs/Skeleton.h     |  2 ++
 src/Mobs/Wither.h       |  2 ++
 src/Mobs/Zombie.h       |  6 ++++--
 src/Mobs/ZombiePigman.h |  2 ++
 6 files changed, 11 insertions(+), 13 deletions(-)

(limited to 'src/Mobs')

diff --git a/src/Mobs/Monster.cpp b/src/Mobs/Monster.cpp
index db45db5b9..753a44914 100644
--- a/src/Mobs/Monster.cpp
+++ b/src/Mobs/Monster.cpp
@@ -680,16 +680,6 @@ void cMonster::GetMonsterConfig(const AString & a_Name)
 
 bool cMonster::IsUndead(void)
 {
-	switch (GetMobType())
-	{
-		case mtZombie:
-		case mtZombiePigman:
-		case mtSkeleton:
-		case mtWither:
-		{
-			return true;
-		}
-	}
 	return false;
 }
 
diff --git a/src/Mobs/Monster.h b/src/Mobs/Monster.h
index bbc3ebd35..ffd078505 100644
--- a/src/Mobs/Monster.h
+++ b/src/Mobs/Monster.h
@@ -107,7 +107,7 @@ public:
 	void GetMonsterConfig(const AString & a_Name);
 	
 	/** Returns whether this mob is undead (skeleton, zombie, etc.) */
-	bool IsUndead(void);
+	virtual bool IsUndead(void);
 	
 	virtual void EventLosePlayer(void);
 	virtual void CheckEventLostPlayer(void);
diff --git a/src/Mobs/Skeleton.h b/src/Mobs/Skeleton.h
index efb670c83..9a121ef48 100644
--- a/src/Mobs/Skeleton.h
+++ b/src/Mobs/Skeleton.h
@@ -22,6 +22,8 @@ public:
 	virtual void Attack(float a_Dt) override;
 	virtual void SpawnOn(cClientHandle & a_ClientHandle) override;
 
+	virtual bool IsUndead(void) override { return true; }
+	
 	bool IsWither(void) const { return m_bIsWither; };
 
 private:
diff --git a/src/Mobs/Wither.h b/src/Mobs/Wither.h
index 7d76f70f5..cc8d1459b 100644
--- a/src/Mobs/Wither.h
+++ b/src/Mobs/Wither.h
@@ -30,6 +30,8 @@ public:
 	virtual bool DoTakeDamage(TakeDamageInfo & a_TDI) override;
 	virtual void Tick(float a_Dt, cChunk & a_Chunk) override;
 	virtual void KilledBy(TakeDamageInfo & a_TDI) override;
+	
+	virtual bool IsUndead(void) override { return true; }
 
 private:
 
diff --git a/src/Mobs/Zombie.h b/src/Mobs/Zombie.h
index c56409570..082573d8b 100644
--- a/src/Mobs/Zombie.h
+++ b/src/Mobs/Zombie.h
@@ -19,8 +19,10 @@ public:
 	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
 	virtual void MoveToPosition(const Vector3d & a_Position) override;
 
-	bool IsVillagerZombie(void) const {return m_IsVillagerZombie; }
-	bool IsConverting    (void) const {return m_IsConverting; }
+	virtual bool IsUndead(void) override { return true; }
+	
+	bool IsVillagerZombie(void) const { return m_IsVillagerZombie; }
+	bool IsConverting    (void) const { return m_IsConverting; }
 
 private:
 
diff --git a/src/Mobs/ZombiePigman.h b/src/Mobs/ZombiePigman.h
index a2ebc87cb..a4bad7efb 100644
--- a/src/Mobs/ZombiePigman.h
+++ b/src/Mobs/ZombiePigman.h
@@ -18,6 +18,8 @@ public:
 
 	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
 	virtual void KilledBy(TakeDamageInfo & a_TDI) override;
+	
+	virtual bool IsUndead(void) override { return true; }
 } ;
 
 
-- 
cgit v1.2.3