aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts/Outland
diff options
context:
space:
mode:
authorclick <click@gonnamakeyou.com>2011-07-02 23:58:05 +0200
committerclick <click@gonnamakeyou.com>2011-07-02 23:58:05 +0200
commitdb045c40adba23ae54674351466e81cc2a7cb117 (patch)
tree17f89e62dff9ba20712ca0e3b36d62f6860490ee /src/server/scripts/Outland
parentf676585cac5b8b51cfc23bbda669164ad4374f33 (diff)
Core: Cleaning up hungarian notation - Phase5: pKiller -> killer
Diffstat (limited to 'src/server/scripts/Outland')
-rw-r--r--src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp4
-rw-r--r--src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp6
-rw-r--r--src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp10
-rw-r--r--src/server/scripts/Outland/netherstorm.cpp2
4 files changed, 11 insertions, 11 deletions
diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp
index b9262135f51..0d21ff2c70c 100644
--- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp
@@ -384,11 +384,11 @@ class boss_vazruden_the_herald : public CreatureScript
pSummoned->AI()->AttackStart(victim);
}
- void SentryDownBy(Unit* pKiller)
+ void SentryDownBy(Unit* killer)
{
if (sentryDown)
{
- AttackStartNoMove(pKiller);
+ AttackStartNoMove(killer);
sentryDown = false;
}
else
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp
index aa3322629b5..97010fdefaa 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp
@@ -168,7 +168,7 @@ class boss_alar : public CreatureScript
ScriptedAI::AttackStart(who);
}
- void DamageTaken(Unit* /*pKiller*/, uint32 &damage)
+ void DamageTaken(Unit* /*killer*/, uint32 &damage)
{
if (damage >= me->GetHealth() && Phase1)
{
@@ -490,9 +490,9 @@ class mob_ember_of_alar : public CreatureScript
me->setDeathState(JUST_DIED);
}
- void DamageTaken(Unit* pKiller, uint32 &damage)
+ void DamageTaken(Unit* killer, uint32 &damage)
{
- if (damage >= me->GetHealth() && pKiller != me && !toDie)
+ if (damage >= me->GetHealth() && killer != me && !toDie)
{
damage = 0;
DoCast(me, SPELL_EMBER_BLAST, true);
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
index e1d366b0cf7..47bb157bbbd 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
@@ -208,7 +208,7 @@ struct advisorbase_ai : public ScriptedAI
DelayRes_Timer = 2000;
}
- void DamageTaken(Unit* pKiller, uint32 &damage)
+ void DamageTaken(Unit* killer, uint32 &damage)
{
if (damage < me->GetHealth())
return;
@@ -240,7 +240,7 @@ struct advisorbase_ai : public ScriptedAI
me->GetMotionMaster()->Clear();
me->GetMotionMaster()->MoveIdle();
me->SetStandState(UNIT_STAND_STATE_DEAD);
- JustDied(pKiller);
+ JustDied(killer);
}
}
@@ -1043,7 +1043,7 @@ class boss_thaladred_the_darkener : public CreatureScript
me->AddThreat(who, 5000000.0f);
}
- void JustDied(Unit* /*pKiller*/)
+ void JustDied(Unit* /*killer*/)
{
if (m_pInstance && m_pInstance->GetData(DATA_KAELTHASEVENT) == 3)
DoScriptText(SAY_THALADRED_DEATH, me);
@@ -1200,7 +1200,7 @@ class boss_grand_astromancer_capernian : public CreatureScript
advisorbase_ai::Reset();
}
- void JustDied(Unit* /*pKiller*/)
+ void JustDied(Unit* /*killer*/)
{
if (m_pInstance && m_pInstance->GetData(DATA_KAELTHASEVENT) == 3)
DoScriptText(SAY_CAPERNIAN_DEATH, me);
@@ -1339,7 +1339,7 @@ class boss_master_engineer_telonicus : public CreatureScript
advisorbase_ai::Reset();
}
- void JustDied(Unit* /*pKiller*/)
+ void JustDied(Unit* /*killer*/)
{
if (m_pInstance && m_pInstance->GetData(DATA_KAELTHASEVENT) == 3)
DoScriptText(SAY_TELONICUS_DEATH, me);
diff --git a/src/server/scripts/Outland/netherstorm.cpp b/src/server/scripts/Outland/netherstorm.cpp
index 820b654140f..4437a71a9af 100644
--- a/src/server/scripts/Outland/netherstorm.cpp
+++ b/src/server/scripts/Outland/netherstorm.cpp
@@ -1003,7 +1003,7 @@ public:
}
}
- void JustDied(Unit* /*pKiller*/)
+ void JustDied(Unit* /*killer*/)
{
Player* player = GetPlayerForEscort();
if (player)