aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts/Outland
diff options
context:
space:
mode:
authorclick <click@gonnamakeyou.com>2011-07-02 23:53:38 +0200
committerclick <click@gonnamakeyou.com>2011-07-02 23:53:38 +0200
commitf676585cac5b8b51cfc23bbda669164ad4374f33 (patch)
tree3afbb7ca335723420185afa3b21b5a179196beb4 /src/server/scripts/Outland
parentf997363c08ad472d4f30375b46b8dfb6ac9cfbb8 (diff)
Core: Cleaning up hungarian notation - Phase5: pWho -> who
Diffstat (limited to 'src/server/scripts/Outland')
-rw-r--r--src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp4
-rw-r--r--src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp10
-rw-r--r--src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp14
-rw-r--r--src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp12
-rw-r--r--src/server/scripts/Outland/hellfire_peninsula.cpp8
-rw-r--r--src/server/scripts/Outland/nagrand.cpp2
-rw-r--r--src/server/scripts/Outland/shadowmoon_valley.cpp6
-rw-r--r--src/server/scripts/Outland/shattrath_city.cpp10
8 files changed, 33 insertions, 33 deletions
diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp
index 4c936116c90..204de59e155 100644
--- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp
@@ -94,12 +94,12 @@ public:
m_pInstance->SetData(TYPE_HELLMAW, FAIL);
}
- void MoveInLineOfSight(Unit* pWho)
+ void MoveInLineOfSight(Unit* who)
{
if (me->HasAura(SPELL_BANISH))
return;
- npc_escortAI::MoveInLineOfSight(pWho);
+ npc_escortAI::MoveInLineOfSight(who);
}
void WaypointReached(uint32 /*i*/)
diff --git a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp
index f8a2a4e6d5a..f346de0e859 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp
@@ -265,11 +265,11 @@ public:
void EnterCombat(Unit* /*who*/) {}
- void MoveInLineOfSight(Unit* pWho)
+ void MoveInLineOfSight(Unit* who)
{
- if (!Intro && pWho->GetTypeId() == TYPEID_PLAYER && pWho->isTargetableForAttack() && me->IsHostileTo(pWho) && pWho->isInAccessiblePlaceFor(me))
+ if (!Intro && who->GetTypeId() == TYPEID_PLAYER && who->isTargetableForAttack() && me->IsHostileTo(who) && who->isInAccessiblePlaceFor(me))
{
- if (me->IsWithinDistInMap(pWho, VISIBLE_RANGE) && me->IsWithinLOSInMap(pWho))
+ if (me->IsWithinDistInMap(who, VISIBLE_RANGE) && me->IsWithinLOSInMap(who))
{
if (pInstance)
pInstance->SetData(DATA_TERONGOREFIENDEVENT, IN_PROGRESS);
@@ -278,12 +278,12 @@ public:
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
DoScriptText(SAY_INTRO, me);
me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_TALK);
- AggroTargetGUID = pWho->GetGUID();
+ AggroTargetGUID = who->GetGUID();
Intro = true;
}
}
if (Done)
- ScriptedAI::MoveInLineOfSight(pWho);
+ ScriptedAI::MoveInLineOfSight(who);
}
void KilledUnit(Unit* /*victim*/)
diff --git a/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp b/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp
index 2baacf26553..03133b81e17 100644
--- a/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp
+++ b/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp
@@ -339,18 +339,18 @@ public:
pInstance->SetData(DATA_MAULGAREVENT, NOT_STARTED);
}
- void AttackStart(Unit* pWho)
+ void AttackStart(Unit* who)
{
- if (!pWho)
+ if (!who)
return;
- if (me->Attack(pWho, true))
+ if (me->Attack(who, true))
{
- me->AddThreat(pWho, 0.0f);
- me->SetInCombatWith(pWho);
- pWho->SetInCombatWith(me);
+ me->AddThreat(who, 0.0f);
+ me->SetInCombatWith(who);
+ who->SetInCombatWith(me);
- me->GetMotionMaster()->MoveChase(pWho, 30.0f);
+ me->GetMotionMaster()->MoveChase(who, 30.0f);
}
}
diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp
index 8e6c0b830e6..0cdcca1ae2f 100644
--- a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp
+++ b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp
@@ -111,14 +111,14 @@ class npc_millhouse_manastorm : public CreatureScript
}
}
- void AttackStart(Unit* pWho)
+ void AttackStart(Unit* who)
{
- if (me->Attack(pWho, true))
+ if (me->Attack(who, true))
{
- me->AddThreat(pWho, 0.0f);
- me->SetInCombatWith(pWho);
- pWho->SetInCombatWith(me);
- me->GetMotionMaster()->MoveChase(pWho, 25.0f);
+ me->AddThreat(who, 0.0f);
+ me->SetInCombatWith(who);
+ who->SetInCombatWith(me);
+ me->GetMotionMaster()->MoveChase(who, 25.0f);
}
}
diff --git a/src/server/scripts/Outland/hellfire_peninsula.cpp b/src/server/scripts/Outland/hellfire_peninsula.cpp
index 20e1415cfa6..a9845cbeb12 100644
--- a/src/server/scripts/Outland/hellfire_peninsula.cpp
+++ b/src/server/scripts/Outland/hellfire_peninsula.cpp
@@ -173,12 +173,12 @@ public:
DoCast(me, SPELL_ANCESTRAL_WOLF_BUFF, true);
}
- void MoveInLineOfSight(Unit* pWho)
+ void MoveInLineOfSight(Unit* who)
{
- if (!pRyga && pWho->GetTypeId() == TYPEID_UNIT && pWho->GetEntry() == NPC_RYGA && me->IsWithinDistInMap(pWho, 15.0f))
- pRyga = pWho;
+ if (!pRyga && who->GetTypeId() == TYPEID_UNIT && who->GetEntry() == NPC_RYGA && me->IsWithinDistInMap(who, 15.0f))
+ pRyga = who;
- npc_escortAI::MoveInLineOfSight(pWho);
+ npc_escortAI::MoveInLineOfSight(who);
}
void WaypointReached(uint32 uiPointId)
diff --git a/src/server/scripts/Outland/nagrand.cpp b/src/server/scripts/Outland/nagrand.cpp
index 97bf0d1c400..4d2091d71b1 100644
--- a/src/server/scripts/Outland/nagrand.cpp
+++ b/src/server/scripts/Outland/nagrand.cpp
@@ -645,7 +645,7 @@ public:
m_uiFrostShockTimer = 6000;
}
- void EnterCombat(Unit* /*pWho*/)
+ void EnterCombat(Unit* /*who*/)
{
DoCast(me, SPELL_EARTHBIND_TOTEM, false);
}
diff --git a/src/server/scripts/Outland/shadowmoon_valley.cpp b/src/server/scripts/Outland/shadowmoon_valley.cpp
index 64fef57b34c..8eb0aee951f 100644
--- a/src/server/scripts/Outland/shadowmoon_valley.cpp
+++ b/src/server/scripts/Outland/shadowmoon_valley.cpp
@@ -1022,18 +1022,18 @@ public:
DoSummon(NPC_COILSKAR_ASSASSIN, me, 15.0f, 5000, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT);
}
- void EnterCombat(Unit* pWho)
+ void EnterCombat(Unit* who)
{
//don't always use
if (rand()%5)
return;
//only aggro text if not player
- if (pWho->GetTypeId() != TYPEID_PLAYER)
+ if (who->GetTypeId() != TYPEID_PLAYER)
{
//appears to be random
if (urand(0, 1))
- DoScriptText(RAND(SAY_WIL_AGGRO1, SAY_WIL_AGGRO2), pWho);
+ DoScriptText(RAND(SAY_WIL_AGGRO1, SAY_WIL_AGGRO2), who);
}
}
diff --git a/src/server/scripts/Outland/shattrath_city.cpp b/src/server/scripts/Outland/shattrath_city.cpp
index 50fbd1056db..35ef9ae820b 100644
--- a/src/server/scripts/Outland/shattrath_city.cpp
+++ b/src/server/scripts/Outland/shattrath_city.cpp
@@ -360,19 +360,19 @@ public:
}
}
- void MoveInLineOfSight(Unit* pWho)
+ void MoveInLineOfSight(Unit* who)
{
if (HasEscortState(STATE_ESCORT_ESCORTING))
return;
- if (pWho->GetTypeId() == TYPEID_PLAYER)
+ if (who->GetTypeId() == TYPEID_PLAYER)
{
- if (CAST_PLR(pWho)->GetQuestStatus(10211) == QUEST_STATUS_INCOMPLETE)
+ if (CAST_PLR(who)->GetQuestStatus(10211) == QUEST_STATUS_INCOMPLETE)
{
float Radius = 10.0;
- if (me->IsWithinDistInMap(pWho, Radius))
+ if (me->IsWithinDistInMap(who, Radius))
{
- Start(false, false, pWho->GetGUID());
+ Start(false, false, who->GetGUID());
}
}
}