diff options
Diffstat (limited to 'src/server/scripts/Northrend')
59 files changed, 463 insertions, 463 deletions
diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp index 05a351cc07b..b180458a3a9 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp @@ -142,10 +142,10 @@ public: } } - Creature* DoSummonImpaleTarget(Unit* pTarget) + Creature* DoSummonImpaleTarget(Unit* target) { Position targetPos; - pTarget->GetPosition(&targetPos); + target->GetPosition(&targetPos); if (TempSummon* pImpaleTarget = me->SummonCreature(CREATURE_IMPALE_TARGET, targetPos, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 6*IN_MILLISECONDS)) { diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp index 3350cf58eb3..f4fe681bcb9 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp @@ -157,24 +157,24 @@ public: if (uiAcidTimer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget, SPELL_ACID_CLOUD); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(target, SPELL_ACID_CLOUD); uiAcidTimer = urand(20*IN_MILLISECONDS, 30*IN_MILLISECONDS); } else uiAcidTimer -= diff; if (uiLeechTimer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget, SPELL_LEECH_POISON); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(target, SPELL_LEECH_POISON); uiLeechTimer = urand(11*IN_MILLISECONDS, 14*IN_MILLISECONDS); } else uiLeechTimer -= diff; if (uiGrabTimer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) // Draws all players (and attacking Mobs) to itself. - DoCast(pTarget, SPELL_WEB_GRAB); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) // Draws all players (and attacking Mobs) to itself. + DoCast(target, SPELL_WEB_GRAB); uiGrabTimer = urand(15*IN_MILLISECONDS, 30*IN_MILLISECONDS); } else uiGrabTimer -= diff; diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp index 3a499184684..3b67d12d4b3 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp @@ -252,11 +252,11 @@ public: if (uiChargeTimer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) { DoResetThreat(); - me->AddThreat(pTarget, 1.0f); - DoCast(pTarget, SPELL_CHARGE, true); + me->AddThreat(target, 1.0f); + DoCast(target, SPELL_CHARGE, true); } uiChargeTimer = 15*IN_MILLISECONDS; } else uiChargeTimer -= diff; @@ -303,8 +303,8 @@ public: if (uiShadowBoltTimer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget, SPELL_SHADOW_BOLT, true); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(target, SPELL_SHADOW_BOLT, true); uiShadowBoltTimer = 15*IN_MILLISECONDS; } else uiShadowBoltTimer -= diff; @@ -399,8 +399,8 @@ public: if (uiWebWrapTimer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget, SPELL_WEB_WRAP, true); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(target, SPELL_WEB_WRAP, true); uiWebWrapTimer = 17*IN_MILLISECONDS; } else uiWebWrapTimer -= diff; @@ -447,8 +447,8 @@ public: if (uiWebWrapTimer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget, SPELL_WEB_WRAP, true); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(target, SPELL_WEB_WRAP, true); uiWebWrapTimer = 15*IN_MILLISECONDS; } else uiWebWrapTimer -= diff; @@ -501,8 +501,8 @@ public: if (uiWebWrapTimer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget, SPELL_WEB_WRAP, true); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(target, SPELL_WEB_WRAP, true); uiWebWrapTimer = 15*IN_MILLISECONDS; } else uiWebWrapTimer -= diff; diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp index 7a5faa10c63..c9278bffead 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp @@ -132,8 +132,8 @@ public: if (uiRootTimer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget, SPELL_ENTANGLING_ROOTS); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(target, SPELL_ENTANGLING_ROOTS); uiRootTimer = urand(15*IN_MILLISECONDS, 30*IN_MILLISECONDS); } else uiRootTimer -= diff; @@ -145,8 +145,8 @@ public: if (uiBoltTimer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget, SPELL_VENOM_BOLT_VOLLEY); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(target, SPELL_VENOM_BOLT_VOLLEY); uiBoltTimer = urand(15*IN_MILLISECONDS, 30*IN_MILLISECONDS); } else uiBoltTimer -= diff; diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp index dc5fe56faaf..b71bde00f62 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp @@ -101,12 +101,12 @@ public: } } - void SpellHitTarget(Unit* pTarget, const SpellEntry *spell) + void SpellHitTarget(Unit* target, const SpellEntry *spell) { if (spell->Id == SPELL_INSANITY) { // Not good target or too many players - if (pTarget->GetTypeId() != TYPEID_PLAYER || insanityHandled > 4) + if (target->GetTypeId() != TYPEID_PLAYER || insanityHandled > 4) return; // First target - start channel visual and set self as unnattackable if (!insanityHandled) @@ -118,7 +118,7 @@ public: me->SetControlled(true, UNIT_STAT_STUNNED); } // phase mask - pTarget->CastSpell(pTarget, SPELL_INSANITY_TARGET+insanityHandled, true); + target->CastSpell(target, SPELL_INSANITY_TARGET+insanityHandled, true); // summon twisted party members for this target Map::PlayerList const &players = me->GetMap()->GetPlayers(); for (Map::PlayerList::const_iterator i = players.begin(); i != players.end(); ++i) @@ -288,8 +288,8 @@ public: if (uiShiverTimer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_SHIVER); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(target, SPELL_SHIVER); uiShiverTimer = 15*IN_MILLISECONDS; } else uiShiverTimer -= diff; diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp index 08a63b6b118..1522d679fd0 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp @@ -227,12 +227,12 @@ public: } else { - if (Unit* pTarget = Unit::GetUnit(*me, pInstance->GetData64(DATA_PL_JEDOGA_TARGET))) + if (Unit* target = Unit::GetUnit(*me, pInstance->GetData64(DATA_PL_JEDOGA_TARGET))) { - AttackStart(pTarget); + AttackStart(target); pInstance->SetData(DATA_JEDOGA_RESET_INITIANDS, 0); if (pInstance->GetData(DATA_JEDOGA_SHADOWSEEKER_EVENT) != IN_PROGRESS) - EnterCombat(pTarget); + EnterCombat(target); } else if (!me->isInCombat()) EnterEvadeMode(); @@ -318,16 +318,16 @@ public: if (uiBoltTimer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - me->CastSpell(pTarget, DUNGEON_MODE(SPELL_LIGHTNING_BOLT, SPELL_LIGHTNING_BOLT_H), false); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + me->CastSpell(target, DUNGEON_MODE(SPELL_LIGHTNING_BOLT, SPELL_LIGHTNING_BOLT_H), false); uiBoltTimer = urand(15*IN_MILLISECONDS, 30*IN_MILLISECONDS); } else uiBoltTimer -= diff; if (uiThunderTimer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - me->CastSpell(pTarget, DUNGEON_MODE(SPELL_THUNDERSHOCK, SPELL_THUNDERSHOCK_H), false); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + me->CastSpell(target, DUNGEON_MODE(SPELL_THUNDERSHOCK, SPELL_THUNDERSHOCK_H), false); uiThunderTimer = urand(15*IN_MILLISECONDS, 30*IN_MILLISECONDS); } else uiThunderTimer -= diff; diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp index 35e844655ac..ba34591b84c 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp @@ -210,16 +210,16 @@ public: if (uiVanishTimer <= diff) { //Count alive players - Unit* pTarget = NULL; + Unit* target = NULL; std::list<HostileReference *> t_list = me->getThreatManager().getThreatList(); std::vector<Unit* > target_list; for (std::list<HostileReference *>::const_iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) { - pTarget = Unit::GetUnit(*me, (*itr)->getUnitGuid()); + target = Unit::GetUnit(*me, (*itr)->getUnitGuid()); // exclude pets & totems - if (pTarget && pTarget->GetTypeId() == TYPEID_PLAYER && pTarget->isAlive()) - target_list.push_back(pTarget); - pTarget = NULL; + if (target && target->GetTypeId() == TYPEID_PLAYER && target->isAlive()) + target_list.push_back(target); + target = NULL; } //He only vanishes if there are 3 or more alive players if (target_list.size() > 2) diff --git a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp index d43d19fd239..d32bade761f 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp @@ -644,9 +644,9 @@ public: // Lavas Strike if (m_uiLavaStrikeTimer <= uiDiff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) { - CastLavaStrikeOnTarget(pTarget); + CastLavaStrikeOnTarget(target); if(urand(0, 5) == 0) DoScriptText(RAND(SAY_SARTHARION_SPECIAL_1, SAY_SARTHARION_SPECIAL_2, SAY_SARTHARION_SPECIAL_3), me); @@ -1037,8 +1037,8 @@ public: // shadow fissure if (m_uiShadowFissureTimer <= uiDiff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, RAID_MODE(SPELL_SHADOW_FISSURE, SPELL_SHADOW_FISSURE)); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(target, RAID_MODE(SPELL_SHADOW_FISSURE, SPELL_SHADOW_FISSURE)); m_uiShadowFissureTimer = urand(15000, 20000); } @@ -1133,8 +1133,8 @@ public: // shadow fissure if (m_uiShadowFissureTimer <= uiDiff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, RAID_MODE(SPELL_SHADOW_FISSURE, SPELL_SHADOW_FISSURE_H)); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(target, RAID_MODE(SPELL_SHADOW_FISSURE, SPELL_SHADOW_FISSURE_H)); m_uiShadowFissureTimer = urand(15000, 20000); } @@ -1232,8 +1232,8 @@ public: // shadow fissure if (m_uiShadowFissureTimer <= uiDiff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, RAID_MODE(SPELL_SHADOW_FISSURE, SPELL_SHADOW_FISSURE_H)); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(target, RAID_MODE(SPELL_SHADOW_FISSURE, SPELL_SHADOW_FISSURE_H)); m_uiShadowFissureTimer = urand(15000, 20000); } @@ -1300,19 +1300,19 @@ public: uiDespawnTimer = 28000; if (pInstance) { - Creature* pTarget = NULL; + Creature* target = NULL; //if not solo figth, buff main boss, else place debuff on mini-boss. both spells TARGET_SCRIPT if (pInstance->GetData(TYPE_SARTHARION_EVENT) == IN_PROGRESS) { - pTarget = Unit::GetCreature((*me), pInstance->GetData64(DATA_SARTHARION)); - if (pTarget) - pTarget->AddAura(SPELL_GIFT_OF_TWILIGTH_SAR, pTarget); + target = Unit::GetCreature((*me), pInstance->GetData64(DATA_SARTHARION)); + if (target) + target->AddAura(SPELL_GIFT_OF_TWILIGTH_SAR, target); } else { - pTarget = Unit::GetCreature((*me), pInstance->GetData64(DATA_SHADRON)); - if (pTarget) - pTarget->AddAura(SPELL_GIFT_OF_TWILIGTH_SHA, pTarget); + target = Unit::GetCreature((*me), pInstance->GetData64(DATA_SHADRON)); + if (target) + target->AddAura(SPELL_GIFT_OF_TWILIGTH_SHA, target); } } 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 90f7c299e93..1fca39ffa8c 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp @@ -163,12 +163,12 @@ public: { me->InterruptNonMeleeSpells(true); - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 250, true)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 250, true)) { - if (pTarget && pTarget->isAlive()) + if (target && target->isAlive()) { - DoCast(pTarget, SPELL_HAMMER_JUSTICE); - DoCast(pTarget, SPELL_HAMMER_RIGHTEOUS); + DoCast(target, SPELL_HAMMER_JUSTICE); + DoCast(target, SPELL_HAMMER_RIGHTEOUS); } } uiHammerJusticeTimer = 25000; @@ -287,10 +287,10 @@ public: if (uiHolyFireTimer <= uiDiff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 250, true)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 250, true)) { - if (pTarget && pTarget->isAlive()) - DoCast(pTarget, SPELL_HOLY_FIRE); + if (target && target->isAlive()) + DoCast(target, SPELL_HOLY_FIRE); } if (me->HasAura(SPELL_SHIELD)) uiHolyFireTimer = 13000; @@ -300,10 +300,10 @@ public: if (uiHolySmiteTimer <= uiDiff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 250, true)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 250, true)) { - if (pTarget && pTarget->isAlive()) - DoCast(pTarget, SPELL_SMITE); + if (target && target->isAlive()) + DoCast(target, SPELL_SMITE); } if (me->HasAura(SPELL_SHIELD)) uiHolySmiteTimer = 9000; @@ -385,10 +385,10 @@ public: if (uiOldWoundsTimer <= uiDiff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) { - if (pTarget && pTarget->isAlive()) - DoCast(pTarget, SPELL_OLD_WOUNDS); + if (target && target->isAlive()) + DoCast(target, SPELL_OLD_WOUNDS); } uiOldWoundsTimer = 12000; }else uiOldWoundsTimer -= uiDiff; @@ -401,10 +401,10 @@ public: if (uiShadowPastTimer <= uiDiff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1)) { - if (pTarget && pTarget->isAlive()) - DoCast(pTarget, SPELL_SHADOWS_PAST); + if (target && target->isAlive()) + DoCast(target, SPELL_SHADOWS_PAST); } uiShadowPastTimer = 5000; }else uiShadowPastTimer -= uiDiff; 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 5d3a53c4472..d75ef2ad720 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp @@ -195,10 +195,10 @@ public: { if (uiDeathRespiteTimer <= uiDiff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) { - if (pTarget && pTarget->isAlive()) - DoCast(pTarget, SPELL_DEATH_RESPITE); + if (target && target->isAlive()) + DoCast(target, SPELL_DEATH_RESPITE); } uiDeathRespiteTimer = urand(15000, 16000); } else uiDeathRespiteTimer -= uiDiff; @@ -223,10 +223,10 @@ public: } if (uiDesecration <= uiDiff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) { - if (pTarget && pTarget->isAlive()) - DoCast(pTarget, SPELL_DESECRATION); + if (target && target->isAlive()) + DoCast(target, SPELL_DESECRATION); } uiDesecration = urand(15000, 16000); } else uiDesecration -= uiDiff; @@ -250,10 +250,10 @@ public: } else uiDeathBiteTimer -= uiDiff; if (uiMarkedDeathTimer <= uiDiff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) { - if (pTarget && pTarget->isAlive()) - DoCast(pTarget, SPELL_MARKED_DEATH); + if (target && target->isAlive()) + DoCast(target, SPELL_MARKED_DEATH); } uiMarkedDeathTimer = urand (5000, 7000); } else uiMarkedDeathTimer -= uiDiff; @@ -322,10 +322,10 @@ public: if (uiAttackTimer <= uiDiff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true)) { - if (pTarget && pTarget->isAlive()) - DoCast(pTarget, (SPELL_LEAP)); + if (target && target->isAlive()) + DoCast(target, (SPELL_LEAP)); } uiAttackTimer = 3500; } else uiAttackTimer -= uiDiff; 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 a1606d90f5c..fc8e1ae2540 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp @@ -537,8 +537,8 @@ public: if (uiPolymorphTimer <= uiDiff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_POLYMORPH); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(target, SPELL_POLYMORPH); uiPolymorphTimer = 8000; } else uiPolymorphTimer -= uiDiff; @@ -669,8 +669,8 @@ public: if (uiChainLightningTimer <= uiDiff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_CHAIN_LIGHTNING); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(target, SPELL_CHAIN_LIGHTNING); uiChainLightningTimer = 16000; } else uiChainLightningTimer -= uiDiff; @@ -821,10 +821,10 @@ public: if (uiShootTimer <= uiDiff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_FARTHEST, 0, 30.0f)) + if (Unit* target = SelectTarget(SELECT_TARGET_FARTHEST, 0, 30.0f)) { - uiTargetGUID = pTarget->GetGUID(); - DoCast(pTarget, SPELL_SHOOT); + uiTargetGUID = target->GetGUID(); + DoCast(target, SPELL_SHOOT); } uiShootTimer = 12000; uiMultiShotTimer = 3000; @@ -834,11 +834,11 @@ public: if (bShoot && uiMultiShotTimer <= uiDiff) { me->InterruptNonMeleeSpells(true); - Unit* pTarget = Unit::GetUnit(*me, uiTargetGUID); + Unit* target = Unit::GetUnit(*me, uiTargetGUID); - if (pTarget && me->IsInRange(pTarget, 5.0f, 30.0f, false)) + if (target && me->IsInRange(target, 5.0f, 30.0f, false)) { - DoCast(pTarget, SPELL_MULTI_SHOT); + DoCast(target, SPELL_MULTI_SHOT); } else { Map::PlayerList const& players = me->GetMap()->GetPlayers(); @@ -849,7 +849,7 @@ public: Player* player = itr->getSource(); if (player && !player->isGameMaster() && me->IsInRange(player, 5.0f, 30.0f, false)) { - DoCast(pTarget, SPELL_MULTI_SHOT); + DoCast(target, SPELL_MULTI_SHOT); break; } } @@ -974,8 +974,8 @@ public: if (uiPosionBottleTimer <= uiDiff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_POISON_BOTTLE); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(target, SPELL_POISON_BOTTLE); uiPosionBottleTimer = 19000; } else uiPosionBottleTimer -= uiDiff; 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 0be23eb484c..3b6440b1465 100755 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp @@ -224,7 +224,7 @@ public: void JustSummoned(Creature* pSummoned) { - Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 0, true); + Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0, true); switch (pSummoned->GetEntry()) { case NPC_BURROW: @@ -233,8 +233,8 @@ public: pSummoned->CastSpell(pSummoned, SPELL_CHURNING_GROUND, false); break; case NPC_SPIKE: - pSummoned->CombatStart(pTarget); - DoScriptText(EMOTE_SPIKE, me, pTarget); + pSummoned->CombatStart(target); + DoScriptText(EMOTE_SPIKE, me, target); break; } Summons.Summon(pSummoned); @@ -434,8 +434,8 @@ public: m_uiDeterminationTimer = urand(5*IN_MILLISECONDS, 60*IN_MILLISECONDS); DoCast(me, SPELL_ACID_MANDIBLE); me->SetInCombatWithZone(); - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM)) - me->AddThreat(pTarget, 20000.0f); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM)) + me->AddThreat(target, 20000.0f); if (!me->isInCombat()) me->DisappearAndDie(); } @@ -513,8 +513,8 @@ public: switch (actionId) { case ACTION_SHADOW_STRIKE: - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_SHADOW_STRIKE); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(target, SPELL_SHADOW_STRIKE); break; } } @@ -677,8 +677,8 @@ public: void UpdateAI(const uint32 uiDiff) { - Unit* pTarget = Unit::GetPlayer(*me, m_uiTargetGUID); - if (!pTarget || !pTarget->isAlive() || !pTarget->HasAura(SPELL_MARK)) + Unit* target = Unit::GetPlayer(*me, m_uiTargetGUID); + if (!target || !target->isAlive() || !target->HasAura(SPELL_MARK)) { if (Creature* pAnubarak = Unit::GetCreature((*me), m_pInstance->GetData64(NPC_ANUBARAK))) pAnubarak->CastSpell(pAnubarak, SPELL_SPIKE_TELE, false); 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 06b5e1fcda3..f5d472f1a75 100755 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp @@ -532,8 +532,8 @@ public: DoCast(me, SPELL_REJUVENATION); break; case 4: - if (Creature* pTarget = SelectRandomFriendlyMissingBuff(SPELL_THORNS)) - DoCast(pTarget, SPELL_THORNS); + if (Creature* target = SelectRandomFriendlyMissingBuff(SPELL_THORNS)) + DoCast(target, SPELL_THORNS); break; } m_uiCommonTimer = urand(15*IN_MILLISECONDS, 30*IN_MILLISECONDS); @@ -605,8 +605,8 @@ public: if (m_uiHexTimer <= uiDiff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_HEX); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(target, SPELL_HEX); m_uiHexTimer = urand(10*IN_MILLISECONDS, 40*IN_MILLISECONDS); } else m_uiHexTimer -= uiDiff; @@ -627,8 +627,8 @@ public: DoCast(me, SPELL_SPIRIT_CLEANSE); break; case 5: - if (Unit* pTarget = SelectRandomFriendlyMissingBuff(SPELL_EARTH_SHIELD)) - DoCast(pTarget, SPELL_EARTH_SHIELD); + if (Unit* target = SelectRandomFriendlyMissingBuff(SPELL_EARTH_SHIELD)) + DoCast(target, SPELL_EARTH_SHIELD); break; } m_uiCommonTimer = urand(5*IN_MILLISECONDS, 15*IN_MILLISECONDS); @@ -699,30 +699,30 @@ public: if (m_uiHandOfProtectionTimer <= uiDiff) { - if (Unit* pTarget = DoSelectLowestHpFriendly(40.0f)) - if (pTarget->HealthBelowPct(15)) - DoCast(pTarget, SPELL_HAND_OF_PROTECTION); + if (Unit* target = DoSelectLowestHpFriendly(40.0f)) + if (target->HealthBelowPct(15)) + DoCast(target, SPELL_HAND_OF_PROTECTION); m_uiHandOfProtectionTimer = urand(0*IN_MILLISECONDS, 360*IN_MILLISECONDS); } else m_uiHandOfProtectionTimer -= uiDiff; if (m_uiHolyShockTimer <= uiDiff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_HOLY_SHOCK); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(target, SPELL_HOLY_SHOCK); m_uiHolyShockTimer = urand(6*IN_MILLISECONDS, 15*IN_MILLISECONDS); } else m_uiHolyShockTimer -= uiDiff; if (m_uiHandOfFreedomTimer <= uiDiff) { - if (Unit* pTarget = SelectRandomFriendlyMissingBuff(SPELL_HAND_OF_FREEDOM)) - DoCast(pTarget, SPELL_HAND_OF_FREEDOM); + if (Unit* target = SelectRandomFriendlyMissingBuff(SPELL_HAND_OF_FREEDOM)) + DoCast(target, SPELL_HAND_OF_FREEDOM); m_uiHandOfFreedomTimer = urand(25*IN_MILLISECONDS, 40*IN_MILLISECONDS); } else m_uiHandOfFreedomTimer -= uiDiff; if (m_uiHammerOfJusticeTimer <= uiDiff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_HAMMER_OF_JUSTICE); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(target, SPELL_HAMMER_OF_JUSTICE); m_uiHammerOfJusticeTimer = urand(5*IN_MILLISECONDS, 15*IN_MILLISECONDS); } else m_uiHammerOfJusticeTimer -= uiDiff; @@ -809,8 +809,8 @@ public: DoCast(me, SPELL_FLASH_HEAL); break; case 4: - if (Unit* pTarget = urand(0, 1) ? SelectTarget(SELECT_TARGET_RANDOM, 0) : DoSelectLowestHpFriendly(40.0f)) - DoCast(pTarget, SPELL_DISPEL); + if (Unit* target = urand(0, 1) ? SelectTarget(SELECT_TARGET_RANDOM, 0) : DoSelectLowestHpFriendly(40.0f)) + DoCast(target, SPELL_DISPEL); break; case 5: DoCast(me, SPELL_MANA_BURN); @@ -897,15 +897,15 @@ public: if (m_uiSilenceTimer <= uiDiff) { - if (Unit* pTarget = SelectEnemyCaster(false)) - DoCast(pTarget, SPELL_SILENCE); + if (Unit* target = SelectEnemyCaster(false)) + DoCast(target, SPELL_SILENCE); m_uiSilenceTimer = urand(8*IN_MILLISECONDS, 15*IN_MILLISECONDS); } else m_uiSilenceTimer -= uiDiff; if (m_uiMindBlastTimer <= uiDiff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_MIND_BLAST); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(target, SPELL_MIND_BLAST); m_uiMindBlastTimer = urand(3*IN_MILLISECONDS, 8*IN_MILLISECONDS); } else m_uiMindBlastTimer -= uiDiff; @@ -914,20 +914,20 @@ public: switch (urand(0, 4)) { case 0: case 1: - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_MIND_FLAY); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(target, SPELL_MIND_FLAY); break; case 2: - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_VAMPIRIC_TOUCH); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(target, SPELL_VAMPIRIC_TOUCH); break; case 3: - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_SW_PAIN); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(target, SPELL_SW_PAIN); break; case 4: - if (Unit* pTarget = urand(0, 1) ? SelectTarget(SELECT_TARGET_RANDOM, 0) : DoSelectLowestHpFriendly(40.0f)) - DoCast(pTarget, SPELL_DISPEL); + if (Unit* target = urand(0, 1) ? SelectTarget(SELECT_TARGET_RANDOM, 0) : DoSelectLowestHpFriendly(40.0f)) + DoCast(target, SPELL_DISPEL); break; } m_uiCommonTimer = urand(15*IN_MILLISECONDS, 30*IN_MILLISECONDS); @@ -994,8 +994,8 @@ public: if (m_uiFearTimer <= uiDiff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_FEAR); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(target, SPELL_FEAR); m_uiFearTimer = urand(4*IN_MILLISECONDS, 15*IN_MILLISECONDS); } else m_uiFearTimer -= uiDiff; @@ -1008,8 +1008,8 @@ public: if (m_uiUnstableAfflictionTimer <= uiDiff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_UNSTABLE_AFFLICTION); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(target, SPELL_UNSTABLE_AFFLICTION); m_uiUnstableAfflictionTimer = urand(2*IN_MILLISECONDS, 10*IN_MILLISECONDS); } else m_uiUnstableAfflictionTimer -= uiDiff; @@ -1035,8 +1035,8 @@ public: DoCastVictim(SPELL_CURSE_OF_AGONY); break; case 5: - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_CURSE_OF_EXHAUSTION); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(target, SPELL_CURSE_OF_EXHAUSTION); break; } m_uiCommonTimer = urand(15*IN_MILLISECONDS, 30*IN_MILLISECONDS); @@ -1097,8 +1097,8 @@ public: if (m_uiCounterspellTimer <= uiDiff) { - if (Unit* pTarget = SelectEnemyCaster(false)) - DoCast(pTarget, SPELL_COUNTERSPELL); + if (Unit* target = SelectEnemyCaster(false)) + DoCast(target, SPELL_COUNTERSPELL); m_uiCounterspellTimer = urand(5*IN_MILLISECONDS, 15*IN_MILLISECONDS); } else m_uiCounterspellTimer -= uiDiff; @@ -1121,8 +1121,8 @@ public: if (m_uiPolymorphTimer <= uiDiff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_POLYMORPH); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(target, SPELL_POLYMORPH); m_uiPolymorphTimer = urand(15*IN_MILLISECONDS, 40*IN_MILLISECONDS); } else m_uiPolymorphTimer -= uiDiff; @@ -1323,15 +1323,15 @@ public: if (m_uiCycloneTimer <= uiDiff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_CYCLONE); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(target, SPELL_CYCLONE); m_uiCycloneTimer = urand(5*IN_MILLISECONDS, 40*IN_MILLISECONDS); } else m_uiCycloneTimer -= uiDiff; if (m_uiEntanglingRootsTimer <= uiDiff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_ENTANGLING_ROOTS); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(target, SPELL_ENTANGLING_ROOTS); m_uiEntanglingRootsTimer = urand(5*IN_MILLISECONDS, 40*IN_MILLISECONDS); } else m_uiEntanglingRootsTimer -= uiDiff; @@ -1545,8 +1545,8 @@ public: if (m_uiChainsOfIceTimer <= uiDiff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_CHAINS_OF_ICE); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(target, SPELL_CHAINS_OF_ICE); m_uiChainsOfIceTimer = urand(5*IN_MILLISECONDS, 15*IN_MILLISECONDS); } else m_uiChainsOfIceTimer -= uiDiff; @@ -1558,8 +1558,8 @@ public: if (m_uiStrangulateTimer <= uiDiff) { - if (Unit* pTarget = SelectEnemyCaster(false)) - DoCast(pTarget, SPELL_STRANGULATE); + if (Unit* target = SelectEnemyCaster(false)) + DoCast(target, SPELL_STRANGULATE); m_uiStrangulateTimer = urand(10*IN_MILLISECONDS, 90*IN_MILLISECONDS); } else m_uiStrangulateTimer -= uiDiff; @@ -1666,9 +1666,9 @@ public: if (m_uiBlindTimer <= uiDiff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1)) - if (me->IsInRange(pTarget, 0.0f, 15.0f, false)) - DoCast(pTarget, SPELL_BLIND); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1)) + if (me->IsInRange(target, 0.0f, 15.0f, false)) + DoCast(target, SPELL_BLIND); m_uiBlindTimer = urand(7*IN_MILLISECONDS, 8*IN_MILLISECONDS); } else m_uiBlindTimer -= uiDiff; @@ -1877,8 +1877,8 @@ public: if (m_uiRepeteanceTimer <= uiDiff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_REPENTANCE); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(target, SPELL_REPENTANCE); m_uiRepeteanceTimer = 60*IN_MILLISECONDS; } else m_uiRepeteanceTimer -= uiDiff; 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 24dbb7fb68c..ba4143511e3 100755 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp @@ -202,18 +202,18 @@ public: if (m_uiFelLightningTimer <= uiDiff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM)) - DoCast(pTarget, SPELL_FEL_LIGHTING); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM)) + DoCast(target, SPELL_FEL_LIGHTING); m_uiFelLightningTimer = urand(10*IN_MILLISECONDS, 15*IN_MILLISECONDS); } else m_uiFelLightningTimer -= uiDiff; if (m_uiIncinerateFleshTimer <= uiDiff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1, 0, true)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 0, true)) { - DoScriptText(EMOTE_INCINERATE, me, pTarget); + DoScriptText(EMOTE_INCINERATE, me, target); DoScriptText(SAY_INCINERATE, me); - DoCast(pTarget, SPELL_INCINERATE_FLESH); + DoCast(target, SPELL_INCINERATE_FLESH); } m_uiIncinerateFleshTimer = urand(20*IN_MILLISECONDS, 25*IN_MILLISECONDS); } else m_uiIncinerateFleshTimer -= uiDiff; @@ -226,18 +226,18 @@ public: if (m_uiLegionFlameTimer <= uiDiff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1, 0, true)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 0, true)) { - DoScriptText(EMOTE_LEGION_FLAME, me, pTarget); - DoCast(pTarget, SPELL_LEGION_FLAME); + DoScriptText(EMOTE_LEGION_FLAME, me, target); + DoCast(target, SPELL_LEGION_FLAME); } m_uiLegionFlameTimer = 30*IN_MILLISECONDS; } else m_uiLegionFlameTimer -= uiDiff; if (GetDifficulty() == RAID_DIFFICULTY_25MAN_HEROIC && m_uiTouchOfJaraxxusTimer <= uiDiff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_TOUCH_OF_JARAXXUS); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(target, SPELL_TOUCH_OF_JARAXXUS); m_uiTouchOfJaraxxusTimer = urand(10*IN_MILLISECONDS, 15*IN_MILLISECONDS); } else m_uiTouchOfJaraxxusTimer -= uiDiff; @@ -382,7 +382,7 @@ public: me->SetInCombatWithZone(); } - /*void SpellHitTarget(Unit* pTarget, const SpellEntry *pSpell) + /*void SpellHitTarget(Unit* target, const SpellEntry *pSpell) { if (pSpell->Id == SPELL_FEL_STREAK) DoCastAOE(SPELL_FEL_INFERNO); //66517 @@ -398,8 +398,8 @@ public: if (m_uiFelStreakTimer <= uiDiff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_FEL_STREAK); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(target, SPELL_FEL_STREAK); m_uiFelStreakTimer = 30*IN_MILLISECONDS; } else m_uiFelStreakTimer -= uiDiff; @@ -534,15 +534,15 @@ public: if (m_uiSpinningStrikeTimer <= uiDiff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 0, true)) - DoCast(pTarget, SPELL_SPINNING_STRIKE); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0, true)) + DoCast(target, SPELL_SPINNING_STRIKE); m_uiSpinningStrikeTimer = 30*IN_MILLISECONDS; } else m_uiSpinningStrikeTimer -= uiDiff; if (IsHeroic() && m_uiMistressKissTimer <= uiDiff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 0, true)) - DoCast(pTarget, SPELL_MISTRESS_KISS); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0, true)) + DoCast(target, SPELL_MISTRESS_KISS); m_uiMistressKissTimer = 30*IN_MILLISECONDS; } else m_uiMistressKissTimer -= uiDiff; 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 2187cafe56b..a58c6756898 100755 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp @@ -293,9 +293,9 @@ public: void JustDied(Unit* /*pKiller*/) { - if (Unit* pTarget = Unit::GetPlayer(*me, m_uiTargetGUID)) - if (pTarget->isAlive()) - pTarget->RemoveAurasDueToSpell(SPELL_SNOBOLLED); + if (Unit* target = Unit::GetPlayer(*me, m_uiTargetGUID)) + if (target->isAlive()) + target->RemoveAurasDueToSpell(SPELL_SNOBOLLED); if (m_pInstance) m_pInstance->SetData(DATA_SNOBOLD_COUNT, DECREASE); } @@ -305,9 +305,9 @@ public: if (m_bTargetDied || !UpdateVictim()) return; - if (Unit* pTarget = Unit::GetPlayer(*me, m_uiTargetGUID)) + if (Unit* target = Unit::GetPlayer(*me, m_uiTargetGUID)) { - if (!pTarget->isAlive()) + if (!target->isAlive()) { if (m_pInstance) { @@ -329,24 +329,24 @@ public: if (m_uiFireBombTimer < uiDiff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_FIRE_BOMB); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(target, SPELL_FIRE_BOMB); m_uiFireBombTimer = 20000; } else m_uiFireBombTimer -= uiDiff; if (m_uiBatterTimer < uiDiff) { - if (Unit* pTarget = Unit::GetPlayer(*me, m_uiTargetGUID)) - DoCast(pTarget, SPELL_BATTER); + if (Unit* target = Unit::GetPlayer(*me, m_uiTargetGUID)) + DoCast(target, SPELL_BATTER); m_uiBatterTimer = 10000; } else m_uiBatterTimer -= uiDiff; if (m_uiHeadCrackTimer < uiDiff) { - if (Unit* pTarget = Unit::GetPlayer(*me, m_uiTargetGUID)) - DoCast(pTarget, SPELL_HEAD_CRACK); + if (Unit* target = Unit::GetPlayer(*me, m_uiTargetGUID)) + DoCast(target, SPELL_HEAD_CRACK); m_uiHeadCrackTimer = 35000; } else m_uiHeadCrackTimer -= uiDiff; @@ -500,8 +500,8 @@ struct boss_jormungarAI : public ScriptedAI case 4: // Stationary if (sprayTimer <= uiDiff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, spraySpell); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(target, spraySpell); sprayTimer = urand(15*IN_MILLISECONDS, 30*IN_MILLISECONDS); } else sprayTimer -= uiDiff; @@ -697,7 +697,7 @@ public: bool m_bMovementFinish; bool m_bTrampleCasted; uint8 m_uiStage; - Unit* pTarget; + Unit* target; void Reset() { @@ -800,8 +800,8 @@ public: if (m_uiArticBreathTimer <= uiDiff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_ARCTIC_BREATH); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(target, SPELL_ARCTIC_BREATH); m_uiArticBreathTimer = urand(25*IN_MILLISECONDS, 40*IN_MILLISECONDS); } else m_uiArticBreathTimer -= uiDiff; @@ -825,11 +825,11 @@ public: m_uiStage = 2; break; case 2: - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 0, true)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0, true)) { - m_uiTrampleTargetGUID = pTarget->GetGUID(); + m_uiTrampleTargetGUID = target->GetGUID(); me->SetUInt64Value(UNIT_FIELD_TARGET, m_uiTrampleTargetGUID); - DoScriptText(SAY_TRAMPLE_STARE, me, pTarget); + DoScriptText(SAY_TRAMPLE_STARE, me, target); m_bTrampleCasted = false; SetCombatMovement(false); me->GetMotionMaster()->MoveIdle(); @@ -841,13 +841,13 @@ public: case 3: if (m_uiTrampleTimer <= uiDiff) { - if (Unit* pTarget = Unit::GetPlayer(*me, m_uiTrampleTargetGUID)) + if (Unit* target = Unit::GetPlayer(*me, m_uiTrampleTargetGUID)) { m_bTrampleCasted = false; m_bMovementStarted = true; - m_fTrampleTargetX = pTarget->GetPositionX(); - m_fTrampleTargetY = pTarget->GetPositionY(); - m_fTrampleTargetZ = pTarget->GetPositionZ(); + m_fTrampleTargetX = target->GetPositionX(); + m_fTrampleTargetY = target->GetPositionY(); + m_fTrampleTargetZ = target->GetPositionZ(); me->GetMotionMaster()->MoveJump(2*me->GetPositionX()-m_fTrampleTargetX, 2*me->GetPositionY()-m_fTrampleTargetY, me->GetPositionZ(), 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 5ea54803327..cb3d47b3dd9 100755 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp @@ -390,8 +390,8 @@ struct boss_twin_baseAI : public ScriptedAI if (IsHeroic() && m_uiTouchTimer <= uiDiff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 200, true, m_uiOtherEssenceSpellId)) - me->CastCustomSpell(m_uiTouchSpellId, SPELLVALUE_MAX_TARGETS, 1, pTarget, false); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 200, true, m_uiOtherEssenceSpellId)) + me->CastCustomSpell(m_uiTouchSpellId, SPELLVALUE_MAX_TARGETS, 1, target, false); m_uiTouchTimer = urand(10, 15)*IN_MILLISECONDS; } else @@ -643,8 +643,8 @@ public: { if (m_uiRangeCheckTimer < uiDiff) { - if (Unit* pTarget = me->SelectNearestTarget(2.0f)) - if (pTarget->GetTypeId() == TYPEID_PLAYER && pTarget->isAlive()) + if (Unit* target = me->SelectNearestTarget(2.0f)) + if (target->GetTypeId() == TYPEID_PLAYER && target->isAlive()) { DoCastAOE(SPELL_UNLEASHED_DARK); me->GetMotionMaster()->MoveIdle(); @@ -676,8 +676,8 @@ public: { if (m_uiRangeCheckTimer < uiDiff) { - if (Unit* pTarget = me->SelectNearestTarget(2.0f)) - if (pTarget->GetTypeId() == TYPEID_PLAYER && pTarget->isAlive()) + if (Unit* target = me->SelectNearestTarget(2.0f)) + if (target->GetTypeId() == TYPEID_PLAYER && target->isAlive()) { DoCastAOE(SPELL_UNLEASHED_LIGHT); me->GetMotionMaster()->MoveIdle(); diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp index 84028c90ba3..cf8295b6360 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp @@ -168,8 +168,8 @@ public: case PHASE_2: if (uiTimer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget, DUNGEON_MODE(RAND(SPELL_ARCANE_BLAST, SPELL_BLIZZARD, SPELL_FROSTBOLT, SPELL_WRATH_OF_MISERY), + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(target, DUNGEON_MODE(RAND(SPELL_ARCANE_BLAST, SPELL_BLIZZARD, SPELL_FROSTBOLT, SPELL_WRATH_OF_MISERY), RAND(H_SPELL_ARCANE_BLAST, H_SPELL_BLIZZARD, H_SPELL_FROSTBOLT, H_SPELL_WRATH_OF_MISERY))); uiTimer = urand(1*IN_MILLISECONDS, 3*IN_MILLISECONDS); } else uiTimer -= diff; @@ -299,8 +299,8 @@ public: if (type != POINT_MOTION_TYPE || id != 0) return; if (Creature* pNovos = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_NOVOS) : 0)) - if (Unit* pTarget = CAST_AI(boss_novos::boss_novosAI, pNovos->AI())->GetRandomTarget()) - AttackStart(pTarget); + if (Unit* target = CAST_AI(boss_novos::boss_novosAI, pNovos->AI())->GetRandomTarget()) + AttackStart(target); } }; @@ -331,8 +331,8 @@ public: if (Creature* Novos = ObjectAccessor::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_NOVOS) : 0)) { Novos->AI()->DoAction(ACTION_MINION_REACHED); - if (Unit* pTarget = CAST_AI(boss_novos::boss_novosAI, Novos->AI())->GetRandomTarget()) - AttackStart(pTarget); + if (Unit* target = CAST_AI(boss_novos::boss_novosAI, Novos->AI())->GetRandomTarget()) + AttackStart(target); } } }; diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp index 99869ef2201..6024fba7f68 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp @@ -119,8 +119,8 @@ public: case SKELETAL: if (uiCurseOfLifeTimer < diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget, SPELL_CURSE_OF_LIFE); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(target, SPELL_CURSE_OF_LIFE); uiCurseOfLifeTimer = urand(10*IN_MILLISECONDS, 15*IN_MILLISECONDS); } else uiCurseOfLifeTimer -= diff; @@ -169,15 +169,15 @@ public: case FLESH: if (uiLightningBreathTimer < diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget, SPELL_LIGHTNING_BREATH); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(target, SPELL_LIGHTNING_BREATH); uiLightningBreathTimer = urand(6*IN_MILLISECONDS, 7*IN_MILLISECONDS); } else uiLightningBreathTimer -= diff; if (uiEyeBeamTimer < diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget, SPELL_EYE_BEAM); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(target, SPELL_EYE_BEAM); uiEyeBeamTimer = urand(4*IN_MILLISECONDS, 6*IN_MILLISECONDS); } else uiEyeBeamTimer -= diff; diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp index 8c12b1956c3..b8eb274280c 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp @@ -113,10 +113,10 @@ public: events.ScheduleEvent(EVENT_QUIVERING_STRIKE, 10000); break; case EVENT_IMPENDING_DESPAIR: - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM)) { DoScriptText(SAY_IMPENDING_DESPAIR, me); - DoCast(pTarget, SPELL_IMPENDING_DESPAIR); + DoCast(target, SPELL_IMPENDING_DESPAIR); } events.ScheduleEvent(EVENT_IMPENDING_DESPAIR, 13000); break; diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp index a0557e6e430..da5fe591aa1 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp @@ -119,8 +119,8 @@ public: events.ScheduleEvent(EVENT_CORRUPTED_FLESH, 20000); break; case EVENT_SHARED_SUFFERING: - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM)) - DoCast(pTarget, SPELL_SHARED_SUFFERING); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM)) + DoCast(target, SPELL_SHARED_SUFFERING); events.ScheduleEvent(EVENT_SHARED_SUFFERING, 20000); break; } 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 a6270d3dfe9..036435d383d 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp @@ -667,25 +667,25 @@ public: switch(eventId) { case EVENT_SHADOW_WORD_PAIN: - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM)) - DoCast(pTarget, SPELL_SHADOW_WORD_PAIN); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM)) + DoCast(target, SPELL_SHADOW_WORD_PAIN); events.ScheduleEvent(EVENT_SHADOW_WORD_PAIN, 8000); return; case EVENT_CIRCLE_OF_DESTRUCTION: - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM)) - DoCast(pTarget, SPELL_CIRCLE_OF_DESTRUCTION); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM)) + DoCast(target, SPELL_CIRCLE_OF_DESTRUCTION); events.ScheduleEvent(EVENT_CIRCLE_OF_DESTRUCTION, 12000); return; case EVENT_COWER_IN_FEAR: - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM)) - DoCast(pTarget, SPELL_COWER_IN_FEAR); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM)) + DoCast(target, SPELL_COWER_IN_FEAR); events.ScheduleEvent(EVENT_COWER_IN_FEAR, 10000); return; case EVENT_DARK_MENDING: // find an ally with missing HP - if (Unit* pTarget = DoSelectLowestHpFriendly(40, DUNGEON_MODE(30000, 50000))) + if (Unit* target = DoSelectLowestHpFriendly(40, DUNGEON_MODE(30000, 50000))) { - DoCast(pTarget, SPELL_DARK_MENDING); + DoCast(target, SPELL_DARK_MENDING); events.ScheduleEvent(EVENT_DARK_MENDING, 20000); } else @@ -750,8 +750,8 @@ public: switch(eventId) { case EVENT_FIREBALL: - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM)) - DoCast(pTarget, SPELL_FIREBALL); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM)) + DoCast(target, SPELL_FIREBALL); events.ScheduleEvent(EVENT_FIREBALL, 15000); return; case EVENT_FLAMESTRIKE: @@ -759,13 +759,13 @@ public: events.ScheduleEvent(EVENT_FLAMESTRIKE, 15000); return; case EVENT_FROSTBOLT: - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM)) - DoCast(pTarget, SPELL_FROSTBOLT); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM)) + DoCast(target, SPELL_FROSTBOLT); events.ScheduleEvent(EVENT_FROSTBOLT, 15000); return; case EVENT_CHAINS_OF_ICE: - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM)) - DoCast(pTarget, SPELL_CHAINS_OF_ICE); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM)) + DoCast(target, SPELL_CHAINS_OF_ICE); events.ScheduleEvent(EVENT_CHAINS_OF_ICE, 15000); return; case EVENT_HALLUCINATION: @@ -858,8 +858,8 @@ public: events.ScheduleEvent(EVENT_DEADLY_POISON, 10000); return; case EVENT_ENVENOMED_DAGGER_THROW: - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM)) - DoCast(pTarget, SPELL_ENVENOMED_DAGGER_THROW); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM)) + DoCast(target, SPELL_ENVENOMED_DAGGER_THROW); events.ScheduleEvent(EVENT_ENVENOMED_DAGGER_THROW, 10000); return; case EVENT_KIDNEY_SHOT: @@ -986,13 +986,13 @@ public: switch(eventId) { case EVENT_SHOOT: - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM)) - DoCast(pTarget, SPELL_SHOOT); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM)) + DoCast(target, SPELL_SHOOT); events.ScheduleEvent(EVENT_SHOOT, 2000); return; case EVENT_CURSED_ARROW: - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM)) - DoCast(pTarget, SPELL_CURSED_ARROW); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM)) + DoCast(target, SPELL_CURSED_ARROW); events.ScheduleEvent(EVENT_CURSED_ARROW, 10000); return; case EVENT_FROST_TRAP: @@ -1000,8 +1000,8 @@ public: events.ScheduleEvent(EVENT_FROST_TRAP, 30000); return; case EVENT_ICE_SHOT: - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM)) - DoCast(pTarget, SPELL_ICE_SHOT); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM)) + DoCast(target, SPELL_ICE_SHOT); events.ScheduleEvent(EVENT_ICE_SHOT, 15000); return; } diff --git a/src/server/scripts/Northrend/Gundrak/boss_eck.cpp b/src/server/scripts/Northrend/Gundrak/boss_eck.cpp index 776640a86fb..fa52f5d9505 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_eck.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_eck.cpp @@ -94,10 +94,10 @@ public: if (uiSpringTimer <= diff) { - Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1); - if (pTarget && pTarget->GetTypeId() == TYPEID_PLAYER) + Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1); + if (target && target->GetTypeId() == TYPEID_PLAYER) { - DoCast(pTarget, RAND(SPELL_ECK_SPRING_1, SPELL_ECK_SPRING_2)); + DoCast(target, RAND(SPELL_ECK_SPRING_1, SPELL_ECK_SPRING_2)); uiSpringTimer = urand(5*IN_MILLISECONDS, 10*IN_MILLISECONDS); } } else uiSpringTimer -= diff; diff --git a/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp b/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp index 8cbb1ec8d0e..35bfbf49bde 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp @@ -228,10 +228,10 @@ public: if (uiImpalingChargeTimer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) { - DoCast(pTarget, SPELL_IMPALING_CHARGE); - CheckAchievement(pTarget->GetGUID()); + DoCast(target, SPELL_IMPALING_CHARGE); + CheckAchievement(target->GetGUID()); } uiImpalingChargeTimer = 31*IN_MILLISECONDS; ++uiPhaseCounter; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp b/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp index 622add70b17..acd47c2e606 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp @@ -155,8 +155,8 @@ public: //Cast Impale on a random target //Do NOT cast it when we are afflicted by locust swarm if (!me->HasAura(RAID_MODE(SPELL_LOCUST_SWARM_10, SPELL_LOCUST_SWARM_25))) - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, RAID_MODE(SPELL_IMPALE_10, SPELL_IMPALE_25)); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(target, RAID_MODE(SPELL_IMPALE_10, SPELL_IMPALE_25)); events.ScheduleEvent(EVENT_IMPALE, urand(10000, 20000)); break; case EVENT_LOCUST: diff --git a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp index b6c0f523f3b..856d0031d0d 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp @@ -361,8 +361,8 @@ public: if (caster) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 45.0f)) - DoCast(pTarget, SPELL_PRIMARY(id)); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 45.0f)) + DoCast(target, SPELL_PRIMARY(id)); } else DoCast(me->getVictim(), SPELL_PRIMARY(id)); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp index 34bedfc2574..c362006d632 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp @@ -469,10 +469,10 @@ class boss_gothik : public CreatureScript DoTeleportTo(PosGroundLiveSide); me->getThreatManager().resetAggro(NotOnSameSide(me)); - if (Unit* pTarget = SelectTarget(SELECT_TARGET_NEAREST, 0)) + if (Unit* target = SelectTarget(SELECT_TARGET_NEAREST, 0)) { - me->getThreatManager().addThreat(pTarget, 100.0f); - AttackStart(pTarget); + me->getThreatManager().addThreat(target, 100.0f); + AttackStart(target); } events.ScheduleEvent(EVENT_TELEPORT, 20000); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp b/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp index 4b59ac3fa7c..a2902ce3ab3 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp @@ -59,11 +59,11 @@ public: events.ScheduleEvent(EVENT_BERSERK, 12*60000); } - void SpellHitTarget(Unit* pTarget, const SpellEntry *spell) + void SpellHitTarget(Unit* target, const SpellEntry *spell) { if (spell->Id == uint32(SPELL_SLIME_SPRAY)) { - if (TempSummon *slime = me->SummonCreature(MOB_FALLOUT_SLIME, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 0)) + if (TempSummon *slime = me->SummonCreature(MOB_FALLOUT_SLIME, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 0)) DoZoneInCombat(slime); } } @@ -91,9 +91,9 @@ public: events.ScheduleEvent(EVENT_SPRAY, 15000+rand()%15000); return; case EVENT_INJECT: - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1)) - if (!pTarget->HasAura(SPELL_MUTATING_INJECTION)) - DoCast(pTarget, SPELL_MUTATING_INJECTION); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1)) + if (!target->HasAura(SPELL_MUTATING_INJECTION)) + DoCast(target, SPELL_MUTATING_INJECTION); events.ScheduleEvent(EVENT_INJECT, 8000 + uint32(120 * me->GetHealthPct())); return; } diff --git a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp index 3beb219a466..62b00a90dc6 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp @@ -498,13 +498,13 @@ public: uint32 count = urand(1, 3); for (uint8 i = 1; i <= count; i++) { - Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1, 200, true); - if (pTarget && !pTarget->isCharmed() && (chained.find(pTarget->GetGUID()) == chained.end())) + Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 200, true); + if (target && !target->isCharmed() && (chained.find(target->GetGUID()) == chained.end())) { - DoCast(pTarget, SPELL_CHAINS_OF_KELTHUZAD); - float scale = pTarget->GetFloatValue(OBJECT_FIELD_SCALE_X); - chained.insert(std::make_pair(pTarget->GetGUID(), scale)); - pTarget->SetFloatValue(OBJECT_FIELD_SCALE_X, scale * 2); + DoCast(target, SPELL_CHAINS_OF_KELTHUZAD); + float scale = target->GetFloatValue(OBJECT_FIELD_SCALE_X); + chained.insert(std::make_pair(target->GetGUID(), scale)); + target->SetFloatValue(OBJECT_FIELD_SCALE_X, scale * 2); events.ScheduleEvent(EVENT_CHAINED_SPELL, 2000); //core has 2000ms to set unit flag charm } } @@ -530,54 +530,54 @@ public: continue; } - if (Unit* pTarget = SelectTarget(SELECT_TARGET_TOPAGGRO, 0, NotCharmedTargetSelector())) + if (Unit* target = SelectTarget(SELECT_TARGET_TOPAGGRO, 0, NotCharmedTargetSelector())) { switch(player->getClass()) { case CLASS_DRUID: if (urand(0, 1)) - player->CastSpell(pTarget, SPELL_MOONFIRE, false); + player->CastSpell(target, SPELL_MOONFIRE, false); else player->CastSpell(me, SPELL_LIFEBLOOM, false); break; case CLASS_HUNTER: - player->CastSpell(pTarget, RAND(SPELL_MULTI_SHOT, SPELL_VOLLEY), false); + player->CastSpell(target, RAND(SPELL_MULTI_SHOT, SPELL_VOLLEY), false); break; case CLASS_MAGE: - player->CastSpell(pTarget, RAND(SPELL_FROST_FIREBOLT, SPELL_ARCANE_MISSILES), false); + player->CastSpell(target, RAND(SPELL_FROST_FIREBOLT, SPELL_ARCANE_MISSILES), false); break; case CLASS_WARLOCK: - player->CastSpell(pTarget, RAND(SPELL_CURSE_OF_AGONY, SPELL_SHADOW_BOLT), true); + player->CastSpell(target, RAND(SPELL_CURSE_OF_AGONY, SPELL_SHADOW_BOLT), true); break; case CLASS_WARRIOR: - player->CastSpell(pTarget, RAND(SPELL_BLADESTORM, SPELL_CLEAVE), false); + player->CastSpell(target, RAND(SPELL_BLADESTORM, SPELL_CLEAVE), false); break; case CLASS_PALADIN: if (urand(0, 1)) - player->CastSpell(pTarget, SPELL_HAMMER_OF_JUSTICE, false); + player->CastSpell(target, SPELL_HAMMER_OF_JUSTICE, false); else player->CastSpell(me, SPELL_HOLY_SHOCK, false); break; case CLASS_PRIEST: if (urand(0, 1)) - player->CastSpell(pTarget, SPELL_VAMPIRIC_TOUCH, false); + player->CastSpell(target, SPELL_VAMPIRIC_TOUCH, false); else player->CastSpell(me, SPELL_RENEW, false); break; case CLASS_SHAMAN: if (urand(0, 1)) - player->CastSpell(pTarget, SPELL_EARTH_SHOCK, false); + player->CastSpell(target, SPELL_EARTH_SHOCK, false); else player->CastSpell(me, SPELL_HEALING_WAVE, false); break; case CLASS_ROGUE: - player->CastSpell(pTarget, RAND(SPELL_HEMORRHAGE, SPELL_MUTILATE), false); + player->CastSpell(target, RAND(SPELL_HEMORRHAGE, SPELL_MUTILATE), false); break; case CLASS_DEATH_KNIGHT: if (urand(0, 1)) - player->CastSpell(pTarget, SPELL_PLAGUE_STRIKE, true); + player->CastSpell(target, SPELL_PLAGUE_STRIKE, true); else - player->CastSpell(pTarget, SPELL_HOWLING_BLAST, true); + player->CastSpell(target, SPELL_HOWLING_BLAST, true); break; } } @@ -616,13 +616,13 @@ public: break; } case EVENT_FISSURE: - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_SHADOW_FISURE); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(target, SPELL_SHADOW_FISURE); events.RepeatEvent(urand(10000, 45000)); break; case EVENT_BLAST: - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, RAID_MODE(1, 0), 0, true)) - DoCast(pTarget, SPELL_FROST_BLAST); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, RAID_MODE(1, 0), 0, true)) + DoCast(target, SPELL_FROST_BLAST); if (rand()%2) DoScriptText(SAY_FROST_BLAST, me); events.RepeatEvent(urand(30000, 90000)); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp index fa978f323b6..35766476a16 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp @@ -104,13 +104,13 @@ public: // TODO : Add missing text for (uint8 i = 0; i < RAID_MODE(1, 2); ++i) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1, 0, true, -SPELL_WEB_WRAP)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 0, true, -SPELL_WEB_WRAP)) { - pTarget->RemoveAura(RAID_MODE(SPELL_WEB_SPRAY_10, SPELL_WEB_SPRAY_25)); + target->RemoveAura(RAID_MODE(SPELL_WEB_SPRAY_10, SPELL_WEB_SPRAY_25)); uint8 pos = rand()%MAX_POS_WRAP; - pTarget->GetMotionMaster()->MoveJump(PosWrap[pos].GetPositionX(), PosWrap[pos].GetPositionY(), PosWrap[pos].GetPositionZ(), 20, 20); + target->GetMotionMaster()->MoveJump(PosWrap[pos].GetPositionX(), PosWrap[pos].GetPositionY(), PosWrap[pos].GetPositionZ(), 20, 20); if (Creature* wrap = DoSummon(MOB_WEB_WRAP, PosWrap[pos], 0, TEMPSUMMON_CORPSE_DESPAWN)) - wrap->AI()->SetGUID(pTarget->GetGUID()); + wrap->AI()->SetGUID(target->GetGUID()); } } events.ScheduleEvent(EVENT_WRAP, 40000); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp b/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp index d0d8fa11ae8..9e87ed06069 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp @@ -118,11 +118,11 @@ public: std::list<HostileReference*>::const_iterator i = me->getThreatManager().getThreatList().begin(); for (; i != me->getThreatManager().getThreatList().end(); ++i) { - Unit* pTarget = (*i)->getTarget(); - if (pTarget->isAlive() && pTarget != me->getVictim() && pTarget->GetHealth() > MostHP && me->IsWithinMeleeRange(pTarget)) + Unit* target = (*i)->getTarget(); + if (target->isAlive() && target != me->getVictim() && target->GetHealth() > MostHP && me->IsWithinMeleeRange(target)) { - MostHP = pTarget->GetHealth(); - pMostHPTarget = pTarget; + MostHP = target->GetHealth(); + pMostHPTarget = target; } } diff --git a/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp b/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp index afe0b9929e9..0d8c993ffa6 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp @@ -118,8 +118,8 @@ public: events.ScheduleEvent(EVENT_SHOUT, 25000); return; case EVENT_KNIFE: - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 45.0f)) - DoCast(pTarget, SPELL_JAGGED_KNIFE); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 45.0f)) + DoCast(target, SPELL_JAGGED_KNIFE); events.ScheduleEvent(EVENT_KNIFE, 10000); return; case EVENT_COMMAND: diff --git a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp index afd8015d656..c76446954fb 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp @@ -132,14 +132,14 @@ public: CheckPlayersFrostResist(); } - void SpellHitTarget(Unit* pTarget, const SpellEntry *spell) + void SpellHitTarget(Unit* target, const SpellEntry *spell) { if (spell->Id == SPELL_ICEBOLT) { - IceBlockMap::iterator itr = iceblocks.find(pTarget->GetGUID()); + IceBlockMap::iterator itr = iceblocks.find(target->GetGUID()); if (itr != iceblocks.end() && !itr->second) { - if (GameObject* iceblock = me->SummonGameObject(GO_ICEBLOCK, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, 0, 0, 0, 0, 25000)) + if (GameObject* iceblock = me->SummonGameObject(GO_ICEBLOCK, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0, 0, 0, 0, 0, 25000)) itr->second = iceblock->GetGUID(); } } @@ -360,14 +360,14 @@ public: std::list<HostileReference*>::const_iterator i = me->getThreatManager().getThreatList().begin(); for (; i != me->getThreatManager().getThreatList().end(); ++i) { - Unit* pTarget = (*i)->getTarget(); - if (pTarget->GetTypeId() != TYPEID_PLAYER) + Unit* target = (*i)->getTarget(); + if (target->GetTypeId() != TYPEID_PLAYER) continue; - if (pTarget->HasAura(SPELL_ICEBOLT)) + if (target->HasAura(SPELL_ICEBOLT)) { - pTarget->ApplySpellImmune(0, IMMUNITY_ID, SPELL_FROST_EXPLOSION, true); - targets.push_back(pTarget); + target->ApplySpellImmune(0, IMMUNITY_ID, SPELL_FROST_EXPLOSION, true); + targets.push_back(target); continue; } @@ -375,11 +375,11 @@ public: { if (GameObject* pGo = GameObject::GetGameObject(*me, itr->second)) { - if (pGo->IsInBetween(me, pTarget, 2.0f) - && me->GetExactDist2d(pTarget->GetPositionX(), pTarget->GetPositionY()) - me->GetExactDist2d(pGo->GetPositionX(), pGo->GetPositionY()) < 5.0f) + if (pGo->IsInBetween(me, target, 2.0f) + && me->GetExactDist2d(target->GetPositionX(), target->GetPositionY()) - me->GetExactDist2d(pGo->GetPositionX(), pGo->GetPositionY()) < 5.0f) { - pTarget->ApplySpellImmune(0, IMMUNITY_ID, SPELL_FROST_EXPLOSION, true); - targets.push_back(pTarget); + target->ApplySpellImmune(0, IMMUNITY_ID, SPELL_FROST_EXPLOSION, true); + targets.push_back(target); break; } } diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp index 4f8e15b6111..88fe98e8370 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp @@ -235,8 +235,8 @@ class mob_chaotic_rift : public CreatureScript if (uiSummonCrazedManaWraithTimer <= diff) { if (Creature* Wraith = me->SummonCreature(MOB_CRAZED_MANA_WRAITH, me->GetPositionX() + 1, me->GetPositionY() + 1, me->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 1000)) - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - Wraith->AI()->AttackStart(pTarget); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + Wraith->AI()->AttackStart(target); Creature* Anomalus = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_ANOMALUS)); if (Anomalus && Anomalus->HasAura(SPELL_RIFT_SHIELD)) uiSummonCrazedManaWraithTimer = 5000; diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp index e49bf985310..a8ccd350bc3 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp @@ -192,8 +192,8 @@ public: DoScriptText(SAY_CRYSTAL_NOVA, me); if (IsHeroic()) DoCast(me, SPELL_CRYSTALIZE); - else if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget, SPELL_CRYSTAL_CHAINS); + else if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(target, SPELL_CRYSTAL_CHAINS); uiCrystalChainsCrystalizeTimer = DUNGEON_MODE(30*IN_MILLISECONDS, 11*IN_MILLISECONDS); } else uiCrystalChainsCrystalizeTimer -= diff; diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp index 72ade0857a8..7a3605af959 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp @@ -184,8 +184,8 @@ public: break; } } - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - Summoned->AI()->AttackStart(pTarget); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + Summoned->AI()->AttackStart(target); return Summoned->GetGUID(); } return 0; @@ -303,9 +303,9 @@ public: if (uiIceNovaTimer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) { - DoCast(pTarget, SPELL_ICE_NOVA, false); + DoCast(target, SPELL_ICE_NOVA, false); uiCooldown = 1500; } uiIceNovaTimer = 15*IN_MILLISECONDS; @@ -313,9 +313,9 @@ public: if (uiGravityWellTimer <= diff) { - if (Unit* pTarget = me->getVictim()) + if (Unit* target = me->getVictim()) { - DoCast(pTarget, SPELL_GRAVITY_WELL); + DoCast(target, SPELL_GRAVITY_WELL); uiCooldown = 6*IN_MILLISECONDS; } uiGravityWellTimer = 15*IN_MILLISECONDS; @@ -323,9 +323,9 @@ public: if (uiFireBombTimer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) { - DoCast(pTarget, SPELL_FIREBOMB, false); + DoCast(target, SPELL_FIREBOMB, false); uiCooldown = 2*IN_MILLISECONDS; } uiFireBombTimer = 2*IN_MILLISECONDS; diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp index aa8fc95ead3..386c925fab4 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp @@ -181,7 +181,7 @@ public: Creature* Crystalline_Tangler = me->SummonCreature(MOB_CRYSTALLINE_TANGLER, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation(), TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 1000); if (Crystalline_Tangler) { - Unit* pTarget = NULL; + Unit* target = NULL; uint8 Healer = 0; for (uint8 j = 1; j <= 4; j++) { @@ -198,19 +198,19 @@ public: Unit* pTemp = Unit::GetUnit((*me), (*i)->getUnitGuid()); if (pTemp && pTemp->GetTypeId() == TYPEID_PLAYER && pTemp->getClass() == Healer) { - pTarget = pTemp; + target = pTemp; break; } } - if (pTarget) + if (target) break; } - if (!pTarget) - pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); - if (pTarget) + if (!target) + target = SelectTarget(SELECT_TARGET_RANDOM, 0); + if (target) { - Crystalline_Tangler->AI()->AttackStart(pTarget); - Crystalline_Tangler->getThreatManager().addThreat(pTarget, 1000000000.0f); + Crystalline_Tangler->AI()->AttackStart(target); + Crystalline_Tangler->getThreatManager().addThreat(target, 1000000000.0f); } } uiSummonCrystallineTanglerTimer = 17*IN_MILLISECONDS; diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp index 0224571cd68..19592cbbd9e 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp @@ -199,12 +199,12 @@ public: pSummoned->CastSpell(pSummoned, DUNGEON_MODE(SPELL_SPARK_VISUAL_TRIGGER, H_SPELL_SPARK_VISUAL_TRIGGER), true); - Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); - if (pTarget) + Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0); + if (target) { - pSummoned->SetInCombatWith(pTarget); + pSummoned->SetInCombatWith(target); pSummoned->GetMotionMaster()->Clear(); - pSummoned->GetMotionMaster()->MoveFollow(pTarget, 0.0f, 0.0f); + pSummoned->GetMotionMaster()->MoveFollow(target, 0.0f, 0.0f); } } } @@ -257,8 +257,8 @@ public: if (uiStaticOverloadTimer <= uiDiff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_STATIC_OVERLOAD); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(target, SPELL_STATIC_OVERLOAD); uiStaticOverloadTimer = urand(5*IN_MILLISECONDS, 6*IN_MILLISECONDS); } diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp index 21493c8eccc..d6b298a2399 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp @@ -180,8 +180,8 @@ public: if (m_uiArcLightning_Timer <= uiDiff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_ARC_LIGHTNING); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(target, SPELL_ARC_LIGHTNING); m_uiArcLightning_Timer = 15000 + rand()%1000; } diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp index b783f43795e..4cec6577c42 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp @@ -217,8 +217,8 @@ public: { m_lGolemGUIDList.push_back(pSummoned->GetGUID()); - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - pSummoned->GetMotionMaster()->MoveFollow(pTarget, 0.0f, 0.0f); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + pSummoned->GetMotionMaster()->MoveFollow(target, 0.0f, 0.0f); // Why healing when just summoned? pSummoned->CastSpell(pSummoned, DUNGEON_MODE(SPELL_HEAT_N, SPELL_HEAT_H), false, NULL, NULL, me->GetGUID()); @@ -320,11 +320,11 @@ public: case 3: // 3 - Cast Temper on the Anvil - if (Unit* pTarget = GetClosestCreatureWithEntry(me, NPC_VOLKHAN_ANVIL, 1000.0f, true)) + if (Unit* target = GetClosestCreatureWithEntry(me, NPC_VOLKHAN_ANVIL, 1000.0f, true)) { me->SetOrientation(2.29f); - DoCast(pTarget, SPELL_TEMPER, false); - DoCast(pTarget, SPELL_TEMPER_DUMMY, false); + DoCast(target, SPELL_TEMPER, false); + DoCast(target, SPELL_TEMPER_DUMMY, false); } m_uiDelay_Timer = 1000; // Delay 2 seconds before next phase can begin m_uiSummonPhase = 4; // Set Next Phase @@ -334,11 +334,11 @@ public: // 4 - Wait for delay to expire if (m_uiDelay_Timer <= uiDiff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_TOPAGGRO, 0)) + if (Unit* target = SelectTarget(SELECT_TARGET_TOPAGGRO, 0)) { me->SetReactState(REACT_AGGRESSIVE); - me->SetInCombatWith(pTarget); - me->GetMotionMaster()->MoveFollow(pTarget, 0.0f, 0.0f); + me->SetInCombatWith(target); + me->GetMotionMaster()->MoveFollow(target, 0.0f, 0.0f); } m_uiSummonPhase = 5; } diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp index 93a7848bd6f..387eaecf70a 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp @@ -105,15 +105,15 @@ public: if (uiBoulderTossTimer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget, SPELL_BOULDER_TOSS); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(target, SPELL_BOULDER_TOSS); uiBoulderTossTimer = 9000 + rand()%6000; } else uiBoulderTossTimer -= diff; if (uiGroundSpikeTimer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget, SPELL_GROUND_SPIKE); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(target, SPELL_GROUND_SPIKE); uiGroundSpikeTimer = 12000 + rand()%5000; } else uiGroundSpikeTimer -= diff; @@ -157,16 +157,16 @@ public: DoScriptText(SAY_KILL, me); } - void SpellHitTarget(Unit* pTarget, const SpellEntry* pSpell) + void SpellHitTarget(Unit* target, const SpellEntry* pSpell) { //this part should be in the core if (pSpell->Id == SPELL_SHATTER || pSpell->Id == H_SPELL_SHATTER) { //this spell must have custom handling in the core, dealing damage based on distance - pTarget->CastSpell(pTarget, DUNGEON_MODE(SPELL_SHATTER_EFFECT, H_SPELL_SHATTER_EFFECT), true); + target->CastSpell(target, DUNGEON_MODE(SPELL_SHATTER_EFFECT, H_SPELL_SHATTER_EFFECT), true); - if (pTarget->HasAura(SPELL_STONED)) - pTarget->RemoveAurasDueToSpell(SPELL_STONED); + if (target->HasAura(SPELL_STONED)) + target->RemoveAurasDueToSpell(SPELL_STONED); //clear this, if we are still performing if (bIsSlam) diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp index 1d01173a6ab..dcd71e41432 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp @@ -119,10 +119,10 @@ public: { if (PartingSorrowTimer <= diff) { - Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); + Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0); - if (pTarget) - DoCast(pTarget, SPELL_PARTING_SORROW); + if (target) + DoCast(target, SPELL_PARTING_SORROW); PartingSorrowTimer = 30000 + rand()%10000; } else PartingSorrowTimer -= diff; @@ -144,10 +144,10 @@ public: if (PillarOfWoeTimer <= diff) { - Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1); + Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1); - if (pTarget) - DoCast(pTarget, SPELL_PILLAR_OF_WOE_N); + if (target) + DoCast(target, SPELL_PILLAR_OF_WOE_N); else DoCast(me->getVictim(), SPELL_PILLAR_OF_WOE_N); diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp index 97af158a357..5273c0100b0 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp @@ -156,8 +156,8 @@ public: if (uiChainLightningTimer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget, SPELL_CHAIN_LIGHTING); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(target, SPELL_CHAIN_LIGHTING); uiChainLightningTimer = 10000 + rand()%5000; } else uiChainLightningTimer -= diff; @@ -209,8 +209,8 @@ public: void JustSummoned(Creature* summon) { summon->GetMotionMaster()->MovePoint(0, CenterPoint.x, CenterPoint.y, CenterPoint.z); - /*if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - summon->AI()->AttackStart(pTarget);*/ + /*if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + summon->AI()->AttackStart(target);*/ lSummons.Summon(summon); } diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp index d9d3f4ebd7d..8edb4226fc4 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp @@ -213,14 +213,14 @@ public: { if (uiKaddrakEncounterTimer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) if (!KaddrakGUIDList.empty()) for (std::list<uint64>::const_iterator itr = KaddrakGUIDList.begin(); itr != KaddrakGUIDList.end(); ++itr) { if (Creature* pKaddrak = Unit::GetCreature(*me, *itr)) { if (pKaddrak->isAlive()) - pKaddrak->CastSpell(pTarget, DUNGEON_MODE(SPELL_GLARE_OF_THE_TRIBUNAL, H_SPELL_GLARE_OF_THE_TRIBUNAL), true); + pKaddrak->CastSpell(target, DUNGEON_MODE(SPELL_GLARE_OF_THE_TRIBUNAL, H_SPELL_GLARE_OF_THE_TRIBUNAL), true); } } uiKaddrakEncounterTimer = 1500; @@ -230,13 +230,13 @@ public: { if (uiMarnakEncounterTimer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) { - if (Creature* pSummon = me->SummonCreature(CREATURE_DARK_MATTER_TARGET, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0.0f, TEMPSUMMON_TIMED_DESPAWN, 1000)) + if (Creature* pSummon = me->SummonCreature(CREATURE_DARK_MATTER_TARGET, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0.0f, TEMPSUMMON_TIMED_DESPAWN, 1000)) { pSummon->SetDisplayId(11686); pSummon->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - pSummon->CastSpell(pTarget, DUNGEON_MODE(SPELL_DARK_MATTER, H_SPELL_DARK_MATTER), true); + pSummon->CastSpell(target, DUNGEON_MODE(SPELL_DARK_MATTER, H_SPELL_DARK_MATTER), true); } } uiMarnakEncounterTimer = 30000 + rand()%1000; @@ -246,13 +246,13 @@ public: { if (uiAbedneumEncounterTimer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) { - if (Creature* pSummon = me->SummonCreature(CREATURE_SEARING_GAZE_TARGET, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0.0f, TEMPSUMMON_TIMED_DESPAWN, 1000)) + if (Creature* pSummon = me->SummonCreature(CREATURE_SEARING_GAZE_TARGET, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0.0f, TEMPSUMMON_TIMED_DESPAWN, 1000)) { pSummon->SetDisplayId(11686); pSummon->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - pSummon->CastSpell(pTarget, DUNGEON_MODE(SPELL_SEARING_GAZE, H_SPELL_SEARING_GAZE), true); + pSummon->CastSpell(target, DUNGEON_MODE(SPELL_SEARING_GAZE, H_SPELL_SEARING_GAZE), true); } } uiAbedneumEncounterTimer = 30000 + rand()%1000; diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_algalon.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_algalon.cpp index 99bc6f1c4cd..1d6a30b45ae 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_algalon.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_algalon.cpp @@ -178,9 +178,9 @@ public: { if (pSummoned->GetEntry() == CREATURE_COLLAPSING_STAR) { - Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); + Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0); if (me->getVictim()) - pSummoned->AI()->AttackStart(pTarget ? pTarget : me->getVictim()); + pSummoned->AI()->AttackStart(target ? target : me->getVictim()); m_lCollapsingStarGUIDList.push_back(pSummoned->GetGUID()); } } diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_assembly_of_iron.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_assembly_of_iron.cpp index dd511516cb4..4e0c50972ff 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_assembly_of_iron.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_assembly_of_iron.cpp @@ -18,7 +18,7 @@ /* ScriptData SDName: Assembly of Iron encounter SD%Complete: 60% -SDComment: Runes need DB support, chain lightning won't cast, supercharge won't cast (pTarget error?) - it worked before during debugging. +SDComment: Runes need DB support, chain lightning won't cast, supercharge won't cast (target error?) - it worked before during debugging. SDCategory: Ulduar - Ulduar EndScriptData */ diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp index 2f2446cb94a..8147456a884 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp @@ -270,14 +270,14 @@ class boss_xt002 : public CreatureScript switch (eventId) { case EVENT_SEARING_LIGHT: - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, RAID_MODE(SPELL_SEARING_LIGHT_10, SPELL_SEARING_LIGHT_25)); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(target, RAID_MODE(SPELL_SEARING_LIGHT_10, SPELL_SEARING_LIGHT_25)); events.RepeatEvent(TIMER_SEARING_LIGHT); break; case EVENT_GRAVITY_BOMB: - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, RAID_MODE(SPELL_GRAVITY_BOMB_10, SPELL_GRAVITY_BOMB_25)); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(target, RAID_MODE(SPELL_GRAVITY_BOMB_10, SPELL_GRAVITY_BOMB_25)); events.RepeatEvent(TIMER_GRAVITY_BOMB); break; diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp index e6a6c27d33b..4e6a6fb72c5 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp @@ -242,10 +242,10 @@ public: if (!me->HasUnitState(UNIT_STAT_CASTING)) { // Spawn target for Axe - Unit* pTarget = SelectTarget(SELECT_TARGET_TOPAGGRO, 1); - if (pTarget) + Unit* target = SelectTarget(SELECT_TARGET_TOPAGGRO, 1); + if (target) { - me->SummonCreature(ENTRY_THROW_TARGET, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 2000); + me->SummonCreature(ENTRY_THROW_TARGET, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 2000); DoCast(me, SPELL_SHADOW_AXE_SUMMON); } @@ -417,12 +417,12 @@ public: void Reset() { - Unit* pTarget = me->FindNearestCreature(ENTRY_THROW_TARGET, 50); - if (pTarget) + Unit* target = me->FindNearestCreature(ENTRY_THROW_TARGET, 50); + if (target) { DoCast(me, SPELL_SHADOW_AXE_DAMAGE); float x, y, z; - pTarget->GetPosition(x, y, z); + target->GetPosition(x, y, z); me->GetMotionMaster()->MovePoint(0, x, y, z); } uiDespawnTimer = 7000; diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp index 964a7b3a9cd..57a4a1f02eb 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp @@ -205,9 +205,9 @@ public: if (ShadowboltTimer <= diff) { - Unit* pTarget = SelectTarget(SELECT_TARGET_TOPAGGRO, 0); - if (pTarget && pTarget->isAlive() && pTarget->GetTypeId() == TYPEID_PLAYER) - me->CastSpell(pTarget, DUNGEON_MODE(SPELL_SHADOWBOLT, SPELL_SHADOWBOLT_HEROIC), true); + Unit* target = SelectTarget(SELECT_TARGET_TOPAGGRO, 0); + if (target && target->isAlive() && target->GetTypeId() == TYPEID_PLAYER) + me->CastSpell(target, DUNGEON_MODE(SPELL_SHADOWBOLT, SPELL_SHADOWBOLT_HEROIC), true); ShadowboltTimer = 10000; } else ShadowboltTimer -= diff; @@ -234,14 +234,14 @@ public: if (FrostTombTimer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - if (pTarget->isAlive()) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (target->isAlive()) { - //DoCast(pTarget, SPELL_FROST_TOMB_SUMMON, true); - if (Creature* pChains = me->SummonCreature(CREATURE_FROSTTOMB, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 20000)) + //DoCast(target, SPELL_FROST_TOMB_SUMMON, true); + if (Creature* pChains = me->SummonCreature(CREATURE_FROSTTOMB, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 20000)) { - CAST_AI(mob_frost_tomb::mob_frost_tombAI, pChains->AI())->SetPrisoner(pTarget); - pChains->CastSpell(pTarget, SPELL_FROST_TOMB, true); + CAST_AI(mob_frost_tomb::mob_frost_tombAI, pChains->AI())->SetPrisoner(target); + pChains->CastSpell(target, SPELL_FROST_TOMB, true); DoScriptText(SAY_FROST_TOMB, me); } diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp index 9e5d238d68c..137492c16ca 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp @@ -195,8 +195,8 @@ public: if (uiImpaleTimer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget, SPELL_IMPALE); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(target, SPELL_IMPALE); uiImpaleTimer = urand(8000, 12000); } else uiImpaleTimer -= diff; @@ -574,8 +574,8 @@ public: if (uiGrievousWoundTimer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget, SPELL_GRIEVOUS_WOUND); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(target, SPELL_GRIEVOUS_WOUND); uiGrievousWoundTimer = 18000 + rand() % 4000; } else uiGrievousWoundTimer -= diff; @@ -682,8 +682,8 @@ public: if (uiAcidSpitTimer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget, SPELL_ACID_SPIT); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(target, SPELL_ACID_SPIT); uiAcidSpitTimer = 2000 + rand() % 2000; } else uiAcidSpitTimer -= diff; @@ -695,8 +695,8 @@ public: if (uiPoisonBreathTimer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget, SPELL_POISON_BREATH); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(target, SPELL_POISON_BREATH); uiPoisonBreathTimer = 8000 + rand() % 4000; } else uiPoisonBreathTimer -= diff; diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp index fa55d0321bd..0592c468bc0 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp @@ -258,8 +258,8 @@ public: case CREATURE_YMIRJAR_HARPOONER: pSummoned->setActive(true); pSummoned->SetInCombatWithZone(); - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - pSummoned->AI()->AttackStart(pTarget); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + pSummoned->AI()->AttackStart(target); break; case CREATURE_TRIGGER: pSummoned->CastSpell((Unit*)NULL, SPELL_FREEZING_CLOUD, true); @@ -391,8 +391,8 @@ public: if (m_uiPoisonedSpearTimer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM)) - DoCast(pTarget, SPELL_POISONED_SPEAR); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM)) + DoCast(target, SPELL_POISONED_SPEAR); m_uiPoisonedSpearTimer = 10000; } else m_uiPoisonedSpearTimer -= diff; diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp index 41f2f6d9458..12a41b791f2 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp @@ -333,9 +333,9 @@ public: if (uiCallFlamesTimer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) { - DoCast(pTarget, SPELL_CALL_FLAMES); + DoCast(target, SPELL_CALL_FLAMES); uiCallFlamesTimer = urand(8 * IN_MILLISECONDS, 12 * IN_MILLISECONDS); } } else uiCallFlamesTimer -= diff; @@ -381,8 +381,8 @@ public: Phase = NORMAL; pSacrificeTarget = NULL; me->SetUnitMovementFlags(MOVEMENTFLAG_WALKING); - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - me->GetMotionMaster()->MoveChase(pTarget); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + me->GetMotionMaster()->MoveChase(target); uiSacrificeTimer = 8 * IN_MILLISECONDS; } diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp index 85851b673cb..f7f9dcae844 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp @@ -318,10 +318,10 @@ public: //DoCast(me, SPELL_SUMMON_AVENGING_SPIRIT); // works fine, but using summon has better control if (Creature* pTemp = me->SummonCreature(CREATURE_AVENGING_SPIRIT, x + rand() % 10, y + rand() % 10, z, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000)) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) { - pTemp->AddThreat(pTarget, 0.0f); - pTemp->AI()->AttackStart(pTarget); + pTemp->AddThreat(target, 0.0f); + pTemp->AI()->AttackStart(target); } } } diff --git a/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp index 53f62d3e534..1e17103d23d 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp @@ -111,8 +111,8 @@ public: if (uiBlizzardTimer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget, SPELL_BLIZZARD); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(target, SPELL_BLIZZARD); uiBlizzardTimer = 15000; } else uiBlizzardTimer -= diff; @@ -132,8 +132,8 @@ public: { if (uiManaDestructionTimer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget, SPELL_MANA_DESTRUCTION); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(target, SPELL_MANA_DESTRUCTION); uiManaDestructionTimer = 30000; } else uiManaDestructionTimer -= diff; } diff --git a/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp b/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp index 4afe6dfe8d8..a6910af0a95 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp @@ -174,8 +174,8 @@ public: { if (uint64 TargetGUID = GetChainHealTargetGUID()) { - if (Creature* pTarget = Unit::GetCreature(*me, TargetGUID)) - DoCast(pTarget, SPELL_CHAIN_HEAL); + if (Creature* target = Unit::GetCreature(*me, TargetGUID)) + DoCast(target, SPELL_CHAIN_HEAL); //If one of the adds is dead spawn heals faster Creature* pGuard1 = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_EREKEM_GUARD_1) : 0); @@ -198,8 +198,8 @@ public: if (uiLightningBoltTimer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget, SPELL_LIGHTNING_BOLT); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(target, SPELL_LIGHTNING_BOLT); uiLightningBoltTimer = urand(18000, 24000); } else uiLightningBoltTimer -= diff; diff --git a/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp b/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp index f7f2c5e5478..65d5aa157d0 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp @@ -102,8 +102,8 @@ public: if (uiOpticLinkTimer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget, SPELL_OPTIC_LINK); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(target, SPELL_OPTIC_LINK); uiOpticLinkTimer = 15000; } else uiOpticLinkTimer -= diff; diff --git a/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp b/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp index 6277367d622..c4bbf4dab36 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp @@ -114,10 +114,10 @@ public: void JustSummoned(Creature* pSummoned) { pSummoned->SetSpeed(MOVE_RUN, 0.5f); - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) { - pSummoned->AddThreat(pTarget, 0.00f); - pSummoned->AI()->AttackStart(pTarget); + pSummoned->AddThreat(target, 0.00f); + pSummoned->AI()->AttackStart(target); } } diff --git a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp index fc3822e562d..0fdd8c7b153 100644 --- a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp +++ b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp @@ -844,9 +844,9 @@ public: if (uiImpaleTimer <= diff) { - Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); - if (pTarget) - DoCast(pTarget, SPELL_IMPALE); + Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); + if (target) + DoCast(target, SPELL_IMPALE); uiImpaleTimer = 4000; } else uiImpaleTimer -= diff; } @@ -922,9 +922,9 @@ public: if (uiArcainBarrageTimer <= diff) { - Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); - if (pTarget) - DoCast(pTarget, DUNGEON_MODE(SPELL_ARCANE_BARRAGE, H_SPELL_ARCANE_BARRAGE)); + Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); + if (target) + DoCast(target, DUNGEON_MODE(SPELL_ARCANE_BARRAGE, H_SPELL_ARCANE_BARRAGE)); uiArcainBarrageTimer = 6000; } else uiArcainBarrageTimer -= diff; } @@ -939,9 +939,9 @@ public: if (uiFrostboltTimer <= diff) { - Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); - if (pTarget) - DoCast(pTarget, DUNGEON_MODE(SPELL_FROSTBOLT, H_SPELL_FROSTBOLT)); + Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); + if (target) + DoCast(target, DUNGEON_MODE(SPELL_FROSTBOLT, H_SPELL_FROSTBOLT)); uiFrostboltTimer = 6000; } else uiFrostboltTimer -= diff; } @@ -999,9 +999,9 @@ public: { if (uiSpellLockTimer <= diff) { - Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); - if (pTarget) - DoCast(pTarget, SPELL_SPELL_LOCK); + Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); + if (target) + DoCast(target, SPELL_SPELL_LOCK); uiSpellLockTimer = 9000; } else uiSpellLockTimer -= diff; } @@ -1103,9 +1103,9 @@ public: { if (uiTacticalBlinkTimer <= diff) { - Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 40, true); - if (pTarget) - DoCast(pTarget, SPELL_TACTICAL_BLINK); + Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 40, true); + if (target) + DoCast(target, SPELL_TACTICAL_BLINK); uiTacticalBlinkTimer = 6000; TacticalBlinkCasted = true; } else uiTacticalBlinkTimer -= diff; @@ -1115,8 +1115,8 @@ public: { if (uiBackstabTimer <= diff) { - Unit* pTarget = SelectTarget(SELECT_TARGET_NEAREST, 0, 10, true); - DoCast(pTarget, SPELL_BACKSTAB); + Unit* target = SelectTarget(SELECT_TARGET_NEAREST, 0, 10, true); + DoCast(target, SPELL_BACKSTAB); TacticalBlinkCasted = false; uiBackstabTimer =1300; } else uiBackstabTimer -= diff; @@ -1165,17 +1165,17 @@ public: { if (uiArcaneBlastTimer <= diff) { - Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); - if (pTarget) - DoCast(pTarget, DUNGEON_MODE(SPELL_ARCANE_BLAST, H_SPELL_ARCANE_BLAST)); + Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); + if (target) + DoCast(target, DUNGEON_MODE(SPELL_ARCANE_BLAST, H_SPELL_ARCANE_BLAST)); uiArcaneBlastTimer = 6000; } else uiArcaneBlastTimer -= diff; if (uiSlowTimer <= diff) { - Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); - if (pTarget) - DoCast(pTarget, SPELL_SLOW); + Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); + if (target) + DoCast(target, SPELL_SLOW); uiSlowTimer = 5000; } else uiSlowTimer -= diff; } @@ -1184,9 +1184,9 @@ public: { if (uiChainsOfIceTimer <= diff) { - Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); - if (pTarget) - DoCast(pTarget, SPELL_CHAINS_OF_ICE); + Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); + if (target) + DoCast(target, SPELL_CHAINS_OF_ICE); uiChainsOfIceTimer = 7000; } else uiChainsOfIceTimer -= diff; @@ -1297,9 +1297,9 @@ public: if (uiArcaneStreamTimer <= diff) { - Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); - if (pTarget) - DoCast(pTarget, DUNGEON_MODE(SPELL_ARCANE_STREAM, H_SPELL_ARCANE_STREAM)); + Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); + if (target) + DoCast(target, DUNGEON_MODE(SPELL_ARCANE_STREAM, H_SPELL_ARCANE_STREAM)); uiArcaneStreamTimer = urand(0, 5000)+5000; uiArcaneStreamTimerStartingValueHolder = uiArcaneStreamTimer; } else uiArcaneStreamTimer -= diff; diff --git a/src/server/scripts/Northrend/icecrown.cpp b/src/server/scripts/Northrend/icecrown.cpp index 0a6c2e19b7f..feab72a5819 100644 --- a/src/server/scripts/Northrend/icecrown.cpp +++ b/src/server/scripts/Northrend/icecrown.cpp @@ -309,19 +309,19 @@ public: if (uiCast) return; uiCast = true; - Creature* pTarget = NULL; + Creature* target = NULL; switch(me->GetEntry()) { case NPC_PRIESTESS_ALORAH: - pTarget = me->FindNearestCreature(NPC_EYDIS_DARKBANE, 10.0f); + target = me->FindNearestCreature(NPC_EYDIS_DARKBANE, 10.0f); break; case NPC_PRIEST_GRIMMIN: - pTarget = me->FindNearestCreature(NPC_FJOLA_LIGHTBANE, 10.0f); + target = me->FindNearestCreature(NPC_FJOLA_LIGHTBANE, 10.0f); break; } - if (pTarget) - DoCast(pTarget, SPELL_CHAIN); + if (target) + DoCast(target, SPELL_CHAIN); if (!UpdateVictim()) return; diff --git a/src/server/scripts/Northrend/zuldrak.cpp b/src/server/scripts/Northrend/zuldrak.cpp index 0a19865d9fa..5849518fce8 100644 --- a/src/server/scripts/Northrend/zuldrak.cpp +++ b/src/server/scripts/Northrend/zuldrak.cpp @@ -767,15 +767,15 @@ public: if (uiUppercutTimer <= uiDiff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_NEAREST, 0)) - DoCast(pTarget, SPELL_UPPERCUT); + if (Unit* target = SelectTarget(SELECT_TARGET_NEAREST, 0)) + DoCast(target, SPELL_UPPERCUT); uiUppercutTimer = 12000; } else uiUppercutTimer -= uiDiff; if (uiChargeTimer <= uiDiff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_FARTHEST, 0)) - DoCast(pTarget, SPELL_CHARGE); + if (Unit* target = SelectTarget(SELECT_TARGET_FARTHEST, 0)) + DoCast(target, SPELL_CHARGE); uiChargeTimer = 15000; } else uiChargeTimer -= uiDiff; @@ -983,20 +983,20 @@ public: if (uiKnockAwayTimer <= uiDiff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) { - if (pTarget && pTarget->isAlive()) - DoCast(pTarget, SPELL_KNOCK_AWAY); + if (target && target->isAlive()) + DoCast(target, SPELL_KNOCK_AWAY); } uiKnockAwayTimer = 10000; } else uiKnockAwayTimer -= uiDiff; if (uiStinkyBeardTimer <= uiDiff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) { - if (pTarget && pTarget->isAlive()) - DoCast(pTarget, SPELL_STINKY_BEARD); + if (target && target->isAlive()) + DoCast(target, SPELL_STINKY_BEARD); } uiStinkyBeardTimer = 15000; } else uiStinkyBeardTimer -= uiDiff; |