diff options
author | click <click@gonnamakeyou.com> | 2011-07-02 23:53:38 +0200 |
---|---|---|
committer | click <click@gonnamakeyou.com> | 2011-07-02 23:53:38 +0200 |
commit | f676585cac5b8b51cfc23bbda669164ad4374f33 (patch) | |
tree | 3afbb7ca335723420185afa3b21b5a179196beb4 /src/server/scripts/EasternKingdoms | |
parent | f997363c08ad472d4f30375b46b8dfb6ac9cfbb8 (diff) |
Core: Cleaning up hungarian notation - Phase5: pWho -> who
Diffstat (limited to 'src/server/scripts/EasternKingdoms')
13 files changed, 45 insertions, 45 deletions
diff --git a/src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp b/src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp index c0be771ce4b..cbb4917de2e 100644 --- a/src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp +++ b/src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp @@ -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); } diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp index 794e23f9510..fe516d3d1fa 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp @@ -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); } diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp index ba1a3d18eee..c8b3224a0a8 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp @@ -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) diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp index 7c01110b18e..a21b5f00a22 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp @@ -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); } diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp index 29ab9df2c44..ade340d7abb 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp @@ -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() diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp index 6b4dbf41121..e13afba48dc 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp @@ -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); } diff --git a/src/server/scripts/EasternKingdoms/arathi_highlands.cpp b/src/server/scripts/EasternKingdoms/arathi_highlands.cpp index f389c107329..4f1f9f82cbe 100644 --- a/src/server/scripts/EasternKingdoms/arathi_highlands.cpp +++ b/src/server/scripts/EasternKingdoms/arathi_highlands.cpp @@ -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); } diff --git a/src/server/scripts/EasternKingdoms/hinterlands.cpp b/src/server/scripts/EasternKingdoms/hinterlands.cpp index e982e27492c..1296a7a6159 100644 --- a/src/server/scripts/EasternKingdoms/hinterlands.cpp +++ b/src/server/scripts/EasternKingdoms/hinterlands.cpp @@ -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; } diff --git a/src/server/scripts/EasternKingdoms/stormwind_city.cpp b/src/server/scripts/EasternKingdoms/stormwind_city.cpp index eca101b3d3a..d0e93d0be27 100644 --- a/src/server/scripts/EasternKingdoms/stormwind_city.cpp +++ b/src/server/scripts/EasternKingdoms/stormwind_city.cpp @@ -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); } } } diff --git a/src/server/scripts/EasternKingdoms/swamp_of_sorrows.cpp b/src/server/scripts/EasternKingdoms/swamp_of_sorrows.cpp index 8419ca964d8..dc04f77a488 100644 --- a/src/server/scripts/EasternKingdoms/swamp_of_sorrows.cpp +++ b/src/server/scripts/EasternKingdoms/swamp_of_sorrows.cpp @@ -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) diff --git a/src/server/scripts/EasternKingdoms/western_plaguelands.cpp b/src/server/scripts/EasternKingdoms/western_plaguelands.cpp index 97cb11a352b..bc087aeba46 100644 --- a/src/server/scripts/EasternKingdoms/western_plaguelands.cpp +++ b/src/server/scripts/EasternKingdoms/western_plaguelands.cpp @@ -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*/) { diff --git a/src/server/scripts/EasternKingdoms/westfall.cpp b/src/server/scripts/EasternKingdoms/westfall.cpp index 777384bf13d..a8c98e4d632 100644 --- a/src/server/scripts/EasternKingdoms/westfall.cpp +++ b/src/server/scripts/EasternKingdoms/westfall.cpp @@ -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); } } diff --git a/src/server/scripts/EasternKingdoms/wetlands.cpp b/src/server/scripts/EasternKingdoms/wetlands.cpp index d1358399118..e4ba171f813 100644 --- a/src/server/scripts/EasternKingdoms/wetlands.cpp +++ b/src/server/scripts/EasternKingdoms/wetlands.cpp @@ -81,7 +81,7 @@ public: } } - void EnterCombat(Unit* /*pWho*/) + void EnterCombat(Unit* /*who*/) { Player* player = GetPlayerForEscort(); |