diff options
46 files changed, 101 insertions, 101 deletions
diff --git a/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp b/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp index 420df63db1f..397a25267e0 100644 --- a/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp +++ b/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp @@ -577,7 +577,7 @@ public: DoMeleeAttackIfReady(); } - void JustDied(Unit* /*pKiller*/) + void JustDied(Unit* /*killer*/) { if (!me->isSummon()) return; diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp index a77fc425782..5a881a9151e 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp @@ -507,7 +507,7 @@ public: void EnterCombat(Unit* /*who*/) {} - void DamageTaken(Unit* /*pKiller*/, uint32 &damage) + void DamageTaken(Unit* /*killer*/, uint32 &damage) { if (damage < me->GetHealth()) return; diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp index c1cb60f6761..f7760fc8ca0 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp @@ -58,7 +58,7 @@ public: m_uiFrenzy_Timer = 1000; } - void JustDied(Unit* /*pKiller*/) + void JustDied(Unit* /*killer*/) { InstanceScript* pInstance = me->GetInstanceScript(); if (pInstance) diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp index 601b54ec5d7..3640d5be4a4 100644 --- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp +++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp @@ -187,7 +187,7 @@ public: DoMeleeAttackIfReady(); } - void JustDied(Unit* /*pKiller*/) + void JustDied(Unit* /*killer*/) { if (pInstance) pInstance->SetData(TYPE_FENRUS, pInstance->GetData(TYPE_FENRUS) + 1); diff --git a/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp b/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp index 4a50cb9f61a..69a54643f63 100644 --- a/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp +++ b/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp @@ -196,7 +196,7 @@ class boss_archaedas : public CreatureScript DoMeleeAttackIfReady(); } - void JustDied (Unit* /*pKiller*/) + void JustDied (Unit* /*killer*/) { if (pInstance) { diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp index e13afba48dc..41aa22ef010 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp @@ -117,7 +117,7 @@ class boss_arlokk : public CreatureScript me->DespawnOrUnsummon(); } - void JustDied(Unit* /*pKiller*/) + void JustDied(Unit* /*killer*/) { DoScriptText(SAY_DEATH, me); diff --git a/src/server/scripts/EasternKingdoms/silverpine_forest.cpp b/src/server/scripts/EasternKingdoms/silverpine_forest.cpp index 63b48ad5568..5a458f3cffc 100644 --- a/src/server/scripts/EasternKingdoms/silverpine_forest.cpp +++ b/src/server/scripts/EasternKingdoms/silverpine_forest.cpp @@ -308,7 +308,7 @@ public: } } - void JustDied(Unit* /*pKiller*/) + void JustDied(Unit* /*killer*/) { if (PlayerGUID) if (Player* player = Unit::GetPlayer(*me, PlayerGUID)) diff --git a/src/server/scripts/EasternKingdoms/western_plaguelands.cpp b/src/server/scripts/EasternKingdoms/western_plaguelands.cpp index bc087aeba46..49d4fb8f82d 100644 --- a/src/server/scripts/EasternKingdoms/western_plaguelands.cpp +++ b/src/server/scripts/EasternKingdoms/western_plaguelands.cpp @@ -380,7 +380,7 @@ public: void EnterCombat(Unit* /*who*/){} - void JustDied(Unit* /*pKiller*/) + void JustDied(Unit* /*killer*/) { Player* player = GetPlayerForEscort(); if (player) diff --git a/src/server/scripts/Examples/example_escort.cpp b/src/server/scripts/Examples/example_escort.cpp index 1c0d97d60f3..5dba76a61ae 100644 --- a/src/server/scripts/Examples/example_escort.cpp +++ b/src/server/scripts/Examples/example_escort.cpp @@ -115,14 +115,14 @@ class example_escort : public CreatureScript m_uiChatTimer = 4000; } - void JustDied(Unit* pKiller) + void JustDied(Unit* killer) { if (HasEscortState(STATE_ESCORT_ESCORTING)) { if (Player* player = GetPlayerForEscort()) { // not a likely case, code here for the sake of example - if (pKiller == me) + if (killer == me) { DoScriptText(SAY_DEATH_1, me, player); } diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp index 33a96f1a763..afd39b9b8d0 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp @@ -180,7 +180,7 @@ public: DoMeleeAttackIfReady(); } - void JustDied(Unit* /*pKiller*/) + void JustDied(Unit* /*killer*/) { if (me->isSummon()) //we are not a normal spawn. if (pInstance) diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp index ee7868958db..62fe67b4520 100644 --- a/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp +++ b/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp @@ -158,7 +158,7 @@ public: DoMeleeAttackIfReady(); } - void JustDied(Unit* /*pKiller*/) + void JustDied(Unit* /*killer*/) { if (pInstance) pInstance->SetData(DATA_GONG_WAVES, pInstance->GetData(DATA_GONG_WAVES)+1); diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp index b7d37279b8b..81167dd0ad2 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp @@ -878,7 +878,7 @@ public: } } - void JustDied(Unit* /*pKiller*/) + void JustDied(Unit* /*killer*/) { if (pInst) pInst->SetData(DATA_CTHUN_PHASE, PHASE_CTHUN_DONE); diff --git a/src/server/scripts/Kalimdor/ashenvale.cpp b/src/server/scripts/Kalimdor/ashenvale.cpp index 1360a7dbbeb..356083cf554 100644 --- a/src/server/scripts/Kalimdor/ashenvale.cpp +++ b/src/server/scripts/Kalimdor/ashenvale.cpp @@ -368,7 +368,7 @@ class npc_muglash : public CreatureScript m_bIsBrazierExtinguished = false; } - void JustDied(Unit* /*pKiller*/) + void JustDied(Unit* /*killer*/) { Player* player = GetPlayerForEscort(); if (HasEscortState(STATE_ESCORT_ESCORTING)) diff --git a/src/server/scripts/Kalimdor/desolace.cpp b/src/server/scripts/Kalimdor/desolace.cpp index 9237985e554..997de5d9bff 100644 --- a/src/server/scripts/Kalimdor/desolace.cpp +++ b/src/server/scripts/Kalimdor/desolace.cpp @@ -238,7 +238,7 @@ public: void Reset() {} - void JustDied(Unit* /*pKiller*/) + void JustDied(Unit* /*killer*/) { Player* player = GetPlayerForEscort(); if (player) diff --git a/src/server/scripts/Kalimdor/dustwallow_marsh.cpp b/src/server/scripts/Kalimdor/dustwallow_marsh.cpp index 3a1684c87b3..13d18a44483 100644 --- a/src/server/scripts/Kalimdor/dustwallow_marsh.cpp +++ b/src/server/scripts/Kalimdor/dustwallow_marsh.cpp @@ -660,7 +660,7 @@ public: void Reset() {} - void JustDied(Unit* /*pKiller*/) + void JustDied(Unit* /*killer*/) { Player* player = GetPlayerForEscort(); if (HasEscortState(STATE_ESCORT_ESCORTING) && player) diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp index 4fd52bd7444..77b1d7366e5 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp @@ -325,7 +325,7 @@ public: } } - void JustDied(Unit* /*pKiller*/) + void JustDied(Unit* /*killer*/) { DoScriptText(SAY_DEATH, me); lSummons.DespawnAll(); diff --git a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp index f91ddb8d789..a272e47d771 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp @@ -362,7 +362,7 @@ public: } } - void JustDied(Unit* /*pKiller*/) + void JustDied(Unit* /*killer*/) { DoScriptText(SAY_SARTHARION_DEATH, me); @@ -901,7 +901,7 @@ struct dummy_dragonAI : public ScriptedAI //Refresh respawnTime so time again are set to 30secs? } - void JustDied(Unit* /*pKiller*/) + void JustDied(Unit* /*killer*/) { if (!m_bCanLoot) me->SetLootRecipient(NULL); @@ -1415,7 +1415,7 @@ public: DoCast(me, SPELL_TWILIGHT_TORMENT_VESP_ACO); } - void JustDied(Unit* /*pKiller*/) + void JustDied(Unit* /*killer*/) { me->RemoveAurasDueToSpell(SPELL_TWILIGHT_TORMENT_VESP_ACO); diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp index 1fca39ffa8c..3b9827100e4 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp @@ -412,7 +412,7 @@ public: DoMeleeAttackIfReady(); } - void JustDied(Unit* /*pKiller*/) + void JustDied(Unit* /*killer*/) { if (me->isSummon()) if (Unit* summoner = me->ToTempSummon()->GetSummoner()) @@ -530,7 +530,7 @@ public: DoMeleeAttackIfReady(); } - void JustDied(Unit* /*pKiller*/) + void JustDied(Unit* /*killer*/) { if (pInstance) pInstance->SetData(DATA_ARGENT_SOLDIER_DEFEATED, pInstance->GetData(DATA_ARGENT_SOLDIER_DEFEATED) + 1); diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp index d75ef2ad720..1e0502c61ed 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp @@ -286,7 +286,7 @@ public: } } - void JustDied(Unit* /*pKiller*/) + void JustDied(Unit* /*killer*/) { if (pInstance) pInstance->SetData(BOSS_BLACK_KNIGHT, DONE); 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 a49c8fdbc72..0c52039ea5d 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp @@ -420,7 +420,7 @@ public: DoMeleeAttackIfReady(); } - void JustDied(Unit* /*pKiller*/) + void JustDied(Unit* /*killer*/) { if (pInstance) pInstance->SetData(BOSS_GRAND_CHAMPIONS, DONE); @@ -559,7 +559,7 @@ public: DoMeleeAttackIfReady(); } - void JustDied(Unit* /*pKiller*/) + void JustDied(Unit* /*killer*/) { if (pInstance) pInstance->SetData(BOSS_GRAND_CHAMPIONS, DONE); @@ -706,7 +706,7 @@ public: DoMeleeAttackIfReady(); } - void JustDied(Unit* /*pKiller*/) + void JustDied(Unit* /*killer*/) { if (pInstance) pInstance->SetData(BOSS_GRAND_CHAMPIONS, DONE); @@ -861,7 +861,7 @@ public: DoMeleeAttackIfReady(); } - void JustDied(Unit* /*pKiller*/) + void JustDied(Unit* /*killer*/) { if (pInstance) pInstance->SetData(BOSS_GRAND_CHAMPIONS, DONE); @@ -982,7 +982,7 @@ public: DoMeleeAttackIfReady(); } - void JustDied(Unit* /*pKiller*/) + void JustDied(Unit* /*killer*/) { if (pInstance) pInstance->SetData(BOSS_GRAND_CHAMPIONS, DONE); 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 fbead980be7..1119814985a 100755 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp @@ -214,7 +214,7 @@ public: pTemp->setFaction(31); } - void JustDied(Unit* /*pKiller*/) + void JustDied(Unit* /*killer*/) { Summons.DespawnAll(); DoScriptText(SAY_DEATH, me); @@ -451,9 +451,9 @@ public: } } - void JustDied(Unit* pKiller) + void JustDied(Unit* killer) { - DoCast(pKiller, RAID_MODE(SPELL_TRAITOR_KING_10, SPELL_TRAITOR_KING_25)); + DoCast(killer, RAID_MODE(SPELL_TRAITOR_KING_10, SPELL_TRAITOR_KING_25)); } void UpdateAI(const uint32 uiDiff) 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 03b513c5319..727fce6260f 100755 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp @@ -1765,9 +1765,9 @@ public: */ } - void JustDied(Unit* pKiller) + void JustDied(Unit* killer) { - boss_faction_championsAI::JustDied(pKiller); + boss_faction_championsAI::JustDied(killer); Summons.DespawnAll(); } 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 863d4b269ec..037e5b42045 100755 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp @@ -150,7 +150,7 @@ public: } } - void JustDied(Unit* /*pKiller*/) + void JustDied(Unit* /*killer*/) { Summons.DespawnAll(); DoScriptText(SAY_DEATH, me); @@ -330,7 +330,7 @@ public: pSummoned->SetCorpseDelay(0); } - void JustDied(Unit* /*pKiller*/) + void JustDied(Unit* /*killer*/) { me->DespawnOrUnsummon(); } @@ -512,7 +512,7 @@ public: me->SetInCombatWithZone(); } - void JustDied(Unit* /*pKiller*/) + void JustDied(Unit* /*killer*/) { if (m_pInstance) m_pInstance->SetData(DATA_MISTRESS_OF_PAIN_COUNT, DECREASE); 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 b159bc9e454..c8d4139cbe0 100755 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp @@ -149,7 +149,7 @@ public: Summons.DespawnAll(); } - void JustDied(Unit* /*pKiller*/) + void JustDied(Unit* /*killer*/) { if (m_pInstance) m_pInstance->SetData(TYPE_NORTHREND_BEASTS, GORMOK_DONE); @@ -291,7 +291,7 @@ public: } } - void JustDied(Unit* /*pKiller*/) + void JustDied(Unit* /*killer*/) { if (Unit* target = Unit::GetPlayer(*me, m_uiTargetGUID)) if (target->isAlive()) @@ -375,7 +375,7 @@ struct boss_jormungarAI : public ScriptedAI sweepTimer = urand(15*IN_MILLISECONDS, 30*IN_MILLISECONDS); } - void JustDied(Unit* /*pKiller*/) + void JustDied(Unit* /*killer*/) { if (instanceScript) { @@ -716,7 +716,7 @@ public: m_uiStage = 0; } - void JustDied(Unit* /*pKiller*/) + void JustDied(Unit* /*killer*/) { if (m_pInstance) m_pInstance->SetData(TYPE_NORTHREND_BEASTS, ICEHOWL_DONE); 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 27b590d7f2f..d9d5fc23ba2 100755 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp @@ -277,7 +277,7 @@ struct boss_twin_baseAI : public ScriptedAI } } - void JustDied(Unit* /*pKiller*/) + void JustDied(Unit* /*killer*/) { DoScriptText(SAY_DEATH, me); if (m_pInstance) 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 72726d33132..aa50ccb4fc2 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 @@ -364,9 +364,9 @@ class npc_fizzlebang_toc : public CreatureScript uint64 m_uiPortalGUID; uint64 m_uiTriggerGUID; - void JustDied(Unit* pKiller) + void JustDied(Unit* killer) { - DoScriptText(SAY_STAGE_1_06, me, pKiller); + DoScriptText(SAY_STAGE_1_06, me, killer); m_pInstance->SetData(TYPE_EVENT, 1180); if (Creature* pTemp = Unit::GetCreature(*me, m_pInstance->GetData64(NPC_JARAXXUS))) { diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp index 4b84b3ae9b3..2f517cefd75 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp @@ -179,7 +179,7 @@ class boss_ick : public CreatureScript ScriptedAI::EnterEvadeMode(); } - void JustDied(Unit* /*pKiller*/) + void JustDied(Unit* /*killer*/) { if (Creature* krick = GetKrick()) { diff --git a/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp b/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp index e1a734eb1a9..ad973375c58 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp @@ -151,7 +151,7 @@ public: return 0; } - void JustDied(Unit* /*pKiller*/) + void JustDied(Unit* /*killer*/) { DoScriptText(SAY_DEATH, me); diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp index 1c38dea5a37..b44ab3820fc 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp @@ -183,7 +183,7 @@ public: DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3), me); } - void JustDied(Unit* /*pKiller*/) + void JustDied(Unit* /*killer*/) { DoScriptText(SAY_DEATH, me); diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp index 5758200770d..04b09da1ca2 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp @@ -115,7 +115,7 @@ public: } } - void JustDied(Unit* /*pKiller*/) + void JustDied(Unit* /*killer*/) { DoScriptText(SAY_DEATH, me); diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp index 0c0e956c148..4aa0707e625 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp @@ -146,7 +146,7 @@ public: } } - void JustDied(Unit* /*pKiller*/) + void JustDied(Unit* /*killer*/) { DoScriptText(SAY_DEATH, me); DespawnGolem(); diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp index 5273c0100b0..e8d6bd9f214 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp @@ -308,7 +308,7 @@ public: InstanceScript* pInstance; - void JustDied(Unit* /*pKiller*/) + void JustDied(Unit* /*killer*/) { if (pInstance) if (Creature* Sjonnir = ObjectAccessor::GetCreature(*me, pInstance->GetData64(DATA_SJONNIR))) diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp index 14a73bd92c3..67a52b2e2b6 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp @@ -395,13 +395,13 @@ public: DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3), me); } - void JustDied(Unit* pKiller) + void JustDied(Unit* killer) { if (pInstance) { Creature* pSvala = Unit::GetCreature((*me), pInstance->GetData64(DATA_SVALA)); if (pSvala && pSvala->isAlive()) - pKiller->Kill(pSvala); + killer->Kill(pSvala); pInstance->SetData(DATA_SVALA_SORROWGRAVE_EVENT, DONE); } diff --git a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp index d560cb97121..2bd99764a1b 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp @@ -384,7 +384,7 @@ public: else uiRangeCheck_Timer -= uiDiff; } - void JustDied(Unit* /*pKiller*/) + void JustDied(Unit* /*killer*/) { DoCast(me, SPELL_SPLASH); if (Creature* pIchoron = Unit::GetCreature(*me, pInstance->GetData64(DATA_ICHORON))) diff --git a/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp b/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp index af20456fb07..60629e2c3cb 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp @@ -193,7 +193,7 @@ public: DoMeleeAttackIfReady(); } - void JustDied(Unit* /*pKiller*/) + void JustDied(Unit* /*killer*/) { DoScriptText(SAY_DEATH, me); diff --git a/src/server/scripts/Northrend/borean_tundra.cpp b/src/server/scripts/Northrend/borean_tundra.cpp index 429511c2f74..a3aa60cfcdd 100644 --- a/src/server/scripts/Northrend/borean_tundra.cpp +++ b/src/server/scripts/Northrend/borean_tundra.cpp @@ -1227,7 +1227,7 @@ public: DoMeleeAttackIfReady(); } - void JustDied(Unit* /*pKiller*/) + void JustDied(Unit* /*killer*/) { if (Creature* pTalbot = me->GetCreature(*me, uiTalbot)) pTalbot->RemoveFromWorld(); @@ -1430,7 +1430,7 @@ public: DoMeleeAttackIfReady(); } - void JustDied(Unit* pKiller) + void JustDied(Unit* killer) { if (!LeryssaGUID || !ArlosGUID) return; @@ -1449,8 +1449,8 @@ public: pLeryssa->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); pLeryssa->GetMotionMaster()->MovePoint(0, 3722.114502f, 3564.201660f, 477.441437f); - if (pKiller->GetTypeId() == TYPEID_PLAYER) - CAST_PLR(pKiller)->RewardPlayerAndGroupAtEvent(NPC_PRINCE_VALANAR, 0); + if (killer->GetTypeId() == TYPEID_PLAYER) + CAST_PLR(killer)->RewardPlayerAndGroupAtEvent(NPC_PRINCE_VALANAR, 0); } }; @@ -2123,16 +2123,16 @@ public: { npc_magmoth_crusherAI(Creature* c) : ScriptedAI(c) {} - void JustDied(Unit* pKiller) + void JustDied(Unit* killer) { - if (pKiller->GetTypeId() == TYPEID_PLAYER && - CAST_PLR(pKiller)->GetQuestStatus(QUEST_YOU_RE_NOT_SO_BIG_NOW) == QUEST_STATUS_INCOMPLETE && + if (killer->GetTypeId() == TYPEID_PLAYER && + CAST_PLR(killer)->GetQuestStatus(QUEST_YOU_RE_NOT_SO_BIG_NOW) == QUEST_STATUS_INCOMPLETE && (me->HasAura(SPELL_AURA_NOTSOBIG_1) || me->HasAura(SPELL_AURA_NOTSOBIG_2) || me->HasAura(SPELL_AURA_NOTSOBIG_3) || me->HasAura(SPELL_AURA_NOTSOBIG_4))) { Quest const* qInfo = sObjectMgr->GetQuestTemplate(QUEST_YOU_RE_NOT_SO_BIG_NOW); if (qInfo) - CAST_PLR(pKiller)->KilledMonsterCredit(qInfo->ReqCreatureOrGOId[0], 0); + CAST_PLR(killer)->KilledMonsterCredit(qInfo->ReqCreatureOrGOId[0], 0); } } }; diff --git a/src/server/scripts/Northrend/grizzly_hills.cpp b/src/server/scripts/Northrend/grizzly_hills.cpp index 2fe7bc369b0..abec25530df 100644 --- a/src/server/scripts/Northrend/grizzly_hills.cpp +++ b/src/server/scripts/Northrend/grizzly_hills.cpp @@ -675,15 +675,15 @@ public: DoMeleeAttackIfReady(); } - void JustDied(Unit* pKiller) + void JustDied(Unit* killer) { - if (pKiller->ToPlayer() && pKiller->ToPlayer()->GetTypeId() == TYPEID_PLAYER) + if (killer->ToPlayer() && killer->ToPlayer()->GetTypeId() == TYPEID_PLAYER) { if (me->FindNearestCreature(NPC_WAR_GOLEM, 10.0f, true)) { - if (pKiller->ToPlayer()->GetQuestStatus(QUEST_OR_MAYBE_WE_DONT_A) == QUEST_STATUS_INCOMPLETE || - pKiller->ToPlayer()->GetQuestStatus(QUEST_OR_MAYBE_WE_DONT_H) == QUEST_STATUS_INCOMPLETE) - pKiller->ToPlayer()->KilledMonsterCredit(NPC_WAR_GOLEM, 0); + if (killer->ToPlayer()->GetQuestStatus(QUEST_OR_MAYBE_WE_DONT_A) == QUEST_STATUS_INCOMPLETE || + killer->ToPlayer()->GetQuestStatus(QUEST_OR_MAYBE_WE_DONT_H) == QUEST_STATUS_INCOMPLETE) + killer->ToPlayer()->KilledMonsterCredit(NPC_WAR_GOLEM, 0); } } } diff --git a/src/server/scripts/Northrend/howling_fjord.cpp b/src/server/scripts/Northrend/howling_fjord.cpp index 16394ad7295..1d98ca2b7a1 100644 --- a/src/server/scripts/Northrend/howling_fjord.cpp +++ b/src/server/scripts/Northrend/howling_fjord.cpp @@ -404,7 +404,7 @@ public: me->SummonCreature(uiEntry, afSummon[0], afSummon[1], afSummon[2], 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30*IN_MILLISECONDS); } - void SummonedCreatureDies(Creature* pSummoned, Unit* /*pKiller*/) + void SummonedCreatureDies(Creature* pSummoned, Unit* /*killer*/) { uint32 uiEntry = 0; diff --git a/src/server/scripts/Northrend/sholazar_basin.cpp b/src/server/scripts/Northrend/sholazar_basin.cpp index fb4c7cd3256..dbbd7f9a765 100644 --- a/src/server/scripts/Northrend/sholazar_basin.cpp +++ b/src/server/scripts/Northrend/sholazar_basin.cpp @@ -402,7 +402,7 @@ public: { m_uiChatTimer = 4000; } - void JustDied(Unit* /*pKiller*/) + void JustDied(Unit* /*killer*/) { Player* player = GetPlayerForEscort(); if (HasEscortState(STATE_ESCORT_ESCORTING)) diff --git a/src/server/scripts/Northrend/storm_peaks.cpp b/src/server/scripts/Northrend/storm_peaks.cpp index 240a4d10d3c..b5b9d6bcc36 100644 --- a/src/server/scripts/Northrend/storm_peaks.cpp +++ b/src/server/scripts/Northrend/storm_peaks.cpp @@ -429,7 +429,7 @@ public: void Reset() {} - void JustDied(Unit* /*pKiller*/) + void JustDied(Unit* /*killer*/) { Player* player = GetPlayerForEscort(); if (HasEscortState(STATE_ESCORT_ESCORTING) && player) diff --git a/src/server/scripts/Northrend/zuldrak.cpp b/src/server/scripts/Northrend/zuldrak.cpp index a12271f8fac..e2a4ca470fc 100644 --- a/src/server/scripts/Northrend/zuldrak.cpp +++ b/src/server/scripts/Northrend/zuldrak.cpp @@ -684,14 +684,14 @@ public: } } - void JustDied(Unit* pKiller) + void JustDied(Unit* killer) { if (uiWhisker) if (Creature* pWhisker = me->GetCreature(*me, uiWhisker)) pWhisker->RemoveFromWorld(); - if (pKiller->GetTypeId() == TYPEID_PLAYER) - pKiller->GetCharmerOrOwnerPlayerOrPlayerItself()->GroupEventHappens(QUEST_AMPHITHEATER_ANGUISH_TUSKARRMAGEDDON, pKiller); + if (killer->GetTypeId() == TYPEID_PLAYER) + killer->GetCharmerOrOwnerPlayerOrPlayerItself()->GroupEventHappens(QUEST_AMPHITHEATER_ANGUISH_TUSKARRMAGEDDON, killer); } }; @@ -787,10 +787,10 @@ public: DoMeleeAttackIfReady(); } - void JustDied(Unit* pKiller) + void JustDied(Unit* killer) { - if (Player* player = pKiller->GetCharmerOrOwnerPlayerOrPlayerItself()) - player->GroupEventHappens(QUEST_AMPHITHEATER_ANGUISH_KORRAK_BLOODRAGER, pKiller); + if (Player* player = killer->GetCharmerOrOwnerPlayerOrPlayerItself()) + player->GroupEventHappens(QUEST_AMPHITHEATER_ANGUISH_KORRAK_BLOODRAGER, killer); } }; @@ -867,22 +867,22 @@ public: DoMeleeAttackIfReady(); } - void JustDied(Unit* pKiller) + void JustDied(Unit* killer) { if (Unit* pSummoner = me->ToTempSummon()->GetSummoner()) { - std::string sText = (std::string(pKiller->GetName()) + " has defeated Yg.. Yggg-really big worm!"); + std::string sText = (std::string(killer->GetName()) + " has defeated Yg.. Yggg-really big worm!"); pSummoner->MonsterYell(sText.c_str(), LANG_UNIVERSAL, 0); } - if (Player* player = pKiller->GetCharmerOrOwnerPlayerOrPlayerItself()) + if (Player* player = killer->GetCharmerOrOwnerPlayerOrPlayerItself()) { - player->GroupEventHappens(QUEST_AMPHITHEATER_ANGUISH_YGGDRAS_1, pKiller); - player->GroupEventHappens(QUEST_AMPHITHEATER_ANGUISH_YGGDRAS_2, pKiller); + player->GroupEventHappens(QUEST_AMPHITHEATER_ANGUISH_YGGDRAS_1, killer); + player->GroupEventHappens(QUEST_AMPHITHEATER_ANGUISH_YGGDRAS_2, killer); } for (uint8 i = 0; i < 3; ++i) - DoCast(pKiller, SPELL_JORMUNGAR_SPAWN, true); + DoCast(killer, SPELL_JORMUNGAR_SPAWN, true); } }; @@ -1009,12 +1009,12 @@ public: DoMeleeAttackIfReady(); } - void JustDied(Unit* pKiller) + void JustDied(Unit* killer) { - if (Player* player = pKiller->GetCharmerOrOwnerPlayerOrPlayerItself()) - player->GetCharmerOrOwnerPlayerOrPlayerItself()->GroupEventHappens(QUEST_AMPHITHEATER_ANGUISH_MAGNATAUR, pKiller); + if (Player* player = killer->GetCharmerOrOwnerPlayerOrPlayerItself()) + player->GetCharmerOrOwnerPlayerOrPlayerItself()->GroupEventHappens(QUEST_AMPHITHEATER_ANGUISH_MAGNATAUR, killer); - std::string sText = ("And with AUTHORITY, " + std::string(pKiller->GetName()) + " dominates the magnataur lord! Stinkbeard's clan is gonna miss him back home in the Dragonblight!"); + std::string sText = ("And with AUTHORITY, " + std::string(killer->GetName()) + " dominates the magnataur lord! Stinkbeard's clan is gonna miss him back home in the Dragonblight!"); me->MonsterYell(sText.c_str(), LANG_UNIVERSAL, 0); } }; @@ -1147,17 +1147,17 @@ public: DoMeleeAttackIfReady(); } - void JustDied(Unit* pKiller) + void JustDied(Unit* killer) { if (!SummonList.empty()) for (std::list<uint64>::const_iterator itr = SummonList.begin(); itr != SummonList.end(); ++itr) if (Creature* pTemp = Unit::GetCreature(*me, *itr)) pTemp->DespawnOrUnsummon(); - if (Player* player = pKiller->GetCharmerOrOwnerPlayerOrPlayerItself()) - player->GetCharmerOrOwnerPlayerOrPlayerItself()->GroupEventHappens(QUEST_AMPHITHEATER_ANGUISH_FROM_BEYOND, pKiller); + if (Player* player = killer->GetCharmerOrOwnerPlayerOrPlayerItself()) + player->GetCharmerOrOwnerPlayerOrPlayerItself()->GroupEventHappens(QUEST_AMPHITHEATER_ANGUISH_FROM_BEYOND, killer); - std::string sText = (std::string(pKiller->GetName()) + " is victorious once more!"); + std::string sText = (std::string(killer->GetName()) + " is victorious once more!"); if (Unit* pSummoner = me->ToTempSummon()->GetSummoner()) pSummoner->MonsterYell(sText.c_str(), LANG_UNIVERSAL, 0); diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp index b9262135f51..0d21ff2c70c 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp @@ -384,11 +384,11 @@ class boss_vazruden_the_herald : public CreatureScript pSummoned->AI()->AttackStart(victim); } - void SentryDownBy(Unit* pKiller) + void SentryDownBy(Unit* killer) { if (sentryDown) { - AttackStartNoMove(pKiller); + AttackStartNoMove(killer); sentryDown = false; } else diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp index aa3322629b5..97010fdefaa 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp @@ -168,7 +168,7 @@ class boss_alar : public CreatureScript ScriptedAI::AttackStart(who); } - void DamageTaken(Unit* /*pKiller*/, uint32 &damage) + void DamageTaken(Unit* /*killer*/, uint32 &damage) { if (damage >= me->GetHealth() && Phase1) { @@ -490,9 +490,9 @@ class mob_ember_of_alar : public CreatureScript me->setDeathState(JUST_DIED); } - void DamageTaken(Unit* pKiller, uint32 &damage) + void DamageTaken(Unit* killer, uint32 &damage) { - if (damage >= me->GetHealth() && pKiller != me && !toDie) + if (damage >= me->GetHealth() && killer != me && !toDie) { damage = 0; DoCast(me, SPELL_EMBER_BLAST, true); diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp index e1d366b0cf7..47bb157bbbd 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp @@ -208,7 +208,7 @@ struct advisorbase_ai : public ScriptedAI DelayRes_Timer = 2000; } - void DamageTaken(Unit* pKiller, uint32 &damage) + void DamageTaken(Unit* killer, uint32 &damage) { if (damage < me->GetHealth()) return; @@ -240,7 +240,7 @@ struct advisorbase_ai : public ScriptedAI me->GetMotionMaster()->Clear(); me->GetMotionMaster()->MoveIdle(); me->SetStandState(UNIT_STAND_STATE_DEAD); - JustDied(pKiller); + JustDied(killer); } } @@ -1043,7 +1043,7 @@ class boss_thaladred_the_darkener : public CreatureScript me->AddThreat(who, 5000000.0f); } - void JustDied(Unit* /*pKiller*/) + void JustDied(Unit* /*killer*/) { if (m_pInstance && m_pInstance->GetData(DATA_KAELTHASEVENT) == 3) DoScriptText(SAY_THALADRED_DEATH, me); @@ -1200,7 +1200,7 @@ class boss_grand_astromancer_capernian : public CreatureScript advisorbase_ai::Reset(); } - void JustDied(Unit* /*pKiller*/) + void JustDied(Unit* /*killer*/) { if (m_pInstance && m_pInstance->GetData(DATA_KAELTHASEVENT) == 3) DoScriptText(SAY_CAPERNIAN_DEATH, me); @@ -1339,7 +1339,7 @@ class boss_master_engineer_telonicus : public CreatureScript advisorbase_ai::Reset(); } - void JustDied(Unit* /*pKiller*/) + void JustDied(Unit* /*killer*/) { if (m_pInstance && m_pInstance->GetData(DATA_KAELTHASEVENT) == 3) DoScriptText(SAY_TELONICUS_DEATH, me); diff --git a/src/server/scripts/Outland/netherstorm.cpp b/src/server/scripts/Outland/netherstorm.cpp index 820b654140f..4437a71a9af 100644 --- a/src/server/scripts/Outland/netherstorm.cpp +++ b/src/server/scripts/Outland/netherstorm.cpp @@ -1003,7 +1003,7 @@ public: } } - void JustDied(Unit* /*pKiller*/) + void JustDied(Unit* /*killer*/) { Player* player = GetPlayerForEscort(); if (player) diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp index 9a1e34a510d..f06ce89f699 100644 --- a/src/server/scripts/World/npcs_special.cpp +++ b/src/server/scripts/World/npcs_special.cpp @@ -2100,7 +2100,7 @@ public: { npc_shadowfiendAI(Creature* creature) : ScriptedAI(creature) {} - void DamageTaken(Unit* /*pKiller*/, uint32 &damage) + void DamageTaken(Unit* /*killer*/, uint32 &damage) { if (me->isSummon()) if (Unit* pOwner = me->ToTempSummon()->GetSummoner()) |