diff options
Diffstat (limited to 'src/scripts')
36 files changed, 83 insertions, 83 deletions
diff --git a/src/scripts/eastern_kingdoms/blackwing_lair/boss_chromaggus.cpp b/src/scripts/eastern_kingdoms/blackwing_lair/boss_chromaggus.cpp index cee08a0bbec..20ebe58b7db 100644 --- a/src/scripts/eastern_kingdoms/blackwing_lair/boss_chromaggus.cpp +++ b/src/scripts/eastern_kingdoms/blackwing_lair/boss_chromaggus.cpp @@ -229,8 +229,8 @@ struct boss_chromaggusAI : public ScriptedAI //Affliction_Timer if (Affliction_Timer <= diff) { - std::list<HostilReference*> threatlist = m_creature->getThreatManager().getThreatList(); - for (std::list<HostilReference*>::iterator i = threatlist.begin(); i != threatlist.end(); ++i) + std::list<HostileReference*> threatlist = m_creature->getThreatManager().getThreatList(); + for (std::list<HostileReference*>::iterator i = threatlist.begin(); i != threatlist.end(); ++i) { Unit* pUnit; if ((*i) && (*i)->getSource()) diff --git a/src/scripts/eastern_kingdoms/karazhan/boss_midnight.cpp b/src/scripts/eastern_kingdoms/karazhan/boss_midnight.cpp index d684844c993..48a6ecf5412 100644 --- a/src/scripts/eastern_kingdoms/karazhan/boss_midnight.cpp +++ b/src/scripts/eastern_kingdoms/karazhan/boss_midnight.cpp @@ -244,9 +244,9 @@ struct boss_attumenAI : public ScriptedAI if (ChargeTimer <= diff) { Unit *pTarget; - std::list<HostilReference *> t_list = m_creature->getThreatManager().getThreatList(); + std::list<HostileReference *> t_list = m_creature->getThreatManager().getThreatList(); std::vector<Unit *> target_list; - for (std::list<HostilReference *>::iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) + for (std::list<HostileReference *>::iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) { pTarget = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid()); if (pTarget && !pTarget->IsWithinDist(m_creature, ATTACK_DISTANCE, false)) diff --git a/src/scripts/eastern_kingdoms/karazhan/boss_prince_malchezaar.cpp b/src/scripts/eastern_kingdoms/karazhan/boss_prince_malchezaar.cpp index 3434ea54e1a..b9217b5a305 100644 --- a/src/scripts/eastern_kingdoms/karazhan/boss_prince_malchezaar.cpp +++ b/src/scripts/eastern_kingdoms/karazhan/boss_prince_malchezaar.cpp @@ -281,14 +281,14 @@ struct boss_malchezaarAI : public ScriptedAI if (!info) return; - std::list<HostilReference *> t_list = m_creature->getThreatManager().getThreatList(); + std::list<HostileReference *> t_list = m_creature->getThreatManager().getThreatList(); std::vector<Unit *> targets; if (!t_list.size()) return; //begin + 1, so we don't target the one with the highest threat - std::list<HostilReference *>::iterator itr = t_list.begin(); + std::list<HostileReference *>::iterator itr = t_list.begin(); std::advance(itr, 1); for (; itr != t_list.end(); ++itr) //store the threat list in a different container if (Unit *pTarget = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid())) diff --git a/src/scripts/eastern_kingdoms/karazhan/boss_shade_of_aran.cpp b/src/scripts/eastern_kingdoms/karazhan/boss_shade_of_aran.cpp index 39dc4481bbc..07128968456 100644 --- a/src/scripts/eastern_kingdoms/karazhan/boss_shade_of_aran.cpp +++ b/src/scripts/eastern_kingdoms/karazhan/boss_shade_of_aran.cpp @@ -175,13 +175,13 @@ struct boss_aranAI : public ScriptedAI void FlameWreathEffect() { std::vector<Unit*> targets; - std::list<HostilReference *> t_list = m_creature->getThreatManager().getThreatList(); + std::list<HostileReference *> t_list = m_creature->getThreatManager().getThreatList(); if (!t_list.size()) return; //store the threat list in a different container - for (std::list<HostilReference *>::iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) + for (std::list<HostileReference *>::iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) { Unit *pTarget = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid()); //only on alive players diff --git a/src/scripts/eastern_kingdoms/magisters_terrace/boss_felblood_kaelthas.cpp b/src/scripts/eastern_kingdoms/magisters_terrace/boss_felblood_kaelthas.cpp index bf61a663521..acbd94e57d7 100644 --- a/src/scripts/eastern_kingdoms/magisters_terrace/boss_felblood_kaelthas.cpp +++ b/src/scripts/eastern_kingdoms/magisters_terrace/boss_felblood_kaelthas.cpp @@ -177,8 +177,8 @@ struct boss_felblood_kaelthasAI : public ScriptedAI if (!SummonedUnit) return; - std::list<HostilReference*>& m_threatlist = m_creature->getThreatManager().getThreatList(); - std::list<HostilReference*>::iterator i = m_threatlist.begin(); + std::list<HostileReference*>& m_threatlist = m_creature->getThreatManager().getThreatList(); + std::list<HostileReference*>::iterator i = m_threatlist.begin(); for (i = m_threatlist.begin(); i != m_threatlist.end(); ++i) { Unit* pUnit = Unit::GetUnit((*m_creature), (*i)->getUnitGuid()); @@ -196,7 +196,7 @@ struct boss_felblood_kaelthasAI : public ScriptedAI float y = KaelLocations[0][1]; m_creature->GetMap()->CreatureRelocation(m_creature, x, y, LOCATION_Z, 0.0f); //m_creature->SendMonsterMove(x, y, LOCATION_Z, 0, 0, 0); // causes some issues... - std::list<HostilReference*>::iterator i = m_creature->getThreatManager().getThreatList().begin(); + std::list<HostileReference*>::iterator i = m_creature->getThreatManager().getThreatList().begin(); for (i = m_creature->getThreatManager().getThreatList().begin(); i!= m_creature->getThreatManager().getThreatList().end(); ++i) { Unit* pUnit = Unit::GetUnit((*m_creature), (*i)->getUnitGuid()); @@ -208,7 +208,7 @@ struct boss_felblood_kaelthasAI : public ScriptedAI void CastGravityLapseKnockUp() { - std::list<HostilReference*>::iterator i = m_creature->getThreatManager().getThreatList().begin(); + std::list<HostileReference*>::iterator i = m_creature->getThreatManager().getThreatList().begin(); for (i = m_creature->getThreatManager().getThreatList().begin(); i!= m_creature->getThreatManager().getThreatList().end(); ++i) { Unit* pUnit = Unit::GetUnit((*m_creature), (*i)->getUnitGuid()); @@ -220,7 +220,7 @@ struct boss_felblood_kaelthasAI : public ScriptedAI void CastGravityLapseFly() // Use Fly Packet hack for now as players can't cast "fly" spells unless in map 530. Has to be done a while after they get knocked into the air... { - std::list<HostilReference*>::iterator i = m_creature->getThreatManager().getThreatList().begin(); + std::list<HostileReference*>::iterator i = m_creature->getThreatManager().getThreatList().begin(); for (i = m_creature->getThreatManager().getThreatList().begin(); i!= m_creature->getThreatManager().getThreatList().end(); ++i) { Unit* pUnit = Unit::GetUnit((*m_creature), (*i)->getUnitGuid()); @@ -240,7 +240,7 @@ struct boss_felblood_kaelthasAI : public ScriptedAI void RemoveGravityLapse() { - std::list<HostilReference*>::iterator i = m_creature->getThreatManager().getThreatList().begin(); + std::list<HostileReference*>::iterator i = m_creature->getThreatManager().getThreatList().begin(); for (i = m_creature->getThreatManager().getThreatList().begin(); i!= m_creature->getThreatManager().getThreatList().end(); ++i) { Unit* pUnit = Unit::GetUnit((*m_creature), (*i)->getUnitGuid()); diff --git a/src/scripts/eastern_kingdoms/magisters_terrace/boss_priestess_delrissa.cpp b/src/scripts/eastern_kingdoms/magisters_terrace/boss_priestess_delrissa.cpp index f14e1933988..c84879d5720 100644 --- a/src/scripts/eastern_kingdoms/magisters_terrace/boss_priestess_delrissa.cpp +++ b/src/scripts/eastern_kingdoms/magisters_terrace/boss_priestess_delrissa.cpp @@ -796,8 +796,8 @@ struct boss_yazzaiAI : public boss_priestess_lackey_commonAI if (Blink_Timer <= diff) { bool InMeleeRange = false; - std::list<HostilReference*>& t_list = m_creature->getThreatManager().getThreatList(); - for (std::list<HostilReference*>::iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) + std::list<HostileReference*>& t_list = m_creature->getThreatManager().getThreatList(); + for (std::list<HostileReference*>::iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) { if (Unit *pTarget = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid())) { @@ -876,8 +876,8 @@ struct boss_warlord_salarisAI : public boss_priestess_lackey_commonAI if (Intercept_Stun_Timer <= diff) { bool InMeleeRange = false; - std::list<HostilReference*>& t_list = m_creature->getThreatManager().getThreatList(); - for (std::list<HostilReference*>::iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) + std::list<HostileReference*>& t_list = m_creature->getThreatManager().getThreatList(); + for (std::list<HostileReference*>::iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) { if (Unit *pTarget = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid())) { diff --git a/src/scripts/eastern_kingdoms/scarlet_monastery/boss_headless_horseman.cpp b/src/scripts/eastern_kingdoms/scarlet_monastery/boss_headless_horseman.cpp index e79a8204e17..36863d5f3ca 100644 --- a/src/scripts/eastern_kingdoms/scarlet_monastery/boss_headless_horseman.cpp +++ b/src/scripts/eastern_kingdoms/scarlet_monastery/boss_headless_horseman.cpp @@ -559,7 +559,7 @@ struct boss_headless_horsemanAI : public ScriptedAI caster->GetMotionMaster()->Clear(false); caster->GetMotionMaster()->MoveFollow(m_creature,6,urand(0,5)); //DoResetThreat();//not sure if need - std::list<HostilReference*>::iterator itr; + std::list<HostileReference*>::iterator itr; for (itr = caster->getThreatManager().getThreatList().begin(); itr != caster->getThreatManager().getThreatList().end(); ++itr) { Unit* pUnit = Unit::GetUnit((*m_creature), (*itr)->getUnitGuid()); diff --git a/src/scripts/eastern_kingdoms/sunwell_plateau/boss_kalecgos.cpp b/src/scripts/eastern_kingdoms/sunwell_plateau/boss_kalecgos.cpp index 575bb0afaa1..6aaa00fd6ac 100644 --- a/src/scripts/eastern_kingdoms/sunwell_plateau/boss_kalecgos.cpp +++ b/src/scripts/eastern_kingdoms/sunwell_plateau/boss_kalecgos.cpp @@ -300,9 +300,9 @@ struct boss_kalecgosAI : public ScriptedAI if (SpectralBlastTimer <= diff) { - std::list<HostilReference*> &m_threatlist = me->getThreatManager().getThreatList(); + std::list<HostileReference*> &m_threatlist = me->getThreatManager().getThreatList(); std::list<Unit*> targetList; - for (std::list<HostilReference*>::iterator itr = m_threatlist.begin(); itr!= m_threatlist.end(); ++itr) + for (std::list<HostileReference*>::iterator itr = m_threatlist.begin(); itr!= m_threatlist.end(); ++itr) if((*itr)->getTarget() && (*itr)->getTarget()->GetTypeId() == TYPEID_PLAYER && (*itr)->getTarget()->GetGUID() != me->getVictim()->GetGUID() && !(*itr)->getTarget()->HasAura(AURA_SPECTRAL_EXHAUSTION) && (*itr)->getTarget()->GetPositionZ() > me->GetPositionZ()-5) targetList.push_back((*itr)->getTarget()); if(targetList.empty()) @@ -614,7 +614,7 @@ struct boss_sathrovarrAI : public ScriptedAI if (ResetThreat <= diff) { - for (std::list<HostilReference*>::iterator itr = me->getThreatManager().getThreatList().begin(); itr != me->getThreatManager().getThreatList().end(); ++itr) + for (std::list<HostileReference*>::iterator itr = me->getThreatManager().getThreatList().begin(); itr != me->getThreatManager().getThreatList().end(); ++itr) { if(Unit* pUnit = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid())) { diff --git a/src/scripts/eastern_kingdoms/sunwell_plateau/boss_kiljaeden.cpp b/src/scripts/eastern_kingdoms/sunwell_plateau/boss_kiljaeden.cpp index cdb79d5e2f6..87291ae807a 100644 --- a/src/scripts/eastern_kingdoms/sunwell_plateau/boss_kiljaeden.cpp +++ b/src/scripts/eastern_kingdoms/sunwell_plateau/boss_kiljaeden.cpp @@ -944,7 +944,7 @@ struct mob_hand_of_the_deceiverAI : public ScriptedAI Creature* Portal = DoSpawnCreature(CREATURE_FELFIRE_PORTAL, 0, 0,0, 0, TEMPSUMMON_TIMED_DESPAWN, 20000); if (Portal) { - std::list<HostilReference*>::iterator itr; + std::list<HostileReference*>::iterator itr; for (itr = m_creature->getThreatManager().getThreatList().begin(); itr != m_creature->getThreatManager().getThreatList().end(); ++itr) { Unit* pUnit = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid()); diff --git a/src/scripts/eastern_kingdoms/zulgurub/boss_mandokir.cpp b/src/scripts/eastern_kingdoms/zulgurub/boss_mandokir.cpp index 0f8a3d515f3..7dcea97b86b 100644 --- a/src/scripts/eastern_kingdoms/zulgurub/boss_mandokir.cpp +++ b/src/scripts/eastern_kingdoms/zulgurub/boss_mandokir.cpp @@ -218,7 +218,7 @@ struct boss_mandokirAI : public ScriptedAI { TargetInRange = 0; - std::list<HostilReference*>::iterator i = m_creature->getThreatManager().getThreatList().begin(); + std::list<HostileReference*>::iterator i = m_creature->getThreatManager().getThreatList().begin(); for (; i != m_creature->getThreatManager().getThreatList().end(); ++i) { Unit* pUnit = Unit::GetUnit(*m_creature, (*i)->getUnitGuid()); diff --git a/src/scripts/kalimdor/boss_azuregos.cpp b/src/scripts/kalimdor/boss_azuregos.cpp index 94af33c83be..26801be6c8e 100644 --- a/src/scripts/kalimdor/boss_azuregos.cpp +++ b/src/scripts/kalimdor/boss_azuregos.cpp @@ -71,8 +71,8 @@ struct boss_azuregosAI : public ScriptedAI if (Teleport_Timer <= diff) { DoScriptText(SAY_TELEPORT, m_creature); - std::list<HostilReference*>& m_threatlist = m_creature->getThreatManager().getThreatList(); - std::list<HostilReference*>::iterator i = m_threatlist.begin(); + std::list<HostileReference*>& m_threatlist = m_creature->getThreatManager().getThreatList(); + std::list<HostileReference*>::iterator i = m_threatlist.begin(); for (i = m_threatlist.begin(); i!= m_threatlist.end(); ++i) { Unit* pUnit = Unit::GetUnit((*m_creature), (*i)->getUnitGuid()); diff --git a/src/scripts/kalimdor/caverns_of_time/hyjal/boss_archimonde.cpp b/src/scripts/kalimdor/caverns_of_time/hyjal/boss_archimonde.cpp index 30aeaceffc1..1377439c40b 100644 --- a/src/scripts/kalimdor/caverns_of_time/hyjal/boss_archimonde.cpp +++ b/src/scripts/kalimdor/caverns_of_time/hyjal/boss_archimonde.cpp @@ -302,12 +302,12 @@ struct boss_archimondeAI : public hyjal_trashAI if (victim && m_creature->IsWithinDistInMap(victim, m_creature->GetAttackDistance(victim))) return false; - std::list<HostilReference*>& m_threatlist = m_creature->getThreatManager().getThreatList(); + std::list<HostileReference*>& m_threatlist = m_creature->getThreatManager().getThreatList(); if (m_threatlist.empty()) return false; std::list<Unit*> targets; - std::list<HostilReference*>::iterator itr = m_threatlist.begin(); + std::list<HostileReference*>::iterator itr = m_threatlist.begin(); for (; itr != m_threatlist.end(); ++itr) { Unit* pUnit = Unit::GetUnit((*m_creature), (*itr)->getUnitGuid()); diff --git a/src/scripts/kalimdor/caverns_of_time/hyjal/boss_kazrogal.cpp b/src/scripts/kalimdor/caverns_of_time/hyjal/boss_kazrogal.cpp index a5c0f27fade..1885fadc3c1 100644 --- a/src/scripts/kalimdor/caverns_of_time/hyjal/boss_kazrogal.cpp +++ b/src/scripts/kalimdor/caverns_of_time/hyjal/boss_kazrogal.cpp @@ -152,8 +152,8 @@ struct boss_kazrogalAI : public hyjal_trashAI //cast dummy, useful for bos addons m_creature->CastCustomSpell(m_creature, SPELL_MARK, NULL, NULL, NULL, false, NULL, NULL, m_creature->GetGUID()); - std::list<HostilReference *> t_list = m_creature->getThreatManager().getThreatList(); - for (std::list<HostilReference *>::iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) + std::list<HostileReference *> t_list = m_creature->getThreatManager().getThreatList(); + for (std::list<HostileReference *>::iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) { Unit *pTarget = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid()); if (pTarget && pTarget->GetTypeId() == TYPEID_PLAYER && pTarget->getPowerType() == POWER_MANA) diff --git a/src/scripts/kalimdor/temple_of_ahnqiraj/boss_cthun.cpp b/src/scripts/kalimdor/temple_of_ahnqiraj/boss_cthun.cpp index 25fa866c833..bea64893b2c 100644 --- a/src/scripts/kalimdor/temple_of_ahnqiraj/boss_cthun.cpp +++ b/src/scripts/kalimdor/temple_of_ahnqiraj/boss_cthun.cpp @@ -654,7 +654,7 @@ struct cthunAI : public Scripted_NoMovementAI //Place all units in threat list on outside of stomach Stomach_Map.clear(); - std::list<HostilReference*>::iterator i = m_creature->getThreatManager().getThreatList().begin(); + std::list<HostileReference*>::iterator i = m_creature->getThreatManager().getThreatList().begin(); for (; i != m_creature->getThreatManager().getThreatList().end(); ++i) { //Outside stomach diff --git a/src/scripts/kalimdor/temple_of_ahnqiraj/mob_anubisath_sentinel.cpp b/src/scripts/kalimdor/temple_of_ahnqiraj/mob_anubisath_sentinel.cpp index 1c09e7e8eda..7cdb76a82e1 100644 --- a/src/scripts/kalimdor/temple_of_ahnqiraj/mob_anubisath_sentinel.cpp +++ b/src/scripts/kalimdor/temple_of_ahnqiraj/mob_anubisath_sentinel.cpp @@ -240,7 +240,7 @@ struct aqsentinelAI : public ScriptedAI Unit *GetHatedManaUser() const { - std::list<HostilReference*>::iterator i; + std::list<HostileReference*>::iterator i; for (i = m_creature->getThreatManager().getThreatList().begin(); i != m_creature->getThreatManager().getThreatList().end(); ++i) { Unit* pUnit = Unit::GetUnit((*m_creature), (*i)->getUnitGuid()); diff --git a/src/scripts/northrend/azjol_nerub/ahnkahet/boss_prince_taldaram.cpp b/src/scripts/northrend/azjol_nerub/ahnkahet/boss_prince_taldaram.cpp index 1d3e8ac9cd3..5c2cbb724c1 100644 --- a/src/scripts/northrend/azjol_nerub/ahnkahet/boss_prince_taldaram.cpp +++ b/src/scripts/northrend/azjol_nerub/ahnkahet/boss_prince_taldaram.cpp @@ -213,9 +213,9 @@ struct boss_taldaramAI : public ScriptedAI { //Count alive players Unit *pTarget = NULL; - std::list<HostilReference *> t_list = m_creature->getThreatManager().getThreatList(); + std::list<HostileReference *> t_list = m_creature->getThreatManager().getThreatList(); std::vector<Unit *> target_list; - for (std::list<HostilReference *>::iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) + for (std::list<HostileReference *>::iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) { pTarget = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid()); // exclude pets & totems diff --git a/src/scripts/northrend/draktharon_keep/boss_tharon_ja.cpp b/src/scripts/northrend/draktharon_keep/boss_tharon_ja.cpp index 57e1bea1f70..31d4170ec3f 100644 --- a/src/scripts/northrend/draktharon_keep/boss_tharon_ja.cpp +++ b/src/scripts/northrend/draktharon_keep/boss_tharon_ja.cpp @@ -165,8 +165,8 @@ struct boss_tharon_jaAI : public ScriptedAI { DoScriptText(RAND(SAY_FLESH_1,SAY_FLESH_2),m_creature); m_creature->SetDisplayId(MODEL_FLESH); - std::list<HostilReference*>& threatlist = m_creature->getThreatManager().getThreatList(); - for (std::list<HostilReference*>::iterator itr = threatlist.begin(); itr != threatlist.end(); ++itr) + std::list<HostileReference*>& threatlist = m_creature->getThreatManager().getThreatList(); + for (std::list<HostileReference*>::iterator itr = threatlist.begin(); itr != threatlist.end(); ++itr) { Unit *pTemp = Unit::GetUnit((*m_creature),(*itr)->getUnitGuid()); if (pTemp && pTemp->GetTypeId() == TYPEID_PLAYER) @@ -221,8 +221,8 @@ struct boss_tharon_jaAI : public ScriptedAI uiCurseOfLifeTimer = 1000; uiRainOfFireTimer = urand(14000,18000); uiShadowVolleyTimer = urand(8000,10000); - std::list<HostilReference*>& threatlist = m_creature->getThreatManager().getThreatList(); - for (std::list<HostilReference*>::iterator itr = threatlist.begin(); itr != threatlist.end(); ++itr) + std::list<HostileReference*>& threatlist = m_creature->getThreatManager().getThreatList(); + for (std::list<HostileReference*>::iterator itr = threatlist.begin(); itr != threatlist.end(); ++itr) { Unit *pTemp = Unit::GetUnit((*m_creature),(*itr)->getUnitGuid()); if (pTemp && pTemp->GetTypeId() == TYPEID_PLAYER) diff --git a/src/scripts/northrend/naxxramas/boss_kelthuzad.cpp b/src/scripts/northrend/naxxramas/boss_kelthuzad.cpp index 76ead936212..ce275fe952e 100644 --- a/src/scripts/northrend/naxxramas/boss_kelthuzad.cpp +++ b/src/scripts/northrend/naxxramas/boss_kelthuzad.cpp @@ -579,8 +579,8 @@ struct boss_kelthuzadAI : public BossAI case EVENT_DETONATE: { std::vector<Unit*> unitList; - std::list<HostilReference*> *threatList = &me->getThreatManager().getThreatList(); - for (std::list<HostilReference*>::const_iterator itr = threatList->begin(); itr != threatList->end(); ++itr) + std::list<HostileReference*> *threatList = &me->getThreatManager().getThreatList(); + for (std::list<HostileReference*>::const_iterator itr = threatList->begin(); itr != threatList->end(); ++itr) { if ((*itr)->getTarget()->GetTypeId() == TYPEID_PLAYER && (*itr)->getTarget()->getPowerType() == POWER_MANA diff --git a/src/scripts/northrend/naxxramas/boss_patchwerk.cpp b/src/scripts/northrend/naxxramas/boss_patchwerk.cpp index 68e27f5f722..438e0f91ec8 100644 --- a/src/scripts/northrend/naxxramas/boss_patchwerk.cpp +++ b/src/scripts/northrend/naxxramas/boss_patchwerk.cpp @@ -111,7 +111,7 @@ struct boss_patchwerkAI : public BossAI //amount of HP within melee distance uint32 MostHP = 0; Unit* pMostHPTarget = NULL; - std::list<HostilReference*>::iterator i = me->getThreatManager().getThreatList().begin(); + std::list<HostileReference*>::iterator i = me->getThreatManager().getThreatList().begin(); for (; i != me->getThreatManager().getThreatList().end(); ++i) { Unit *pTarget = (*i)->getTarget(); diff --git a/src/scripts/northrend/naxxramas/boss_sapphiron.cpp b/src/scripts/northrend/naxxramas/boss_sapphiron.cpp index b754cc124ef..9a613a7583e 100644 --- a/src/scripts/northrend/naxxramas/boss_sapphiron.cpp +++ b/src/scripts/northrend/naxxramas/boss_sapphiron.cpp @@ -291,7 +291,7 @@ struct boss_sapphironAI : public BossAI case EVENT_ICEBOLT: { std::vector<Unit*> targets; - std::list<HostilReference*>::iterator i = me->getThreatManager().getThreatList().begin(); + std::list<HostileReference*>::iterator i = me->getThreatManager().getThreatList().begin(); for (; i != me->getThreatManager().getThreatList().end(); ++i) if ((*i)->getTarget()->GetTypeId() == TYPEID_PLAYER && !(*i)->getTarget()->HasAura(SPELL_ICEBOLT)) targets.push_back((*i)->getTarget()); @@ -348,7 +348,7 @@ struct boss_sapphironAI : public BossAI { DoZoneInCombat(); // make sure everyone is in threatlist std::vector<Unit*> targets; - std::list<HostilReference*>::iterator i = me->getThreatManager().getThreatList().begin(); + std::list<HostileReference*>::iterator i = me->getThreatManager().getThreatList().begin(); for (; i != me->getThreatManager().getThreatList().end(); ++i) { Unit *pTarget = (*i)->getTarget(); diff --git a/src/scripts/northrend/nexus/nexus/boss_keristrasza.cpp b/src/scripts/northrend/nexus/nexus/boss_keristrasza.cpp index af51b19e553..0b1257e5b94 100644 --- a/src/scripts/northrend/nexus/nexus/boss_keristrasza.cpp +++ b/src/scripts/northrend/nexus/nexus/boss_keristrasza.cpp @@ -171,8 +171,8 @@ struct boss_keristraszaAI : public ScriptedAI if (CheckIntenseColdTimer < diff && !MoreThanTwoIntenseCold) { - std::list<HostilReference*> ThreatList = m_creature->getThreatManager().getThreatList(); - for (std::list<HostilReference*>::const_iterator itr = ThreatList.begin(); itr != ThreatList.end(); itr++) + std::list<HostileReference*> ThreatList = m_creature->getThreatManager().getThreatList(); + for (std::list<HostileReference*>::const_iterator itr = ThreatList.begin(); itr != ThreatList.end(); itr++) { Unit *pTarget = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid()); if (!pTarget || pTarget->GetTypeId() != TYPEID_PLAYER) diff --git a/src/scripts/northrend/nexus/nexus/boss_ormorok.cpp b/src/scripts/northrend/nexus/nexus/boss_ormorok.cpp index 49bbecde614..95361f44732 100644 --- a/src/scripts/northrend/nexus/nexus/boss_ormorok.cpp +++ b/src/scripts/northrend/nexus/nexus/boss_ormorok.cpp @@ -184,7 +184,7 @@ struct boss_ormorokAI : public ScriptedAI case 3: Healer = CLASS_DRUID; break; case 4: Healer = CLASS_SHAMAN; break; } - std::list<HostilReference*>::iterator i = m_creature->getThreatManager().getThreatList().begin(); + std::list<HostileReference*>::iterator i = m_creature->getThreatManager().getThreatList().begin(); for (; i != m_creature->getThreatManager().getThreatList().end(); ++i) { Unit* pTemp = Unit::GetUnit((*m_creature),(*i)->getUnitGuid()); diff --git a/src/scripts/outland/auchindoun/shadow_labyrinth/boss_blackheart_the_inciter.cpp b/src/scripts/outland/auchindoun/shadow_labyrinth/boss_blackheart_the_inciter.cpp index 02e74e06445..9535be2bae1 100644 --- a/src/scripts/outland/auchindoun/shadow_labyrinth/boss_blackheart_the_inciter.cpp +++ b/src/scripts/outland/auchindoun/shadow_labyrinth/boss_blackheart_the_inciter.cpp @@ -121,8 +121,8 @@ struct boss_blackheart_the_inciterAI : public ScriptedAI { DoCast(m_creature, SPELL_INCITE_CHAOS); - std::list<HostilReference *> t_list = m_creature->getThreatManager().getThreatList(); - for (std::list<HostilReference *>::iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) + std::list<HostileReference *> t_list = m_creature->getThreatManager().getThreatList(); + for (std::list<HostileReference *>::iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) { Unit *pTarget = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid()); if (pTarget && pTarget->GetTypeId() == TYPEID_PLAYER) diff --git a/src/scripts/outland/auchindoun/shadow_labyrinth/boss_murmur.cpp b/src/scripts/outland/auchindoun/shadow_labyrinth/boss_murmur.cpp index 60d8f5e63d2..a02148d4758 100644 --- a/src/scripts/outland/auchindoun/shadow_labyrinth/boss_murmur.cpp +++ b/src/scripts/outland/auchindoun/shadow_labyrinth/boss_murmur.cpp @@ -67,8 +67,8 @@ struct boss_murmurAI : public ScriptedAI void SonicBoomEffect() { - std::list<HostilReference *> t_list = m_creature->getThreatManager().getThreatList(); - for (std::list<HostilReference *>::iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) + std::list<HostileReference *> t_list = m_creature->getThreatManager().getThreatList(); + for (std::list<HostileReference *>::iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) { Unit *pTarget = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid()); if (pTarget && pTarget->GetTypeId() == TYPEID_PLAYER) @@ -152,8 +152,8 @@ struct boss_murmurAI : public ScriptedAI // Thundering Storm if (ThunderingStorm_Timer <= diff) { - std::list<HostilReference*>& m_threatlist = m_creature->getThreatManager().getThreatList(); - for (std::list<HostilReference*>::iterator i = m_threatlist.begin(); i != m_threatlist.end(); ++i) + std::list<HostileReference*>& m_threatlist = m_creature->getThreatManager().getThreatList(); + for (std::list<HostileReference*>::iterator i = m_threatlist.begin(); i != m_threatlist.end(); ++i) if (Unit *pTarget = Unit::GetUnit((*m_creature),(*i)->getUnitGuid())) if (pTarget->isAlive() && !m_creature->IsWithinDist(pTarget, 35, false)) DoCast(pTarget, SPELL_THUNDERING_STORM, true); @@ -175,8 +175,8 @@ struct boss_murmurAI : public ScriptedAI return; if (!m_creature->IsWithinMeleeRange(m_creature->getVictim())) { - std::list<HostilReference*>& m_threatlist = m_creature->getThreatManager().getThreatList(); - for (std::list<HostilReference*>::iterator i = m_threatlist.begin(); i != m_threatlist.end(); ++i) + std::list<HostileReference*>& m_threatlist = m_creature->getThreatManager().getThreatList(); + for (std::list<HostileReference*>::iterator i = m_threatlist.begin(); i != m_threatlist.end(); ++i) if (Unit *pTarget = Unit::GetUnit((*m_creature),(*i)->getUnitGuid())) if (pTarget->isAlive() && m_creature->IsWithinMeleeRange(pTarget)) { diff --git a/src/scripts/outland/black_temple/boss_bloodboil.cpp b/src/scripts/outland/black_temple/boss_bloodboil.cpp index a0fa5ef8311..150b631e641 100644 --- a/src/scripts/outland/black_temple/boss_bloodboil.cpp +++ b/src/scripts/outland/black_temple/boss_bloodboil.cpp @@ -130,13 +130,13 @@ struct boss_gurtogg_bloodboilAI : public ScriptedAI void CastBloodboil() { // Get the Threat List - std::list<HostilReference *> m_threatlist = m_creature->getThreatManager().getThreatList(); + std::list<HostileReference *> m_threatlist = m_creature->getThreatManager().getThreatList(); if (!m_threatlist.size()) // He doesn't have anyone in his threatlist, useless to continue return; std::list<Unit *> targets; - std::list<HostilReference *>::iterator itr = m_threatlist.begin(); + std::list<HostileReference *>::iterator itr = m_threatlist.begin(); for (; itr!= m_threatlist.end(); ++itr) //store the threat list in a different container { Unit *pTarget = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid()); diff --git a/src/scripts/outland/black_temple/boss_illidan.cpp b/src/scripts/outland/black_temple/boss_illidan.cpp index 6f1e4cc0e59..ed1b1d4df02 100644 --- a/src/scripts/outland/black_temple/boss_illidan.cpp +++ b/src/scripts/outland/black_temple/boss_illidan.cpp @@ -501,7 +501,7 @@ struct boss_illidan_stormrageAI : public ScriptedAI void DeleteFromThreatList(uint64 TargetGUID) { - for (std::list<HostilReference*>::iterator itr = m_creature->getThreatManager().getThreatList().begin(); itr != m_creature->getThreatManager().getThreatList().end(); ++itr) + for (std::list<HostileReference*>::iterator itr = m_creature->getThreatManager().getThreatList().begin(); itr != m_creature->getThreatManager().getThreatList().end(); ++itr) { if ((*itr)->getUnitGuid() == TargetGUID) { @@ -1070,9 +1070,9 @@ struct npc_akama_illidanAI : public ScriptedAI void KillAllElites() { - std::list<HostilReference*>& threatList = m_creature->getThreatManager().getThreatList(); + std::list<HostileReference*>& threatList = m_creature->getThreatManager().getThreatList(); std::vector<Unit*> eliteList; - for (std::list<HostilReference*>::iterator itr = threatList.begin(); itr != threatList.end(); ++itr) + for (std::list<HostileReference*>::iterator itr = threatList.begin(); itr != threatList.end(); ++itr) { Unit* pUnit = Unit::GetUnit((*m_creature), (*itr)->getUnitGuid()); if (pUnit && pUnit->GetEntry() == ILLIDARI_ELITE) diff --git a/src/scripts/outland/black_temple/boss_reliquary_of_souls.cpp b/src/scripts/outland/black_temple/boss_reliquary_of_souls.cpp index 43bf9471104..6504b9918aa 100644 --- a/src/scripts/outland/black_temple/boss_reliquary_of_souls.cpp +++ b/src/scripts/outland/black_temple/boss_reliquary_of_souls.cpp @@ -188,8 +188,8 @@ struct boss_reliquary_of_soulsAI : public ScriptedAI if (!pTarget) return; - std::list<HostilReference*>& m_threatlist = pTarget->getThreatManager().getThreatList(); - std::list<HostilReference*>::iterator itr = m_threatlist.begin(); + std::list<HostileReference*>& m_threatlist = pTarget->getThreatManager().getThreatList(); + std::list<HostileReference*>::iterator itr = m_threatlist.begin(); for (; itr != m_threatlist.end(); itr++) { Unit* pUnit = Unit::GetUnit((*m_creature), (*itr)->getUnitGuid()); @@ -386,11 +386,11 @@ struct boss_essence_of_sufferingAI : public ScriptedAI void CastFixate() { - std::list<HostilReference*>& m_threatlist = m_creature->getThreatManager().getThreatList(); + std::list<HostileReference*>& m_threatlist = m_creature->getThreatManager().getThreatList(); if (m_threatlist.empty()) return; // No point continuing if empty threatlist. std::list<Unit*> targets; - std::list<HostilReference*>::iterator itr = m_threatlist.begin(); + std::list<HostileReference*>::iterator itr = m_threatlist.begin(); for (; itr != m_threatlist.end(); ++itr) { Unit* pUnit = Unit::GetUnit((*m_creature), (*itr)->getUnitGuid()); diff --git a/src/scripts/outland/black_temple/boss_supremus.cpp b/src/scripts/outland/black_temple/boss_supremus.cpp index 8290fa6399b..24f75d5d1e0 100644 --- a/src/scripts/outland/black_temple/boss_supremus.cpp +++ b/src/scripts/outland/black_temple/boss_supremus.cpp @@ -149,8 +149,8 @@ struct boss_supremusAI : public ScriptedAI uint32 health = 0; Unit *pTarget = NULL; - std::list<HostilReference*>& m_threatlist = m_creature->getThreatManager().getThreatList(); - std::list<HostilReference*>::iterator i = m_threatlist.begin(); + std::list<HostileReference*>& m_threatlist = m_creature->getThreatManager().getThreatList(); + std::list<HostileReference*>::iterator i = m_threatlist.begin(); for (i = m_threatlist.begin(); i!= m_threatlist.end(); ++i) { Unit* pUnit = Unit::GetUnit((*m_creature), (*i)->getUnitGuid()); diff --git a/src/scripts/outland/black_temple/boss_teron_gorefiend.cpp b/src/scripts/outland/black_temple/boss_teron_gorefiend.cpp index f143f2e7323..c12bbd4249c 100644 --- a/src/scripts/outland/black_temple/boss_teron_gorefiend.cpp +++ b/src/scripts/outland/black_temple/boss_teron_gorefiend.cpp @@ -142,10 +142,10 @@ struct mob_shadowy_constructAI : public ScriptedAI void CheckPlayers() { - std::list<HostilReference*>& m_threatlist = m_creature->getThreatManager().getThreatList(); + std::list<HostileReference*>& m_threatlist = m_creature->getThreatManager().getThreatList(); if (m_threatlist.empty()) return; // No threat list. Don't continue. - std::list<HostilReference*>::iterator itr = m_threatlist.begin(); + std::list<HostileReference*>::iterator itr = m_threatlist.begin(); std::list<Unit*> targets; for (; itr != m_threatlist.end(); ++itr) { @@ -282,8 +282,8 @@ struct boss_teron_gorefiendAI : public ScriptedAI { if (!Blossom) return; - std::list<HostilReference*>& m_threatlist = m_creature->getThreatManager().getThreatList(); - std::list<HostilReference*>::iterator i = m_threatlist.begin(); + std::list<HostileReference*>& m_threatlist = m_creature->getThreatManager().getThreatList(); + std::list<HostileReference*>::iterator i = m_threatlist.begin(); for (i = m_threatlist.begin(); i != m_threatlist.end(); ++i) { Unit* pUnit = Unit::GetUnit((*m_creature), (*i)->getUnitGuid()); diff --git a/src/scripts/outland/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp b/src/scripts/outland/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp index 96d8c837877..d16f9a9e57f 100644 --- a/src/scripts/outland/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp +++ b/src/scripts/outland/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp @@ -439,8 +439,8 @@ struct boss_lady_vashjAI : public ScriptedAI { bool InMeleeRange = false; Unit *pTarget; - std::list<HostilReference *> t_list = m_creature->getThreatManager().getThreatList(); - for (std::list<HostilReference *>::iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) + std::list<HostileReference *> t_list = m_creature->getThreatManager().getThreatList(); + for (std::list<HostileReference *>::iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) { pTarget = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid()); //if in melee range diff --git a/src/scripts/outland/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp b/src/scripts/outland/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp index b701d2d5c33..37b859a4097 100644 --- a/src/scripts/outland/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp +++ b/src/scripts/outland/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp @@ -478,9 +478,9 @@ struct boss_leotheras_the_blindAI : public ScriptedAI //Summon Inner Demon if (InnerDemons_Timer <= diff) { - std::list<HostilReference *>& ThreatList = m_creature->getThreatManager().getThreatList(); + std::list<HostileReference *>& ThreatList = m_creature->getThreatManager().getThreatList(); std::vector<Unit *> TargetList; - for (std::list<HostilReference *>::iterator itr = ThreatList.begin(); itr != ThreatList.end(); ++itr) + for (std::list<HostileReference *>::iterator itr = ThreatList.begin(); itr != ThreatList.end(); ++itr) { Unit *tempTarget = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid()); if (tempTarget && tempTarget->GetTypeId() == TYPEID_PLAYER && tempTarget->GetGUID() != m_creature->getVictim()->GetGUID() && TargetList.size()<5) diff --git a/src/scripts/outland/gruuls_lair/boss_high_king_maulgar.cpp b/src/scripts/outland/gruuls_lair/boss_high_king_maulgar.cpp index c55bf2b8b70..4e586b2057f 100644 --- a/src/scripts/outland/gruuls_lair/boss_high_king_maulgar.cpp +++ b/src/scripts/outland/gruuls_lair/boss_high_king_maulgar.cpp @@ -706,9 +706,9 @@ struct boss_krosh_firehandAI : public ScriptedAI if (BlastWave_Timer <= diff) { Unit *pTarget; - std::list<HostilReference *> t_list = m_creature->getThreatManager().getThreatList(); + std::list<HostileReference *> t_list = m_creature->getThreatManager().getThreatList(); std::vector<Unit *> target_list; - for (std::list<HostilReference *>::iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) + for (std::list<HostileReference *>::iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) { pTarget = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid()); //15 yard radius minimum diff --git a/src/scripts/outland/netherstorm.cpp b/src/scripts/outland/netherstorm.cpp index 16c4abea69e..25dba020be4 100644 --- a/src/scripts/outland/netherstorm.cpp +++ b/src/scripts/outland/netherstorm.cpp @@ -743,10 +743,10 @@ struct mob_phase_hunterAI : public ScriptedAI // some code to cast spell Mana Burn on random target which has mana if (ManaBurnTimer <= diff) { - std::list<HostilReference*> AggroList = m_creature->getThreatManager().getThreatList(); + std::list<HostileReference*> AggroList = m_creature->getThreatManager().getThreatList(); std::list<Unit*> UnitsWithMana; - for(std::list<HostilReference*>::const_iterator itr = AggroList.begin(); itr != AggroList.end(); ++itr) + for(std::list<HostileReference*>::const_iterator itr = AggroList.begin(); itr != AggroList.end(); ++itr) { if(Unit *pUnit = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid())) { diff --git a/src/scripts/outland/shadowmoon_valley.cpp b/src/scripts/outland/shadowmoon_valley.cpp index 341f5abde60..cd9a253d4cb 100644 --- a/src/scripts/outland/shadowmoon_valley.cpp +++ b/src/scripts/outland/shadowmoon_valley.cpp @@ -230,7 +230,7 @@ struct mob_enslaved_netherwing_drakeAI : public ScriptedAI AttackStart(Dragonmaw); } - HostilReference* ref = m_creature->getThreatManager().getOnlineContainer().getReferenceByTarget(caster); + HostileReference* ref = m_creature->getThreatManager().getOnlineContainer().getReferenceByTarget(caster); if (ref) ref->removeReference(); } diff --git a/src/scripts/outland/tempest_keep/the_eye/boss_kaelthas.cpp b/src/scripts/outland/tempest_keep/the_eye/boss_kaelthas.cpp index 2962ede14df..0fc0c57d2e2 100644 --- a/src/scripts/outland/tempest_keep/the_eye/boss_kaelthas.cpp +++ b/src/scripts/outland/tempest_keep/the_eye/boss_kaelthas.cpp @@ -851,7 +851,7 @@ struct boss_kaelthasAI : public ScriptedAI //GravityLapse_Timer if (GravityLapse_Timer <= diff) { - std::list<HostilReference*>::iterator i = m_creature->getThreatManager().getThreatList().begin(); + std::list<HostileReference*>::iterator i = m_creature->getThreatManager().getThreatList().begin(); switch (GravityLapse_Phase) { case 0: @@ -1196,8 +1196,8 @@ struct boss_grand_astromancer_capernianAI : public advisorbase_ai { bool InMeleeRange = false; Unit *pTarget = NULL; - std::list<HostilReference*>& m_threatlist = m_creature->getThreatManager().getThreatList(); - for (std::list<HostilReference*>::iterator i = m_threatlist.begin(); i!= m_threatlist.end(); ++i) + std::list<HostileReference*>& m_threatlist = m_creature->getThreatManager().getThreatList(); + for (std::list<HostileReference*>::iterator i = m_threatlist.begin(); i!= m_threatlist.end(); ++i) { Unit* pUnit = Unit::GetUnit((*m_creature), (*i)->getUnitGuid()); //if in melee range diff --git a/src/scripts/outland/tempest_keep/the_eye/boss_void_reaver.cpp b/src/scripts/outland/tempest_keep/the_eye/boss_void_reaver.cpp index ca0f42ed5af..84dd5af73d0 100644 --- a/src/scripts/outland/tempest_keep/the_eye/boss_void_reaver.cpp +++ b/src/scripts/outland/tempest_keep/the_eye/boss_void_reaver.cpp @@ -109,9 +109,9 @@ struct boss_void_reaverAI : public ScriptedAI if (ArcaneOrb_Timer <= diff) { Unit *pTarget = NULL; - std::list<HostilReference *> t_list = m_creature->getThreatManager().getThreatList(); + std::list<HostileReference *> t_list = m_creature->getThreatManager().getThreatList(); std::vector<Unit *> target_list; - for (std::list<HostilReference *>::iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) + for (std::list<HostileReference *>::iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) { pTarget = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid()); if (!pTarget) |