*Merge with 448.

--HG--
branch : trunk

2 files changed, 13 insertions, 1 deletions

diff --git a/src/game/WaypointMovementGenerator.cpp b/src/game/WaypointMovementGenerator.cpp
index 84f121eb9b3..47119aa007c 100644
--- a/src/game/WaypointMovementGenerator.cpp
+++ b/src/game/WaypointMovementGenerator.cpp
@@ -66,6 +66,18 @@ void WaypointMovementGenerator<Creature>::MovementInform(Creature &unit)
     unit.AI()->MovementInform(WAYPOINT_MOTION_TYPE, i_currentNode);
 }
 
+template<class T>
+bool WaypointMovementGenerator<T>::GetDestination(float &x, float &y, float &z) const
+{
+    if(i_destinationHolder.HasArrived())
+        return false; 
+    
+    i_destinationHolder.GetDestination(x, y, z); 
+    return true;
+}
+template bool WaypointMovementGenerator<Creature>::GetDestination(float &x, float &y, float &z) const;
+template bool WaypointMovementGenerator<Player>::GetDestination(float &x, float &y, float &z) const;
+
 template<>
 void WaypointMovementGenerator<Creature>::Reset(Creature &unit){}
 
diff --git a/src/game/WaypointMovementGenerator.h b/src/game/WaypointMovementGenerator.h
index 78752c771f0..5995188ac8d 100644
--- a/src/game/WaypointMovementGenerator.h
+++ b/src/game/WaypointMovementGenerator.h
@@ -76,7 +76,7 @@ class TRINITY_DLL_SPEC WaypointMovementGenerator
 		void GeneratePathId(T &);
 		void Reset(T &unit);
         bool Update(T &, const uint32 &);
-		bool GetDestination(float &x, float &y, float &z) const{if(i_destinationHolder.HasArrived())return false; i_destinationHolder.GetDestination(x, y, z); return true;}
+		bool GetDestination(float &x, float &y, float &z) const;
 		MovementGeneratorType GetMovementGeneratorType() { return WAYPOINT_MOTION_TYPE; }
 
 	private: