Scripts: Removed unused global variables

4 files changed, 49 insertions, 57 deletions

diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp
index a24f4be8d3f..affd9a0ee1a 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp
@@ -147,22 +147,22 @@ enum TocMenuIds
     MENUID_LK                = 10693
 };
 
-Position const BarretSpawnPosition       = { 559.1528f, 90.55729f, 395.2734f, 5.078908f };
-Position const WilfredSpawnPosition      = { 563.6007f, 208.5278f, 395.2696f, 4.729842f };
-Position const JaraxxusSpawnPosition     = { 563.8264f, 140.6563f, 393.9861f, 4.694936f };
-Position const PortalTargetSpawnPosition = { 563.6597f, 139.7569f, 399.2507f, 4.712389f };
-Position const PurpleGroundSpawnPosition = { 563.6858f, 139.4323f, 393.9862f, 4.694936f };
-Position const ArthasPortalSpawnPosition = { 563.6996f, 175.9826f, 394.5042f, 4.694936f };
-Position const LichKingSpawnPosition     = { 563.5712f, 174.8351f, 394.4954f, 4.712389f };
-Position const CorpseTeleportPosition    = { 631.9390f, 136.5040f, 142.5540f, 0.803332f };
-
-Position const NorthrendBeastsSpawnPositions[] =
+constexpr Position BarretSpawnPosition       = { 559.1528f, 90.55729f, 395.2734f, 5.078908f };
+constexpr Position WilfredSpawnPosition      = { 563.6007f, 208.5278f, 395.2696f, 4.729842f };
+constexpr Position JaraxxusSpawnPosition     = { 563.8264f, 140.6563f, 393.9861f, 4.694936f };
+constexpr Position PortalTargetSpawnPosition = { 563.6597f, 139.7569f, 399.2507f, 4.712389f };
+constexpr Position PurpleGroundSpawnPosition = { 563.6858f, 139.4323f, 393.9862f, 4.694936f };
+constexpr Position ArthasPortalSpawnPosition = { 563.6996f, 175.9826f, 394.5042f, 4.694936f };
+constexpr Position LichKingSpawnPosition     = { 563.5712f, 174.8351f, 394.4954f, 4.712389f };
+constexpr Position CorpseTeleportPosition    = { 631.9390f, 136.5040f, 142.5540f, 0.803332f };
+
+constexpr Position NorthrendBeastsSpawnPositions[] =
 {
     { 563.9358f, 229.8299f, 394.8061f, 4.694936f }, // Gormok \ Icehowl
     { 564.2802f, 233.1322f, 394.7897f, 1.621917f }, // Dreadscale
 };
 
-Position const AnubarakLoc[] =
+constexpr Position AnubarakLoc[] =
 {
     { 783.9305f, 132.9722f, 142.6711f, 3.141593f }, // 0 - Anub'arak Spawn Location (sniffed)
     { 695.240051f, 137.834824f, 142.200000f, 0 },  // 1 - Anub'arak move point location
@@ -172,15 +172,15 @@ Position const AnubarakLoc[] =
     { 740.184509f, 193.443390f, 142.117584f, 0 }   // 4 - Nerub Spawn
 };
 
-Position const EndSpawnLoc[] =
-{
-    { 648.9167f, 131.0208f, 141.6161f, 0.f }, // 0 - Highlord Tirion Fordring
-    { 649.1614f, 142.0399f, 141.3057f, 0.f }, // 1 - Argent Mage
-    { 644.6250f, 149.2743f, 140.6015f, 5.f }  // 2 - Portal to Dalaran
-};
+//constexpr Position EndSpawnLoc[] =
+//{
+//    { 648.9167f, 131.0208f, 141.6161f, 0.f }, // 0 - Highlord Tirion Fordring
+//    { 649.1614f, 142.0399f, 141.3057f, 0.f }, // 1 - Argent Mage
+//    { 644.6250f, 149.2743f, 140.6015f, 5.f }  // 2 - Portal to Dalaran
+//};
 
 // ToDo: Remove it in nexts rewrites
