diff options
| author | click <click@gonnamakeyou.com> | 2011-07-02 23:16:45 +0200 |
|---|---|---|
| committer | click <click@gonnamakeyou.com> | 2011-07-02 23:16:45 +0200 |
| commit | 70115f52f7229254af99162f6f5639792a23da49 (patch) | |
| tree | c6acac7a3cf183fe14eadf82e07cac2ffde6c4c2 /src | |
| parent | 169f5da8c3120da98c01ebd8117f7aa527106206 (diff) | |
Core: Cleaning up hungarian notation - Phase3: pTarget -> target
Diffstat (limited to 'src')
212 files changed, 1970 insertions, 1970 deletions
diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_anubshiah.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_anubshiah.cpp index e97a0fd4ab4..1edb5d99463 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_anubshiah.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_anubshiah.cpp @@ -83,8 +83,8 @@ public: //CurseOfTongues_Timer if (CurseOfTongues_Timer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget, SPELL_CURSEOFTONGUES); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(target, SPELL_CURSEOFTONGUES); CurseOfTongues_Timer = 18000; } else CurseOfTongues_Timer -= diff; @@ -105,8 +105,8 @@ public: //EnvelopingWeb_Timer if (EnvelopingWeb_Timer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget, SPELL_ENVELOPINGWEB); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(target, SPELL_ENVELOPINGWEB); EnvelopingWeb_Timer = 12000; } else EnvelopingWeb_Timer -= diff; diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp index ac5c0b70fd4..3ff21b428d6 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp @@ -81,8 +81,8 @@ public: if (HandOfThaurissan_Timer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_HANDOFTHAURISSAN); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(target, SPELL_HANDOFTHAURISSAN); //3 Hands of Thaurissan will be casted //if (Counter < 3) diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_high_interrogator_gerstahn.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_high_interrogator_gerstahn.cpp index ab6a2918ad4..5b7ce8bd760 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_high_interrogator_gerstahn.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_high_interrogator_gerstahn.cpp @@ -73,16 +73,16 @@ public: //ShadowWordPain_Timer if (ShadowWordPain_Timer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget, SPELL_SHADOWWORDPAIN); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(target, SPELL_SHADOWWORDPAIN); ShadowWordPain_Timer = 7000; } else ShadowWordPain_Timer -= diff; //ManaBurn_Timer if (ManaBurn_Timer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget, SPELL_MANABURN); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(target, SPELL_MANABURN); ManaBurn_Timer = 10000; } else ManaBurn_Timer -= diff; diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_tomb_of_seven.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_tomb_of_seven.cpp index 5517e5d5345..16fdae555a2 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_tomb_of_seven.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_tomb_of_seven.cpp @@ -222,8 +222,8 @@ public: //Immolate_Timer if (Immolate_Timer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget, SPELL_IMMOLATE); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(target, SPELL_IMMOLATE); Immolate_Timer = 25000; } else Immolate_Timer -= diff; diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp index f93775a006e..9a5956f41b1 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp @@ -378,8 +378,8 @@ public: { boss->setFaction(FACTION_HOSTILE); boss->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); - if (Unit* pTarget = boss->SelectNearestTarget(500)) - boss->AI()->AttackStart(pTarget); + if (Unit* target = boss->SelectNearestTarget(500)) + boss->AI()->AttackStart(target); } } } diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp index 922fb5cd5c1..71ce5c8d48e 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp @@ -86,8 +86,8 @@ public: events.ScheduleEvent(EVENT_CURSE_OF_BLOOD, 45*IN_MILLISECONDS); break; case EVENT_HEX: - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget, SPELL_HEX); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(target, SPELL_HEX); events.ScheduleEvent(EVENT_HEX, 15*IN_MILLISECONDS); break; case EVENT_CLEAVE: diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_chromaggus.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_chromaggus.cpp index 1a6072c1d3a..d74c075b05a 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_chromaggus.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_chromaggus.cpp @@ -262,7 +262,7 @@ public: && pUnit->HasAura(SPELL_BROODAF_GREEN)) { //pTarget->RemoveAllAuras(); - //DoCast(pTarget, SPELL_CHROMATIC_MUT_1); + //DoCast(target, SPELL_CHROMATIC_MUT_1); //Chromatic mutation is causing issues //Assuming it is caused by a lack of core support for Charm diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_razorgore.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_razorgore.cpp index effcb5293dd..b4ccc8544a1 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_razorgore.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_razorgore.cpp @@ -114,8 +114,8 @@ public: // Aura Check. If the gamer is affected by confliguration we attack a random gamer. if (me->getVictim() && me->getVictim()->HasAura(SPELL_CONFLAGRATION)) - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true)) - me->TauntApply(pTarget); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true)) + me->TauntApply(target); DoMeleeAttackIfReady(); } diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_vaelastrasz.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_vaelastrasz.cpp index c8eb2da6e88..1f7683500b0 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_vaelastrasz.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_vaelastrasz.cpp @@ -115,10 +115,10 @@ public: DoingSpeech = false; } - void BeginSpeech(Unit* pTarget) + void BeginSpeech(Unit* target) { //Stand up and begin speach - PlayerGUID = pTarget->GetGUID(); + PlayerGUID = target->GetGUID(); //10 seconds DoScriptText(SAY_LINE1, me); @@ -208,18 +208,18 @@ public: //BurningAdrenalineCaster_Timer if (BurningAdrenalineCaster_Timer <= diff) { - Unit* pTarget = NULL; + Unit* target = NULL; uint8 i = 0; while (i < 3) // max 3 tries to get a random target with power_mana { ++i; - pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true); //not aggro leader - if (pTarget && pTarget->getPowerType() == POWER_MANA) + target = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true); //not aggro leader + if (target && target->getPowerType() == POWER_MANA) i = 3; } - if (pTarget) // cast on self (see below) - pTarget->CastSpell(pTarget, SPELL_BURNINGADRENALINE, 1); + if (target) // cast on self (see below) + target->CastSpell(target, SPELL_BURNINGADRENALINE, 1); BurningAdrenalineCaster_Timer = 15000; } else BurningAdrenalineCaster_Timer -= diff; diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp index 5e080e485c1..53985ce9e58 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp @@ -224,7 +224,7 @@ public: me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); } - void BeginEvent(Player* pTarget) + void BeginEvent(Player* target) { DoScriptText(SAY_GAMESBEGIN_2, me); @@ -240,7 +240,7 @@ public: me->SetUInt32Value(UNIT_NPC_FLAGS, 0); me->setFaction(103); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - AttackStart(pTarget); + AttackStart(target); } void EnterCombat(Unit* /*who*/) @@ -269,8 +269,8 @@ public: //ShadowBoltTimer if (ShadowBoltTimer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget, SPELL_SHADOWBOLT); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(target, SPELL_SHADOWBOLT); ShadowBoltTimer = urand(3000, 10000); } else ShadowBoltTimer -= diff; @@ -278,8 +278,8 @@ public: //FearTimer if (FearTimer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget, SPELL_FEAR); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(target, SPELL_FEAR); FearTimer = 10000 + (rand()%10000); } else FearTimer -= diff; @@ -290,7 +290,7 @@ public: //Spawn 2 random types of creatures at the 2 locations uint32 CreatureID; Creature* Spawned = NULL; - Unit* pTarget = NULL; + Unit* target = NULL; //1 in 3 chance it will be a chromatic if (urand(0, 2) == 0) @@ -302,10 +302,10 @@ public: //Spawn Creature and force it to start attacking a random target Spawned = me->SummonCreature(CreatureID, ADD_X1, ADD_Y1, ADD_Z1, 5.000f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); - pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); - if (pTarget && Spawned) + target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); + if (target && Spawned) { - Spawned->AI()->AttackStart(pTarget); + Spawned->AI()->AttackStart(target); Spawned->setFaction(103); } @@ -318,10 +318,10 @@ public: ++SpawnedAdds; Spawned = me->SummonCreature(CreatureID, ADD_X2, ADD_Y2, ADD_Z2, 5.000f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); - pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); - if (pTarget && Spawned) + target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); + if (target && Spawned) { - Spawned->AI()->AttackStart(pTarget); + Spawned->AI()->AttackStart(target); Spawned->setFaction(103); } @@ -346,10 +346,10 @@ public: //Spawn nef and have him attack a random target Creature* Nefarian = me->SummonCreature(CREATURE_NEFARIAN, NEF_X, NEF_Y, NEF_Z, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); - pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); - if (pTarget && Nefarian) + target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); + if (target && Nefarian) { - Nefarian->AI()->AttackStart(pTarget); + Nefarian->AI()->AttackStart(target); Nefarian->setFaction(103); NefarianGUID = Nefarian->GetGUID(); } diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp index 65a122798fe..423b73eed49 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp @@ -132,13 +132,13 @@ public: { //Summon Astral Flare Creature* AstralFlare = DoSpawnCreature(17096, float(rand()%37), float(rand()%37), 0, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); - Unit* pTarget = NULL; - pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); + Unit* target = NULL; + target = SelectTarget(SELECT_TARGET_RANDOM, 0); - if (AstralFlare && pTarget) + if (AstralFlare && target) { AstralFlare->CastSpell(AstralFlare, SPELL_ASTRAL_FLARE_PASSIVE, false); - AstralFlare->AI()->AttackStart(pTarget); + AstralFlare->AI()->AttackStart(target); } //Reduce Mana by 10% of max health @@ -184,8 +184,8 @@ public: else HatefulBoltTimer = 15000; - if (Unit* pTarget = SelectTarget(SELECT_TARGET_TOPAGGRO, 1)) - DoCast(pTarget, SPELL_HATEFUL_BOLT); + if (Unit* target = SelectTarget(SELECT_TARGET_TOPAGGRO, 1)) + DoCast(target, SPELL_HATEFUL_BOLT); } else HatefulBoltTimer -= diff; diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp index cdf63ee0edc..8db9221c764 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp @@ -115,16 +115,16 @@ public: if (Holyfire_Timer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget, SPELL_HOLYFIRE); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(target, SPELL_HOLYFIRE); Holyfire_Timer = urand(8000, 23000); //Anywhere from 8 to 23 seconds, good luck having several of those in a row! } else Holyfire_Timer -= diff; if (Holywrath_Timer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget, SPELL_HOLYWRATH); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(target, SPELL_HOLYWRATH); Holywrath_Timer = urand(20000, 25000); //20-30 secs sounds nice } else Holywrath_Timer -= diff; diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp index 283cbb7fdf7..4fc4d56d912 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp @@ -276,20 +276,20 @@ void boss_attumen::boss_attumenAI::UpdateAI(const uint32 diff) { if (ChargeTimer <= diff) { - 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()); - if (pTarget && !pTarget->IsWithinDist(me, ATTACK_DISTANCE, false)) - target_list.push_back(pTarget); - pTarget = NULL; + target = Unit::GetUnit(*me, (*itr)->getUnitGuid()); + if (target && !target->IsWithinDist(me, ATTACK_DISTANCE, false)) + target_list.push_back(target); + target = NULL; } if (!target_list.empty()) - pTarget = *(target_list.begin()+rand()%target_list.size()); + target = *(target_list.begin()+rand()%target_list.size()); - DoCast(pTarget, SPELL_BERSERKER_CHARGE); + DoCast(target, SPELL_BERSERKER_CHARGE); ChargeTimer = 20000; } else ChargeTimer -= diff; } diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp index ff80d63e0de..14cfd95fae4 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp @@ -284,9 +284,9 @@ public: if (Blind_Timer <= diff) { - std::list<Unit*> pTargets; - SelectTargetList(pTargets, 5, SELECT_TARGET_RANDOM, me->GetMeleeReach()*5, true); - for (std::list<Unit*>::const_iterator i = pTargets.begin(); i != pTargets.end(); ++i) + std::list<Unit*> targets; + SelectTargetList(targets, 5, SELECT_TARGET_RANDOM, me->GetMeleeReach()*5, true); + for (std::list<Unit*>::const_iterator i = targets.begin(); i != targets.end(); ++i) if (!me->IsWithinMeleeRange(*i)) { DoCast(*i, SPELL_BLIND); @@ -302,8 +302,8 @@ public: { DoScriptText(RAND(SAY_SPECIAL_1, SAY_SPECIAL_2), me); - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - pTarget->CastSpell(pTarget, SPELL_GARROTE, true); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + target->CastSpell(target, SPELL_GARROTE, true); InVanish = false; } else Wait_Timer -= diff; @@ -449,17 +449,17 @@ public: if (ManaBurn_Timer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - if (pTarget->getPowerType() == POWER_MANA) - DoCast(pTarget, SPELL_MANABURN); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (target->getPowerType() == POWER_MANA) + DoCast(target, SPELL_MANABURN); ManaBurn_Timer = 5000; // 3 sec cast } else ManaBurn_Timer -= diff; if (ShadowWordPain_Timer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) { - DoCast(pTarget, SPELL_SWPAIN); + DoCast(target, SPELL_SWPAIN); ShadowWordPain_Timer = 7000; } } else ShadowWordPain_Timer -= diff; @@ -573,9 +573,9 @@ public: if (GreaterHeal_Timer <= diff) { - Unit* pTarget = SelectGuestTarget(); + Unit* target = SelectGuestTarget(); - DoCast(pTarget, SPELL_GREATERHEAL); + DoCast(target, SPELL_GREATERHEAL); GreaterHeal_Timer = 17000; } else GreaterHeal_Timer -= diff; @@ -587,8 +587,8 @@ public: if (DispelMagic_Timer <= diff) { - if (Unit* pTarget = RAND(SelectGuestTarget(), SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))) - DoCast(pTarget, SPELL_DISPELMAGIC); + if (Unit* target = RAND(SelectGuestTarget(), SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))) + DoCast(target, SPELL_DISPELMAGIC); DispelMagic_Timer = 25000; } else DispelMagic_Timer -= diff; @@ -644,26 +644,26 @@ public: if (HolyLight_Timer <= diff) { - Unit* pTarget = SelectGuestTarget(); + Unit* target = SelectGuestTarget(); - DoCast(pTarget, SPELL_HOLYLIGHT); + DoCast(target, SPELL_HOLYLIGHT); HolyLight_Timer = 10000; } else HolyLight_Timer -= diff; if (GreaterBless_Timer <= diff) { - Unit* pTarget = SelectGuestTarget(); + Unit* target = SelectGuestTarget(); - DoCast(pTarget, SPELL_GREATERBLESSOFMIGHT); + DoCast(target, SPELL_GREATERBLESSOFMIGHT); GreaterBless_Timer = 50000; } else GreaterBless_Timer -= diff; if (Cleanse_Timer <= diff) { - Unit* pTarget = SelectGuestTarget(); + Unit* target = SelectGuestTarget(); - DoCast(pTarget, SPELL_CLEANSE); + DoCast(target, SPELL_CLEANSE); Cleanse_Timer = 10000; } else Cleanse_Timer -= diff; diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp index 1e06cdf1eb4..c970bb7152d 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp @@ -96,9 +96,9 @@ public: uint64 BeamerGUID[3]; // guid's of auxiliary beaming portals uint64 BeamTarget[3]; // guid's of portals' current targets - bool IsBetween(WorldObject* u1, WorldObject *pTarget, WorldObject* u2) // the in-line checker + bool IsBetween(WorldObject* u1, WorldObject* target, WorldObject* u2) // the in-line checker { - if (!u1 || !u2 || !pTarget) + if (!u1 || !u2 || !target) return false; float xn, yn, xp, yp, xh, yh; @@ -106,8 +106,8 @@ public: yn = u1->GetPositionY(); xp = u2->GetPositionX(); yp = u2->GetPositionY(); - xh = pTarget->GetPositionX(); - yh = pTarget->GetPositionY(); + xh = target->GetPositionX(); + yh = target->GetPositionY(); // check if target is between (not checking distance from the beam yet) if (dist(xn, yn, xh, yh) >= dist(xn, yn, xp, yp) || dist(xp, yp, xh, yh) >= dist(xn, yn, xp, yp)) @@ -169,7 +169,7 @@ public: // the one who's been casted upon before Unit* current = Unit::GetUnit(*portal, BeamTarget[j]); // temporary store for the best suitable beam reciever - Unit* pTarget = me; + Unit* target = me; if (Map* map = me->GetMap()) { @@ -180,41 +180,41 @@ public: { Player* p = i->getSource(); if (p && p->isAlive() // alive - && (!pTarget || pTarget->GetDistance2d(portal)>p->GetDistance2d(portal)) // closer than current best + && (!target || target->GetDistance2d(portal)>p->GetDistance2d(portal)) // closer than current best && !p->HasAura(PlayerDebuff[j], 0) // not exhausted && !p->HasAura(PlayerBuff[(j+1)%3], 0) // not on another beam && !p->HasAura(PlayerBuff[(j+2)%3], 0) && IsBetween(me, p, portal)) // on the beam - pTarget = p; + target = p; } } // buff the target - if (pTarget->GetTypeId() == TYPEID_PLAYER) - pTarget->AddAura(PlayerBuff[j], pTarget); + if (target->GetTypeId() == TYPEID_PLAYER) + target->AddAura(PlayerBuff[j], target); else - pTarget->AddAura(NetherBuff[j], pTarget); + target->AddAura(NetherBuff[j], target); // cast visual beam on the chosen target if switched // simple target switching isn't working -> using BeamerGUID to cast (workaround) - if (!current || pTarget != current) + if (!current || target != current) { - BeamTarget[j] = pTarget->GetGUID(); + BeamTarget[j] = target->GetGUID(); // remove currently beaming portal if (Creature* beamer = Unit::GetCreature(*portal, BeamerGUID[j])) { - beamer->CastSpell(pTarget, PortalBeam[j], false); + beamer->CastSpell(target, PortalBeam[j], false); beamer->DisappearAndDie(); BeamerGUID[j] = 0; } // create new one and start beaming on the target if (Creature* beamer = portal->SummonCreature(PortalID[j], portal->GetPositionX(), portal->GetPositionY(), portal->GetPositionZ(), portal->GetOrientation(), TEMPSUMMON_TIMED_DESPAWN, 60000)) { - beamer->CastSpell(pTarget, PortalBeam[j], false); + beamer->CastSpell(target, PortalBeam[j], false); BeamerGUID[j] = beamer->GetGUID(); } } // aggro target if Red Beam - if (j == RED_PORTAL && me->getVictim() != pTarget && pTarget->GetTypeId() == TYPEID_PLAYER) - me->getThreatManager().addThreat(pTarget, 100000.0f+DoGetThreat(me->getVictim())); + if (j == RED_PORTAL && me->getVictim() != target && target->GetTypeId() == TYPEID_PLAYER) + me->getThreatManager().addThreat(target, 100000.0f+DoGetThreat(me->getVictim())); } } @@ -314,8 +314,8 @@ public: // Netherbreath if (NetherbreathTimer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 40, true)) - DoCast(pTarget, SPELL_NETHERBREATH); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 40, true)) + DoCast(target, SPELL_NETHERBREATH); NetherbreathTimer = urand(5000, 7000); } else NetherbreathTimer -= diff; diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp index 5cd9f80217c..e691bbbb95f 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp @@ -321,23 +321,23 @@ public: if (CharredEarthTimer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget, SPELL_CHARRED_EARTH); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(target, SPELL_CHARRED_EARTH); CharredEarthTimer = 20000; } else CharredEarthTimer -= diff; if (TailSweepTimer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - if (!me->HasInArc(M_PI, pTarget)) - DoCast(pTarget, SPELL_TAIL_SWEEP); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (!me->HasInArc(M_PI, target)) + DoCast(target, SPELL_TAIL_SWEEP); TailSweepTimer = 15000; } else TailSweepTimer -= diff; if (SearingCindersTimer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget, SPELL_SEARING_CINDERS); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(target, SPELL_SEARING_CINDERS); SearingCindersTimer = 10000; } else SearingCindersTimer -= diff; @@ -378,8 +378,8 @@ public: if (DistractingAshTimer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget, SPELL_DISTRACTING_ASH); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(target, SPELL_DISTRACTING_ASH); DistractingAshTimer = 2000; //timer wrong } else DistractingAshTimer -= diff; } @@ -395,8 +395,8 @@ public: if (FireballBarrageTimer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_FARTHEST, 0)) - DoCast(pTarget, SPELL_FIREBALL_BARRAGE); + if (Unit* target = SelectTarget(SELECT_TARGET_FARTHEST, 0)) + DoCast(target, SPELL_FIREBALL_BARRAGE); FireballBarrageTimer = 20000; } else FireballBarrageTimer -= diff; diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp index 24352f93027..f9f26bcd2c4 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp @@ -319,9 +319,9 @@ public: std::list<HostileReference *>::const_iterator itr = t_list.begin(); std::advance(itr, 1); for (; itr != t_list.end(); ++itr) //store the threat list in a different container - if (Unit* pTarget = Unit::GetUnit(*me, (*itr)->getUnitGuid())) - if (pTarget->isAlive() && pTarget->GetTypeId() == TYPEID_PLAYER) - targets.push_back(pTarget); + if (Unit* target = Unit::GetUnit(*me, (*itr)->getUnitGuid())) + if (target->isAlive() && target->GetTypeId() == TYPEID_PLAYER) + targets.push_back(target); //cut down to size if we have more than 5 targets while (targets.size() > 5) @@ -329,13 +329,13 @@ public: uint32 i = 0; for (std::vector<Unit* >::const_iterator iter = targets.begin(); iter != targets.end(); ++iter, ++i) - if (Unit* pTarget = *iter) + if (Unit* target = *iter) { - enfeeble_targets[i] = pTarget->GetGUID(); - enfeeble_health[i] = pTarget->GetHealth(); + enfeeble_targets[i] = target->GetGUID(); + enfeeble_health[i] = target->GetHealth(); - pTarget->CastSpell(pTarget, SPELL_ENFEEBLE, true, 0, 0, me->GetGUID()); - pTarget->SetHealth(1); + target->CastSpell(target, SPELL_ENFEEBLE, true, 0, 0, me->GetGUID()); + target->SetHealth(1); } } @@ -343,9 +343,9 @@ public: { for (uint8 i = 0; i < 5; ++i) { - Unit* pTarget = Unit::GetUnit(*me, enfeeble_targets[i]); - if (pTarget && pTarget->isAlive()) - pTarget->SetHealth(enfeeble_health[i]); + Unit* target = Unit::GetUnit(*me, enfeeble_targets[i]); + if (target && target->isAlive()) + target->SetHealth(enfeeble_health[i]); enfeeble_targets[i] = 0; enfeeble_health[i] = 0; } @@ -449,7 +449,7 @@ public: DoScriptText(SAY_AXE_TOSS2, me); - Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); + Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); for (uint8 i = 0; i < 2; ++i) { Creature* axe = me->SummonCreature(MALCHEZARS_AXE, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 1000); @@ -458,12 +458,12 @@ public: axe->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); axe->setFaction(me->getFaction()); axes[i] = axe->GetGUID(); - if (pTarget) + if (target) { - axe->AI()->AttackStart(pTarget); - //axe->getThreatManager().tauntApply(pTarget); //Taunt Apply and fade out does not work properly + axe->AI()->AttackStart(target); + //axe->getThreatManager().tauntApply(target); //Taunt Apply and fade out does not work properly // So we'll use a hack to add a lot of threat to our target - axe->AddThreat(pTarget, 10000000.0f); + axe->AddThreat(target, 10000000.0f); } } } @@ -494,7 +494,7 @@ public: { AxesTargetSwitchTimer = urand(7500, 20000); - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) { for (uint8 i = 0; i < 2; ++i) { @@ -502,10 +502,10 @@ public: { if (axe->getVictim()) DoModifyThreatPercent(axe->getVictim(), -100); - if (pTarget) - axe->AddThreat(pTarget, 1000000.0f); + if (target) + axe->AddThreat(target, 1000000.0f); //axe->getThreatManager().tauntFadeOut(axe->getVictim()); - //axe->getThreatManager().tauntApply(pTarget); + //axe->getThreatManager().tauntApply(target); } } } @@ -513,8 +513,8 @@ public: if (AmplifyDamageTimer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget, SPELL_AMPLIFY_DAMAGE); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(target, SPELL_AMPLIFY_DAMAGE); AmplifyDamageTimer = urand(20000, 30000); } else AmplifyDamageTimer -= diff; } @@ -536,14 +536,14 @@ public: { if (SWPainTimer <= diff) { - Unit* pTarget = NULL; + Unit* target = NULL; if (phase == 1) - pTarget = me->getVictim(); // the tank + target = me->getVictim(); // the tank else // anyone but the tank - pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true); + target = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true); - if (pTarget) - DoCast(pTarget, SPELL_SW_PAIN); + if (target) + DoCast(target, SPELL_SW_PAIN); SWPainTimer = 20000; } else SWPainTimer -= diff; diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp index 1a5382356ff..a0daa2b5cf7 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp @@ -195,10 +195,10 @@ public: //store the threat list in a different container for (std::list<HostileReference *>::const_iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) { - Unit* pTarget = Unit::GetUnit(*me, (*itr)->getUnitGuid()); + Unit* target = Unit::GetUnit(*me, (*itr)->getUnitGuid()); //only on alive players - if (pTarget && pTarget->isAlive() && pTarget->GetTypeId() == TYPEID_PLAYER) - targets.push_back(pTarget); + if (target && target->isAlive() && target->GetTypeId() == TYPEID_PLAYER) + targets.push_back(target); } //cut down to size if we have more than 3 targets @@ -309,8 +309,8 @@ public: { if (!me->IsNonMeleeSpellCasted(false)) { - Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); - if (!pTarget) + Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); + if (!target) return; uint32 Spells[3]; @@ -337,7 +337,7 @@ public: if (AvailableSpells) { CurrentNormalSpell = Spells[rand() % AvailableSpells]; - DoCast(pTarget, CurrentNormalSpell); + DoCast(target, CurrentNormalSpell); } } NormalCastTimer = 1000; @@ -351,8 +351,8 @@ public: DoCast(me, SPELL_AOE_CS); break; case 1: - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget, SPELL_CHAINSOFICE); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(target, SPELL_CHAINSOFICE); break; } SecondarySpellTimer = urand(5000, 20000); diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp index 477dcf0f7bf..97548d4d7a3 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp @@ -370,15 +370,15 @@ public: if (SacrificeTimer <= diff) { - Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true); - if (pTarget && pTarget->isAlive()) + Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true); + if (target && target->isAlive()) { - DoCast(pTarget, SPELL_SACRIFICE, true); - DoCast(pTarget, SPELL_SUMMON_DEMONCHAINS, true); + DoCast(target, SPELL_SACRIFICE, true); + DoCast(target, SPELL_SUMMON_DEMONCHAINS, true); if (Creature* Chains = me->FindNearestCreature(CREATURE_DEMONCHAINS, 5000)) { - CAST_AI(mob_demon_chain::mob_demon_chainAI, Chains->AI())->SacrificeGUID = pTarget->GetGUID(); + CAST_AI(mob_demon_chain::mob_demon_chainAI, Chains->AI())->SacrificeGUID = target->GetGUID(); Chains->CastSpell(Chains, SPELL_DEMON_CHAINS, true); DoScriptText(RAND(SAY_SACRIFICE1, SAY_SACRIFICE2), me); SacrificeTimer = 30000; diff --git a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp index 5eb84ad8383..831c1ca1f8e 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp @@ -388,8 +388,8 @@ public: if (BrainWipeTimer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget, SPELL_BRAIN_WIPE); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(target, SPELL_BRAIN_WIPE); BrainWipeTimer = 20000; } else BrainWipeTimer -= diff; @@ -869,15 +869,15 @@ public: { if (!IsChasing) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) { DoScriptText(SAY_WOLF_HOOD, me); - DoCast(pTarget, SPELL_LITTLE_RED_RIDING_HOOD, true); - TempThreat = DoGetThreat(pTarget); + DoCast(target, SPELL_LITTLE_RED_RIDING_HOOD, true); + TempThreat = DoGetThreat(target); if (TempThreat) - DoModifyThreatPercent(pTarget, -100); - HoodGUID = pTarget->GetGUID(); - me->AddThreat(pTarget, 1000000.0f); + DoModifyThreatPercent(target, -100); + HoodGUID = target->GetGUID(); + me->AddThreat(target, 1000000.0f); ChaseTimer = 20000; IsChasing = true; } @@ -886,12 +886,12 @@ public: { IsChasing = false; - if (Unit* pTarget = Unit::GetUnit((*me), HoodGUID)) + if (Unit* target = Unit::GetUnit((*me), HoodGUID)) { HoodGUID = 0; - if (DoGetThreat(pTarget)) - DoModifyThreatPercent(pTarget, -100); - me->AddThreat(pTarget, TempThreat); + if (DoGetThreat(target)) + DoModifyThreatPercent(target, -100); + me->AddThreat(target, TempThreat); TempThreat = 0; } @@ -977,19 +977,19 @@ void PretendToDie(Creature* creature) creature->SetStandState(UNIT_STAND_STATE_DEAD); }; -void Resurrect(Creature* pTarget) +void Resurrect(Creature* target) { - pTarget->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - pTarget->SetFullHealth(); - pTarget->SetStandState(UNIT_STAND_STATE_STAND); - pTarget->CastSpell(pTarget, SPELL_RES_VISUAL, true); - if (pTarget->getVictim()) + target->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); + target->SetFullHealth(); + target->SetStandState(UNIT_STAND_STATE_STAND); + target->CastSpell(target, SPELL_RES_VISUAL, true); + if (target->getVictim()) { - pTarget->GetMotionMaster()->MoveChase(pTarget->getVictim()); - pTarget->AI()->AttackStart(pTarget->getVictim()); + target->GetMotionMaster()->MoveChase(target->getVictim()); + target->AI()->AttackStart(target->getVictim()); } else - pTarget->GetMotionMaster()->Initialize(); + target->GetMotionMaster()->Initialize(); }; class boss_julianne : public CreatureScript @@ -1289,10 +1289,10 @@ public: if (BackwardLungeTimer <= diff) { - Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true); - if (pTarget && !me->HasInArc(M_PI, pTarget)) + Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true); + if (target && !me->HasInArc(M_PI, target)) { - DoCast(pTarget, SPELL_BACKWARD_LUNGE); + DoCast(target, SPELL_BACKWARD_LUNGE); BackwardLungeTimer = urand(15000, 30000); } } else BackwardLungeTimer -= diff; @@ -1305,8 +1305,8 @@ public: if (DeadlySwatheTimer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget, SPELL_DEADLY_SWATHE); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(target, SPELL_DEADLY_SWATHE); DeadlySwatheTimer = urand(15000, 25000); } else DeadlySwatheTimer -= diff; @@ -1410,8 +1410,8 @@ void boss_julianne::boss_julianneAI::UpdateAI(const uint32 diff) if (BlindingPassionTimer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget, SPELL_BLINDING_PASSION); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(target, SPELL_BLINDING_PASSION); BlindingPassionTimer = urand(30000, 45000); } else BlindingPassionTimer -= diff; diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp index 8b9bc02e364..a77fc425782 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp @@ -302,7 +302,7 @@ public: if (PhoenixTimer <= diff) { - Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1); + Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1); uint8 random = urand(1, 2); float x = KaelLocations[random][0]; @@ -313,7 +313,7 @@ public: { Phoenix->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE + UNIT_FLAG_NON_ATTACKABLE); SetThreatList(Phoenix); - Phoenix->AI()->AttackStart(pTarget); + Phoenix->AI()->AttackStart(target); } DoScriptText(SAY_PHOENIX, me); @@ -323,11 +323,11 @@ public: if (FlameStrikeTimer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) { me->InterruptSpell(CURRENT_CHANNELED_SPELL); me->InterruptSpell(CURRENT_GENERIC_SPELL); - DoCast(pTarget, SPELL_FLAMESTRIKE3, true); + DoCast(target, SPELL_FLAMESTRIKE3, true); DoScriptText(SAY_FLAMESTRIKE, me); } FlameStrikeTimer = urand(15000, 25000); @@ -395,15 +395,15 @@ public: for (uint8 i = 0; i < 3; ++i) { - Unit* pTarget = NULL; - pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); + Unit* target = NULL; + target = SelectTarget(SELECT_TARGET_RANDOM, 0); Creature* Orb = DoSpawnCreature(CREATURE_ARCANE_SPHERE, 5, 5, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 30000); - if (Orb && pTarget) + if (Orb && target) { Orb->SetSpeed(MOVE_RUN, 0.5f); - Orb->AddThreat(pTarget, 1000000.0f); - Orb->AI()->AttackStart(pTarget); + Orb->AddThreat(target, 1000000.0f); + Orb->AI()->AttackStart(target); } } @@ -671,11 +671,11 @@ public: if (ChangeTargetTimer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) { - me->AddThreat(pTarget, 1.0f); - me->TauntApply(pTarget); - AttackStart(pTarget); + me->AddThreat(target, 1.0f); + me->TauntApply(target); + AttackStart(target); } ChangeTargetTimer = urand(5000, 15000); diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp index bcd355873bf..794e23f9510 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp @@ -256,72 +256,72 @@ public: if (HealTimer <= diff) { uint32 health = me->GetHealth(); - Unit* pTarget = me; + Unit* target = me; for (uint8 i = 0; i < MAX_ACTIVE_LACKEY; ++i) { if (Unit* pAdd = Unit::GetUnit(*me, m_auiLackeyGUID[i])) { if (pAdd->isAlive() && pAdd->GetHealth() < health) - pTarget = pAdd; + target = pAdd; } } - DoCast(pTarget, SPELL_FLASH_HEAL); + DoCast(target, SPELL_FLASH_HEAL); HealTimer = 15000; } else HealTimer -= diff; if (RenewTimer <= diff) { - Unit* pTarget = me; + Unit* target = me; if (urand(0, 1)) if (Unit* pAdd = Unit::GetUnit(*me, m_auiLackeyGUID[rand()%MAX_ACTIVE_LACKEY])) if (pAdd->isAlive()) - pTarget = pAdd; + target = pAdd; - DoCast(pTarget, SPELL_RENEW_NORMAL); + DoCast(target, SPELL_RENEW_NORMAL); RenewTimer = 5000; } else RenewTimer -= diff; if (ShieldTimer <= diff) { - Unit* pTarget = me; + Unit* target = me; if (urand(0, 1)) if (Unit* pAdd = Unit::GetUnit(*me, m_auiLackeyGUID[rand()%MAX_ACTIVE_LACKEY])) if (pAdd->isAlive() && !pAdd->HasAura(SPELL_SHIELD)) - pTarget = pAdd; + target = pAdd; - DoCast(pTarget, SPELL_SHIELD); + DoCast(target, SPELL_SHIELD); ShieldTimer = 7500; } else ShieldTimer -= diff; if (DispelTimer <= diff) { - Unit* pTarget = NULL; + Unit* target = NULL; if (urand(0, 1)) - pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); + target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); else { if (urand(0, 1)) - pTarget = me; + target = me; else if (Unit* pAdd = Unit::GetUnit(*me, m_auiLackeyGUID[rand()%MAX_ACTIVE_LACKEY])) if (pAdd->isAlive()) - pTarget = pAdd; + target = pAdd; } - if (pTarget) - DoCast(pTarget, SPELL_DISPEL_MAGIC); + if (target) + DoCast(target, SPELL_DISPEL_MAGIC); DispelTimer = 12000; } else DispelTimer -= diff; if (SWPainTimer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget, SPELL_SW_PAIN_NORMAL); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(target, SPELL_SW_PAIN_NORMAL); SWPainTimer = 10000; } else SWPainTimer -= diff; @@ -791,9 +791,9 @@ public: if (Polymorph_Timer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) { - DoCast(pTarget, SPELL_POLYMORPH); + DoCast(target, SPELL_POLYMORPH); Polymorph_Timer = 20000; } } else Polymorph_Timer -= diff; @@ -836,10 +836,10 @@ public: std::list<HostileReference*>& t_list = me->getThreatManager().getThreatList(); for (std::list<HostileReference*>::const_iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) { - if (Unit* pTarget = Unit::GetUnit(*me, (*itr)->getUnitGuid())) + if (Unit* target = Unit::GetUnit(*me, (*itr)->getUnitGuid())) { //if in melee range - if (pTarget->IsWithinDistInMap(me, 5)) + if (target->IsWithinDistInMap(me, 5)) { InMeleeRange = true; break; @@ -923,10 +923,10 @@ public: std::list<HostileReference*>& t_list = me->getThreatManager().getThreatList(); for (std::list<HostileReference*>::const_iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) { - if (Unit* pTarget = Unit::GetUnit(*me, (*itr)->getUnitGuid())) + if (Unit* target = Unit::GetUnit(*me, (*itr)->getUnitGuid())) { //if in melee range - if (pTarget->IsWithinDistInMap(me, ATTACK_DISTANCE)) + if (target->IsWithinDistInMap(me, ATTACK_DISTANCE)) { InMeleeRange = true; break; diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp index b742e9702b5..94575fb8aae 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp @@ -163,17 +163,17 @@ public: if (ChainLightningTimer <= diff) { - 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); ChainLightningTimer = 8000; } else ChainLightningTimer -= diff; if (ArcaneShockTimer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - if (pTarget) - DoCast(pTarget, SPELL_ARCANE_SHOCK); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (target) + DoCast(target, SPELL_ARCANE_SHOCK); ArcaneShockTimer = 8000; } else ArcaneShockTimer -= diff; diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_golemagg.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_golemagg.cpp index ef502543f10..47f192bc55c 100644 --- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_golemagg.cpp +++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_golemagg.cpp @@ -99,8 +99,8 @@ class boss_golemagg : public CreatureScript switch (eventId) { case EVENT_PYROBLAST: - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_PYROBLAST); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(target, SPELL_PYROBLAST); events.ScheduleEvent(EVENT_PYROBLAST, 7000); break; case EVENT_EARTHQUAKE: diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_ragnaros.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_ragnaros.cpp index 3e28382efdf..80b35eb77ae 100644 --- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_ragnaros.cpp +++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_ragnaros.cpp @@ -259,9 +259,9 @@ class boss_ragnaros : public CreatureScript // summon 8 elementals for (uint8 i = 0; i < 8; ++i) - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - if (Creature* pSummoned = me->SummonCreature(12143, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0.0f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 900000)) - pSummoned->AI()->AttackStart(pTarget); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Creature* pSummoned = me->SummonCreature(12143, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0.0f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 900000)) + pSummoned->AI()->AttackStart(target); _hasSubmergedOnce = true; _isBanished = true; @@ -274,9 +274,9 @@ class boss_ragnaros : public CreatureScript DoScriptText(SAY_REINFORCEMENTS2, me); for (uint8 i = 0; i < 8; ++i) - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - if (Creature* pSummoned = me->SummonCreature(12143, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0.0f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 900000)) - pSummoned->AI()->AttackStart(pTarget); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Creature* pSummoned = me->SummonCreature(12143, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0.0f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 900000)) + pSummoned->AI()->AttackStart(target); _isBanished = true; //DoCast(me, SPELL_RAGSUBMERGE); diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp index cda67d6ed4c..bfef149dbe6 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp @@ -155,7 +155,7 @@ public: } } - void EventStart(Creature* anchor, Player* pTarget) + void EventStart(Creature* anchor, Player* target) { wait_timer = 5000; phase = PHASE_TO_EQUIP; @@ -167,8 +167,8 @@ public: float z; anchor->GetContactPoint(me, anchorX, anchorY, z, 1.0f); - playerGUID = pTarget->GetGUID(); - DoScriptText(say_event_start[rand()%8], me, pTarget); + playerGUID = target->GetGUID(); + DoScriptText(say_event_start[rand()%8], me, target); } void UpdateAI(const uint32 diff) @@ -233,8 +233,8 @@ public: me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); phase = PHASE_ATTACKING; - if (Player* pTarget = Unit::GetPlayer(*me, playerGUID)) - me->AI()->AttackStart(pTarget); + if (Player* target = Unit::GetPlayer(*me, playerGUID)) + me->AI()->AttackStart(target); wait_timer = 0; } } @@ -561,8 +561,8 @@ public: Phase = 1; break; case 1: - if (Unit* pTarget = Unit::GetUnit(*me, TargetGUID)) - DoCast(pTarget, DESPAWN_HORSE, true); + if (Unit* target = Unit::GetUnit(*me, TargetGUID)) + DoCast(target, DESPAWN_HORSE, true); PhaseTimer = 3000; Phase = 2; break; diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp index 408aa8f5c8f..a5fe8a5c6db 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp @@ -101,8 +101,8 @@ public: if (Polymorph_Timer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1)) - DoCast(pTarget, SPELL_POLYMORPH); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1)) + DoCast(target, SPELL_POLYMORPH); Polymorph_Timer = 20000; } else Polymorph_Timer -= diff; diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp index c9ce9b65b39..3183f87c5a5 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp @@ -249,9 +249,9 @@ public: } void EnterCombat(Unit* /*who*/) {} - void SaySound(int32 textEntry, Unit* pTarget = 0) + void SaySound(int32 textEntry, Unit* target = 0) { - DoScriptText(textEntry, me, pTarget); + DoScriptText(textEntry, me, target); //DoCast(me, SPELL_HEAD_SPEAKS, true); Creature* speaker = DoSpawnCreature(HELPER, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN, 1000); if (speaker) @@ -502,9 +502,9 @@ public: } } - void SaySound(int32 textEntry, Unit* pTarget = 0) + void SaySound(int32 textEntry, Unit* target = 0) { - DoScriptText(textEntry, me, pTarget); + DoScriptText(textEntry, me, target); laugh += 4000; } diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp index 665cfa54f1e..5c6b31c2ab7 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp @@ -87,8 +87,8 @@ public: //Fear_Timer if (Fear_Timer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1)) - DoCast(pTarget, SPELL_FEAR); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1)) + DoCast(target, SPELL_FEAR); Fear_Timer = 40000; } else Fear_Timer -= diff; @@ -96,8 +96,8 @@ public: //Sleep_Timer if (Sleep_Timer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_TOPAGGRO, 0)) - DoCast(pTarget, SPELL_SLEEP); + if (Unit* target = SelectTarget(SELECT_TARGET_TOPAGGRO, 0)) + DoCast(target, SPELL_SLEEP); Sleep_Timer = 30000; } else Sleep_Timer -= diff; @@ -112,8 +112,8 @@ public: //Dispel_Timer if (Dispel_Timer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_DISPELMAGIC); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(target, SPELL_DISPELMAGIC); DispelMagic_Timer = 30000; } else DispelMagic_Timer -= diff; diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp index 647ebdda0fe..baa181d2ad7 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp @@ -317,10 +317,10 @@ public: //If we are <75% hp cast healing spells at self or Mograine if (m_uiHeal_Timer <= uiDiff) { - Creature* pTarget = NULL; + Creature* target = NULL; if (!HealthAbovePct(75)) - pTarget = me; + target = me; if (m_pInstance) { @@ -328,12 +328,12 @@ public: { // checking m_bCanResurrectCheck prevents her healing Mograine while he is "faking death" if (m_bCanResurrectCheck && pMograine->isAlive() && !pMograine->HealthAbovePct(75)) - pTarget = pMograine; + target = pMograine; } } - if (pTarget) - DoCast(pTarget, SPELL_HEAL); + if (target) + DoCast(target, SPELL_HEAL); m_uiHeal_Timer = 13000; } else m_uiHeal_Timer -= uiDiff; diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp index 34988e063ff..52d8b2b926d 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp @@ -124,93 +124,93 @@ public: { if (Teleport_Timer <= diff) { - Unit* pTarget = NULL; - pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); - if (pTarget && pTarget->GetTypeId() == TYPEID_PLAYER) + Unit* target = NULL; + target = SelectTarget(SELECT_TARGET_RANDOM, 0); + if (target && target->GetTypeId() == TYPEID_PLAYER) { - if (DoGetThreat(pTarget)) - DoModifyThreatPercent(pTarget, -100); + if (DoGetThreat(target)) + DoModifyThreatPercent(target, -100); Creature* Summoned = NULL; switch(rand()%6) { case 0: - DoTeleportPlayer(pTarget, 250.0696f, 0.3921f, 84.8408f, 3.149f); + DoTeleportPlayer(target, 250.0696f, 0.3921f, 84.8408f, 3.149f); Summoned = me->SummonCreature(16119, 254.2325f, 0.3417f, 84.8407f, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000); if (Summoned) - Summoned->AI()->AttackStart(pTarget); + Summoned->AI()->AttackStart(target); Summoned = me->SummonCreature(16119, 257.7133f, 4.0226f, 84.8407f, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000); if (Summoned) - Summoned->AI()->AttackStart(pTarget); + Summoned->AI()->AttackStart(target); Summoned = me->SummonCreature(16119, 258.6702f, -2.60656f, 84.8407f, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000); if (Summoned) - Summoned->AI()->AttackStart(pTarget); + Summoned->AI()->AttackStart(target); break; case 1: - DoTeleportPlayer(pTarget, 181.4220f, -91.9481f, 84.8410f, 1.608f); + DoTeleportPlayer(target, 181.4220f, -91.9481f, 84.8410f, 1.608f); Summoned = me->SummonCreature(16119, 184.0519f, -73.5649f, 84.8407f, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000); if (Summoned) - Summoned->AI()->AttackStart(pTarget); + Summoned->AI()->AttackStart(target); Summoned = me->SummonCreature(16119, 179.5951f, -73.7045f, 84.8407f, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000); if (Summoned) - Summoned->AI()->AttackStart(pTarget); + Summoned->AI()->AttackStart(target); Summoned = me->SummonCreature(16119, 180.6452f, -78.2143f, 84.8407f, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000); if (Summoned) - Summoned->AI()->AttackStart(pTarget); + Summoned->AI()->AttackStart(target); Summoned = me->SummonCreature(16119, 283.2274f, -78.1518f, 84.8407f, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000); if (Summoned) - Summoned->AI()->AttackStart(pTarget); + Summoned->AI()->AttackStart(target); break; case 2: - DoTeleportPlayer(pTarget, 95.1547f, -1.8173f, 85.2289f, 0.043f); + DoTeleportPlayer(target, 95.1547f, -1.8173f, 85.2289f, 0.043f); Summoned = me->SummonCreature(16119, 100.9404f, -1.8016f, 85.2289f, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000); if (Summoned) - Summoned->AI()->AttackStart(pTarget); + Summoned->AI()->AttackStart(target); Summoned = me->SummonCreature(16119, 101.3729f, 0.4882f, 85.2289f, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000); if (Summoned) - Summoned->AI()->AttackStart(pTarget); + Summoned->AI()->AttackStart(target); Summoned = me->SummonCreature(16119, 101.4596f, -4.4740f, 85.2289f, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000); if (Summoned) - Summoned->AI()->AttackStart(pTarget); + Summoned->AI()->AttackStart(target); break; case 3: - DoTeleportPlayer(pTarget, 250.0696f, 0.3921f, 72.6722f, 3.149f); + DoTeleportPlayer(target, 250.0696f, 0.3921f, 72.6722f, 3.149f); Summoned = me->SummonCreature(16119, 240.34481f, 0.7368f, 72.6722f, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000); if (Summoned) - Summoned->AI()->AttackStart(pTarget); + Summoned->AI()->AttackStart(target); Summoned = me->SummonCreature(16119, 240.3633f, -2.9520f, 72.6722f, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000); if (Summoned) - Summoned->AI()->AttackStart(pTarget); + Summoned->AI()->AttackStart(target); Summoned = me->SummonCreature(16119, 240.6702f, 3.34949f, 72.6722f, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000); if (Summoned) - Summoned->AI()->AttackStart(pTarget); + Summoned->AI()->AttackStart(target); break; case 4: - DoTeleportPlayer(pTarget, 181.4220f, -91.9481f, 70.7734f, 1.608f); + DoTeleportPlayer(target, 181.4220f, -91.9481f, 70.7734f, 1.608f); Summoned = me->SummonCreature(16119, 184.0519f, -73.5649f, 70.7734f, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000); if (Summoned) - Summoned->AI()->AttackStart(pTarget); + Summoned->AI()->AttackStart(target); Summoned = me->SummonCreature(16119, 179.5951f, -73.7045f, 70.7734f, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000); if (Summoned) - Summoned->AI()->AttackStart(pTarget); + Summoned->AI()->AttackStart(target); Summoned = me->SummonCreature(16119, 180.6452f, -78.2143f, 70.7734f, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000); if (Summoned) - Summoned->AI()->AttackStart(pTarget); + Summoned->AI()->AttackStart(target); Summoned = me->SummonCreature(16119, 283.2274f, -78.1518f, 70.7734f, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000); if (Summoned) - Summoned->AI()->AttackStart(pTarget); + Summoned->AI()->AttackStart(target); break; case 5: - DoTeleportPlayer(pTarget, 106.1541f, -1.8994f, 75.3663f, 0.043f); + DoTeleportPlayer(target, 106.1541f, -1.8994f, 75.3663f, 0.043f); Summoned = me->SummonCreature(16119, 115.3945f, -1.5555f, 75.3663f, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000); if (Summoned) - Summoned->AI()->AttackStart(pTarget); + Summoned->AI()->AttackStart(target); Summoned = me->SummonCreature(16119, 257.7133f, 1.8066f, 75.3663f, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000); if (Summoned) - Summoned->AI()->AttackStart(pTarget); + Summoned->AI()->AttackStart(target); Summoned = me->SummonCreature(16119, 258.6702f, -5.1001f, 75.3663f, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000); if (Summoned) - Summoned->AI()->AttackStart(pTarget); + Summoned->AI()->AttackStart(target); break; } } diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp index dcd8e4940a1..1de9a507d2f 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp @@ -89,9 +89,9 @@ public: //ShadowShock_Timer if (ShadowShock_Timer <= diff) { - Unit* pTarget = NULL; - pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); - if (pTarget) DoCast(pTarget, SPELL_SHADOWSHOCK); + Unit* target = NULL; + target = SelectTarget(SELECT_TARGET_RANDOM, 0); + if (target) DoCast(target, SPELL_SHADOWSHOCK); ShadowShock_Timer = 12000; } else ShadowShock_Timer -= diff; diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp index 9ca1a12bb02..fbea2f35219 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp @@ -96,9 +96,9 @@ public: //Corruption_Timer if (Corruption_Timer <= diff) { - Unit* pTarget = NULL; - pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); - if (pTarget) DoCast(pTarget, SPELL_CORRUPTION); + Unit* target = NULL; + target = SelectTarget(SELECT_TARGET_RANDOM, 0); + if (target) DoCast(target, SPELL_CORRUPTION); Corruption_Timer = 24000; } else Corruption_Timer -= diff; diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp index f485b81072f..9dd9f1fedb5 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp @@ -111,12 +111,12 @@ public: DoModifyThreatPercent(me->getVictim(), -99); //Summon 10 Illusions attacking random gamers - Unit* pTarget = NULL; + Unit* target = NULL; for (uint8 i = 0; i < 10; ++i) { - pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); - if (pTarget) - SummonIllusions(pTarget); + target = SelectTarget(SELECT_TARGET_RANDOM, 0); + if (target) + SummonIllusions(target); } Invisible = true; Invisible_Timer = 3000; diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp index ae2550886b9..794758b6bd7 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp @@ -78,9 +78,9 @@ public: //Immolate_Timer if (Immolate_Timer <= diff) { - Unit* pTarget = NULL; - pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); - if (pTarget) DoCast(pTarget, SPELL_IMMOLATE); + Unit* target = NULL; + target = SelectTarget(SELECT_TARGET_RANDOM, 0); + if (target) DoCast(target, SPELL_IMMOLATE); Immolate_Timer = 12000; } else Immolate_Timer -= diff; diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp index 026bbbae5b1..efff8042824 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp @@ -82,8 +82,8 @@ public: //Frostbolt_Timer if (Frostbolt_Timer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget, SPELL_FROSTBOLT); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(target, SPELL_FROSTBOLT); Frostbolt_Timer = 8000; } else Frostbolt_Timer -= diff; diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp index b3885f796fe..65f6e6fbf69 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp @@ -122,8 +122,8 @@ public: void JustSummoned(Creature* summoned) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - summoned->AI()->AttackStart(pTarget); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + summoned->AI()->AttackStart(target); } void JustDied(Unit* /*Killer*/) diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp index 58e8a0813ed..bdd12326a8f 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp @@ -111,9 +111,9 @@ public: //Cast if (rand()%100 < 65) { - Unit* pTarget = NULL; - pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); - if (pTarget)DoCast(pTarget, SPELL_POSSESS); + Unit* target = NULL; + target = SelectUnit(SELECT_TARGET_RANDOM, 0); + if (target)DoCast(target, SPELL_POSSESS); } //50 seconds until we should cast this again Possess_Timer = 50000; diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp index c1033a2fdb9..17ea8a04293 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp @@ -186,8 +186,8 @@ public: //PsychicScream if (m_uiPsychicScream_Timer <= uiDiff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_PSYCHICSCREAM); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(target, SPELL_PSYCHICSCREAM); m_uiPsychicScream_Timer = 20000; } else m_uiPsychicScream_Timer -= uiDiff; @@ -195,8 +195,8 @@ public: //DeepSleep if (m_uiDeepSleep_Timer <= uiDiff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_SLEEP); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(target, SPELL_SLEEP); m_uiDeepSleep_Timer = 15000; } else m_uiDeepSleep_Timer -= uiDiff; diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp index 9ad5faff5b6..29ab9df2c44 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp @@ -322,9 +322,9 @@ public: if (BurnTimer <= diff) { - std::list<Unit*> pTargets; - SelectTargetList(pTargets, 10, SELECT_TARGET_RANDOM, 100, true); - for (std::list<Unit*>::const_iterator i = pTargets.begin(); i != pTargets.end(); ++i) + std::list<Unit*> targets; + SelectTargetList(targets, 10, SELECT_TARGET_RANDOM, 100, true); + for (std::list<Unit*>::const_iterator i = targets.begin(); i != targets.end(); ++i) if (!(*i)->HasAura(SPELL_BURN)) { (*i)->CastSpell((*i), SPELL_BURN, true); diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp index 64bcf1b3ec4..4e1b170b3a3 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp @@ -181,7 +181,7 @@ public: me->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE); } - void SpellHitTarget(Unit* pTarget, const SpellEntry* spell) + void SpellHitTarget(Unit* target, const SpellEntry* spell) { switch(spell->Id) { @@ -189,36 +189,36 @@ public: case SPELL_SHADOW_NOVA: case SPELL_CONFOUNDING_BLOW: case SPELL_SHADOW_FURY: - HandleTouchedSpells(pTarget, SPELL_DARK_TOUCHED); + HandleTouchedSpells(target, SPELL_DARK_TOUCHED); break; case SPELL_CONFLAGRATION: - HandleTouchedSpells(pTarget, SPELL_FLAME_TOUCHED); + HandleTouchedSpells(target, SPELL_FLAME_TOUCHED); break; } } - void HandleTouchedSpells(Unit* pTarget, uint32 TouchedType) + void HandleTouchedSpells(Unit* target, uint32 TouchedType) { switch(TouchedType) { case SPELL_FLAME_TOUCHED: - if (!pTarget->HasAura(SPELL_DARK_FLAME)) + if (!target->HasAura(SPELL_DARK_FLAME)) { - if (pTarget->HasAura(SPELL_DARK_TOUCHED)) + if (target->HasAura(SPELL_DARK_TOUCHED)) { - pTarget->RemoveAurasDueToSpell(SPELL_DARK_TOUCHED); - pTarget->CastSpell(pTarget, SPELL_DARK_FLAME, true); - } else pTarget->CastSpell(pTarget, SPELL_FLAME_TOUCHED, true); + target->RemoveAurasDueToSpell(SPELL_DARK_TOUCHED); + target->CastSpell(target, SPELL_DARK_FLAME, true); + } else target->CastSpell(target, SPELL_FLAME_TOUCHED, true); } break; case SPELL_DARK_TOUCHED: - if (!pTarget->HasAura(SPELL_DARK_FLAME)) + if (!target->HasAura(SPELL_DARK_FLAME)) { - if (pTarget->HasAura(SPELL_FLAME_TOUCHED)) + if (target->HasAura(SPELL_FLAME_TOUCHED)) { - pTarget->RemoveAurasDueToSpell(SPELL_FLAME_TOUCHED); - pTarget->CastSpell(pTarget, SPELL_DARK_FLAME, true); - } else pTarget->CastSpell(pTarget, SPELL_DARK_TOUCHED, true); + target->RemoveAurasDueToSpell(SPELL_FLAME_TOUCHED); + target->CastSpell(target, SPELL_DARK_FLAME, true); + } else target->CastSpell(target, SPELL_DARK_TOUCHED, true); } break; } @@ -252,10 +252,10 @@ public: if (!me->IsNonMeleeSpellCasted(false)) { me->InterruptSpell(CURRENT_GENERIC_SPELL); - Unit* pTarget = NULL; - pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); - if (pTarget) - DoCast(pTarget, SPELL_CONFLAGRATION); + Unit* target = NULL; + target = SelectTarget(SELECT_TARGET_RANDOM, 0); + if (target) + DoCast(target, SPELL_CONFLAGRATION); ConflagrationTimer = 30000+(rand()%5000); } } else ConflagrationTimer -= diff; @@ -266,15 +266,15 @@ public: { if (!me->IsNonMeleeSpellCasted(false)) { - Unit* pTarget = NULL; - pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); - if (pTarget) - DoCast(pTarget, SPELL_SHADOW_NOVA); + Unit* target = NULL; + target = SelectTarget(SELECT_TARGET_RANDOM, 0); + if (target) + DoCast(target, SPELL_SHADOW_NOVA); if (!SisterDeath) { - if (pTarget) - DoScriptText(EMOTE_SHADOW_NOVA, me, pTarget); + if (target) + DoScriptText(EMOTE_SHADOW_NOVA, me, target); DoScriptText(YELL_SHADOW_NOVA, me); } ShadownovaTimer = 30000+(rand()%5000); @@ -286,26 +286,26 @@ public: { if (!me->IsNonMeleeSpellCasted(false)) { - Unit* pTarget = NULL; - pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); - if (pTarget) - DoCast(pTarget, SPELL_CONFOUNDING_BLOW); + Unit* target = NULL; + target = SelectTarget(SELECT_TARGET_RANDOM, 0); + if (target) + DoCast(target, SPELL_CONFOUNDING_BLOW); ConfoundingblowTimer = 20000 + (rand()%5000); } } else ConfoundingblowTimer -=diff; if (ShadowimageTimer <= diff) { - Unit* pTarget = NULL; + Unit* target = NULL; Creature* temp = NULL; for (uint8 i = 0; i<3; ++i) { - pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); + target = SelectTarget(SELECT_TARGET_RANDOM, 0); temp = DoSpawnCreature(MOB_SHADOW_IMAGE, 0, 0, 0, 0, TEMPSUMMON_CORPSE_DESPAWN, 10000); - if (temp && pTarget) + if (temp && target) { - temp->AddThreat(pTarget, 1000000);//don't change target(healers) - temp->AI()->AttackStart(pTarget); + temp->AddThreat(target, 1000000);//don't change target(healers) + temp->AI()->AttackStart(target); } } ShadowimageTimer = 20000; @@ -476,48 +476,48 @@ public: me->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE); } - void SpellHitTarget(Unit* pTarget, const SpellEntry* spell) + void SpellHitTarget(Unit* target, const SpellEntry* spell) { switch(spell->Id) { case SPELL_BLAZE: - pTarget->CastSpell(pTarget, SPELL_BLAZE_SUMMON, true); + target->CastSpell(target, SPELL_BLAZE_SUMMON, true); case SPELL_CONFLAGRATION: case SPELL_FLAME_SEAR: - HandleTouchedSpells(pTarget, SPELL_FLAME_TOUCHED); + HandleTouchedSpells(target, SPELL_FLAME_TOUCHED); break; case SPELL_SHADOW_NOVA: - HandleTouchedSpells(pTarget, SPELL_DARK_TOUCHED); + HandleTouchedSpells(target, SPELL_DARK_TOUCHED); break; } } - void HandleTouchedSpells(Unit* pTarget, uint32 TouchedType) + void HandleTouchedSpells(Unit* target, uint32 TouchedType) { switch(TouchedType) { case SPELL_FLAME_TOUCHED: - if (!pTarget->HasAura(SPELL_DARK_FLAME)) + if (!target->HasAura(SPELL_DARK_FLAME)) { - if (pTarget->HasAura(SPELL_DARK_TOUCHED)) + if (target->HasAura(SPELL_DARK_TOUCHED)) { - pTarget->RemoveAurasDueToSpell(SPELL_DARK_TOUCHED); - pTarget->CastSpell(pTarget, SPELL_DARK_FLAME, true); + target->RemoveAurasDueToSpell(SPELL_DARK_TOUCHED); + target->CastSpell(target, SPELL_DARK_FLAME, true); }else { - pTarget->CastSpell(pTarget, SPELL_FLAME_TOUCHED, true); + target->CastSpell(target, SPELL_FLAME_TOUCHED, true); } } break; case SPELL_DARK_TOUCHED: - if (!pTarget->HasAura(SPELL_DARK_FLAME)) + if (!target->HasAura(SPELL_DARK_FLAME)) { - if (pTarget->HasAura(SPELL_FLAME_TOUCHED)) + if (target->HasAura(SPELL_FLAME_TOUCHED)) { - pTarget->RemoveAurasDueToSpell(SPELL_FLAME_TOUCHED); - pTarget->CastSpell(pTarget, SPELL_DARK_FLAME, true); - } else pTarget->CastSpell(pTarget, SPELL_DARK_TOUCHED, true); + target->RemoveAurasDueToSpell(SPELL_FLAME_TOUCHED); + target->CastSpell(target, SPELL_DARK_FLAME, true); + } else target->CastSpell(target, SPELL_DARK_TOUCHED, true); } break; } @@ -601,10 +601,10 @@ public: { if (!me->IsNonMeleeSpellCasted(false)) { - Unit* pTarget = NULL; - pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); - if (pTarget) - DoCast(pTarget, SPELL_SHADOW_NOVA); + Unit* target = NULL; + target = SelectTarget(SELECT_TARGET_RANDOM, 0); + if (target) + DoCast(target, SPELL_SHADOW_NOVA); ShadownovaTimer= 30000+(rand()%5000); } } else ShadownovaTimer -=diff; @@ -616,16 +616,16 @@ public: if (!me->IsNonMeleeSpellCasted(false)) { me->InterruptSpell(CURRENT_GENERIC_SPELL); - Unit* pTarget = NULL; - pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); - if (pTarget) - DoCast(pTarget, SPELL_CONFLAGRATION); + Unit* target = NULL; + target = SelectTarget(SELECT_TARGET_RANDOM, 0); + if (target) + DoCast(target, SPELL_CONFLAGRATION); ConflagrationTimer = 30000+(rand()%5000); if (!SisterDeath) { - if (pTarget) - DoScriptText(EMOTE_CONFLAGRATION, me, pTarget); + if (target) + DoScriptText(EMOTE_CONFLAGRATION, me, target); DoScriptText(YELL_CANFLAGRATION, me); } @@ -701,20 +701,20 @@ public: void EnterCombat(Unit* /*who*/){} - void SpellHitTarget(Unit* pTarget, const SpellEntry* spell) + void SpellHitTarget(Unit* target, const SpellEntry* spell) { switch(spell->Id) { case SPELL_SHADOW_FURY: case SPELL_DARK_STRIKE: - if (!pTarget->HasAura(SPELL_DARK_FLAME)) + if (!target->HasAura(SPELL_DARK_FLAME)) { - if (pTarget->HasAura(SPELL_FLAME_TOUCHED)) + if (target->HasAura(SPELL_FLAME_TOUCHED)) { - pTarget->RemoveAurasDueToSpell(SPELL_FLAME_TOUCHED); - pTarget->CastSpell(pTarget, SPELL_DARK_FLAME, true); - } else pTarget->CastSpell(pTarget, SPELL_DARK_TOUCHED, true); + target->RemoveAurasDueToSpell(SPELL_FLAME_TOUCHED); + target->CastSpell(target, SPELL_DARK_FLAME, true); + } else target->CastSpell(target, SPELL_DARK_TOUCHED, true); } break; } diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp index efa8a341b81..013de745585 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp @@ -293,20 +293,20 @@ public: break; case 2: { - Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 150, true); - if (!pTarget) - pTarget = Unit::GetUnit(*me, pInstance ? pInstance->GetData64(DATA_PLAYER_GUID) : 0); + Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 150, true); + if (!target) + target = Unit::GetUnit(*me, pInstance ? pInstance->GetData64(DATA_PLAYER_GUID) : 0); - if (!pTarget) + if (!target) { EnterEvadeMode(); return; } - Creature* Vapor = me->SummonCreature(MOB_VAPOR, pTarget->GetPositionX()-5+rand()%10, pTarget->GetPositionY()-5+rand()%10, pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 9000); + Creature* Vapor = me->SummonCreature(MOB_VAPOR, target->GetPositionX()-5+rand()%10, target->GetPositionY()-5+rand()%10, target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 9000); if (Vapor) { - Vapor->AI()->AttackStart(pTarget); + Vapor->AI()->AttackStart(target); me->InterruptNonMeleeSpells(false); DoCast(Vapor, SPELL_VAPOR_CHANNEL, false); // core bug Vapor->CastSpell(Vapor, SPELL_VAPOR_TRIGGER, true); @@ -320,22 +320,22 @@ public: DespawnSummons(MOB_VAPOR_TRAIL); //DoCast(me, SPELL_VAPOR_SELECT); need core support - Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 150, true); - if (!pTarget) - pTarget = Unit::GetUnit(*me, pInstance ? pInstance->GetData64(DATA_PLAYER_GUID) : 0); + Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 150, true); + if (!target) + target = Unit::GetUnit(*me, pInstance ? pInstance->GetData64(DATA_PLAYER_GUID) : 0); - if (!pTarget) + if (!target) { EnterEvadeMode(); return; } - //pTarget->CastSpell(pTarget, SPELL_VAPOR_SUMMON, true); need core support - Creature* pVapor = me->SummonCreature(MOB_VAPOR, pTarget->GetPositionX()-5+rand()%10, pTarget->GetPositionY()-5+rand()%10, pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 9000); + //pTarget->CastSpell(target, SPELL_VAPOR_SUMMON, true); need core support + Creature* pVapor = me->SummonCreature(MOB_VAPOR, target->GetPositionX()-5+rand()%10, target->GetPositionY()-5+rand()%10, target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 9000); if (pVapor) { if (pVapor->AI()) - pVapor->AI()->AttackStart(pTarget); + pVapor->AI()->AttackStart(target); me->InterruptNonMeleeSpells(false); DoCast(pVapor, SPELL_VAPOR_CHANNEL, false); // core bug pVapor->CastSpell(pVapor, SPELL_VAPOR_TRIGGER, true); @@ -350,20 +350,20 @@ public: break; case 5: { - Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 150, true); - if (!pTarget) - pTarget = Unit::GetUnit(*me, pInstance ? pInstance->GetData64(DATA_PLAYER_GUID) : 0); + Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 150, true); + if (!target) + target = Unit::GetUnit(*me, pInstance ? pInstance->GetData64(DATA_PLAYER_GUID) : 0); - if (!pTarget) + if (!target) { EnterEvadeMode(); return; } - breathX = pTarget->GetPositionX(); - breathY = pTarget->GetPositionY(); + breathX = target->GetPositionX(); + breathY = target->GetPositionY(); float x, y, z; - pTarget->GetContactPoint(me, x, y, z, 70); + target->GetContactPoint(me, x, y, z, 70); me->GetMotionMaster()->MovePoint(0, x, y, z+10); break; } @@ -393,8 +393,8 @@ public: uiFlightCount = 4; break; case 9: - if (Unit* pTarget = SelectTarget(SELECT_TARGET_TOPAGGRO)) - DoStartMovement(pTarget); + if (Unit* target = SelectTarget(SELECT_TARGET_TOPAGGRO)) + DoStartMovement(target); else { EnterEvadeMode(); @@ -447,8 +447,8 @@ public: events.ScheduleEvent(EVENT_GAS_NOVA, urand(20000, 25000)); break; case EVENT_ENCAPSULATE: - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 150, true)) - DoCast(pTarget, SPELL_ENCAPSULATE_CHANNEL, false); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 150, true)) + DoCast(target, SPELL_ENCAPSULATE_CHANNEL, false); events.ScheduleEvent(EVENT_ENCAPSULATE, urand(25000, 30000)); break; case EVENT_FLIGHT: @@ -548,8 +548,8 @@ public: void UpdateAI(const uint32 /*diff*/) { if (!me->getVictim()) - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - AttackStart(pTarget); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + AttackStart(target); } }; diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp index 39d1974a495..8b18129f5a0 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp @@ -645,9 +645,9 @@ public: damage = 0; } - void KilledUnit(Unit* pTarget) + void KilledUnit(Unit* target) { - if (pTarget->GetGUID() == KalecGUID) + if (target->GetGUID() == KalecGUID) { TeleportAllPlayersBack(); if (Creature* Kalecgos = Unit::GetCreature(*me, KalecgosGUID)) @@ -783,9 +783,9 @@ public: if (AgonyCurseTimer <= diff) { - Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); - if (!pTarget) pTarget = me->getVictim(); - DoCast(pTarget, SPELL_AGONY_CURSE); + Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0); + if (!target) target = me->getVictim(); + DoCast(target, SPELL_AGONY_CURSE); AgonyCurseTimer = 20000; } else AgonyCurseTimer -= diff; diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp index f258f1b7f31..674f3ab19ca 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp @@ -661,19 +661,19 @@ public: for (uint8 i = 0; i < 4; ++i) { float x, y, z; - Unit* pTarget = NULL; + Unit* target = NULL; for (uint8 z = 0; z < 6; ++z) { - pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); - if (!pTarget || !pTarget->HasAura(SPELL_VENGEANCE_OF_THE_BLUE_FLIGHT, 0))break; + target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); + if (!target || !target->HasAura(SPELL_VENGEANCE_OF_THE_BLUE_FLIGHT, 0))break; } - if (pTarget) + if (target) { - pTarget->GetPosition(x, y, z); + target->GetPosition(x, y, z); if (Creature* pSinisterReflection = me->SummonCreature(CREATURE_SINISTER_REFLECTION, x, y, z, 0, TEMPSUMMON_CORPSE_DESPAWN, 0)) { - pSinisterReflection->SetDisplayId(pTarget->GetDisplayId()); - pSinisterReflection->AI()->AttackStart(pTarget); + pSinisterReflection->SetDisplayId(target->GetDisplayId()); + pSinisterReflection->AI()->AttackStart(target); } } } @@ -842,16 +842,16 @@ public: TimerIsDeactivated[TIMER_ORBS_EMPOWER] = true; break; case TIMER_ARMAGEDDON: //Phase 4 - Unit* pTarget = NULL; + Unit* target = NULL; for (uint8 z = 0; z < 6; ++z) { - pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); - if (!pTarget || !pTarget->HasAura(SPELL_VENGEANCE_OF_THE_BLUE_FLIGHT, 0)) break; + target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); + if (!target || !target->HasAura(SPELL_VENGEANCE_OF_THE_BLUE_FLIGHT, 0)) break; } - if (pTarget) + if (target) { float x, y, z; - pTarget->GetPosition(x, y, z); + target->GetPosition(x, y, z); me->SummonCreature(CREATURE_ARMAGEDDON_TARGET, x, y, z, 0, TEMPSUMMON_TIMED_DESPAWN, 15000); } Timer[TIMER_ARMAGEDDON] = 2000; // No, I'm not kidding diff --git a/src/server/scripts/EasternKingdoms/Uldaman/boss_ironaya.cpp b/src/server/scripts/EasternKingdoms/Uldaman/boss_ironaya.cpp index 89c35cf6e71..0ec25a265fc 100644 --- a/src/server/scripts/EasternKingdoms/Uldaman/boss_ironaya.cpp +++ b/src/server/scripts/EasternKingdoms/Uldaman/boss_ironaya.cpp @@ -72,13 +72,13 @@ class boss_ironaya : public CreatureScript DoCast(me->getVictim(), SPELL_KNOCKAWAY, true); // current aggro target is knocked away pick new target - Unit* pTarget = SelectTarget(SELECT_TARGET_TOPAGGRO, 0); + Unit* target = SelectTarget(SELECT_TARGET_TOPAGGRO, 0); - if (!pTarget || pTarget == me->getVictim()) - pTarget = SelectTarget(SELECT_TARGET_TOPAGGRO, 1); + if (!target || target == me->getVictim()) + target = SelectTarget(SELECT_TARGET_TOPAGGRO, 1); - if (pTarget) - me->TauntApply(pTarget); + if (target) + me->TauntApply(target); //Shouldn't cast this agian bHasCastedKnockaway = true; diff --git a/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp b/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp index 3179ccc9949..5a16c21d21c 100644 --- a/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp +++ b/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp @@ -175,12 +175,12 @@ class instance_uldaman : public InstanceMapScript { for (std::vector<uint64>::const_iterator i = vStoneKeeper.begin(); i != vStoneKeeper.end(); ++i) { - Creature* pTarget = instance->GetCreature(*i); - if (!pTarget || !pTarget->isAlive() || pTarget->getFaction() == 14) + Creature* target = instance->GetCreature(*i); + if (!target || !target->isAlive() || target->getFaction() == 14) continue; - pTarget->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISABLE_MOVE); - pTarget->setFaction(14); - pTarget->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); + target->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISABLE_MOVE); + target->setFaction(14); + target->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); return; // only want the first one we find } // if we get this far than all four are dead so open the door @@ -196,11 +196,11 @@ class instance_uldaman : public InstanceMapScript for (std::vector<uint64>::const_iterator i = vArchaedasWallMinions.begin(); i != vArchaedasWallMinions.end(); ++i) { - Creature* pTarget = instance->GetCreature(*i); - if (!pTarget || !pTarget->isAlive() || pTarget->getFaction() == 14) + Creature* target = instance->GetCreature(*i); + if (!target || !target->isAlive() || target->getFaction() == 14) continue; - archaedas->CastSpell(pTarget, SPELL_AWAKEN_VAULT_WALKER, true); - pTarget->CastSpell(pTarget, SPELL_ARCHAEDAS_AWAKEN, true); + archaedas->CastSpell(target, SPELL_AWAKEN_VAULT_WALKER, true); + target->CastSpell(target, SPELL_ARCHAEDAS_AWAKEN, true); return; // only want the first one we find } } @@ -211,31 +211,31 @@ class instance_uldaman : public InstanceMapScript // first despawn any aggroed wall minions for (std::vector<uint64>::const_iterator i = vArchaedasWallMinions.begin(); i != vArchaedasWallMinions.end(); ++i) { - Creature* pTarget = instance->GetCreature(*i); - if (!pTarget || pTarget->isDead() || pTarget->getFaction() != 14) + Creature* target = instance->GetCreature(*i); + if (!target || target->isDead() || target->getFaction() != 14) continue; - pTarget->setDeathState(JUST_DIED); - pTarget->RemoveCorpse(); + target->setDeathState(JUST_DIED); + target->RemoveCorpse(); } // Vault Walkers for (std::vector<uint64>::const_iterator i = vVaultWalker.begin(); i != vVaultWalker.end(); ++i) { - Creature* pTarget = instance->GetCreature(*i); - if (!pTarget || pTarget->isDead() || pTarget->getFaction() != 14) + Creature* target = instance->GetCreature(*i); + if (!target || target->isDead() || target->getFaction() != 14) continue; - pTarget->setDeathState(JUST_DIED); - pTarget->RemoveCorpse(); + target->setDeathState(JUST_DIED); + target->RemoveCorpse(); } // Earthen Guardians for (std::vector<uint64>::const_iterator i = vEarthenGuardian.begin(); i != vEarthenGuardian.end(); ++i) { - Creature* pTarget = instance->GetCreature(*i); - if (!pTarget || pTarget->isDead() || pTarget->getFaction() != 14) + Creature* target = instance->GetCreature(*i); + if (!target || target->isDead() || target->getFaction() != 14) continue; - pTarget->setDeathState(JUST_DIED); - pTarget->RemoveCorpse(); + target->setDeathState(JUST_DIED); + target->RemoveCorpse(); } } @@ -268,36 +268,36 @@ class instance_uldaman : public InstanceMapScript // first respawn any aggroed wall minions for (std::vector<uint64>::const_iterator i = vArchaedasWallMinions.begin(); i != vArchaedasWallMinions.end(); ++i) { - Creature* pTarget = instance->GetCreature(*i); - if (pTarget && pTarget->isDead()) + Creature* target = instance->GetCreature(*i); + if (target && target->isDead()) { - pTarget->Respawn(); - pTarget->GetMotionMaster()->MoveTargetedHome(); - SetFrozenState(pTarget); + target->Respawn(); + target->GetMotionMaster()->MoveTargetedHome(); + SetFrozenState(target); } } // Vault Walkers for (std::vector<uint64>::const_iterator i = vVaultWalker.begin(); i != vVaultWalker.end(); ++i) { - Creature* pTarget = instance->GetCreature(*i); - if (pTarget && pTarget->isDead()) + Creature* target = instance->GetCreature(*i); + if (target && target->isDead()) { - pTarget->Respawn(); - pTarget->GetMotionMaster()->MoveTargetedHome(); - SetFrozenState(pTarget); + target->Respawn(); + target->GetMotionMaster()->MoveTargetedHome(); + SetFrozenState(target); } } // Earthen Guardians for (std::vector<uint64>::const_iterator i = vEarthenGuardian.begin(); i != vEarthenGuardian.end(); ++i) { - Creature* pTarget = instance->GetCreature(*i); - if (pTarget && pTarget->isDead()) + Creature* target = instance->GetCreature(*i); + if (target && target->isDead()) { - pTarget->Respawn(); - pTarget->GetMotionMaster()->MoveTargetedHome(); - SetFrozenState(pTarget); + target->Respawn(); + target->GetMotionMaster()->MoveTargetedHome(); + SetFrozenState(target); } } } diff --git a/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp b/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp index e78a18fd6ce..6c7d986842d 100644 --- a/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp +++ b/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp @@ -81,13 +81,13 @@ class mob_jadespine_basilisk : public CreatureScript //Stop attacking target thast asleep and pick new target uiCslumberTimer = 28000; - Unit* pTarget = SelectTarget(SELECT_TARGET_TOPAGGRO, 0); + Unit* target = SelectTarget(SELECT_TARGET_TOPAGGRO, 0); - if (!pTarget || pTarget == me->getVictim()) - pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); + if (!target || target == me->getVictim()) + target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); - if (pTarget) - me->TauntApply(pTarget); + if (target) + me->TauntApply(target); } else uiCslumberTimer -= uiDiff; diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp index 06fc731b4ba..7d6b5c0de1c 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp @@ -258,17 +258,17 @@ class boss_akilzon : public CreatureScript if (StormCount) { - Unit* pTarget = Unit::GetUnit(*me, CloudGUID); - if (!pTarget || !pTarget->isAlive()) + Unit* target = Unit::GetUnit(*me, CloudGUID); + if (!target || !target->isAlive()) { EnterEvadeMode(); return; } else if (Unit* Cyclone = Unit::GetUnit(*me, CycloneGUID)) - Cyclone->CastSpell(pTarget, 25160, true); // keep casting or... + Cyclone->CastSpell(target, 25160, true); // keep casting or... if (StormSequenceTimer <= diff) - HandleStormSequence(pTarget); + HandleStormSequence(target); else StormSequenceTimer -= diff; @@ -285,22 +285,22 @@ class boss_akilzon : public CreatureScript if (StaticDisruption_Timer <= diff) { - Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1); - if (!pTarget) pTarget = me->getVictim(); - TargetGUID = pTarget->GetGUID(); - DoCast(pTarget, SPELL_STATIC_DISRUPTION, false); + Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1); + if (!target) target = me->getVictim(); + TargetGUID = target->GetGUID(); + DoCast(target, SPELL_STATIC_DISRUPTION, false); me->SetInFront(me->getVictim()); StaticDisruption_Timer = (10+rand()%8)*1000; // < 20s - /*if (float dist = me->IsWithinDist3d(pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 5.0f) dist = 5.0f; + /*if (float dist = me->IsWithinDist3d(target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 5.0f) dist = 5.0f; SDisruptAOEVisual_Timer = 1000 + floor(dist / 30 * 1000.0f);*/ } else StaticDisruption_Timer -= diff; if (GustOfWind_Timer <= diff) { - Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1); - if (!pTarget) pTarget = me->getVictim(); - DoCast(pTarget, SPELL_GUST_OF_WIND); + Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1); + if (!target) target = me->getVictim(); + DoCast(target, SPELL_GUST_OF_WIND); GustOfWind_Timer = (20+rand()%10)*1000; //20 to 30 seconds(bosskillers) } else GustOfWind_Timer -= diff; @@ -317,20 +317,20 @@ class boss_akilzon : public CreatureScript } if (ElectricalStorm_Timer <= diff) { - Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 50, true); - if (!pTarget) + Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 50, true); + if (!target) { EnterEvadeMode(); return; } - pTarget->CastSpell(pTarget, 44007, true);//cloud visual - DoCast(pTarget, SPELL_ELECTRICAL_STORM, false);//storm cyclon + visual + target->CastSpell(target, 44007, true);//cloud visual + DoCast(target, SPELL_ELECTRICAL_STORM, false);//storm cyclon + visual float x, y, z; - pTarget->GetPosition(x, y, z); - if (pTarget) + target->GetPosition(x, y, z); + if (target) { - pTarget->SetUnitMovementFlags(MOVEMENTFLAG_LEVITATING); - pTarget->SendMonsterMove(x, y, me->GetPositionZ()+15, 0); + target->SetUnitMovementFlags(MOVEMENTFLAG_LEVITATING); + target->SendMonsterMove(x, y, me->GetPositionZ()+15, 0); } Unit* Cloud = me->SummonTrigger(x, y, me->GetPositionZ()+16, 0, 15000); if (Cloud) @@ -362,11 +362,11 @@ class boss_akilzon : public CreatureScript Unit* bird = Unit::GetUnit(*me, BirdGUIDs[i]); if (!bird) //they despawned on die { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) { - x = pTarget->GetPositionX() + irand(-10, 10); - y = pTarget->GetPositionY() + irand(-10, 10); - z = pTarget->GetPositionZ() + urand(16, 20); + x = target->GetPositionX() + irand(-10, 10); + y = target->GetPositionY() + irand(-10, 10); + z = target->GetPositionZ() + urand(16, 20); if (z > 95) z = 95.0f - urand(0, 5); } @@ -426,8 +426,8 @@ class mob_akilzon_eagle : public CreatureScript arrived = true; if (TargetGUID) { - if (Unit* pTarget = Unit::GetUnit(*me, TargetGUID)) - DoCast(pTarget, SPELL_EAGLE_SWOOP, true); + if (Unit* target = Unit::GetUnit(*me, TargetGUID)) + DoCast(target, SPELL_EAGLE_SWOOP, true); TargetGUID = 0; me->SetSpeed(MOVE_RUN, 1.2f); EagleSwoop_Timer = 5000 + rand()%5000; @@ -443,23 +443,23 @@ class mob_akilzon_eagle : public CreatureScript if (arrived) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) { float x, y, z; if (EagleSwoop_Timer) { - x = pTarget->GetPositionX() + irand(-10, 10); - y = pTarget->GetPositionY() + irand(-10, 10); - z = pTarget->GetPositionZ() + urand(10, 15); + x = target->GetPositionX() + irand(-10, 10); + y = target->GetPositionY() + irand(-10, 10); + z = target->GetPositionZ() + urand(10, 15); if (z > 95) z = 95.0f - urand(0, 5); } else { - pTarget->GetContactPoint(me, x, y, z); + target->GetContactPoint(me, x, y, z); z += 2; me->SetSpeed(MOVE_RUN, 5.0f); - TargetGUID = pTarget->GetGUID(); + TargetGUID = target->GetGUID(); } me->GetMotionMaster()->MovePoint(0, x, y, z); arrived = false; diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp index 8b8a24226af..b14c6935d62 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp @@ -262,12 +262,12 @@ class boss_halazzi : public CreatureScript if (ShockTimer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) { - if (pTarget->IsNonMeleeSpellCasted(false)) - DoCast(pTarget, SPELL_EARTHSHOCK); + if (target->IsNonMeleeSpellCasted(false)) + DoCast(target, SPELL_EARTHSHOCK); else - DoCast(pTarget, SPELL_FLAMESHOCK); + DoCast(target, SPELL_FLAMESHOCK); ShockTimer = 10000 + rand()%5000; } } else ShockTimer -= diff; diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp index eabbab45a6d..1a4082855a9 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp @@ -391,9 +391,9 @@ class boss_hexlord_malacrass : public CreatureScript if (SiphonSoul_Timer <= diff) { - Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 70, true); + Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 70, true); Unit* trigger = DoSpawnCreature(MOB_TEMP_TRIGGER, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN, 30000); - if (!pTarget || !trigger) + if (!target || !trigger) { EnterEvadeMode(); return; @@ -402,20 +402,20 @@ class boss_hexlord_malacrass : public CreatureScript { trigger->SetDisplayId(11686); trigger->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - trigger->CastSpell(pTarget, SPELL_SIPHON_SOUL, true); + trigger->CastSpell(target, SPELL_SIPHON_SOUL, true); trigger->GetMotionMaster()->MoveChase(me); - //DoCast(pTarget, SPELL_SIPHON_SOUL, true); - //me->SetUInt64Value(UNIT_FIELD_CHANNEL_OBJECT, pTarget->GetGUID()); + //DoCast(target, SPELL_SIPHON_SOUL, true); + //me->SetUInt64Value(UNIT_FIELD_CHANNEL_OBJECT, target->GetGUID()); //me->SetUInt32Value(UNIT_CHANNEL_SPELL, SPELL_SIPHON_SOUL); - PlayerGUID = pTarget->GetGUID(); + PlayerGUID = target->GetGUID(); PlayerAbility_Timer = urand(8000, 10000); - PlayerClass = pTarget->getClass() - 1; + PlayerClass = target->getClass() - 1; if (PlayerClass == CLASS_DRUID-1) PlayerClass = CLASS_DRUID; - else if (PlayerClass == CLASS_PRIEST-1 && pTarget->HasSpell(15473)) + else if (PlayerClass == CLASS_PRIEST-1 && target->HasSpell(15473)) PlayerClass = CLASS_PRIEST; // shadow priest SiphonSoul_Timer = 99999; // buff lasts 30 sec @@ -424,8 +424,8 @@ class boss_hexlord_malacrass : public CreatureScript if (PlayerAbility_Timer <= diff) { - //Unit* pTarget = Unit::GetUnit(*me, PlayerGUID); - //if (pTarget && pTarget->isAlive()) + //Unit* target = Unit::GetUnit(*me, PlayerGUID); + //if (target && target->isAlive()) //{ UseAbility(); PlayerAbility_Timer = urand(8000, 10000); @@ -438,32 +438,32 @@ class boss_hexlord_malacrass : public CreatureScript void UseAbility() { uint8 random = urand(0, 2); - Unit* pTarget = NULL; + Unit* target = NULL; switch(PlayerAbility[PlayerClass][random].target) { case ABILITY_TARGET_SELF: - pTarget = me; + target = me; break; case ABILITY_TARGET_VICTIM: - pTarget = me->getVictim(); + target = me->getVictim(); break; case ABILITY_TARGET_ENEMY: default: - pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); + target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); break; case ABILITY_TARGET_HEAL: - pTarget = DoSelectLowestHpFriendly(50, 0); + target = DoSelectLowestHpFriendly(50, 0); break; case ABILITY_TARGET_BUFF: { std::list<Creature*> templist = DoFindFriendlyMissingBuff(50, PlayerAbility[PlayerClass][random].spell); if (!templist.empty()) - pTarget = *(templist.begin()); + target = *(templist.begin()); } break; } - if (pTarget) - DoCast(pTarget, PlayerAbility[PlayerClass][random].spell, false); + if (target) + DoCast(target, PlayerAbility[PlayerClass][random].spell, false); } }; @@ -511,8 +511,8 @@ class boss_thurg : public CreatureScript std::list<Creature*> templist = DoFindFriendlyMissingBuff(50, SPELL_BLOODLUST); if (!templist.empty()) { - if (Unit* pTarget = *(templist.begin())) - DoCast(pTarget, SPELL_BLOODLUST, false); + if (Unit* target = *(templist.begin())) + DoCast(target, SPELL_BLOODLUST, false); } bloodlust_timer = 12000; } else bloodlust_timer -= diff; @@ -585,26 +585,26 @@ class boss_alyson_antille : public CreatureScript if (flashheal_timer <= diff) { - Unit* pTarget = DoSelectLowestHpFriendly(99, 30000); - if (pTarget) + Unit* target = DoSelectLowestHpFriendly(99, 30000); + if (target) { - if (pTarget->IsWithinDistInMap(me, 50)) - DoCast(pTarget, SPELL_FLASH_HEAL, false); + if (target->IsWithinDistInMap(me, 50)) + DoCast(target, SPELL_FLASH_HEAL, false); else { // bugged //me->GetMotionMaster()->Clear(); - //me->GetMotionMaster()->MoveChase(pTarget, 20); + //me->GetMotionMaster()->MoveChase(target, 20); } } else { if (urand(0, 1)) - pTarget = DoSelectLowestHpFriendly(50, 0); + target = DoSelectLowestHpFriendly(50, 0); else - pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); - if (pTarget) - DoCast(pTarget, SPELL_DISPEL_MAGIC, false); + target = SelectTarget(SELECT_TARGET_RANDOM, 0); + if (target) + DoCast(target, SPELL_DISPEL_MAGIC, false); } flashheal_timer = 2500; } else flashheal_timer -= diff; @@ -613,9 +613,9 @@ class boss_alyson_antille : public CreatureScript { if (urand(0, 1)) { - Unit* pTarget = SelectTarget(); + Unit* target = SelectTarget(); - DoCast(pTarget, SPELL_DISPEL_MAGIC, false); + DoCast(target, SPELL_DISPEL_MAGIC, false); } else me->CastSpell(SelectUnit(SELECT_TARGET_RANDOM, 0), SPELL_DISPEL_MAGIC, false); diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp index 2b93d4a6d57..1ba92565be2 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp @@ -181,11 +181,11 @@ class boss_janalai : public CreatureScript // DoZoneInCombat(); } - void DamageDealt(Unit* pTarget, uint32 &damage, DamageEffectType /*damagetype*/) + void DamageDealt(Unit* target, uint32 &damage, DamageEffectType /*damagetype*/) { if (isFlameBreathing) { - if (!me->HasInArc(M_PI/6, pTarget)) + if (!me->HasInArc(M_PI/6, target)) damage = 0; } } @@ -420,11 +420,11 @@ class boss_janalai : public CreatureScript if (FireBreathTimer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) { me->AttackStop(); me->GetMotionMaster()->Clear(); - DoCast(pTarget, SPELL_FLAME_BREATH, false); + DoCast(target, SPELL_FLAME_BREATH, false); me->StopMoving(); isFlameBreathing = true; } diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp index ab4cb968336..812e1e79b4f 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp @@ -155,7 +155,7 @@ class boss_nalorakk : public CreatureScript // me->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID + 1, 5122); // TODO: find the correct equipment id } - void SendAttacker(Unit* pTarget) + void SendAttacker(Unit* target) { std::list<Creature*> templist; float x, y, z; @@ -183,7 +183,7 @@ class boss_nalorakk : public CreatureScript if ((*i) && me->IsWithinDistInMap((*i), 25)) { (*i)->SetNoCallAssistance(true); - (*i)->AI()->AttackStart(pTarget); + (*i)->AI()->AttackStart(target); } } } @@ -414,9 +414,9 @@ class boss_nalorakk : public CreatureScript { me->MonsterYell(YELL_SURGE, LANG_UNIVERSAL, 0); DoPlaySoundToSet(me, SOUND_YELL_SURGE); - Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1, 45, true); - if (pTarget) - DoCast(pTarget, SPELL_SURGE); + Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 45, true); + if (target) + DoCast(target, SPELL_SURGE); Surge_Timer = 15000 + rand()%5000; } else Surge_Timer -= diff; } diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp index f6cba9fea79..9a54716ca02 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp @@ -435,8 +435,8 @@ class boss_zuljin : public CreatureScript if (Grievous_Throw_Timer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget, SPELL_GRIEVOUS_THROW, false); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(target, SPELL_GRIEVOUS_THROW, false); Grievous_Throw_Timer = 10000; } else Grievous_Throw_Timer -= diff; break; @@ -463,11 +463,11 @@ class boss_zuljin : public CreatureScript { if (!TankGUID) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) { TankGUID = me->getVictim()->GetGUID(); me->SetSpeed(MOVE_RUN, 5.0f); - AttackStart(pTarget); // change victim + AttackStart(target); // change victim Claw_Rage_Timer = 0; Claw_Loop_Timer = 500; Claw_Counter = 0; @@ -477,15 +477,15 @@ class boss_zuljin : public CreatureScript { if (Claw_Loop_Timer <= diff) { - Unit* pTarget = me->getVictim(); - if (!pTarget || !pTarget->isTargetableForAttack()) pTarget = Unit::GetUnit(*me, TankGUID); - if (!pTarget || !pTarget->isTargetableForAttack()) pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); - if (pTarget) + Unit* target = me->getVictim(); + if (!target || !target->isTargetableForAttack()) target = Unit::GetUnit(*me, TankGUID); + if (!target || !target->isTargetableForAttack()) target = SelectTarget(SELECT_TARGET_RANDOM, 0); + if (target) { - AttackStart(pTarget); - if (me->IsWithinMeleeRange(pTarget)) + AttackStart(target); + if (me->IsWithinMeleeRange(target)) { - DoCast(pTarget, SPELL_CLAW_RAGE_DAMAGE, true); + DoCast(target, SPELL_CLAW_RAGE_DAMAGE, true); ++Claw_Counter; if (Claw_Counter == 12) { @@ -501,7 +501,7 @@ class boss_zuljin : public CreatureScript } else { - EnterEvadeMode(); // if (pTarget) + EnterEvadeMode(); // if (target) return; } } else Claw_Loop_Timer -= diff; @@ -512,28 +512,28 @@ class boss_zuljin : public CreatureScript { if (!TankGUID) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) { TankGUID = me->getVictim()->GetGUID(); me->SetSpeed(MOVE_RUN, 5.0f); - AttackStart(pTarget); // change victim + AttackStart(target); // change victim Lynx_Rush_Timer = 0; Claw_Counter = 0; } } else if (!Lynx_Rush_Timer) { - Unit* pTarget = me->getVictim(); - if (!pTarget || !pTarget->isTargetableForAttack()) + Unit* target = me->getVictim(); + if (!target || !target->isTargetableForAttack()) { - pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); - AttackStart(pTarget); + target = SelectTarget(SELECT_TARGET_RANDOM, 0); + AttackStart(target); } - if (pTarget) + if (target) { - if (me->IsWithinMeleeRange(pTarget)) + if (me->IsWithinMeleeRange(target)) { - DoCast(pTarget, SPELL_LYNX_RUSH_DAMAGE, true); + DoCast(target, SPELL_LYNX_RUSH_DAMAGE, true); ++Claw_Counter; if (Claw_Counter == 9) { @@ -548,7 +548,7 @@ class boss_zuljin : public CreatureScript } else { - EnterEvadeMode(); // if (pTarget) + EnterEvadeMode(); // if (target) return; } } //if (TankGUID) @@ -564,15 +564,15 @@ class boss_zuljin : public CreatureScript if (Pillar_Of_Fire_Timer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_SUMMON_PILLAR); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(target, SPELL_SUMMON_PILLAR); Pillar_Of_Fire_Timer = 10000; } else Pillar_Of_Fire_Timer -= diff; if (Flame_Breath_Timer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - me->SetInFront(pTarget); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + me->SetInFront(target); DoCast(me, SPELL_FLAME_BREATH); Flame_Breath_Timer = 10000; } else Flame_Breath_Timer -= diff; diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp index 005f84f7494..6b4dbf41121 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp @@ -242,8 +242,8 @@ class boss_arlokk : public CreatureScript me->SetBaseWeaponDamage(BASE_ATTACK, MAXDAMAGE, (cinfo->maxdmg +((cinfo->maxdmg/100) * 35))); me->UpdateDamagePhysical(BASE_ATTACK); - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - AttackStart(pTarget); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + AttackStart(target); m_bIsPhaseTwo = true; m_bIsVanished = false; diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp index fe5e8a98476..e01dafd4777 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp @@ -66,14 +66,14 @@ class boss_grilek : public CreatureScript { DoCast(me, SPELL_AVARTAR); - Unit* pTarget = NULL; + Unit* target = NULL; - pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1); + target = SelectTarget(SELECT_TARGET_RANDOM, 1); if (DoGetThreat(me->getVictim())) DoModifyThreatPercent(me->getVictim(), -50); - if (pTarget) - AttackStart(pTarget); + if (target) + AttackStart(target); Avartar_Timer = 25000 + rand()%10000; } else Avartar_Timer -= diff; diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp index b7f493b738e..9a7a21fb46c 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp @@ -132,8 +132,8 @@ class boss_hakkar : public CreatureScript //CauseInsanity_Timer /*if (CauseInsanity_Timer <= diff) { - if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_CAUSEINSANITY); + if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0)) + DoCast(target, SPELL_CAUSEINSANITY); CauseInsanity_Timer = 35000 + rand()%8000; } else CauseInsanity_Timer -= diff;*/ @@ -141,8 +141,8 @@ class boss_hakkar : public CreatureScript //WillOfHakkar_Timer if (WillOfHakkar_Timer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_WILLOFHAKKAR); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(target, SPELL_WILLOFHAKKAR); WillOfHakkar_Timer = 25000 + rand()%10000; } else WillOfHakkar_Timer -= diff; diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp index 1e2b990eb5b..b8f4b0a50a1 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp @@ -81,16 +81,16 @@ class boss_hazzarah : public CreatureScript { //We will summon 3 illusions that will spawn on a random gamer and attack this gamer //We will just use one model for the beginning - Unit* pTarget = NULL; + Unit* target = NULL; for (uint8 i = 0; i < 3; ++i) { - pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); - if (!pTarget) + target = SelectTarget(SELECT_TARGET_RANDOM, 0); + if (!target) return; - Creature* Illusion = me->SummonCreature(15163, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 30000); + Creature* Illusion = me->SummonCreature(15163, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 30000); if (Illusion) - Illusion->AI()->AttackStart(pTarget); + Illusion->AI()->AttackStart(target); } Illusions_Timer = 15000 + rand()%10000; diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp index 21b513739a5..a1421f7cfba 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp @@ -113,10 +113,10 @@ class boss_jeklik : public CreatureScript { if (Charge_Timer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) { - DoCast(pTarget, SPELL_CHARGE); - AttackStart(pTarget); + DoCast(target, SPELL_CHARGE); + AttackStart(target); } Charge_Timer = 15000 + rand()%15000; @@ -136,25 +136,25 @@ class boss_jeklik : public CreatureScript if (SpawnBats_Timer <= diff) { - Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); + Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0); Creature* Bat = NULL; Bat = me->SummonCreature(11368, -12291.6220f, -1380.2640f, 144.8304f, 5.483f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); - if (pTarget && Bat) Bat ->AI()->AttackStart(pTarget); + if (target && Bat) Bat ->AI()->AttackStart(target); Bat = me->SummonCreature(11368, -12289.6220f, -1380.2640f, 144.8304f, 5.483f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); - if (pTarget && Bat) Bat ->AI()->AttackStart(pTarget); + if (target && Bat) Bat ->AI()->AttackStart(target); Bat = me->SummonCreature(11368, -12293.6220f, -1380.2640f, 144.8304f, 5.483f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); - if (pTarget && Bat) Bat ->AI()->AttackStart(pTarget); + if (target && Bat) Bat ->AI()->AttackStart(target); Bat = me->SummonCreature(11368, -12291.6220f, -1380.2640f, 144.8304f, 5.483f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); - if (pTarget && Bat) Bat ->AI()->AttackStart(pTarget); + if (target && Bat) Bat ->AI()->AttackStart(target); Bat = me->SummonCreature(11368, -12289.6220f, -1380.2640f, 144.8304f, 5.483f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); - if (pTarget && Bat) Bat ->AI()->AttackStart(pTarget); + if (target && Bat) Bat ->AI()->AttackStart(target); Bat = me->SummonCreature(11368, -12293.6220f, -1380.2640f, 144.8304f, 5.483f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); - if (pTarget && Bat) Bat ->AI()->AttackStart(pTarget); + if (target && Bat) Bat ->AI()->AttackStart(target); SpawnBats_Timer = 60000; } else SpawnBats_Timer -= diff; @@ -165,9 +165,9 @@ class boss_jeklik : public CreatureScript { if (PhaseTwo && ShadowWordPain_Timer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) { - DoCast(pTarget, SPELL_SHADOW_WORD_PAIN); + DoCast(target, SPELL_SHADOW_WORD_PAIN); ShadowWordPain_Timer = 12000 + rand()%6000; } }ShadowWordPain_Timer -=diff; @@ -194,13 +194,13 @@ class boss_jeklik : public CreatureScript if (SpawnFlyingBats_Timer <= diff) { - Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); - if (!pTarget) + Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0); + if (!target) return; - Creature* FlyingBat = me->SummonCreature(14965, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ()+15, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + Creature* FlyingBat = me->SummonCreature(14965, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ()+15, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (FlyingBat) - FlyingBat->AI()->AttackStart(pTarget); + FlyingBat->AI()->AttackStart(target); SpawnFlyingBats_Timer = 10000 + rand()%5000; } else SpawnFlyingBats_Timer -=diff; @@ -264,9 +264,9 @@ class mob_batrider : public CreatureScript //Bomb_Timer if (Bomb_Timer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) { - DoCast(pTarget, SPELL_BOMB); + DoCast(target, SPELL_BOMB); Bomb_Timer = 5000; } } else Bomb_Timer -= diff; diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp index 81bd6ba9032..51db392d3a6 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp @@ -108,13 +108,13 @@ class boss_jindo : public CreatureScript //Casting the delusion curse with a shade. So shade will attack the same target with the curse. if (Delusions_Timer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) { - DoCast(pTarget, SPELL_DELUSIONSOFJINDO); + DoCast(target, SPELL_DELUSIONSOFJINDO); - Creature* Shade = me->SummonCreature(14986, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + Creature* Shade = me->SummonCreature(14986, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (Shade) - Shade->AI()->AttackStart(pTarget); + Shade->AI()->AttackStart(target); } Delusions_Timer = 4000 + rand()%8000; @@ -123,43 +123,43 @@ class boss_jindo : public CreatureScript //Teleporting a random gamer and spawning 9 skeletons that will attack this gamer if (Teleport_Timer <= diff) { - Unit* pTarget = NULL; - pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); - if (pTarget && pTarget->GetTypeId() == TYPEID_PLAYER) + Unit* target = NULL; + target = SelectTarget(SELECT_TARGET_RANDOM, 0); + if (target && target->GetTypeId() == TYPEID_PLAYER) { - DoTeleportPlayer(pTarget, -11583.7783f, -1249.4278f, 77.5471f, 4.745f); + DoTeleportPlayer(target, -11583.7783f, -1249.4278f, 77.5471f, 4.745f); if (DoGetThreat(me->getVictim())) - DoModifyThreatPercent(pTarget, -100); + DoModifyThreatPercent(target, -100); Creature* Skeletons; - Skeletons = me->SummonCreature(14826, pTarget->GetPositionX()+2, pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + Skeletons = me->SummonCreature(14826, target->GetPositionX()+2, target->GetPositionY(), target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (Skeletons) - Skeletons->AI()->AttackStart(pTarget); - Skeletons = me->SummonCreature(14826, pTarget->GetPositionX()-2, pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + Skeletons->AI()->AttackStart(target); + Skeletons = me->SummonCreature(14826, target->GetPositionX()-2, target->GetPositionY(), target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (Skeletons) - Skeletons->AI()->AttackStart(pTarget); - Skeletons = me->SummonCreature(14826, pTarget->GetPositionX()+4, pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + Skeletons->AI()->AttackStart(target); + Skeletons = me->SummonCreature(14826, target->GetPositionX()+4, target->GetPositionY(), target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (Skeletons) - Skeletons->AI()->AttackStart(pTarget); - Skeletons = me->SummonCreature(14826, pTarget->GetPositionX()-4, pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + Skeletons->AI()->AttackStart(target); + Skeletons = me->SummonCreature(14826, target->GetPositionX()-4, target->GetPositionY(), target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (Skeletons) - Skeletons->AI()->AttackStart(pTarget); - Skeletons = me->SummonCreature(14826, pTarget->GetPositionX(), pTarget->GetPositionY()+2, pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + Skeletons->AI()->AttackStart(target); + Skeletons = me->SummonCreature(14826, target->GetPositionX(), target->GetPositionY()+2, target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (Skeletons) - Skeletons->AI()->AttackStart(pTarget); - Skeletons = me->SummonCreature(14826, pTarget->GetPositionX(), pTarget->GetPositionY()-2, pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + Skeletons->AI()->AttackStart(target); + Skeletons = me->SummonCreature(14826, target->GetPositionX(), target->GetPositionY()-2, target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (Skeletons) - Skeletons->AI()->AttackStart(pTarget); - Skeletons = me->SummonCreature(14826, pTarget->GetPositionX(), pTarget->GetPositionY()+4, pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + Skeletons->AI()->AttackStart(target); + Skeletons = me->SummonCreature(14826, target->GetPositionX(), target->GetPositionY()+4, target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (Skeletons) - Skeletons->AI()->AttackStart(pTarget); - Skeletons = me->SummonCreature(14826, pTarget->GetPositionX(), pTarget->GetPositionY()-4, pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + Skeletons->AI()->AttackStart(target); + Skeletons = me->SummonCreature(14826, target->GetPositionX(), target->GetPositionY()-4, target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (Skeletons) - Skeletons->AI()->AttackStart(pTarget); - Skeletons = me->SummonCreature(14826, pTarget->GetPositionX()+3, pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + Skeletons->AI()->AttackStart(target); + Skeletons = me->SummonCreature(14826, target->GetPositionX()+3, target->GetPositionY(), target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (Skeletons) - Skeletons->AI()->AttackStart(pTarget); + Skeletons->AI()->AttackStart(target); } Teleport_Timer = 15000 + rand()%8000; diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp index 26d7a52f09c..ca34747f8a3 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp @@ -118,37 +118,37 @@ class boss_marli : public CreatureScript { DoScriptText(SAY_SPIDER_SPAWN, me); - Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); - if (!pTarget) + Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0); + if (!target) return; Creature* Spider = NULL; - Spider = me->SummonCreature(15041, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + Spider = me->SummonCreature(15041, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (Spider) - Spider->AI()->AttackStart(pTarget); - Spider = me->SummonCreature(15041, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + Spider->AI()->AttackStart(target); + Spider = me->SummonCreature(15041, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (Spider) - Spider->AI()->AttackStart(pTarget); - Spider = me->SummonCreature(15041, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + Spider->AI()->AttackStart(target); + Spider = me->SummonCreature(15041, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (Spider) - Spider->AI()->AttackStart(pTarget); - Spider = me->SummonCreature(15041, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + Spider->AI()->AttackStart(target); + Spider = me->SummonCreature(15041, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (Spider) - Spider->AI()->AttackStart(pTarget); + Spider->AI()->AttackStart(target); Spawned = true; } else SpawnStartSpiders_Timer -= diff; if (SpawnSpider_Timer <= diff) { - Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); - if (!pTarget) + Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0); + if (!target) return; - Creature* Spider = me->SummonCreature(15041, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + Creature* Spider = me->SummonCreature(15041, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (Spider) - Spider->AI()->AttackStart(pTarget); + Spider->AI()->AttackStart(target); SpawnSpider_Timer = 12000 + rand()%5000; } else SpawnSpider_Timer -= diff; @@ -173,21 +173,21 @@ class boss_marli : public CreatureScript { if (Charge_Timer <= diff) { - Unit* pTarget = NULL; + Unit* target = NULL; int i = 0; while (i < 3) // max 3 tries to get a random target with power_mana { ++i; - pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true); // not aggro leader - if (pTarget && pTarget->getPowerType() == POWER_MANA) + target = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true); // not aggro leader + if (target && target->getPowerType() == POWER_MANA) i = 3; } - if (pTarget) + if (target) { - DoCast(pTarget, SPELL_CHARGE); - //me->GetMap()->CreatureRelocation(me, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0); - //me->SendMonsterMove(pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, true, 1); - AttackStart(pTarget); + DoCast(target, SPELL_CHARGE); + //me->GetMap()->CreatureRelocation(me, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0); + //me->SendMonsterMove(target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0, true, 1); + AttackStart(target); } Charge_Timer = 8000; diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp index c05bc2e6fcb..d8ed6394e4c 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp @@ -92,12 +92,12 @@ class boss_renataki : public CreatureScript { if (Ambush_Timer <= diff) { - Unit* pTarget = NULL; - pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); - if (pTarget) + Unit* target = NULL; + target = SelectTarget(SELECT_TARGET_RANDOM, 0); + if (target) { - DoTeleportTo(pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ()); - DoCast(pTarget, SPELL_AMBUSH); + DoTeleportTo(target->GetPositionX(), target->GetPositionY(), target->GetPositionZ()); + DoCast(target, SPELL_AMBUSH); } Ambushed = true; @@ -126,14 +126,14 @@ class boss_renataki : public CreatureScript { if (Aggro_Timer <= diff) { - Unit* pTarget = NULL; - pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1); + Unit* target = NULL; + target = SelectTarget(SELECT_TARGET_RANDOM, 1); if (DoGetThreat(me->getVictim())) DoModifyThreatPercent(me->getVictim(), -50); - if (pTarget) - AttackStart(pTarget); + if (target) + AttackStart(target); Aggro_Timer = 7000 + rand()%13000; } else Aggro_Timer -= diff; diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp index 1b5beea9c35..12540d6d7fb 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp @@ -219,11 +219,11 @@ class boss_thekal : public CreatureScript { if (Charge_Timer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) { - DoCast(pTarget, SPELL_CHARGE); + DoCast(target, SPELL_CHARGE); DoResetThreat(); - AttackStart(pTarget); + AttackStart(target); } Charge_Timer = 15000 + rand()%7000; diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp index 9857ba68ffc..7288d063c21 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp @@ -70,9 +70,9 @@ class boss_wushoolay : public CreatureScript //LightningWave_Timer if (LightningWave_Timer <= diff) { - Unit* pTarget = NULL; - pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); - if (pTarget) DoCast(pTarget, SPELL_LIGHTNINGWAVE); + Unit* target = NULL; + target = SelectTarget(SELECT_TARGET_RANDOM, 0); + if (target) DoCast(target, SPELL_LIGHTNINGWAVE); LightningWave_Timer = 12000 + rand()%4000; } else LightningWave_Timer -= diff; diff --git a/src/server/scripts/EasternKingdoms/eversong_woods.cpp b/src/server/scripts/EasternKingdoms/eversong_woods.cpp index 96c709c8251..b9d791b9af8 100644 --- a/src/server/scripts/EasternKingdoms/eversong_woods.cpp +++ b/src/server/scripts/EasternKingdoms/eversong_woods.cpp @@ -259,10 +259,10 @@ public: me->setFaction(FACTION_HOSTILE); questPhase = 0; - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) { - me->AddThreat(pTarget, 5000000.0f); - AttackStart(pTarget); + me->AddThreat(target, 5000000.0f); + AttackStart(target); } } else diff --git a/src/server/scripts/EasternKingdoms/silverpine_forest.cpp b/src/server/scripts/EasternKingdoms/silverpine_forest.cpp index 2c211b260c4..63b48ad5568 100644 --- a/src/server/scripts/EasternKingdoms/silverpine_forest.cpp +++ b/src/server/scripts/EasternKingdoms/silverpine_forest.cpp @@ -290,20 +290,20 @@ public: if (Creature* pSummoned = me->SummonCreature(creatureId, PyrewoodSpawnPoints[position][0], PyrewoodSpawnPoints[position][1], PyrewoodSpawnPoints[position][2], PyrewoodSpawnPoints[position][3], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 15000)) { Player* player = NULL; - Unit* pTarget = NULL; + Unit* target = NULL; if (PlayerGUID) { player = Unit::GetPlayer(*me, PlayerGUID); if (player) - pTarget = RAND((Unit*)me, (Unit*)player); + target = RAND((Unit*)me, (Unit*)player); } else - pTarget = me; + target = me; - if (pTarget) + if (target) { pSummoned->setFaction(168); - pSummoned->AddThreat(pTarget, 32.0f); - pSummoned->AI()->AttackStart(pTarget); + pSummoned->AddThreat(target, 32.0f); + pSummoned->AI()->AttackStart(target); } } } diff --git a/src/server/scripts/EasternKingdoms/undercity.cpp b/src/server/scripts/EasternKingdoms/undercity.cpp index bbc3e45d454..042c8f695c7 100644 --- a/src/server/scripts/EasternKingdoms/undercity.cpp +++ b/src/server/scripts/EasternKingdoms/undercity.cpp @@ -107,11 +107,11 @@ public: { if (summoned->GetEntry() == ENTRY_HIGHBORNE_BUNNY) { - if (Unit* pTarget = Unit::GetUnit(*summoned, targetGUID)) + if (Unit* target = Unit::GetUnit(*summoned, targetGUID)) { - pTarget->SendMonsterMove(pTarget->GetPositionX(), pTarget->GetPositionY(), me->GetPositionZ()+15.0f, 0); - pTarget->GetMap()->CreatureRelocation(me, pTarget->GetPositionX(), pTarget->GetPositionY(), me->GetPositionZ()+15.0f, 0.0f); - summoned->CastSpell(pTarget, SPELL_RIBBON_OF_SOULS, false); + target->SendMonsterMove(target->GetPositionX(), target->GetPositionY(), me->GetPositionZ()+15.0f, 0); + target->GetMap()->CreatureRelocation(me, target->GetPositionX(), target->GetPositionY(), me->GetPositionZ()+15.0f, 0.0f); + summoned->CastSpell(target, SPELL_RIBBON_OF_SOULS, false); } summoned->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING); diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp index 4c2d29e7cc3..33a96f1a763 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp @@ -161,10 +161,10 @@ public: { if (uiFrostBoltVolleyTimer <= uiDiff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) { - if (pTarget) - DoCast(pTarget, SPELL_FROST_BOLT_VOLLEY); + if (target) + DoCast(target, SPELL_FROST_BOLT_VOLLEY); } uiFrostBoltVolleyTimer = urand(5000, 8000); } else uiFrostBoltVolleyTimer -= uiDiff; diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp index b39d222b948..9476380deb6 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp @@ -89,10 +89,10 @@ public: if (uiSleepTimer < diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) { DoScriptText(SAY_SLEEP, me); - DoCast(pTarget, SPELL_SLEEP); + DoCast(target, SPELL_SLEEP); } uiSleepTimer = urand(15000, 20000); } else uiSleepTimer -= diff; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp index dc8784599de..6d6843c9720 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp @@ -128,9 +128,9 @@ public: pos = i; if (i == 7 && pInstance) { - Unit* pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); - if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget, 0.0f); + Unit* target = Unit::GetUnit((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); + if (target && target->isAlive()) + me->AddThreat(target, 0.0f); } } @@ -174,8 +174,8 @@ public: if (SwarmTimer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget, SPELL_CARRION_SWARM); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(target, SPELL_CARRION_SWARM); SwarmTimer = urand(45000, 60000); switch (urand(0, 1)) @@ -195,8 +195,8 @@ public: { for (uint8 i = 0; i < 3; ++i) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - pTarget->CastSpell(pTarget, SPELL_SLEEP, true); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + target->CastSpell(target, SPELL_SLEEP, true); } SleepTimer = 60000; switch (urand(0, 1)) diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp index 0a9745123cb..5a28f3af333 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp @@ -154,7 +154,7 @@ public: }; /* This is the script for the Doomfire Spirit Mob. This mob simply follow players or - travels in random directions if pTarget cannot be found. */ + travels in random directions if target cannot be found. */ class mob_doomfire_targetting : public CreatureScript { public: @@ -216,10 +216,10 @@ public: /* Finally, Archimonde's script. His script isn't extremely complex, most are simply spells on timers. The only complicated aspect of the battle is Finger of Death and Doomfire, with Doomfire being the hardest bit to code. Finger of Death is simply a distance check - if no one is in melee range, then - select a random pTarget and cast the spell on them. However, if someone IS in melee range, and this + select a random target and cast the spell on them. However, if someone IS in melee range, and this is NOT the main tank (creature's victim), then we aggro that player and they become the new victim. For Doomfire, we summon a mob (Doomfire Spirit) for the Doomfire mob to follow. It's spirit will - randomly select it's pTarget to follow and then we create the random movement making it unpredictable. */ + randomly select it's target to follow and then we create the random movement making it unpredictable. */ class boss_archimonde : public CreatureScript { @@ -367,13 +367,13 @@ public: return false; targets.sort(Trinity::ObjectDistanceOrderPred(me)); - Unit* pTarget = targets.front(); - if (pTarget) + Unit* target = targets.front(); + if (target) { - if (!me->IsWithinDistInMap(pTarget, me->GetAttackDistance(pTarget))) + if (!me->IsWithinDistInMap(target, me->GetAttackDistance(target))) return true; // Cast Finger of Death else // This target is closest, he is our new tank - me->AddThreat(pTarget, me->getThreatManager().getThreat(me->getVictim())); + me->AddThreat(target, me->getThreatManager().getThreat(me->getVictim())); } return false; @@ -409,14 +409,14 @@ public: } //this is code doing close to what the summoning spell would do (spell 31903) - void SummonDoomfire(Unit* pTarget) + void SummonDoomfire(Unit* target) { me->SummonCreature(CREATURE_DOOMFIRE_SPIRIT, - pTarget->GetPositionX()+15.0f, pTarget->GetPositionY()+15.0f, pTarget->GetPositionZ(), 0, + target->GetPositionX()+15.0f, target->GetPositionY()+15.0f, target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 27000); me->SummonCreature(CREATURE_DOOMFIRE, - pTarget->GetPositionX()-15.0f, pTarget->GetPositionY()-15.0f, pTarget->GetPositionZ(), 0, + target->GetPositionX()-15.0f, target->GetPositionY()-15.0f, target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 27000); } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp index 7ec1cbed785..25474b47c0f 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp @@ -121,9 +121,9 @@ public: pos = i; if (i == 7 && pInstance) { - Unit* pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); - if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget, 0.0f); + Unit* target = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); + if (target && target->isAlive()) + me->AddThreat(target, 0.0f); } } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp index ef6d4a4dcbe..f258444eb62 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp @@ -116,9 +116,9 @@ public: pos = i; if (i == 7 && pInstance) { - Unit* pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); - if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget, 0.0f); + Unit* target = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); + if (target && target->isAlive()) + me->AddThreat(target, 0.0f); } } @@ -181,10 +181,10 @@ public: std::list<HostileReference *> t_list = me->getThreatManager().getThreatList(); for (std::list<HostileReference *>::const_iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) { - Unit* pTarget = Unit::GetUnit(*me, (*itr)->getUnitGuid()); - if (pTarget && pTarget->GetTypeId() == TYPEID_PLAYER && pTarget->getPowerType() == POWER_MANA) + Unit* target = Unit::GetUnit(*me, (*itr)->getUnitGuid()); + if (target && target->GetTypeId() == TYPEID_PLAYER && target->getPowerType() == POWER_MANA) { - pTarget->CastSpell(pTarget, SPELL_MARK, true);//only cast on mana users + target->CastSpell(target, SPELL_MARK, true);//only cast on mana users } } MarkTimerBase -= 5000; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp index a40a431a620..e2e9372522f 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp @@ -112,9 +112,9 @@ public: pos = i; if (i == 7 && pInstance) { - Unit* pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); - if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget, 0.0f); + Unit* target = Unit::GetUnit((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); + if (target && target->isAlive()) + me->AddThreat(target, 0.0f); } } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp index 636354b367e..1d1b1902188 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp @@ -890,18 +890,18 @@ void hyjalAI::UpdateAI(const uint32 diff) if (me->IsNonMeleeSpellCasted(false)) me->InterruptNonMeleeSpells(false); - Unit* pTarget = NULL; + Unit* target = NULL; switch(Spells[i].TargetType) { - case TARGETTYPE_SELF: pTarget = me; break; - case TARGETTYPE_RANDOM: pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); break; - case TARGETTYPE_VICTIM: pTarget = me->getVictim(); break; + case TARGETTYPE_SELF: target = me; break; + case TARGETTYPE_RANDOM: target = SelectTarget(SELECT_TARGET_RANDOM, 0); break; + case TARGETTYPE_VICTIM: target = me->getVictim(); break; } - if (pTarget && pTarget->isAlive()) + if (target && target->isAlive()) { - DoCast(pTarget, Spells[i].SpellId); + DoCast(target, Spells[i].SpellId); SpellTimer[i] = Spells[i].Cooldown; } } else SpellTimer[i] -= diff; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp index 972267a4cca..a3d5e4886e0 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp @@ -434,9 +434,9 @@ public: { if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, attack thrall { - Unit* pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); - if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget, 0.0f); + Unit* target = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); + if (target && target->isAlive()) + me->AddThreat(target, 0.0f); } } } @@ -475,9 +475,9 @@ public: { if (pInstance->GetData(DATA_ALLIANCE_RETREAT) && !pInstance->GetData(DATA_HORDE_RETREAT)) { - Unit* pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); - if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget, 0.0f); + Unit* target = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); + if (target && target->isAlive()) + me->AddThreat(target, 0.0f); } else if (pInstance->GetData(DATA_ALLIANCE_RETREAT) && pInstance->GetData(DATA_HORDE_RETREAT)){ //do overrun } @@ -562,13 +562,13 @@ public: { if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, attack thrall { - Unit* pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); - if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget, 0.0f); + Unit* target = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); + if (target && target->isAlive()) + me->AddThreat(target, 0.0f); }else{ - Unit* pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); - if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget, 0.0f); + Unit* target = Unit::GetUnit((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); + if (target && target->isAlive()) + me->AddThreat(target, 0.0f); } } if (i == LastOverronPos && IsOverrun) @@ -667,13 +667,13 @@ public: { if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, attack thrall { - Unit* pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); - if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget, 0.0f); + Unit* target = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); + if (target && target->isAlive()) + me->AddThreat(target, 0.0f); }else{ - Unit* pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); - if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget, 0.0f); + Unit* target = Unit::GetUnit((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); + if (target && target->isAlive()) + me->AddThreat(target, 0.0f); } } if (i == LastOverronPos && IsOverrun) @@ -768,9 +768,9 @@ public: void JustSummoned(Creature* summon) { - Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 30, true); - if (pTarget && summon) - summon->Attack(pTarget, false); + Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 30, true); + if (target && summon) + summon->Attack(target, false); summons.Summon(summon); } void SummonedCreatureDespawn(Creature* summon) {summons.Despawn(summon);} @@ -781,13 +781,13 @@ public: { if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, attack thrall { - Unit* pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); - if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget, 0.0f); + Unit* target = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); + if (target && target->isAlive()) + me->AddThreat(target, 0.0f); }else{ - Unit* pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); - if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget, 0.0f); + Unit* target = Unit::GetUnit((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); + if (target && target->isAlive()) + me->AddThreat(target, 0.0f); } } } @@ -897,13 +897,13 @@ public: { if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, attack thrall { - Unit* pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); - if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget, 0.0f); + Unit* target = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); + if (target && target->isAlive()) + me->AddThreat(target, 0.0f); }else{ - Unit* pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); - if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget, 0.0f); + Unit* target = Unit::GetUnit((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); + if (target && target->isAlive()) + me->AddThreat(target, 0.0f); } } } @@ -998,13 +998,13 @@ public: { if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, attack thrall { - Unit* pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); - if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget, 0.0f); + Unit* target = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); + if (target && target->isAlive()) + me->AddThreat(target, 0.0f); }else{ - Unit* pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); - if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget, 0.0f); + Unit* target = Unit::GetUnit((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); + if (target && target->isAlive()) + me->AddThreat(target, 0.0f); } } } @@ -1090,13 +1090,13 @@ public: { if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, attack thrall { - Unit* pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); - if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget, 0.0f); + Unit* target = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); + if (target && target->isAlive()) + me->AddThreat(target, 0.0f); }else{ - Unit* pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); - if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget, 0.0f); + Unit* target = Unit::GetUnit((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); + if (target && target->isAlive()) + me->AddThreat(target, 0.0f); } } } @@ -1184,11 +1184,11 @@ public: pos = i; if (i == 2 && pInstance && !IsOverrun) { - Unit* pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); - if (pTarget && pTarget->isAlive()) + Unit* target = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); + if (target && target->isAlive()) { - me->AddThreat(pTarget, 0.0f); - DoCast(pTarget, SPELL_FROST_BREATH, true); + me->AddThreat(target, 0.0f); + DoCast(target, SPELL_FROST_BREATH, true); } } } @@ -1306,11 +1306,11 @@ public: pos = i; if (i == 2 && pInstance && !IsOverrun) { - Unit* pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); - if (pTarget && pTarget->isAlive()) + Unit* target = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); + if (target && target->isAlive()) { - me->AddThreat(pTarget, 0.0f); - DoCast(pTarget, SPELL_GARGOYLE_STRIKE, true); + me->AddThreat(target, 0.0f); + DoCast(target, SPELL_GARGOYLE_STRIKE, true); } } } @@ -1373,9 +1373,9 @@ public: forcemove = false; if (forcemove) { - Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); - if (pTarget) - me->Attack(pTarget, false); + Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0); + if (target) + me->Attack(target, false); } if (MoveTimer <= diff) { diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp index 882c7240ae3..b0b75c53e52 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp @@ -104,8 +104,8 @@ public: if (uiCurseOfExertionTimer < diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget, SPELL_CURSE_OF_EXERTION); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(target, SPELL_CURSE_OF_EXERTION); uiCurseOfExertionTimer = 9300; } else uiCurseOfExertionTimer -= diff; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp index 28378daf7ab..c37b0205603 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp @@ -171,8 +171,8 @@ public: if (uiMindBlastTimer < diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget, SPELL_MIND_BLAST); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(target, SPELL_MIND_BLAST); uiMindBlastTimer = 6000; } else uiMindBlastTimer -= diff; @@ -185,8 +185,8 @@ public: if (uiSleepTimer < diff) { DoScriptText(RAND(SAY_SLEEP_1, SAY_SLEEP_2), me); - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget, SPELL_SLEEP); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(target, SPELL_SLEEP); uiSleepTimer = urand(15000, 20000); } else uiSleepTimer -= diff; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp index 9f4f46c2dd3..7f5ef2cb36e 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp @@ -108,8 +108,8 @@ public: if (uiChainTimer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget, SPELL_CONSTRICTING_CHAINS); //anyone but the tank + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(target, SPELL_CONSTRICTING_CHAINS); //anyone but the tank uiChainTimer = urand(2000, 4000); } else uiChainTimer -= diff; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp index 46d8936670f..782d70070bd 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp @@ -117,8 +117,8 @@ public: //Shadow bolt timer if (uiShadowBoltTimer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_SHADOW_BOLT); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(target, SPELL_SHADOW_BOLT); uiShadowBoltTimer = urand(8000, 12000); } else uiShadowBoltTimer -= diff; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_chrono_lord_deja.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_chrono_lord_deja.cpp index 2d6256e4666..092ee779d75 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_chrono_lord_deja.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_chrono_lord_deja.cpp @@ -124,8 +124,8 @@ public: //Arcane Discharge if (ArcaneDischarge_Timer <= diff) { - Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); - DoCast(pTarget, SPELL_ARCANE_DISCHARGE); + Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0); + DoCast(target, SPELL_ARCANE_DISCHARGE); ArcaneDischarge_Timer = 20000+rand()%10000; } else ArcaneDischarge_Timer -= diff; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp index 45d28c6785b..a965fb74517 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp @@ -119,8 +119,8 @@ public: if (WingBuffet_Timer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_WING_BUFFET); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(target, SPELL_WING_BUFFET); WingBuffet_Timer = 25000+rand()%10000; } else WingBuffet_Timer -= diff; diff --git a/src/server/scripts/Kalimdor/Maraudon/boss_celebras_the_cursed.cpp b/src/server/scripts/Kalimdor/Maraudon/boss_celebras_the_cursed.cpp index ea70cf6de3f..8b6b1bc26dc 100644 --- a/src/server/scripts/Kalimdor/Maraudon/boss_celebras_the_cursed.cpp +++ b/src/server/scripts/Kalimdor/Maraudon/boss_celebras_the_cursed.cpp @@ -69,10 +69,10 @@ public: //Wrath if (Wrath_Timer <= diff) { - Unit* pTarget = NULL; - pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); - if (pTarget) - DoCast(pTarget, SPELL_WRATH); + Unit* target = NULL; + target = SelectTarget(SELECT_TARGET_RANDOM, 0); + if (target) + DoCast(target, SPELL_WRATH); Wrath_Timer = 8000; } else Wrath_Timer -= diff; diff --git a/src/server/scripts/Kalimdor/Maraudon/boss_princess_theradras.cpp b/src/server/scripts/Kalimdor/Maraudon/boss_princess_theradras.cpp index f7b98988cd4..caa2327511c 100644 --- a/src/server/scripts/Kalimdor/Maraudon/boss_princess_theradras.cpp +++ b/src/server/scripts/Kalimdor/Maraudon/boss_princess_theradras.cpp @@ -81,10 +81,10 @@ public: //Boulder_Timer if (Boulder_Timer <= diff) { - Unit* pTarget = NULL; - pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); - if (pTarget) - DoCast(pTarget, SPELL_BOULDER); + Unit* target = NULL; + target = SelectTarget(SELECT_TARGET_RANDOM, 0); + if (target) + DoCast(target, SPELL_BOULDER); Boulder_Timer = 10000; } else Boulder_Timer -= diff; diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp index 196cbc218d2..7e9aac30a74 100644 --- a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp +++ b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp @@ -200,8 +200,8 @@ public: void JustSummoned(Creature* pSummoned) { 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); switch (pSummoned->GetEntry()) { @@ -457,8 +457,8 @@ public: { if (me->GetMotionMaster()->GetCurrentMovementGeneratorType() != POINT_MOTION_TYPE) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_FIREBALL); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(target, SPELL_FIREBALL); m_uiFireballTimer = 8000; } diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp index b9c6c452fd7..a5efb416b76 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp @@ -193,13 +193,13 @@ public: //Charge_Timer if (Charge_Timer <= diff) { - Unit* pTarget = NULL; - pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); - if (pTarget) + Unit* target = NULL; + target = SelectTarget(SELECT_TARGET_RANDOM, 0); + if (target) { - DoCast(pTarget, SPELL_CHARGE); - //me->SendMonsterMove(pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, true, 1); - AttackStart(pTarget); + DoCast(target, SPELL_CHARGE); + //me->SendMonsterMove(target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0, true, 1); + AttackStart(target); } Charge_Timer = 8000 + rand()%8000; @@ -273,10 +273,10 @@ public: for (uint8 i = 0; i < 10; ++i) { - Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); + Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0); Creature* Summoned = me->SummonCreature(15621, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 90000); - if (Summoned && pTarget) - Summoned->AI()->AttackStart(pTarget); + if (Summoned && target) + Summoned->AI()->AttackStart(target); } } diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp index ff9a593c08e..b7d37279b8b 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp @@ -241,9 +241,9 @@ public: void SpawnEyeTentacle(float x, float y) { if (Creature* Spawned = DoSpawnCreature(MOB_EYE_TENTACLE, x, y, 0, 0, TEMPSUMMON_CORPSE_DESPAWN, 500)) - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) if (Spawned->AI()) - Spawned->AI()->AttackStart(pTarget); + Spawned->AI()->AttackStart(target); } void UpdateAI(const uint32 diff) @@ -284,13 +284,13 @@ public: if (BeamTimer <= diff) { //SPELL_GREEN_BEAM - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) { me->InterruptNonMeleeSpells(false); - DoCast(pTarget, SPELL_GREEN_BEAM); + DoCast(target, SPELL_GREEN_BEAM); //Correctly update our target - me->SetUInt64Value(UNIT_FIELD_TARGET, pTarget->GetGUID()); + me->SetUInt64Value(UNIT_FIELD_TARGET, target->GetGUID()); } //Beam every 3 seconds @@ -300,15 +300,15 @@ public: //ClawTentacleTimer if (ClawTentacleTimer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) { Creature* Spawned = NULL; //Spawn claw tentacle on the random target - Spawned = me->SummonCreature(MOB_CLAW_TENTACLE, *pTarget, TEMPSUMMON_CORPSE_DESPAWN, 500); + Spawned = me->SummonCreature(MOB_CLAW_TENTACLE, *target, TEMPSUMMON_CORPSE_DESPAWN, 500); if (Spawned && Spawned->AI()) - Spawned->AI()->AttackStart(pTarget); + Spawned->AI()->AttackStart(target); } //One claw tentacle every 12.5 seconds @@ -328,10 +328,10 @@ public: me->SetUInt64Value(UNIT_FIELD_TARGET, 0); //Select random target for dark beam to start on - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) { //Face our target - DarkGlareAngle = me->GetAngle(pTarget); + DarkGlareAngle = me->GetAngle(target); DarkGlareTickTimer = 1000; DarkGlareTick = 0; ClockWise = RAND(true, false); @@ -558,8 +558,8 @@ public: Creature* Spawned; Spawned = DoSpawnCreature(MOB_EYE_TENTACLE, x, y, 0, 0, TEMPSUMMON_CORPSE_DESPAWN, 500); if (Spawned && Spawned->AI()) - if (Unit* pTarget = SelectRandomNotStomach()) - Spawned->AI()->AttackStart(pTarget); + if (Unit* target = SelectRandomNotStomach()) + Spawned->AI()->AttackStart(target); } Unit* SelectRandomNotStomach() @@ -787,13 +787,13 @@ public: //Stomach Enter Timer if (StomachEnterTimer <= diff) { - if (Unit* pTarget = SelectRandomNotStomach()) + if (Unit* target = SelectRandomNotStomach()) { //Set target in stomach - Stomach_Map[pTarget->GetGUID()] = true; - pTarget->InterruptNonMeleeSpells(false); - pTarget->CastSpell(pTarget, SPELL_MOUTH_TENTACLE, true, NULL, NULL, me->GetGUID()); - StomachEnterTarget = pTarget->GetGUID(); + Stomach_Map[target->GetGUID()] = true; + target->InterruptNonMeleeSpells(false); + target->CastSpell(target, SPELL_MOUTH_TENTACLE, true, NULL, NULL, me->GetGUID()); + StomachEnterTarget = target->GetGUID(); StomachEnterVisTimer = 3800; } @@ -820,12 +820,12 @@ public: //GientClawTentacleTimer if (GiantClawTentacleTimer <= diff) { - if (Unit* pTarget = SelectRandomNotStomach()) + if (Unit* target = SelectRandomNotStomach()) { //Spawn claw tentacle on the random target - if (Creature* spawned = me->SummonCreature(MOB_GIANT_CLAW_TENTACLE, *pTarget, TEMPSUMMON_CORPSE_DESPAWN, 500)) + if (Creature* spawned = me->SummonCreature(MOB_GIANT_CLAW_TENTACLE, *target, TEMPSUMMON_CORPSE_DESPAWN, 500)) if (spawned->AI()) - spawned->AI()->AttackStart(pTarget); + spawned->AI()->AttackStart(target); } //One giant claw tentacle every minute @@ -835,12 +835,12 @@ public: //GiantEyeTentacleTimer if (GiantEyeTentacleTimer <= diff) { - if (Unit* pTarget = SelectRandomNotStomach()) + if (Unit* target = SelectRandomNotStomach()) { //Spawn claw tentacle on the random target - if (Creature* spawned = me->SummonCreature(MOB_GIANT_EYE_TENTACLE, *pTarget, TEMPSUMMON_CORPSE_DESPAWN, 500)) + if (Creature* spawned = me->SummonCreature(MOB_GIANT_EYE_TENTACLE, *target, TEMPSUMMON_CORPSE_DESPAWN, 500)) if (spawned->AI()) - spawned->AI()->AttackStart(pTarget); + spawned->AI()->AttackStart(target); } //One giant eye tentacle every minute @@ -988,9 +988,9 @@ public: //MindflayTimer if (MindflayTimer <= diff) { - Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); - if (pTarget && !pTarget->HasAura(SPELL_DIGESTIVE_ACID)) - DoCast(pTarget, SPELL_MIND_FLAY); + Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0); + if (target && !target->HasAura(SPELL_DIGESTIVE_ACID)) + DoCast(target, SPELL_MIND_FLAY); //Mindflay every 10 seconds MindflayTimer = 10000; @@ -1064,16 +1064,16 @@ public: //Dissapear and reappear at new position me->SetVisible(false); - Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); - if (!pTarget) + Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0); + if (!target) { me->Kill(me); return; } - if (!pTarget->HasAura(SPELL_DIGESTIVE_ACID)) + if (!target->HasAura(SPELL_DIGESTIVE_ACID)) { - me->GetMap()->CreatureRelocation(me, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0); + me->GetMap()->CreatureRelocation(me, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0); if (Creature* pPortal = me->SummonCreature(MOB_SMALL_PORTAL, *me, TEMPSUMMON_CORPSE_DESPAWN)) { pPortal->SetReactState(REACT_PASSIVE); @@ -1083,7 +1083,7 @@ public: GroundRuptureTimer = 500; HamstringTimer = 2000; EvadeTimer = 5000; - AttackStart(pTarget); + AttackStart(target); } me->SetVisible(true); @@ -1176,16 +1176,16 @@ public: //Dissapear and reappear at new position me->SetVisible(false); - Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); - if (!pTarget) + Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0); + if (!target) { me->Kill(me); return; } - if (!pTarget->HasAura(SPELL_DIGESTIVE_ACID)) + if (!target->HasAura(SPELL_DIGESTIVE_ACID)) { - me->GetMap()->CreatureRelocation(me, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0); + me->GetMap()->CreatureRelocation(me, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0); if (Creature* pPortal = me->SummonCreature(MOB_GIANT_PORTAL, *me, TEMPSUMMON_CORPSE_DESPAWN)) { pPortal->SetReactState(REACT_PASSIVE); @@ -1196,7 +1196,7 @@ public: HamstringTimer = 2000; ThrashTimer = 5000; EvadeTimer = 5000; - AttackStart(pTarget); + AttackStart(target); } me->SetVisible(true); } else EvadeTimer -= diff; @@ -1281,9 +1281,9 @@ public: //BeamTimer if (BeamTimer <= diff) { - Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); - if (pTarget && !pTarget->HasAura(SPELL_DIGESTIVE_ACID)) - DoCast(pTarget, SPELL_GREEN_BEAM); + Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0); + if (target && !target->HasAura(SPELL_DIGESTIVE_ACID)) + DoCast(target, SPELL_GREEN_BEAM); //Beam every 2 seconds BeamTimer = 2100; diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp index 26496020afa..8a40096bc33 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp @@ -136,61 +136,61 @@ public: { if (SpawnHatchlings_Timer <= diff) { - Unit* pTarget = NULL; - pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); - if (pTarget && pTarget->GetTypeId() == TYPEID_PLAYER) + Unit* target = NULL; + target = SelectTarget(SELECT_TARGET_RANDOM, 0); + if (target && target->GetTypeId() == TYPEID_PLAYER) { - DoCast(pTarget, SPELL_ROOT); + DoCast(target, SPELL_ROOT); - if (DoGetThreat(pTarget)) - DoModifyThreatPercent(pTarget, -100); + if (DoGetThreat(target)) + DoModifyThreatPercent(target, -100); switch(urand(0, 2)) { case 0: - DoTeleportPlayer(pTarget, -8106.0142f, 1289.2900f, -74.419533f, 5.112f); - Hatchling = me->SummonCreature(15962, pTarget->GetPositionX()-3, pTarget->GetPositionY()-3, pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + DoTeleportPlayer(target, -8106.0142f, 1289.2900f, -74.419533f, 5.112f); + Hatchling = me->SummonCreature(15962, target->GetPositionX()-3, target->GetPositionY()-3, target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (Hatchling) - Hatchling->AI()->AttackStart(pTarget); - Hatchling = me->SummonCreature(15962, pTarget->GetPositionX()-3, pTarget->GetPositionY()+3, pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + Hatchling->AI()->AttackStart(target); + Hatchling = me->SummonCreature(15962, target->GetPositionX()-3, target->GetPositionY()+3, target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (Hatchling) - Hatchling->AI()->AttackStart(pTarget); - Hatchling = me->SummonCreature(15962, pTarget->GetPositionX()-5, pTarget->GetPositionY()-5, pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + Hatchling->AI()->AttackStart(target); + Hatchling = me->SummonCreature(15962, target->GetPositionX()-5, target->GetPositionY()-5, target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (Hatchling) - Hatchling->AI()->AttackStart(pTarget); - Hatchling = me->SummonCreature(15962, pTarget->GetPositionX()-5, pTarget->GetPositionY()+5, pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + Hatchling->AI()->AttackStart(target); + Hatchling = me->SummonCreature(15962, target->GetPositionX()-5, target->GetPositionY()+5, target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (Hatchling) - Hatchling->AI()->AttackStart(pTarget); + Hatchling->AI()->AttackStart(target); break; case 1: - DoTeleportPlayer(pTarget, -7990.135354f, 1155.1907f, -78.849319f, 2.608f); - Hatchling = me->SummonCreature(15962, pTarget->GetPositionX()-3, pTarget->GetPositionY()-3, pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + DoTeleportPlayer(target, -7990.135354f, 1155.1907f, -78.849319f, 2.608f); + Hatchling = me->SummonCreature(15962, target->GetPositionX()-3, target->GetPositionY()-3, target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (Hatchling) - Hatchling->AI()->AttackStart(pTarget); - Hatchling = me->SummonCreature(15962, pTarget->GetPositionX()-3, pTarget->GetPositionY()+3, pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + Hatchling->AI()->AttackStart(target); + Hatchling = me->SummonCreature(15962, target->GetPositionX()-3, target->GetPositionY()+3, target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (Hatchling) - Hatchling->AI()->AttackStart(pTarget); - Hatchling = me->SummonCreature(15962, pTarget->GetPositionX()-5, pTarget->GetPositionY()-5, pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + Hatchling->AI()->AttackStart(target); + Hatchling = me->SummonCreature(15962, target->GetPositionX()-5, target->GetPositionY()-5, target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (Hatchling) - Hatchling->AI()->AttackStart(pTarget); - Hatchling = me->SummonCreature(15962, pTarget->GetPositionX()-5, pTarget->GetPositionY()+5, pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + Hatchling->AI()->AttackStart(target); + Hatchling = me->SummonCreature(15962, target->GetPositionX()-5, target->GetPositionY()+5, target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (Hatchling) - Hatchling->AI()->AttackStart(pTarget); + Hatchling->AI()->AttackStart(target); break; case 2: - DoTeleportPlayer(pTarget, -8159.7753f, 1127.9064f, -76.868660f, 0.675f); - Hatchling = me->SummonCreature(15962, pTarget->GetPositionX()-3, pTarget->GetPositionY()-3, pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + DoTeleportPlayer(target, -8159.7753f, 1127.9064f, -76.868660f, 0.675f); + Hatchling = me->SummonCreature(15962, target->GetPositionX()-3, target->GetPositionY()-3, target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (Hatchling) - Hatchling->AI()->AttackStart(pTarget); - Hatchling = me->SummonCreature(15962, pTarget->GetPositionX()-3, pTarget->GetPositionY()+3, pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + Hatchling->AI()->AttackStart(target); + Hatchling = me->SummonCreature(15962, target->GetPositionX()-3, target->GetPositionY()+3, target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (Hatchling) - Hatchling->AI()->AttackStart(pTarget); - Hatchling = me->SummonCreature(15962, pTarget->GetPositionX()-5, pTarget->GetPositionY()-5, pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + Hatchling->AI()->AttackStart(target); + Hatchling = me->SummonCreature(15962, target->GetPositionX()-5, target->GetPositionY()-5, target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (Hatchling) - Hatchling->AI()->AttackStart(pTarget); - Hatchling = me->SummonCreature(15962, pTarget->GetPositionX()-5, pTarget->GetPositionY()+5, pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + Hatchling->AI()->AttackStart(target); + Hatchling = me->SummonCreature(15962, target->GetPositionX()-5, target->GetPositionY()+5, target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (Hatchling) - Hatchling->AI()->AttackStart(pTarget); + Hatchling->AI()->AttackStart(target); break; } } diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp index 4e6dd4d7c32..f8cafea0ef2 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp @@ -95,8 +95,8 @@ public: // Wyvern Timer if (Wyvern_Timer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_WYVERNSTING); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(target, SPELL_WYVERNSTING); Wyvern_Timer = 15000 + rand()%17000; } else Wyvern_Timer -= diff; diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp index 220bea8602d..01d26ed7726 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp @@ -111,11 +111,11 @@ public: //ChangeTarget_Timer if (Submerged && ChangeTarget_Timer <= diff) { - Unit* pTarget = NULL; - pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); + Unit* target = NULL; + target = SelectTarget(SELECT_TARGET_RANDOM, 0); - if (pTarget) - DoTeleportTo(pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ()); + if (target) + DoTeleportTo(target->GetPositionX(), target->GetPositionY(), target->GetPositionZ()); ChangeTarget_Timer = 10000 + rand()%10000; } else ChangeTarget_Timer -= diff; diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp index 8374303bc6e..4fc02c70728 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp @@ -236,9 +236,9 @@ public: for (uint16 i = 0; i < 41; ++i) { - if (Player* pTarget = CAST_PLR(SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))) + if (Player* target = CAST_PLR(SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))) { - if (Group *pGrp = pTarget->GetGroup()) + if (Group *pGrp = target->GetGroup()) for (uint8 ico = 0; ico < TARGETICONCOUNT; ++ico) { //if (grp->m_targetIcons[ico] == me->GetGUID()) -- private member :( @@ -264,15 +264,15 @@ public: case 25: Images25 = true; break; } - Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); + Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0); Creature* Image1 = me->SummonCreature(15263, i1->x, i1->y, i1->z, i1->r, TEMPSUMMON_CORPSE_DESPAWN, 30000); if (Image1) { Image1->SetMaxHealth(me->GetMaxHealth() / 5); Image1->SetHealth(me->GetHealth() / 5); - if (pTarget) - Image1->AI()->AttackStart(pTarget); + if (target) + Image1->AI()->AttackStart(target); CAST_AI(boss_skeram::boss_skeramAI, Image1->AI())->IsImage = true; } @@ -281,8 +281,8 @@ public: { Image2->SetMaxHealth(me->GetMaxHealth() / 5); Image2->SetHealth(me->GetHealth() / 5); - if (pTarget) - Image2->AI()->AttackStart(pTarget); + if (target) + Image2->AI()->AttackStart(target); CAST_AI(boss_skeram::boss_skeramAI, Image2->AI())->IsImage = true; } Invisible = true; diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp index 50da169751b..bd66602a24b 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp @@ -79,7 +79,7 @@ struct boss_twinemperorsAI : public ScriptedAI virtual bool IAmVeklor() = 0; virtual void Reset() = 0; - virtual void CastSpellOnBug(Creature* pTarget) = 0; + virtual void CastSpellOnBug(Creature* target) = 0; void TwinReset() { @@ -418,12 +418,12 @@ public: me->ApplySpellImmune(0, IMMUNITY_DAMAGE, SPELL_SCHOOL_MASK_MAGIC, true); } - void CastSpellOnBug(Creature* pTarget) + void CastSpellOnBug(Creature* target) { - pTarget->setFaction(14); - pTarget->AI()->AttackStart(me->getThreatManager().getHostilTarget()); - pTarget->AddAura(SPELL_MUTATE_BUG, pTarget); - pTarget->SetFullHealth(); + target->setFaction(14); + target->AI()->AttackStart(me->getThreatManager().getHostilTarget()); + target->AddAura(SPELL_MUTATE_BUG, target); + target->SetFullHealth(); } void UpdateAI(const uint32 diff) @@ -508,11 +508,11 @@ public: me->SetBaseWeaponDamage(BASE_ATTACK, MAXDAMAGE, 0); } - void CastSpellOnBug(Creature* pTarget) + void CastSpellOnBug(Creature* target) { - pTarget->setFaction(14); - pTarget->AddAura(SPELL_EXPLODEBUG, pTarget); - pTarget->SetFullHealth(); + target->setFaction(14); + target->AddAura(SPELL_EXPLODEBUG, target); + target->SetFullHealth(); } void UpdateAI(const uint32 diff) @@ -542,10 +542,10 @@ public: //Blizzard_Timer if (Blizzard_Timer <= diff) { - Unit* pTarget = NULL; - pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 45, true); - if (pTarget) - DoCast(pTarget, SPELL_BLIZZARD); + Unit* target = NULL; + target = SelectTarget(SELECT_TARGET_RANDOM, 0, 45, true); + if (target) + DoCast(target, SPELL_BLIZZARD); Blizzard_Timer = 15000+rand()%15000; } else Blizzard_Timer -= diff; diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp index c1850b4e8ce..650463a02df 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp @@ -19,7 +19,7 @@ /* ScriptData SDName: mob_anubisath_sentinel SD%Complete: 95 -SDComment: Shadow storm is not properly implemented in core it should only pTarget ppl outside of melee range. +SDComment: Shadow storm is not properly implemented in core it should only target ppl outside of melee range. SDCategory: Temple of Ahn'Qiraj EndScriptData */ diff --git a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp index 9d7fcc11135..98c93ec3c34 100644 --- a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp +++ b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp @@ -142,8 +142,8 @@ public: break; case 3: me->setFaction(FACTION_HOSTILE); - if (Player* pTarget = Player::GetPlayer(*me, PlayerGUID)) - AttackStart(pTarget); + if (Player* target = Player::GetPlayer(*me, PlayerGUID)) + AttackStart(target); if (pInstance) { diff --git a/src/server/scripts/Kalimdor/boss_azuregos.cpp b/src/server/scripts/Kalimdor/boss_azuregos.cpp index 035153e46f7..8bfefade07e 100644 --- a/src/server/scripts/Kalimdor/boss_azuregos.cpp +++ b/src/server/scripts/Kalimdor/boss_azuregos.cpp @@ -122,8 +122,8 @@ public: //ManaStorm_Timer if (ManaStorm_Timer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_MANASTORM); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(target, SPELL_MANASTORM); ManaStorm_Timer = 7500 + rand()%5000; } else ManaStorm_Timer -= diff; diff --git a/src/server/scripts/Kalimdor/silithus.cpp b/src/server/scripts/Kalimdor/silithus.cpp index 04cddc0c272..7baa2603b10 100644 --- a/src/server/scripts/Kalimdor/silithus.cpp +++ b/src/server/scripts/Kalimdor/silithus.cpp @@ -841,7 +841,7 @@ public: void UpdateAI(const uint32 diff) { - Unit* pTarget = NULL; + Unit* target = NULL; //Player* player = me->GetPlayer(PlayerGUID); if (!Timers) @@ -888,21 +888,21 @@ public: if (!hasTarget) { if (me->GetEntry() == 15424 || me->GetEntry() == 15422 || me->GetEntry() == 15414) - pTarget = me->FindNearestCreature(15423, 20, true); + target = me->FindNearestCreature(15423, 20, true); if (me->GetEntry() == 15423) { uint8 tar = urand(0, 2); if (tar == 0) - pTarget = me->FindNearestCreature(15422, 20, true); + target = me->FindNearestCreature(15422, 20, true); else if (tar == 1) - pTarget = me->FindNearestCreature(15424, 20, true); + target = me->FindNearestCreature(15424, 20, true); else if (tar == 2) - pTarget = me->FindNearestCreature(15414, 20, true); + target = me->FindNearestCreature(15414, 20, true); } hasTarget = true; - if (pTarget) - me->AI()->AttackStart(pTarget); + if (target) + me->AI()->AttackStart(target); } if (!(me->FindNearestCreature(15379, 60))) DoCast(me, 33652); diff --git a/src/server/scripts/Kalimdor/thunder_bluff.cpp b/src/server/scripts/Kalimdor/thunder_bluff.cpp index e9766280aa1..36c81eecb9c 100644 --- a/src/server/scripts/Kalimdor/thunder_bluff.cpp +++ b/src/server/scripts/Kalimdor/thunder_bluff.cpp @@ -99,9 +99,9 @@ public: if (BerserkerCharge_Timer <= diff) { - Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); - if (pTarget) - DoCast(pTarget, SPELL_BERSERKER_CHARGE); + Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0); + if (target) + DoCast(target, SPELL_BERSERKER_CHARGE); BerserkerCharge_Timer = 25000; } else BerserkerCharge_Timer -= diff; 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; diff --git a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp index 446783802e2..7b0c8fc017e 100644 --- a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp +++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp @@ -216,11 +216,11 @@ public: summoned->SetDisplayId(soulmodel); summoned->setFaction(me->getFaction()); - if (Unit* pTarget = Unit::GetUnit(*me, soulholder)) + if (Unit* target = Unit::GetUnit(*me, soulholder)) { CAST_AI(mob_stolen_soul::mob_stolen_soulAI, summoned->AI())->SetMyClass(soulclass); - summoned->AI()->AttackStart(pTarget); + summoned->AI()->AttackStart(target); } } } @@ -259,9 +259,9 @@ public: if (StolenSoul_Timer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) { - if (pTarget->GetTypeId() == TYPEID_PLAYER) + if (target->GetTypeId() == TYPEID_PLAYER) { if (me->IsNonMeleeSpellCasted(false)) me->InterruptNonMeleeSpells(true); @@ -272,11 +272,11 @@ public: else DoScriptText(SAY_SOUL_CLEAVE, me); - soulmodel = pTarget->GetDisplayId(); - soulholder = pTarget->GetGUID(); - soulclass = pTarget->getClass(); + soulmodel = target->GetDisplayId(); + soulholder = target->GetGUID(); + soulclass = target->getClass(); - DoCast(pTarget, SPELL_STOLEN_SOUL); + DoCast(target, SPELL_STOLEN_SOUL); me->SummonCreature(ENTRY_STOLEN_SOUL, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000); StolenSoul_Timer = 20000 + rand()% 10000; @@ -286,8 +286,8 @@ public: if (Ribbon_of_Souls_timer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_RIBBON_OF_SOULS); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(target, SPELL_RIBBON_OF_SOULS); Ribbon_of_Souls_timer = 5000 + (rand()%20 * 1000); } else Ribbon_of_Souls_timer -= diff; diff --git a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp index d047ccefe46..a7309ba146c 100644 --- a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp +++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp @@ -136,16 +136,16 @@ public: if (FocusFire_Timer <= diff) { // Summon Focus Fire & Emote - Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1); - if (pTarget && pTarget->GetTypeId() == TYPEID_PLAYER && pTarget->isAlive()) + Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1); + if (target && target->GetTypeId() == TYPEID_PLAYER && target->isAlive()) { - FocusedTargetGUID = pTarget->GetGUID(); - me->SummonCreature(ENTRY_FOCUS_FIRE, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 5500); + FocusedTargetGUID = target->GetGUID(); + me->SummonCreature(ENTRY_FOCUS_FIRE, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 5500); // TODO: Find better way to handle emote // Emote std::string *emote = new std::string(EMOTE_FOCUSES_ON); - emote->append(pTarget->GetName()); + emote->append(target->GetName()); emote->append("!"); const char* text = emote->c_str(); me->MonsterTextEmote(text, 0, true); diff --git a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp index 77824c72a1c..829f681982f 100644 --- a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp +++ b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp @@ -128,8 +128,8 @@ public: { summoned->CastSpell(summoned, SPELL_ETHEREAL_BEACON_VISUAL, false); - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - summoned->AI()->AttackStart(pTarget); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + summoned->AI()->AttackStart(target); } summons.Summon(summoned); diff --git a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp index 6bc290f381d..ca8557b22af 100644 --- a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp +++ b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp @@ -90,9 +90,9 @@ public: if (VoidBlast_Timer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) { - DoCast(pTarget, SPELL_VOID_BLAST); + DoCast(target, SPELL_VOID_BLAST); VoidBlast_Timer = 500; ++VoidBlast_Counter; } diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp index 5060e3ea59b..43171eda1af 100644 --- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp +++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp @@ -112,8 +112,8 @@ public: void JustSummoned(Creature* summoned) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - summoned->AI()->AttackStart(pTarget); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + summoned->AI()->AttackStart(target); } void SythSummoning() @@ -154,40 +154,40 @@ public: if (flameshock_timer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_FLAME_SHOCK); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(target, SPELL_FLAME_SHOCK); flameshock_timer = 10000 + rand()%5000; } else flameshock_timer -= diff; if (arcaneshock_timer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_ARCANE_SHOCK); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(target, SPELL_ARCANE_SHOCK); arcaneshock_timer = 10000 + rand()%5000; } else arcaneshock_timer -= diff; if (frostshock_timer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_FROST_SHOCK); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(target, SPELL_FROST_SHOCK); frostshock_timer = 10000 + rand()%5000; } else frostshock_timer -= diff; if (shadowshock_timer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_SHADOW_SHOCK); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(target, SPELL_SHADOW_SHOCK); shadowshock_timer = 10000 + rand()%5000; } else shadowshock_timer -= diff; if (chainlightning_timer <= diff) { - 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); chainlightning_timer = 25000; } else chainlightning_timer -= diff; @@ -229,16 +229,16 @@ public: if (flameshock_timer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_FLAME_SHOCK); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(target, SPELL_FLAME_SHOCK); flameshock_timer = 5000; } else flameshock_timer -= diff; if (flamebuffet_timer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_FLAME_BUFFET); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(target, SPELL_FLAME_BUFFET); flamebuffet_timer = 5000; } else flamebuffet_timer -= diff; @@ -288,16 +288,16 @@ public: if (arcaneshock_timer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_ARCANE_SHOCK); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(target, SPELL_ARCANE_SHOCK); arcaneshock_timer = 5000; } else arcaneshock_timer -= diff; if (arcanebuffet_timer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_ARCANE_BUFFET); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(target, SPELL_ARCANE_BUFFET); arcanebuffet_timer = 5000; } else arcanebuffet_timer -= diff; @@ -342,16 +342,16 @@ public: if (frostshock_timer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_FROST_SHOCK); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(target, SPELL_FROST_SHOCK); frostshock_timer = 5000; } else frostshock_timer -= diff; if (frostbuffet_timer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_FROST_BUFFET); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(target, SPELL_FROST_BUFFET); frostbuffet_timer = 5000; } else frostbuffet_timer -= diff; @@ -397,16 +397,16 @@ public: if (shadowshock_timer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_SHADOW_SHOCK); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(target, SPELL_SHADOW_SHOCK); shadowshock_timer = 5000; } else shadowshock_timer -= diff; if (shadowbuffet_timer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_SHADOW_BUFFET); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(target, SPELL_SHADOW_BUFFET); shadowbuffet_timer = 5000; } else shadowbuffet_timer -= diff; diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp index 1a773d81eef..bc1c4ee27b5 100644 --- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp +++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp @@ -151,16 +151,16 @@ public: if (Sheep_Timer <= diff) { - Unit* pTarget; + Unit* target; //second top aggro target in normal, random target in heroic correct? if (IsHeroic()) - pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); + target = SelectTarget(SELECT_TARGET_RANDOM, 0); else - pTarget = SelectTarget(SELECT_TARGET_TOPAGGRO, 1); + target = SelectTarget(SELECT_TARGET_TOPAGGRO, 1); - if (pTarget) - DoCast(pTarget, SPELL_POLYMORPH); + if (target) + DoCast(target, SPELL_POLYMORPH); Sheep_Timer = 15000+rand()%2500; } else Sheep_Timer -= diff; @@ -184,21 +184,21 @@ public: { DoScriptText(EMOTE_ARCANE_EXP, me); - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) { if (me->IsNonMeleeSpellCasted(false)) me->InterruptNonMeleeSpells(false); //Spell doesn't work, but we use for visual effect at least - DoCast(pTarget, SPELL_BLINK); + DoCast(target, SPELL_BLINK); - float X = pTarget->GetPositionX(); - float Y = pTarget->GetPositionY(); - float Z = pTarget->GetPositionZ(); + float X = target->GetPositionX(); + float Y = target->GetPositionY(); + float Z = target->GetPositionZ(); DoTeleportTo(X, Y, Z); - DoCast(pTarget, SPELL_BLINK_TELEPORT); + DoCast(target, SPELL_BLINK_TELEPORT); Blink = true; } Blink_Timer = 35000+rand()%5000; diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp index 68a2ee1a8e7..d22dbd4b172 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp @@ -136,9 +136,9 @@ public: std::list<HostileReference *> t_list = me->getThreatManager().getThreatList(); for (std::list<HostileReference *>::const_iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) { - Unit* pTarget = Unit::GetUnit(*me, (*itr)->getUnitGuid()); - if (pTarget && pTarget->GetTypeId() == TYPEID_PLAYER) - pTarget->CastSpell(pTarget, SPELL_INCITE_CHAOS_B, true); + Unit* target = Unit::GetUnit(*me, (*itr)->getUnitGuid()); + if (target && target->GetTypeId() == TYPEID_PLAYER) + target->CastSpell(target, SPELL_INCITE_CHAOS_B, true); } DoResetThreat(); @@ -150,8 +150,8 @@ public: //Charge_Timer if (Charge_Timer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_CHARGE); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(target, SPELL_CHARGE); Charge_Timer = 15000 + rand()%10000; } else Charge_Timer -= diff; diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp index c1d63b228cd..8f014956d77 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp @@ -274,10 +274,10 @@ public: if (IsHeroic() && banish_Timer <= diff) { - Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 30, false); - if (pTarget) + Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 30, false); + if (target) { - DoCast(pTarget, SPELL_BANISH); + DoCast(target, SPELL_BANISH); banish_Timer = 16000; } } else banish_Timer -= diff; diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp index 6601e298a01..250d4927894 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp @@ -82,14 +82,14 @@ public: std::list<HostileReference *> t_list = me->getThreatManager().getThreatList(); for (std::list<HostileReference *>::const_iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) { - Unit* pTarget = Unit::GetUnit(*me, (*itr)->getUnitGuid()); - if (pTarget && pTarget->GetTypeId() == TYPEID_PLAYER) + Unit* target = Unit::GetUnit(*me, (*itr)->getUnitGuid()); + if (target && target->GetTypeId() == TYPEID_PLAYER) { //Not do anything without aura, spell can be resisted! - if (pTarget->HasAura(SPELL_SONIC_BOOM_CAST) && me->IsWithinDistInMap(pTarget, 34.0f)) + if (target->HasAura(SPELL_SONIC_BOOM_CAST) && me->IsWithinDistInMap(target, 34.0f)) { //This will be wrong calculation. Also, comments suggest it must deal damage - pTarget->SetHealth(pTarget->CountPctFromMaxHealth(20)); + target->SetHealth(target->CountPctFromMaxHealth(20)); } } } @@ -98,10 +98,10 @@ public: void EnterCombat(Unit* /*who*/) { } // Sonic Boom instant damage (needs core fix instead of this) - void SpellHitTarget(Unit* pTarget, const SpellEntry *spell) + void SpellHitTarget(Unit* target, const SpellEntry *spell) { - if (pTarget && pTarget->isAlive() && spell && spell->Id == uint32(SPELL_SONIC_BOOM_EFFECT)) - me->DealDamage(pTarget, (pTarget->GetHealth()*90)/100, NULL, SPELL_DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NATURE, spell); + if (target && target->isAlive() && spell && spell->Id == uint32(SPELL_SONIC_BOOM_EFFECT)) + me->DealDamage(target, (target->GetHealth()*90)/100, NULL, SPELL_DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NATURE, spell); } void UpdateAI(const uint32 diff) @@ -131,8 +131,8 @@ public: // Murmur's Touch if (MurmursTouch_Timer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 80, true)) - DoCast(pTarget, SPELL_MURMURS_TOUCH); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 80, true)) + DoCast(target, SPELL_MURMURS_TOUCH); MurmursTouch_Timer = 25000 + rand()%10000; } else MurmursTouch_Timer -= diff; @@ -149,10 +149,10 @@ public: // Magnetic Pull if (MagneticPull_Timer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - if (pTarget->GetTypeId() == TYPEID_PLAYER && pTarget->isAlive()) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (target->GetTypeId() == TYPEID_PLAYER && target->isAlive()) { - DoCast(pTarget, SPELL_MAGNETIC_PULL); + DoCast(target, SPELL_MAGNETIC_PULL); MagneticPull_Timer = 15000+rand()%15000; return; } @@ -166,18 +166,18 @@ public: { std::list<HostileReference*>& m_threatlist = me->getThreatManager().getThreatList(); for (std::list<HostileReference*>::const_iterator i = m_threatlist.begin(); i != m_threatlist.end(); ++i) - if (Unit* pTarget = Unit::GetUnit((*me), (*i)->getUnitGuid())) - if (pTarget->isAlive() && !me->IsWithinDist(pTarget, 35, false)) - DoCast(pTarget, SPELL_THUNDERING_STORM, true); + if (Unit* target = Unit::GetUnit((*me), (*i)->getUnitGuid())) + if (target->isAlive() && !me->IsWithinDist(target, 35, false)) + DoCast(target, SPELL_THUNDERING_STORM, true); ThunderingStorm_Timer = 15000; } else ThunderingStorm_Timer -= diff; // Sonic Shock if (SonicShock_Timer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 20, false)) - if (pTarget->isAlive()) - DoCast(pTarget, SPELL_SONIC_SHOCK); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 20, false)) + if (target->isAlive()) + DoCast(target, SPELL_SONIC_SHOCK); SonicShock_Timer = 10000+rand()%10000; } else SonicShock_Timer -= diff; } @@ -189,10 +189,10 @@ public: { std::list<HostileReference*>& m_threatlist = me->getThreatManager().getThreatList(); for (std::list<HostileReference*>::const_iterator i = m_threatlist.begin(); i != m_threatlist.end(); ++i) - if (Unit* pTarget = Unit::GetUnit((*me), (*i)->getUnitGuid())) - if (pTarget->isAlive() && me->IsWithinMeleeRange(pTarget)) + if (Unit* target = Unit::GetUnit((*me), (*i)->getUnitGuid())) + if (target->isAlive() && me->IsWithinMeleeRange(target)) { - me->TauntApply(pTarget); + me->TauntApply(target); break; } } diff --git a/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp b/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp index 76eff9fa474..b1384a84d39 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp @@ -151,10 +151,10 @@ public: std::list<HostileReference *>::const_iterator itr = m_threatlist.begin(); for (; itr!= m_threatlist.end(); ++itr) //store the threat list in a different container { - Unit* pTarget = Unit::GetUnit(*me, (*itr)->getUnitGuid()); + Unit* target = Unit::GetUnit(*me, (*itr)->getUnitGuid()); //only on alive players - if (pTarget && pTarget->isAlive() && pTarget->GetTypeId() == TYPEID_PLAYER) - targets.push_back(pTarget); + if (target && target->isAlive() && target->GetTypeId() == TYPEID_PLAYER) + targets.push_back(target); } //Sort the list of players @@ -168,16 +168,16 @@ public: { for (std::list<Unit* >::const_iterator itr = targets.begin(); itr != targets.end(); ++itr) { - Unit* pTarget = *itr; - if (!pTarget) return; + Unit* target = *itr; + if (!target) return; for (uint32 i = 0; i<3; ++i) { uint8 eff = spellInfo->Effect[i]; if (eff >= TOTAL_SPELL_EFFECTS) continue; - Aura *Aur = new Aura(spellInfo, i, pTarget, pTarget, pTarget); - pTarget->AddAura(Aur); + Aura *Aur = new Aura(spellInfo, i, target, target, target); + target->AddAura(Aur); } } }*/ @@ -228,8 +228,8 @@ public: { DoCast(me->getVictim(), SPELL_BEWILDERING_STRIKE); float mt_threat = DoGetThreat(me->getVictim()); - if (Unit* pTarget = SelectTarget(SELECT_TARGET_TOPAGGRO, 1)) - me->AddThreat(pTarget, mt_threat); + if (Unit* target = SelectTarget(SELECT_TARGET_TOPAGGRO, 1)) + me->AddThreat(target, mt_threat); BewilderingStrikeTimer = 20000; } else BewilderingStrikeTimer -= diff; @@ -277,26 +277,26 @@ public: { if (Phase1) { - Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); - if (pTarget && pTarget->isAlive()) + Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0); + if (target && target->isAlive()) { Phase1 = false; - TargetThreat = DoGetThreat(pTarget); - TargetGUID = pTarget->GetGUID(); - pTarget->CastSpell(me, SPELL_TAUNT_GURTOGG, true); - if (DoGetThreat(pTarget)) - DoModifyThreatPercent(pTarget, -100); - me->AddThreat(pTarget, 50000000.0f); + TargetThreat = DoGetThreat(target); + TargetGUID = target->GetGUID(); + target->CastSpell(me, SPELL_TAUNT_GURTOGG, true); + if (DoGetThreat(target)) + DoModifyThreatPercent(target, -100); + me->AddThreat(target, 50000000.0f); me->ApplySpellImmune(0, IMMUNITY_STATE, SPELL_AURA_MOD_TAUNT, true); me->ApplySpellImmune(0, IMMUNITY_EFFECT, SPELL_EFFECT_ATTACK_ME, true); // If VMaps are disabled, this spell can call the whole instance DoCast(me, SPELL_INSIGNIFIGANCE, true); - DoCast(pTarget, SPELL_FEL_RAGE_TARGET, true); - DoCast(pTarget, SPELL_FEL_RAGE_2, true); + DoCast(target, SPELL_FEL_RAGE_TARGET, true); + DoCast(target, SPELL_FEL_RAGE_2, true); /* These spells do not work, comment them out for now. - DoCast(pTarget, SPELL_FEL_RAGE_2, true); - DoCast(pTarget, SPELL_FEL_RAGE_3, true);*/ + DoCast(target, SPELL_FEL_RAGE_2, true); + DoCast(target, SPELL_FEL_RAGE_3, true);*/ //Cast this without triggered so that it appears in combat logs and shows visual. DoCast(me, SPELL_FEL_RAGE_SELF); diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp index 37883eb14c4..10509de0266 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp @@ -392,13 +392,13 @@ public: void ChargeCheck() { - Unit* pTarget = SelectTarget(SELECT_TARGET_FARTHEST, 0, 200, false); - if (pTarget && (!me->IsWithinCombatRange(pTarget, FLAME_CHARGE_DISTANCE))) + Unit* target = SelectTarget(SELECT_TARGET_FARTHEST, 0, 200, false); + if (target && (!me->IsWithinCombatRange(target, FLAME_CHARGE_DISTANCE))) { - me->AddThreat(pTarget, 5000000.0f); - AttackStart(pTarget); - DoCast(pTarget, SPELL_CHARGE); - me->MonsterTextEmote(EMOTE_SETS_GAZE_ON, pTarget->GetGUID()); + me->AddThreat(target, 5000000.0f); + AttackStart(target); + DoCast(target, SPELL_CHARGE); + me->MonsterTextEmote(EMOTE_SETS_GAZE_ON, target->GetGUID()); } } @@ -411,8 +411,8 @@ public: Glaive->InterruptNonMeleeSpells(true); DoCast(me, SPELL_FLAME_ENRAGE, true); DoResetThreat(); - Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); - if (pTarget && pTarget->isAlive()) + Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0); + if (target && target->isAlive()) { me->AddThreat(me->getVictim(), 5000000.0f); AttackStart(me->getVictim()); @@ -1038,8 +1038,8 @@ public: case EVENT_PARASITIC_SHADOWFIEND: { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1, 200, true)) - DoCast(pTarget, SPELL_PARASITIC_SHADOWFIEND, true); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 200, true)) + DoCast(target, SPELL_PARASITIC_SHADOWFIEND, true); Timer[EVENT_PARASITIC_SHADOWFIEND] = 35000 + rand()%10000; } break; @@ -1271,9 +1271,9 @@ public: { if (GETCRE(Illidan, IllidanGUID)) { - Unit* pTarget = Illidan->AI()->SelectTarget(SELECT_TARGET_RANDOM, 0); + Unit* target = Illidan->AI()->SelectTarget(SELECT_TARGET_RANDOM, 0); - if (!pTarget || !me->IsWithinDistInMap(pTarget, 80) || Illidan->IsWithinDistInMap(pTarget, 20)) + if (!target || !me->IsWithinDistInMap(target, 80) || Illidan->IsWithinDistInMap(target, 20)) { uint8 pos = rand()%4; BlinkTo(HoverPosition[pos].x, HoverPosition[pos].y, HoverPosition[pos].z); @@ -1281,7 +1281,7 @@ public: else { float x, y, z; - pTarget->GetPosition(x, y, z); + target->GetPosition(x, y, z); BlinkTo(x, y, z); } } @@ -1886,19 +1886,19 @@ void boss_illidan_stormrage::boss_illidan_stormrageAI::JustSummoned(Creature* su summon->setDeathState(JUST_DIED); return; } - Unit* pTarget = SelectTarget(SELECT_TARGET_TOPAGGRO, 0, 999, true); - if (!pTarget || pTarget->HasAura(SPELL_PARASITIC_SHADOWFIEND) - || pTarget->HasAura(SPELL_PARASITIC_SHADOWFIEND2)) - pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 999, true); - if (pTarget) - summon->AI()->AttackStart(pTarget); + Unit* target = SelectTarget(SELECT_TARGET_TOPAGGRO, 0, 999, true); + if (!target || target->HasAura(SPELL_PARASITIC_SHADOWFIEND) + || target->HasAura(SPELL_PARASITIC_SHADOWFIEND2)) + target = SelectTarget(SELECT_TARGET_RANDOM, 0, 999, true); + if (target) + summon->AI()->AttackStart(target); } break; case SHADOW_DEMON: - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 999, true)) // only on players. + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 999, true)) // only on players. { - summon->AddThreat(pTarget, 5000000.0f); - summon->AI()->AttackStart(pTarget); + summon->AddThreat(target, 5000000.0f); + summon->AI()->AttackStart(target); } break; case MAIEV_SHADOWSONG: @@ -2128,8 +2128,8 @@ public: void JustDied(Unit* /*killer*/) { - if (Unit* pTarget = Unit::GetUnit((*me), TargetGUID)) - pTarget->RemoveAurasDueToSpell(SPELL_PARALYZE); + if (Unit* target = Unit::GetUnit((*me), TargetGUID)) + target->RemoveAurasDueToSpell(SPELL_PARALYZE); } void UpdateAI(const uint32 /*diff*/) @@ -2231,8 +2231,8 @@ public: { if (!me->getVictim()) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 999, true)) - AttackStart(pTarget); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 999, true)) + AttackStart(target); else { me->SetVisible(false); diff --git a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp index 0bf3d3f54bb..9311e1e6744 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp @@ -190,8 +190,8 @@ public: //Randomly cast one beam. if (BeamTimer <= diff) { - Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); - if (!pTarget || !pTarget->isAlive()) + Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0); + if (!target || !target->isAlive()) return; BeamTimer = 9000; @@ -199,16 +199,16 @@ public: switch(CurrentBeam) { case 0: - DoCast(pTarget, SPELL_BEAM_SINISTER); + DoCast(target, SPELL_BEAM_SINISTER); break; case 1: - DoCast(pTarget, SPELL_BEAM_VILE); + DoCast(target, SPELL_BEAM_VILE); break; case 2: - DoCast(pTarget, SPELL_BEAM_WICKED); + DoCast(target, SPELL_BEAM_WICKED); break; case 3: - DoCast(pTarget, SPELL_BEAM_SINFUL); + DoCast(target, SPELL_BEAM_SINFUL); break; } ++BeamCount; diff --git a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp index 13a877b91f0..d0e4258e986 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp @@ -199,20 +199,20 @@ public: float y = Coords[random].y; Creature* Soul = me->SummonCreature(CREATURE_ENSLAVED_SOUL, x, y, me->GetPositionZ(), me->GetOrientation(), TEMPSUMMON_CORPSE_DESPAWN, 0); if (!Soul) return false; - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) { CAST_AI(npc_enslaved_soul::npc_enslaved_soulAI, Soul->AI())->ReliquaryGUID = me->GetGUID(); - Soul->AI()->AttackStart(pTarget); + Soul->AI()->AttackStart(target); } else EnterEvadeMode(); return true; } - void MergeThreatList(Creature* pTarget) + void MergeThreatList(Creature* target) { - if (!pTarget) + if (!target) return; - std::list<HostileReference*>& m_threatlist = pTarget->getThreatManager().getThreatList(); + std::list<HostileReference*>& m_threatlist = target->getThreatManager().getThreatList(); std::list<HostileReference*>::const_iterator itr = m_threatlist.begin(); for (; itr != m_threatlist.end(); ++itr) { @@ -220,7 +220,7 @@ public: if (pUnit) { DoModifyThreatPercent(pUnit, -100); - float threat = pTarget->getThreatManager().getThreat(pUnit); + float threat = target->getThreatManager().getThreat(pUnit); me->AddThreat(pUnit, threat); // This makes it so that the unit has the same amount of threat in Reliquary's threatlist as in the target creature's (One of the Essences). } } @@ -446,11 +446,11 @@ public: return; // No targets added for some reason. No point continuing. targets.sort(Trinity::ObjectDistanceOrderPred(me)); // Sort players by distance. targets.resize(1); // Only need closest target. - Unit* pTarget = targets.front(); // Get the first target. - if (pTarget) - pTarget->CastSpell(me, SPELL_FIXATE_TAUNT, true); + Unit* target = targets.front(); // Get the first target. + if (target) + target->CastSpell(me, SPELL_FIXATE_TAUNT, true); DoResetThreat(); - me->AddThreat(pTarget, 1000000); + me->AddThreat(target, 1000000); } void UpdateAI(const uint32 diff) diff --git a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp index 192905bd469..2d09088edc8 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp @@ -371,8 +371,8 @@ public: { Spawn->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); Spawn->GetMotionMaster()->MovePoint(0, AGGRO_X, AGGRO_Y, AGGRO_Z); - Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1); - Spawn->AI()->AttackStart(pTarget); + Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1); + Spawn->AI()->AttackStart(target); } } } diff --git a/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp b/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp index 757ce9ba76b..ce4d7745a68 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp @@ -171,7 +171,7 @@ public: Unit* CalculateHatefulStrikeTarget() { uint32 health = 0; - Unit* pTarget = NULL; + Unit* target = NULL; std::list<HostileReference*>& m_threatlist = me->getThreatManager().getThreatList(); std::list<HostileReference*>::const_iterator i = m_threatlist.begin(); @@ -183,12 +183,12 @@ public: if (pUnit->GetHealth() > health) { health = pUnit->GetHealth(); - pTarget = pUnit; + target = pUnit; } } } - return pTarget; + return target; } void UpdateAI(const uint32 diff) @@ -211,28 +211,28 @@ public: events.ScheduleEvent(EVENT_FLAME, 20000, GCD_CAST); break; case EVENT_HATEFUL_STRIKE: - if (Unit* pTarget = CalculateHatefulStrikeTarget()) - DoCast(pTarget, SPELL_HATEFUL_STRIKE); + if (Unit* target = CalculateHatefulStrikeTarget()) + DoCast(target, SPELL_HATEFUL_STRIKE); events.DelayEvents(1000, GCD_CAST); events.ScheduleEvent(EVENT_HATEFUL_STRIKE, 5000, GCD_CAST, PHASE_STRIKE); break; case EVENT_SWITCH_TARGET: - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true)) { DoResetThreat(); - me->AddThreat(pTarget, 5000000.0f); + me->AddThreat(target, 5000000.0f); DoScriptText(EMOTE_NEW_TARGET, me); } events.ScheduleEvent(EVENT_SWITCH_TARGET, 10000, 0, PHASE_CHASE); break; case EVENT_VOLCANO: { - Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 999, true); - if (!pTarget) pTarget = me->getVictim(); - if (pTarget) + Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 999, true); + if (!target) target = me->getVictim(); + if (target) { - //DoCast(pTarget, SPELL_VOLCANIC_SUMMON);//movement bugged - me->SummonCreature(CREATURE_VOLCANO, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 30000); + //DoCast(target, SPELL_VOLCANIC_SUMMON);//movement bugged + me->SummonCreature(CREATURE_VOLCANO, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 30000); DoScriptText(EMOTE_GROUND_CRACK, me); events.DelayEvents(1500, GCD_CAST); } diff --git a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp index d02f73ff87e..f8a2a4e6d5a 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp @@ -178,11 +178,11 @@ public: targets.push_back(pUnit); } targets.sort(Trinity::ObjectDistanceOrderPred(me)); - Unit* pTarget = targets.front(); - if (pTarget && me->IsWithinDistInMap(pTarget, me->GetAttackDistance(pTarget))) + Unit* target = targets.front(); + if (target && me->IsWithinDistInMap(target, me->GetAttackDistance(target))) { - DoCast(pTarget, SPELL_ATROPHY); - me->AI()->AttackStart(pTarget); + DoCast(target, SPELL_ATROPHY); + me->AI()->AttackStart(target); } } @@ -365,12 +365,12 @@ public: Construct->CastSpell(Construct, SPELL_PASSIVE_SHADOWFORM, true); SetThreatList(Construct); // Use same function as Doom Blossom to set Threat List. CAST_AI(mob_shadowy_construct::mob_shadowy_constructAI, Construct->AI())->GhostGUID = GhostGUID; - Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1); - if (!pTarget) // someone's trying to solo. - pTarget = me->getVictim(); + Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1); + if (!target) // someone's trying to solo. + target = me->getVictim(); - if (pTarget) - Construct->GetMotionMaster()->MoveChase(pTarget); + if (target) + Construct->GetMotionMaster()->MoveChase(target); } } } @@ -417,12 +417,12 @@ public: Shadow = me->SummonCreature(CREATURE_SHADOWY_CONSTRUCT, X, me->GetPositionY(), me->GetPositionZ(), 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 0); if (Shadow) { - Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1); - if (!pTarget) - pTarget = me->getVictim(); + Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1); + if (!target) + target = me->getVictim(); - if (pTarget) - Shadow->AI()->AttackStart(pTarget); + if (target) + Shadow->AI()->AttackStart(target); } } SummonShadowsTimer = 60000; @@ -430,20 +430,20 @@ public: if (SummonDoomBlossomTimer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) { - float X = CalculateRandomLocation(pTarget->GetPositionX(), 20); - float Y = CalculateRandomLocation(pTarget->GetPositionY(), 20); - float Z = pTarget->GetPositionZ(); + float X = CalculateRandomLocation(target->GetPositionX(), 20); + float Y = CalculateRandomLocation(target->GetPositionY(), 20); + float Z = target->GetPositionZ(); Z = me->GetMap()->GetHeight(X, Y, Z); Creature* DoomBlossom = me->SummonCreature(CREATURE_DOOM_BLOSSOM, X, Y, Z, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 20000); if (DoomBlossom) { DoomBlossom->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); DoomBlossom->setFaction(me->getFaction()); - DoomBlossom->AddThreat(pTarget, 1.0f); + DoomBlossom->AddThreat(target, 1.0f); CAST_AI(mob_doom_blossom::mob_doom_blossomAI, DoomBlossom->AI())->SetTeronGUID(me->GetGUID()); - pTarget->CombatStart(DoomBlossom); + target->CombatStart(DoomBlossom); SetThreatList(DoomBlossom); SummonDoomBlossomTimer = 35000; } @@ -452,38 +452,38 @@ public: if (IncinerateTimer <= diff) { - Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1); - if (!pTarget) - pTarget = me->getVictim(); + Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1); + if (!target) + target = me->getVictim(); - if (pTarget) + if (target) { DoScriptText(RAND(SAY_SPECIAL1, SAY_SPECIAL2), me); - DoCast(pTarget, SPELL_INCINERATE); + DoCast(target, SPELL_INCINERATE); IncinerateTimer = 20000 + rand()%31 * 1000; } } else IncinerateTimer -= diff; if (CrushingShadowsTimer <= diff) { - Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); - if (pTarget && pTarget->isAlive()) - DoCast(pTarget, SPELL_CRUSHING_SHADOWS); + Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0); + if (target && target->isAlive()) + DoCast(target, SPELL_CRUSHING_SHADOWS); CrushingShadowsTimer = 10000 + rand()%16 * 1000; } else CrushingShadowsTimer -= diff; /*** NOTE FOR FUTURE DEV: UNCOMMENT BELOW ONLY IF MIND CONTROL IS FULLY IMPLEMENTED **/ /*if (ShadowOfDeathTimer <= diff) { - Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM, 1); + Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 1); - if (!pTarget) - pTarget = me->getVictim(); + if (!target) + target = me->getVictim(); - if (pTarget && pTarget->isAlive() && pTarget->GetTypeId() == TYPEID_PLAYER) + if (target && target->isAlive() && target->GetTypeId() == TYPEID_PLAYER) { - DoCast(pTarget, SPELL_SHADOW_OF_DEATH); - GhostGUID = pTarget->GetGUID(); + DoCast(target, SPELL_SHADOW_OF_DEATH); + GhostGUID = target->GetGUID(); ShadowOfDeathTimer = 30000; SummonShadowsTimer = 53000; // Make it VERY close but slightly less so that we can check if the aura is still on the player } diff --git a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp index aee03039ec6..4d2d866ecf5 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp @@ -131,9 +131,9 @@ public: bool RemoveImpalingSpine() { if (!SpineTargetGUID) return false; - Unit* pTarget = Unit::GetUnit(*me, SpineTargetGUID); - if (pTarget && pTarget->HasAura(SPELL_IMPALING_SPINE)) - pTarget->RemoveAurasDueToSpell(SPELL_IMPALING_SPINE); + Unit* target = Unit::GetUnit(*me, SpineTargetGUID); + if (target && target->HasAura(SPELL_IMPALING_SPINE)) + target->RemoveAurasDueToSpell(SPELL_IMPALING_SPINE); SpineTargetGUID=0; return true; } @@ -167,14 +167,14 @@ public: break; case EVENT_SPINE: { - Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1); - if (!pTarget) pTarget = me->getVictim(); - if (pTarget) + Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1); + if (!target) target = me->getVictim(); + if (target) { - DoCast(pTarget, SPELL_IMPALING_SPINE, true); - SpineTargetGUID = pTarget->GetGUID(); + DoCast(target, SPELL_IMPALING_SPINE, true); + SpineTargetGUID = target->GetGUID(); //must let target summon, otherwise you cannot click the spine - pTarget->SummonGameObject(GOBJECT_SPINE, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), me->GetOrientation(), 0, 0, 0, 0, 30); + target->SummonGameObject(GOBJECT_SPINE, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), me->GetOrientation(), 0, 0, 0, 0, 30); DoScriptText(rand()%2 ? SAY_NEEDLE1 : SAY_NEEDLE2, me); events.DelayEvents(1500, GCD_CAST); events.DelayEvents(15000, GCD_YELL); @@ -185,9 +185,9 @@ public: case EVENT_NEEDLE: { //DoCast(me, SPELL_NEEDLE_SPINE, true); - std::list<Unit*> pTargets; - SelectTargetList(pTargets, 3, SELECT_TARGET_RANDOM, 80, true); - for (std::list<Unit*>::const_iterator i = pTargets.begin(); i != pTargets.end(); ++i) + std::list<Unit*> targets; + SelectTargetList(targets, 3, SELECT_TARGET_RANDOM, 80, true); + for (std::list<Unit*>::const_iterator i = targets.begin(); i != targets.end(); ++i) DoCast(*i, 39835, true); events.ScheduleEvent(EVENT_NEEDLE, urand(15000, 25000), GCD_CAST); events.DelayEvents(1500, GCD_CAST); diff --git a/src/server/scripts/Outland/BlackTemple/illidari_council.cpp b/src/server/scripts/Outland/BlackTemple/illidari_council.cpp index d82d74339d5..d4edaa8f36f 100644 --- a/src/server/scripts/Outland/BlackTemple/illidari_council.cpp +++ b/src/server/scripts/Outland/BlackTemple/illidari_council.cpp @@ -275,12 +275,12 @@ public: void AttackStart(Unit* /*who*/) {} void MoveInLineOfSight(Unit* /*who*/) {} - void StartEvent(Unit* pTarget) + void StartEvent(Unit* target) { if (!pInstance) return; - if (pTarget && pTarget->isAlive()) + if (target && target->isAlive()) { Council[0] = pInstance->GetData64(DATA_GATHIOSTHESHATTERER); Council[1] = pInstance->GetData64(DATA_HIGHNETHERMANCERZEREVOR); @@ -301,7 +301,7 @@ public: { Member = Unit::GetUnit((*me), Council[i]); if (Member && Member->isAlive()) - CAST_CRE(Member)->AI()->AttackStart(pTarget); + CAST_CRE(Member)->AI()->AttackStart(target); } } @@ -557,12 +557,12 @@ public: if (HammerOfJusticeTimer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) { // is in ~10-40 yd range - if (me->IsInRange(pTarget, 10.0f, 40.0f, false)) + if (me->IsInRange(target, 10.0f, 40.0f, false)) { - DoCast(pTarget, SPELL_HAMMER_OF_JUSTICE); + DoCast(target, SPELL_HAMMER_OF_JUSTICE); HammerOfJusticeTimer = 20000; } } @@ -670,9 +670,9 @@ public: if (BlizzardTimer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) { - DoCast(pTarget, SPELL_BLIZZARD); + DoCast(target, SPELL_BLIZZARD); BlizzardTimer = 45000 + rand()%46 * 1000; FlamestrikeTimer += 10000; Cooldown = 1000; @@ -681,9 +681,9 @@ public: if (FlamestrikeTimer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) { - DoCast(pTarget, SPELL_FLAMESTRIKE); + DoCast(target, SPELL_FLAMESTRIKE); FlamestrikeTimer = 55000 + rand()%46 * 1000; BlizzardTimer += 10000; Cooldown = 2000; @@ -738,9 +738,9 @@ public: if (EmpoweredSmiteTimer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) { - DoCast(pTarget, SPELL_EMPOWERED_SMITE); + DoCast(target, SPELL_EMPOWERED_SMITE); EmpoweredSmiteTimer = 38000; } } else EmpoweredSmiteTimer -= diff; @@ -753,9 +753,9 @@ public: if (DivineWrathTimer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) { - DoCast(pTarget, SPELL_DIVINE_WRATH); + DoCast(target, SPELL_DIVINE_WRATH); DivineWrathTimer = 40000 + rand()%41 * 1000; } } else DivineWrathTimer -= diff; @@ -838,7 +838,7 @@ public: if (VanishTimer <= diff) // Disappear and stop attacking, but follow a random unit { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) { VanishTimer = 30000; AppearEnvenomTimer= 28000; @@ -847,8 +847,8 @@ public: me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); DoResetThreat(); // Chase a unit. Check before DoMeleeAttackIfReady prevents from attacking - me->AddThreat(pTarget, 500000.0f); - me->GetMotionMaster()->MoveChase(pTarget); + me->AddThreat(target, 500000.0f); + me->GetMotionMaster()->MoveChase(target); } } else VanishTimer -= diff; @@ -858,11 +858,11 @@ public: { if (VanishTimer <= diff) // Become attackable and poison current target { - Unit* pTarget = me->getVictim(); - DoCast(pTarget, SPELL_DEADLY_POISON); + Unit* target = me->getVictim(); + DoCast(target, SPELL_DEADLY_POISON); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); DoResetThreat(); - me->AddThreat(pTarget, 3000.0f); // Make Veras attack his target for a while, he will cast Envenom 4 seconds after. + me->AddThreat(target, 3000.0f); // Make Veras attack his target for a while, he will cast Envenom 4 seconds after. DeadlyPoisonTimer += 6000; VanishTimer = 90000; AppearEnvenomTimer = 4000; diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp index d89afc47f00..1433859dfe1 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp @@ -225,11 +225,11 @@ public: //Only if not incombat check if the event is started if (!me->isInCombat() && pInstance && pInstance->GetData(DATA_KARATHRESSEVENT)) { - Unit* pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_KARATHRESSEVENT_STARTER)); + Unit* target = Unit::GetUnit((*me), pInstance->GetData64(DATA_KARATHRESSEVENT_STARTER)); - if (pTarget) + if (target) { - AttackStart(pTarget); + AttackStart(target); GetAdvisors(); } } @@ -249,14 +249,14 @@ public: if (CataclysmicBolt_Timer <= diff) { //select a random unit other than the main tank - Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1); + Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1); //if there aren't other units, cast on the tank - if (!pTarget) - pTarget = me->getVictim(); + if (!target) + target = me->getVictim(); - if (pTarget) - DoCast(pTarget, SPELL_CATACLYSMIC_BOLT); + if (target) + DoCast(target, SPELL_CATACLYSMIC_BOLT); CataclysmicBolt_Timer = 10000; } else CataclysmicBolt_Timer -= diff; @@ -381,11 +381,11 @@ public: //Only if not incombat check if the event is started if (!me->isInCombat() && pInstance && pInstance->GetData(DATA_KARATHRESSEVENT)) { - Unit* pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_KARATHRESSEVENT_STARTER)); + Unit* target = Unit::GetUnit((*me), pInstance->GetData64(DATA_KARATHRESSEVENT_STARTER)); - if (pTarget) + if (target) { - AttackStart(pTarget); + AttackStart(target); } } @@ -444,10 +444,10 @@ public: } //DoCast(me, spell_id, true); Creature* Pet = DoSpawnCreature(pet_id, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); - Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); - if (Pet && pTarget) + Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0); + if (Pet && target) { - Pet->AI()->AttackStart(pTarget); + Pet->AI()->AttackStart(target); SummonedPet = Pet->GetGUID(); } } else Pet_Timer -= diff; @@ -522,11 +522,11 @@ public: //Only if not incombat check if the event is started if (!me->isInCombat() && pInstance && pInstance->GetData(DATA_KARATHRESSEVENT)) { - Unit* pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_KARATHRESSEVENT_STARTER)); + Unit* target = Unit::GetUnit((*me), pInstance->GetData64(DATA_KARATHRESSEVENT_STARTER)); - if (pTarget) + if (target) { - AttackStart(pTarget); + AttackStart(target); } } @@ -648,11 +648,11 @@ public: //Only if not incombat check if the event is started if (!me->isInCombat() && pInstance && pInstance->GetData(DATA_KARATHRESSEVENT)) { - Unit* pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_KARATHRESSEVENT_STARTER)); + Unit* target = Unit::GetUnit((*me), pInstance->GetData64(DATA_KARATHRESSEVENT_STARTER)); - if (pTarget) + if (target) { - AttackStart(pTarget); + AttackStart(target); } } @@ -695,10 +695,10 @@ public: Cyclone->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); Cyclone->setFaction(me->getFaction()); Cyclone->CastSpell(Cyclone, SPELL_CYCLONE_CYCLONE, true); - Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); - if (pTarget) + Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0); + if (target) { - Cyclone->AI()->AttackStart(pTarget); + Cyclone->AI()->AttackStart(target); } } } else Cyclone_Timer -= diff; diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp index 00dd3b1c9fb..0f27d5e7a9d 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp @@ -262,9 +262,9 @@ public: //VileSludge_Timer if (VileSludge_Timer <= diff) { - Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); - if (pTarget) - DoCast(pTarget, SPELL_VILE_SLUDGE); + Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0); + if (target) + DoCast(target, SPELL_VILE_SLUDGE); VileSludge_Timer = 15000; } else VileSludge_Timer -= diff; @@ -329,9 +329,9 @@ public: //WaterTomb_Timer if (WaterTomb_Timer <= diff) { - Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); - if (pTarget) - DoCast(pTarget, SPELL_WATER_TOMB); + Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); + if (target) + DoCast(target, SPELL_WATER_TOMB); WaterTomb_Timer = 7000; } else WaterTomb_Timer -= diff; diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp index 4c142ed3930..9cd7dfc9af8 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp @@ -363,12 +363,12 @@ public: { //Static Charge //Used on random people (only 1 person at any given time) in Phases 1 and 3, it's a debuff doing 2775 to 3225 Nature damage to the target and everybody in about 5 yards around it, every 1 seconds for 30 seconds. It can be removed by Cloak of Shadows, Iceblock, Divine Shield, etc, but not by Cleanse or Dispel Magic. - Unit* pTarget = NULL; - pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 200, true); + Unit* target = NULL; + target = SelectTarget(SELECT_TARGET_RANDOM, 0, 200, true); - if (pTarget && !pTarget->HasAura(SPELL_STATIC_CHARGE_TRIGGER)) + if (target && !target->HasAura(SPELL_STATIC_CHARGE_TRIGGER)) //cast Static Charge every 2 seconds for 20 seconds - DoCast(pTarget, SPELL_STATIC_CHARGE_TRIGGER); + DoCast(target, SPELL_STATIC_CHARGE_TRIGGER); StaticCharge_Timer = 10000+rand()%20000; //blizzlike } else StaticCharge_Timer -= diff; @@ -425,10 +425,10 @@ public: if (Sporebat) { - Unit* pTarget = NULL; - pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); - if (pTarget) - Sporebat->AI()->AttackStart(pTarget); + Unit* target = NULL; + target = SelectTarget(SELECT_TARGET_RANDOM, 0); + if (target) + Sporebat->AI()->AttackStart(target); } //summon sporebats faster and faster @@ -450,13 +450,13 @@ public: if (Check_Timer <= diff) { bool InMeleeRange = false; - Unit* pTarget; + Unit* target; std::list<HostileReference *> t_list = me->getThreatManager().getThreatList(); 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()); //if in melee range - if (pTarget && pTarget->IsWithinDistInMap(me, 5)) + if (target && target->IsWithinDistInMap(me, 5)) { InMeleeRange = true; break; @@ -478,13 +478,13 @@ public: { //Forked Lightning //Used constantly in Phase 2, it shoots out completely randomly targeted bolts of lightning which hit everybody in a roughtly 60 degree cone in front of Vashj for 2313-2687 nature damage. - Unit* pTarget = NULL; - pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); + Unit* target = NULL; + target = SelectTarget(SELECT_TARGET_RANDOM, 0); - if (!pTarget) - pTarget = me->getVictim(); + if (!target) + target = me->getVictim(); - DoCast(pTarget, SPELL_FORKED_LIGHTNING); + DoCast(target, SPELL_FORKED_LIGHTNING); ForkedLightning_Timer = 2000+rand()%6000; //blizzlike } else ForkedLightning_Timer -= diff; @@ -519,10 +519,10 @@ public: CoilfangElite = me->SummonCreature(COILFANG_ELITE, CoilfangElitePos[pos][0], CoilfangElitePos[pos][1], CoilfangElitePos[pos][2], CoilfangElitePos[pos][3], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); if (CoilfangElite) { - Unit* pTarget = NULL; - pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); - if (pTarget) - CoilfangElite->AI()->AttackStart(pTarget); + Unit* target = NULL; + target = SelectTarget(SELECT_TARGET_RANDOM, 0); + if (target) + CoilfangElite->AI()->AttackStart(target); else if (me->getVictim()) CoilfangElite->AI()->AttackStart(me->getVictim()); } @@ -537,10 +537,10 @@ public: CoilfangStrider = me->SummonCreature(COILFANG_STRIDER, CoilfangStriderPos[pos][0], CoilfangStriderPos[pos][1], CoilfangStriderPos[pos][2], CoilfangStriderPos[pos][3], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); if (CoilfangStrider) { - Unit* pTarget = NULL; - pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); - if (pTarget) - CoilfangStrider->AI()->AttackStart(pTarget); + Unit* target = NULL; + target = SelectTarget(SELECT_TARGET_RANDOM, 0); + if (target) + CoilfangStrider->AI()->AttackStart(target); else if (me->getVictim()) CoilfangStrider->AI()->AttackStart(me->getVictim()); } @@ -727,11 +727,11 @@ public: //PoisonBolt_Timer if (PoisonBolt_Timer <= diff) { - Unit* pTarget = NULL; - pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); + Unit* target = NULL; + target = SelectTarget(SELECT_TARGET_RANDOM, 0); - if (pTarget && pTarget->IsWithinDistInMap(me, 30)) - DoCast(pTarget, SPELL_POISON_BOLT); + if (target && target->IsWithinDistInMap(me, 30)) + DoCast(target, SPELL_POISON_BOLT); PoisonBolt_Timer = 5000+rand()%5000; } else PoisonBolt_Timer -= diff; @@ -819,11 +819,11 @@ public: //toxic spores if (bolt_timer <= diff) { - Unit* pTarget = NULL; - pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); - if (pTarget) + Unit* target = NULL; + target = SelectTarget(SELECT_TARGET_RANDOM, 0); + if (target) { - Creature* trig = me->SummonCreature(TOXIC_SPORES_TRIGGER, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 30000); + Creature* trig = me->SummonCreature(TOXIC_SPORES_TRIGGER, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 30000); if (trig) { trig->setFaction(14); diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp index 0a8f4ff574e..f9d16f5fc6c 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp @@ -356,11 +356,11 @@ public: Creature* pUnit = Unit::GetCreature((*me), InnderDemon[i]); if (pUnit && pUnit->isAlive()) { - Unit* pUnit_pTarget = Unit::GetUnit(*pUnit, CAST_AI(mob_inner_demon::mob_inner_demonAI, pUnit->AI())->victimGUID); - if (pUnit_pTarget && pUnit_pTarget->isAlive()) + Unit* unit_target = Unit::GetUnit(*pUnit, CAST_AI(mob_inner_demon::mob_inner_demonAI, pUnit->AI())->victimGUID); + if (unit_target && unit_target->isAlive()) { - pUnit->CastSpell(pUnit_pTarget, SPELL_CONSUMING_MADNESS, true); - DoModifyThreatPercent(pUnit_pTarget, -100); + pUnit->CastSpell(unit_target, SPELL_CONSUMING_MADNESS, true); + DoModifyThreatPercent(unit_target, -100); } } } @@ -759,10 +759,10 @@ public: if (Mindblast_Timer <= diff) { - Unit* pTarget = NULL; - pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); + Unit* target = NULL; + target = SelectTarget(SELECT_TARGET_RANDOM, 0); - if (pTarget)DoCast(pTarget, SPELL_MINDBLAST); + if (target)DoCast(target, SPELL_MINDBLAST); Mindblast_Timer = 10000 + rand()%5000; } else Mindblast_Timer -= diff; diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp index 52055a5ef3a..7cd0c5a09c0 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp @@ -299,11 +299,11 @@ public: if (GeyserTimer <= diff) { - Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1); - if (!pTarget && me->getVictim()) - pTarget = me->getVictim(); - if (pTarget) - DoCast(pTarget, SPELL_GEYSER, true); + Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1); + if (!target && me->getVictim()) + target = me->getVictim(); + if (target) + DoCast(target, SPELL_GEYSER, true); GeyserTimer = rand()%5000 + 15000; } else GeyserTimer -= diff; @@ -311,11 +311,11 @@ public: { if (WaterboltTimer <= diff) { - Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); - if (!pTarget && me->getVictim()) - pTarget = me->getVictim(); - if (pTarget) - DoCast(pTarget, SPELL_WATERBOLT, true); + Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0); + if (!target && me->getVictim()) + target = me->getVictim(); + if (target) + DoCast(target, SPELL_WATERBOLT, true); WaterboltTimer = 3000; } else WaterboltTimer -= diff; } @@ -453,11 +453,11 @@ public: if (ShootBowTimer <= diff) { - Unit* pTarget = NULL; - pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); + Unit* target = NULL; + target = SelectTarget(SELECT_TARGET_RANDOM, 0); int bp0 = 1100; - if (pTarget) - me->CastCustomSpell(pTarget, SPELL_SHOOT, &bp0, NULL, NULL, true); + if (target) + me->CastCustomSpell(target, SPELL_SHOOT, &bp0, NULL, NULL, true); ShootBowTimer = 4000+rand()%5000; MultiShotTimer += 1500;//add global cooldown } else ShootBowTimer -= diff; diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp index 821a60fb133..b2abb397dfe 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp @@ -187,10 +187,10 @@ public: for (uint8 i = 0; i < 10; ++i) { - Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); + Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0); Creature* Murloc = me->SummonCreature(NPC_TIDEWALKER_LURKER, MurlocCords[i][0], MurlocCords[i][1], MurlocCords[i][2], MurlocCords[i][3], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000); - if (pTarget && Murloc) - Murloc->AI()->AttackStart(pTarget); + if (target && Murloc) + Murloc->AI()->AttackStart(target); } DoScriptText(EMOTE_EARTHQUAKE, me); Earthquake = false; @@ -211,7 +211,7 @@ public: if (WateryGrave_Timer <= diff) { //Teleport 4 players under the waterfalls - Unit* pTarget; + Unit* target; std::set<uint64> list; std::set<uint64>::const_iterator itr; for (uint8 i = 0; i < 4; ++i) @@ -219,18 +219,18 @@ public: counter = 0; do { - pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1, 50, true); //target players only + target = SelectTarget(SELECT_TARGET_RANDOM, 1, 50, true); //target players only if (counter < Playercount) break; - if (pTarget) - itr = list.find(pTarget->GetGUID()); + if (target) + itr = list.find(target->GetGUID()); ++counter; } while (itr != list.end()); - if (pTarget) + if (target) { - list.insert(pTarget->GetGUID()); - ApplyWateryGrave(pTarget, i); + list.insert(target->GetGUID()); + ApplyWateryGrave(target, i); } } diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp index 7c651742c3e..4d5b3ecc86a 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp @@ -108,13 +108,13 @@ public: //LightningCloud_Timer if (LightningCloud_Timer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_LIGHTNING_CLOUD); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(target, SPELL_LIGHTNING_CLOUD); //cast twice in Heroic mode if (IsHeroic()) - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_LIGHTNING_CLOUD); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(target, SPELL_LIGHTNING_CLOUD); LightningCloud_Timer = 15000+rand()%10000; } else LightningCloud_Timer -=diff; @@ -122,21 +122,21 @@ public: //LungBurst_Timer if (LungBurst_Timer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_LUNG_BURST); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(target, SPELL_LUNG_BURST); LungBurst_Timer = 7000+rand()%5000; } else LungBurst_Timer -=diff; //EnvelopingWinds_Timer if (EnvelopingWinds_Timer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_ENVELOPING_WINDS); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(target, SPELL_ENVELOPING_WINDS); //cast twice in Heroic mode if (IsHeroic()) - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_ENVELOPING_WINDS); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(target, SPELL_ENVELOPING_WINDS); EnvelopingWinds_Timer = 10000+rand()%5000; } else EnvelopingWinds_Timer -=diff; diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp index f8f059afff4..49c5df03ed8 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp @@ -19,7 +19,7 @@ /* ScriptData SDName: Boss_Mekgineer_Steamrigger SD%Complete: 60 -SDComment: Mechanics' interrrupt heal doesn't work very well, also a proper movement needs to be implemented -> summon further away and move towards pTarget to repair. +SDComment: Mechanics' interrrupt heal doesn't work very well, also a proper movement needs to be implemented -> summon further away and move towards target to repair. SDCategory: Coilfang Resevoir, The Steamvault EndScriptData */ @@ -137,8 +137,8 @@ public: if (Saw_Blade_Timer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1)) - DoCast(pTarget, SPELL_SAW_BLADE); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1)) + DoCast(target, SPELL_SAW_BLADE); else DoCast(me->getVictim(), SPELL_SAW_BLADE); diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp index 1893dd689f4..bb6acdae778 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp @@ -191,8 +191,8 @@ public: //Impale_Timer if (Impale_Timer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_IMPALE); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(target, SPELL_IMPALE); Impale_Timer = 7500+rand()%5000; } else Impale_Timer -= diff; diff --git a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_hungarfen.cpp b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_hungarfen.cpp index 0dd05d9e03a..e570537c71c 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_hungarfen.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_hungarfen.cpp @@ -75,8 +75,8 @@ public: if (Mushroom_Timer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - me->SummonCreature(17990, pTarget->GetPositionX()+(rand()%8), pTarget->GetPositionY()+(rand()%8), pTarget->GetPositionZ(), float(rand()%5), TEMPSUMMON_TIMED_DESPAWN, 22000); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + me->SummonCreature(17990, target->GetPositionX()+(rand()%8), target->GetPositionY()+(rand()%8), target->GetPositionZ(), float(rand()%5), TEMPSUMMON_TIMED_DESPAWN, 22000); else me->SummonCreature(17990, me->GetPositionX()+(rand()%8), me->GetPositionY()+(rand()%8), me->GetPositionZ(), float(rand()%5), TEMPSUMMON_TIMED_DESPAWN, 22000); @@ -85,8 +85,8 @@ public: if (AcidGeyser_Timer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_ACID_GEYSER); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(target, SPELL_ACID_GEYSER); AcidGeyser_Timer = 10000+rand()%7500; } else AcidGeyser_Timer -= diff; diff --git a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp index 63379918fb7..c00a365057a 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp @@ -80,8 +80,8 @@ public: if (summon && summon->GetEntry() == ENTRY_SPORE_STRIDER) { Striders.push_back(summon->GetGUID()); - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1)) - summon->AI()->AttackStart(pTarget); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1)) + summon->AI()->AttackStart(target); else if (me->getVictim()) summon->AI()->AttackStart(me->getVictim()); @@ -125,21 +125,21 @@ public: { if (LevitatedTarget_Timer <= diff) { - if (Unit* pTarget = Unit::GetUnit(*me, LevitatedTarget)) + if (Unit* target = Unit::GetUnit(*me, LevitatedTarget)) { - if (!pTarget->HasAura(SPELL_LEVITATE)) + if (!target->HasAura(SPELL_LEVITATE)) { LevitatedTarget = 0; return; } if (InAir) { - pTarget->AddAura(SPELL_SUSPENSION, pTarget); + target->AddAura(SPELL_SUSPENSION, target); LevitatedTarget = 0; } else { - pTarget->CastSpell(pTarget, SPELL_MAGNETIC_PULL, true); + target->CastSpell(target, SPELL_MAGNETIC_PULL, true); InAir = true; LevitatedTarget_Timer = 1500; } @@ -150,10 +150,10 @@ public: } if (Levitate_Timer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1)) { - DoCast(pTarget, SPELL_LEVITATE); - LevitatedTarget = pTarget->GetGUID(); + DoCast(target, SPELL_LEVITATE); + LevitatedTarget = target->GetGUID(); LevitatedTarget_Timer = 2000; InAir = false; } @@ -163,16 +163,16 @@ public: // Chain Lightning if (ChainLightning_Timer <= diff) { - 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); ChainLightning_Timer = 7000; } else ChainLightning_Timer -= diff; // Static Charge if (StaticCharge_Timer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 30, true)) - DoCast(pTarget, SPELL_STATIC_CHARGE); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 30, true)) + DoCast(target, SPELL_STATIC_CHARGE); StaticCharge_Timer = 10000; } else StaticCharge_Timer -= diff; diff --git a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp index a2d409e7b35..af62a78fe8d 100644 --- a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp +++ b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp @@ -120,18 +120,18 @@ public: } } - void SpellHitTarget(Unit* pTarget, const SpellEntry* pSpell) + void SpellHitTarget(Unit* target, const SpellEntry* pSpell) { //This to emulate effect1 (77) of SPELL_GROUND_SLAM, knock back to any direction //It's initially wrong, since this will cause fall damage, which is by comments, not intended. if (pSpell->Id == SPELL_GROUND_SLAM) { - if (pTarget->GetTypeId() == TYPEID_PLAYER) + if (target->GetTypeId() == TYPEID_PLAYER) { switch (urand(0, 1)) { - case 0: pTarget->CastSpell(pTarget, SPELL_MAGNETIC_PULL, true, NULL, NULL, me->GetGUID()); break; - case 1: pTarget->CastSpell(pTarget, SPELL_KNOCK_BACK, true, NULL, NULL, me->GetGUID()); break; + case 0: target->CastSpell(target, SPELL_MAGNETIC_PULL, true, NULL, NULL, me->GetGUID()); break; + case 1: target->CastSpell(target, SPELL_KNOCK_BACK, true, NULL, NULL, me->GetGUID()); break; } } } @@ -140,10 +140,10 @@ public: if (pSpell->Id == SPELL_SHATTER) { //this spell must have custom handling in the core, dealing damage based on distance - pTarget->CastSpell(pTarget, SPELL_SHATTER_EFFECT, true); + target->CastSpell(target, 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 (m_bPerformingGroundSlam) @@ -197,10 +197,10 @@ public: // Hurtful Strike if (m_uiHurtfulStrike_Timer <= uiDiff) { - Unit* pTarget = SelectTarget(SELECT_TARGET_TOPAGGRO, 1); + Unit* target = SelectTarget(SELECT_TARGET_TOPAGGRO, 1); - if (pTarget && me->IsWithinMeleeRange(me->getVictim())) - DoCast(pTarget, SPELL_HURTFUL_STRIKE); + if (target && me->IsWithinMeleeRange(me->getVictim())) + DoCast(target, SPELL_HURTFUL_STRIKE); else DoCast(me->getVictim(), SPELL_HURTFUL_STRIKE); @@ -221,8 +221,8 @@ public: // Cave In if (m_uiCaveIn_Timer <= uiDiff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_CAVE_IN); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(target, SPELL_CAVE_IN); if (m_uiCaveIn_StaticTimer >= 4000) m_uiCaveIn_StaticTimer -= 2000; diff --git a/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp b/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp index ac96dc5186f..2baacf26553 100644 --- a/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp +++ b/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp @@ -223,11 +223,11 @@ public: //Only if not incombat check if the event is started if (!me->isInCombat() && pInstance && pInstance->GetData(DATA_MAULGAREVENT)) { - Unit* pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_MAULGAREVENT_TANK)); + Unit* target = Unit::GetUnit((*me), pInstance->GetData64(DATA_MAULGAREVENT_TANK)); - if (pTarget) + if (target) { - AttackStart(pTarget); + AttackStart(target); GetCouncil(); } } @@ -280,12 +280,12 @@ public: //Charging_Timer if (Charging_Timer <= diff) { - Unit* pTarget = NULL; - pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); - if (pTarget) + Unit* target = NULL; + target = SelectTarget(SELECT_TARGET_RANDOM, 0); + if (target) { - AttackStart(pTarget); - DoCast(pTarget, SPELL_BERSERKER_C); + AttackStart(target); + DoCast(target, SPELL_BERSERKER_C); } Charging_Timer = 20000; } else Charging_Timer -= diff; @@ -383,11 +383,11 @@ public: //Only if not incombat check if the event is started if (!me->isInCombat() && pInstance && pInstance->GetData(DATA_MAULGAREVENT)) { - Unit* pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_MAULGAREVENT_TANK)); + Unit* target = Unit::GetUnit((*me), pInstance->GetData64(DATA_MAULGAREVENT_TANK)); - if (pTarget) + if (target) { - AttackStart(pTarget); + AttackStart(target); } } @@ -419,10 +419,10 @@ public: //DeathCoil Timer /need correct timer if (DeathCoil_Timer <= diff) { - Unit* pTarget = NULL; - pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); - if (pTarget) - DoCast(pTarget, SPELL_DEATH_COIL); + Unit* target = NULL; + target = SelectTarget(SELECT_TARGET_RANDOM, 0); + if (target) + DoCast(target, SPELL_DEATH_COIL); DeathCoil_Timer = 20000; } else DeathCoil_Timer -= diff; @@ -498,11 +498,11 @@ public: //Only if not incombat check if the event is started if (!me->isInCombat() && pInstance && pInstance->GetData(DATA_MAULGAREVENT)) { - Unit* pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_MAULGAREVENT_TANK)); + Unit* target = Unit::GetUnit((*me), pInstance->GetData64(DATA_MAULGAREVENT_TANK)); - if (pTarget) + if (target) { - AttackStart(pTarget); + AttackStart(target); } } @@ -520,9 +520,9 @@ public: //GreaterPolymorph_Timer if (GreaterPolymorph_Timer <= diff) { - Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); - if (pTarget) - DoCast(pTarget, SPELL_GREATER_POLYMORPH); + Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0); + if (target) + DoCast(target, SPELL_GREATER_POLYMORPH); GreaterPolymorph_Timer = 15000 + rand()%5000; } else GreaterPolymorph_Timer -= diff; @@ -618,11 +618,11 @@ public: //Only if not incombat check if the event is started if (!me->isInCombat() && pInstance && pInstance->GetData(DATA_MAULGAREVENT)) { - Unit* pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_MAULGAREVENT_TANK)); + Unit* target = Unit::GetUnit((*me), pInstance->GetData64(DATA_MAULGAREVENT_TANK)); - if (pTarget) + if (target) { - AttackStart(pTarget); + AttackStart(target); } } @@ -728,11 +728,11 @@ public: //Only if not incombat check if the event is started if (!me->isInCombat() && pInstance && pInstance->GetData(DATA_MAULGAREVENT)) { - Unit* pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_MAULGAREVENT_TANK)); + Unit* target = Unit::GetUnit((*me), pInstance->GetData64(DATA_MAULGAREVENT_TANK)); - if (pTarget) + if (target) { - AttackStart(pTarget); + AttackStart(target); } } @@ -765,22 +765,22 @@ public: //BlastWave_Timer if (BlastWave_Timer <= diff) { - 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()); //15 yard radius minimum - if (pTarget && pTarget->IsWithinDist(me, 15, false)) - target_list.push_back(pTarget); - pTarget = NULL; + if (target && target->IsWithinDist(me, 15, false)) + target_list.push_back(target); + target = NULL; } if (!target_list.empty()) - pTarget = *(target_list.begin()+rand()%target_list.size()); + target = *(target_list.begin()+rand()%target_list.size()); me->InterruptNonMeleeSpells(false); - DoCast(pTarget, SPELL_BLAST_WAVE); + DoCast(target, SPELL_BLAST_WAVE); BlastWave_Timer = 60000; } else BlastWave_Timer -= diff; } diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp index b5f75d8e537..37a2dccec2f 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp @@ -352,8 +352,8 @@ class mob_shadowmoon_channeler : public CreatureScript if (MarkOfShadow_Timer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_MARK_OF_SHADOW); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(target, SPELL_MARK_OF_SHADOW); MarkOfShadow_Timer = 15000+rand()%5000; } else diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp index c28c48295c5..5820d789f12 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp @@ -122,8 +122,8 @@ class boss_the_maker : public CreatureScript if (ExplodingBreaker_Timer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_EXPLODING_BREAKER); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(target, SPELL_EXPLODING_BREAKER); ExplodingBreaker_Timer = 4000+rand()%8000; } else @@ -132,10 +132,10 @@ class boss_the_maker : public CreatureScript /* // Disabled until Core Support for mind control if (domination_timer_timer <= diff) { - Unit* pTarget; - pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); + Unit* target; + target = SelectUnit(SELECT_TARGET_RANDOM, 0); - DoCast(pTarget, SPELL_DOMINATION); + DoCast(target, SPELL_DOMINATION); domination_timer = 120000; } else domination_timer -=diff; diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp index f7746db3ed1..0a60a1584dc 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp @@ -192,9 +192,9 @@ class boss_omor_the_unscarred : public CreatureScript { DoScriptText(SAY_CURSE, me); - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) { - DoCast(pTarget, SPELL_TREACHEROUS_AURA); + DoCast(target, SPELL_TREACHEROUS_AURA); Aura_Timer = 8000+rand()%8000; } } @@ -203,12 +203,12 @@ class boss_omor_the_unscarred : public CreatureScript if (Shadowbolt_Timer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) { - if (pTarget) - pTarget = me->getVictim(); + if (target) + target = me->getVictim(); - DoCast(pTarget, SPELL_SHADOW_BOLT); + DoCast(target, SPELL_SHADOW_BOLT); Shadowbolt_Timer = 4000+rand()%2500; } } diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp index 3096471df0e..16c273bd2b2 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp @@ -117,10 +117,10 @@ class boss_nazan : public CreatureScript } } - void SpellHitTarget(Unit* pTarget, const SpellEntry* entry) + void SpellHitTarget(Unit* target, const SpellEntry* entry) { - if (pTarget && entry->Id == uint32(SPELL_FIREBALL)) - me->SummonCreature(ENTRY_LIQUID_FIRE, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), pTarget->GetOrientation(), TEMPSUMMON_TIMED_DESPAWN, 30000); + if (target && entry->Id == uint32(SPELL_FIREBALL)) + me->SummonCreature(ENTRY_LIQUID_FIRE, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), target->GetOrientation(), TEMPSUMMON_TIMED_DESPAWN, 30000); } void UpdateAI(const uint32 diff) diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp index 28127d88b9a..44a0225fc2c 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp @@ -19,7 +19,7 @@ /* ScriptData SDName: Boss_Watchkeeper_Gargolmar SD%Complete: 80 -SDComment: Missing adds to heal him. Surge should be used on pTarget furthest away, not random. +SDComment: Missing adds to heal him. Surge should be used on target furthest away, not random. SDCategory: Hellfire Citadel, Hellfire Ramparts EndScriptData */ @@ -131,8 +131,8 @@ class boss_watchkeeper_gargolmar : public CreatureScript { DoScriptText(SAY_SURGE, me); - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_SURGE); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(target, SPELL_SURGE); Surge_Timer = 5000+rand()%8000; } diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp index e95eaaa8e7e..ccc2f0712f8 100644 --- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp @@ -426,10 +426,10 @@ class boss_magtheridon : public CreatureScript if (Blaze_Timer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) { float x, y, z; - pTarget->GetPosition(x, y, z); + target->GetPosition(x, y, z); Creature* summon = me->SummonCreature(MOB_ABYSSAL, x, y, z, 0, TEMPSUMMON_CORPSE_DESPAWN, 0); if (summon) { @@ -460,10 +460,10 @@ class boss_magtheridon : public CreatureScript { if (Debris_Timer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) { float x, y, z; - pTarget->GetPosition(x, y, z); + target->GetPosition(x, y, z); Creature* summon = me->SummonCreature(MOB_ABYSSAL, x, y, z, 0, TEMPSUMMON_CORPSE_DESPAWN, 0); if (summon) CAST_AI(mob_abyssal::mob_abyssalAI, summon->AI())->SetTrigger(1); @@ -577,8 +577,8 @@ class mob_hellfire_channeler : public CreatureScript if (Fear_Timer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1)) - DoCast(pTarget, SPELL_FEAR); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1)) + DoCast(target, SPELL_FEAR); Fear_Timer = 25000 + rand()%15000; } else @@ -586,8 +586,8 @@ class mob_hellfire_channeler : public CreatureScript if (Infernal_Timer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_BURNING_ABYSSAL, true); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(target, SPELL_BURNING_ABYSSAL, true); Infernal_Timer = 30000 + rand()%10000; } else diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp index 1808a4ce73f..2bf7485ea02 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp @@ -277,8 +277,8 @@ class boss_grand_warlock_nethekurse : public CreatureScript { if (ShadowFissure_Timer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_SHADOW_FISSURE); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(target, SPELL_SHADOW_FISSURE); ShadowFissure_Timer = urand(7500, 15000); } else @@ -286,8 +286,8 @@ class boss_grand_warlock_nethekurse : public CreatureScript if (DeathCoil_Timer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_DEATH_COIL); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(target, SPELL_DEATH_COIL); DeathCoil_Timer = urand(15000, 20000); } else diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp index 537ddcbdb10..5d7d7883ce0 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp @@ -383,11 +383,11 @@ class boss_warbringer_omrogg : public CreatureScript if (ResetThreat_Timer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) { DoYellForThreat(); DoResetThreat(); - me->AddThreat(pTarget, 0.0f); + me->AddThreat(target, 0.0f); } ResetThreat_Timer = 25000+rand()%15000; } diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp index f57d28978f1..aa3322629b5 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp @@ -154,8 +154,8 @@ class boss_alar : public CreatureScript void JustSummoned(Creature* summon) { if (summon->GetEntry() == CREATURE_EMBER_OF_ALAR) - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - summon->AI()->AttackStart(pTarget); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + summon->AI()->AttackStart(target); } void MoveInLineOfSight(Unit* /*who*/) {} @@ -283,15 +283,15 @@ class boss_alar : public CreatureScript WaitTimer = 4000; return; case WE_DIVE: - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) { me->RemoveAurasDueToSpell(SPELL_DIVE_BOMB_VISUAL); - DoCast(pTarget, SPELL_DIVE_BOMB, true); + DoCast(target, SPELL_DIVE_BOMB, true); float dist = 3.0f; - if (me->IsWithinDist3d(pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 5.0f)) + if (me->IsWithinDist3d(target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 5.0f)) dist = 5.0f; WaitTimer = 1000 + uint32(floor(dist / 80 * 1000.0f)); - me->GetMap()->CreatureRelocation(me, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0.0f); + me->GetMap()->CreatureRelocation(me, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0.0f); me->StopMoving(); WaitEvent = WE_LAND; } @@ -371,9 +371,9 @@ class boss_alar : public CreatureScript { if (Charge_Timer <= diff) { - Unit* pTarget= SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true); - if (pTarget) - DoCast(pTarget, SPELL_CHARGE); + Unit* target= SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true); + if (target) + DoCast(target, SPELL_CHARGE); Charge_Timer = 30000; } else @@ -403,9 +403,9 @@ class boss_alar : public CreatureScript if (FlamePatch_Timer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) { - Creature* Summoned = me->SummonCreature(CREATURE_FLAME_PATCH_ALAR, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 120000); + Creature* Summoned = me->SummonCreature(CREATURE_FLAME_PATCH_ALAR, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 120000); if (Summoned) { Summoned->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); @@ -436,10 +436,10 @@ class boss_alar : public CreatureScript } else { - Unit* pTarget = NULL; - pTarget = me->SelectNearestTargetInAttackDistance(5); - if (pTarget) - me->AI()->AttackStart(pTarget); + Unit* target = NULL; + target = me->SelectNearestTargetInAttackDistance(5); + if (target) + me->AI()->AttackStart(target); else { DoCast(me, SPELL_FLAME_BUFFET, true); diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp index a87d87767c0..8aba632365a 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp @@ -171,8 +171,8 @@ class boss_high_astromancer_solarian : public CreatureScript Creature* Summoned = me->SummonCreature(entry, x, y, z, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); if (Summoned) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - Summoned->AI()->AttackStart(pTarget); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + Summoned->AI()->AttackStart(target); Summons.Summon(Summoned); } @@ -227,8 +227,8 @@ class boss_high_astromancer_solarian : public CreatureScript if (Wrath_Timer <= diff) { me->InterruptNonMeleeSpells(false); - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true)) - DoCast(pTarget, SPELL_WRATH_OF_THE_ASTROMANCER, true); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true)) + DoCast(target, SPELL_WRATH_OF_THE_ASTROMANCER, true); Wrath_Timer = 20000+rand()%5000; } else @@ -243,11 +243,11 @@ class boss_high_astromancer_solarian : public CreatureScript } else { - Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); - if (!me->HasInArc(2.5f, pTarget)) - pTarget = me->getVictim(); - if (pTarget) - DoCast(pTarget, SPELL_ARCANE_MISSILES); + Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0); + if (!me->HasInArc(2.5f, target)) + target = me->getVictim(); + if (target) + DoCast(target, SPELL_ARCANE_MISSILES); } ArcaneMissiles_Timer = 3000; } @@ -258,11 +258,11 @@ class boss_high_astromancer_solarian : public CreatureScript { me->InterruptNonMeleeSpells(false); //Target the tank ? - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1)) { - if (pTarget->GetTypeId() == TYPEID_PLAYER) + if (target->GetTypeId() == TYPEID_PLAYER) { - DoCast(pTarget, SPELL_WRATH_OF_THE_ASTROMANCER); + DoCast(target, SPELL_WRATH_OF_THE_ASTROMANCER); m_uiWrathOfTheAstromancer_Timer = 25000; } else @@ -446,21 +446,21 @@ class mob_solarium_priest : public CreatureScript if (healTimer <= diff) { - Unit* pTarget = NULL; + Unit* target = NULL; switch (urand(0, 1)) { case 0: if (pInstance) - pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_ASTROMANCER)); + target = Unit::GetUnit((*me), pInstance->GetData64(DATA_ASTROMANCER)); break; case 1: - pTarget = me; + target = me; break; } - if (pTarget) + if (target) { - DoCast(pTarget, SPELL_SOLARIUM_GREAT_HEAL); + DoCast(target, SPELL_SOLARIUM_GREAT_HEAL); healTimer = 9000; } } diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp index 0b94e4ad13e..e1d366b0cf7 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp @@ -376,8 +376,8 @@ class boss_kaelthas : public CreatureScript me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - AttackStart(pTarget); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + AttackStart(target); } else @@ -439,8 +439,8 @@ class boss_kaelthas : public CreatureScript // if not phoenix, then it's one of the 7 weapons if (pSummoned->GetEntry() != NPC_PHOENIX) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - pSummoned->AI()->AttackStart(pTarget); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + pSummoned->AI()->AttackStart(target); summons.Summon(pSummoned); } @@ -474,7 +474,7 @@ class boss_kaelthas : public CreatureScript { case 1: { - Unit* pTarget = NULL; + Unit* target = NULL; Creature* Advisor = NULL; //Subphase switch @@ -503,9 +503,9 @@ class boss_kaelthas : public CreatureScript Advisor->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); Advisor->setFaction(me->getFaction()); - pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); - if (pTarget) - Advisor->AI()->AttackStart(pTarget); + target = SelectTarget(SELECT_TARGET_RANDOM, 0); + if (target) + Advisor->AI()->AttackStart(target); } ++PhaseSubphase; @@ -537,9 +537,9 @@ class boss_kaelthas : public CreatureScript Advisor->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); Advisor->setFaction(me->getFaction()); - pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); - if (pTarget) - Advisor->AI()->AttackStart(pTarget); + target = SelectTarget(SELECT_TARGET_RANDOM, 0); + if (target) + Advisor->AI()->AttackStart(target); } ++PhaseSubphase; @@ -571,9 +571,9 @@ class boss_kaelthas : public CreatureScript Advisor->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); Advisor->setFaction(me->getFaction()); - pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); - if (pTarget) - Advisor->AI()->AttackStart(pTarget); + target = SelectTarget(SELECT_TARGET_RANDOM, 0); + if (target) + Advisor->AI()->AttackStart(target); } ++PhaseSubphase; @@ -605,9 +605,9 @@ class boss_kaelthas : public CreatureScript Advisor->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); Advisor->setFaction(me->getFaction()); - pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); - if (pTarget) - Advisor->AI()->AttackStart(pTarget); + target = SelectTarget(SELECT_TARGET_RANDOM, 0); + if (target) + Advisor->AI()->AttackStart(target); } Phase_Timer = 3000; @@ -683,7 +683,7 @@ class boss_kaelthas : public CreatureScript if (PhaseSubphase == 0) { //Respawn advisors - Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); + Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0); Creature* Advisor; for (uint8 i = 0; i < MAX_ADVISORS; ++i) @@ -693,7 +693,7 @@ class boss_kaelthas : public CreatureScript if (!Advisor) sLog->outError("SD2: Kael'Thas Advisor %u does not exist. Possibly despawned? Incorrectly Killed?", i); else - CAST_AI(advisorbase_ai, Advisor->AI())->Revive(pTarget); + CAST_AI(advisorbase_ai, Advisor->AI())->Revive(target); } PhaseSubphase = 1; @@ -714,8 +714,8 @@ class boss_kaelthas : public CreatureScript me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - AttackStart(pTarget); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + AttackStart(target); Phase_Timer = 30000; } @@ -1064,11 +1064,11 @@ class boss_thaladred_the_darkener : public CreatureScript //Gaze_Timer if (Gaze_Timer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) { DoResetThreat(); - me->AddThreat(pTarget, 5000000.0f); - DoScriptText(EMOTE_THALADRED_GAZE, me, pTarget); + me->AddThreat(target, 5000000.0f); + DoScriptText(EMOTE_THALADRED_GAZE, me, target); Gaze_Timer = 8500; } } @@ -1266,11 +1266,11 @@ class boss_grand_astromancer_capernian : public CreatureScript //Conflagration_Timer if (Conflagration_Timer <= diff) { - Unit* pTarget = NULL; - pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); + Unit* target = NULL; + target = SelectTarget(SELECT_TARGET_RANDOM, 0); - if (pTarget && me->IsWithinDistInMap(pTarget, 30)) - DoCast(pTarget, SPELL_CONFLAGRATION); + if (target && me->IsWithinDistInMap(target, 30)) + DoCast(target, SPELL_CONFLAGRATION); else DoCast(me->getVictim(), SPELL_CONFLAGRATION); @@ -1283,7 +1283,7 @@ class boss_grand_astromancer_capernian : public CreatureScript if (ArcaneExplosion_Timer <= diff) { bool InMeleeRange = false; - Unit* pTarget = NULL; + Unit* target = NULL; std::list<HostileReference*>& m_threatlist = me->getThreatManager().getThreatList(); for (std::list<HostileReference*>::const_iterator i = m_threatlist.begin(); i!= m_threatlist.end(); ++i) { @@ -1292,13 +1292,13 @@ class boss_grand_astromancer_capernian : public CreatureScript if (pUnit && pUnit->IsWithinDistInMap(me, 5)) { InMeleeRange = true; - pTarget = pUnit; + target = pUnit; break; } } if (InMeleeRange) - DoCast(pTarget, SPELL_ARCANE_EXPLOSION); + DoCast(target, SPELL_ARCANE_EXPLOSION); ArcaneExplosion_Timer = 4000+rand()%2000; } @@ -1380,8 +1380,8 @@ class boss_master_engineer_telonicus : public CreatureScript //RemoteToy_Timer if (RemoteToy_Timer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_REMOTE_TOY); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(target, SPELL_REMOTE_TOY); RemoteToy_Timer = 10000+rand()%5000; } diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp index 94ea9e0fd68..3852d0b7c46 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp @@ -118,27 +118,27 @@ class boss_void_reaver : public CreatureScript // Arcane Orb if (ArcaneOrb_Timer <= diff) { - 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()); - if (!pTarget) + target = Unit::GetUnit(*me, (*itr)->getUnitGuid()); + if (!target) continue; // exclude pets & totems, 18 yard radius minimum - if (pTarget->GetTypeId() == TYPEID_PLAYER && pTarget->isAlive() && !pTarget->IsWithinDist(me, 18, false)) - target_list.push_back(pTarget); - pTarget = NULL; + if (target->GetTypeId() == TYPEID_PLAYER && target->isAlive() && !target->IsWithinDist(me, 18, false)) + target_list.push_back(target); + target = NULL; } if (target_list.size()) - pTarget = *(target_list.begin()+rand()%target_list.size()); + target = *(target_list.begin()+rand()%target_list.size()); else - pTarget = me->getVictim(); + target = me->getVictim(); - if (pTarget) - me->CastSpell(pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), SPELL_ARCANE_ORB, false, NULL, NULL, 0, pTarget); + if (target) + me->CastSpell(target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), SPELL_ARCANE_ORB, false, NULL, NULL, 0, target); ArcaneOrb_Timer = 3000; } else diff --git a/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp b/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp index e54e55789ae..71a38340a3d 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp @@ -73,13 +73,13 @@ class mob_crystalcore_devastator : public CreatureScript DoCast(me->getVictim(), SPELL_KNOCKAWAY, true); // current aggro target is knocked away pick new target - Unit* pTarget = SelectTarget(SELECT_TARGET_TOPAGGRO, 0); + Unit* target = SelectTarget(SELECT_TARGET_TOPAGGRO, 0); - if (!pTarget || pTarget == me->getVictim()) - pTarget = SelectTarget(SELECT_TARGET_TOPAGGRO, 1); + if (!target || target == me->getVictim()) + target = SelectTarget(SELECT_TARGET_TOPAGGRO, 1); - if (pTarget) - me->TauntApply(pTarget); + if (target) + me->TauntApply(target); Knockaway_Timer = 23000; } diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp index a5ad891012e..707a4ae5946 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp @@ -233,8 +233,8 @@ class mob_ragin_flames : public CreatureScript if (!onlyonce) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - me->GetMotionMaster()->MoveChase(pTarget); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + me->GetMotionMaster()->MoveChase(target); onlyonce = true; } diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp index 1b2a104dc66..54ecbdd621a 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp @@ -129,10 +129,10 @@ class boss_pathaleon_the_calculator : public CreatureScript { for (uint8 i = 0; i < 3; ++i) { - Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); + Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0); Creature* Wraith = me->SummonCreature(21062, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); - if (pTarget && Wraith) - Wraith->AI()->AttackStart(pTarget); + if (target && Wraith) + Wraith->AI()->AttackStart(target); } DoScriptText(SAY_SUMMON, me); Summon_Timer = 30000 + rand()%15000; @@ -158,10 +158,10 @@ class boss_pathaleon_the_calculator : public CreatureScript if (Domination_Timer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1)) { DoScriptText(RAND(SAY_DOMINATION_1, SAY_DOMINATION_2), me); - DoCast(pTarget, SPELL_DOMINATION); + DoCast(target, SPELL_DOMINATION); } Domination_Timer = 25000 + rand()%5000; } @@ -233,8 +233,8 @@ class mob_nether_wraith : public CreatureScript if (ArcaneMissiles_Timer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1)) - DoCast(pTarget, SPELL_ARCANE_MISSILES); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1)) + DoCast(target, SPELL_ARCANE_MISSILES); else DoCast(me->getVictim(), SPELL_ARCANE_MISSILES); ArcaneMissiles_Timer = 5000 + rand()%5000; diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp index 5fa365ac4ac..dee6da11c3d 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp @@ -128,8 +128,8 @@ class boss_harbinger_skyriss : public CreatureScript else summon->SetHealth(summon->CountPctFromMaxHealth(66)); if (me->getVictim()) - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - summon->AI()->AttackStart(pTarget); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + summon->AI()->AttackStart(target); } void KilledUnit(Unit* victim) @@ -208,8 +208,8 @@ class boss_harbinger_skyriss : public CreatureScript if (MindRend_Timer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1)) - DoCast(pTarget, SPELL_MIND_REND); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1)) + DoCast(target, SPELL_MIND_REND); else DoCast(me->getVictim(), SPELL_MIND_REND); @@ -225,8 +225,8 @@ class boss_harbinger_skyriss : public CreatureScript DoScriptText(RAND(SAY_FEAR_1, SAY_FEAR_2), me); - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1)) - DoCast(pTarget, SPELL_FEAR); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1)) + DoCast(target, SPELL_FEAR); else DoCast(me->getVictim(), SPELL_FEAR); @@ -242,8 +242,8 @@ class boss_harbinger_skyriss : public CreatureScript DoScriptText(RAND(SAY_MIND_1, SAY_MIND_2), me); - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1)) - DoCast(pTarget, SPELL_DOMINATION); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1)) + DoCast(target, SPELL_DOMINATION); else DoCast(me->getVictim(), SPELL_DOMINATION); @@ -259,8 +259,8 @@ class boss_harbinger_skyriss : public CreatureScript if (me->IsNonMeleeSpellCasted(false)) return; - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1)) - DoCast(pTarget, H_SPELL_MANA_BURN); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1)) + DoCast(target, H_SPELL_MANA_BURN); ManaBurn_Timer = 16000+rand()%16000; } diff --git a/src/server/scripts/Outland/blades_edge_mountains.cpp b/src/server/scripts/Outland/blades_edge_mountains.cpp index 771968de9bb..1ae5ff2115f 100644 --- a/src/server/scripts/Outland/blades_edge_mountains.cpp +++ b/src/server/scripts/Outland/blades_edge_mountains.cpp @@ -237,9 +237,9 @@ public: if (ManaBurn_Timer <= diff) { - Unit* pTarget = me->getVictim(); - if (pTarget && pTarget->getPowerType() == POWER_MANA) - DoCast(pTarget, SPELL_MANA_BURN); + Unit* target = me->getVictim(); + if (target && target->getPowerType() == POWER_MANA) + DoCast(target, SPELL_MANA_BURN); ManaBurn_Timer = 8000+rand()%8000; } else ManaBurn_Timer -= diff; diff --git a/src/server/scripts/Outland/shadowmoon_valley.cpp b/src/server/scripts/Outland/shadowmoon_valley.cpp index 336263039b7..64fef57b34c 100644 --- a/src/server/scripts/Outland/shadowmoon_valley.cpp +++ b/src/server/scripts/Outland/shadowmoon_valley.cpp @@ -1541,11 +1541,11 @@ public: { if (SpellTimer1 <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) { - if (pTarget->GetTypeId() == TYPEID_PLAYER) + if (target->GetTypeId() == TYPEID_PLAYER) { - DoCast(pTarget, SpawnCast[1].SpellId); //Focused Bursts + DoCast(target, SpawnCast[1].SpellId); //Focused Bursts SpellTimer1 = SpawnCast[1].Timer2 + (rand()%5 * 1000); } else SpellTimer1 = 2000; } @@ -1629,10 +1629,10 @@ void npc_lord_illidan_stormrage::npc_lord_illidan_stormrageAI::SummonNextWave() { if (PlayerGUID) { - if (Player* pTarget = Unit::GetPlayer(*me, PlayerGUID)) + if (Player* target = Unit::GetPlayer(*me, PlayerGUID)) { float x, y, z; - pTarget->GetPosition(x, y, z); + target->GetPosition(x, y, z); Spawn->GetMotionMaster()->MovePoint(0, x, y, z); } } diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp index a6938122196..fbe890a41c4 100644 --- a/src/server/scripts/Spells/spell_generic.cpp +++ b/src/server/scripts/Spells/spell_generic.cpp @@ -476,10 +476,10 @@ class spell_gen_trick_or_treat : public SpellScriptLoader void HandleScript(SpellEffIndex /*effIndex*/) { - if (Player* pTarget = GetHitPlayer()) + if (Player* target = GetHitPlayer()) { - GetCaster()->CastSpell(pTarget, roll_chance_i(50) ? SPELL_TRICK : SPELL_TREAT, true, NULL); - GetCaster()->CastSpell(pTarget, SPELL_TRICKED_OR_TREATED, true, NULL); + GetCaster()->CastSpell(target, roll_chance_i(50) ? SPELL_TRICK : SPELL_TREAT, true, NULL); + GetCaster()->CastSpell(target, SPELL_TRICKED_OR_TREATED, true, NULL); } } diff --git a/src/server/scripts/Spells/spell_hunter.cpp b/src/server/scripts/Spells/spell_hunter.cpp index 0cdeaf82c55..931d63d954b 100644 --- a/src/server/scripts/Spells/spell_hunter.cpp +++ b/src/server/scripts/Spells/spell_hunter.cpp @@ -369,23 +369,23 @@ public: return; uint32 spellId = SPELL_SNIPER_TRAINING_BUFF_R1 + GetId() - SPELL_SNIPER_TRAINING_R1; - Unit* pTarget = GetTarget(); - if (!pTarget->HasAura(spellId)) + Unit* target = GetTarget(); + if (!target->HasAura(spellId)) { SpellEntry const* triggeredSpellInfo = sSpellStore.LookupEntry(spellId); - Unit* triggerCaster = GetTriggeredSpellCaster(triggeredSpellInfo, caster, pTarget); - triggerCaster->CastSpell(pTarget, triggeredSpellInfo, true, 0, aurEff); + Unit* triggerCaster = GetTriggeredSpellCaster(triggeredSpellInfo, caster, target); + triggerCaster->CastSpell(target, triggeredSpellInfo, true, 0, aurEff); } } void HandleUpdatePeriodic(AuraEffect * aurEff) { - Unit* pTarget = GetUnitOwner(); - if (Player* playerTarget = pTarget->ToPlayer()) + Unit* target = GetUnitOwner(); + if (Player* playerTarget = target->ToPlayer()) { int32 baseAmount = aurEff->GetBaseAmount(); int32 amount = playerTarget->isMoving() ? - pTarget->CalculateSpellDamage(pTarget, GetSpellProto(), aurEff->GetEffIndex(), &baseAmount) : + target->CalculateSpellDamage(target, GetSpellProto(), aurEff->GetEffIndex(), &baseAmount) : aurEff->GetAmount() - 1; aurEff->SetAmount(amount); } diff --git a/src/server/scripts/Spells/spell_item.cpp b/src/server/scripts/Spells/spell_item.cpp index 76ef4eb2ccc..af62114014e 100644 --- a/src/server/scripts/Spells/spell_item.cpp +++ b/src/server/scripts/Spells/spell_item.cpp @@ -222,13 +222,13 @@ public: void HandleDummy(SpellEffIndex /*effIndex*/) { - if (Unit* pTarget = GetHitUnit()) + if (Unit* target = GetHitUnit()) { Unit* pCaster = GetCaster(); if (urand(0, 99) < 15) pCaster->CastSpell(pCaster, SPELL_GNOMISH_DEATH_RAY_SELF, true, NULL); // failure else - pCaster->CastSpell(pTarget, SPELL_GNOMISH_DEATH_RAY_TARGET, true, NULL); + pCaster->CastSpell(target, SPELL_GNOMISH_DEATH_RAY_TARGET, true, NULL); } } @@ -394,7 +394,7 @@ public: void HandleDummy(SpellEffIndex /*effIndex*/) { - if (Unit* pTarget = GetHitUnit()) + if (Unit* target = GetHitUnit()) { uint32 spellId = SPELL_NET_O_MATIC_TRIGGERED3; uint32 roll = urand(0, 99); @@ -403,7 +403,7 @@ public: else if (roll < 4) // 2% for 20 sec root, charge to target (off-like chance unknown) spellId = SPELL_NET_O_MATIC_TRIGGERED2; - GetCaster()->CastSpell(pTarget, spellId, true, NULL); + GetCaster()->CastSpell(target, spellId, true, NULL); } } @@ -572,7 +572,7 @@ public: void HandleDummy(SpellEffIndex /*effIndex*/) { - if (Unit* pTarget = GetHitUnit()) + if (Unit* target = GetHitUnit()) { Unit* pCaster = GetCaster(); @@ -588,17 +588,17 @@ public: { spellId = SPELL_POLYMORPH; if (urand(0, 100) <= 30) // 30% chance to self-cast - pTarget = pCaster; + target = pCaster; } else if (rand < 95) // Enveloping Winds (15% chance) spellId = SPELL_ENVELOPING_WINDS; else // Summon Felhund minion (5% chance) { spellId = SPELL_SUMMON_FELHOUND_MINION; - pTarget = pCaster; + target = pCaster; } - pCaster->CastSpell(pTarget, spellId, true, GetCastItem()); + pCaster->CastSpell(target, spellId, true, GetCastItem()); } } diff --git a/src/server/scripts/Spells/spell_paladin.cpp b/src/server/scripts/Spells/spell_paladin.cpp index 031a7da97f2..2de2e5a13cf 100644 --- a/src/server/scripts/Spells/spell_paladin.cpp +++ b/src/server/scripts/Spells/spell_paladin.cpp @@ -186,15 +186,15 @@ public: void HandleEffectApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { - Unit* pTarget = GetTarget(); + Unit* target = GetTarget(); if (Unit* pCaster = GetCaster()) - pCaster->CastSpell(pTarget, PALADIN_SPELL_BLESSING_OF_SANCTUARY_BUFF, true); + pCaster->CastSpell(target, PALADIN_SPELL_BLESSING_OF_SANCTUARY_BUFF, true); } void HandleEffectRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { - Unit* pTarget = GetTarget(); - pTarget->RemoveAura(PALADIN_SPELL_BLESSING_OF_SANCTUARY_BUFF, GetCasterGUID()); + Unit* target = GetTarget(); + target->RemoveAura(PALADIN_SPELL_BLESSING_OF_SANCTUARY_BUFF, GetCasterGUID()); } void Register() diff --git a/src/server/scripts/Spells/spell_quest.cpp b/src/server/scripts/Spells/spell_quest.cpp index aaa7186f2ac..c760220b5e5 100644 --- a/src/server/scripts/Spells/spell_quest.cpp +++ b/src/server/scripts/Spells/spell_quest.cpp @@ -221,9 +221,9 @@ public: PrepareAuraScript(spell_q11396_11399_force_shield_arcane_purple_x3_AuraScript) void HandleEffectApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { - Unit* pTarget = GetTarget(); - pTarget->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); - pTarget->AddUnitState(UNIT_STAT_ROOT); + Unit* target = GetTarget(); + target->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); + target->AddUnitState(UNIT_STAT_ROOT); } void HandleEffectRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) @@ -265,11 +265,11 @@ public: void HandleDummy(SpellEffIndex /*effIndex*/) { - if (Unit* pTarget = GetTargetUnit()) - if (pTarget->GetTypeId() == TYPEID_UNIT && pTarget->HasAura(SPELL_FORCE_SHIELD_ARCANE_PURPLE_X3)) + if (Unit* target = GetTargetUnit()) + if (target->GetTypeId() == TYPEID_UNIT && target->HasAura(SPELL_FORCE_SHIELD_ARCANE_PURPLE_X3)) // Make sure nobody else is channeling the same target - if (!pTarget->HasAura(SPELL_SCOURGING_CRYSTAL_CONTROLLER)) - GetCaster()->CastSpell(pTarget, SPELL_SCOURGING_CRYSTAL_CONTROLLER, true, GetCastItem()); + if (!target->HasAura(SPELL_SCOURGING_CRYSTAL_CONTROLLER)) + GetCaster()->CastSpell(target, SPELL_SCOURGING_CRYSTAL_CONTROLLER, true, GetCastItem()); } void Register() @@ -302,9 +302,9 @@ public: void HandleDummy(SpellEffIndex /*effIndex*/) { - if (Unit* pTarget = GetTargetUnit()) - if (pTarget->GetTypeId() == TYPEID_UNIT) - pTarget->RemoveAurasDueToSpell(SPELL_FORCE_SHIELD_ARCANE_PURPLE_X3); + if (Unit* target = GetTargetUnit()) + if (target->GetTypeId() == TYPEID_UNIT) + target->RemoveAurasDueToSpell(SPELL_FORCE_SHIELD_ARCANE_PURPLE_X3); } void Register() @@ -443,12 +443,12 @@ public: if (pCaster->GetTypeId() != TYPEID_PLAYER) return; - Creature* pTarget = GetHitCreature(); - if (!pTarget) + Creature* target = GetHitCreature(); + if (!target) return; uint32 spellId = 0; - switch (pTarget->GetEntry()) + switch (target->GetEntry()) { case NPC_SCAVENGEBOT_004A8: spellId = SPELL_SUMMON_SCAVENGEBOT_004A8; break; case NPC_SENTRYBOT_57K: spellId = SPELL_SUMMON_SENTRYBOT_57K; break; @@ -460,7 +460,7 @@ public: } pCaster->CastSpell(pCaster, spellId, true, castItem); pCaster->CastSpell(pCaster, SPELL_ROBOT_KILL_CREDIT, true); - pTarget->DespawnOrUnsummon(); + target->DespawnOrUnsummon(); } void Register() @@ -706,11 +706,11 @@ public: Unit* pCaster = GetCaster(); if (Player* player = pCaster->ToPlayer()) { - if(Creature* pTarget = GetHitCreature()) + if(Creature* target = GetHitCreature()) { player->CastSpell(player, SPELL_TRIGGER_AID_OF_THE_EARTHEN, true, NULL); player->KilledMonsterCredit(NPC_FALLEN_EARTHEN_DEFENDER, 0); - pTarget->DespawnOrUnsummon(); + target->DespawnOrUnsummon(); } } } diff --git a/src/server/scripts/Spells/spell_rogue.cpp b/src/server/scripts/Spells/spell_rogue.cpp index 4c2bdbfa4de..035c6d9b9b5 100644 --- a/src/server/scripts/Spells/spell_rogue.cpp +++ b/src/server/scripts/Spells/spell_rogue.cpp @@ -226,18 +226,18 @@ public: void HandleEffectPeriodic(AuraEffect const* /*aurEff*/) { - Unit* pTarget = GetTarget(); - Unit* pVictim = pTarget->getVictim(); - if (pVictim && (pTarget->GetHealthPct() > pVictim->GetHealthPct())) + Unit* target = GetTarget(); + Unit* pVictim = target->getVictim(); + if (pVictim && (target->GetHealthPct() > pVictim->GetHealthPct())) { - if (!pTarget->HasAura(ROGUE_SPELL_PREY_ON_THE_WEAK)) + if (!target->HasAura(ROGUE_SPELL_PREY_ON_THE_WEAK)) { int32 bp = SpellMgr::CalculateSpellEffectAmount(GetSpellProto(), 0); - pTarget->CastCustomSpell(pTarget, ROGUE_SPELL_PREY_ON_THE_WEAK, &bp, 0, 0, true); + target->CastCustomSpell(target, ROGUE_SPELL_PREY_ON_THE_WEAK, &bp, 0, 0, true); } } else - pTarget->RemoveAurasDueToSpell(ROGUE_SPELL_PREY_ON_THE_WEAK); + target->RemoveAurasDueToSpell(ROGUE_SPELL_PREY_ON_THE_WEAK); } void Register() diff --git a/src/server/scripts/World/achievement_scripts.cpp b/src/server/scripts/World/achievement_scripts.cpp index 339d54d5450..2c979f5727c 100755 --- a/src/server/scripts/World/achievement_scripts.cpp +++ b/src/server/scripts/World/achievement_scripts.cpp @@ -89,13 +89,13 @@ class achievement_save_the_day : public AchievementCriteriaScript if (!target) return false; - if (Player const* pTarget = target->ToPlayer()) + if (Player const* target = target->ToPlayer()) { if (source->GetBattlegroundTypeId() != BATTLEGROUND_WS || !source->GetBattleground()) return false; BattlegroundWS* pWSG = static_cast<BattlegroundWS*>(source->GetBattleground()); - if (pWSG->GetFlagState(pTarget->GetTeam()) == BG_WS_FLAG_STATE_ON_BASE) + if (pWSG->GetFlagState(target->GetTeam()) == BG_WS_FLAG_STATE_ON_BASE) return true; } return false; diff --git a/src/server/scripts/World/go_scripts.cpp b/src/server/scripts/World/go_scripts.cpp index c98288cd976..fba7b44d789 100644 --- a/src/server/scripts/World/go_scripts.cpp +++ b/src/server/scripts/World/go_scripts.cpp @@ -1130,11 +1130,11 @@ public: if (uiAction == GOSSIP_ACTION_INFO_DEF +1) { player->CLOSE_GOSSIP_MENU(); - Creature* pTarget = GetClosestCreatureWithEntry(player, NPC_OUTHOUSE_BUNNY, 3.0f); - if (pTarget) + Creature* target = GetClosestCreatureWithEntry(player, NPC_OUTHOUSE_BUNNY, 3.0f); + if (target) { - pTarget->AI()->SetData(1, player->getGender()); - pGO->CastSpell(pTarget, SPELL_INDISPOSED_III); + target->AI()->SetData(1, player->getGender()); + pGO->CastSpell(target, SPELL_INDISPOSED_III); } pGO->CastSpell(player, SPELL_INDISPOSED); if (player->HasItemCount(ITEM_ANDERHOLS_SLIDER_CIDER, 1)) |