diff options
Diffstat (limited to 'src/scripts/eastern_kingdoms')
10 files changed, 24 insertions, 24 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()); |