Merge [SD2]

r1294 Let EscortAI fill waypoint list at Start(). Scripts using escortAI then no longer need to call FillPointMovementListForCreature().
r1295 Move one misplaced source file.

--HG--
branch : trunk

1 files changed, 5 insertions, 0 deletions

diff --git a/src/bindings/scripts/base/escortAI.cpp b/src/bindings/scripts/base/escortAI.cpp
index 4fcfb00b0f9..52b398cd59c 100644
--- a/src/bindings/scripts/base/escortAI.cpp
+++ b/src/bindings/scripts/base/escortAI.cpp
@@ -345,6 +345,11 @@ void npc_escortAI::Start(bool bIsActiveAttacker, bool bRun, uint64 uiPlayerGUID,
         return;
     }
 
+    if (!WaypointList.empty())
+        WaypointList.clear();
+
+    FillPointMovementListForCreature();
+
     if (WaypointList.empty())
     {
         error_db_log("TSCR: EscortAI Start with 0 waypoints (possible missing entry in script_waypoint)");