josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core: Cleaning up hungarian notation - Phase5: pWho -> who

Browse Source
This commit is contained in:
click
2011-07-02 23:53:38 +02:00
parent f997363c08
commit f676585cac
62 changed files with 326 additions and 326 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp
+1 -1
View File
@@ -177,7 +177,7 @@ public:
}
}
void EnterCombat(Unit* /*pWho*/)
void EnterCombat(Unit* /*who*/)
{
DoScriptText(SAY_AGGRO, me);
me->SetInCombatWithZone();
src/server/scripts/Kalimdor/ashenvale.cpp
+1 -1
View File
@@ -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))
src/server/scripts/Kalimdor/darkshore.cpp
+9 -9
View File
@@ -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();
}
}
src/server/scripts/Kalimdor/desolace.cpp
+5 -5
View File
@@ -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() {}
src/server/scripts/Kalimdor/dustwallow_marsh.cpp
+8 -8
View File
@@ -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() {}
src/server/scripts/Kalimdor/tanaris.cpp
+5 -5
View File
@@ -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);
}
}
src/server/scripts/Kalimdor/teldrassil.cpp
+5 -5
View File
@@ -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();
}
}
src/server/scripts/Kalimdor/the_barrens.cpp
+4 -4
View File
@@ -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);
}
}
};
src/server/scripts/Kalimdor/ungoro_crater.cpp
+5 -5
View File
@@ -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);
}
}