From 5ffdaa8142da27c68f467f26c4f28129865b7bf9 Mon Sep 17 00:00:00 2001
From: archshift <admin@archshift.com>
Date: Fri, 25 Apr 2014 12:59:55 -0700
Subject: Moved huge conditional out of InStateChasing(), improving readability

Squashed a warning.
---
 src/Mobs/AggressiveMonster.cpp | 17 ++++++++++++++++-
 src/Mobs/AggressiveMonster.h   |  4 ++++
 2 files changed, 20 insertions(+), 1 deletion(-)

(limited to 'src/Mobs')

diff --git a/src/Mobs/AggressiveMonster.cpp b/src/Mobs/AggressiveMonster.cpp
index 0901f85a9..cafa7ee74 100644
--- a/src/Mobs/AggressiveMonster.cpp
+++ b/src/Mobs/AggressiveMonster.cpp
@@ -37,7 +37,7 @@ void cAggressiveMonster::InStateChasing(float a_Dt)
 			}
 		}
 
-		if (((float)m_FinalDestination.x != (float)m_Target->GetPosX()) || ((float)m_FinalDestination.z != (float)m_Target->GetPosZ()))
+		if (!IsMovingToTargetPosition())
 		{
 			MoveToPosition(m_Target->GetPosition());
 		}
@@ -106,3 +106,18 @@ void cAggressiveMonster::Attack(float a_Dt)
 
 
 
+bool cAggressiveMonster::IsMovingToTargetPosition()
+{
+	float epsilon = 0.000000000001;
+	//Difference between destination x and target x is negligable (to 10^-12 precision)
+	if (fabsf((float)m_FinalDestination.x - (float)m_Target->GetPosX()) < epsilon)
+	{
+		return false;
+	}
+	//Difference between destination z and target z is negligable (to 10^-12 precision)
+	else if (fabsf(m_FinalDestination.z - (float)m_Target->GetPosZ()) > epsilon)
+	{
+		return false;
+	}
+	return true;
+}
diff --git a/src/Mobs/AggressiveMonster.h b/src/Mobs/AggressiveMonster.h
index 152260f95..c66452360 100644
--- a/src/Mobs/AggressiveMonster.h
+++ b/src/Mobs/AggressiveMonster.h
@@ -22,6 +22,10 @@ public:
 	virtual void EventSeePlayer(cEntity *) override;
 	virtual void Attack(float a_Dt);
 
+protected:
+	/* Whether this mob's destination is the same as its target's position. */
+	bool IsMovingToTargetPosition();
+
 } ;
 
 
-- 
cgit v1.2.3