Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-19 00:48:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rename 'Hostil' to 'Hostile'

Browse Source 
Credits to NoFantasy (Mangos)
Closes issue #411

--HG--
branch : trunk
This commit is contained in:
Spp
2010-03-09 11:11:10 +01:00
parent c716c0e5e5
commit 8034a6c48e
63 changed files with 260 additions and 260 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/scripts/eastern_kingdoms/blackwing_lair/boss_chromaggus.cpp
View File

@@ -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())

4
src/scripts/eastern_kingdoms/karazhan/boss_midnight.cpp
View File

@@ -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))

4
src/scripts/eastern_kingdoms/karazhan/boss_prince_malchezaar.cpp
View File

@@ -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()))

4
src/scripts/eastern_kingdoms/karazhan/boss_shade_of_aran.cpp
View File

@@ -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

12
src/scripts/eastern_kingdoms/magisters_terrace/boss_felblood_kaelthas.cpp
View File

@@ -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());

8
src/scripts/eastern_kingdoms/magisters_terrace/boss_priestess_delrissa.cpp
View File

@@ -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()))
{

2
src/scripts/eastern_kingdoms/scarlet_monastery/boss_headless_horseman.cpp
View File

@@ -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());

6
src/scripts/eastern_kingdoms/sunwell_plateau/boss_kalecgos.cpp
View File

@@ -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()))
{

2
src/scripts/eastern_kingdoms/sunwell_plateau/boss_kiljaeden.cpp
View File

@@ -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());

2
src/scripts/eastern_kingdoms/zulgurub/boss_mandokir.cpp
View File

@@ -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());

4
src/scripts/kalimdor/boss_azuregos.cpp
View File

@@ -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());

4
src/scripts/kalimdor/caverns_of_time/hyjal/boss_archimonde.cpp
View File

@@ -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());

4
src/scripts/kalimdor/caverns_of_time/hyjal/boss_kazrogal.cpp
View File

@@ -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)

2
src/scripts/kalimdor/temple_of_ahnqiraj/boss_cthun.cpp
View File

@@ -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

2
src/scripts/kalimdor/temple_of_ahnqiraj/mob_anubisath_sentinel.cpp
View File

@@ -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());

4
src/scripts/northrend/azjol_nerub/ahnkahet/boss_prince_taldaram.cpp
View File

@@ -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

8
src/scripts/northrend/draktharon_keep/boss_tharon_ja.cpp
View File

@@ -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)

4
src/scripts/northrend/naxxramas/boss_kelthuzad.cpp
View File

@@ -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

2
src/scripts/northrend/naxxramas/boss_patchwerk.cpp
View File

@@ -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();

4
src/scripts/northrend/naxxramas/boss_sapphiron.cpp
View File

@@ -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();

4
src/scripts/northrend/nexus/nexus/boss_keristrasza.cpp
View File

@@ -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)

2
src/scripts/northrend/nexus/nexus/boss_ormorok.cpp
View File

@@ -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());

4
src/scripts/outland/auchindoun/shadow_labyrinth/boss_blackheart_the_inciter.cpp
View File

@@ -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)

12
src/scripts/outland/auchindoun/shadow_labyrinth/boss_murmur.cpp
View File

@@ -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))
{

4
src/scripts/outland/black_temple/boss_bloodboil.cpp
View File

@@ -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());

6
src/scripts/outland/black_temple/boss_illidan.cpp
View File

@@ -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)

8
src/scripts/outland/black_temple/boss_reliquary_of_souls.cpp
View File

@@ -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());

4
src/scripts/outland/black_temple/boss_supremus.cpp
View File

@@ -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());

8
src/scripts/outland/black_temple/boss_teron_gorefiend.cpp
View File

@@ -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());

4
src/scripts/outland/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp
View File

@@ -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

4
src/scripts/outland/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp
View File

@@ -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)

4
src/scripts/outland/gruuls_lair/boss_high_king_maulgar.cpp
View File

@@ -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

4
src/scripts/outland/netherstorm.cpp
View File

@@ -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()))
{

2
src/scripts/outland/shadowmoon_valley.cpp
View File

@@ -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();
}

6
src/scripts/outland/tempest_keep/the_eye/boss_kaelthas.cpp
View File

@@ -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

4
src/scripts/outland/tempest_keep/the_eye/boss_void_reaver.cpp
View File

@@ -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)