-Position const ToCCommonLoc[] =
+constexpr Position ToCCommonLoc[] =
 {
     { 559.257996f, 90.266197f, 395.122986f, 0.0f },  //  0 Barrent
     { 563.672974f, 139.57100f, 393.837006f, 0.0f },    //  1 Center
diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp
index 377fc98af1d..e561eafe44a 100644
--- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp
@@ -273,7 +273,7 @@ enum HorGossipMenu
     GOSSIP_MENU_SYLVANAS_FINAL         = 10931
 };
 
-Position const NpcJainaOrSylvanasEscapeRoute[] =
+constexpr Position NpcJainaOrSylvanasEscapeRoute[] =
 {
     { 5601.217285f, 2207.652832f, 731.541931f, 5.223304f }, // leave the throne room
     { 5607.224375f, 2173.913330f, 731.126038f, 2.608723f }, // adjust route
@@ -286,36 +286,36 @@ Position const NpcJainaOrSylvanasEscapeRoute[] =
     { 5265.53f,     1681.6f,      784.2947f,   4.13643f  }  // final position (sniffed)
 };
 
-Position const LichKingMoveAwayPos      = { 5400.069824f, 2102.7131689f, 707.69525f, 0.843803f }; // Lich King walks away
-Position const LichKingFirstSummon      = { 5600.076172f, 2192.270996f, 731.750488f, 4.330935f }; // Lich King First summons
-Position const JainaSylvanasShadowThroneDoor = { 5577.243f, 2235.852f, 733.0128f, 2.209562f }; // Jaina/Sylvanas move to door
-Position const LichKingFinalPos         = { 5283.742188f, 1706.335693f, 783.293518f, 4.138510f }; // Lich King Final Pos
+constexpr Position LichKingMoveAwayPos      = { 5400.069824f, 2102.7131689f, 707.69525f, 0.843803f }; // Lich King walks away
+constexpr Position LichKingFirstSummon      = { 5600.076172f, 2192.270996f, 731.750488f, 4.330935f }; // Lich King First summons
+//constexpr Position JainaSylvanasShadowThroneDoor = { 5577.243f, 2235.852f, 733.0128f, 2.209562f };    // Jaina/Sylvanas move to door
+constexpr Position LichKingFinalPos         = { 5283.742188f, 1706.335693f, 783.293518f, 4.138510f }; // Lich King Final Pos
 
 // sniffed
-Position const KorelnOrLoralenPos[] =
+constexpr Position KorelnOrLoralenPos[] =
 {
     { 5253.061f, 1953.616f, 707.6948f, 0.8377581f },
     { 5283.226f, 1992.300f, 707.7445f, 0.8377581f },
     { 5360.711f, 2064.797f, 707.6948f, 0.0f }
 };
 
-Position const SylvanasIntroPosition[] =
+constexpr Position SylvanasIntroPosition[] =
 {
     { 0.0f,     0.0f,     0.0f,      0.0f       }, // 0 - Spawn
     { 5263.2f,  1950.96f, 707.6948f, 0.8028514f }, // 1 - Move to Door
     { 5306.82f, 1998.17f, 709.341f,  1.239184f  }, // 2 - Move to Frostmourne
 };
 
-Position const JainaIntroPosition[] =
+constexpr Position JainaIntroPosition[] =
 {
     { 0.0f,     0.0f,     0.0f,      0.0f      }, // 0 - Spawn
     { 5265.89f, 1952.98f, 707.6978f, 0.0f      }, // 1 - Move to Door
     { 5306.95f, 1998.49f, 709.3414f, 1.277278f }  // 2 - Move to Frostmourne
 };
 
-Position const UtherSpawnPos = { 5307.814f, 2003.168f, 709.4244f, 4.537856f };
+constexpr Position UtherSpawnPos = { 5307.814f, 2003.168f, 709.4244f, 4.537856f };
 
-Position const LichKingIntroPosition[] =
+constexpr Position LichKingIntroPosition[] =
 {
     { 5362.463f, 2062.693f, 707.7781f, 3.944444f }, // 0 - Spawn
     { 5332.83f,  2031.24f,  707.6948f, 0.0f      }, // 1 - Door
@@ -325,21 +325,21 @@ Position const LichKingIntroPosition[] =
     { 5355.488f, 2055.149f, 707.6907f, 0.0f      }  // 5 - Move back 3
 };
 
