Core/Misc: Tweaked ThreatContainer internals

(and many cosmetic changes here and there)

2 files changed, 10 insertions, 18 deletions

diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp
index ee988accbac..1c91d78cd29 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp
@@ -129,7 +129,6 @@ public:
             } else CheckTimer -= diff;
         }
     };
-
 };
 
 /* This script is merely a placeholder for the Doomfire that triggers Doomfire spell. It will
@@ -220,7 +219,6 @@ public:
             } else ChangeTargetTimer -= diff;
         }
     };
-
 };
 
 /* Finally, Archimonde's script. His script isn't extremely complex, most are simply spells on timers.
@@ -315,8 +313,8 @@ public:
         {
             Talk(SAY_SLAY);
 
-            if (victim && (victim->GetTypeId() == TYPEID_PLAYER))
-                GainSoulCharge(CAST_PLR(victim));
+            if (victim && victim->GetTypeId() == TYPEID_PLAYER)
+                GainSoulCharge(victim->ToPlayer());
         }
 
         void GainSoulCharge(Player* victim)
@@ -360,13 +358,13 @@ public:
             if (victim && me->IsWithinDistInMap(victim, me->GetAttackDistance(victim)))
                 return false;
 
-            std::list<HostileReference*>& m_threatlist = me->getThreatManager().getThreatList();
-            if (m_threatlist.empty())
+            ThreatContainer::StorageType const &threatlist = me->getThreatManager().getThreatList();
+            if (threatlist.empty())
                 return false;
 
             std::list<Unit*> targets;
-            std::list<HostileReference*>::const_iterator itr = m_threatlist.begin();
-            for (; itr != m_threatlist.end(); ++itr)
+            ThreatContainer::StorageType::const_iterator itr = threatlist.begin();
+            for (; itr != threatlist.end(); ++itr)
             {
                 Unit* unit = Unit::GetUnit(*me, (*itr)->getUnitGuid());
                 if (unit && unit->isAlive())
@@ -637,13 +635,8 @@ public:
 
             DoMeleeAttackIfReady();
         }
-
-        void WaypointReached(uint32 /*waypointId*/)
-        {
-
-        }
+        void WaypointReached(uint32 /*waypointId*/) { }
     };
-
 };
 
 void AddSC_boss_archimonde()
diff --git a/src/server/scripts/Kalimdor/boss_azuregos.cpp b/src/server/scripts/Kalimdor/boss_azuregos.cpp
index ec098951c03..3b431d55a2c 100644
--- a/src/server/scripts/Kalimdor/boss_azuregos.cpp
+++ b/src/server/scripts/Kalimdor/boss_azuregos.cpp
@@ -90,9 +90,9 @@ public:
             if (TeleportTimer <= diff)
             {
                 DoScriptText(SAY_TELEPORT, me);
-                std::list<HostileReference*>& threatlist = me->getThreatManager().getThreatList();
-                std::list<HostileReference*>::const_iterator i = threatlist.begin();
-                for (i = threatlist.begin(); i!= threatlist.end(); ++i)
+                ThreatContainer::StorageType threatlist = me->getThreatManager().getThreatList();
+                ThreatContainer::StorageType::const_iterator i = threatlist.begin();
+                for (i = threatlist.begin(); i != threatlist.end(); ++i)
                 {
                     Unit* unit = Unit::GetUnit(*me, (*i)->getUnitGuid());
                     if (unit && (unit->GetTypeId() == TYPEID_PLAYER))
@@ -158,7 +158,6 @@ public:
             DoMeleeAttackIfReady();
         }
     };
-
 };
 
 void AddSC_boss_azuregos()