From 2823ce5858ce088dd7f8aa49217f5d1b4eb80d96 Mon Sep 17 00:00:00 2001 From: megamage Date: Sat, 6 Dec 2008 19:54:01 -0600 Subject: [PATCH] *Fix WaypointMovementGenerator. By trullyone. --HG-- branch : trunk --- src/game/WaypointMovementGenerator.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/game/WaypointMovementGenerator.h b/src/game/WaypointMovementGenerator.h index 9f902a17fe..86e1b0beea 100644 --- a/src/game/WaypointMovementGenerator.h +++ b/src/game/WaypointMovementGenerator.h @@ -55,7 +55,6 @@ class TRINITY_DLL_SPEC PathMovementBase void ReloadPath(T &); uint32 GetCurrentNode() const { return i_currentNode; } - virtual bool GetDestination(float& x, float& y, float& z) const { i_destinationHolder.GetDestination(x,y,z); return true; } protected: uint32 i_currentNode; DestinationHolder< Traveller > i_destinationHolder; @@ -104,6 +103,8 @@ public PathMovementBase // statics static void Initialize(void); + + bool GetDestination(float& x, float& y, float& z) const { i_destinationHolder.GetDestination(x,y,z); return true; } private: void ClearWaypoints(); bool b_StopedByPlayer; @@ -134,5 +135,6 @@ public PathMovementBase inline bool HasArrived() const { return (i_currentNode >= i_path.Size()); } void SetCurrentNodeAfterTeleport(); void SkipCurrentNode() { ++i_currentNode; } + bool GetDestination(float& x, float& y, float& z) const { i_destinationHolder.GetDestination(x,y,z); return true; } }; #endif