*Merge with 448.

--HG--
branch : trunk

1 files changed, 12 insertions, 0 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){}