-Position const FalricPosition[] =
+constexpr Position FalricPosition[] =
 {
     { 5276.583f, 2037.45f, 709.4025f, 5.532694f }, // 0 - Spawn
     { 5283.95f,  2030.53f, 709.3191f, 0.0f      }  // 1 - Intro
 };
 
-Position const MarwynPosition[] =
+constexpr Position MarwynPosition[] =
 {
     { 5342.232f, 1975.696f, 709.4025f, 2.391101f }, // 0 - Spawn
     { 5335.01f,  1982.37f,  709.3191f, 0.0f      }  // 1 - Intro
 };
 
-Position const SylvanasShadowThroneDoorPosition = { 5576.79f, 2235.73f, 733.0029f, 2.687807f };
+constexpr Position SylvanasShadowThroneDoorPosition = { 5576.79f, 2235.73f, 733.0029f, 2.687807f };
 
-Position const IceWallTargetPosition[] =
+constexpr Position IceWallTargetPosition[] =
 {
     { 5547.833f, 2083.701f, 731.4332f, 1.029744f  }, // 1st Icewall
     { 5503.213f, 1969.547f, 737.0245f, 1.27409f   }, // 2nd Icewall
@@ -2415,16 +2415,16 @@ enum QuelDelarMisc
     SPELL_QUEL_DELAR_WILL          = 70698
 };
 
-Position const QuelDelarCenterPos = { 5309.259f, 2006.390f, 718.046f, 0.0f };
-Position const QuelDelarSummonPos = { 5298.473f, 1994.852f, 709.424f, 3.979351f };
-Position const QuelDelarMovement[] =
+constexpr Position QuelDelarCenterPos = { 5309.259f, 2006.390f, 718.046f, 0.0f };
+constexpr Position QuelDelarSummonPos = { 5298.473f, 1994.852f, 709.424f, 3.979351f };
+constexpr Position QuelDelarMovement[] =
 {
     { 5292.870f, 1998.950f, 718.046f, 0.0f },
     { 5295.819f, 1991.912f, 707.707f, 0.0f },
     { 5295.301f, 1989.782f, 708.696f, 0.0f }
 };
 
-Position const UtherQuelDelarMovement[] =
+constexpr Position UtherQuelDelarMovement[] =
 {
     { 5336.830f, 1981.700f, 709.319f, 0.0f },
     { 5314.350f, 1993.440f, 707.726f, 0.0f }
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp
index a5fe4abab32..572a73b7838 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp
@@ -47,13 +47,6 @@ enum Spells
     SPELL_INFECTED_WOUND                = 29307  // Used by the zombies on self.
 };
 
