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/Northrend | |
parent | f997363c08ad472d4f30375b46b8dfb6ac9cfbb8 (diff) |
Core: Cleaning up hungarian notation - Phase5: pWho -> who
Diffstat (limited to 'src/server/scripts/Northrend')
29 files changed, 190 insertions, 190 deletions
diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp index 53797939e77..4fd52bd7444 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp @@ -159,7 +159,7 @@ public: return NULL; } - void EnterCombat(Unit* /*pWho*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); if (pInstance) diff --git a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp index 9926a27c52c..f91ddb8d789 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp @@ -350,7 +350,7 @@ public: pInstance->SetData(TYPE_SARTHARION_EVENT, NOT_STARTED); } - void EnterCombat(Unit* /*pWho*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_SARTHARION_AGGRO, me); DoZoneInCombat(); @@ -1013,7 +1013,7 @@ public: m_bHasPortalOpen = false; } - void EnterCombat(Unit* /*pWho*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_TENEBRON_AGGRO, me); DoZoneInCombat(); @@ -1109,7 +1109,7 @@ public: m_bHasPortalOpen = false; } - void EnterCombat(Unit* /*pWho*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_SHADRON_AGGRO, me); DoZoneInCombat(); @@ -1208,7 +1208,7 @@ public: m_bHasPortalOpen = false; } - void EnterCombat(Unit* /*pWho*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_VESPERON_AGGRO, me); DoZoneInCombat(); @@ -1523,9 +1523,9 @@ public: me->DealDamage(me, me->GetHealth()); } - void JustSummoned(Creature* pWho) + void JustSummoned(Creature* who) { - pWho->SetInCombatWithZone(); + who->SetInCombatWithZone(); } void UpdateAI(const uint32 uiDiff) @@ -1541,8 +1541,8 @@ public: m_uiHatchEggTimer -= uiDiff; } - void AttackStart(Unit* /*pWho*/) {} - void MoveInLineOfSight(Unit* /*pWho*/) {} + void AttackStart(Unit* /*who*/) {} + void MoveInLineOfSight(Unit* /*who*/) {} }; }; diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp index fc8e1ae2540..a49c8fdbc72 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp @@ -218,7 +218,7 @@ public: } } - void EnterCombat(Unit* /*pWho*/) + void EnterCombat(Unit* /*who*/) { DoCastSpellShield(); } @@ -616,10 +616,10 @@ public: uiHexMendingTimer = urand(20000, 25000); } - void EnterCombat(Unit* pWho) + void EnterCombat(Unit* who) { DoCast(me, SPELL_EARTH_SHIELD); - DoCast(pWho, SPELL_HEX_OF_MENDING); + DoCast(who, SPELL_HEX_OF_MENDING); }; void JustReachedHome() diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp index 3b6440b1465..fbead980be7 100755 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp @@ -185,9 +185,9 @@ public: m_vBurrowGUID.clear(); } - void KilledUnit(Unit* pWho) + void KilledUnit(Unit* who) { - if (pWho->GetTypeId() == TYPEID_PLAYER) + if (who->GetTypeId() == TYPEID_PLAYER) { DoScriptText(urand(0, 1) ? SAY_KILL1 : SAY_KILL2, me); if (m_pInstance) @@ -195,7 +195,7 @@ public: } } - void MoveInLineOfSight(Unit* /*pWho*/) + void MoveInLineOfSight(Unit* /*who*/) { if (!m_bIntro) { @@ -250,7 +250,7 @@ public: } } - void EnterCombat(Unit* /*pWho*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE); @@ -582,7 +582,7 @@ public: DoCast(SPELL_FROST_SPHERE); } - void DamageTaken(Unit* /*pWho*/, uint32& uiDamage) + void DamageTaken(Unit* /*who*/, uint32& uiDamage) { if (me->GetHealth() < uiDamage) { @@ -660,17 +660,17 @@ public: m_uiTargetGUID = 0; } - void EnterCombat(Unit* pWho) + void EnterCombat(Unit* who) { - m_uiTargetGUID = pWho->GetGUID(); - DoCast(pWho, SPELL_MARK); + m_uiTargetGUID = who->GetGUID(); + DoCast(who, SPELL_MARK); me->SetSpeed(MOVE_RUN, 0.5f); m_uiSpeed = 0; m_uiIncreaseSpeedTimer = 1*IN_MILLISECONDS; - me->TauntApply(pWho); + me->TauntApply(who); } - void DamageTaken(Unit* /*pWho*/, uint32& uiDamage) + void DamageTaken(Unit* /*who*/, uint32& uiDamage) { uiDamage = 0; } diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp index f5d472f1a75..03b513c5319 100755 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp @@ -406,20 +406,20 @@ struct boss_faction_championsAI : public ScriptedAI return count; } - void AttackStart(Unit* pWho) + void AttackStart(Unit* who) { - if (!pWho) return; + if (!who) return; - if (me->Attack(pWho, true)) + if (me->Attack(who, true)) { - me->AddThreat(pWho, 10.0f); - me->SetInCombatWith(pWho); - pWho->SetInCombatWith(me); + me->AddThreat(who, 10.0f); + me->SetInCombatWith(who); + who->SetInCombatWith(me); if (mAIType == AI_MELEE || mAIType == AI_PET) - DoStartMovement(pWho); + DoStartMovement(who); else - DoStartMovement(pWho, 20.0f); + DoStartMovement(who, 20.0f); SetCombatMovement(true); } } @@ -872,9 +872,9 @@ public: DoCast(me, SPELL_SHADOWFORM); } - void EnterCombat(Unit* pWho) + void EnterCombat(Unit* who) { - boss_faction_championsAI::EnterCombat(pWho); + boss_faction_championsAI::EnterCombat(who); } void UpdateAI(const uint32 uiDiff) @@ -1865,9 +1865,9 @@ public: SetEquipmentSlots(false, 47519, EQUIP_NO_CHANGE, EQUIP_NO_CHANGE); } - void EnterCombat(Unit* pWho) + void EnterCombat(Unit* who) { - boss_faction_championsAI::EnterCombat(pWho); + boss_faction_championsAI::EnterCombat(who); DoCast(SPELL_SEAL_OF_COMMAND); } diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp index ba4143511e3..863d4b269ec 100755 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp @@ -141,9 +141,9 @@ public: me->SetReactState(REACT_PASSIVE); } - void KilledUnit(Unit* pWho) + void KilledUnit(Unit* who) { - if (pWho->GetTypeId() == TYPEID_PLAYER) + if (who->GetTypeId() == TYPEID_PLAYER) { if (m_pInstance) m_pInstance->SetData(DATA_TRIBUTE_TO_IMMORTALITY_ELEGIBLE, 0); @@ -163,7 +163,7 @@ public: Summons.Summon(pSummoned); } - void EnterCombat(Unit* /*pWho*/) + void EnterCombat(Unit* /*who*/) { me->SetInCombatWithZone(); if (m_pInstance) diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp index a58c6756898..b159bc9e454 100755 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp @@ -162,7 +162,7 @@ public: me->DespawnOrUnsummon(); } - void EnterCombat(Unit* /*pWho*/) + void EnterCombat(Unit* /*who*/) { me->SetInCombatWithZone(); m_pInstance->SetData(TYPE_NORTHREND_BEASTS, GORMOK_IN_PROGRESS); @@ -265,11 +265,11 @@ public: me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE); } - void EnterCombat(Unit* pWho) + void EnterCombat(Unit* who) { - m_uiTargetGUID = pWho->GetGUID(); - me->TauntApply(pWho); - DoCast(pWho, SPELL_SNOBOLLED); + m_uiTargetGUID = who->GetGUID(); + me->TauntApply(who); + DoCast(who, SPELL_SNOBOLLED); } void DamageTaken(Unit* pDoneBy, uint32 &uiDamage) @@ -402,16 +402,16 @@ struct boss_jormungarAI : public ScriptedAI me->DespawnOrUnsummon(); } - void KilledUnit(Unit* pWho) + void KilledUnit(Unit* who) { - if (pWho->GetTypeId() == TYPEID_PLAYER) + if (who->GetTypeId() == TYPEID_PLAYER) { if (instanceScript) instanceScript->SetData(DATA_TRIBUTE_TO_IMMORTALITY_ELEGIBLE, 0); } } - void EnterCombat(Unit* /*pWho*/) + void EnterCombat(Unit* /*who*/) { me->SetInCombatWithZone(); if (instanceScript) @@ -756,16 +756,16 @@ public: me->DespawnOrUnsummon(); } - void KilledUnit(Unit* pWho) + void KilledUnit(Unit* who) { - if (pWho->GetTypeId() == TYPEID_PLAYER) + if (who->GetTypeId() == TYPEID_PLAYER) { if (m_pInstance) m_pInstance->SetData(DATA_TRIBUTE_TO_IMMORTALITY_ELEGIBLE, 0); } } - void EnterCombat(Unit* /*pWho*/) + void EnterCombat(Unit* /*who*/) { if (m_pInstance) m_pInstance->SetData(TYPE_NORTHREND_BEASTS, ICEHOWL_IN_PROGRESS); diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp index cb3d47b3dd9..27b590d7f2f 100755 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp @@ -195,9 +195,9 @@ struct boss_twin_baseAI : public ScriptedAI } } - void KilledUnit(Unit* pWho) + void KilledUnit(Unit* who) { - if (pWho->GetTypeId() == TYPEID_PLAYER) + if (who->GetTypeId() == TYPEID_PLAYER) { DoScriptText(urand(0, 1) ? SAY_KILL1 : SAY_KILL2, me); if (m_pInstance) @@ -302,7 +302,7 @@ struct boss_twin_baseAI : public ScriptedAI return Unit::GetCreature((*me), m_pInstance->GetData64(m_uiSisterNpcId)); } - void EnterCombat(Unit* /*pWho*/) + void EnterCombat(Unit* /*who*/) { me->SetInCombatWithZone(); if (m_pInstance) @@ -474,9 +474,9 @@ public: } } - void EnterCombat(Unit* pWho) + void EnterCombat(Unit* who) { - boss_twin_baseAI::EnterCombat(pWho); + boss_twin_baseAI::EnterCombat(who); if (m_pInstance) { m_pInstance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, EVENT_START_TWINS_FIGHT); diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp index 3ce934201d8..72726d33132 100755 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp @@ -120,7 +120,7 @@ class npc_announcer_toc10 : public CreatureScript pAlly->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); } - void AttackStart(Unit* /*pWho*/) {} + void AttackStart(Unit* /*who*/) {} }; bool OnGossipHello(Player* player, Creature* creature) @@ -530,7 +530,7 @@ class npc_tirion_toc : public CreatureScript void Reset() {} - void AttackStart(Unit* /*pWho*/) {} + void AttackStart(Unit* /*who*/) {} void UpdateAI(const uint32 uiDiff) { @@ -844,7 +844,7 @@ class npc_garrosh_toc : public CreatureScript void Reset() {} - void AttackStart(Unit* /*pWho*/) {} + void AttackStart(Unit* /*who*/) {} void UpdateAI(const uint32 uiDiff) { @@ -922,7 +922,7 @@ class npc_varian_toc : public CreatureScript void Reset() {} - void AttackStart(Unit* /*pWho*/) {} + void AttackStart(Unit* /*who*/) {} void UpdateAI(const uint32 uiDiff) { diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp index 036435d383d..f4bb4a9f72c 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp @@ -796,7 +796,7 @@ public: { } - void JustDied(Unit* /*pWho*/) + void JustDied(Unit* /*who*/) { DoCast(SPELL_HALLUCINATION_2); } diff --git a/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp b/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp index a2e58475c28..e1a734eb1a9 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp @@ -83,7 +83,7 @@ public: pInstance->SetData(DATA_MOORABI_EVENT, NOT_STARTED); } - void EnterCombat(Unit* /*pWho*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); DoCast(me, SPELL_MOJO_FRENZY, true); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp index 8397d41fd43..9859cd758df 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp @@ -286,7 +286,7 @@ public: magneticPullTimer = 20000; } - void EnterCombat(Unit* /*pWho*/) + void EnterCombat(Unit* /*who*/) { DoCast(SPELL_STALAGG_TESLA); } @@ -370,7 +370,7 @@ public: staticFieldTimer = 5000; } - void EnterCombat(Unit* /*pWho*/) + void EnterCombat(Unit* /*who*/) { DoCast(SPELL_FEUGEN_TESLA); } diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp index 2416078119c..83bfe2b083f 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp @@ -127,7 +127,7 @@ public: timeBombTimer = urand(20000, 25000); } - void EnterCombat(Unit* /*pWho*/) + void EnterCombat(Unit* /*who*/) { _EnterCombat(); @@ -139,24 +139,24 @@ public: instance->SetData(DATA_UROM_PLATAFORM, instance->GetData(DATA_UROM_PLATAFORM)+1); } - void AttackStart(Unit* pWho) + void AttackStart(Unit* who) { - if (!pWho) + if (!who) return; if (me->GetPositionZ() > 518.63f) - DoStartNoMovement(pWho); + DoStartNoMovement(who); if (me->GetPositionZ() < 518.63f) { - if (me->Attack(pWho, true)) + if (me->Attack(who, true)) { DoScriptText(SayAggro[3], me); - me->SetInCombatWith(pWho); - pWho->SetInCombatWith(me); + me->SetInCombatWith(who); + who->SetInCombatWith(me); - me->GetMotionMaster()->MoveChase(pWho, 0, 0); + me->GetMotionMaster()->MoveChase(who, 0, 0); } } } diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp index 9304549c21e..1c38dea5a37 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp @@ -167,7 +167,7 @@ public: m_pInstance->SetData(TYPE_BJARNGRIM, NOT_STARTED); } - void EnterCombat(Unit* /*pWho*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); @@ -385,14 +385,14 @@ public: m_uiRenewSteel_Timer = 10000 + rand()%1000; } - void EnterCombat(Unit* pWho) + void EnterCombat(Unit* who) { if (m_pInstance) { if (Creature* pBjarngrim = m_pInstance->instance->GetCreature(m_pInstance->GetData64(DATA_BJARNGRIM))) { if (pBjarngrim->isAlive() && !pBjarngrim->getVictim()) - pBjarngrim->AI()->AttackStart(pWho); + pBjarngrim->AI()->AttackStart(who); } } } diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp index a12465f3b91..5758200770d 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp @@ -104,7 +104,7 @@ public: } } - void EnterCombat(Unit* /*pWho*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp index fea4ed4a5ac..0c0e956c148 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp @@ -125,7 +125,7 @@ public: m_pInstance->SetData(TYPE_VOLKHAN, NOT_STARTED); } - void EnterCombat(Unit* /*pWho*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); @@ -133,16 +133,16 @@ public: m_pInstance->SetData(TYPE_VOLKHAN, IN_PROGRESS); } - 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->AddThreat(who, 0.0f); + me->SetInCombatWith(who); + who->SetInCombatWith(me); if (!m_bHasTemper) - me->GetMotionMaster()->MoveChase(pWho); + me->GetMotionMaster()->MoveChase(who); } } @@ -395,16 +395,16 @@ public: m_uiImmolation_Timer = 5000; } - 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->AddThreat(who, 0.0f); + me->SetInCombatWith(who); + who->SetInCombatWith(me); if (!m_bIsFrozen) - me->GetMotionMaster()->MoveChase(pWho); + me->GetMotionMaster()->MoveChase(who); } } diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_thorim.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_thorim.cpp index 0204aaa97d3..f993c419b8c 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_thorim.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_thorim.cpp @@ -79,7 +79,7 @@ public: _JustDied(); } - void EnterCombat(Unit* /*pWho*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2), me); _EnterCombat(); diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp index c566208ba30..14a73bd92c3 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp @@ -123,12 +123,12 @@ public: pInstance->SetData(DATA_SVALA_SORROWGRAVE_EVENT, NOT_STARTED); } - void MoveInLineOfSight(Unit* pWho) + void MoveInLineOfSight(Unit* who) { - if (!pWho) + if (!who) return; - if (Phase == IDLE && pWho->isTargetableForAttack() && me->IsHostileTo(pWho) && me->IsWithinDistInMap(pWho, 40)) + if (Phase == IDLE && who->isTargetableForAttack() && me->IsHostileTo(who) && me->IsWithinDistInMap(who, 40)) { Phase = INTRO; me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); diff --git a/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp b/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp index a6910af0a95..5e816cc1488 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp @@ -95,34 +95,34 @@ public: } } - void AttackStart(Unit* pWho) + void AttackStart(Unit* who) { if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE) || me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) return; - if (me->Attack(pWho, true)) + if (me->Attack(who, true)) { - me->AddThreat(pWho, 0.0f); - me->SetInCombatWith(pWho); - pWho->SetInCombatWith(me); - DoStartMovement(pWho); + me->AddThreat(who, 0.0f); + me->SetInCombatWith(who); + who->SetInCombatWith(me); + DoStartMovement(who); if (Creature* pGuard1 = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_EREKEM_GUARD_1) : 0)) { pGuard1->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE|UNIT_FLAG_NON_ATTACKABLE); if (!pGuard1->getVictim() && pGuard1->AI()) - pGuard1->AI()->AttackStart(pWho); + pGuard1->AI()->AttackStart(who); } if (Creature* pGuard2 = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_EREKEM_GUARD_2) : 0)) { pGuard2->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE|UNIT_FLAG_NON_ATTACKABLE); if (!pGuard2->getVictim() && pGuard2->AI()) - pGuard2->AI()->AttackStart(pWho); + pGuard2->AI()->AttackStart(who); } } } - void EnterCombat(Unit* /*pWho*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); DoCast(me, SPELL_EARTH_SHIELD); @@ -288,17 +288,17 @@ public: uiGushingWoundTimer = urand(1000, 3000); } - void AttackStart(Unit* pWho) + void AttackStart(Unit* who) { if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE) || me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) return; - if (me->Attack(pWho, true)) + if (me->Attack(who, true)) { - me->AddThreat(pWho, 0.0f); - me->SetInCombatWith(pWho); - pWho->SetInCombatWith(me); - DoStartMovement(pWho); + me->AddThreat(who, 0.0f); + me->SetInCombatWith(who); + who->SetInCombatWith(me); + DoStartMovement(who); } } diff --git a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp index e18793ee41b..d560cb97121 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp @@ -117,7 +117,7 @@ public: } } - void EnterCombat(Unit* /*pWho*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); @@ -138,17 +138,17 @@ public: } } - void AttackStart(Unit* pWho) + void AttackStart(Unit* who) { if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE) || me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) return; - if (me->Attack(pWho, true)) + if (me->Attack(who, true)) { - me->AddThreat(pWho, 0.0f); - me->SetInCombatWith(pWho); - pWho->SetInCombatWith(me); - DoStartMovement(pWho); + me->AddThreat(who, 0.0f); + me->SetInCombatWith(who); + who->SetInCombatWith(me); + DoStartMovement(who); } } @@ -204,7 +204,7 @@ public: return 0; } - void MoveInLineOfSight(Unit* /*pWho*/) {} + void MoveInLineOfSight(Unit* /*who*/) {} void UpdateAI(const uint32 uiDiff) { @@ -358,7 +358,7 @@ public: DoCast(me, SPELL_WATER_GLOBULE); } - void AttackStart(Unit* /*pWho*/) + void AttackStart(Unit* /*who*/) { return; } diff --git a/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp b/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp index ab860434ded..5f8318644d5 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp @@ -85,17 +85,17 @@ public: } } - void AttackStart(Unit* pWho) + void AttackStart(Unit* who) { if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE) || me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) return; - if (me->Attack(pWho, true)) + if (me->Attack(who, true)) { - me->AddThreat(pWho, 0.0f); - me->SetInCombatWith(pWho); - pWho->SetInCombatWith(me); - DoStartMovement(pWho); + me->AddThreat(who, 0.0f); + me->SetInCombatWith(who); + who->SetInCombatWith(me); + DoStartMovement(who); } } diff --git a/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp b/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp index 65d5aa157d0..3ebd7f771de 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp @@ -78,17 +78,17 @@ public: } } - void AttackStart(Unit* pWho) + void AttackStart(Unit* who) { if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE) || me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) return; - if (me->Attack(pWho, true)) + if (me->Attack(who, true)) { - me->AddThreat(pWho, 0.0f); - me->SetInCombatWith(pWho); - pWho->SetInCombatWith(me); - DoStartMovement(pWho); + me->AddThreat(who, 0.0f); + me->SetInCombatWith(who); + who->SetInCombatWith(me); + DoStartMovement(who); } } diff --git a/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp b/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp index 047217a1291..af20456fb07 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp @@ -121,21 +121,21 @@ public: } } - void AttackStart(Unit* pWho) + void AttackStart(Unit* who) { if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE) || me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) return; - if (me->Attack(pWho, true)) + if (me->Attack(who, true)) { - me->AddThreat(pWho, 0.0f); - me->SetInCombatWith(pWho); - pWho->SetInCombatWith(me); - DoStartMovement(pWho); + me->AddThreat(who, 0.0f); + me->SetInCombatWith(who); + who->SetInCombatWith(me); + DoStartMovement(who); } } - void EnterCombat(Unit* /*pWho*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); if (pInstance) @@ -153,7 +153,7 @@ public: } } - void MoveInLineOfSight(Unit* /*pWho*/) {} + void MoveInLineOfSight(Unit* /*who*/) {} void UpdateAI(const uint32 uiDiff) { diff --git a/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp b/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp index 88edcdc36c3..318876d79e7 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp @@ -89,17 +89,17 @@ public: voidDance = true; } - void AttackStart(Unit* pWho) + void AttackStart(Unit* who) { if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE) || me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) return; - if (me->Attack(pWho, true)) + if (me->Attack(who, true)) { - me->AddThreat(pWho, 0.0f); - me->SetInCombatWith(pWho); - pWho->SetInCombatWith(me); - DoStartMovement(pWho); + me->AddThreat(who, 0.0f); + me->SetInCombatWith(who); + who->SetInCombatWith(me); + DoStartMovement(who); } } diff --git a/src/server/scripts/Northrend/borean_tundra.cpp b/src/server/scripts/Northrend/borean_tundra.cpp index a8ad7e5b845..429511c2f74 100644 --- a/src/server/scripts/Northrend/borean_tundra.cpp +++ b/src/server/scripts/Northrend/borean_tundra.cpp @@ -502,24 +502,24 @@ public: { npc_fezzix_geartwistAI(Creature* creature) : ScriptedAI(creature) {} - void MoveInLineOfSight(Unit* pWho) + void MoveInLineOfSight(Unit* who) { - ScriptedAI::MoveInLineOfSight(pWho); + ScriptedAI::MoveInLineOfSight(who); - if (pWho->GetTypeId() != TYPEID_UNIT) + if (who->GetTypeId() != TYPEID_UNIT) return; - if (pWho->GetEntry() == NPC_JENNY && me->IsWithinDistInMap(pWho, 10.0f)) + if (who->GetEntry() == NPC_JENNY && me->IsWithinDistInMap(who, 10.0f)) { - if (Unit* pOwner = pWho->GetOwner()) + if (Unit* pOwner = who->GetOwner()) { if (pOwner->GetTypeId() == TYPEID_PLAYER) { - if (pWho->HasAura(SPELL_CRATES_CARRIED)) + if (who->HasAura(SPELL_CRATES_CARRIED)) { pOwner->CastSpell(pOwner, SPELL_GIVE_JENNY_CREDIT, true); // Maybe is not working. CAST_PLR(pOwner)->CompleteQuest(QUEST_LOADER_UP); - CAST_CRE(pWho)->DisappearAndDie(); + CAST_CRE(who)->DisappearAndDie(); } } } @@ -860,10 +860,10 @@ public: HarpoonerGUID = 0; } - void EnterCombat(Unit* pWho) + void EnterCombat(Unit* who) { - if (me->canAttack(pWho)) - AttackStart(pWho); + if (me->canAttack(who)) + AttackStart(who); } void SpellHit(Unit* caster, const SpellEntry *spell) @@ -876,16 +876,16 @@ public: WithRedDragonBlood = true; } - void MoveInLineOfSight(Unit* pWho) + void MoveInLineOfSight(Unit* who) { - FollowerAI::MoveInLineOfSight(pWho); + FollowerAI::MoveInLineOfSight(who); if (!HarpoonerGUID) return; - if (me->HasAura(SPELL_SUBDUED) && pWho->GetEntry() == NPC_RAELORASZ) + if (me->HasAura(SPELL_SUBDUED) && who->GetEntry() == NPC_RAELORASZ) { - if (me->IsWithinDistInMap(pWho, INTERACTION_DISTANCE)) + if (me->IsWithinDistInMap(who, INTERACTION_DISTANCE)) { if (Player* pHarpooner = Unit::GetPlayer(*me, HarpoonerGUID)) { @@ -1616,10 +1616,10 @@ public: bEnslaved = false; } - void EnterCombat(Unit* pWho) + void EnterCombat(Unit* who) { - if (me->canAttack(pWho)) - AttackStart(pWho); + if (me->canAttack(who)) + AttackStart(who); } void SpellHit(Unit* pCaster, const SpellEntry* pSpell) @@ -1636,11 +1636,11 @@ public: } } - void MoveInLineOfSight(Unit* pWho) + void MoveInLineOfSight(Unit* who) { - FollowerAI::MoveInLineOfSight(pWho); + FollowerAI::MoveInLineOfSight(who); - if (pWho->GetEntry() == NPC_LIBRARIAN_DONATHAN && me->IsWithinDistInMap(pWho, INTERACTION_DISTANCE)) + if (who->GetEntry() == NPC_LIBRARIAN_DONATHAN && me->IsWithinDistInMap(who, INTERACTION_DISTANCE)) { SetFollowComplete(); me->DisappearAndDie(); @@ -1702,7 +1702,7 @@ public: CasterGUID = 0; } - void EnterCombat(Unit* /*pWho*/) + void EnterCombat(Unit* /*who*/) { } @@ -2278,9 +2278,9 @@ public: m_uiTimer = 0; } - void EnterCombat(Unit* /*pWho*/) {} + void EnterCombat(Unit* /*who*/) {} - void AttackStart(Unit* /*pWho*/) {} + void AttackStart(Unit* /*who*/) {} void UpdateAI(const uint32 uiDiff) { diff --git a/src/server/scripts/Northrend/dalaran.cpp b/src/server/scripts/Northrend/dalaran.cpp index 9f725724963..4854261aeae 100644 --- a/src/server/scripts/Northrend/dalaran.cpp +++ b/src/server/scripts/Northrend/dalaran.cpp @@ -57,19 +57,19 @@ public: void Reset(){} - void EnterCombat(Unit* /*pWho*/){} + void EnterCombat(Unit* /*who*/){} - void AttackStart(Unit* /*pWho*/){} + void AttackStart(Unit* /*who*/){} - void MoveInLineOfSight(Unit* pWho) + void MoveInLineOfSight(Unit* who) { - if (!pWho || !pWho->IsInWorld() || pWho->GetZoneId() != 4395) + if (!who || !who->IsInWorld() || who->GetZoneId() != 4395) return; - if (!me->IsWithinDist(pWho, 65.0f, false)) + if (!me->IsWithinDist(who, 65.0f, false)) return; - Player* player = pWho->GetCharmerOrOwnerPlayerOrPlayerItself(); + Player* player = who->GetCharmerOrOwnerPlayerOrPlayerItself(); if (!player || player->isGameMaster() || player->IsBeingTeleported()) return; @@ -81,11 +81,11 @@ public: { if (GetClosestCreatureWithEntry(me, NPC_APPLEBOUGH_A, 32.0f)) { - if (me->isInBackInMap(pWho, 12.0f)) // In my line of sight, "outdoors", and behind me - DoCast(pWho, SPELL_TRESPASSER_A); // Teleport the Horde unit out + if (me->isInBackInMap(who, 12.0f)) // In my line of sight, "outdoors", and behind me + DoCast(who, SPELL_TRESPASSER_A); // Teleport the Horde unit out } else // In my line of sight, and "indoors" - DoCast(pWho, SPELL_TRESPASSER_A); // Teleport the Horde unit out + DoCast(who, SPELL_TRESPASSER_A); // Teleport the Horde unit out } break; case 29255: @@ -93,11 +93,11 @@ public: { if (GetClosestCreatureWithEntry(me, NPC_SWEETBERRY_H, 32.0f)) { - if (me->isInBackInMap(pWho, 12.0f)) // In my line of sight, "outdoors", and behind me - DoCast(pWho, SPELL_TRESPASSER_H); // Teleport the Alliance unit out + if (me->isInBackInMap(who, 12.0f)) // In my line of sight, "outdoors", and behind me + DoCast(who, SPELL_TRESPASSER_H); // Teleport the Alliance unit out } else // In my line of sight, and "indoors" - DoCast(pWho, SPELL_TRESPASSER_H); // Teleport the Alliance unit out + DoCast(who, SPELL_TRESPASSER_H); // Teleport the Alliance unit out } break; } diff --git a/src/server/scripts/Northrend/icecrown.cpp b/src/server/scripts/Northrend/icecrown.cpp index feab72a5819..86b375fc274 100644 --- a/src/server/scripts/Northrend/icecrown.cpp +++ b/src/server/scripts/Northrend/icecrown.cpp @@ -356,21 +356,21 @@ public: { npc_guardian_pavilionAI(Creature* creature) : Scripted_NoMovementAI(creature) {} - void MoveInLineOfSight(Unit* pWho) + void MoveInLineOfSight(Unit* who) { if (me->GetAreaId() != AREA_SUNREAVER_PAVILION && me->GetAreaId() != AREA_SILVER_COVENANT_PAVILION) return; - if (!pWho || pWho->GetTypeId() != TYPEID_PLAYER || !me->IsHostileTo(pWho) || !me->isInBackInMap(pWho, 5.0f)) + if (!who || who->GetTypeId() != TYPEID_PLAYER || !me->IsHostileTo(who) || !me->isInBackInMap(who, 5.0f)) return; - if (pWho->HasAura(SPELL_TRESPASSER_H) || pWho->HasAura(SPELL_TRESPASSER_A)) + if (who->HasAura(SPELL_TRESPASSER_H) || who->HasAura(SPELL_TRESPASSER_A)) return; - if (pWho->ToPlayer()->GetTeamId() == TEAM_ALLIANCE) - pWho->CastSpell(pWho, SPELL_TRESPASSER_H, true); + if (who->ToPlayer()->GetTeamId() == TEAM_ALLIANCE) + who->CastSpell(who, SPELL_TRESPASSER_H, true); else - pWho->CastSpell(pWho, SPELL_TRESPASSER_A, true); + who->CastSpell(who, SPELL_TRESPASSER_A, true); } }; diff --git a/src/server/scripts/Northrend/storm_peaks.cpp b/src/server/scripts/Northrend/storm_peaks.cpp index 305d4649a99..240a4d10d3c 100644 --- a/src/server/scripts/Northrend/storm_peaks.cpp +++ b/src/server/scripts/Northrend/storm_peaks.cpp @@ -425,7 +425,7 @@ public: } } - void EnterCombat(Unit* /*pWho*/) {} + void EnterCombat(Unit* /*who*/) {} void Reset() {} diff --git a/src/server/scripts/Northrend/zuldrak.cpp b/src/server/scripts/Northrend/zuldrak.cpp index 5849518fce8..a12271f8fac 100644 --- a/src/server/scripts/Northrend/zuldrak.cpp +++ b/src/server/scripts/Northrend/zuldrak.cpp @@ -71,9 +71,9 @@ public: DoCast(Rageclaw, SPELL_RIGHT_CHAIN, true); } - void UnlockRageclaw(Unit* pWho) + void UnlockRageclaw(Unit* who) { - if (!pWho) + if (!who) return; Creature* Rageclaw = Unit::GetCreature(*me, RageclawGUID); @@ -628,9 +628,9 @@ public: uiBattleShoutTimer = 7000; } - void EnterCombat(Unit* pWho) + void EnterCombat(Unit* who) { - DoCast(pWho, SPELL_IMPALE); + DoCast(who, SPELL_IMPALE); } void UpdateAI(const uint32 uiDiff) @@ -753,7 +753,7 @@ public: } } - void EnterCombat(Unit* /*pWho*/) + void EnterCombat(Unit* /*who*/) { DoCast(me, SPELL_GROW); } @@ -1195,12 +1195,12 @@ public: uiMissleTimer = urand(2000, 7000); } - void AttackStart(Unit* pWho) + void AttackStart(Unit* who) { - if (!pWho) + if (!who) return; - AttackStartNoMove(pWho); + AttackStartNoMove(who); } void SetData(uint32 uiData, uint32 uiValue) |