Scripts: Removed unused global variables

4 files changed, 10 insertions, 15 deletions

diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp
index 88e22ad94be..9b5ebec95f6 100644
--- a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp
+++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp
@@ -33,8 +33,6 @@ enum Spells
     SPELL_TELEPORT_DARNASSUS                                = 9268
 };
 
-const Position HomePosition = {-815.817f, -145.299f, -25.870f, 0};
-
 struct go_blackfathom_altar : public GameObjectAI
 {
     go_blackfathom_altar(GameObject* go) : GameObjectAI(go) { }
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp
index 438c6e33a53..a112ebdfe90 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp
@@ -96,8 +96,6 @@ enum Actions
     ACTION_CHANNEL_WORLD_TREE
 };
 
-Position const NordrassilLoc = { 5503.713f, -3523.436f, 1608.781f, 0.0f };
-
 class npc_ancient_wisp : public CreatureScript
 {
 public:
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp
index 1ca9817b337..c44c56bb0f1 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp
@@ -609,8 +609,8 @@ enum CrateEvent1Misc
     CHAIN_JENA_LEAVE    = 72
 };
 
-static float const marthaIdleOrientation1 = 3.159046f;
-static float const marthaIdleOrientation2 = 4.764749f;
+static constexpr float marthaIdleOrientation1 = 3.159046f;
+static constexpr float marthaIdleOrientation2 = 4.764749f;
 
 struct npc_martha_goslin : public CreatureScript
 {
@@ -978,12 +978,11 @@ enum CrateEvent3Misc
 
 };
 
-static Position const malcolmSpawn = { 1605.2420f, 805.4160f, 122.9956f, 5.284148f };
-static Position const scruffySpawn = { 1601.1030f, 805.3391f, 123.7677f, 5.471561f };
-static float const scruffyFacing2 = 5.734883f;
-static float const malcolmFacing3 = 2.303835f;
-static Position const scruffyPos3 = { 1629.004f, 810.138f, 120.4927f };
-static float const scruffyFacing4 = 5.445427f;
+static constexpr Position malcolmSpawn = { 1605.2420f, 805.4160f, 122.9956f, 5.284148f };
+static constexpr Position scruffySpawn = { 1601.1030f, 805.3391f, 123.7677f, 5.471561f };
+static constexpr float scruffyFacing2 = 5.734883f;
+static constexpr float malcolmFacing3 = 2.303835f;
+static constexpr float scruffyFacing4 = 5.445427f;
 
 struct npc_malcolm_moore : public CreatureScript
 {
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp
index 97c1f3de988..7c7754595ee 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp
@@ -49,9 +49,9 @@ enum Erozion
 };
 #define GOSSIP_HELLO_EROZION2   "[PH] Teleport please, i'm tired." //not in DB,maybe incorrect?
 
-Position const ThrallRespawnPositionAfterSkarloc(2062.934f, 229.14508f, 64.57113f, 2.338741064071655273);
-Position const ThrallRespawnPositionAfterHorseRide(2486.5637f, 624.09796f, 57.95088f, 4.136430263519287109);
-Position const ThrallRespawnPositionAfterMeetingTaretha(2660.0847f, 659.54816f, 62.020317f, 5.864306449890136718);
+//constexpr Position ThrallRespawnPositionAfterSkarloc(2062.934f, 229.14508f, 64.57113f, 2.338741064071655273);
+//constexpr Position ThrallRespawnPositionAfterHorseRide(2486.5637f, 624.09796f, 57.95088f, 4.136430263519287109);
+//constexpr Position ThrallRespawnPositionAfterMeetingTaretha(2660.0847f, 659.54816f, 62.020317f, 5.864306449890136718);
 
 /*######
 ## npc_erozion