From eb6f664545b4917feab5bcadf30616d07da7d9d6 Mon Sep 17 00:00:00 2001 From: Samuel Barney Date: Wed, 20 Aug 2014 08:28:45 -0600 Subject: Revert "Moved m_FinalDestination out where I could get to it." This reverts commit e5b0964895ebefa7ef77c9879419cf46ee1f216d. --- src/Mobs/Monster.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/Mobs/Monster.h b/src/Mobs/Monster.h index 1ac5b8253..906b0dd28 100644 --- a/src/Mobs/Monster.h +++ b/src/Mobs/Monster.h @@ -71,8 +71,6 @@ public: } ; // tolua_end - /** Coordinates for the ultimate, final destination. */ - Vector3d m_FinalDestination; enum MState{ATTACKING, IDLE, CHASING, ESCAPING} m_EMState; enum MPersonality{PASSIVE,AGGRESSIVE,COWARDLY} m_EMPersonality; @@ -119,8 +117,6 @@ public: int GetAttackRate() { return (int)m_AttackRate; } int GetAttackInterval() { return (int)m_AttackInterval; } int GetSightDistance() { return m_SightDistance; } - int GetAttackDamage() { return m_AttackDamage; } - int GetAttackRange() { return m_AttackRange; } void SetAttackRate(float a_AttackRate) { m_AttackRate = a_AttackRate; } void SetAttackInterval(float a_AttackInterval) { m_AttackInterval = a_AttackInterval; } void SetAttackRange(int a_AttackRange) { m_AttackRange = a_AttackRange; } @@ -178,6 +174,8 @@ protected: cEntity * m_Target; /** Coordinates of the next position that should be reached */ Vector3d m_Destination; + /** Coordinates for the ultimate, final destination. */ + Vector3d m_FinalDestination; /** Returns if the ultimate, final destination has been reached */ bool ReachedFinalDestination(void); -- cgit v1.2.3