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

35 files changed, 52 insertions, 198 deletions

diff --git a/src/bindings/scripts/CMakeLists.txt b/src/bindings/scripts/CMakeLists.txt
index b34978b5ce9..fd258cd6c81 100644
--- a/src/bindings/scripts/CMakeLists.txt
+++ b/src/bindings/scripts/CMakeLists.txt
@@ -28,6 +28,7 @@ SET(trinityscript_LIB_SRCS
    scripts/eastern_kingdoms/ghostlands.cpp
    scripts/eastern_kingdoms/hinterlands.cpp
    scripts/eastern_kingdoms/ironforge.cpp
+   scripts/eastern_kingdoms/isle_of_queldanas.cpp
    scripts/eastern_kingdoms/loch_modan.cpp
    scripts/eastern_kingdoms/searing_gorge.cpp
    scripts/eastern_kingdoms/silvermoon_city.cpp
@@ -73,7 +74,6 @@ SET(trinityscript_LIB_SRCS
    scripts/outland/boss_doomlord_kazzak.cpp
    scripts/outland/boss_doomwalker.cpp
    scripts/outland/hellfire_peninsula.cpp
-   scripts/outland/isle_of_queldanas.cpp
    scripts/outland/nagrand.cpp
    scripts/outland/netherstorm.cpp
    scripts/outland/shadowmoon_valley.cpp
diff --git a/src/bindings/scripts/VC80/80ScriptDev2.vcproj b/src/bindings/scripts/VC80/80ScriptDev2.vcproj
index 38ffd7dfa73..95469729521 100644
--- a/src/bindings/scripts/VC80/80ScriptDev2.vcproj
+++ b/src/bindings/scripts/VC80/80ScriptDev2.vcproj
@@ -443,6 +443,10 @@
                     >
                 </File>
                 <File
+                    RelativePath="..\scripts\eastern_kingdoms\isle_of_queldanas.cpp"
+                    >
+                </File>
+                <File
                     RelativePath="..\scripts\eastern_kingdoms\loch_modan.cpp"
                     >
                 </File>
@@ -638,10 +642,6 @@
                     >
                 </File>
                 <File
-                    RelativePath="..\scripts\outland\isle_of_queldanas.cpp"
-                    >
-                </File>
-                <File
                     RelativePath="..\scripts\outland\nagrand.cpp"
                     >
                 </File>
diff --git a/src/bindings/scripts/VC90/90ScriptDev2.vcproj b/src/bindings/scripts/VC90/90ScriptDev2.vcproj
index 80f34afd82f..0db7d101594 100644
--- a/src/bindings/scripts/VC90/90ScriptDev2.vcproj
+++ b/src/bindings/scripts/VC90/90ScriptDev2.vcproj
@@ -440,6 +440,10 @@
                     >
                 </File>
                 <File
+                    RelativePath="..\scripts\eastern_kingdoms\isle_of_queldanas.cpp"
+                    >
+                </File>
+                <File
                     RelativePath="..\scripts\eastern_kingdoms\loch_modan.cpp"
                     >
                 </File>
@@ -635,10 +639,6 @@
                     >
                 </File>
                 <File
-                    RelativePath="..\scripts\outland\isle_of_queldanas.cpp"
-                    >
-                </File>
-                <File
                     RelativePath="..\scripts\outland\nagrand.cpp"
                     >
                 </File>
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)");
diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/arathi_highlands.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/arathi_highlands.cpp
index d95fce3a016..bc33d9841eb 100644
--- a/src/bindings/scripts/scripts/eastern_kingdoms/arathi_highlands.cpp
+++ b/src/bindings/scripts/scripts/eastern_kingdoms/arathi_highlands.cpp
@@ -114,11 +114,7 @@ bool QuestAccept_npc_professor_phizzlethorpe(Player* pPlayer, Creature* pCreatur
 
 CreatureAI* GetAI_npc_professor_phizzlethorpeAI(Creature* pCreature)
 {
-    npc_professor_phizzlethorpeAI* professor_phizzlethorpeAI = new npc_professor_phizzlethorpeAI(pCreature);
-
-    professor_phizzlethorpeAI->FillPointMovementListForCreature();
-
-    return professor_phizzlethorpeAI;
+    return new npc_professor_phizzlethorpeAI(pCreature);
 }
 
 void AddSC_arathi_highlands()
diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/eversong_woods.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/eversong_woods.cpp
index 78326ffb82b..6c76adeaecb 100644
--- a/src/bindings/scripts/scripts/eastern_kingdoms/eversong_woods.cpp
+++ b/src/bindings/scripts/scripts/eastern_kingdoms/eversong_woods.cpp
@@ -85,11 +85,7 @@ struct TRINITY_DLL_DECL npc_prospector_anvilwardAI : public npc_escortAI
 
 CreatureAI* GetAI_npc_prospector_anvilward(Creature* pCreature)
 {
-    npc_prospector_anvilwardAI* thisAI = new npc_prospector_anvilwardAI(pCreature);
-
-    thisAI->FillPointMovementListForCreature();
-
-    return thisAI;
+    return new npc_prospector_anvilwardAI(pCreature);
 }
 
 bool GossipHello_npc_prospector_anvilward(Player* pPlayer, Creature* pCreature)
diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/ghostlands.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/ghostlands.cpp
index 2416096e6af..c96923661de 100644
--- a/src/bindings/scripts/scripts/eastern_kingdoms/ghostlands.cpp
+++ b/src/bindings/scripts/scripts/eastern_kingdoms/ghostlands.cpp
@@ -234,11 +234,7 @@ bool QuestAccept_npc_ranger_lilatha(Player* pPlayer, Creature* pCreature, Quest
 
 CreatureAI* GetAI_npc_ranger_lilathaAI(Creature* pCreature)
 {
-    npc_ranger_lilathaAI* ranger_lilathaAI = new npc_ranger_lilathaAI(pCreature);
-
-    ranger_lilathaAI->FillPointMovementListForCreature();
-
-    return ranger_lilathaAI;
+    return new npc_ranger_lilathaAI(pCreature);
 }
 
 void AddSC_ghostlands()
diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/hinterlands.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/hinterlands.cpp
index 69005114ff6..46f12159acf 100644
--- a/src/bindings/scripts/scripts/eastern_kingdoms/hinterlands.cpp
+++ b/src/bindings/scripts/scripts/eastern_kingdoms/hinterlands.cpp
@@ -215,11 +215,7 @@ bool QuestAccept_npc_rinji(Player* pPlayer, Creature* pCreature, const Quest* pQ
 
 CreatureAI* GetAI_npc_rinji(Creature* pCreature)
 {
-    npc_rinjiAI* pTempAI = new npc_rinjiAI(pCreature);
-
-    pTempAI->FillPointMovementListForCreature();
-
-    return (CreatureAI*)pTempAI;
+    return new npc_rinjiAI(pCreature);
 }
 
 void AddSC_hinterlands()
diff --git a/src/bindings/scripts/scripts/outland/isle_of_queldanas.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/isle_of_queldanas.cpp
index 469e2f712f1..469e2f712f1 100644
--- a/src/bindings/scripts/scripts/outland/isle_of_queldanas.cpp
+++ b/src/bindings/scripts/scripts/eastern_kingdoms/isle_of_queldanas.cpp
diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/westfall.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/westfall.cpp
index dadef602e04..3ddaffe6e25 100644
--- a/src/bindings/scripts/scripts/eastern_kingdoms/westfall.cpp
+++ b/src/bindings/scripts/scripts/eastern_kingdoms/westfall.cpp
@@ -176,11 +176,7 @@ bool QuestAccept_npc_daphne_stilwell(Player* pPlayer, Creature* pCreature, const
 
 CreatureAI* GetAI_npc_daphne_stilwell(Creature* pCreature)
 {
-    npc_daphne_stilwellAI* thisAI = new npc_daphne_stilwellAI(pCreature);
-
-    thisAI->FillPointMovementListForCreature();
-
-    return thisAI;
+    return new npc_daphne_stilwellAI(pCreature);
 }
 
 /*######
@@ -250,11 +246,7 @@ bool QuestAccept_npc_defias_traitor(Player* pPlayer, Creature* pCreature, Quest
 
 CreatureAI* GetAI_npc_defias_traitor(Creature* pCreature)
 {
-    npc_defias_traitorAI* thisAI = new npc_defias_traitorAI(pCreature);
-
-    thisAI->FillPointMovementListForCreature();
-
-    return thisAI;
+    return new npc_defias_traitorAI(pCreature);
 }
 
 void AddSC_westfall()
diff --git a/src/bindings/scripts/scripts/examples/example_escort.cpp b/src/bindings/scripts/scripts/examples/example_escort.cpp
index 21d29f848f2..23c97fb9b60 100644
--- a/src/bindings/scripts/scripts/examples/example_escort.cpp
+++ b/src/bindings/scripts/scripts/examples/example_escort.cpp
@@ -169,18 +169,7 @@ struct TRINITY_DLL_DECL example_escortAI : public npc_escortAI
 
 CreatureAI* GetAI_example_escort(Creature* pCreature)
 {
-    example_escortAI* pTestAI = new example_escortAI(pCreature);
-
-    // this should be done over the db table scriptdev2.script_waypoint
-    // when using the db, you have to call this line instead of the ->AddWaypoint():
-    // pTestAI->FillPointMovementListForCreature();
-    pTestAI->AddWaypoint(0, 1231.0f, -4419.0f, 23.0f);
-    pTestAI->AddWaypoint(1, 1198.0f, -4440.0f, 23.0f);
-    pTestAI->AddWaypoint(2, 1208.0f, -4392.0f, 23.0f);
-    pTestAI->AddWaypoint(3, 1231.0f, -4419.0f, 23.0f, 5000);
-    pTestAI->AddWaypoint(4, 1208.0f, -4392.0f, 23.0f, 5000);
-
-    return pTestAI;
+    return new example_escortAI(pCreature);
 }
 
 bool GossipHello_example_escort(Player* pPlayer, Creature* pCreature)
diff --git a/src/bindings/scripts/scripts/kalimdor/ashenvale.cpp b/src/bindings/scripts/scripts/kalimdor/ashenvale.cpp
index 271caf17215..86f3286c92f 100644
--- a/src/bindings/scripts/scripts/kalimdor/ashenvale.cpp
+++ b/src/bindings/scripts/scripts/kalimdor/ashenvale.cpp
@@ -144,11 +144,7 @@ bool QuestAccept_npc_torek(Player* pPlayer, Creature* pCreature, Quest const* qu
 
 CreatureAI* GetAI_npc_torek(Creature* pCreature)
 {
-    npc_torekAI* thisAI = new npc_torekAI(pCreature);
-
-    thisAI->FillPointMovementListForCreature();
- 
-    return thisAI;
+    return new npc_torekAI(pCreature);
 }
 
 /*####
@@ -230,11 +226,7 @@ bool QuestAccept_npc_ruul_snowhoof(Player* pPlayer, Creature* pCreature, Quest c
 
 CreatureAI* GetAI_npc_ruul_snowhoofAI(Creature* pCreature)
 {
-    npc_ruul_snowhoofAI* ruul_snowhoofAI = new npc_ruul_snowhoofAI(pCreature);
-
-    ruul_snowhoofAI->FillPointMovementListForCreature();
-
-    return ruul_snowhoofAI;
+    return new npc_ruul_snowhoofAI(pCreature);
 }
 
 void AddSC_ashenvale()
diff --git a/src/bindings/scripts/scripts/kalimdor/azuremyst_isle.cpp b/src/bindings/scripts/scripts/kalimdor/azuremyst_isle.cpp
index 1d8d283a7bb..71341f4d0ee 100644
--- a/src/bindings/scripts/scripts/kalimdor/azuremyst_isle.cpp
+++ b/src/bindings/scripts/scripts/kalimdor/azuremyst_isle.cpp
@@ -383,11 +383,7 @@ bool QuestAccept_npc_magwin(Player* pPlayer, Creature* pCreature, Quest const* q
 
 CreatureAI* GetAI_npc_magwinAI(Creature* pCreature)
 {
-    npc_magwinAI* magwinAI = new npc_magwinAI(pCreature);
-
-    magwinAI->FillPointMovementListForCreature();
-
-    return magwinAI;
+    return new npc_magwinAI(pCreature);
 }
 
 /*######
diff --git a/src/bindings/scripts/scripts/kalimdor/darkshore.cpp b/src/bindings/scripts/scripts/kalimdor/darkshore.cpp
index fa10893582f..fef5cf36e43 100644
--- a/src/bindings/scripts/scripts/kalimdor/darkshore.cpp
+++ b/src/bindings/scripts/scripts/kalimdor/darkshore.cpp
@@ -145,11 +145,7 @@ struct TRINITY_DLL_DECL npc_prospector_remtravelAI : public npc_escortAI
 
 CreatureAI* GetAI_npc_prospector_remtravel(Creature* pCreature)
 {
-    npc_prospector_remtravelAI* tempAI = new npc_prospector_remtravelAI(pCreature);
-
-    tempAI->FillPointMovementListForCreature();
-
-    return tempAI;
+    return new npc_prospector_remtravelAI(pCreature);
 }
 
 bool QuestAccept_npc_prospector_remtravel(Player* pPlayer, Creature* pCreature, const Quest* pQuest)
diff --git a/src/bindings/scripts/scripts/kalimdor/feralas.cpp b/src/bindings/scripts/scripts/kalimdor/feralas.cpp
index 0816a171644..826d9cf19f8 100644
--- a/src/bindings/scripts/scripts/kalimdor/feralas.cpp
+++ b/src/bindings/scripts/scripts/kalimdor/feralas.cpp
@@ -143,11 +143,7 @@ struct TRINITY_DLL_DECL npc_oox22feAI : public npc_escortAI
 
 CreatureAI* GetAI_npc_oox22fe(Creature* pCreature)
 {
-    npc_oox22feAI* oox22AI = new npc_oox22feAI(pCreature);
-
-    oox22AI->FillPointMovementListForCreature();
-
-    return oox22AI;
+    return new npc_oox22feAI(pCreature);
 }
 
 bool QuestAccept_npc_oox22fe(Player* pPlayer, Creature* pCreature, const Quest* pQuest)
diff --git a/src/bindings/scripts/scripts/kalimdor/stonetalon_mountains.cpp b/src/bindings/scripts/scripts/kalimdor/stonetalon_mountains.cpp
index ddf852063c7..5c9dbe0b199 100644
--- a/src/bindings/scripts/scripts/kalimdor/stonetalon_mountains.cpp
+++ b/src/bindings/scripts/scripts/kalimdor/stonetalon_mountains.cpp
@@ -146,11 +146,7 @@ bool QuestAccept_npc_kaya_flathoof(Player* pPlayer, Creature* pCreature, Quest c
 
 CreatureAI* GetAI_npc_kaya_flathoofAI(Creature* pCreature)
 {
-    npc_kaya_flathoofAI* kayaAI = new npc_kaya_flathoofAI(pCreature);
-
-    kayaAI->FillPointMovementListForCreature();
-
-    return kayaAI;
+    return new npc_kaya_flathoofAI(pCreature);
 }
 
 /*######
diff --git a/src/bindings/scripts/scripts/kalimdor/tanaris.cpp b/src/bindings/scripts/scripts/kalimdor/tanaris.cpp
index 8298190bf9b..be97636270e 100644
--- a/src/bindings/scripts/scripts/kalimdor/tanaris.cpp
+++ b/src/bindings/scripts/scripts/kalimdor/tanaris.cpp
@@ -214,11 +214,7 @@ struct TRINITY_DLL_DECL npc_custodian_of_timeAI : public npc_escortAI
 
 CreatureAI* GetAI_npc_custodian_of_time(Creature* pCreature)
 {
-    npc_custodian_of_timeAI* custodian_of_timeAI = new npc_custodian_of_timeAI(pCreature);
-
-    custodian_of_timeAI->FillPointMovementListForCreature();
-
-    return custodian_of_timeAI;
+    return new npc_custodian_of_timeAI(pCreature);
 }
 
 /*######
diff --git a/src/bindings/scripts/scripts/kalimdor/the_barrens.cpp b/src/bindings/scripts/scripts/kalimdor/the_barrens.cpp
index ccb83e8c029..aff67963445 100644
--- a/src/bindings/scripts/scripts/kalimdor/the_barrens.cpp
+++ b/src/bindings/scripts/scripts/kalimdor/the_barrens.cpp
@@ -146,11 +146,7 @@ struct TRINITY_DLL_DECL npc_giltharesAI : public npc_escortAI
 
 CreatureAI* GetAI_npc_gilthares(Creature* pCreature)
 {
-    npc_giltharesAI* pTempAI = new npc_giltharesAI(pCreature);
-
-    pTempAI->FillPointMovementListForCreature();
-
-    return (CreatureAI*)pTempAI;
+    return new npc_giltharesAI(pCreature);
 }
 
 bool QuestAccept_npc_gilthares(Player* pPlayer, Creature* pCreature, const Quest* pQuest)
diff --git a/src/bindings/scripts/scripts/kalimdor/thousand_needles.cpp b/src/bindings/scripts/scripts/kalimdor/thousand_needles.cpp
index 6736ec18b29..6ec4a1403ab 100644
--- a/src/bindings/scripts/scripts/kalimdor/thousand_needles.cpp
+++ b/src/bindings/scripts/scripts/kalimdor/thousand_needles.cpp
@@ -82,11 +82,7 @@ struct TRINITY_DLL_DECL npc_kanatiAI : public npc_escortAI
 
 CreatureAI* GetAI_npc_kanati(Creature* pCreature)
 {
-    npc_kanatiAI* pTempAI = new npc_kanatiAI(pCreature);
-
-    pTempAI->FillPointMovementListForCreature();
-
-    return (CreatureAI*)pTempAI;
+    return new npc_kanatiAI(pCreature);
 }
 
 bool QuestAccept_npc_kanati(Player* pPlayer, Creature* pCreature, const Quest* pQuest)
@@ -170,11 +166,7 @@ struct TRINITY_DLL_DECL npc_lakota_windsongAI : public npc_escortAI
 
 CreatureAI* GetAI_npc_lakota_windsong(Creature* pCreature)
 {
-    npc_lakota_windsongAI* pTempAI = new npc_lakota_windsongAI(pCreature);
-
-    pTempAI->FillPointMovementListForCreature();
-
-    return (CreatureAI*)pTempAI;
+    return new npc_lakota_windsongAI(pCreature);
 }
 
 bool QuestAccept_npc_lakota_windsong(Player* pPlayer, Creature* pCreature, const Quest* pQuest)
@@ -247,11 +239,7 @@ struct TRINITY_DLL_DECL npc_paoka_swiftmountainAI : public npc_escortAI
 
 CreatureAI* GetAI_npc_paoka_swiftmountain(Creature* pCreature)
 {
-    npc_paoka_swiftmountainAI* pTempAI = new npc_paoka_swiftmountainAI(pCreature);
-
-    pTempAI->FillPointMovementListForCreature();
-
-    return (CreatureAI*)pTempAI;
+    return new npc_paoka_swiftmountainAI(pCreature);
 }
 
 bool QuestAccept_npc_paoka_swiftmountain(Player* pPlayer, Creature* pCreature, const Quest* pQuest)
diff --git a/src/bindings/scripts/scripts/northrend/sholazar_basin.cpp b/src/bindings/scripts/scripts/northrend/sholazar_basin.cpp
index bf146b11522..da370ac4978 100644
--- a/src/bindings/scripts/scripts/northrend/sholazar_basin.cpp
+++ b/src/bindings/scripts/scripts/northrend/sholazar_basin.cpp
@@ -160,11 +160,7 @@ bool QuestAccept_npc_injured_rainspeaker_oracle(Player* pPlayer, Creature* pCrea
 
 CreatureAI* GetAI_npc_injured_rainspeaker_oracle(Creature* pCreature)
 {
-    npc_injured_rainspeaker_oracleAI* thisAI = new npc_injured_rainspeaker_oracleAI(pCreature);
-
-    thisAI->FillPointMovementListForCreature();
-
-    return thisAI;
+    return new npc_injured_rainspeaker_oracleAI(pCreature);
 }
 
 void AddSC_sholazar_basin()
diff --git a/src/bindings/scripts/scripts/outland/hellfire_peninsula.cpp b/src/bindings/scripts/scripts/outland/hellfire_peninsula.cpp
index cd5a94319a7..e33f430894e 100644
--- a/src/bindings/scripts/scripts/outland/hellfire_peninsula.cpp
+++ b/src/bindings/scripts/scripts/outland/hellfire_peninsula.cpp
@@ -197,11 +197,7 @@ struct TRINITY_DLL_DECL npc_wounded_blood_elfAI : public npc_escortAI
 
 CreatureAI* GetAI_npc_wounded_blood_elf(Creature* pCreature)
 {
-    npc_wounded_blood_elfAI* welfAI = new npc_wounded_blood_elfAI(pCreature);
-
-    welfAI->FillPointMovementListForCreature();
-
-    return welfAI;
+    return new npc_wounded_blood_elfAI(pCreature);
 }
 
 bool QuestAccept_npc_wounded_blood_elf(Player* pPlayer, Creature* pCreature, Quest const* quest)
diff --git a/src/bindings/scripts/scripts/outland/shadowmoon_valley.cpp b/src/bindings/scripts/scripts/outland/shadowmoon_valley.cpp
index 779869cc781..41b1ec159b8 100644
--- a/src/bindings/scripts/scripts/outland/shadowmoon_valley.cpp
+++ b/src/bindings/scripts/scripts/outland/shadowmoon_valley.cpp
@@ -1017,11 +1017,7 @@ struct TRINITY_DLL_DECL npc_earthmender_wildaAI : public npc_escortAI
 
 CreatureAI* GetAI_npc_earthmender_wilda(Creature* pCreature)
 {
-    npc_earthmender_wildaAI* pTempAI = new npc_earthmender_wildaAI(pCreature);
-
-    pTempAI->FillPointMovementListForCreature();
-
-    return (CreatureAI*)pTempAI;
+    return new npc_earthmender_wildaAI(pCreature);
 }
 
 bool QuestAccept_npc_earthmender_wilda(Player* pPlayer, Creature* pCreature, const Quest* pQuest)
diff --git a/src/bindings/scripts/scripts/outland/shattrath_city.cpp b/src/bindings/scripts/scripts/outland/shattrath_city.cpp
index 054615bc3b3..e44aea2e0a0 100644
--- a/src/bindings/scripts/scripts/outland/shattrath_city.cpp
+++ b/src/bindings/scripts/scripts/outland/shattrath_city.cpp
@@ -356,11 +356,7 @@ public:
 };
 CreatureAI* GetAI_npc_kservantAI(Creature* pCreature)
 {
-    npc_kservantAI* kservantAI = new npc_kservantAI(pCreature);
-
-    kservantAI->FillPointMovementListForCreature();
-
-    return kservantAI;
+    return new npc_kservantAI(pCreature);
 }
 
 /*######
diff --git a/src/bindings/scripts/scripts/outland/terokkar_forest.cpp b/src/bindings/scripts/scripts/outland/terokkar_forest.cpp
index 8ac9aef4a04..ebe8c0b944f 100644
--- a/src/bindings/scripts/scripts/outland/terokkar_forest.cpp
+++ b/src/bindings/scripts/scripts/outland/terokkar_forest.cpp
@@ -221,11 +221,7 @@ public:
 
 CreatureAI* GetAI_npc_skywingAI(Creature* pCreature)
 {
-    npc_skywingAI* skywingAI = new npc_skywingAI(pCreature);
-
-    skywingAI->FillPointMovementListForCreature();
-
-    return skywingAI;
+    return new npc_skywingAI(pCreature);
 }
 
 /*######
@@ -675,11 +671,7 @@ bool QuestAccept_npc_akuno(Player* pPlayer, Creature* pCreature, Quest const* pQ
 
 CreatureAI* GetAI_npc_akuno(Creature* pCreature)
 {
-    npc_akunoAI* thisAI = new npc_akunoAI(pCreature);
-
-    thisAI->FillPointMovementListForCreature();
-
-    return(CreatureAI*)thisAI;
+    return new npc_akunoAI(pCreature);
 }
 
 void AddSC_terokkar_forest()
diff --git a/src/bindings/scripts/scripts/outland/zangarmarsh.cpp b/src/bindings/scripts/scripts/outland/zangarmarsh.cpp
index dfa472237b6..5267767c544 100644
--- a/src/bindings/scripts/scripts/outland/zangarmarsh.cpp
+++ b/src/bindings/scripts/scripts/outland/zangarmarsh.cpp
@@ -331,11 +331,7 @@ bool QuestAccept_npc_kayra_longmane(Player* pPlayer, Creature* pCreature, Quest
 
 CreatureAI* GetAI_npc_kayra_longmaneAI(Creature* pCreature)
 {
-    npc_kayra_longmaneAI* thisAI = new npc_kayra_longmaneAI(pCreature);
-
-    thisAI->FillPointMovementListForCreature();
-
-    return thisAI;
+    return new npc_kayra_longmaneAI(pCreature);
 }
 /*######
 ## AddSC
diff --git a/src/bindings/scripts/scripts/world/npcs_special.cpp b/src/bindings/scripts/scripts/world/npcs_special.cpp
index b35b9292698..2a56a825b11 100644
--- a/src/bindings/scripts/scripts/world/npcs_special.cpp
+++ b/src/bindings/scripts/scripts/world/npcs_special.cpp
@@ -1005,11 +1005,7 @@ struct TRINITY_DLL_DECL npc_garments_of_questsAI : public npc_escortAI
 
 CreatureAI* GetAI_npc_garments_of_quests(Creature* pCreature)
 {
-    npc_garments_of_questsAI* tempAI = new npc_garments_of_questsAI(pCreature);
-
-    tempAI->FillPointMovementListForCreature();
-
-    return tempAI;
+    return new npc_garments_of_questsAI(pCreature);
 }
 
 /*######
diff --git a/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_ambassador_hellmaw.cpp b/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_ambassador_hellmaw.cpp
index 39842444e5c..f9961e10174 100644
--- a/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_ambassador_hellmaw.cpp
+++ b/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_ambassador_hellmaw.cpp
@@ -203,11 +203,7 @@ struct TRINITY_DLL_DECL boss_ambassador_hellmawAI : public npc_escortAI
 
 CreatureAI* GetAI_boss_ambassador_hellmaw(Creature* pCreature)
 {
-    boss_ambassador_hellmawAI* pHellAI = new boss_ambassador_hellmawAI(pCreature);
-
-    pHellAI->FillPointMovementListForCreature();
-
-    return (CreatureAI*)pHellAI;
+    return new boss_ambassador_hellmawAI(pCreature);
 }
 
 void AddSC_boss_ambassador_hellmaw()
diff --git a/src/bindings/scripts/scripts/zone/blackrock_depths/blackrock_depths.cpp b/src/bindings/scripts/scripts/zone/blackrock_depths/blackrock_depths.cpp
index 04f48fcd2de..5eef2c90aa0 100644
--- a/src/bindings/scripts/scripts/zone/blackrock_depths/blackrock_depths.cpp
+++ b/src/bindings/scripts/scripts/zone/blackrock_depths/blackrock_depths.cpp
@@ -330,11 +330,7 @@ struct TRINITY_DLL_DECL npc_grimstoneAI : public npc_escortAI
 
 CreatureAI* GetAI_npc_grimstone(Creature* pCreature)
 {
-    npc_grimstoneAI* Grimstone_AI = new npc_grimstoneAI(pCreature);
-
-    Grimstone_AI->FillPointMovementListForCreature();
-
-    return Grimstone_AI;
+    return new npc_grimstoneAI(pCreature);
 }
 
 /*######
@@ -1191,11 +1187,7 @@ struct TRINITY_DLL_DECL npc_rocknotAI : public npc_escortAI
 
 CreatureAI* GetAI_npc_rocknot(Creature* pCreature)
 {
-    npc_rocknotAI* Rocknot_AI = new npc_rocknotAI(pCreature);
-
-    Rocknot_AI->FillPointMovementListForCreature();
-
-    return Rocknot_AI;
+    return new npc_rocknotAI(pCreature);
 }
 
 bool ChooseReward_npc_rocknot(Player* pPlayer, Creature* pCreature, const Quest *_Quest, uint32 item)
diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp
index 7bbc0e026a2..5559989ef65 100644
--- a/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp
+++ b/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp
@@ -483,11 +483,7 @@ struct TRINITY_DLL_DECL npc_thrall_old_hillsbradAI : public npc_escortAI
 
 CreatureAI* GetAI_npc_thrall_old_hillsbrad(Creature* pCreature)
 {
-    npc_thrall_old_hillsbradAI* thrall_walkAI = new npc_thrall_old_hillsbradAI(pCreature);
-
-    thrall_walkAI->FillPointMovementListForCreature();
-
-    return thrall_walkAI;
+    return new npc_thrall_old_hillsbradAI(pCreature);
 }
 
 bool GossipHello_npc_thrall_old_hillsbrad(Player* pPlayer, Creature* pCreature)
@@ -611,11 +607,7 @@ struct TRINITY_DLL_DECL npc_tarethaAI : public npc_escortAI
 };
 CreatureAI* GetAI_npc_taretha(Creature* pCreature)
 {
-    npc_tarethaAI* taretha_walkAI = new npc_tarethaAI(pCreature);
-
-    taretha_walkAI->FillPointMovementListForCreature();
-
-    return taretha_walkAI;
+    return new npc_tarethaAI(pCreature);
 }
 
 bool GossipHello_npc_taretha(Player* pPlayer, Creature* pCreature)
diff --git a/src/bindings/scripts/scripts/zone/eastern_plaguelands/the_scarlet_enclave.cpp b/src/bindings/scripts/scripts/zone/eastern_plaguelands/the_scarlet_enclave.cpp
index 26659932ca5..247a0084e77 100644
--- a/src/bindings/scripts/scripts/zone/eastern_plaguelands/the_scarlet_enclave.cpp
+++ b/src/bindings/scripts/scripts/zone/eastern_plaguelands/the_scarlet_enclave.cpp
@@ -647,11 +647,7 @@ struct TRINITY_DLL_DECL npc_koltira_deathweaverAI : public npc_escortAI
 
 CreatureAI* GetAI_npc_koltira_deathweaver(Creature* pCreature)
 {
-    npc_koltira_deathweaverAI* pTempAI = new npc_koltira_deathweaverAI(pCreature);
-
-    pTempAI->FillPointMovementListForCreature();
-
-    return (CreatureAI*)pTempAI;
+    return new npc_koltira_deathweaverAI(pCreature);
 }
 
 bool QuestAccept_npc_koltira_deathweaver(Player* pPlayer, Creature* pCreature, const Quest* pQuest)
diff --git a/src/bindings/scripts/scripts/zone/karazhan/karazhan.cpp b/src/bindings/scripts/scripts/zone/karazhan/karazhan.cpp
index 03a05b7218a..91dd4e44ad3 100644
--- a/src/bindings/scripts/scripts/zone/karazhan/karazhan.cpp
+++ b/src/bindings/scripts/scripts/zone/karazhan/karazhan.cpp
@@ -320,11 +320,7 @@ struct TRINITY_DLL_DECL npc_barnesAI : public npc_escortAI
 
 CreatureAI* GetAI_npc_barnesAI(Creature* pCreature)
 {
-    npc_barnesAI* Barnes_AI = new npc_barnesAI(pCreature);
-
-    Barnes_AI->FillPointMovementListForCreature();
-
-    return (CreatureAI*)Barnes_AI;
+    return new npc_barnesAI(pCreature);
 }
 
 bool GossipHello_npc_barnes(Player* pPlayer, Creature* pCreature)
diff --git a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_herod.cpp b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_herod.cpp
index 29661b719cf..5a1c8e6d364 100644
--- a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_herod.cpp
+++ b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_herod.cpp
@@ -140,11 +140,7 @@ struct TRINITY_DLL_DECL mob_scarlet_traineeAI : public npc_escortAI
 
 CreatureAI* GetAI_mob_scarlet_trainee(Creature* pCreature)
 {
-    mob_scarlet_traineeAI* thisAI = new mob_scarlet_traineeAI(pCreature);
-
-    thisAI->FillPointMovementListForCreature();
-
-    return thisAI;
+    return new mob_scarlet_traineeAI(pCreature);
 }
 
 void AddSC_boss_herod()
diff --git a/src/bindings/scripts/scripts/zone/shadowfang_keep/shadowfang_keep.cpp b/src/bindings/scripts/scripts/zone/shadowfang_keep/shadowfang_keep.cpp
index 8abb5bb90e1..5f9d42ea65e 100644
--- a/src/bindings/scripts/scripts/zone/shadowfang_keep/shadowfang_keep.cpp
+++ b/src/bindings/scripts/scripts/zone/shadowfang_keep/shadowfang_keep.cpp
@@ -102,11 +102,7 @@ struct TRINITY_DLL_DECL npc_shadowfang_prisonerAI : public npc_escortAI
 
 CreatureAI* GetAI_npc_shadowfang_prisoner(Creature* pCreature)
 {
-    npc_shadowfang_prisonerAI* prisonerAI = new npc_shadowfang_prisonerAI(pCreature);
-
-    prisonerAI->FillPointMovementListForCreature();
-
-    return prisonerAI;
+    return new npc_shadowfang_prisonerAI(pCreature);
 }
 
 bool GossipHello_npc_shadowfang_prisoner(Player* pPlayer, Creature* pCreature)
diff --git a/src/bindings/scripts/scripts/zone/wailing_caverns/wailing_caverns.cpp b/src/bindings/scripts/scripts/zone/wailing_caverns/wailing_caverns.cpp
index 2e130fca34b..622800127db 100644
--- a/src/bindings/scripts/scripts/zone/wailing_caverns/wailing_caverns.cpp
+++ b/src/bindings/scripts/scripts/zone/wailing_caverns/wailing_caverns.cpp
@@ -348,11 +348,7 @@ struct TRINITY_DLL_DECL npc_disciple_of_naralexAI : public npc_escortAI
 
 CreatureAI* GetAI_npc_disciple_of_naralex(Creature* pCreature)
 {
-    npc_disciple_of_naralexAI *disciple_of_naralexAI = new npc_disciple_of_naralexAI(pCreature);
-
-    disciple_of_naralexAI->FillPointMovementListForCreature();
-
-    return disciple_of_naralexAI;
+    return new npc_disciple_of_naralexAI(pCreature);
 }
 
 bool GossipHello_npc_disciple_of_naralex(Player* pPlayer, Creature* pCreature)
diff --git a/src/bindings/scripts/system/ScriptLoader.cpp b/src/bindings/scripts/system/ScriptLoader.cpp
index 1f20f85ebcf..1cca715eebe 100644
--- a/src/bindings/scripts/system/ScriptLoader.cpp
+++ b/src/bindings/scripts/system/ScriptLoader.cpp
@@ -38,6 +38,7 @@ extern void AddSC_eversong_woods();
 extern void AddSC_ghostlands();
 extern void AddSC_hinterlands();
 extern void AddSC_ironforge();
+extern void AddSC_isle_of_queldanas();
 extern void AddSC_loch_modan();
 extern void AddSC_searing_gorge();
 extern void AddSC_silvermoon_city();
@@ -85,7 +86,6 @@ extern void AddSC_blades_edge_mountains();
 extern void AddSC_boss_doomlordkazzak();
 extern void AddSC_boss_doomwalker();
 extern void AddSC_hellfire_peninsula();
-extern void AddSC_isle_of_queldanas();
 extern void AddSC_nagrand();
 extern void AddSC_netherstorm();
 extern void AddSC_shadowmoon_valley();
@@ -551,6 +551,7 @@ void AddScripts()
     AddSC_ghostlands();
     AddSC_hinterlands();
     AddSC_ironforge();
+    AddSC_isle_of_queldanas();
     AddSC_loch_modan();
     AddSC_searing_gorge();
     AddSC_silvermoon_city();
@@ -598,7 +599,6 @@ void AddScripts()
     AddSC_boss_doomlordkazzak();
     AddSC_boss_doomwalker();
     AddSC_hellfire_peninsula();
-    AddSC_isle_of_queldanas();
     AddSC_nagrand();
     AddSC_netherstorm();
     AddSC_shadowmoon_valley();