Core/Scripts: multiple changes

- fixed non pch build
- fixed some warnings
- fixed some coverity issues
- some random things here and there

1 files changed, 12 insertions, 12 deletions

diff --git a/src/server/scripts/Kalimdor/zone_winterspring.cpp b/src/server/scripts/Kalimdor/zone_winterspring.cpp
index ee73d9b27a9..b8200c59258 100644
--- a/src/server/scripts/Kalimdor/zone_winterspring.cpp
+++ b/src/server/scripts/Kalimdor/zone_winterspring.cpp
@@ -377,15 +377,15 @@ public:
         void DoSummonPriestess()
         {
             // Summon 2 Elune priestess and make each of them move to a different spot
-            if (Creature* priestess = me->SummonCreature(NPC_PRIESTESS_ELUNE, wingThicketLocations[0].m_positionX, wingThicketLocations[0].m_positionY, wingThicketLocations[0].m_positionZ, wingThicketLocations[0].m_orientation, TEMPSUMMON_CORPSE_DESPAWN, 0))
+            if (Creature* priestess = me->SummonCreature(NPC_PRIESTESS_ELUNE, wingThicketLocations[0], TEMPSUMMON_CORPSE_DESPAWN, 0))
             {
-                priestess->GetMotionMaster()->MovePoint(0, wingThicketLocations[3].m_positionX, wingThicketLocations[3].m_positionY, wingThicketLocations[3].m_positionZ);
+                priestess->GetMotionMaster()->MovePoint(0, wingThicketLocations[3]);
                 _firstPriestessGUID = priestess->GetGUID();
             }
-            if (Creature* priestess = me->SummonCreature(NPC_PRIESTESS_ELUNE, wingThicketLocations[1].m_positionX, wingThicketLocations[1].m_positionY, wingThicketLocations[1].m_positionZ, wingThicketLocations[1].m_orientation, TEMPSUMMON_CORPSE_DESPAWN, 0))
+            if (Creature* priestess = me->SummonCreature(NPC_PRIESTESS_ELUNE, wingThicketLocations[1], TEMPSUMMON_CORPSE_DESPAWN, 0))
             {
                 // Left priestess should have a distinct move point because she is the one who starts the dialogue at point reach
-                priestess->GetMotionMaster()->MovePoint(1, wingThicketLocations[4].m_positionX, wingThicketLocations[4].m_positionY, wingThicketLocations[4].m_positionZ);
+                priestess->GetMotionMaster()->MovePoint(1, wingThicketLocations[4]);
                 _secondPriestessGUID = priestess->GetGUID();
             }
         }
@@ -476,19 +476,19 @@ public:
                 case SAY_PRIESTESS_ALTAR_9:
                     // move near the escort npc
                     if (Creature* priestess = me->GetMap()->GetCreature(_firstPriestessGUID))
-                        priestess->GetMotionMaster()->MovePoint(0, wingThicketLocations[6].m_positionX, wingThicketLocations[6].m_positionY, wingThicketLocations[6].m_positionZ);
+                        priestess->GetMotionMaster()->MovePoint(0, wingThicketLocations[6]);
                     break;
                 case SAY_PRIESTESS_ALTAR_13:
                     // summon the Guardian of Elune
-                    if (Creature* guard = me->SummonCreature(NPC_GUARDIAN_ELUNE, wingThicketLocations[2].m_positionX, wingThicketLocations[2].m_positionY, wingThicketLocations[2].m_positionZ, wingThicketLocations[2].m_orientation, TEMPSUMMON_CORPSE_DESPAWN, 0))
+                    if (Creature* guard = me->SummonCreature(NPC_GUARDIAN_ELUNE, wingThicketLocations[2], TEMPSUMMON_CORPSE_DESPAWN, 0))
                     {
-                        guard->GetMotionMaster()->MovePoint(0, wingThicketLocations[5].m_positionX, wingThicketLocations[5].m_positionY, wingThicketLocations[5].m_positionZ);
+                        guard->GetMotionMaster()->MovePoint(0, wingThicketLocations[5]);
                         _guardEluneGUID = guard->GetGUID();
                     }
                     // summon the Voice of Elune
                     if (GameObject* altar = me->GetMap()->GetGameObject(_altarGUID))
                     {
-                        if (Creature* voice = me->SummonCreature(NPC_VOICE_ELUNE, altar->GetPositionX(), altar->GetPositionY(), altar->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 30000))
+                        if (Creature* voice = me->SummonCreature(NPC_VOICE_ELUNE, *altar, TEMPSUMMON_TIMED_DESPAWN, 30000))
                             _voiceEluneGUID = voice->GetGUID();
                     }
                     break;
@@ -497,14 +497,14 @@ public:
                     if (Creature* priestess = me->GetMap()->GetCreature(_secondPriestessGUID))
                     {
                         priestess->AI()->Talk(SAY_PRIESTESS_ALTAR_14);
-                        priestess->GetMotionMaster()->MovePoint(0, wingThicketLocations[7].m_positionX, wingThicketLocations[7].m_positionY, wingThicketLocations[7].m_positionZ);
+                        priestess->GetMotionMaster()->MovePoint(0, wingThicketLocations[7]);
                     }
                     break;
                 case SAY_PRIESTESS_ALTAR_19:
                     // make the voice of elune leave
                     if (Creature* guard = me->GetMap()->GetCreature(_guardEluneGUID))
                     {
-                        guard->GetMotionMaster()->MovePoint(0, wingThicketLocations[2].m_positionX, wingThicketLocations[2].m_positionY, wingThicketLocations[2].m_positionZ);
+                        guard->GetMotionMaster()->MovePoint(0, wingThicketLocations[2]);
                         guard->DespawnOrUnsummon(4000);
                     }
                     break;
@@ -512,7 +512,7 @@ public:
                     // make the first priestess leave
                     if (Creature* priestess = me->GetMap()->GetCreature(_firstPriestessGUID))
                     {
-                        priestess->GetMotionMaster()->MovePoint(0, wingThicketLocations[0].m_positionX, wingThicketLocations[0].m_positionY, wingThicketLocations[0].m_positionZ);
+                        priestess->GetMotionMaster()->MovePoint(0, wingThicketLocations[0]);
                         priestess->DespawnOrUnsummon(4000);
                     }
                     break;
@@ -520,7 +520,7 @@ public:
                     // make the second priestess leave
                     if (Creature* priestess = me->GetMap()->GetCreature(_secondPriestessGUID))
                     {
-                        priestess->GetMotionMaster()->MovePoint(0, wingThicketLocations[1].m_positionX, wingThicketLocations[1].m_positionY, wingThicketLocations[1].m_positionZ);
+                        priestess->GetMotionMaster()->MovePoint(0, wingThicketLocations[1]);
                         priestess->DespawnOrUnsummon(4000);
                     }
                     break;