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/EasternKingdoms/Deadmines/boss_mr_smite.cpp
+1 -1
View File
@@ -79,7 +79,7 @@ public:
SetEquipmentSlots(false, EQUIP_SWORD, EQUIP_UNEQUIP, EQUIP_NO_CHANGE);
}
void EnterCombat(Unit* /*pWho*/)
void EnterCombat(Unit* /*who*/)
{
DoScriptText(SAY_AGGRO, me);
}
src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp
+7 -7
View File
@@ -372,9 +372,9 @@ struct boss_priestess_lackey_commonAI : public ScriptedAI
}
}
void EnterCombat(Unit* pWho)
void EnterCombat(Unit* who)
{
if (!pWho)
if (!who)
return;
if (pInstance)
@@ -385,8 +385,8 @@ struct boss_priestess_lackey_commonAI : public ScriptedAI
{
if (!pAdd->getVictim() && pAdd != me)
{
pWho->SetInCombatWith(pAdd);
pAdd->AddThreat(pWho, 0.0f);
who->SetInCombatWith(pAdd);
pAdd->AddThreat(who, 0.0f);
}
}
}
@@ -395,8 +395,8 @@ struct boss_priestess_lackey_commonAI : public ScriptedAI
{
if (pDelrissa->isAlive() && !pDelrissa->getVictim())
{
pWho->SetInCombatWith(pDelrissa);
pDelrissa->AddThreat(pWho, 0.0f);
who->SetInCombatWith(pDelrissa);
pDelrissa->AddThreat(who, 0.0f);
}
}
}
@@ -618,7 +618,7 @@ public:
boss_priestess_lackey_commonAI::Reset();
}
void EnterCombat(Unit* /*pWho*/)
void EnterCombat(Unit* /*who*/)
{
DoCast(me, SPELL_SUMMON_IMP);
}
src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp
+4 -4
View File
@@ -657,13 +657,13 @@ public:
return false;
}
void MoveInLineOfSight(Unit* pWho)
void MoveInLineOfSight(Unit* who)
{
if (PlayerGUID || pWho->GetTypeId() != TYPEID_PLAYER || !pWho->IsWithinDist(me, INTERACTION_DISTANCE))
if (PlayerGUID || who->GetTypeId() != TYPEID_PLAYER || !who->IsWithinDist(me, INTERACTION_DISTANCE))
return;
if (MeetQuestCondition(pWho))
PlayerGUID = pWho->GetGUID();
if (MeetQuestCondition(who))
PlayerGUID = who->GetGUID();
}
void UpdateAI(const uint32 diff)
src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp
+5 -5
View File
@@ -107,7 +107,7 @@ public:
}
}
void EnterCombat(Unit* /*pWho*/)
void EnterCombat(Unit* /*who*/)
{
DoScriptText(SAY_MO_AGGRO, me);
DoCast(me, SPELL_RETRIBUTIONAURA);
@@ -157,7 +157,7 @@ public:
}
}
void SpellHit(Unit* /*pWho*/, const SpellEntry* pSpell)
void SpellHit(Unit* /*who*/, const SpellEntry* pSpell)
{
//When hit with ressurection say text
if (pSpell->Id == SPELL_SCARLETRESURRECTION)
@@ -260,15 +260,15 @@ public:
m_pInstance->SetData(TYPE_MOGRAINE_AND_WHITE_EVENT, NOT_STARTED);
}
void AttackStart(Unit* pWho)
void AttackStart(Unit* who)
{
if (m_pInstance && m_pInstance->GetData(TYPE_MOGRAINE_AND_WHITE_EVENT) == NOT_STARTED)
return;
ScriptedAI::AttackStart(pWho);
ScriptedAI::AttackStart(who);
}
void EnterCombat(Unit* /*pWho*/)
void EnterCombat(Unit* /*who*/)
{
DoScriptText(SAY_WH_INTRO, me);
}
src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp
+3 -3
View File
@@ -182,11 +182,11 @@ public:
IsIntro = false;
}
void AttackStart(Unit* pWho)
void AttackStart(Unit* who)
{
if (!pWho || Intro || IsIntro)
if (!who || Intro || IsIntro)
return;
ScriptedAI::AttackStart(pWho);
ScriptedAI::AttackStart(who);
}
void DoIntro()
src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
+1 -1
View File
@@ -103,7 +103,7 @@ class boss_arlokk : public CreatureScript
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
}
void EnterCombat(Unit* /*pWho*/)
void EnterCombat(Unit* /*who*/)
{
DoScriptText(SAY_AGGRO, me);
}
src/server/scripts/EasternKingdoms/arathi_highlands.cpp
+1 -1
View File
@@ -102,7 +102,7 @@ class npc_professor_phizzlethorpe : public CreatureScript
pSummoned->AI()->AttackStart(me);
}
void EnterCombat(Unit* /*pWho*/)
void EnterCombat(Unit* /*who*/)
{
DoScriptText(SAY_AGGRO, me);
}
src/server/scripts/EasternKingdoms/hinterlands.cpp
+5 -5
View File
@@ -130,9 +130,9 @@ public:
}
}
void EnterCombat(Unit* pWho)
void EnterCombat(Unit* who)
{
if (pWho->GetEntry() == NPC_MARAUDING_OWL || pWho->GetEntry() == NPC_VILE_AMBUSHER)
if (who->GetEntry() == NPC_MARAUDING_OWL || who->GetEntry() == NPC_VILE_AMBUSHER)
return;
if (rand()%1)
@@ -236,13 +236,13 @@ public:
npc_escortAI::JustRespawned();
}
void EnterCombat(Unit* pWho)
void EnterCombat(Unit* who)
{
if (HasEscortState(STATE_ESCORT_ESCORTING))
{
if (pWho->GetEntry() == NPC_OUTRUNNER && !m_bIsByOutrunner)
if (who->GetEntry() == NPC_OUTRUNNER && !m_bIsByOutrunner)
{
DoScriptText(SAY_RIN_BY_OUTRUNNER, pWho);
DoScriptText(SAY_RIN_BY_OUTRUNNER, who);
m_bIsByOutrunner = true;
}
src/server/scripts/EasternKingdoms/stormwind_city.cpp
+4 -4
View File
@@ -335,12 +335,12 @@ public:
}
}
void EnterCombat(Unit* pWho)
void EnterCombat(Unit* who)
{
if (Creature* pMarzon = Unit::GetCreature(*me, MarzonGUID))
{
if (pMarzon->isAlive() && !pMarzon->isInCombat())
pMarzon->AI()->AttackStart(pWho);
pMarzon->AI()->AttackStart(who);
}
}
@@ -472,7 +472,7 @@ public:
me->RestoreFaction();
}
void EnterCombat(Unit* pWho)
void EnterCombat(Unit* who)
{
DoScriptText(SAY_MARZON_2, me);
@@ -481,7 +481,7 @@ public:
if (Unit* pSummoner = me->ToTempSummon()->GetSummoner())
{
if (pSummoner && pSummoner->GetTypeId() == TYPEID_UNIT && pSummoner->isAlive() && !pSummoner->isInCombat())
pSummoner->ToCreature()->AI()->AttackStart(pWho);
pSummoner->ToCreature()->AI()->AttackStart(who);
}
}
}
src/server/scripts/EasternKingdoms/swamp_of_sorrows.cpp
+2 -2
View File
@@ -76,10 +76,10 @@ public:
m_uiPeriodicSay = 6000;
}
void EnterCombat(Unit* pWho)
void EnterCombat(Unit* who)
{
if (HasEscortState(STATE_ESCORT_ESCORTING))
DoScriptText(RAND(SAY_ATTACKED_1, SAY_ATTACKED_2), me, pWho);
DoScriptText(RAND(SAY_ATTACKED_1, SAY_ATTACKED_2), me, who);
}
void WaypointStart(uint32 uiPointId)
src/server/scripts/EasternKingdoms/western_plaguelands.cpp
+4 -4
View File
@@ -255,13 +255,13 @@ public:
{
npc_andorhal_towerAI(Creature* c) : Scripted_NoMovementAI(c) {}
void MoveInLineOfSight(Unit* pWho)
void MoveInLineOfSight(Unit* who)
{
if (!pWho || pWho->GetTypeId() != TYPEID_PLAYER)
if (!who || who->GetTypeId() != TYPEID_PLAYER)
return;
if (me->FindNearestGameObject(GO_BEACON_TORCH, 10.0f))
CAST_PLR(pWho)->KilledMonsterCredit(me->GetEntry(), me->GetGUID());
CAST_PLR(who)->KilledMonsterCredit(me->GetEntry(), me->GetGUID());
}
};
@@ -378,7 +378,7 @@ public:
}
}
void EnterCombat(Unit* /*pWho*/){}
void EnterCombat(Unit* /*who*/){}
void JustDied(Unit* /*pKiller*/)
{
src/server/scripts/EasternKingdoms/westfall.cpp
+7 -7
View File
@@ -149,18 +149,18 @@ public:
}
}
void AttackStart(Unit* pWho)
void AttackStart(Unit* who)
{
if (!pWho)
if (!who)
return;
if (me->Attack(pWho, false))
if (me->Attack(who, false))
{
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);
}
}
src/server/scripts/EasternKingdoms/wetlands.cpp
+1 -1
View File
@@ -81,7 +81,7 @@ public:
}
}
void EnterCombat(Unit* /*pWho*/)
void EnterCombat(Unit* /*who*/)
{
Player* player = GetPlayerForEscort();