aboutsummaryrefslogtreecommitdiff
path: root/src/scripts/northrend
diff options
context:
space:
mode:
Diffstat (limited to 'src/scripts/northrend')
-rw-r--r--src/scripts/northrend/azjol_nerub/ahnkahet/boss_prince_taldaram.cpp4
-rw-r--r--src/scripts/northrend/draktharon_keep/boss_tharon_ja.cpp8
-rw-r--r--src/scripts/northrend/naxxramas/boss_kelthuzad.cpp4
-rw-r--r--src/scripts/northrend/naxxramas/boss_patchwerk.cpp2
-rw-r--r--src/scripts/northrend/naxxramas/boss_sapphiron.cpp4
-rw-r--r--src/scripts/northrend/nexus/nexus/boss_keristrasza.cpp4
-rw-r--r--src/scripts/northrend/nexus/nexus/boss_ormorok.cpp2
7 files changed, 14 insertions, 14 deletions
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());