aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts/Kalimdor
diff options
context:
space:
mode:
Diffstat (limited to 'src/server/scripts/Kalimdor')
-rw-r--r--src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp2
-rw-r--r--src/server/scripts/Kalimdor/ashenvale.cpp2
-rw-r--r--src/server/scripts/Kalimdor/darkshore.cpp18
-rw-r--r--src/server/scripts/Kalimdor/desolace.cpp10
-rw-r--r--src/server/scripts/Kalimdor/dustwallow_marsh.cpp16
-rw-r--r--src/server/scripts/Kalimdor/tanaris.cpp10
-rw-r--r--src/server/scripts/Kalimdor/teldrassil.cpp10
-rw-r--r--src/server/scripts/Kalimdor/the_barrens.cpp8
-rw-r--r--src/server/scripts/Kalimdor/ungoro_crater.cpp10
9 files changed, 43 insertions, 43 deletions
diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp
index 80a546ed4c9..e8d7af383e5 100644
--- a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp
+++ b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp
@@ -177,7 +177,7 @@ public:
}
}
- void EnterCombat(Unit* /*pWho*/)
+ void EnterCombat(Unit* /*who*/)
{
DoScriptText(SAY_AGGRO, me);
me->SetInCombatWithZone();
diff --git a/src/server/scripts/Kalimdor/ashenvale.cpp b/src/server/scripts/Kalimdor/ashenvale.cpp
index 1e2eb049911..1360a7dbbeb 100644
--- a/src/server/scripts/Kalimdor/ashenvale.cpp
+++ b/src/server/scripts/Kalimdor/ashenvale.cpp
@@ -350,7 +350,7 @@ class npc_muglash : public CreatureScript
}
}
- void EnterCombat(Unit* /*pWho*/)
+ void EnterCombat(Unit* /*who*/)
{
if (Player* player = GetPlayerForEscort())
if (HasEscortState(STATE_ESCORT_PAUSED))
diff --git a/src/server/scripts/Kalimdor/darkshore.cpp b/src/server/scripts/Kalimdor/darkshore.cpp
index 2f81461f1e5..052137f9d2e 100644
--- a/src/server/scripts/Kalimdor/darkshore.cpp
+++ b/src/server/scripts/Kalimdor/darkshore.cpp
@@ -101,13 +101,13 @@ public:
m_uiFallAsleepTimer = urand(10000, 45000);
}
- void MoveInLineOfSight(Unit* pWho)
+ void MoveInLineOfSight(Unit* who)
{
- FollowerAI::MoveInLineOfSight(pWho);
+ FollowerAI::MoveInLineOfSight(who);
- if (!me->getVictim() && !HasFollowState(STATE_FOLLOW_COMPLETE) && pWho->GetEntry() == NPC_LILADRIS)
+ if (!me->getVictim() && !HasFollowState(STATE_FOLLOW_COMPLETE) && who->GetEntry() == NPC_LILADRIS)
{
- if (me->IsWithinDistInMap(pWho, INTERACTION_DISTANCE*5))
+ if (me->IsWithinDistInMap(who, INTERACTION_DISTANCE*5))
{
if (Player* player = GetLeaderForFollower())
{
@@ -368,15 +368,15 @@ public:
void Reset() { }
- void MoveInLineOfSight(Unit* pWho)
+ void MoveInLineOfSight(Unit* who)
{
- FollowerAI::MoveInLineOfSight(pWho);
+ FollowerAI::MoveInLineOfSight(who);
- if (!me->getVictim() && !HasFollowState(STATE_FOLLOW_COMPLETE) && pWho->GetEntry() == NPC_GELKAK)
+ if (!me->getVictim() && !HasFollowState(STATE_FOLLOW_COMPLETE) && who->GetEntry() == NPC_GELKAK)
{
- if (me->IsWithinDistInMap(pWho, 10.0f))
+ if (me->IsWithinDistInMap(who, 10.0f))
{
- DoScriptText(SAY_AT_CLOSE, pWho);
+ DoScriptText(SAY_AT_CLOSE, who);
DoAtEnd();
}
}
diff --git a/src/server/scripts/Kalimdor/desolace.cpp b/src/server/scripts/Kalimdor/desolace.cpp
index 3ceadccad4a..9237985e554 100644
--- a/src/server/scripts/Kalimdor/desolace.cpp
+++ b/src/server/scripts/Kalimdor/desolace.cpp
@@ -118,16 +118,16 @@ public:
m_uiDespawnTimer = 0;
}
- void MoveInLineOfSight(Unit* pWho)
+ void MoveInLineOfSight(Unit* who)
{
- if (pWho->GetEntry() == NPC_SMEED)
+ if (who->GetEntry() == NPC_SMEED)
{
if (me->HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP))
return;
- if (me->IsWithinDistInMap(pWho, 10.0f))
+ if (me->IsWithinDistInMap(who, 10.0f))
{
- DoScriptText(RAND(SAY_SMEED_HOME_1, SAY_SMEED_HOME_2, SAY_SMEED_HOME_3), pWho);
+ DoScriptText(RAND(SAY_SMEED_HOME_1, SAY_SMEED_HOME_2, SAY_SMEED_HOME_3), who);
//spell have no implemented effect (dummy), so useful to notify spellHit
DoCast(me, SPELL_KODO_KOMBO_GOSSIP, true);
@@ -234,7 +234,7 @@ public:
}
}
- void EnterCombat(Unit* /*pWho*/) { }
+ void EnterCombat(Unit* /*who*/) { }
void Reset() {}
diff --git a/src/server/scripts/Kalimdor/dustwallow_marsh.cpp b/src/server/scripts/Kalimdor/dustwallow_marsh.cpp
index 7bc145814bb..3a1684c87b3 100644
--- a/src/server/scripts/Kalimdor/dustwallow_marsh.cpp
+++ b/src/server/scripts/Kalimdor/dustwallow_marsh.cpp
@@ -510,18 +510,18 @@ public:
MoveToDock();
}
- void AttackStart(Unit* pWho)
+ void AttackStart(Unit* who)
{
- if (!pWho)
+ if (!who)
return;
- if (me->Attack(pWho, true))
+ if (me->Attack(who, true))
{
- me->SetInCombatWith(pWho);
- pWho->SetInCombatWith(me);
+ me->SetInCombatWith(who);
+ who->SetInCombatWith(me);
if (IsCombatMovementAllowed())
- me->GetMotionMaster()->MoveChase(pWho);
+ me->GetMotionMaster()->MoveChase(who);
}
}
@@ -653,9 +653,9 @@ public:
}
}
- void EnterCombat(Unit* pWho)
+ void EnterCombat(Unit* who)
{
- DoScriptText(SAY_ATTACKED_1, me, pWho);
+ DoScriptText(SAY_ATTACKED_1, me, who);
}
void Reset() {}
diff --git a/src/server/scripts/Kalimdor/tanaris.cpp b/src/server/scripts/Kalimdor/tanaris.cpp
index 68b62c229b6..e03a71f55a1 100644
--- a/src/server/scripts/Kalimdor/tanaris.cpp
+++ b/src/server/scripts/Kalimdor/tanaris.cpp
@@ -541,13 +541,13 @@ public:
TortaGUID = 0;
}
- void MoveInLineOfSight(Unit* pWho)
+ void MoveInLineOfSight(Unit* who)
{
- FollowerAI::MoveInLineOfSight(pWho);
+ FollowerAI::MoveInLineOfSight(who);
- if (!me->getVictim() && !HasFollowState(STATE_FOLLOW_COMPLETE | STATE_FOLLOW_POSTEVENT) && pWho->GetEntry() == NPC_TORTA)
+ if (!me->getVictim() && !HasFollowState(STATE_FOLLOW_COMPLETE | STATE_FOLLOW_POSTEVENT) && who->GetEntry() == NPC_TORTA)
{
- if (me->IsWithinDistInMap(pWho, INTERACTION_DISTANCE))
+ if (me->IsWithinDistInMap(who, INTERACTION_DISTANCE))
{
if (Player* player = GetLeaderForFollower())
{
@@ -555,7 +555,7 @@ public:
player->GroupEventHappens(QUEST_TOOGA, me);
}
- TortaGUID = pWho->GetGUID();
+ TortaGUID = who->GetGUID();
SetFollowComplete(true);
}
}
diff --git a/src/server/scripts/Kalimdor/teldrassil.cpp b/src/server/scripts/Kalimdor/teldrassil.cpp
index 6844931e903..0d93fd2b5bb 100644
--- a/src/server/scripts/Kalimdor/teldrassil.cpp
+++ b/src/server/scripts/Kalimdor/teldrassil.cpp
@@ -70,15 +70,15 @@ public:
void Reset() { }
- void MoveInLineOfSight(Unit* pWho)
+ void MoveInLineOfSight(Unit* who)
{
- FollowerAI::MoveInLineOfSight(pWho);
+ FollowerAI::MoveInLineOfSight(who);
- if (!me->getVictim() && !HasFollowState(STATE_FOLLOW_COMPLETE) && pWho->GetEntry() == NPC_ARYNIA)
+ if (!me->getVictim() && !HasFollowState(STATE_FOLLOW_COMPLETE) && who->GetEntry() == NPC_ARYNIA)
{
- if (me->IsWithinDistInMap(pWho, 10.0f))
+ if (me->IsWithinDistInMap(who, 10.0f))
{
- DoScriptText(SAY_AT_HOME, pWho);
+ DoScriptText(SAY_AT_HOME, who);
DoComplete();
}
}
diff --git a/src/server/scripts/Kalimdor/the_barrens.cpp b/src/server/scripts/Kalimdor/the_barrens.cpp
index 918cd7c7fb1..a71896e95d5 100644
--- a/src/server/scripts/Kalimdor/the_barrens.cpp
+++ b/src/server/scripts/Kalimdor/the_barrens.cpp
@@ -158,17 +158,17 @@ public:
}
}
- void EnterCombat(Unit* pWho)
+ void EnterCombat(Unit* who)
{
//not always use
if (rand()%4)
return;
//only aggro text if not player and only in this area
- if (pWho->GetTypeId() != TYPEID_PLAYER && me->GetAreaId() == AREA_MERCHANT_COAST)
+ if (who->GetTypeId() != TYPEID_PLAYER && me->GetAreaId() == AREA_MERCHANT_COAST)
{
- //appears to be pretty much random (possible only if escorter not in combat with pWho yet?)
- DoScriptText(RAND(SAY_GIL_AGGRO_1, SAY_GIL_AGGRO_2, SAY_GIL_AGGRO_3, SAY_GIL_AGGRO_4), me, pWho);
+ //appears to be pretty much random (possible only if escorter not in combat with who yet?)
+ DoScriptText(RAND(SAY_GIL_AGGRO_1, SAY_GIL_AGGRO_2, SAY_GIL_AGGRO_3, SAY_GIL_AGGRO_4), me, who);
}
}
};
diff --git a/src/server/scripts/Kalimdor/ungoro_crater.cpp b/src/server/scripts/Kalimdor/ungoro_crater.cpp
index 14658eefabd..4dfd64f4b1e 100644
--- a/src/server/scripts/Kalimdor/ungoro_crater.cpp
+++ b/src/server/scripts/Kalimdor/ungoro_crater.cpp
@@ -217,13 +217,13 @@ public:
SpraggleGUID = 0;
}
- void MoveInLineOfSight(Unit* pWho)
+ void MoveInLineOfSight(Unit* who)
{
- FollowerAI::MoveInLineOfSight(pWho);
+ FollowerAI::MoveInLineOfSight(who);
- if (!me->getVictim() && !HasFollowState(STATE_FOLLOW_COMPLETE) && pWho->GetEntry() == NPC_SPRAGGLE)
+ if (!me->getVictim() && !HasFollowState(STATE_FOLLOW_COMPLETE) && who->GetEntry() == NPC_SPRAGGLE)
{
- if (me->IsWithinDistInMap(pWho, INTERACTION_DISTANCE))
+ if (me->IsWithinDistInMap(who, INTERACTION_DISTANCE))
{
if (Player* player = GetLeaderForFollower())
{
@@ -231,7 +231,7 @@ public:
player->GroupEventHappens(QUEST_A_LITTLE_HELP, me);
}
- SpraggleGUID = pWho->GetGUID();
+ SpraggleGUID = who->GetGUID();
SetFollowComplete(true);
}
}