From 8034a6c48ea565345cd769422bb80acf5df015e4 Mon Sep 17 00:00:00 2001 From: Spp Date: Tue, 9 Mar 2010 11:11:10 +0100 Subject: Rename 'Hostil' to 'Hostile' Credits to NoFantasy (Mangos) Closes issue #411 --HG-- branch : trunk --- .../shadow_labyrinth/boss_blackheart_the_inciter.cpp | 4 ++-- .../outland/auchindoun/shadow_labyrinth/boss_murmur.cpp | 12 ++++++------ src/scripts/outland/black_temple/boss_bloodboil.cpp | 4 ++-- src/scripts/outland/black_temple/boss_illidan.cpp | 6 +++--- src/scripts/outland/black_temple/boss_reliquary_of_souls.cpp | 8 ++++---- src/scripts/outland/black_temple/boss_supremus.cpp | 4 ++-- src/scripts/outland/black_temple/boss_teron_gorefiend.cpp | 8 ++++---- .../coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp | 4 ++-- .../serpent_shrine/boss_leotheras_the_blind.cpp | 4 ++-- src/scripts/outland/gruuls_lair/boss_high_king_maulgar.cpp | 4 ++-- src/scripts/outland/netherstorm.cpp | 4 ++-- src/scripts/outland/shadowmoon_valley.cpp | 2 +- src/scripts/outland/tempest_keep/the_eye/boss_kaelthas.cpp | 6 +++--- .../outland/tempest_keep/the_eye/boss_void_reaver.cpp | 4 ++-- 14 files changed, 37 insertions(+), 37 deletions(-) (limited to 'src/scripts/outland') 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 t_list = m_creature->getThreatManager().getThreatList(); - for (std::list::iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) + std::list t_list = m_creature->getThreatManager().getThreatList(); + for (std::list::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 t_list = m_creature->getThreatManager().getThreatList(); - for (std::list::iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) + std::list t_list = m_creature->getThreatManager().getThreatList(); + for (std::list::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& m_threatlist = m_creature->getThreatManager().getThreatList(); - for (std::list::iterator i = m_threatlist.begin(); i != m_threatlist.end(); ++i) + std::list& m_threatlist = m_creature->getThreatManager().getThreatList(); + for (std::list::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& m_threatlist = m_creature->getThreatManager().getThreatList(); - for (std::list::iterator i = m_threatlist.begin(); i != m_threatlist.end(); ++i) + std::list& m_threatlist = m_creature->getThreatManager().getThreatList(); + for (std::list::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 m_threatlist = m_creature->getThreatManager().getThreatList(); + std::list m_threatlist = m_creature->getThreatManager().getThreatList(); if (!m_threatlist.size()) // He doesn't have anyone in his threatlist, useless to continue return; std::list targets; - std::list::iterator itr = m_threatlist.begin(); + std::list::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::iterator itr = m_creature->getThreatManager().getThreatList().begin(); itr != m_creature->getThreatManager().getThreatList().end(); ++itr) + for (std::list::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& threatList = m_creature->getThreatManager().getThreatList(); + std::list& threatList = m_creature->getThreatManager().getThreatList(); std::vector eliteList; - for (std::list::iterator itr = threatList.begin(); itr != threatList.end(); ++itr) + for (std::list::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& m_threatlist = pTarget->getThreatManager().getThreatList(); - std::list::iterator itr = m_threatlist.begin(); + std::list& m_threatlist = pTarget->getThreatManager().getThreatList(); + std::list::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& m_threatlist = m_creature->getThreatManager().getThreatList(); + std::list& m_threatlist = m_creature->getThreatManager().getThreatList(); if (m_threatlist.empty()) return; // No point continuing if empty threatlist. std::list targets; - std::list::iterator itr = m_threatlist.begin(); + std::list::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& m_threatlist = m_creature->getThreatManager().getThreatList(); - std::list::iterator i = m_threatlist.begin(); + std::list& m_threatlist = m_creature->getThreatManager().getThreatList(); + std::list::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& m_threatlist = m_creature->getThreatManager().getThreatList(); + std::list& m_threatlist = m_creature->getThreatManager().getThreatList(); if (m_threatlist.empty()) return; // No threat list. Don't continue. - std::list::iterator itr = m_threatlist.begin(); + std::list::iterator itr = m_threatlist.begin(); std::list targets; for (; itr != m_threatlist.end(); ++itr) { @@ -282,8 +282,8 @@ struct boss_teron_gorefiendAI : public ScriptedAI { if (!Blossom) return; - std::list& m_threatlist = m_creature->getThreatManager().getThreatList(); - std::list::iterator i = m_threatlist.begin(); + std::list& m_threatlist = m_creature->getThreatManager().getThreatList(); + std::list::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 t_list = m_creature->getThreatManager().getThreatList(); - for (std::list::iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) + std::list t_list = m_creature->getThreatManager().getThreatList(); + for (std::list::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& ThreatList = m_creature->getThreatManager().getThreatList(); + std::list& ThreatList = m_creature->getThreatManager().getThreatList(); std::vector TargetList; - for (std::list::iterator itr = ThreatList.begin(); itr != ThreatList.end(); ++itr) + for (std::list::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 t_list = m_creature->getThreatManager().getThreatList(); + std::list t_list = m_creature->getThreatManager().getThreatList(); std::vector target_list; - for (std::list::iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) + for (std::list::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 AggroList = m_creature->getThreatManager().getThreatList(); + std::list AggroList = m_creature->getThreatManager().getThreatList(); std::list UnitsWithMana; - for(std::list::const_iterator itr = AggroList.begin(); itr != AggroList.end(); ++itr) + for(std::list::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::iterator i = m_creature->getThreatManager().getThreatList().begin(); + std::list::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& m_threatlist = m_creature->getThreatManager().getThreatList(); - for (std::list::iterator i = m_threatlist.begin(); i!= m_threatlist.end(); ++i) + std::list& m_threatlist = m_creature->getThreatManager().getThreatList(); + for (std::list::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 t_list = m_creature->getThreatManager().getThreatList(); + std::list t_list = m_creature->getThreatManager().getThreatList(); std::vector target_list; - for (std::list::iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) + for (std::list::iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) { pTarget = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid()); if (!pTarget) -- cgit v1.2.3