-Position const PosSummon[3] =
-{
-    { 3270.132f, -3169.948f, 297.5891f, 5.88176f },
-    { 3307.298f, -3183.449f, 297.5891f, 5.742133f },
-    { 3255.708f, -3135.677f, 297.5891f, 1.867502f }
-};
-
 enum Events
 {
     EVENT_WOUND                         = 1,
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp
index 5406bb8bb07..1f2ebb020c9 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp
@@ -16,6 +16,7 @@
  */
 
 #include "ScriptMgr.h"
+#include "G3DPosition.hpp"
 #include "GameObject.h"
 #include "GameObjectAI.h"
 #include "InstanceScript.h"
@@ -29,7 +30,6 @@
 #include "SpellScript.h"
 #include "TemporarySummon.h"
 #include "ulduar.h"
-#include <G3D/Vector3.h>
 
 enum Says
 {
@@ -230,7 +230,7 @@ enum RazorscalePhases
     PHASE_PERMA_GROUND
 };
 
-Position const PosBrokenHarpoon[4] =
+constexpr Position PosBrokenHarpoon[4] =
 {
     { 571.9465f, -136.0118f, 391.5171f, 2.286379f }, // 1
     { 589.9233f, -133.6223f, 391.8968f, 3.298687f }, // 2
@@ -238,7 +238,7 @@ Position const PosBrokenHarpoon[4] =
     { 606.2297f, -136.7212f, 391.1803f, 5.131269f }  // 3
 };
 
-Position const PosHarpoon[4] =
+constexpr Position PosHarpoon[4] =
 {
     { 571.9012f, -136.5541f, 391.5171f, 4.921829f }, // GO_RAZOR_HARPOON_1
     { 589.9233f, -133.6223f, 391.8968f, 4.81711f  }, // GO_RAZOR_HARPOON_2
@@ -246,7 +246,7 @@ Position const PosHarpoon[4] =
     { 606.2297f, -136.7212f, 391.1803f, 4.537859f }  // GO_RAZOR_HARPOON_4
 };
 
-Position const DefendersPosition[6] =
+constexpr Position DefendersPosition[6] =
 {
     { 624.3065f, -154.4163f, 391.6442f },
     { 611.6274f, -170.9375f, 391.8087f },
@@ -256,14 +256,14 @@ Position const DefendersPosition[6] =
     { 549.1727f, -159.1180f, 391.8087f }
 };
 
-Position const TrapperPosition[3] =
+constexpr Position TrapperPosition[3] =
 {
     { 574.9293f, -184.5150f, 391.8921f },
     { 539.7838f, -178.5337f, 391.3053f },
     { 627.1754f, -177.9638f, 391.5553f }
 };
 
-uint32 const SummonMinionsSpells[4] =
+constexpr uint32 SummonMinionsSpells[4] =
 {
     SPELL_TRIGGER_SUMMON_IRON_DWARVES,
     SPELL_TRIGGER_SUMMON_IRON_DWARVES_2,
@@ -271,8 +271,7 @@ uint32 const SummonMinionsSpells[4] =
     SPELL_TRIGGER_SUMMON_IRON_VRYKUL
 };
 
-uint32 const pathSize = 11;
-G3D::Vector3 const RazorscalePath[pathSize] =
+constexpr Position RazorscalePath[] =
 {
     { 657.0227f, -361.1278f, 519.5406f },
     { 698.9319f, -340.9654f, 520.4857f },
@@ -287,11 +286,10 @@ G3D::Vector3 const RazorscalePath[pathSize] =
     { 611.5800f, -353.1930f, 526.2653f }
 };
 
-Position const RazorFlightPosition       = { 585.3610f, -173.5592f, 456.8430f, 1.526665f };
-Position const RazorFlightPositionPhase2 = { 619.1450f, -238.0780f, 475.1800f, 1.423917f };
-Position const RazorscaleLand            = { 585.4010f, -173.5430f, 408.5080f, 1.570796f };
-Position const RazorscaleGroundPosition  = { 585.4010f, -173.5430f, 391.6421f, 1.570796f };
-Position const RazorscaleFirstPoint      = { 657.0227f, -361.1278f, 519.5406f };
+constexpr Position RazorFlightPosition       = { 585.3610f, -173.5592f, 456.8430f, 1.526665f };
+constexpr Position RazorFlightPositionPhase2 = { 619.1450f, -238.0780f, 475.1800f, 1.423917f };
+constexpr Position RazorscaleLand            = { 585.4010f, -173.5430f, 408.5080f, 1.570796f };
+constexpr Position RazorscaleGroundPosition  = { 585.4010f, -173.5430f, 391.6421f, 1.570796f };
 
 struct boss_razorscale : public BossAI
 {
@@ -331,7 +329,8 @@ struct boss_razorscale : public BossAI
     {
         std::function<void(Movement::MoveSplineInit&)> initializer = [](Movement::MoveSplineInit& init)
         {
-            Movement::PointsArray path(RazorscalePath, RazorscalePath + pathSize);
+            Movement::PointsArray path(std::size(RazorscalePath));
+            std::transform(std::begin(RazorscalePath), std::end(RazorscalePath), path.begin(), [](Position pos) { return PositionToVector3(pos); });
             init.MovebyPath(path, 0);
             init.SetCyclic();
             init.SetFly();