2 files changed, 60 insertions, 46 deletions

diff --git a/source/Mobs/Wolf.cpp b/source/Mobs/Wolf.cpp
index d725e1668..c6e9736f5 100644
--- a/source/Mobs/Wolf.cpp
+++ b/source/Mobs/Wolf.cpp
@@ -15,8 +15,8 @@ cWolf::cWolf(void) :
 	m_IsTame(false),
 	m_IsSitting(false),
 	m_IsBegging(false),
-	m_Owner(""),
-	m_Collar(14)
+	m_OwnerName(""),
+	m_CollarColor(14)
 {
 }
 
@@ -40,7 +40,7 @@ void cWolf::DoTakeDamage(TakeDamageInfo & a_TDI)
 
 void cWolf::OnRightClicked(cPlayer & a_Player)
 {
-	if ((!IsTame()) && (!IsAngry()))
+	if (!IsTame() && !IsAngry())
 	{
 		if (a_Player.GetEquippedItem().m_ItemType == E_ITEM_BONE)
 		{
@@ -64,11 +64,11 @@ void cWolf::OnRightClicked(cPlayer & a_Player)
 	}
 	else if (IsTame())
 	{
-		if (a_Player.GetName() == m_Owner) // Is the player the owner of the dog?
+		if (a_Player.GetName() == m_OwnerName) // Is the player the owner of the dog?
 		{
 			if (a_Player.GetEquippedItem().m_ItemType == E_ITEM_DYE)
 			{
-				m_Collar = 15 - a_Player.GetEquippedItem().m_ItemDamage;
+				SetCollarColor(15 - a_Player.GetEquippedItem().m_ItemDamage);
 				if (!a_Player.IsGameModeCreative())
 				{
 					a_Player.GetInventory().RemoveOneEquippedItem();
@@ -97,7 +97,9 @@ void cWolf::Tick(float a_Dt, cChunk & a_Chunk)
 	if (!IsAngry())
 	{
 		cMonster::Tick(a_Dt, a_Chunk);
-	} else {
+	}
+	else
+	{
 		super::Tick(a_Dt, a_Chunk);
 	}
 
@@ -139,35 +141,45 @@ void cWolf::Tick(float a_Dt, cChunk & a_Chunk)
 			}
 		}
 	}
-	
+
+	if (IsTame())
+	{
+		TickFollowPlayer();
+	}
+}
+
+
+
+
+
+void cWolf::TickFollowPlayer()
+{
 	class cCallback :
 		public cPlayerListCallback
 	{
-		virtual bool Item(cPlayer * Player) override
+		virtual bool Item(cPlayer * a_Player) override
 		{
-			OwnerCoords = Player->GetPosition();
+			OwnerPos = a_Player->GetPosition();
 			return false;
 		}
 	public:
-		Vector3f OwnerCoords;
-	} ;
-	cCallback Callback;
-	m_World->DoWithPlayer(m_Owner, Callback);
-	Vector3f OwnerCoords = Callback.OwnerCoords;
-
-	if (IsTame())
+		Vector3f OwnerPos;
+	} Callback;
+	if (m_World->DoWithPlayer(m_OwnerName, Callback))
 	{
-		if (m_Owner != "")
+		// The player is present in the world, follow them:
+		double Distance = (Callback.OwnerPos - GetPosition()).Length();
+		if (Distance < 3)
 		{
-			double Distance = (OwnerCoords - GetPosition()).Length();
-			if (Distance < 3)
-			{
-				m_bMovingToDestination = false;
-			} else if((Distance > 30) && (!IsSitting())) {
-				TeleportToCoords(OwnerCoords.x, OwnerCoords.y, OwnerCoords.z);
-			} else {
-				m_Destination = OwnerCoords;
-			}
+			m_bMovingToDestination = false;
+		}
+		else if ((Distance > 30) && (!IsSitting()))
+		{
+			TeleportToCoords(Callback.OwnerPos.x, Callback.OwnerPos.y, Callback.OwnerPos.z);
+		}
+		else
+		{
+			m_Destination = Callback.OwnerPos;
 		}
 	}
 }
\ No newline at end of file
diff --git a/source/Mobs/Wolf.h b/source/Mobs/Wolf.h
index bc26fbf9b..faae1d7af 100644
--- a/source/Mobs/Wolf.h
+++ b/source/Mobs/Wolf.h
@@ -21,30 +21,32 @@ public:
 	virtual void DoTakeDamage(TakeDamageInfo & a_TDI) override;
 	virtual void OnRightClicked(cPlayer & a_Player) override;
 	virtual void Tick(float a_Dt, cChunk & a_Chunk) override;
+	virtual void TickFollowPlayer();
 
 	// Get functions
-	bool IsSitting(void) const     { return m_IsSitting; }
-	bool IsTame(void) const        { return m_IsTame; }
-	bool IsBegging(void) const     { return m_IsBegging; }
-	bool IsAngry(void) const       { return m_IsAngry; }
-	AString GetOwner(void) const   { return m_Owner; }
-	int GetCollarColor(void) const { return m_Collar; }
+	bool    IsSitting     (void) const { return m_IsSitting; }
+	bool    IsTame        (void) const { return m_IsTame; }
+	bool    IsBegging     (void) const { return m_IsBegging; }
+	bool    IsAngry       (void) const { return m_IsAngry; }
+	AString GetOwner      (void) const { return m_OwnerName; }
+	int     GetCollarColor(void) const { return m_CollarColor; }
 
 	// Set functions
-	void SetIsSitting(bool a_IsSitting)      { m_IsSitting = a_IsSitting; }
-	void SetIsTame(bool a_IsTame)            { m_IsTame = a_IsTame; }
-	void SetIsBegging(bool a_IsBegging)      { m_IsBegging = a_IsBegging; }
-	void SetIsAngry(bool a_IsAngry)          { m_IsAngry = a_IsAngry; }
-	void SetOwner(AString a_NewOwner)        { m_Owner = a_NewOwner; }
-
-private:
-
-	bool    m_IsSitting;
-	bool    m_IsTame;
-	bool    m_IsBegging;
-	bool    m_IsAngry;
-	AString m_Owner;
-	int     m_Collar;
+	void SetIsSitting  (bool a_IsSitting)   { m_IsSitting = a_IsSitting; }
+	void SetIsTame     (bool a_IsTame)      { m_IsTame = a_IsTame; }
+	void SetIsBegging  (bool a_IsBegging)   { m_IsBegging = a_IsBegging; }
+	void SetIsAngry    (bool a_IsAngry)     { m_IsAngry = a_IsAngry; }
+	void SetOwner      (AString a_NewOwner) { m_OwnerName = a_NewOwner; }
+	void SetCollarColor(int a_CollarColor)  { m_CollarColor = a_CollarColor; }
+
+protected:
+
+	bool      m_IsSitting;
+	bool      m_IsTame;
+	bool      m_IsBegging;
+	bool      m_IsAngry;
+	AString   m_OwnerName;
+	int       m_CollarColor;
 } ;