diff options
Diffstat (limited to 'src/server/scripts/Northrend')
88 files changed, 543 insertions, 543 deletions
diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp index 7ee829ab5d9..05a351cc07b 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp @@ -91,7 +91,7 @@ public: struct boss_anub_arakAI : public ScriptedAI { - boss_anub_arakAI(Creature *c) : ScriptedAI(c), lSummons(me) + boss_anub_arakAI(Creature* c) : ScriptedAI(c), lSummons(me) { pInstance = c->GetInstanceScript(); } @@ -142,7 +142,7 @@ public: } } - Creature* DoSummonImpaleTarget(Unit *pTarget) + Creature* DoSummonImpaleTarget(Unit* pTarget) { Position targetPos; pTarget->GetPosition(&targetPos); @@ -184,7 +184,7 @@ public: case IMPALE_PHASE_TARGET: if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) { - if (Creature *pImpaleTarget = DoSummonImpaleTarget(target)) + if (Creature* pImpaleTarget = DoSummonImpaleTarget(target)) pImpaleTarget->CastSpell(pImpaleTarget, SPELL_IMPALE_SHAKEGROUND, true); uiImpaleTimer = 3*IN_MILLISECONDS; uiImpalePhase = IMPALE_PHASE_ATTACK; @@ -212,7 +212,7 @@ public: { for (uint8 i = 0; i < 2; ++i) { - if (Creature *Guardian = me->SummonCreature(CREATURE_GUARDIAN, SpawnPointGuardian[i], TEMPSUMMON_CORPSE_DESPAWN, 0)) + if (Creature* Guardian = me->SummonCreature(CREATURE_GUARDIAN, SpawnPointGuardian[i], TEMPSUMMON_CORPSE_DESPAWN, 0)) { Guardian->AddThreat(me->getVictim(), 0.0f); DoZoneInCombat(Guardian); @@ -229,7 +229,7 @@ public: { for (uint8 i = 0; i < 2; ++i) { - if (Creature *Venomancer = me->SummonCreature(CREATURE_VENOMANCER, SpawnPoint[i], TEMPSUMMON_CORPSE_DESPAWN, 0)) + if (Creature* Venomancer = me->SummonCreature(CREATURE_VENOMANCER, SpawnPoint[i], TEMPSUMMON_CORPSE_DESPAWN, 0)) { Venomancer->AddThreat(me->getVictim(), 0.0f); DoZoneInCombat(Venomancer); @@ -248,7 +248,7 @@ public: { for (uint8 i = 0; i < 2; ++i) { - if (Creature *Datter = me->SummonCreature(CREATURE_DATTER, SpawnPoint[i], TEMPSUMMON_CORPSE_DESPAWN, 0)) + if (Creature* Datter = me->SummonCreature(CREATURE_DATTER, SpawnPoint[i], TEMPSUMMON_CORPSE_DESPAWN, 0)) { Datter->AddThreat(me->getVictim(), 0.0f); DoZoneInCombat(Datter); @@ -314,7 +314,7 @@ public: { if (Unit* target = me->getVictim()) { - if (Creature *pImpaleTarget = DoSummonImpaleTarget(target)) + if (Creature* pImpaleTarget = DoSummonImpaleTarget(target)) me->CastSpell(pImpaleTarget, DUNGEON_MODE(SPELL_POUND, SPELL_POUND_H), false); } uiPoundTimer = 16500; @@ -333,7 +333,7 @@ public: pInstance->SetData(DATA_ANUBARAK_EVENT, DONE); } - void KilledUnit(Unit *pVictim) + void KilledUnit(Unit* pVictim) { if (pVictim == me) return; @@ -346,7 +346,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new boss_anub_arakAI(creature); } diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp index 0d2ef4c87be..3350cf58eb3 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp @@ -188,7 +188,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new boss_hadronoxAI(creature); } 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 39aefd45287..3a499184684 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 @@ -94,7 +94,7 @@ public: struct boss_krik_thirAI : public ScriptedAI { - boss_krik_thirAI(Creature *c) : ScriptedAI(c) + boss_krik_thirAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -199,7 +199,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new boss_krik_thirAI(creature); } @@ -212,7 +212,7 @@ public: struct npc_skittering_infectorAI : public ScriptedAI { - npc_skittering_infectorAI(Creature *c) : ScriptedAI(c) {} + npc_skittering_infectorAI(Creature* c) : ScriptedAI(c) {} void JustDied(Unit* /*killer*/) { @@ -221,7 +221,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_skittering_infectorAI(creature); } @@ -234,7 +234,7 @@ public: struct npc_anub_ar_skirmisherAI : public ScriptedAI { - npc_anub_ar_skirmisherAI(Creature *c) : ScriptedAI(c) {} + npc_anub_ar_skirmisherAI(Creature* c) : ScriptedAI(c) {} uint32 uiChargeTimer; uint32 uiBackstabTimer; @@ -272,7 +272,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_anub_ar_skirmisherAI(creature); } @@ -285,7 +285,7 @@ public: struct npc_anub_ar_shadowcasterAI : public ScriptedAI { - npc_anub_ar_shadowcasterAI(Creature *c) : ScriptedAI(c) {} + npc_anub_ar_shadowcasterAI(Creature* c) : ScriptedAI(c) {} uint32 uiShadowBoltTimer; uint32 uiShadowNovaTimer; @@ -303,7 +303,7 @@ public: if (uiShadowBoltTimer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_SHADOW_BOLT, true); uiShadowBoltTimer = 15*IN_MILLISECONDS; } else uiShadowBoltTimer -= diff; @@ -318,7 +318,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_anub_ar_shadowcasterAI(creature); } @@ -331,7 +331,7 @@ public: struct npc_anub_ar_warriorAI : public ScriptedAI { - npc_anub_ar_warriorAI(Creature *c) : ScriptedAI(c){} + npc_anub_ar_warriorAI(Creature* c) : ScriptedAI(c){} uint32 uiCleaveTimer; uint32 uiStrikeTimer; @@ -363,7 +363,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_anub_ar_warriorAI(creature); } @@ -376,7 +376,7 @@ public: struct npc_watcher_gashraAI : public ScriptedAI { - npc_watcher_gashraAI(Creature *c) : ScriptedAI(c) {} + npc_watcher_gashraAI(Creature* c) : ScriptedAI(c) {} uint32 uiWebWrapTimer; uint32 uiInfectedBiteTimer; @@ -399,7 +399,7 @@ public: if (uiWebWrapTimer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_WEB_WRAP, true); uiWebWrapTimer = 17*IN_MILLISECONDS; } else uiWebWrapTimer -= diff; @@ -414,7 +414,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_watcher_gashraAI(creature); } @@ -427,7 +427,7 @@ public: struct npc_watcher_narjilAI : public ScriptedAI { - npc_watcher_narjilAI(Creature *c) : ScriptedAI(c) {} + npc_watcher_narjilAI(Creature* c) : ScriptedAI(c) {} uint32 uiWebWrapTimer; uint32 uiInfectedBiteTimer; @@ -447,7 +447,7 @@ public: if (uiWebWrapTimer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_WEB_WRAP, true); uiWebWrapTimer = 15*IN_MILLISECONDS; } else uiWebWrapTimer -= diff; @@ -468,7 +468,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_watcher_narjilAI(creature); } @@ -481,7 +481,7 @@ public: struct npc_watcher_silthikAI : public ScriptedAI { - npc_watcher_silthikAI(Creature *c) : ScriptedAI(c) {} + npc_watcher_silthikAI(Creature* c) : ScriptedAI(c) {} uint32 uiWebWrapTimer; uint32 uiInfectedBiteTimer; @@ -501,7 +501,7 @@ public: if (uiWebWrapTimer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_WEB_WRAP, true); uiWebWrapTimer = 15*IN_MILLISECONDS; @@ -524,7 +524,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_watcher_silthikAI(creature); } diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp index 0e069e5ba43..7a5faa10c63 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp @@ -48,7 +48,7 @@ public: struct boss_amanitarAI : public ScriptedAI { - boss_amanitarAI(Creature *c) : ScriptedAI(c) + boss_amanitarAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); bFirstTime = true; @@ -132,7 +132,7 @@ public: if (uiRootTimer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_ENTANGLING_ROOTS); uiRootTimer = urand(15*IN_MILLISECONDS, 30*IN_MILLISECONDS); } else uiRootTimer -= diff; @@ -145,7 +145,7 @@ public: if (uiBoltTimer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_VENOM_BOLT_VOLLEY); uiBoltTimer = urand(15*IN_MILLISECONDS, 30*IN_MILLISECONDS); } else uiBoltTimer -= diff; @@ -154,7 +154,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new boss_amanitarAI(creature); } @@ -215,7 +215,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new mob_amanitar_mushroomsAI(creature); } 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 75a0420231c..712bec836bc 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp @@ -101,7 +101,7 @@ public: } } - void SpellHitTarget(Unit *pTarget, const SpellEntry *spell) + void SpellHitTarget(Unit* pTarget, const SpellEntry *spell) { if (spell->Id == SPELL_INSANITY) { @@ -123,11 +123,11 @@ public: Map::PlayerList const &players = me->GetMap()->GetPlayers(); for (Map::PlayerList::const_iterator i = players.begin(); i != players.end(); ++i) { - Player *plr = i->getSource(); + Player* plr = i->getSource(); if (!plr || !plr->isAlive()) continue; // Summon clone - if (Unit *summon = me->SummonCreature(MOB_TWISTED_VISAGE, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation(), TEMPSUMMON_CORPSE_DESPAWN, 0)) + if (Unit* summon = me->SummonCreature(MOB_TWISTED_VISAGE, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation(), TEMPSUMMON_CORPSE_DESPAWN, 0)) { // clone plr->CastSpell(summon, SPELL_CLONE_PLAYER, true); @@ -184,7 +184,7 @@ public: } } - void JustSummoned(Creature *summon) + void JustSummoned(Creature* summon) { Summons.Summon(summon); } @@ -213,7 +213,7 @@ public: return spell; } - void SummonedCreatureDespawn(Creature *summon) + void SummonedCreatureDespawn(Creature* summon) { uint32 phase= summon->GetPhaseMask(); uint32 nextPhase = 0; @@ -222,7 +222,7 @@ public: // Check if all summons in this phase killed for (SummonList::const_iterator iter = Summons.begin(); iter != Summons.end(); ++iter) { - if (Creature *visage = Unit::GetCreature(*me, *iter)) + if (Creature* visage = Unit::GetCreature(*me, *iter)) { // Not all are dead if (phase == visage->GetPhaseMask()) @@ -288,7 +288,7 @@ public: if (uiShiverTimer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_SHIVER); uiShiverTimer = 15*IN_MILLISECONDS; } else uiShiverTimer -= diff; @@ -313,7 +313,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new boss_volazjAI(creature); } 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 a3fd20c830e..08a63b6b118 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp @@ -342,7 +342,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new boss_jedoga_shadowseekerAI(creature); } @@ -508,7 +508,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new mob_jedoga_initiandAI(creature); } @@ -591,7 +591,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_jedogas_aufseher_triggerAI(creature); } 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 e97bb5cf491..e52d27bb567 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp @@ -79,7 +79,7 @@ public: struct boss_taldaramAI : public ScriptedAI { - boss_taldaramAI(Creature *c) : ScriptedAI(c) + boss_taldaramAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); @@ -135,7 +135,7 @@ public: //DoCast(me, SPELL_FLAME_SPHERE_SUMMON_1); pSpheres[0] = DoSpawnCreature(CREATURE_FLAME_SPHERE, 0, 0, 5, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 10*IN_MILLISECONDS); - Unit *pSphereTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); + Unit* pSphereTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); if (pSphereTarget && pSpheres[0]) { float angle, x, y; @@ -169,7 +169,7 @@ public: break; } case JUST_VANISHED: - if (Unit *pEmbraceTarget = GetEmbraceTarget()) + if (Unit* pEmbraceTarget = GetEmbraceTarget()) { me->GetMotionMaster()->Clear(); me->SetSpeed(MOVE_WALK, 2.0f, true); @@ -179,7 +179,7 @@ public: uiPhaseTimer = 1300; break; case VANISHED: - if (Unit *pEmbraceTarget = GetEmbraceTarget()) + if (Unit* pEmbraceTarget = GetEmbraceTarget()) DoCast(pEmbraceTarget, SPELL_EMBRACE_OF_THE_VAMPYR); me->GetMotionMaster()->Clear(); me->SetSpeed(MOVE_WALK, 1.0f, true); @@ -210,9 +210,9 @@ public: if (uiVanishTimer <= diff) { //Count alive players - Unit *pTarget = NULL; + Unit* pTarget = NULL; std::list<HostileReference *> t_list = me->getThreatManager().getThreatList(); - std::vector<Unit *> target_list; + 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()); @@ -292,7 +292,7 @@ public: for (uint8 i=0; i < 2; ++i) { - GameObject *pSpheres = pInstance->instance->GetGameObject(uiSphereGuids[i]); + GameObject* pSpheres = pInstance->instance->GetGameObject(uiSphereGuids[i]); if (!pSpheres) return false; if (pSpheres->GetGoState() != GO_STATE_ACTIVE) @@ -325,7 +325,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new boss_taldaramAI(creature); } @@ -338,7 +338,7 @@ public: struct mob_taldaram_flamesphereAI : public ScriptedAI { - mob_taldaram_flamesphereAI(Creature *c) : ScriptedAI(c) + mob_taldaram_flamesphereAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -375,7 +375,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new mob_taldaram_flamesphereAI(creature); } @@ -386,11 +386,11 @@ class prince_taldaram_sphere : public GameObjectScript public: prince_taldaram_sphere() : GameObjectScript("prince_taldaram_sphere") { } - bool OnGossipHello(Player* /*pPlayer*/, GameObject *pGO) + bool OnGossipHello(Player* /*pPlayer*/, GameObject* pGO) { InstanceScript *pInstance = pGO->GetInstanceScript(); - Creature *pPrinceTaldaram = Unit::GetCreature(*pGO, pInstance ? pInstance->GetData64(DATA_PRINCE_TALDARAM) : 0); + Creature* pPrinceTaldaram = Unit::GetCreature(*pGO, pInstance ? pInstance->GetData64(DATA_PRINCE_TALDARAM) : 0); if (pPrinceTaldaram && pPrinceTaldaram->isAlive()) { // maybe these are hacks :( diff --git a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp index 847b5ddb9cc..7ce54792e9b 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp @@ -472,7 +472,7 @@ public: { if (pInstance) { - if (Creature *pTemp = Unit::GetCreature(*me, pInstance->GetData64(uiDataId))) + if (Creature* pTemp = Unit::GetCreature(*me, pInstance->GetData64(uiDataId))) { if (pTemp->isAlive() && !pTemp->getVictim()) { @@ -590,9 +590,9 @@ public: { case 0: { - Creature *Right1 = me->SummonCreature(NPC_FLAME_TSUNAMI, FlameRight1Spawn.x, FlameRight1Spawn.y , FlameRight1Spawn.z, 0, TEMPSUMMON_TIMED_DESPAWN, 12000); - Creature *Right2 = me->SummonCreature(NPC_FLAME_TSUNAMI, FlameRight2Spawn.x, FlameRight2Spawn.y , FlameRight2Spawn.z, 0, TEMPSUMMON_TIMED_DESPAWN, 12000); - Creature *Right3 = me->SummonCreature(NPC_FLAME_TSUNAMI, FlameRight3Spawn.x, FlameRight3Spawn.y , FlameRight3Spawn.z, 0, TEMPSUMMON_TIMED_DESPAWN, 12000); + Creature* Right1 = me->SummonCreature(NPC_FLAME_TSUNAMI, FlameRight1Spawn.x, FlameRight1Spawn.y , FlameRight1Spawn.z, 0, TEMPSUMMON_TIMED_DESPAWN, 12000); + Creature* Right2 = me->SummonCreature(NPC_FLAME_TSUNAMI, FlameRight2Spawn.x, FlameRight2Spawn.y , FlameRight2Spawn.z, 0, TEMPSUMMON_TIMED_DESPAWN, 12000); + Creature* Right3 = me->SummonCreature(NPC_FLAME_TSUNAMI, FlameRight3Spawn.x, FlameRight3Spawn.y , FlameRight3Spawn.z, 0, TEMPSUMMON_TIMED_DESPAWN, 12000); Right1->GetMotionMaster()->MovePoint(0, FlameRight1Direction.x, FlameRight1Direction.y, FlameRight1Direction.z); Right2->GetMotionMaster()->MovePoint(0, FlameRight2Direction.x, FlameRight2Direction.y, FlameRight2Direction.z); Right3->GetMotionMaster()->MovePoint(0, FlameRight3Direction.x, FlameRight3Direction.y, FlameRight3Direction.z); @@ -600,8 +600,8 @@ public: } case 1: { - Creature *Left1 = me->SummonCreature(NPC_FLAME_TSUNAMI, FlameLeft1Spawn.x, FlameLeft1Spawn.y , FlameLeft1Spawn.z, 0, TEMPSUMMON_TIMED_DESPAWN, 12000); - Creature *Left2 = me->SummonCreature(NPC_FLAME_TSUNAMI, FlameLeft2Spawn.x, FlameLeft2Spawn.y , FlameLeft2Spawn.z, 0, TEMPSUMMON_TIMED_DESPAWN, 12000); + Creature* Left1 = me->SummonCreature(NPC_FLAME_TSUNAMI, FlameLeft1Spawn.x, FlameLeft1Spawn.y , FlameLeft1Spawn.z, 0, TEMPSUMMON_TIMED_DESPAWN, 12000); + Creature* Left2 = me->SummonCreature(NPC_FLAME_TSUNAMI, FlameLeft2Spawn.x, FlameLeft2Spawn.y , FlameLeft2Spawn.z, 0, TEMPSUMMON_TIMED_DESPAWN, 12000); Left1->GetMotionMaster()->MovePoint(0, FlameLeft1Direction.x, FlameLeft1Direction.y, FlameLeft1Direction.z); Left2->GetMotionMaster()->MovePoint(0, FlameLeft2Direction.x, FlameLeft2Direction.y, FlameLeft2Direction.z); break; 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 3e8ca0a31d2..8ac4fdb899d 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp @@ -241,7 +241,7 @@ public: bHealth = false; bDone = false; - if (Creature *pMemory = Unit::GetCreature(*me, MemoryGUID)) + if (Creature* pMemory = Unit::GetCreature(*me, MemoryGUID)) if (pMemory->isAlive()) pMemory->RemoveFromWorld(); } @@ -323,7 +323,7 @@ public: DoCast(me, SPELL_RENEW); break; case 1: - if (Creature *pMemory = Unit::GetCreature(*me, MemoryGUID)) + if (Creature* pMemory = Unit::GetCreature(*me, MemoryGUID)) if (pMemory->isAlive()) DoCast(pMemory, SPELL_RENEW); break; 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 5157a602a21..b5d0c9504ef 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp @@ -195,7 +195,7 @@ public: { if (uiDeathRespiteTimer <= uiDiff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) { if (pTarget && pTarget->isAlive()) DoCast(pTarget, SPELL_DEATH_RESPITE); @@ -223,7 +223,7 @@ public: } if (uiDesecration <= uiDiff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) { if (pTarget && pTarget->isAlive()) DoCast(pTarget, SPELL_DESECRATION); @@ -293,7 +293,7 @@ public: } }; - CreatureAI* GetAI(Creature *pCreature) const + CreatureAI* GetAI(Creature* pCreature) const { return new boss_black_knightAI (pCreature); } 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 e1e92b1cdd9..3b2ba1294f5 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp @@ -267,7 +267,7 @@ public: //dosen't work at all if (uiShieldBreakerTimer <= uiDiff) { - Vehicle *pVehicle = me->GetVehicleKit(); + Vehicle* pVehicle = me->GetVehicleKit(); if (!pVehicle) return; 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 b7e38f99022..76150269b4e 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* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 0, true); switch (pSummoned->GetEntry()) { case NPC_BURROW: @@ -264,7 +264,7 @@ public: me->SummonCreature(NPC_BURROW, AnubarakLoc[i+2]); //Spawn Frost Spheres for (int i=0; i < 6; i++) - if (Unit *pSummoned = me->SummonCreature(NPC_FROST_SPHERE, SphereSpawn[i])) + if (Unit* pSummoned = me->SummonCreature(NPC_FROST_SPHERE, SphereSpawn[i])) m_aSphereGUID[i] = pSummoned->GetGUID(); } @@ -332,7 +332,7 @@ public: uint32 at = urand(0, m_vBurrowGUID.size()-1); for (uint32 k = 0; k < at; k++) ++i; - if (Creature *pBurrow = Unit::GetCreature(*me, *i)) + if (Creature* pBurrow = Unit::GetCreature(*me, *i)) pBurrow->CastSpell(pBurrow, 66340, false); m_uiScarabSummoned++; m_uiSummonScarabTimer = 4*IN_MILLISECONDS; @@ -373,11 +373,11 @@ public: uint8 i = startAt; do { - if (Unit *pSphere = Unit::GetCreature(*me, m_aSphereGUID[i])) + if (Unit* pSphere = Unit::GetCreature(*me, m_aSphereGUID[i])) { if (!pSphere->HasAura(SPELL_FROST_SPHERE)) { - if (Creature *pSummon = me->SummonCreature(NPC_FROST_SPHERE, SphereSpawn[i])) + if (Creature* pSummon = me->SummonCreature(NPC_FROST_SPHERE, SphereSpawn[i])) m_aSphereGUID[i] = pSummon->GetGUID(); break; } @@ -434,7 +434,7 @@ public: m_uiDeterminationTimer = urand(5*IN_MILLISECONDS, 60*IN_MILLISECONDS); DoCast(me, SPELL_ACID_MANDIBLE); me->SetInCombatWithZone(); - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM)) me->AddThreat(pTarget, 20000.0f); if (!me->isInCombat()) me->DisappearAndDie(); @@ -513,7 +513,7 @@ public: switch (actionId) { case ACTION_SHADOW_STRIKE: - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_SHADOW_STRIKE); break; } @@ -660,7 +660,7 @@ public: m_uiTargetGUID = 0; } - void EnterCombat(Unit *pWho) + void EnterCombat(Unit* pWho) { m_uiTargetGUID = pWho->GetGUID(); DoCast(pWho, SPELL_MARK); 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 fb41d7bedbd..e7b633b6dba 100755 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp @@ -55,7 +55,7 @@ class boss_toc_champion_controller : public CreatureScript public: boss_toc_champion_controller() : CreatureScript("boss_toc_champion_controller") { } - CreatureAI* GetAI(Creature *pCreature) const + CreatureAI* GetAI(Creature* pCreature) const { return new boss_toc_champion_controllerAI (pCreature); } @@ -369,8 +369,8 @@ struct boss_faction_championsAI : public ScriptedAI Creature* SelectRandomFriendlyMissingBuff(uint32 spell) { - std::list<Creature *> lst = DoFindFriendlyMissingBuff(40.0f, spell); - std::list<Creature *>::const_iterator itr = lst.begin(); + std::list<Creature* > lst = DoFindFriendlyMissingBuff(40.0f, spell); + std::list<Creature* >::const_iterator itr = lst.begin(); if (lst.empty()) return NULL; advance(itr, rand()%lst.size()); @@ -468,7 +468,7 @@ class mob_toc_druid : public CreatureScript public: mob_toc_druid() : CreatureScript("mob_toc_druid") { } - CreatureAI* GetAI(Creature *pCreature) const + CreatureAI* GetAI(Creature* pCreature) const { return new mob_toc_druidAI (pCreature); } @@ -564,14 +564,14 @@ class mob_toc_shaman : public CreatureScript public: mob_toc_shaman() : CreatureScript("mob_toc_shaman") { } - CreatureAI* GetAI(Creature *pCreature) const + CreatureAI* GetAI(Creature* pCreature) const { return new mob_toc_shamanAI (pCreature); } struct mob_toc_shamanAI : public boss_faction_championsAI { - mob_toc_shamanAI(Creature *pCreature) : boss_faction_championsAI(pCreature, AI_HEALER) {} + mob_toc_shamanAI(Creature* pCreature) : boss_faction_championsAI(pCreature, AI_HEALER) {} uint32 m_uiHeroismOrBloodlustTimer; uint32 m_uiHexTimer; @@ -605,7 +605,7 @@ public: if (m_uiHexTimer <= uiDiff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_HEX); m_uiHexTimer = urand(10*IN_MILLISECONDS, 40*IN_MILLISECONDS); } else m_uiHexTimer -= uiDiff; @@ -627,7 +627,7 @@ public: DoCast(me, SPELL_SPIRIT_CLEANSE); break; case 5: - if (Unit *pTarget = SelectRandomFriendlyMissingBuff(SPELL_EARTH_SHIELD)) + if (Unit* pTarget = SelectRandomFriendlyMissingBuff(SPELL_EARTH_SHIELD)) DoCast(pTarget, SPELL_EARTH_SHIELD); break; } @@ -657,14 +657,14 @@ class mob_toc_paladin : public CreatureScript public: mob_toc_paladin() : CreatureScript("mob_toc_paladin") { } - CreatureAI* GetAI(Creature *pCreature) const + CreatureAI* GetAI(Creature* pCreature) const { return new mob_toc_paladinAI (pCreature); } struct mob_toc_paladinAI : public boss_faction_championsAI { - mob_toc_paladinAI(Creature *pCreature) : boss_faction_championsAI(pCreature, AI_HEALER) {} + mob_toc_paladinAI(Creature* pCreature) : boss_faction_championsAI(pCreature, AI_HEALER) {} uint32 m_uiBubbleTimer; uint32 m_uiHandOfProtectionTimer; @@ -699,7 +699,7 @@ public: if (m_uiHandOfProtectionTimer <= uiDiff) { - if (Unit *pTarget = DoSelectLowestHpFriendly(40.0f)) + if (Unit* pTarget = DoSelectLowestHpFriendly(40.0f)) if (pTarget->HealthBelowPct(15)) DoCast(pTarget, SPELL_HAND_OF_PROTECTION); m_uiHandOfProtectionTimer = urand(0*IN_MILLISECONDS, 360*IN_MILLISECONDS); @@ -707,21 +707,21 @@ public: if (m_uiHolyShockTimer <= uiDiff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, 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)) + if (Unit* pTarget = SelectRandomFriendlyMissingBuff(SPELL_HAND_OF_FREEDOM)) DoCast(pTarget, 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)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_HAMMER_OF_JUSTICE); m_uiHammerOfJusticeTimer = urand(5*IN_MILLISECONDS, 15*IN_MILLISECONDS); } else m_uiHammerOfJusticeTimer -= uiDiff; @@ -764,14 +764,14 @@ class mob_toc_priest : public CreatureScript public: mob_toc_priest() : CreatureScript("mob_toc_priest") { } - CreatureAI* GetAI(Creature *pCreature) const + CreatureAI* GetAI(Creature* pCreature) const { return new mob_toc_priestAI (pCreature); } struct mob_toc_priestAI : public boss_faction_championsAI { - mob_toc_priestAI(Creature *pCreature) : boss_faction_championsAI(pCreature, AI_HEALER) {} + mob_toc_priestAI(Creature* pCreature) : boss_faction_championsAI(pCreature, AI_HEALER) {} uint32 m_uiPsychicScreamTimer; uint32 m_uiCommonTimer; @@ -809,7 +809,7 @@ public: DoCast(me, SPELL_FLASH_HEAL); break; case 4: - if (Unit *pTarget = urand(0, 1) ? SelectTarget(SELECT_TARGET_RANDOM, 0) : DoSelectLowestHpFriendly(40.0f)) + if (Unit* pTarget = urand(0, 1) ? SelectTarget(SELECT_TARGET_RANDOM, 0) : DoSelectLowestHpFriendly(40.0f)) DoCast(pTarget, SPELL_DISPEL); break; case 5: @@ -845,14 +845,14 @@ class mob_toc_shadow_priest : public CreatureScript public: mob_toc_shadow_priest() : CreatureScript("mob_toc_shadow_priest") { } - CreatureAI* GetAI(Creature *pCreature) const + CreatureAI* GetAI(Creature* pCreature) const { return new mob_toc_shadow_priestAI (pCreature); } struct mob_toc_shadow_priestAI : public boss_faction_championsAI { - mob_toc_shadow_priestAI(Creature *pCreature) : boss_faction_championsAI(pCreature, AI_RANGED) {} + mob_toc_shadow_priestAI(Creature* pCreature) : boss_faction_championsAI(pCreature, AI_RANGED) {} uint32 m_uiPsychicScreamTimer; uint32 m_uiDispersionTimer; @@ -872,7 +872,7 @@ public: DoCast(me, SPELL_SHADOWFORM); } - void EnterCombat(Unit *pWho) + void EnterCombat(Unit* pWho) { boss_faction_championsAI::EnterCombat(pWho); } @@ -897,14 +897,14 @@ public: if (m_uiSilenceTimer <= uiDiff) { - if (Unit *pTarget = SelectEnemyCaster(false)) + if (Unit* pTarget = SelectEnemyCaster(false)) DoCast(pTarget, 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)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_MIND_BLAST); m_uiMindBlastTimer = urand(3*IN_MILLISECONDS, 8*IN_MILLISECONDS); } else m_uiMindBlastTimer -= uiDiff; @@ -914,19 +914,19 @@ public: switch (urand(0, 4)) { case 0: case 1: - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_MIND_FLAY); break; case 2: - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_VAMPIRIC_TOUCH); break; case 3: - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_SW_PAIN); break; case 4: - if (Unit *pTarget = urand(0, 1) ? SelectTarget(SELECT_TARGET_RANDOM, 0) : DoSelectLowestHpFriendly(40.0f)) + if (Unit* pTarget = urand(0, 1) ? SelectTarget(SELECT_TARGET_RANDOM, 0) : DoSelectLowestHpFriendly(40.0f)) DoCast(pTarget, SPELL_DISPEL); break; } @@ -958,14 +958,14 @@ class mob_toc_warlock : public CreatureScript public: mob_toc_warlock() : CreatureScript("mob_toc_warlock") { } - CreatureAI* GetAI(Creature *pCreature) const + CreatureAI* GetAI(Creature* pCreature) const { return new mob_toc_warlockAI (pCreature); } struct mob_toc_warlockAI : public boss_faction_championsAI { - mob_toc_warlockAI(Creature *pCreature) : boss_faction_championsAI(pCreature, AI_RANGED), Summons(me) {} + mob_toc_warlockAI(Creature* pCreature) : boss_faction_championsAI(pCreature, AI_RANGED), Summons(me) {} SummonList Summons; @@ -994,7 +994,7 @@ public: if (m_uiFearTimer <= uiDiff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_FEAR); m_uiFearTimer = urand(4*IN_MILLISECONDS, 15*IN_MILLISECONDS); } else m_uiFearTimer -= uiDiff; @@ -1008,7 +1008,7 @@ public: if (m_uiUnstableAfflictionTimer <= uiDiff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_UNSTABLE_AFFLICTION); m_uiUnstableAfflictionTimer = urand(2*IN_MILLISECONDS, 10*IN_MILLISECONDS); } else m_uiUnstableAfflictionTimer -= uiDiff; @@ -1035,7 +1035,7 @@ public: DoCastVictim(SPELL_CURSE_OF_AGONY); break; case 5: - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_CURSE_OF_EXHAUSTION); break; } @@ -1065,14 +1065,14 @@ class mob_toc_mage : public CreatureScript public: mob_toc_mage() : CreatureScript("mob_toc_mage") { } - CreatureAI* GetAI(Creature *pCreature) const + CreatureAI* GetAI(Creature* pCreature) const { return new mob_toc_mageAI (pCreature); } struct mob_toc_mageAI : public boss_faction_championsAI { - mob_toc_mageAI(Creature *pCreature) : boss_faction_championsAI(pCreature, AI_RANGED) {} + mob_toc_mageAI(Creature* pCreature) : boss_faction_championsAI(pCreature, AI_RANGED) {} uint32 m_uiCounterspellTimer; uint32 m_uiBlinkTimer; @@ -1097,7 +1097,7 @@ public: if (m_uiCounterspellTimer <= uiDiff) { - if (Unit *pTarget = SelectEnemyCaster(false)) + if (Unit* pTarget = SelectEnemyCaster(false)) DoCast(pTarget, SPELL_COUNTERSPELL); m_uiCounterspellTimer = urand(5*IN_MILLISECONDS, 15*IN_MILLISECONDS); } else m_uiCounterspellTimer -= uiDiff; @@ -1121,7 +1121,7 @@ public: if (m_uiPolymorphTimer <= uiDiff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_POLYMORPH); m_uiPolymorphTimer = urand(15*IN_MILLISECONDS, 40*IN_MILLISECONDS); } else m_uiPolymorphTimer -= uiDiff; @@ -1168,14 +1168,14 @@ class mob_toc_hunter : public CreatureScript public: mob_toc_hunter() : CreatureScript("mob_toc_hunter") { } - CreatureAI* GetAI(Creature *pCreature) const + CreatureAI* GetAI(Creature* pCreature) const { return new mob_toc_hunterAI (pCreature); } struct mob_toc_hunterAI : public boss_faction_championsAI { - mob_toc_hunterAI(Creature *pCreature) : boss_faction_championsAI(pCreature, AI_RANGED), Summons(me) {} + mob_toc_hunterAI(Creature* pCreature) : boss_faction_championsAI(pCreature, AI_RANGED), Summons(me) {} SummonList Summons; @@ -1284,14 +1284,14 @@ class mob_toc_boomkin : public CreatureScript public: mob_toc_boomkin() : CreatureScript("mob_toc_boomkin") { } - CreatureAI* GetAI(Creature *pCreature) const + CreatureAI* GetAI(Creature* pCreature) const { return new mob_toc_boomkinAI (pCreature); } struct mob_toc_boomkinAI : public boss_faction_championsAI { - mob_toc_boomkinAI(Creature *pCreature) : boss_faction_championsAI(pCreature, AI_RANGED) {} + mob_toc_boomkinAI(Creature* pCreature) : boss_faction_championsAI(pCreature, AI_RANGED) {} uint32 m_uiBarkskinTimer; uint32 m_uiCycloneTimer; @@ -1323,14 +1323,14 @@ public: if (m_uiCycloneTimer <= uiDiff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, 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)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_ENTANGLING_ROOTS); m_uiEntanglingRootsTimer = urand(5*IN_MILLISECONDS, 40*IN_MILLISECONDS); } else m_uiEntanglingRootsTimer -= uiDiff; @@ -1388,14 +1388,14 @@ class mob_toc_warrior : public CreatureScript public: mob_toc_warrior() : CreatureScript("mob_toc_warrior") { } - CreatureAI* GetAI(Creature *pCreature) const + CreatureAI* GetAI(Creature* pCreature) const { return new mob_toc_warriorAI (pCreature); } struct mob_toc_warriorAI : public boss_faction_championsAI { - mob_toc_warriorAI(Creature *pCreature) : boss_faction_championsAI(pCreature, AI_MELEE) {} + mob_toc_warriorAI(Creature* pCreature) : boss_faction_championsAI(pCreature, AI_MELEE) {} uint32 m_uiBladestormTimer; uint32 m_uiIntimidatingShoutTimer; @@ -1502,14 +1502,14 @@ class mob_toc_dk : public CreatureScript public: mob_toc_dk() : CreatureScript("mob_toc_dk") { } - CreatureAI* GetAI(Creature *pCreature) const + CreatureAI* GetAI(Creature* pCreature) const { return new mob_toc_dkAI (pCreature); } struct mob_toc_dkAI : public boss_faction_championsAI { - mob_toc_dkAI(Creature *pCreature) : boss_faction_championsAI(pCreature, AI_MELEE) {} + mob_toc_dkAI(Creature* pCreature) : boss_faction_championsAI(pCreature, AI_MELEE) {} uint32 m_uiIceboundFortitudeTimer; uint32 m_uiChainsOfIceTimer; @@ -1545,7 +1545,7 @@ public: if (m_uiChainsOfIceTimer <= uiDiff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_CHAINS_OF_ICE); m_uiChainsOfIceTimer = urand(5*IN_MILLISECONDS, 15*IN_MILLISECONDS); } else m_uiChainsOfIceTimer -= uiDiff; @@ -1558,7 +1558,7 @@ public: if (m_uiStrangulateTimer <= uiDiff) { - if (Unit *pTarget = SelectEnemyCaster(false)) + if (Unit* pTarget = SelectEnemyCaster(false)) DoCast(pTarget, SPELL_STRANGULATE); m_uiStrangulateTimer = urand(10*IN_MILLISECONDS, 90*IN_MILLISECONDS); } else m_uiStrangulateTimer -= uiDiff; @@ -1604,14 +1604,14 @@ class mob_toc_rogue : public CreatureScript public: mob_toc_rogue() : CreatureScript("mob_toc_rogue") { } - CreatureAI* GetAI(Creature *pCreature) const + CreatureAI* GetAI(Creature* pCreature) const { return new mob_toc_rogueAI (pCreature); } struct mob_toc_rogueAI : public boss_faction_championsAI { - mob_toc_rogueAI(Creature *pCreature) : boss_faction_championsAI(pCreature, AI_MELEE) {} + mob_toc_rogueAI(Creature* pCreature) : boss_faction_championsAI(pCreature, AI_MELEE) {} uint32 m_uiFanOfKnivesTimer; uint32 m_uiHemorrhageTimer; @@ -1666,7 +1666,7 @@ public: if (m_uiBlindTimer <= uiDiff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1)) if (me->IsInRange(pTarget, 0.0f, 15.0f, false)) DoCast(pTarget, SPELL_BLIND); m_uiBlindTimer = urand(7*IN_MILLISECONDS, 8*IN_MILLISECONDS); @@ -1703,14 +1703,14 @@ class mob_toc_enh_shaman : public CreatureScript public: mob_toc_enh_shaman() : CreatureScript("mob_toc_enh_shaman") { } - CreatureAI* GetAI(Creature *pCreature) const + CreatureAI* GetAI(Creature* pCreature) const { return new mob_toc_enh_shamanAI (pCreature); } struct mob_toc_enh_shamanAI : public boss_faction_championsAI { - mob_toc_enh_shamanAI(Creature *pCreature) : boss_faction_championsAI(pCreature, AI_MELEE), Summons(me) {} + mob_toc_enh_shamanAI(Creature* pCreature) : boss_faction_championsAI(pCreature, AI_MELEE), Summons(me) {} SummonList Summons; @@ -1765,7 +1765,7 @@ public: */ } - void JustDied(Unit *pKiller) + void JustDied(Unit* pKiller) { boss_faction_championsAI::JustDied(pKiller); Summons.DespawnAll(); @@ -1837,14 +1837,14 @@ class mob_toc_retro_paladin : public CreatureScript public: mob_toc_retro_paladin() : CreatureScript("mob_toc_retro_paladin") { } - CreatureAI* GetAI(Creature *pCreature) const + CreatureAI* GetAI(Creature* pCreature) const { return new mob_toc_retro_paladinAI (pCreature); } struct mob_toc_retro_paladinAI : public boss_faction_championsAI { - mob_toc_retro_paladinAI(Creature *pCreature) : boss_faction_championsAI(pCreature, AI_MELEE) {} + mob_toc_retro_paladinAI(Creature* pCreature) : boss_faction_championsAI(pCreature, AI_MELEE) {} uint32 m_uiRepeteanceTimer; uint32 m_uiCrusaderStrikeTimer; @@ -1865,7 +1865,7 @@ public: SetEquipmentSlots(false, 47519, EQUIP_NO_CHANGE, EQUIP_NO_CHANGE); } - void EnterCombat(Unit *pWho) + void EnterCombat(Unit* pWho) { boss_faction_championsAI::EnterCombat(pWho); DoCast(SPELL_SEAL_OF_COMMAND); @@ -1877,7 +1877,7 @@ public: if (m_uiRepeteanceTimer <= uiDiff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_REPENTANCE); m_uiRepeteanceTimer = 60*IN_MILLISECONDS; } else m_uiRepeteanceTimer -= uiDiff; @@ -1930,14 +1930,14 @@ class mob_toc_pet_warlock : public CreatureScript public: mob_toc_pet_warlock() : CreatureScript("mob_toc_pet_warlock") { } - CreatureAI* GetAI(Creature *pCreature) const + CreatureAI* GetAI(Creature* pCreature) const { return new mob_toc_pet_warlockAI (pCreature); } struct mob_toc_pet_warlockAI : public boss_faction_championsAI { - mob_toc_pet_warlockAI(Creature *pCreature) : boss_faction_championsAI(pCreature, AI_PET) {} + mob_toc_pet_warlockAI(Creature* pCreature) : boss_faction_championsAI(pCreature, AI_PET) {} uint32 m_uiDevourMagicTimer; uint32 m_uiSpellLockTimer; @@ -1981,14 +1981,14 @@ class mob_toc_pet_hunter : public CreatureScript public: mob_toc_pet_hunter() : CreatureScript("mob_toc_pet_hunter") { } - CreatureAI* GetAI(Creature *pCreature) const + CreatureAI* GetAI(Creature* pCreature) const { return new mob_toc_pet_hunterAI (pCreature); } struct mob_toc_pet_hunterAI : public boss_faction_championsAI { - mob_toc_pet_hunterAI(Creature *pCreature) : boss_faction_championsAI(pCreature, AI_PET) {} + mob_toc_pet_hunterAI(Creature* pCreature) : boss_faction_championsAI(pCreature, AI_PET) {} uint32 m_uiClawTimer; 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 5dda6555bf1..6cdca10dde0 100755 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp @@ -141,7 +141,7 @@ public: me->SetReactState(REACT_PASSIVE); } - void KilledUnit(Unit *pWho) + void KilledUnit(Unit* pWho) { if (pWho->GetTypeId() == TYPEID_PLAYER) { @@ -202,14 +202,14 @@ public: if (m_uiFelLightningTimer <= uiDiff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM)) DoCast(pTarget, 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* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1, 0, true)) { DoScriptText(EMOTE_INCINERATE, me, pTarget); DoScriptText(SAY_INCINERATE, me); @@ -226,7 +226,7 @@ public: if (m_uiLegionFlameTimer <= uiDiff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1, 0, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1, 0, true)) { DoScriptText(EMOTE_LEGION_FLAME, me, pTarget); DoCast(pTarget, SPELL_LEGION_FLAME); @@ -236,7 +236,7 @@ public: if (GetDifficulty() == RAID_DIFFICULTY_25MAN_HEROIC && m_uiTouchOfJaraxxusTimer <= uiDiff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, 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* pTarget, const SpellEntry *pSpell) { if (pSpell->Id == SPELL_FEL_STREAK) DoCastAOE(SPELL_FEL_INFERNO); //66517 @@ -398,7 +398,7 @@ public: if (m_uiFelStreakTimer <= uiDiff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_FEL_STREAK); m_uiFelStreakTimer = 30*IN_MILLISECONDS; } else m_uiFelStreakTimer -= uiDiff; @@ -534,14 +534,14 @@ public: if (m_uiSpinningStrikeTimer <= uiDiff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 0, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 0, true)) DoCast(pTarget, 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)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 0, true)) DoCast(pTarget, 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 ba8682d9452..0ff10a55ec9 100755 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp @@ -265,7 +265,7 @@ public: me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE); } - void EnterCombat(Unit *pWho) + void EnterCombat(Unit* pWho) { m_uiTargetGUID = pWho->GetGUID(); me->TauntApply(pWho); @@ -293,7 +293,7 @@ public: void JustDied(Unit* /*pKiller*/) { - if (Unit *pTarget = Unit::GetPlayer(*me, m_uiTargetGUID)) + if (Unit* pTarget = Unit::GetPlayer(*me, m_uiTargetGUID)) if (pTarget->isAlive()) pTarget->RemoveAurasDueToSpell(SPELL_SNOBOLLED); if (m_pInstance) @@ -329,7 +329,7 @@ public: if (m_uiFireBombTimer < uiDiff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_FIRE_BOMB); m_uiFireBombTimer = 20000; } @@ -337,7 +337,7 @@ public: if (m_uiBatterTimer < uiDiff) { - if (Unit *pTarget = Unit::GetPlayer(*me, m_uiTargetGUID)) + if (Unit* pTarget = Unit::GetPlayer(*me, m_uiTargetGUID)) DoCast(pTarget, SPELL_BATTER); m_uiBatterTimer = 10000; } @@ -345,7 +345,7 @@ public: if (m_uiHeadCrackTimer < uiDiff) { - if (Unit *pTarget = Unit::GetPlayer(*me, m_uiTargetGUID)) + if (Unit* pTarget = Unit::GetPlayer(*me, m_uiTargetGUID)) DoCast(pTarget, SPELL_HEAD_CRACK); m_uiHeadCrackTimer = 35000; } @@ -402,7 +402,7 @@ struct boss_jormungarAI : public ScriptedAI me->DespawnOrUnsummon(); } - void KilledUnit(Unit *pWho) + void KilledUnit(Unit* pWho) { if (pWho->GetTypeId() == TYPEID_PLAYER) { @@ -500,7 +500,7 @@ struct boss_jormungarAI : public ScriptedAI case 4: // Stationary if (sprayTimer <= uiDiff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, spraySpell); sprayTimer = urand(15*IN_MILLISECONDS, 30*IN_MILLISECONDS); } else sprayTimer -= uiDiff; @@ -644,7 +644,7 @@ public: struct mob_slime_poolAI : public ScriptedAI { - mob_slime_poolAI(Creature *pCreature) : ScriptedAI(pCreature) + mob_slime_poolAI(Creature* pCreature) : ScriptedAI(pCreature) { } @@ -756,7 +756,7 @@ public: me->DespawnOrUnsummon(); } - void KilledUnit(Unit *pWho) + void KilledUnit(Unit* pWho) { if (pWho->GetTypeId() == TYPEID_PLAYER) { @@ -800,7 +800,7 @@ public: if (m_uiArticBreathTimer <= uiDiff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_ARCTIC_BREATH); m_uiArticBreathTimer = urand(25*IN_MILLISECONDS, 40*IN_MILLISECONDS); } else m_uiArticBreathTimer -= uiDiff; @@ -825,7 +825,7 @@ public: m_uiStage = 2; break; case 2: - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 0, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 0, true)) { m_uiTrampleTargetGUID = pTarget->GetGUID(); me->SetUInt64Value(UNIT_FIELD_TARGET, m_uiTrampleTargetGUID); 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 daf306a6032..8092715d574 100755 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp @@ -390,7 +390,7 @@ struct boss_twin_baseAI : public ScriptedAI if (IsHeroic() && m_uiTouchTimer <= uiDiff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 200, true, m_uiOtherEssenceSpellId)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 200, true, m_uiOtherEssenceSpellId)) me->CastCustomSpell(m_uiTouchSpellId, SPELLVALUE_MAX_TARGETS, 1, pTarget, false); m_uiTouchTimer = urand(10, 15)*IN_MILLISECONDS; } @@ -578,7 +578,7 @@ class mob_essence_of_twin : public CreatureScript struct mob_unleashed_ballAI : public ScriptedAI { - mob_unleashed_ballAI(Creature *pCreature) : ScriptedAI(pCreature) + mob_unleashed_ballAI(Creature* pCreature) : ScriptedAI(pCreature) { m_pInstance = (InstanceScript*)pCreature->GetInstanceScript(); } @@ -630,20 +630,20 @@ class mob_unleashed_dark : public CreatureScript public: mob_unleashed_dark() : CreatureScript("mob_unleashed_dark") { } - CreatureAI* GetAI(Creature *pCreature) const + CreatureAI* GetAI(Creature* pCreature) const { return new mob_unleashed_darkAI(pCreature); } struct mob_unleashed_darkAI : public mob_unleashed_ballAI { - mob_unleashed_darkAI(Creature *pCreature) : mob_unleashed_ballAI(pCreature) {} + mob_unleashed_darkAI(Creature* pCreature) : mob_unleashed_ballAI(pCreature) {} void UpdateAI(const uint32 uiDiff) { if (m_uiRangeCheckTimer < uiDiff) { - if (Unit *pTarget = me->SelectNearestTarget(2.0f)) + if (Unit* pTarget = me->SelectNearestTarget(2.0f)) if (pTarget->GetTypeId() == TYPEID_PLAYER && pTarget->isAlive()) { DoCastAOE(SPELL_UNLEASHED_DARK); @@ -663,20 +663,20 @@ class mob_unleashed_light : public CreatureScript public: mob_unleashed_light() : CreatureScript("mob_unleashed_light") { } - CreatureAI* GetAI(Creature *pCreature) const + CreatureAI* GetAI(Creature* pCreature) const { return new mob_unleashed_lightAI(pCreature); } struct mob_unleashed_lightAI : public mob_unleashed_ballAI { - mob_unleashed_lightAI(Creature *pCreature) : mob_unleashed_ballAI(pCreature) {} + mob_unleashed_lightAI(Creature* pCreature) : mob_unleashed_ballAI(pCreature) {} void UpdateAI(const uint32 uiDiff) { if (m_uiRangeCheckTimer < uiDiff) { - if (Unit *pTarget = me->SelectNearestTarget(2.0f)) + if (Unit* pTarget = me->SelectNearestTarget(2.0f)) if (pTarget->GetTypeId() == TYPEID_PLAYER && pTarget->isAlive()) { DoCastAOE(SPELL_UNLEASHED_LIGHT); diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp index 9732c5f2a77..a53f9c340ed 100755 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp @@ -114,9 +114,9 @@ class npc_announcer_toc10 : public CreatureScript void Reset() { me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - if (Creature *pAlly = GetClosestCreatureWithEntry(me, NPC_THRALL, 300.0f)) + if (Creature* pAlly = GetClosestCreatureWithEntry(me, NPC_THRALL, 300.0f)) pAlly->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - if (Creature *pAlly = GetClosestCreatureWithEntry(me, NPC_PROUDMOORE, 300.0f)) + if (Creature* pAlly = GetClosestCreatureWithEntry(me, NPC_PROUDMOORE, 300.0f)) pAlly->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); } @@ -237,7 +237,7 @@ class boss_lich_king_toc : public CreatureScript struct boss_lich_king_tocAI : public ScriptedAI { - boss_lich_king_tocAI(Creature *pCreature) : ScriptedAI(pCreature) + boss_lich_king_tocAI(Creature* pCreature) : ScriptedAI(pCreature) { m_pInstance = (InstanceScript*)pCreature->GetInstanceScript(); } diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp index a92ed4abdb1..84028c90ba3 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp @@ -72,7 +72,7 @@ public: struct boss_novosAI : public Scripted_NoMovementAI { - boss_novosAI(Creature *c) : Scripted_NoMovementAI(c), lSummons(me) + boss_novosAI(Creature* c) : Scripted_NoMovementAI(c), lSummons(me) { pInstance = c->GetInstanceScript(); } @@ -131,7 +131,7 @@ public: { for (std::list<uint64>::const_iterator itr = luiCrystals.begin(); itr != luiCrystals.end(); ++itr) { - if (GameObject *pTemp = pInstance->instance->GetGameObject(*itr)) + if (GameObject* pTemp = pInstance->instance->GetGameObject(*itr)) pTemp->SetGoState(GO_STATE_ACTIVE); } pInstance->SetData(DATA_NOVOS_EVENT, IN_PROGRESS); @@ -148,7 +148,7 @@ public: case PHASE_1: if (uiTimer <= diff) { - Creature *pSummon = me->SummonCreature(RAND(CREATURE_FETID_TROLL_CORPSE, CREATURE_HULKING_CORPSE, CREATURE_RISEN_SHADOWCASTER), AddSpawnPoint, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20*IN_MILLISECONDS); + Creature* pSummon = me->SummonCreature(RAND(CREATURE_FETID_TROLL_CORPSE, CREATURE_HULKING_CORPSE, CREATURE_RISEN_SHADOWCASTER), AddSpawnPoint, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20*IN_MILLISECONDS); pSummon->GetMotionMaster()->MovePoint(0, AddDestinyPoint); //If spell is casted stops casting arcane field so no spell casting //DoCast(me, SPELL_SUMMON_MINIONS); @@ -159,7 +159,7 @@ public: if (uiCrystalHandlerTimer <= diff) { DoScriptText(SAY_NECRO_ADD, me); - Creature *pCrystalHandler = me->SummonCreature(CREATURE_CRYSTAL_HANDLER, CrystalHandlerSpawnPoint, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20*IN_MILLISECONDS); + Creature* pCrystalHandler = me->SummonCreature(CREATURE_CRYSTAL_HANDLER, CrystalHandlerSpawnPoint, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20*IN_MILLISECONDS); pCrystalHandler->GetMotionMaster()->MovePoint(0, AddDestinyPoint); uiCrystalHandlerTimer = urand(20*IN_MILLISECONDS, 30*IN_MILLISECONDS); } else uiCrystalHandlerTimer -= diff; @@ -168,7 +168,7 @@ public: case PHASE_2: if (uiTimer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + 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), RAND(H_SPELL_ARCANE_BLAST, H_SPELL_BLIZZARD, H_SPELL_FROSTBOLT, H_SPELL_WRATH_OF_MISERY))); uiTimer = urand(1*IN_MILLISECONDS, 3*IN_MILLISECONDS); @@ -193,7 +193,7 @@ public: DoScriptText(SAY_KILL, me); } - void JustSummoned(Creature *summon) + void JustSummoned(Creature* summon) { if (summon->GetEntry() == CREATURE_CRYSTAL_HANDLER) crystalHandlerAmount++; @@ -220,7 +220,7 @@ public: if (!luiCrystals.empty()) { if (pInstance) - if (GameObject *pTemp = pInstance->instance->GetGameObject(luiCrystals.back())) + if (GameObject* pTemp = pInstance->instance->GetGameObject(luiCrystals.back())) pTemp->SetGoState(GO_STATE_READY); luiCrystals.pop_back(); } @@ -241,7 +241,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new boss_novosAI(creature); } @@ -260,7 +260,7 @@ public: struct mob_crystal_handlerAI : public ScriptedAI { - mob_crystal_handlerAI(Creature *c) : ScriptedAI(c) + mob_crystal_handlerAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -298,13 +298,13 @@ 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()) + 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); } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new mob_crystal_handlerAI(creature); } @@ -317,7 +317,7 @@ public: struct mob_novos_minionAI : public ScriptedAI { - mob_novos_minionAI(Creature *c) : ScriptedAI(c) + mob_novos_minionAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -331,13 +331,13 @@ 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()) + if (Unit* pTarget = CAST_AI(boss_novos::boss_novosAI, Novos->AI())->GetRandomTarget()) AttackStart(pTarget); } } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new mob_novos_minionAI(creature); } diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp index f6f8624664b..5270a473771 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp @@ -71,7 +71,7 @@ public: struct boss_tharon_jaAI : public ScriptedAI { - boss_tharon_jaAI(Creature *c) : ScriptedAI(c) + boss_tharon_jaAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -151,11 +151,11 @@ public: DoScriptText(RAND(SAY_FLESH_1, SAY_FLESH_2), me); me->SetDisplayId(MODEL_FLESH); - std::list<Unit *> playerList; + std::list<Unit* > playerList; SelectTargetList(playerList, 5, SELECT_TARGET_TOPAGGRO, 0, true); for (std::list<Unit*>::const_iterator itr = playerList.begin(); itr != playerList.end(); ++itr) { - Unit *pTemp = (*itr); + Unit* pTemp = (*itr); me->AddAura(SPELL_GIFT_OF_THARON_JA, pTemp); pTemp->SetDisplayId(MODEL_SKELETON); } @@ -206,11 +206,11 @@ public: uiRainOfFireTimer = urand(14*IN_MILLISECONDS, 18*IN_MILLISECONDS); uiShadowVolleyTimer = urand(8*IN_MILLISECONDS, 10*IN_MILLISECONDS); - std::list<Unit *> playerList; + std::list<Unit* > playerList; SelectTargetList(playerList, 5, SELECT_TARGET_TOPAGGRO, 0, true); for (std::list<Unit*>::const_iterator itr = playerList.begin(); itr != playerList.end(); ++itr) { - Unit *pTemp = (*itr); + Unit* pTemp = (*itr); if (pTemp->HasAura(SPELL_GIFT_OF_THARON_JA)) pTemp->RemoveAura(SPELL_GIFT_OF_THARON_JA); pTemp->DeMorph(); @@ -235,7 +235,7 @@ public: Map::PlayerList const &PlayerList = pInstance->instance->GetPlayers(); for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) - if (Player *pPlayer = i->getSource()) + if (Player* pPlayer = i->getSource()) pPlayer->DeMorph(); pInstance->DoUpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_BE_SPELL_TARGET2, SPELL_ACHIEVEMENT_CHECK); @@ -244,7 +244,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new boss_tharon_jaAI(creature); } diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp index 745c092b673..d7bcb04a7f6 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp @@ -61,7 +61,7 @@ public: struct boss_trollgoreAI : public ScriptedAI { - boss_trollgoreAI(Creature *c) : ScriptedAI(c), lSummons(me) + boss_trollgoreAI(Creature* c) : ScriptedAI(c), lSummons(me) { pInstance = c->GetInstanceScript(); } @@ -189,7 +189,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new boss_trollgoreAI(creature); } diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp index c7f54e27191..734ee535031 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp @@ -123,7 +123,7 @@ class boss_devourer_of_souls : public CreatureScript struct boss_devourer_of_soulsAI : public BossAI { - boss_devourer_of_soulsAI(Creature *creature) : BossAI(creature, DATA_DEVOURER_EVENT) + boss_devourer_of_soulsAI(Creature* creature) : BossAI(creature, DATA_DEVOURER_EVENT) { } @@ -223,7 +223,7 @@ class boss_devourer_of_souls : public CreatureScript for (int8 i = 0; outroPositions[i].entry[entryIndex] != 0; ++i) { - if (Creature *summon = me->SummonCreature(outroPositions[i].entry[entryIndex], spawnPoint, TEMPSUMMON_DEAD_DESPAWN)) + if (Creature* summon = me->SummonCreature(outroPositions[i].entry[entryIndex], spawnPoint, TEMPSUMMON_DEAD_DESPAWN)) { summon->GetMotionMaster()->MovePoint(0, outroPositions[i].movePosition); if (summon->GetEntry() == NPC_JAINA_PART2) diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp index 2bfdcbc60e2..3622de4cb66 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp @@ -57,7 +57,7 @@ public: struct boss_falricAI : public boss_horAI { - boss_falricAI(Creature *pCreature) : boss_horAI(pCreature) {} + boss_falricAI(Creature* pCreature) : boss_horAI(pCreature) {} uint8 uiHopelessnessCount; diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp index 2f0e9f4703e..a4c4dc36e96 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp @@ -57,7 +57,7 @@ public: struct boss_marwynAI : public boss_horAI { - boss_marwynAI(Creature *pCreature) : boss_horAI(pCreature) {} + boss_marwynAI(Creature* pCreature) : boss_horAI(pCreature) {} void Reset() { 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 ee914e9acb2..adeb289ad3b 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp @@ -205,7 +205,7 @@ public: // AI of Part1: handle the intro till start of gauntlet event. struct npc_jaina_or_sylvanas_horAI : public ScriptedAI { - npc_jaina_or_sylvanas_horAI(Creature *pCreature) : ScriptedAI(pCreature) + npc_jaina_or_sylvanas_horAI(Creature* pCreature) : ScriptedAI(pCreature) { pInstance = me->GetInstanceScript(); } @@ -633,7 +633,7 @@ public: struct npc_ghostly_priestAI: public ScriptedAI { - npc_ghostly_priestAI(Creature *c) : ScriptedAI(c) + npc_ghostly_priestAI(Creature* c) : ScriptedAI(c) { } @@ -667,23 +667,23 @@ public: switch(eventId) { case EVENT_SHADOW_WORD_PAIN: - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM)) DoCast(pTarget, SPELL_SHADOW_WORD_PAIN); events.ScheduleEvent(EVENT_SHADOW_WORD_PAIN, 8000); return; case EVENT_CIRCLE_OF_DESTRUCTION: - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM)) DoCast(pTarget, SPELL_CIRCLE_OF_DESTRUCTION); events.ScheduleEvent(EVENT_CIRCLE_OF_DESTRUCTION, 12000); return; case EVENT_COWER_IN_FEAR: - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM)) DoCast(pTarget, 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* pTarget = DoSelectLowestHpFriendly(40, DUNGEON_MODE(30000, 50000))) { DoCast(pTarget, SPELL_DARK_MENDING); events.ScheduleEvent(EVENT_DARK_MENDING, 20000); @@ -715,7 +715,7 @@ public: struct npc_phantom_mageAI: public ScriptedAI { - npc_phantom_mageAI(Creature *c) : ScriptedAI(c) + npc_phantom_mageAI(Creature* c) : ScriptedAI(c) { } @@ -750,7 +750,7 @@ public: switch(eventId) { case EVENT_FIREBALL: - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM)) DoCast(pTarget, SPELL_FIREBALL); events.ScheduleEvent(EVENT_FIREBALL, 15000); return; @@ -759,12 +759,12 @@ public: events.ScheduleEvent(EVENT_FLAMESTRIKE, 15000); return; case EVENT_FROSTBOLT: - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM)) DoCast(pTarget, SPELL_FROSTBOLT); events.ScheduleEvent(EVENT_FROSTBOLT, 15000); return; case EVENT_CHAINS_OF_ICE: - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM)) DoCast(pTarget, SPELL_CHAINS_OF_ICE); events.ScheduleEvent(EVENT_CHAINS_OF_ICE, 15000); return; @@ -792,7 +792,7 @@ public: struct npc_phantom_hallucinationAI : public npc_phantom_mage::npc_phantom_mageAI { - npc_phantom_hallucinationAI(Creature *c) : npc_phantom_mage::npc_phantom_mageAI(c) + npc_phantom_hallucinationAI(Creature* c) : npc_phantom_mage::npc_phantom_mageAI(c) { } @@ -816,7 +816,7 @@ public: struct npc_shadowy_mercenaryAI: public ScriptedAI { - npc_shadowy_mercenaryAI(Creature *c) : ScriptedAI(c) + npc_shadowy_mercenaryAI(Creature* c) : ScriptedAI(c) { } @@ -858,7 +858,7 @@ public: events.ScheduleEvent(EVENT_DEADLY_POISON, 10000); return; case EVENT_ENVENOMED_DAGGER_THROW: - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM)) DoCast(pTarget, SPELL_ENVENOMED_DAGGER_THROW); events.ScheduleEvent(EVENT_ENVENOMED_DAGGER_THROW, 10000); return; @@ -887,7 +887,7 @@ public: struct npc_spectral_footmanAI: public ScriptedAI { - npc_spectral_footmanAI(Creature *c) : ScriptedAI(c) + npc_spectral_footmanAI(Creature* c) : ScriptedAI(c) { } @@ -952,7 +952,7 @@ public: struct npc_tortured_riflemanAI : public ScriptedAI { - npc_tortured_riflemanAI(Creature *c) : ScriptedAI(c) + npc_tortured_riflemanAI(Creature* c) : ScriptedAI(c) { } @@ -986,12 +986,12 @@ public: switch(eventId) { case EVENT_SHOOT: - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM)) DoCast(pTarget, SPELL_SHOOT); events.ScheduleEvent(EVENT_SHOOT, 2000); return; case EVENT_CURSED_ARROW: - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM)) DoCast(pTarget, SPELL_CURSED_ARROW); events.ScheduleEvent(EVENT_CURSED_ARROW, 10000); return; @@ -1000,7 +1000,7 @@ public: events.ScheduleEvent(EVENT_FROST_TRAP, 30000); return; case EVENT_ICE_SHOT: - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM)) DoCast(pTarget, SPELL_ICE_SHOT); events.ScheduleEvent(EVENT_ICE_SHOT, 15000); return; diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h index fa31154e86c..c433ec28cfe 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h @@ -79,7 +79,7 @@ enum Actions // handled the summonList and the notification events to/from the InstanceScript struct boss_horAI : ScriptedAI { - boss_horAI(Creature *pCreature) : ScriptedAI(pCreature), summons(pCreature) + boss_horAI(Creature* pCreature) : ScriptedAI(pCreature), summons(pCreature) { pInstance = me->GetInstanceScript(); } @@ -114,7 +114,7 @@ struct boss_horAI : ScriptedAI me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE|UNIT_FLAG_NOT_SELECTABLE); me->SetReactState(REACT_AGGRESSIVE); - if (Unit *pUnit = me->SelectNearestTarget()) + if (Unit* pUnit = me->SelectNearestTarget()) AttackStart(pUnit); DoZoneInCombat(); @@ -122,11 +122,11 @@ struct boss_horAI : ScriptedAI } } - void JustSummoned(Creature *pSummoned) + void JustSummoned(Creature* pSummoned) { summons.Summon(pSummoned); - if (Unit *pUnit = pSummoned->SelectNearestTarget()) + if (Unit* pUnit = pSummoned->SelectNearestTarget()) { if (pSummoned->AI()) pSummoned->AI()->AttackStart(pUnit); @@ -141,7 +141,7 @@ struct boss_horAI : ScriptedAI pSummoned->AI()->DoZoneInCombat(); } - void SummonedCreatureDespawn(Creature *pSummoned) + void SummonedCreatureDespawn(Creature* pSummoned) { summons.Despawn(pSummoned); if (summons.empty()) diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp index bc51481acc5..1a3a2802327 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp @@ -83,7 +83,7 @@ class boss_garfrost : public CreatureScript struct boss_garfrostAI : public BossAI { - boss_garfrostAI(Creature *creature) : BossAI(creature, DATA_GARFROST) + boss_garfrostAI(Creature* creature) : BossAI(creature, DATA_GARFROST) { } diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp index 1c454738484..4b84b3ae9b3 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp @@ -136,7 +136,7 @@ class boss_ick : public CreatureScript struct boss_ickAI : public BossAI { - boss_ickAI(Creature *creature) : BossAI(creature, DATA_ICK), _vehicle(creature->GetVehicleKit()) + boss_ickAI(Creature* creature) : BossAI(creature, DATA_ICK), _vehicle(creature->GetVehicleKit()) { ASSERT(_vehicle); } diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp index 3e0a35cd1ca..663c2b0fcc6 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp @@ -114,7 +114,7 @@ class mob_iceborn_protodrake : public CreatureScript struct mob_iceborn_protodrakeAI: public ScriptedAI { - mob_iceborn_protodrakeAI(Creature *creature) : ScriptedAI(creature), _vehicle(creature->GetVehicleKit()) + mob_iceborn_protodrakeAI(Creature* creature) : ScriptedAI(creature), _vehicle(creature->GetVehicleKit()) { ASSERT(_vehicle); } diff --git a/src/server/scripts/Northrend/Gundrak/boss_eck.cpp b/src/server/scripts/Northrend/Gundrak/boss_eck.cpp index b7ecb36e8a6..b4f5b9f8865 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_eck.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_eck.cpp @@ -41,7 +41,7 @@ public: struct boss_eckAI : public ScriptedAI { - boss_eckAI(Creature *c) : ScriptedAI(c) + boss_eckAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -145,7 +145,7 @@ public: struct npc_ruins_dwellerAI : public ScriptedAI { - npc_ruins_dwellerAI(Creature *c) : ScriptedAI(c) + npc_ruins_dwellerAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } diff --git a/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp b/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp index 96f7fb200a5..b20be83b52e 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp @@ -75,7 +75,7 @@ public: struct boss_gal_darahAI : public ScriptedAI { - boss_gal_darahAI(Creature *c) : ScriptedAI(c) + boss_gal_darahAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } diff --git a/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp b/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp index 660cf571c68..eba80c176d3 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp @@ -50,7 +50,7 @@ class boss_moorabi : public CreatureScript public: boss_moorabi() : CreatureScript("boss_moorabi") { } - CreatureAI* GetAI(Creature *pCreature) const + CreatureAI* GetAI(Creature* pCreature) const { return new boss_moorabiAI(pCreature); } diff --git a/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp b/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp index 5fc1f5d5f07..25e13b79dd9 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp @@ -77,7 +77,7 @@ public: struct boss_slad_ranAI : public ScriptedAI { - boss_slad_ranAI(Creature *c) : ScriptedAI(c), lSummons(me) + boss_slad_ranAI(Creature* c) : ScriptedAI(c), lSummons(me) { pInstance = c->GetInstanceScript(); } @@ -202,7 +202,7 @@ public: struct mob_slad_ran_constrictorAI : public ScriptedAI { - mob_slad_ran_constrictorAI(Creature *c) : ScriptedAI(c) {} + mob_slad_ran_constrictorAI(Creature* c) : ScriptedAI(c) {} uint32 uiGripOfSladRanTimer; @@ -239,7 +239,7 @@ public: struct mob_slad_ran_viperAI : public ScriptedAI { - mob_slad_ran_viperAI(Creature *c) : ScriptedAI(c) {} + mob_slad_ran_viperAI(Creature* c) : ScriptedAI(c) {} uint32 uiVenomousBiteTimer; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp b/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp index e7999b1ec3d..488bd83fb26 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp @@ -63,7 +63,7 @@ public: struct boss_anubrekhanAI : public BossAI { - boss_anubrekhanAI(Creature *c) : BossAI(c, BOSS_ANUBREKHAN) {} + boss_anubrekhanAI(Creature* c) : BossAI(c, BOSS_ANUBREKHAN) {} bool hasTaunted; @@ -99,7 +99,7 @@ public: DoScriptText(SAY_SLAY, me); } - void JustDied(Unit *) + void JustDied(Unit* ) { _JustDied(); @@ -119,7 +119,7 @@ public: events.ScheduleEvent(EVENT_SPAWN_GUARDIAN_NORMAL, urand(15000, 20000)); } - void MoveInLineOfSight(Unit *who) + void MoveInLineOfSight(Unit* who) { if (!hasTaunted && me->IsWithinDistInMap(who, 60.0f) && who->GetTypeId() == TYPEID_PLAYER) { @@ -129,7 +129,7 @@ public: ScriptedAI::MoveInLineOfSight(who); } - void SummonedCreatureDespawn(Creature *summon) + void SummonedCreatureDespawn(Creature* summon) { BossAI::SummonedCreatureDespawn(summon); @@ -155,7 +155,7 @@ 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)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, RAID_MODE(SPELL_IMPALE_10, SPELL_IMPALE_25)); events.ScheduleEvent(EVENT_IMPALE, urand(10000, 20000)); break; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp index 2be01e72177..99b4aba247f 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp @@ -89,7 +89,7 @@ public: struct boss_four_horsemenAI : public BossAI { - boss_four_horsemenAI(Creature *c) : BossAI(c, BOSS_HORSEMEN) + boss_four_horsemenAI(Creature* c) : BossAI(c, BOSS_HORSEMEN) { id = Horsemen(0); for (uint8 i = 0; i < 4; ++i) @@ -131,15 +131,15 @@ public: _Reset(); } - bool DoEncounterAction(Unit *who, bool attack, bool reset, bool checkAllDead) + bool DoEncounterAction(Unit* who, bool attack, bool reset, bool checkAllDead) { if (!instance) return false; - Creature *Thane = CAST_CRE(Unit::GetUnit(*me, instance->GetData64(DATA_THANE))); - Creature *Lady = CAST_CRE(Unit::GetUnit(*me, instance->GetData64(DATA_LADY))); - Creature *Baron = CAST_CRE(Unit::GetUnit(*me, instance->GetData64(DATA_BARON))); - Creature *Sir = CAST_CRE(Unit::GetUnit(*me, instance->GetData64(DATA_SIR))); + Creature* Thane = CAST_CRE(Unit::GetUnit(*me, instance->GetData64(DATA_THANE))); + Creature* Lady = CAST_CRE(Unit::GetUnit(*me, instance->GetData64(DATA_LADY))); + Creature* Baron = CAST_CRE(Unit::GetUnit(*me, instance->GetData64(DATA_BARON))); + Creature* Sir = CAST_CRE(Unit::GetUnit(*me, instance->GetData64(DATA_SIR))); if (Thane && Lady && Baron && Sir) { @@ -224,7 +224,7 @@ public: movementCompleted = true; me->SetReactState(REACT_AGGRESSIVE); - Unit *eventStarter = Unit::GetUnit(*me, uiEventStarterGUID); + Unit* eventStarter = Unit::GetUnit(*me, uiEventStarterGUID); if (eventStarter && me->canAttack(eventStarter)) AttackStart(eventStarter); @@ -248,7 +248,7 @@ public: } // switch to "who" if nearer than current target. - void SelectNearestTarget(Unit *who) + void SelectNearestTarget(Unit* who) { if (me->getVictim() && me->GetDistanceOrder(who, me->getVictim()) && me->canAttack(who)) { @@ -257,14 +257,14 @@ public: } } - void MoveInLineOfSight(Unit *who) + void MoveInLineOfSight(Unit* who) { BossAI::MoveInLineOfSight(who); if (caster) SelectNearestTarget(who); } - void AttackStart(Unit *who) + void AttackStart(Unit* who) { if (!movementCompleted && !movementStarted) { @@ -361,7 +361,7 @@ public: if (caster) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 45.0f)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 45.0f)) DoCast(pTarget, SPELL_PRIMARY(id)); } else diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp index 6c7eab3cbbe..cf08338024b 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp @@ -57,13 +57,13 @@ public: struct boss_gluthAI : public BossAI { - boss_gluthAI(Creature *c) : BossAI(c, BOSS_GLUTH) + boss_gluthAI(Creature* c) : BossAI(c, BOSS_GLUTH) { // Do not let Gluth be affected by zombies' debuff me->ApplySpellImmune(0, IMMUNITY_ID, SPELL_INFECTED_WOUND, true); } - void MoveInLineOfSight(Unit *who) + void MoveInLineOfSight(Unit* who) { if (who->GetEntry() == MOB_ZOMBIE && me->IsWithinDistInMap(who, 7)) { @@ -85,7 +85,7 @@ public: events.ScheduleEvent(EVENT_SUMMON, 15000); } - void JustSummoned(Creature *summon) + void JustSummoned(Creature* summon) { if (summon->GetEntry() == MOB_ZOMBIE) summon->AI()->AttackStart(me); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp index 209a0391736..34bedfc2574 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp @@ -225,7 +225,7 @@ class boss_gothik : public CreatureScript summons.Summon(summon); } - void SummonedCreatureDespawn(Creature *summon) + void SummonedCreatureDespawn(Creature* summon) { summons.Despawn(summon); } @@ -357,7 +357,7 @@ class boss_gothik : public CreatureScript if (spellId && me->isInCombat()) { me->HandleEmoteCommand(EMOTE_ONESHOT_SPELLCAST); - if (Creature *pRandomDeadTrigger = Unit::GetCreature(*me, DeadTriggerGUID[rand() % POS_DEAD])) + if (Creature* pRandomDeadTrigger = Unit::GetCreature(*me, DeadTriggerGUID[rand() % POS_DEAD])) me->CastSpell(pRandomDeadTrigger, spellId, true); } } @@ -469,7 +469,7 @@ class boss_gothik : public CreatureScript DoTeleportTo(PosGroundLiveSide); me->getThreatManager().resetAggro(NotOnSameSide(me)); - if (Unit *pTarget = SelectTarget(SELECT_TARGET_NEAREST, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_NEAREST, 0)) { me->getThreatManager().addThreat(pTarget, 100.0f); AttackStart(pTarget); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp b/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp index a5ccbd2f6a5..8b1f52dfb31 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp @@ -45,7 +45,7 @@ public: struct boss_grobbulusAI : public BossAI { - boss_grobbulusAI(Creature *c) : BossAI(c, BOSS_GROBBULUS) + boss_grobbulusAI(Creature* c) : BossAI(c, BOSS_GROBBULUS) { me->ApplySpellImmune(0, IMMUNITY_ID, SPELL_POISON_CLOUD_ADD, true); } @@ -59,7 +59,7 @@ public: events.ScheduleEvent(EVENT_BERSERK, 12*60000); } - void SpellHitTarget(Unit *pTarget, const SpellEntry *spell) + void SpellHitTarget(Unit* pTarget, const SpellEntry *spell) { if (spell->Id == uint32(SPELL_SLIME_SPRAY)) { @@ -91,7 +91,7 @@ public: events.ScheduleEvent(EVENT_SPRAY, 15000+rand()%15000); return; case EVENT_INJECT: - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1)) if (!pTarget->HasAura(SPELL_MUTATING_INJECTION)) DoCast(pTarget, SPELL_MUTATING_INJECTION); events.ScheduleEvent(EVENT_INJECT, 8000 + uint32(120 * me->GetHealthPct())); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp b/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp index 4fd35ab2cfc..6498e1d5556 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp @@ -57,7 +57,7 @@ public: struct boss_heiganAI : public BossAI { - boss_heiganAI(Creature *c) : BossAI(c, BOSS_HEIGAN) {} + boss_heiganAI(Creature* c) : BossAI(c, BOSS_HEIGAN) {} uint32 eruptSection; bool eruptDirection; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp index f2e0bf6e503..31ef9460297 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp @@ -302,7 +302,7 @@ public: FindGameObjects(); - if (GameObject *pKTTrigger = me->GetMap()->GetGameObject(KTTriggerGUID)) + if (GameObject* pKTTrigger = me->GetMap()->GetGameObject(KTTriggerGUID)) { pKTTrigger->ResetDoorOrButton(); pKTTrigger->SetPhaseMask(1, true); @@ -310,7 +310,7 @@ public: for (uint8 i = 0; i <= 3; ++i) { - if (GameObject *pPortal = me->GetMap()->GetGameObject(PortalsGUID[i])) + if (GameObject* pPortal = me->GetMap()->GetGameObject(PortalsGUID[i])) { if (!((pPortal->getLootState() == GO_READY) || (pPortal->getLootState() == GO_NOT_READY))) pPortal->ResetDoorOrButton(); @@ -352,7 +352,7 @@ public: FindGameObjects(); for (uint8 i = 0; i <= 3; ++i) { - if (GameObject *pPortal = me->GetMap()->GetGameObject(PortalsGUID[i])) + if (GameObject* pPortal = me->GetMap()->GetGameObject(PortalsGUID[i])) pPortal->ResetDoorOrButton(); } DoCast(me, SPELL_KELTHUZAD_CHANNEL, false); @@ -415,7 +415,7 @@ public: events.PopEvent(); break; case EVENT_TRIGGER: - if (GameObject *pKTTrigger = me->GetMap()->GetGameObject(KTTriggerGUID)) + if (GameObject* pKTTrigger = me->GetMap()->GetGameObject(KTTriggerGUID)) pKTTrigger->SetPhaseMask(2, true); events.PopEvent(); break; @@ -457,7 +457,7 @@ public: for (uint8 i = 0; i <= 3; ++i) { - if (GameObject *pPortal = me->GetMap()->GetGameObject(PortalsGUID[i])) + if (GameObject* pPortal = me->GetMap()->GetGameObject(PortalsGUID[i])) { if (pPortal->getLootState() == GO_READY) pPortal->UseDoorOrButton(); @@ -498,7 +498,7 @@ public: uint32 count = urand(1, 3); for (uint8 i = 1; i <= count; i++) { - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1, 200, true); + Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1, 200, true); if (pTarget && !pTarget->isCharmed() && (chained.find(pTarget->GetGUID()) == chained.end())) { DoCast(pTarget, SPELL_CHAINS_OF_KELTHUZAD); @@ -530,7 +530,7 @@ public: continue; } - if (Unit *pTarget = SelectTarget(SELECT_TARGET_TOPAGGRO, 0, NotCharmedTargetSelector())) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_TOPAGGRO, 0, NotCharmedTargetSelector())) { switch(player->getClass()) { @@ -616,12 +616,12 @@ public: break; } case EVENT_FISSURE: - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, 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)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, RAID_MODE(1, 0), 0, true)) DoCast(pTarget, SPELL_FROST_BLAST); if (rand()%2) DoScriptText(SAY_FROST_BLAST, me); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp b/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp index de5f3cdd1be..8ee21526b7d 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp @@ -48,7 +48,7 @@ public: struct boss_loathebAI : public BossAI { - boss_loathebAI(Creature *c) : BossAI(c, BOSS_LOATHEB) {} + boss_loathebAI(Creature* c) : BossAI(c, BOSS_LOATHEB) {} void EnterCombat(Unit* /*who*/) { diff --git a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp index 4f9d853e9f4..c6a8e45c472 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp @@ -68,7 +68,7 @@ public: struct boss_maexxnaAI : public BossAI { - boss_maexxnaAI(Creature *c) : BossAI(c, BOSS_MAEXXNA) {} + boss_maexxnaAI(Creature* c) : BossAI(c, BOSS_MAEXXNA) {} bool enraged; @@ -104,12 +104,12 @@ 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* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1, 0, true, -SPELL_WEB_WRAP)) { pTarget->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); - if (Creature *wrap = DoSummon(MOB_WEB_WRAP, PosWrap[pos], 0, TEMPSUMMON_CORPSE_DESPAWN)) + if (Creature* wrap = DoSummon(MOB_WEB_WRAP, PosWrap[pos], 0, TEMPSUMMON_CORPSE_DESPAWN)) wrap->AI()->SetGUID(pTarget->GetGUID()); } } @@ -159,7 +159,7 @@ public: struct mob_webwrapAI : public NullCreatureAI { - mob_webwrapAI(Creature *c) : NullCreatureAI(c), victimGUID(0) {} + mob_webwrapAI(Creature* c) : NullCreatureAI(c), victimGUID(0) {} uint64 victimGUID; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp index 21d8a1af44c..740c477c69a 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp @@ -75,7 +75,7 @@ public: struct boss_nothAI : public BossAI { - boss_nothAI(Creature *c) : BossAI(c, BOSS_NOTH) {} + boss_nothAI(Creature* c) : BossAI(c, BOSS_NOTH) {} uint32 waveCount, balconyCount; @@ -117,7 +117,7 @@ public: DoScriptText(SAY_SLAY, me); } - void JustSummoned(Creature *summon) + void JustSummoned(Creature* summon) { summons.Summon(summon); summon->setActive(true); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp b/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp index 3906528a1a0..fadc4171ed9 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp @@ -62,7 +62,7 @@ public: struct boss_patchwerkAI : public BossAI { - boss_patchwerkAI(Creature *c) : BossAI(c, BOSS_PATCHWERK) {} + boss_patchwerkAI(Creature* c) : BossAI(c, BOSS_PATCHWERK) {} bool Enraged; @@ -118,7 +118,7 @@ public: std::list<HostileReference*>::const_iterator i = me->getThreatManager().getThreatList().begin(); for (; i != me->getThreatManager().getThreatList().end(); ++i) { - Unit *pTarget = (*i)->getTarget(); + Unit* pTarget = (*i)->getTarget(); if (pTarget->isAlive() && pTarget != me->getVictim() && pTarget->GetHealth() > MostHP && me->IsWithinMeleeRange(pTarget)) { MostHP = pTarget->GetHealth(); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp b/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp index 5b0420cd3bc..c934334604d 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp @@ -64,7 +64,7 @@ public: struct boss_razuviousAI : public BossAI { - boss_razuviousAI(Creature *c) : BossAI(c, BOSS_RAZUVIOUS) {} + boss_razuviousAI(Creature* c) : BossAI(c, BOSS_RAZUVIOUS) {} void KilledUnit(Unit* /*victim*/) { @@ -118,7 +118,7 @@ public: events.ScheduleEvent(EVENT_SHOUT, 25000); return; case EVENT_KNIFE: - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 45.0f)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 45.0f)) DoCast(pTarget, SPELL_JAGGED_KNIFE); events.ScheduleEvent(EVENT_KNIFE, 10000); return; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp index 916e096be92..825bd74c1e0 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* pTarget, const SpellEntry *spell) { if (spell->Id == SPELL_ICEBOLT) { IceBlockMap::iterator itr = iceblocks.find(pTarget->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, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, 0, 0, 0, 0, 25000)) itr->second = iceblock->GetGUID(); } } @@ -265,7 +265,7 @@ public: case EVENT_BLIZZARD: { //DoCastAOE(SPELL_SUMMON_BLIZZARD); - if (Creature *pSummon = DoSummon(MOB_BLIZZARD, me, 0.0f, urand(25000, 30000), TEMPSUMMON_TIMED_DESPAWN)) + if (Creature* pSummon = DoSummon(MOB_BLIZZARD, me, 0.0f, urand(25000, 30000), TEMPSUMMON_TIMED_DESPAWN)) pSummon->GetMotionMaster()->MoveRandom(40); events.ScheduleEvent(EVENT_BLIZZARD, RAID_MODE(20000, 7000), 0, PHASE_GROUND); break; @@ -360,7 +360,7 @@ public: std::list<HostileReference*>::const_iterator i = me->getThreatManager().getThreatList().begin(); for (; i != me->getThreatManager().getThreatList().end(); ++i) { - Unit *pTarget = (*i)->getTarget(); + Unit* pTarget = (*i)->getTarget(); if (pTarget->GetTypeId() != TYPEID_PLAYER) continue; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp index 6d6c824e04b..23de7c4afa4 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp @@ -106,7 +106,7 @@ public: struct boss_thaddiusAI : public BossAI { - boss_thaddiusAI(Creature *c) : BossAI(c, BOSS_THADDIUS) + boss_thaddiusAI(Creature* c) : BossAI(c, BOSS_THADDIUS) { // init is a bit tricky because thaddius shall track the life of both adds, but not if there was a wipe // and, in particular, if there was a crash after both adds were killed (should not respawn) @@ -114,11 +114,11 @@ public: // Moreover, the adds may not yet be spawn. So just track down the status if mob is spawn // and each mob will send its status at reset (meaning that it is alive) checkFeugenAlive = false; - if (Creature *pFeugen = me->GetCreature(*me, instance->GetData64(DATA_FEUGEN))) + if (Creature* pFeugen = me->GetCreature(*me, instance->GetData64(DATA_FEUGEN))) checkFeugenAlive = pFeugen->isAlive(); checkStalaggAlive = false; - if (Creature *pStalagg = me->GetCreature(*me, instance->GetData64(DATA_STALAGG))) + if (Creature* pStalagg = me->GetCreature(*me, instance->GetData64(DATA_STALAGG))) checkStalaggAlive = pStalagg->isAlive(); if (!checkFeugenAlive && !checkStalaggAlive) @@ -207,13 +207,13 @@ public: if (!checkStalaggAlive) { if (instance) - if (Creature *pStalagg = me->GetCreature(*me, instance->GetData64(DATA_STALAGG))) + if (Creature* pStalagg = me->GetCreature(*me, instance->GetData64(DATA_STALAGG))) pStalagg->Respawn(); } else { if (instance) - if (Creature *pFeugen = me->GetCreature(*me, instance->GetData64(DATA_FEUGEN))) + if (Creature* pFeugen = me->GetCreature(*me, instance->GetData64(DATA_FEUGEN))) pFeugen->Respawn(); } } @@ -266,7 +266,7 @@ public: struct mob_stalaggAI : public ScriptedAI { - mob_stalaggAI(Creature *c) : ScriptedAI(c) + mob_stalaggAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -279,7 +279,7 @@ public: void Reset() { if (pInstance) - if (Creature *pThaddius = me->GetCreature(*me, pInstance->GetData64(DATA_THADDIUS))) + if (Creature* pThaddius = me->GetCreature(*me, pInstance->GetData64(DATA_THADDIUS))) if (pThaddius->AI()) pThaddius->AI()->DoAction(ACTION_STALAGG_RESET); powerSurgeTimer = urand(20000, 25000); @@ -294,7 +294,7 @@ public: void JustDied(Unit* /*killer*/) { if (pInstance) - if (Creature *pThaddius = me->GetCreature(*me, pInstance->GetData64(DATA_THADDIUS))) + if (Creature* pThaddius = me->GetCreature(*me, pInstance->GetData64(DATA_THADDIUS))) if (pThaddius->AI()) pThaddius->AI()->DoAction(ACTION_STALAGG_DIED); } @@ -306,7 +306,7 @@ public: if (magneticPullTimer <= uiDiff) { - if (Creature *pFeugen = me->GetCreature(*me, pInstance->GetData64(DATA_FEUGEN))) + if (Creature* pFeugen = me->GetCreature(*me, pInstance->GetData64(DATA_FEUGEN))) { Unit* pStalaggVictim = me->getVictim(); Unit* pFeugenVictim = pFeugen->getVictim(); @@ -352,7 +352,7 @@ public: struct mob_feugenAI : public ScriptedAI { - mob_feugenAI(Creature *c) : ScriptedAI(c) + mob_feugenAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -364,7 +364,7 @@ public: void Reset() { if (pInstance) - if (Creature *pThaddius = me->GetCreature(*me, pInstance->GetData64(DATA_THADDIUS))) + if (Creature* pThaddius = me->GetCreature(*me, pInstance->GetData64(DATA_THADDIUS))) if (pThaddius->AI()) pThaddius->AI()->DoAction(ACTION_FEUGEN_RESET); staticFieldTimer = 5000; @@ -378,7 +378,7 @@ public: void JustDied(Unit* /*killer*/) { if (pInstance) - if (Creature *pThaddius = me->GetCreature(*me, pInstance->GetData64(DATA_THADDIUS))) + if (Creature* pThaddius = me->GetCreature(*me, pInstance->GetData64(DATA_THADDIUS))) if (pThaddius->AI()) pThaddius->AI()->DoAction(ACTION_FEUGEN_DIED); } diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp index 98f821eb153..abe4d4ce7be 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp @@ -235,7 +235,7 @@ 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)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) Wraith->AI()->AttackStart(pTarget); Creature* Anomalus = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_ANOMALUS)); if (Anomalus && Anomalus->HasAura(SPELL_RIFT_SHIELD)) diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp index c0949cb03fe..adb8e1d1376 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp @@ -61,7 +61,7 @@ public: struct boss_keristraszaAI : public ScriptedAI { - boss_keristraszaAI(Creature *c) : ScriptedAI(c) + boss_keristraszaAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -125,7 +125,7 @@ public: auiContainmentSphereGUIDs[1] = pInstance->GetData64(ORMOROKS_CONTAINMET_SPHERE); auiContainmentSphereGUIDs[2] = pInstance->GetData64(TELESTRAS_CONTAINMET_SPHERE); - GameObject *ContainmentSpheres[DATA_CONTAINMENT_SPHERES]; + GameObject* ContainmentSpheres[DATA_CONTAINMENT_SPHERES]; for (uint8 i = 0; i < DATA_CONTAINMENT_SPHERES; ++i) { @@ -192,7 +192,7 @@ public: DoScriptText(SAY_CRYSTAL_NOVA, me); if (IsHeroic()) DoCast(me, SPELL_CRYSTALIZE); - else if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + else if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_CRYSTAL_CHAINS); uiCrystalChainsCrystalizeTimer = DUNGEON_MODE(30*IN_MILLISECONDS, 11*IN_MILLISECONDS); } else uiCrystalChainsCrystalizeTimer -= diff; @@ -208,11 +208,11 @@ class containment_sphere : public GameObjectScript public: containment_sphere() : GameObjectScript("containment_sphere") { } - bool OnGossipHello(Player* /*pPlayer*/, GameObject *pGO) + bool OnGossipHello(Player* /*pPlayer*/, GameObject* pGO) { InstanceScript *pInstance = pGO->GetInstanceScript(); - Creature *pKeristrasza = Unit::GetCreature(*pGO, pInstance ? pInstance->GetData64(DATA_KERISTRASZA) : 0); + Creature* pKeristrasza = Unit::GetCreature(*pGO, pInstance ? pInstance->GetData64(DATA_KERISTRASZA) : 0); if (pKeristrasza && pKeristrasza->isAlive()) { // maybe these are hacks :( 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 3440ba0a028..db83efd695e 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp @@ -184,14 +184,14 @@ public: break; } } - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) Summoned->AI()->AttackStart(pTarget); return Summoned->GetGUID(); } return 0; } - void SummonedCreatureDespawn(Creature *summon) + void SummonedCreatureDespawn(Creature* summon) { if (summon->isAlive()) return; @@ -303,7 +303,7 @@ public: if (uiIceNovaTimer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) { DoCast(pTarget, SPELL_ICE_NOVA, false); uiCooldown = 1500; @@ -313,7 +313,7 @@ public: if (uiGravityWellTimer <= diff) { - if (Unit *pTarget = me->getVictim()) + if (Unit* pTarget = me->getVictim()) { DoCast(pTarget, SPELL_GRAVITY_WELL); uiCooldown = 6*IN_MILLISECONDS; @@ -323,7 +323,7 @@ public: if (uiFireBombTimer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) { DoCast(pTarget, SPELL_FIREBOMB, false); uiCooldown = 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 aff5f15c923..ef9ccb39a36 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp @@ -61,7 +61,7 @@ public: struct boss_ormorokAI : public ScriptedAI { - boss_ormorokAI(Creature *c) : ScriptedAI(c) + boss_ormorokAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -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* pTarget = NULL; uint8 Healer = 0; for (uint8 j = 1; j <= 4; j++) { @@ -234,7 +234,7 @@ public: struct mob_crystal_spikeAI : public Scripted_NoMovementAI { - mob_crystal_spikeAI(Creature *c) : Scripted_NoMovementAI(c) + mob_crystal_spikeAI(Creature* c) : Scripted_NoMovementAI(c) { } @@ -277,7 +277,7 @@ public: struct mob_crystalline_tanglerAI : public ScriptedAI { - mob_crystalline_tanglerAI(Creature *c) : ScriptedAI(c) {} + mob_crystalline_tanglerAI(Creature* c) : ScriptedAI(c) {} uint32 uiRootsTimer; diff --git a/src/server/scripts/Northrend/Nexus/Nexus/commander_kolurg.cpp b/src/server/scripts/Northrend/Nexus/Nexus/commander_kolurg.cpp index 12bf5dec0fc..0a82eb4d778 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/commander_kolurg.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/commander_kolurg.cpp @@ -49,7 +49,7 @@ public: struct boss_commander_kolurgAI : public ScriptedAI { - boss_commander_kolurgAI(Creature *c) : ScriptedAI(c) {} + boss_commander_kolurgAI(Creature* c) : ScriptedAI(c) {} void Reset() {} void EnterCombat(Unit* /*who*/) {} diff --git a/src/server/scripts/Northrend/Nexus/Nexus/commander_stoutbeard.cpp b/src/server/scripts/Northrend/Nexus/Nexus/commander_stoutbeard.cpp index 4d68eb61cc6..365db104337 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/commander_stoutbeard.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/commander_stoutbeard.cpp @@ -49,7 +49,7 @@ public: struct boss_commander_stoutbeardAI : public ScriptedAI { - boss_commander_stoutbeardAI(Creature *c) : ScriptedAI(c) {} + boss_commander_stoutbeardAI(Creature* c) : ScriptedAI(c) {} void Reset() {} void EnterCombat(Unit* /*who*/) diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp index 54cdc46245b..36aef9c7100 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp @@ -93,7 +93,7 @@ public: struct boss_bjarngrimAI : public ScriptedAI { - boss_bjarngrimAI(Creature *pCreature) : ScriptedAI(pCreature) + boss_bjarngrimAI(Creature* pCreature) : ScriptedAI(pCreature) { m_pInstance = pCreature->GetInstanceScript(); m_uiStance = STANCE_DEFENSIVE; @@ -369,7 +369,7 @@ public: struct mob_stormforged_lieutenantAI : public ScriptedAI { - mob_stormforged_lieutenantAI(Creature *pCreature) : ScriptedAI(pCreature) + mob_stormforged_lieutenantAI(Creature* pCreature) : ScriptedAI(pCreature) { m_pInstance = pCreature->GetInstanceScript(); } diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp index fb2432e6f26..d10d9946e24 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp @@ -78,7 +78,7 @@ public: struct boss_ionarAI : public ScriptedAI { - boss_ionarAI(Creature *pCreature) : ScriptedAI(pCreature), lSparkList(pCreature) + boss_ionarAI(Creature* pCreature) : ScriptedAI(pCreature), lSparkList(pCreature) { pInstance = pCreature->GetInstanceScript(); } @@ -209,7 +209,7 @@ public: } } - void SummonedCreatureDespawn(Creature *pSummoned) + void SummonedCreatureDespawn(Creature* pSummoned) { if (pSummoned->GetEntry() == NPC_SPARK_OF_IONAR) lSparkList.Despawn(pSummoned); @@ -308,7 +308,7 @@ public: struct mob_spark_of_ionarAI : public ScriptedAI { - mob_spark_of_ionarAI(Creature *pCreature) : ScriptedAI(pCreature) + mob_spark_of_ionarAI(Creature* pCreature) : ScriptedAI(pCreature) { pInstance = pCreature->GetInstanceScript(); } diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp index 700df86881f..0021658eb41 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp @@ -81,7 +81,7 @@ public: struct boss_volkhanAI : public ScriptedAI { - boss_volkhanAI(Creature *pCreature) : ScriptedAI(pCreature) + boss_volkhanAI(Creature* pCreature) : ScriptedAI(pCreature) { m_pInstance = pCreature->GetInstanceScript(); } @@ -378,7 +378,7 @@ public: struct mob_molten_golemAI : public ScriptedAI { - mob_molten_golemAI(Creature *pCreature) : ScriptedAI(pCreature) { } + mob_molten_golemAI(Creature* pCreature) : ScriptedAI(pCreature) { } bool m_bIsFrozen; diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp index eaf9f71f6fe..0ab8eff0d58 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp @@ -61,7 +61,7 @@ public: struct boss_krystallusAI : public ScriptedAI { - boss_krystallusAI(Creature *c) : ScriptedAI(c) + boss_krystallusAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } 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 235a36e661a..0fb965bde55 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 @@ -65,7 +65,7 @@ public: struct boss_maiden_of_griefAI : public ScriptedAI { - boss_maiden_of_griefAI(Creature *c) : ScriptedAI(c) + boss_maiden_of_griefAI(Creature* c) : ScriptedAI(c) { pInstance = me->GetInstanceScript(); } @@ -97,7 +97,7 @@ public: if (pInstance) { - if (GameObject *pDoor = pInstance->instance->GetGameObject(pInstance->GetData64(DATA_MAIDEN_DOOR))) + if (GameObject* pDoor = pInstance->instance->GetGameObject(pInstance->GetData64(DATA_MAIDEN_DOOR))) if (pDoor->GetGoState() == GO_STATE_READY) { EnterEvadeMode(); @@ -119,7 +119,7 @@ public: { if (PartingSorrowTimer <= diff) { - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); + Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget) DoCast(pTarget, SPELL_PARTING_SORROW); @@ -144,7 +144,7 @@ public: if (PillarOfWoeTimer <= diff) { - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1); + Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1); if (pTarget) DoCast(pTarget, 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 808f0d6a8e0..18d336582b6 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp @@ -90,7 +90,7 @@ public: struct boss_sjonnirAI : public ScriptedAI { - boss_sjonnirAI(Creature *c) : ScriptedAI(c), lSummons(me) + boss_sjonnirAI(Creature* c) : ScriptedAI(c), lSummons(me) { pInstance = c->GetInstanceScript(); } @@ -137,7 +137,7 @@ public: if (pInstance) { - if (GameObject *pDoor = pInstance->instance->GetGameObject(pInstance->GetData64(DATA_SJONNIR_DOOR))) + if (GameObject* pDoor = pInstance->instance->GetGameObject(pInstance->GetData64(DATA_SJONNIR_DOOR))) if (pDoor->GetGoState() == GO_STATE_READY) { EnterEvadeMode(); @@ -258,7 +258,7 @@ public: struct mob_malformed_oozeAI : public ScriptedAI { - mob_malformed_oozeAI(Creature *c) : ScriptedAI(c) {} + mob_malformed_oozeAI(Creature* c) : ScriptedAI(c) {} uint32 uiMergeTimer; @@ -301,7 +301,7 @@ public: struct mob_iron_sludgeAI : public ScriptedAI { - mob_iron_sludgeAI(Creature *c) : ScriptedAI(c) + mob_iron_sludgeAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } 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 2af26df3829..7c73f1900ff 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp @@ -142,7 +142,7 @@ public: struct mob_tribuna_controllerAI : public ScriptedAI { - mob_tribuna_controllerAI(Creature *c) : ScriptedAI(c) + mob_tribuna_controllerAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); SetCombatMovement(false); @@ -217,7 +217,7 @@ public: if (!KaddrakGUIDList.empty()) for (std::list<uint64>::const_iterator itr = KaddrakGUIDList.begin(); itr != KaddrakGUIDList.end(); ++itr) { - if (Creature *pKaddrak = Unit::GetCreature(*me, *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); @@ -298,7 +298,7 @@ public: struct npc_brann_hosAI : public npc_escortAI { - npc_brann_hosAI(Creature *c) : npc_escortAI(c) + npc_brann_hosAI(Creature* c) : npc_escortAI(c) { pInstance = c->GetInstanceScript(); } diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_algalon.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_algalon.cpp index 3003ebc2b7f..878f1213571 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_algalon.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_algalon.cpp @@ -81,7 +81,7 @@ public: struct boss_algalonAI : public ScriptedAI { - boss_algalonAI(Creature *c) : ScriptedAI(c) + boss_algalonAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); Summon = false; // not in reset. intro speech done only once. @@ -340,7 +340,7 @@ public: struct mob_collapsing_starAI : public ScriptedAI { - mob_collapsing_starAI(Creature *pCreature) : ScriptedAI(pCreature) + mob_collapsing_starAI(Creature* pCreature) : ScriptedAI(pCreature) { pInstance = pCreature->GetInstanceScript(); } diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_kologarn.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_kologarn.cpp index 30a1299ae57..d19a44bc2a1 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_kologarn.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_kologarn.cpp @@ -204,7 +204,7 @@ class boss_kologarn : public CreatureScript } } - void JustSummoned(Creature *summon) + void JustSummoned(Creature* summon) { switch (summon->GetEntry()) { @@ -364,7 +364,7 @@ class spell_ulduar_rubble_summon : public SpellScriptLoader }; // predicate function to select non main tank target -class StoneGripTargetSelector : public std::unary_function<Unit *, bool> +class StoneGripTargetSelector : public std::unary_function<Unit* , bool> { public: StoneGripTargetSelector(Creature* me, Unit const* victim) : _me(me), _victim(victim) {} diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp index 73ba394e1e2..26f3abbd00b 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp @@ -188,7 +188,7 @@ class boss_xt002 : public CreatureScript struct boss_xt002_AI : public BossAI { - boss_xt002_AI(Creature *pCreature) : BossAI(pCreature, BOSS_XT002) + boss_xt002_AI(Creature* pCreature) : BossAI(pCreature, BOSS_XT002) { } 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 5938b09e9da..45445d57bf9 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 @@ -83,7 +83,7 @@ public: struct boss_ingvar_the_plundererAI : public ScriptedAI { - boss_ingvar_the_plundererAI(Creature *c) : ScriptedAI(c) + boss_ingvar_the_plundererAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -242,7 +242,7 @@ public: if (!me->HasUnitState(UNIT_STAT_CASTING)) { // Spawn target for Axe - Unit *pTarget = SelectTarget(SELECT_TARGET_TOPAGGRO, 1); + Unit* pTarget = SelectTarget(SELECT_TARGET_TOPAGGRO, 1); if (pTarget) { me->SummonCreature(ENTRY_THROW_TARGET, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 2000); @@ -296,7 +296,7 @@ public: struct mob_annhylde_the_callerAI : public ScriptedAI { - mob_annhylde_the_callerAI(Creature *c) : ScriptedAI(c) + mob_annhylde_the_callerAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -409,7 +409,7 @@ public: struct mob_ingvar_throw_dummyAI : public ScriptedAI { - mob_ingvar_throw_dummyAI(Creature *c) : ScriptedAI(c) + mob_ingvar_throw_dummyAI(Creature* c) : ScriptedAI(c) { } @@ -417,7 +417,7 @@ public: void Reset() { - Unit *pTarget = me->FindNearestCreature(ENTRY_THROW_TARGET, 50); + Unit* pTarget = me->FindNearestCreature(ENTRY_THROW_TARGET, 50); if (pTarget) { DoCast(me, SPELL_SHADOW_AXE_DAMAGE); diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp index 0e7e5b1700b..e2705969544 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp @@ -72,7 +72,7 @@ public: struct mob_frost_tombAI : public ScriptedAI { - mob_frost_tombAI(Creature *c) : ScriptedAI(c) + mob_frost_tombAI(Creature* c) : ScriptedAI(c) { FrostTombGUID = 0; } @@ -124,7 +124,7 @@ public: struct boss_kelesethAI : public ScriptedAI { - boss_kelesethAI(Creature *c) : ScriptedAI(c) + boss_kelesethAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -205,7 +205,7 @@ public: if (ShadowboltTimer <= diff) { - Unit *pTarget = SelectTarget(SELECT_TARGET_TOPAGGRO, 0); + 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); ShadowboltTimer = 10000; @@ -234,11 +234,11 @@ public: if (FrostTombTimer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) if (pTarget->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)) + if (Creature* pChains = me->SummonCreature(CREATURE_FROSTTOMB, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->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); @@ -267,7 +267,7 @@ public: struct mob_vrykul_skeletonAI : public ScriptedAI { - mob_vrykul_skeletonAI(Creature *c) : ScriptedAI(c) + mob_vrykul_skeletonAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -287,7 +287,7 @@ public: } void EnterCombat(Unit* /*who*/){} - void DamageTaken(Unit *done_by, uint32 &damage) + void DamageTaken(Unit* done_by, uint32 &damage) { if (done_by->GetGUID() == me->GetGUID()) return; diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp index b3e5e16e2c7..b5cb5076e5b 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp @@ -69,7 +69,7 @@ public: struct boss_skarvald_the_constructorAI : public ScriptedAI { - boss_skarvald_the_constructorAI(Creature *c) : ScriptedAI(c) + boss_skarvald_the_constructorAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -221,7 +221,7 @@ public: struct boss_dalronn_the_controllerAI : public ScriptedAI { - boss_dalronn_the_controllerAI(Creature *c) : ScriptedAI(c) + boss_dalronn_the_controllerAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp index a8ccd970e45..a324fd3eedf 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp @@ -37,7 +37,7 @@ public: struct npc_dragonflayer_forge_masterAI : public ScriptedAI { - npc_dragonflayer_forge_masterAI(Creature *c) : ScriptedAI(c) + npc_dragonflayer_forge_masterAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); fm_Type = 0; diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp index a4385d861c2..edc0de10eeb 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp @@ -94,7 +94,7 @@ public: struct boss_palehoofAI : public ScriptedAI { - boss_palehoofAI(Creature *c) : ScriptedAI(c) + boss_palehoofAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -256,7 +256,7 @@ public: move = (Phase)(move % 4); } //send orb to summon spot - Creature *pOrb = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_MOB_ORB) : 0); + Creature* pOrb = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_MOB_ORB) : 0); if (pOrb && pOrb->isAlive()) { if (currentPhase == PHASE_NONE) @@ -297,7 +297,7 @@ public: struct mob_ravenous_furbolgAI : public ScriptedAI { - mob_ravenous_furbolgAI(Creature *c) : ScriptedAI(c) + mob_ravenous_furbolgAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -319,7 +319,7 @@ public: if (pInstance) if (pInstance->GetData(DATA_GORTOK_PALEHOOF_EVENT) == IN_PROGRESS) { - Creature *pPalehoof = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_GORTOK_PALEHOOF) : 0); + Creature* pPalehoof = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_GORTOK_PALEHOOF) : 0); if (pPalehoof && pPalehoof->isAlive()) CAST_AI(boss_palehoof::boss_palehoofAI, pPalehoof->AI())->Reset(); } @@ -373,7 +373,7 @@ public: { if (pInstance) { - Creature *pPalehoof = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_GORTOK_PALEHOOF) : 0); + Creature* pPalehoof = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_GORTOK_PALEHOOF) : 0); if (pPalehoof) CAST_AI(boss_palehoof::boss_palehoofAI, pPalehoof->AI())->NextPhase(); } @@ -410,7 +410,7 @@ public: struct mob_frenzied_worgenAI : public ScriptedAI { - mob_frenzied_worgenAI(Creature *c) : ScriptedAI(c) + mob_frenzied_worgenAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -432,7 +432,7 @@ public: if (pInstance) if (pInstance->GetData(DATA_GORTOK_PALEHOOF_EVENT) == IN_PROGRESS) { - Creature *pPalehoof = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_GORTOK_PALEHOOF) : 0); + Creature* pPalehoof = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_GORTOK_PALEHOOF) : 0); if (pPalehoof && pPalehoof->isAlive()) CAST_AI(boss_palehoof::boss_palehoofAI, pPalehoof->AI())->Reset(); } @@ -488,7 +488,7 @@ public: { if (pInstance) { - Creature *pPalehoof = Unit::GetCreature((*me), pInstance->GetData64(DATA_GORTOK_PALEHOOF)); + Creature* pPalehoof = Unit::GetCreature((*me), pInstance->GetData64(DATA_GORTOK_PALEHOOF)); if (pPalehoof) CAST_AI(boss_palehoof::boss_palehoofAI, pPalehoof->AI())->NextPhase(); } @@ -526,7 +526,7 @@ public: struct mob_ferocious_rhinoAI : public ScriptedAI { - mob_ferocious_rhinoAI(Creature *c) : ScriptedAI(c) + mob_ferocious_rhinoAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -548,7 +548,7 @@ public: if (pInstance) if (pInstance->GetData(DATA_GORTOK_PALEHOOF_EVENT) == IN_PROGRESS) { - Creature *pPalehoof = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_GORTOK_PALEHOOF) : 0); + Creature* pPalehoof = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_GORTOK_PALEHOOF) : 0); if (pPalehoof && pPalehoof->isAlive()) CAST_AI(boss_palehoof::boss_palehoofAI, pPalehoof->AI())->Reset(); } @@ -603,7 +603,7 @@ public: { if (pInstance) { - Creature *pPalehoof = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_GORTOK_PALEHOOF) : 0); + Creature* pPalehoof = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_GORTOK_PALEHOOF) : 0); if (pPalehoof) CAST_AI(boss_palehoof::boss_palehoofAI, pPalehoof->AI())->NextPhase(); } @@ -646,7 +646,7 @@ public: struct mob_massive_jormungarAI : public ScriptedAI { - mob_massive_jormungarAI(Creature *c) : ScriptedAI(c) + mob_massive_jormungarAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -668,7 +668,7 @@ public: if (pInstance) if (pInstance->GetData(DATA_GORTOK_PALEHOOF_EVENT) == IN_PROGRESS) { - Creature *pPalehoof = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_GORTOK_PALEHOOF) : 0); + Creature* pPalehoof = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_GORTOK_PALEHOOF) : 0); if (pPalehoof && pPalehoof->isAlive()) CAST_AI(boss_palehoof::boss_palehoofAI, pPalehoof->AI())->Reset(); } @@ -724,7 +724,7 @@ public: { if (pInstance) { - Creature *pPalehoof = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_GORTOK_PALEHOOF) : 0); + Creature* pPalehoof = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_GORTOK_PALEHOOF) : 0); if (pPalehoof) CAST_AI(boss_palehoof::boss_palehoofAI, pPalehoof->AI())->NextPhase(); } @@ -752,7 +752,7 @@ public: struct mob_palehoof_orbAI : public ScriptedAI { - mob_palehoof_orbAI(Creature *c) : ScriptedAI(c) + mob_palehoof_orbAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -779,7 +779,7 @@ public: { if (currentPhase<5&¤tPhase >= 0) { - Creature *pNext = NULL; + Creature* pNext = NULL; switch(currentPhase) { case PHASE_FRENZIED_WORGEN: pNext = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_MOB_FRENZIED_WORGEN) : 0); break; @@ -810,7 +810,7 @@ public: return; if (id > 4) return; - Creature *pNext = NULL; + Creature* pNext = NULL; switch(id) { case PHASE_FRENZIED_WORGEN: pNext = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_MOB_FRENZIED_WORGEN) : 0); break; @@ -834,11 +834,11 @@ class go_palehoof_sphere : public GameObjectScript public: go_palehoof_sphere() : GameObjectScript("go_palehoof_sphere") { } - bool OnGossipHello(Player* /*pPlayer*/, GameObject *pGO) + bool OnGossipHello(Player* /*pPlayer*/, GameObject* pGO) { InstanceScript *pInstance = pGO->GetInstanceScript(); - Creature *pPalehoof = Unit::GetCreature(*pGO, pInstance ? pInstance->GetData64(DATA_GORTOK_PALEHOOF) : 0); + Creature* pPalehoof = Unit::GetCreature(*pGO, pInstance ? pInstance->GetData64(DATA_GORTOK_PALEHOOF) : 0); if (pPalehoof && pPalehoof->isAlive()) { pGO->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp index 7da067b87cb..589ceb64fcb 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp @@ -168,7 +168,7 @@ public: struct boss_skadiAI : public ScriptedAI { - boss_skadiAI(Creature *c) : ScriptedAI(c), Summons(me) + boss_skadiAI(Creature* c) : ScriptedAI(c), Summons(me) { m_pInstance = c->GetInstanceScript(); } @@ -461,7 +461,7 @@ class go_harpoon_launcher : public GameObjectScript public: go_harpoon_launcher() : GameObjectScript("go_harpoon_launcher") { } - bool OnGossipHello(Player *pPlayer, GameObject *pGO) + bool OnGossipHello(Player* pPlayer, GameObject* pGO) { InstanceScript* m_pInstance = pGO->GetInstanceScript(); if (!m_pInstance) return false; diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp index 00cc67cd06f..c7deb9f1a6f 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp @@ -96,7 +96,7 @@ public: struct boss_svalaAI : public ScriptedAI { - boss_svalaAI(Creature *c) : ScriptedAI(c) + boss_svalaAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -133,7 +133,7 @@ public: Phase = INTRO; me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - if (Creature *pArthas = me->SummonCreature(CREATURE_ARTHAS, ArthasPos, TEMPSUMMON_MANUAL_DESPAWN)) + if (Creature* pArthas = me->SummonCreature(CREATURE_ARTHAS, ArthasPos, TEMPSUMMON_MANUAL_DESPAWN)) { pArthas->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE); pArthas->SetFloatValue(OBJECT_FIELD_SCALE_X, 5); @@ -151,7 +151,7 @@ public: if (uiIntroTimer <= diff) { - Creature *pArthas = Unit::GetCreature(*me, uiArthasGUID); + Creature* pArthas = Unit::GetCreature(*me, uiArthasGUID); if (!pArthas) return; @@ -219,7 +219,7 @@ public: struct mob_ritual_channelerAI : public Scripted_NoMovementAI { - mob_ritual_channelerAI(Creature *c) :Scripted_NoMovementAI(c) + mob_ritual_channelerAI(Creature* c) :Scripted_NoMovementAI(c) { pInstance = c->GetInstanceScript(); } @@ -235,7 +235,7 @@ public: void DoAction(const int32 /*action*/) { if (pInstance) - if (Unit *pVictim = me->GetUnit(*me, pInstance->GetData64(DATA_SACRIFICED_PLAYER))) + if (Unit* pVictim = me->GetUnit(*me, pInstance->GetData64(DATA_SACRIFICED_PLAYER))) DoCast(pVictim, SPELL_PARALYZE); } @@ -258,7 +258,7 @@ public: struct boss_svala_sorrowgraveAI : public ScriptedAI { - boss_svala_sorrowgraveAI(Creature *c) : ScriptedAI(c), summons(c) + boss_svala_sorrowgraveAI(Creature* c) : ScriptedAI(c), summons(c) { pInstance = c->GetInstanceScript(); } @@ -307,12 +307,12 @@ public: pInstance->SetData(DATA_SVALA_SORROWGRAVE_EVENT, IN_PROGRESS); } - void JustSummoned(Creature *summon) + void JustSummoned(Creature* summon) { summons.Summon(summon); } - void SummonedCreatureDespawn(Creature *summon) + void SummonedCreatureDespawn(Creature* summon) { summons.Despawn(summon); } diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp index 7bd659400b7..100d3496215 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp @@ -108,7 +108,7 @@ public: struct boss_ymironAI : public ScriptedAI { - boss_ymironAI(Creature *c) : ScriptedAI(c) + boss_ymironAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); for (int i = 0; i < 4; ++i) diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp index 04935d3fb99..e160cda0699 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp @@ -99,7 +99,7 @@ class boss_emalon : public CreatureScript { for (std::list<uint64>::const_iterator itr = summons.begin(); itr != summons.end(); ++itr) { - Creature *minion = Unit::GetCreature(*me, *itr); + Creature* minion = Unit::GetCreature(*me, *itr); if (minion && minion->isAlive() && !minion->getVictim() && minion->AI()) minion->AI()->AttackStart(who); } @@ -208,7 +208,7 @@ class mob_tempest_minion : public CreatureScript DoZoneInCombat(); events.ScheduleEvent(EVENT_SHOCK, 20000); - if (Creature *pEmalon = Unit::GetCreature(*me, instance ? instance->GetData64(DATA_EMALON) : 0)) + if (Creature* pEmalon = Unit::GetCreature(*me, instance ? instance->GetData64(DATA_EMALON) : 0)) { if (!pEmalon->getVictim() && pEmalon->AI()) pEmalon->AI()->AttackStart(who); diff --git a/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp index 804d602a06f..0d24b92620e 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp @@ -57,7 +57,7 @@ public: struct boss_cyanigosaAI : public ScriptedAI { - boss_cyanigosaAI(Creature *c) : ScriptedAI(c) + boss_cyanigosaAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -111,7 +111,7 @@ public: if (uiBlizzardTimer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_BLIZZARD); uiBlizzardTimer = 15000; } else uiBlizzardTimer -= diff; diff --git a/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp b/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp index d36533cb906..c621fbc5f1c 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp @@ -55,7 +55,7 @@ public: struct boss_erekemAI : public ScriptedAI { - boss_erekemAI(Creature *c) : ScriptedAI(c) + boss_erekemAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -83,12 +83,12 @@ public: pInstance->SetData(DATA_2ND_BOSS_EVENT, NOT_STARTED); } - if (Creature *pGuard1 = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_EREKEM_GUARD_1) : 0)) + if (Creature* pGuard1 = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_EREKEM_GUARD_1) : 0)) { if (!pGuard1->isAlive()) pGuard1->Respawn(); } - if (Creature *pGuard2 = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_EREKEM_GUARD_2) : 0)) + if (Creature* pGuard2 = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_EREKEM_GUARD_2) : 0)) { if (!pGuard2->isAlive()) pGuard2->Respawn(); @@ -107,13 +107,13 @@ public: pWho->SetInCombatWith(me); DoStartMovement(pWho); - if (Creature *pGuard1 = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_EREKEM_GUARD_1) : 0)) + if (Creature* pGuard1 = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_EREKEM_GUARD_1) : 0)) { pGuard1->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE|UNIT_FLAG_NON_ATTACKABLE); if (!pGuard1->getVictim() && pGuard1->AI()) pGuard1->AI()->AttackStart(pWho); } - if (Creature *pGuard2 = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_EREKEM_GUARD_2) : 0)) + if (Creature* pGuard2 = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_EREKEM_GUARD_2) : 0)) { pGuard2->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE|UNIT_FLAG_NON_ATTACKABLE); if (!pGuard2->getVictim() && pGuard2->AI()) @@ -129,7 +129,7 @@ public: if (pInstance) { - if (GameObject *pDoor = pInstance->instance->GetGameObject(pInstance->GetData64(DATA_EREKEM_CELL))) + if (GameObject* pDoor = pInstance->instance->GetGameObject(pInstance->GetData64(DATA_EREKEM_CELL))) if (pDoor->GetGoState() == GO_STATE_READY) { EnterEvadeMode(); @@ -154,9 +154,9 @@ public: //spam stormstrike in hc mode if spawns are dead if (IsHeroic()) { - if (Creature *pGuard1 = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_EREKEM_GUARD_1) : 0)) + if (Creature* pGuard1 = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_EREKEM_GUARD_1) : 0)) { - if (Creature *pGuard2 = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_EREKEM_GUARD_2) : 0)) + if (Creature* pGuard2 = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_EREKEM_GUARD_2) : 0)) { if (!pGuard1->isAlive() && !pGuard2->isAlive()) DoCast(me->getVictim(), SPELL_STORMSTRIKE); @@ -174,12 +174,12 @@ public: { if (uint64 TargetGUID = GetChainHealTargetGUID()) { - if (Creature *pTarget = Unit::GetCreature(*me, TargetGUID)) + if (Creature* pTarget = Unit::GetCreature(*me, TargetGUID)) DoCast(pTarget, 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); - Creature *pGuard2 = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_EREKEM_GUARD_2) : 0); + Creature* pGuard1 = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_EREKEM_GUARD_1) : 0); + Creature* pGuard2 = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_EREKEM_GUARD_2) : 0); uiChainHealTimer = ((pGuard1 && !pGuard1->isAlive()) || (pGuard2 && !pGuard2->isAlive()) ? 3000 : 8000) + rand()%3000; } } else uiChainHealTimer -= diff; @@ -237,11 +237,11 @@ public: if (HealthBelowPct(85)) return me->GetGUID(); - Creature *pGuard1 = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_EREKEM_GUARD_1) : 0); + Creature* pGuard1 = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_EREKEM_GUARD_1) : 0); if (pGuard1 && pGuard1->isAlive() && !pGuard1->HealthAbovePct(75)) return pGuard1->GetGUID(); - Creature *pGuard2 = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_EREKEM_GUARD_2) : 0); + Creature* pGuard2 = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_EREKEM_GUARD_2) : 0); if (pGuard2 && pGuard2->isAlive() && !pGuard2->HealthAbovePct(75)) return pGuard2->GetGUID(); @@ -270,7 +270,7 @@ public: struct mob_erekem_guardAI : public ScriptedAI { - mob_erekem_guardAI(Creature *c) : ScriptedAI(c) + mob_erekem_guardAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } diff --git a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp index 1e3914ab40b..f1c72e1becb 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp @@ -125,7 +125,7 @@ public: if (pInstance) { - if (GameObject *pDoor = pInstance->instance->GetGameObject(pInstance->GetData64(DATA_ICHORON_CELL))) + if (GameObject* pDoor = pInstance->instance->GetGameObject(pInstance->GetData64(DATA_ICHORON_CELL))) if (pDoor->GetGoState() == GO_STATE_READY) { EnterEvadeMode(); @@ -312,7 +312,7 @@ public: } } - void SummonedCreatureDespawn(Creature *pSummoned) + void SummonedCreatureDespawn(Creature* pSummoned) { if (pSummoned) { diff --git a/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp b/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp index 67153a0cf81..6988f5f0714 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp @@ -41,7 +41,7 @@ public: struct boss_lavanthorAI : public ScriptedAI { - boss_lavanthorAI(Creature *c) : ScriptedAI(c) + boss_lavanthorAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -72,7 +72,7 @@ public: { if (pInstance) { - if (GameObject *pDoor = pInstance->instance->GetGameObject(pInstance->GetData64(DATA_LAVANTHOR_CELL))) + if (GameObject* pDoor = pInstance->instance->GetGameObject(pInstance->GetData64(DATA_LAVANTHOR_CELL))) if (pDoor->GetGoState() == GO_STATE_READY) { EnterEvadeMode(); diff --git a/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp b/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp index e2893a5445b..da0294d7d89 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp @@ -37,7 +37,7 @@ public: struct boss_moraggAI : public ScriptedAI { - boss_moraggAI(Creature *c) : ScriptedAI(c) + boss_moraggAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -65,7 +65,7 @@ public: { if (pInstance) { - if (GameObject *pDoor = pInstance->instance->GetGameObject(pInstance->GetData64(DATA_MORAGG_CELL))) + if (GameObject* pDoor = pInstance->instance->GetGameObject(pInstance->GetData64(DATA_MORAGG_CELL))) if (pDoor->GetGoState() == GO_STATE_READY) { EnterEvadeMode(); diff --git a/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp b/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp index bfaf971abce..ff7a67b6a29 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp @@ -140,7 +140,7 @@ public: DoScriptText(SAY_AGGRO, me); if (pInstance) { - if (GameObject *pDoor = pInstance->instance->GetGameObject(pInstance->GetData64(DATA_XEVOZZ_CELL))) + if (GameObject* pDoor = pInstance->instance->GetGameObject(pInstance->GetData64(DATA_XEVOZZ_CELL))) if (pDoor->GetGoState() == GO_STATE_READY) { EnterEvadeMode(); diff --git a/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp b/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp index 16f49316782..1e795e86759 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp @@ -61,7 +61,7 @@ public: struct boss_zuramatAI : public ScriptedAI { - boss_zuramatAI(Creature *c) : ScriptedAI(c) + boss_zuramatAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -108,7 +108,7 @@ public: DoScriptText(SAY_AGGRO, me); if (pInstance) { - if (GameObject *pDoor = pInstance->instance->GetGameObject(pInstance->GetData64(DATA_ZURAMAT_CELL))) + if (GameObject* pDoor = pInstance->instance->GetGameObject(pInstance->GetData64(DATA_ZURAMAT_CELL))) if (pDoor->GetGoState() == GO_STATE_READY) { EnterEvadeMode(); diff --git a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp index d009063109f..e250cfa399d 100644 --- a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp +++ b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp @@ -426,7 +426,7 @@ public: struct mob_azure_saboteurAI : public npc_escortAI { - mob_azure_saboteurAI(Creature *c):npc_escortAI(c) + mob_azure_saboteurAI(Creature* c):npc_escortAI(c) { pInstance = c->GetInstanceScript(); bHasGotMovingPoints = false; @@ -543,14 +543,14 @@ class npc_teleportation_portal_vh : public CreatureScript public: npc_teleportation_portal_vh() : CreatureScript("npc_teleportation_portal_vh") { } - CreatureAI* GetAI(Creature *pCreature) const + CreatureAI* GetAI(Creature* pCreature) const { return new npc_teleportation_portalAI(pCreature); } struct npc_teleportation_portalAI : public ScriptedAI { - npc_teleportation_portalAI(Creature *c) : ScriptedAI(c), listOfMobs(me) + npc_teleportation_portalAI(Creature* c) : ScriptedAI(c), listOfMobs(me) { pInstance = c->GetInstanceScript(); uiTypeOfMobsPortal = urand(0, 1); // 0 - elite mobs 1 - portal guardian or portal keeper with regular mobs @@ -635,7 +635,7 @@ public: { bPortalGuardianOrKeeperOrEliteSpawn = true; uint32 entry = RAND(CREATURE_PORTAL_GUARDIAN, CREATURE_PORTAL_KEEPER); - if (Creature *pPortalKeeper = DoSummon(entry, me, 2.0f, 0, TEMPSUMMON_DEAD_DESPAWN)) + if (Creature* pPortalKeeper = DoSummon(entry, me, 2.0f, 0, TEMPSUMMON_DEAD_DESPAWN)) me->CastSpell(pPortalKeeper, SPELL_PORTAL_CHANNEL, false); } uiSpawnTimer = SPAWN_TIME; @@ -656,14 +656,14 @@ public: pInstance->SetData(DATA_WAVE_COUNT, pInstance->GetData(DATA_WAVE_COUNT)+1); } - void JustSummoned(Creature *pSummoned) + void JustSummoned(Creature* pSummoned) { listOfMobs.Summon(pSummoned); if (pSummoned) pInstance->SetData64(DATA_ADD_TRASH_MOB, pSummoned->GetGUID()); } - void SummonedMobDied(Creature *pSummoned) + void SummonedMobDied(Creature* pSummoned) { listOfMobs.Despawn(pSummoned); if (pSummoned) @@ -675,7 +675,7 @@ public: struct violet_hold_trashAI : public npc_escortAI { - violet_hold_trashAI(Creature *c):npc_escortAI(c) + violet_hold_trashAI(Creature* c):npc_escortAI(c) { pInstance = c->GetInstanceScript(); bHasGotMovingPoints = false; @@ -808,7 +808,7 @@ public: struct mob_azure_invaderAI : public violet_hold_trashAI { - mob_azure_invaderAI(Creature *c) : violet_hold_trashAI(c) + mob_azure_invaderAI(Creature* c) : violet_hold_trashAI(c) { pInstance = c->GetInstanceScript(); } @@ -886,7 +886,7 @@ public: struct mob_azure_binderAI : public violet_hold_trashAI { - mob_azure_binderAI(Creature *c) : violet_hold_trashAI(c) + mob_azure_binderAI(Creature* c) : violet_hold_trashAI(c) { pInstance = c->GetInstanceScript(); } @@ -964,7 +964,7 @@ public: struct mob_azure_mage_slayerAI : public violet_hold_trashAI { - mob_azure_mage_slayerAI(Creature *c) : violet_hold_trashAI(c) + mob_azure_mage_slayerAI(Creature* c) : violet_hold_trashAI(c) { pInstance = c->GetInstanceScript(); } @@ -1024,7 +1024,7 @@ public: struct mob_azure_raiderAI : public violet_hold_trashAI { - mob_azure_raiderAI(Creature *c) : violet_hold_trashAI(c) + mob_azure_raiderAI(Creature* c) : violet_hold_trashAI(c) { pInstance = c->GetInstanceScript(); } @@ -1076,7 +1076,7 @@ public: struct mob_azure_stalkerAI : public violet_hold_trashAI { - mob_azure_stalkerAI(Creature *c) : violet_hold_trashAI(c) + mob_azure_stalkerAI(Creature* c) : violet_hold_trashAI(c) { pInstance = c->GetInstanceScript(); } @@ -1219,7 +1219,7 @@ public: struct mob_azure_captainAI : public violet_hold_trashAI { - mob_azure_captainAI(Creature *c) : violet_hold_trashAI(c) + mob_azure_captainAI(Creature* c) : violet_hold_trashAI(c) { pInstance = c->GetInstanceScript(); } @@ -1271,7 +1271,7 @@ public: struct mob_azure_sorcerorAI : public violet_hold_trashAI { - mob_azure_sorcerorAI(Creature *c) : violet_hold_trashAI(c) + mob_azure_sorcerorAI(Creature* c) : violet_hold_trashAI(c) { pInstance = c->GetInstanceScript(); } diff --git a/src/server/scripts/Northrend/borean_tundra.cpp b/src/server/scripts/Northrend/borean_tundra.cpp index 00d9b943f0b..641301a17d8 100644 --- a/src/server/scripts/Northrend/borean_tundra.cpp +++ b/src/server/scripts/Northrend/borean_tundra.cpp @@ -73,7 +73,7 @@ public: casterGuid = 0; } - void SpellHit(Unit *caster, const SpellEntry *spell) + void SpellHit(Unit* caster, const SpellEntry *spell) { if (Phase) return; @@ -138,7 +138,7 @@ public: break; case 7: DoCast(me, SPELL_EXPLODE_CART, true); - if (Player *caster = Unit::GetPlayer(*me, casterGuid)) + if (Player* caster = Unit::GetPlayer(*me, casterGuid)) caster->KilledMonster(me->GetCreatureInfo(), me->GetGUID()); uiPhaseTimer = 5000; Phase = 8; @@ -153,7 +153,7 @@ public: }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_sinkhole_kill_creditAI(creature); } @@ -170,9 +170,9 @@ public: struct npc_khunok_the_behemothAI : public ScriptedAI { - npc_khunok_the_behemothAI(Creature *c) : ScriptedAI(c) {} + npc_khunok_the_behemothAI(Creature* c) : ScriptedAI(c) {} - void MoveInLineOfSight(Unit *who) + void MoveInLineOfSight(Unit* who) { ScriptedAI::MoveInLineOfSight(who); @@ -181,7 +181,7 @@ public: if (who->GetEntry() == 25861 && me->IsWithinDistInMap(who, 10.0f)) { - if (Unit *owner = who->GetOwner()) + if (Unit* owner = who->GetOwner()) { if (owner->GetTypeId() == TYPEID_PLAYER) { @@ -193,7 +193,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_khunok_the_behemothAI(creature); } @@ -350,7 +350,7 @@ public: struct mob_nerubar_victimAI : public ScriptedAI { - mob_nerubar_victimAI(Creature *c) : ScriptedAI(c) {} + mob_nerubar_victimAI(Creature* c) : ScriptedAI(c) {} void Reset() {} void EnterCombat(Unit* /*who*/) {} @@ -375,7 +375,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new mob_nerubar_victimAI(creature); } @@ -410,7 +410,7 @@ public: }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_scourge_prisonerAI(creature); } @@ -483,7 +483,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_jennyAI (creature); } @@ -527,7 +527,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_fezzix_geartwistAI(creature); } @@ -575,7 +575,7 @@ public: struct npc_nesingwary_trapperAI : public ScriptedAI { - npc_nesingwary_trapperAI(Creature *c) : ScriptedAI(c) { c->SetVisible(false); } + npc_nesingwary_trapperAI(Creature* c) : ScriptedAI(c) { c->SetVisible(false); } uint64 go_caribouGUID; uint8 Phase; @@ -593,16 +593,16 @@ public: void JustDied(Unit* /*who*/) { - if (GameObject *go_caribou = me->GetMap()->GetGameObject(go_caribouGUID)) + if (GameObject* go_caribou = me->GetMap()->GetGameObject(go_caribouGUID)) go_caribou->SetLootState(GO_JUST_DEACTIVATED); if (TempSummon *summon = me->ToTempSummon()) if (summon->isSummon()) - if (Unit *pTemp = summon->GetSummoner()) + if (Unit* pTemp = summon->GetSummoner()) if (pTemp->GetTypeId() == TYPEID_PLAYER) CAST_PLR(pTemp)->KilledMonsterCredit(me->GetEntry(), 0); - if (GameObject *go_caribou = me->GetMap()->GetGameObject(go_caribouGUID)) + if (GameObject* go_caribou = me->GetMap()->GetGameObject(go_caribouGUID)) go_caribou->SetGoState(GO_STATE_READY); } @@ -619,7 +619,7 @@ public: break; case 2: - if (GameObject *go_fur = me->FindNearestGameObject(GO_HIGH_QUALITY_FUR, 11.0f)) + if (GameObject* go_fur = me->FindNearestGameObject(GO_HIGH_QUALITY_FUR, 11.0f)) me->GetMotionMaster()->MovePoint(0, go_fur->GetPositionX(), go_fur->GetPositionY(), go_fur->GetPositionZ()); uiPhaseTimer = 1500; Phase = 3; @@ -640,7 +640,7 @@ public: Phase = 6; break; case 6: - if (GameObject *go_fur = me->FindNearestGameObject(GO_HIGH_QUALITY_FUR, 11.0f)) + if (GameObject* go_fur = me->FindNearestGameObject(GO_HIGH_QUALITY_FUR, 11.0f)) go_fur->Delete(); uiPhaseTimer = 500; Phase = 7; @@ -648,7 +648,7 @@ public: case 7: { - GameObject *go_caribou = NULL; + GameObject* go_caribou = NULL; for (uint8 i = 0; i < CaribouTrapsNum; ++i) { go_caribou = me->FindNearestGameObject(CaribouTraps[i], 5.0f); @@ -672,7 +672,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_nesingwary_trapperAI(creature); } @@ -789,7 +789,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_lurgglbrAI(creature); } @@ -849,7 +849,7 @@ public: struct npc_nexus_drake_hatchlingAI : public FollowerAI //The spell who makes the npc follow the player is missing, also we can use FollowerAI! { - npc_nexus_drake_hatchlingAI(Creature *c) : FollowerAI(c) {} + npc_nexus_drake_hatchlingAI(Creature* c) : FollowerAI(c) {} uint64 HarpoonerGUID; bool WithRedDragonBlood; @@ -866,7 +866,7 @@ public: AttackStart(pWho); } - void SpellHit(Unit *caster, const SpellEntry *spell) + void SpellHit(Unit* caster, const SpellEntry *spell) { if (spell->Id == SPELL_DRAKE_HARPOON && caster->GetTypeId() == TYPEID_PLAYER) { @@ -876,7 +876,7 @@ public: WithRedDragonBlood = true; } - void MoveInLineOfSight(Unit *pWho) + void MoveInLineOfSight(Unit* pWho) { FollowerAI::MoveInLineOfSight(pWho); @@ -887,7 +887,7 @@ public: { if (me->IsWithinDistInMap(pWho, INTERACTION_DISTANCE)) { - if (Player *pHarpooner = Unit::GetPlayer(*me, HarpoonerGUID)) + if (Player* pHarpooner = Unit::GetPlayer(*me, HarpoonerGUID)) { pHarpooner->KilledMonsterCredit(26175, 0); pHarpooner->RemoveAura(SPELL_DRAKE_HATCHLING_SUBDUED); @@ -903,7 +903,7 @@ public: { if (WithRedDragonBlood && HarpoonerGUID && !me->HasAura(SPELL_RED_DRAGONBLOOD)) { - if (Player *pHarpooner = Unit::GetPlayer(*me, HarpoonerGUID)) + if (Player* pHarpooner = Unit::GetPlayer(*me, HarpoonerGUID)) { EnterEvadeMode(); StartFollow(pHarpooner, 35, NULL); @@ -923,7 +923,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_nexus_drake_hatchlingAI(creature); } @@ -1025,7 +1025,7 @@ public: { case 3: SetEscortPaused(true); - if (Creature *pArthas = me->SummonCreature(NPC_IMAGE_LICH_KING, 3730.313f, 3518.689f, 473.324f, 1.562f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 120000)) + if (Creature* pArthas = me->SummonCreature(NPC_IMAGE_LICH_KING, 3730.313f, 3518.689f, 473.324f, 1.562f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 120000)) { uiArthas = pArthas->GetGUID(); pArthas->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); @@ -1033,7 +1033,7 @@ public: pArthas->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); pArthas->GetMotionMaster()->MovePoint(0, 3737.374756f, 3564.841309f, 477.433014f); } - if (Creature *pTalbot = me->SummonCreature(NPC_COUNSELOR_TALBOT, 3747.23f, 3614.936f, 473.321f, 4.462012f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 120000)) + if (Creature* pTalbot = me->SummonCreature(NPC_COUNSELOR_TALBOT, 3747.23f, 3614.936f, 473.321f, 4.462012f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 120000)) { uiTalbot = pTalbot->GetGUID(); pTalbot->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); @@ -1121,7 +1121,7 @@ public: pArlos->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); pArlos->GetMotionMaster()->MovePoint(0, 3735.570068f, 3572.419922f, 477.441010f); } - if (Creature *pLeryssa = me->SummonCreature(NPC_LERYSSA, 3749.654541f, 3614.959717f, 473.323486f, 4.524959f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 120000)) + if (Creature* pLeryssa = me->SummonCreature(NPC_LERYSSA, 3749.654541f, 3614.959717f, 473.323486f, 4.524959f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 120000)) { uiLeryssa = pLeryssa->GetGUID(); pLeryssa->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); @@ -1269,7 +1269,7 @@ public: return true; } - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_thassarianAI(creature); } @@ -1304,7 +1304,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_image_lich_kingAI(creature); } @@ -1336,7 +1336,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_general_arlosAI(creature); } @@ -1396,9 +1396,9 @@ public: { if (bCheck) { - if (Creature *pLeryssa = me->FindNearestCreature(NPC_LERYSSA, 50.0f, true)) + if (Creature* pLeryssa = me->FindNearestCreature(NPC_LERYSSA, 50.0f, true)) LeryssaGUID = pLeryssa->GetGUID(); - if (Creature *pArlos = me->FindNearestCreature(NPC_GENERAL_ARLOS, 50.0f, true)) + if (Creature* pArlos = me->FindNearestCreature(NPC_GENERAL_ARLOS, 50.0f, true)) ArlosGUID = pArlos->GetGUID(); bCheck = false; } @@ -1435,8 +1435,8 @@ public: if (!LeryssaGUID || !ArlosGUID) return; - Creature *pLeryssa = Unit::GetCreature(*me, LeryssaGUID); - Creature *pArlos = Unit::GetCreature(*me, ArlosGUID); + Creature* pLeryssa = Unit::GetCreature(*me, LeryssaGUID); + Creature* pArlos = Unit::GetCreature(*me, ArlosGUID); if (!pLeryssa || !pArlos) return; @@ -1454,7 +1454,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_counselor_talbotAI(creature); } @@ -1579,7 +1579,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_leryssaAI(creature); } @@ -1656,7 +1656,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_beryl_sorcererAI(creature); } @@ -1762,7 +1762,7 @@ public: case 5: if (uiStep == 5) { - if (Player *pCaster = Unit::GetPlayer(*me, CasterGUID)) + if (Player* pCaster = Unit::GetPlayer(*me, CasterGUID)) { DoScriptText(SAY_IMPRISIONED_BERYL_5, me); pCaster->KilledMonsterCredit(25478, 0); @@ -1791,7 +1791,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_imprisoned_beryl_sorcererAI(creature); } @@ -1840,7 +1840,7 @@ public: struct npc_mootoo_the_youngerAI : public npc_escortAI { - npc_mootoo_the_youngerAI(Creature *c) : npc_escortAI(c) {} + npc_mootoo_the_youngerAI(Creature* c) : npc_escortAI(c) {} void Reset() { @@ -1886,7 +1886,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_mootoo_the_youngerAI(creature); } @@ -1933,7 +1933,7 @@ public: struct npc_bonker_togglevoltAI : public npc_escortAI { - npc_bonker_togglevoltAI(Creature *c) : npc_escortAI(c) {} + npc_bonker_togglevoltAI(Creature* c) : npc_escortAI(c) {} uint32 Bonker_agro; void Reset() @@ -1979,7 +1979,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_bonker_togglevoltAI(creature); } @@ -2095,7 +2095,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_trapped_mammoth_calfAI(creature); } @@ -2123,7 +2123,7 @@ public: { npc_magmoth_crusherAI(Creature* c) : ScriptedAI(c) {} - void JustDied(Unit *pKiller) + void JustDied(Unit* pKiller) { if (pKiller->GetTypeId() == TYPEID_PLAYER && CAST_PLR(pKiller)->GetQuestStatus(QUEST_YOU_RE_NOT_SO_BIG_NOW) == QUEST_STATUS_INCOMPLETE && @@ -2137,7 +2137,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_magmoth_crusherAI(creature); } @@ -2157,7 +2157,7 @@ public: struct npc_seaforium_depth_chargeAI : public ScriptedAI { - npc_seaforium_depth_chargeAI(Creature *c) : ScriptedAI(c) {} + npc_seaforium_depth_chargeAI(Creature* c) : ScriptedAI(c) {} uint32 uiExplosionTimer; void Reset() @@ -2187,7 +2187,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_seaforium_depth_chargeAI(creature); } @@ -2239,7 +2239,7 @@ public: }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_valiance_keep_cannoneerAI(creature); } @@ -2344,7 +2344,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_warmage_coldarraAI(creature); } diff --git a/src/server/scripts/Northrend/crystalsong_forest.cpp b/src/server/scripts/Northrend/crystalsong_forest.cpp index 277f9d98091..8392c57ea26 100644 --- a/src/server/scripts/Northrend/crystalsong_forest.cpp +++ b/src/server/scripts/Northrend/crystalsong_forest.cpp @@ -98,7 +98,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_warmage_violetstandAI(creature); } diff --git a/src/server/scripts/Northrend/dalaran.cpp b/src/server/scripts/Northrend/dalaran.cpp index 13dc395712a..74f6bbf4f49 100644 --- a/src/server/scripts/Northrend/dalaran.cpp +++ b/src/server/scripts/Northrend/dalaran.cpp @@ -61,7 +61,7 @@ public: void AttackStart(Unit* /*pWho*/){} - void MoveInLineOfSight(Unit *pWho) + void MoveInLineOfSight(Unit* pWho) { if (!pWho || !pWho->IsInWorld() || pWho->GetZoneId() != 4395) return; @@ -69,7 +69,7 @@ public: if (!me->IsWithinDist(pWho, 65.0f, false)) return; - Player *pPlayer = pWho->GetCharmerOrOwnerPlayerOrPlayerItself(); + Player* pPlayer = pWho->GetCharmerOrOwnerPlayerOrPlayerItself(); if (!pPlayer || pPlayer->isGameMaster() || pPlayer->IsBeingTeleported()) return; @@ -108,7 +108,7 @@ public: void UpdateAI(const uint32 /*diff*/){} }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_mageguard_dalaranAI(creature); } diff --git a/src/server/scripts/Northrend/grizzly_hills.cpp b/src/server/scripts/Northrend/grizzly_hills.cpp index 1678e36b1a8..4f77010203e 100644 --- a/src/server/scripts/Northrend/grizzly_hills.cpp +++ b/src/server/scripts/Northrend/grizzly_hills.cpp @@ -188,7 +188,7 @@ public: switch (i) { case 9: - if (Creature *Mrfloppy = GetClosestCreatureWithEntry(me, NPC_MRFLOPPY, 100.0f)) + if (Creature* Mrfloppy = GetClosestCreatureWithEntry(me, NPC_MRFLOPPY, 100.0f)) MrfloppyGUID = Mrfloppy->GetGUID(); break; case 10: @@ -199,45 +199,45 @@ public: } break; case 11: - if (Creature *Mrfloppy = Unit::GetCreature(*me, MrfloppyGUID)) + if (Creature* Mrfloppy = Unit::GetCreature(*me, MrfloppyGUID)) Mrfloppy->GetMotionMaster()->MoveFollow(me, PET_FOLLOW_DIST, PET_FOLLOW_ANGLE); break; case 17: - if (Creature *Mrfloppy = Unit::GetCreature(*me, MrfloppyGUID)) + if (Creature* Mrfloppy = Unit::GetCreature(*me, MrfloppyGUID)) Mrfloppy->GetMotionMaster()->MovePoint(0, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ()); DoScriptText(SAY_WORGRAGGRO3, me); - if (Creature *RWORG = me->SummonCreature(NPC_RAVENOUS_WORG, me->GetPositionX()+10, me->GetPositionY()+8, me->GetPositionZ()+2, 3.229f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 120000)) + if (Creature* RWORG = me->SummonCreature(NPC_RAVENOUS_WORG, me->GetPositionX()+10, me->GetPositionY()+8, me->GetPositionZ()+2, 3.229f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 120000)) { RWORG->setFaction(35); RWORGGUID = RWORG->GetGUID(); } break; case 18: - if (Creature *Mrfloppy = Unit::GetCreature(*me, MrfloppyGUID)) + if (Creature* Mrfloppy = Unit::GetCreature(*me, MrfloppyGUID)) { - if (Creature *RWORG = Unit::GetCreature(*me, RWORGGUID)) + if (Creature* RWORG = Unit::GetCreature(*me, RWORGGUID)) RWORG->GetMotionMaster()->MovePoint(0, Mrfloppy->GetPositionX(), Mrfloppy->GetPositionY(), Mrfloppy->GetPositionZ()); DoCast(Mrfloppy, SPELL_MRFLOPPY); } break; case 19: - if (Creature *Mrfloppy = Unit::GetCreature(*me, MrfloppyGUID)) + if (Creature* Mrfloppy = Unit::GetCreature(*me, MrfloppyGUID)) { if (Mrfloppy->HasAura(SPELL_MRFLOPPY, 0)) { - if (Creature *RWORG = Unit::GetCreature(*me, RWORGGUID)) + if (Creature* RWORG = Unit::GetCreature(*me, RWORGGUID)) Mrfloppy->EnterVehicle(RWORG); } } break; case 20: - if (Creature *RWORG = Unit::GetCreature(*me, RWORGGUID)) + if (Creature* RWORG = Unit::GetCreature(*me, RWORGGUID)) RWORG->HandleEmoteCommand(34); break; case 21: - if (Creature *Mrfloppy = Unit::GetCreature(*me, MrfloppyGUID)) + if (Creature* Mrfloppy = Unit::GetCreature(*me, MrfloppyGUID)) { - if (Creature *RWORG = Unit::GetCreature(*me, RWORGGUID)) + if (Creature* RWORG = Unit::GetCreature(*me, RWORGGUID)) { RWORG->Kill(Mrfloppy); Mrfloppy->ExitVehicle(); @@ -248,11 +248,11 @@ public: } break; case 22: - if (Creature *Mrfloppy = Unit::GetCreature(*me, MrfloppyGUID)) + if (Creature* Mrfloppy = Unit::GetCreature(*me, MrfloppyGUID)) { if (Mrfloppy->isDead()) { - if (Creature *RWORG = Unit::GetCreature(*me, RWORGGUID)) + if (Creature* RWORG = Unit::GetCreature(*me, RWORGGUID)) RWORG->DisappearAndDie(); me->GetMotionMaster()->MovePoint(0, Mrfloppy->GetPositionX(), Mrfloppy->GetPositionY(), Mrfloppy->GetPositionZ()); Mrfloppy->setDeathState(ALIVE); @@ -275,7 +275,7 @@ public: break; case 27: me->DisappearAndDie(); - if (Creature *Mrfloppy = Unit::GetCreature(*me, MrfloppyGUID)) + if (Creature* Mrfloppy = Unit::GetCreature(*me, MrfloppyGUID)) Mrfloppy->DisappearAndDie(); break; } @@ -325,7 +325,7 @@ public: return true; } - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_emilyAI(creature); } @@ -339,7 +339,7 @@ public: struct npc_mrfloppyAI : public ScriptedAI { - npc_mrfloppyAI(Creature *c) : ScriptedAI(c) {} + npc_mrfloppyAI(Creature* c) : ScriptedAI(c) {} uint64 EmilyGUID; uint64 RWORGGUID; @@ -376,7 +376,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_mrfloppyAI(creature); } @@ -440,7 +440,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_outhouse_bunnyAI(creature); } @@ -484,7 +484,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_tallhorn_stagAI(creature); } @@ -550,7 +550,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_amberpine_woodsmanAI(creature); } @@ -576,7 +576,7 @@ public: struct npc_wounded_skirmisherAI : public ScriptedAI { - npc_wounded_skirmisherAI(Creature *c) : ScriptedAI(c) {} + npc_wounded_skirmisherAI(Creature* c) : ScriptedAI(c) {} uint64 uiPlayerGUID; @@ -594,7 +594,7 @@ public: me->DespawnOrUnsummon(DespawnTimer); } - void SpellHit(Unit *caster, const SpellEntry *spell) + void SpellHit(Unit* caster, const SpellEntry *spell) { if (spell->Id == SPELL_RENEW_SKIRMISHER && caster->GetTypeId() == TYPEID_PLAYER && caster->ToPlayer()->GetQuestStatus(12288) == QUEST_STATUS_INCOMPLETE) @@ -620,7 +620,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_wounded_skirmisherAI(creature); } @@ -643,14 +643,14 @@ class npc_lightning_sentry : public CreatureScript public: npc_lightning_sentry() : CreatureScript("npc_lightning_sentry") { } - CreatureAI *GetAI(Creature *pCreature) const + CreatureAI *GetAI(Creature* pCreature) const { return new npc_lightning_sentryAI(pCreature); } struct npc_lightning_sentryAI : public ScriptedAI { - npc_lightning_sentryAI(Creature *pCreature) : ScriptedAI(pCreature) { } + npc_lightning_sentryAI(Creature* pCreature) : ScriptedAI(pCreature) { } uint32 uiChargedSentryTotem; @@ -710,14 +710,14 @@ class npc_venture_co_straggler : public CreatureScript public: npc_venture_co_straggler() : CreatureScript("npc_venture_co_straggler") { } - CreatureAI *GetAI(Creature *pCreature) const + CreatureAI *GetAI(Creature* pCreature) const { return new npc_venture_co_stragglerAI(pCreature); } struct npc_venture_co_stragglerAI : public ScriptedAI { - npc_venture_co_stragglerAI(Creature *pCreature) : ScriptedAI(pCreature) { } + npc_venture_co_stragglerAI(Creature* pCreature) : ScriptedAI(pCreature) { } uint64 uiPlayerGUID; uint32 uiRunAwayTimer; @@ -737,7 +737,7 @@ public: { if (uiRunAwayTimer <= uiDiff) { - if (Player *pPlayer = Unit::GetPlayer(*me, uiPlayerGUID)) + if (Player* pPlayer = Unit::GetPlayer(*me, uiPlayerGUID)) { switch (uiTimer) { @@ -784,7 +784,7 @@ public: DoMeleeAttackIfReady(); } - void SpellHit(Unit *pCaster, const SpellEntry *pSpell) + void SpellHit(Unit* pCaster, const SpellEntry *pSpell) { if (pCaster && pCaster->GetTypeId() == TYPEID_PLAYER && pSpell->Id == SPELL_SMOKE_BOMB) { diff --git a/src/server/scripts/Northrend/howling_fjord.cpp b/src/server/scripts/Northrend/howling_fjord.cpp index dd91279584e..4be95efa5c5 100644 --- a/src/server/scripts/Northrend/howling_fjord.cpp +++ b/src/server/scripts/Northrend/howling_fjord.cpp @@ -147,7 +147,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_Apothecary_HanesAI(creature); } @@ -196,7 +196,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_plaguehound_trackerAI(creature); } @@ -362,7 +362,7 @@ public: // TODO: make prisoners help (unclear if summoned or using npc's from surrounding cages (summon inside small cages?)) struct npc_daegarnAI : public ScriptedAI { - npc_daegarnAI(Creature *pCreature) : ScriptedAI(pCreature) { } + npc_daegarnAI(Creature* pCreature) : ScriptedAI(pCreature) { } bool bEventInProgress; uint64 uiPlayerGUID; @@ -421,7 +421,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_daegarnAI(creature); } diff --git a/src/server/scripts/Northrend/icecrown.cpp b/src/server/scripts/Northrend/icecrown.cpp index 6d6cf8998c0..bdc1489d610 100644 --- a/src/server/scripts/Northrend/icecrown.cpp +++ b/src/server/scripts/Northrend/icecrown.cpp @@ -269,7 +269,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_argent_valiantAI(creature); } @@ -328,7 +328,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_alorah_and_grimminAI(creature); } @@ -375,7 +375,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_guardian_pavilionAI(creature); } diff --git a/src/server/scripts/Northrend/sholazar_basin.cpp b/src/server/scripts/Northrend/sholazar_basin.cpp index 255a1779ff7..63b89064b4d 100644 --- a/src/server/scripts/Northrend/sholazar_basin.cpp +++ b/src/server/scripts/Northrend/sholazar_basin.cpp @@ -161,7 +161,7 @@ public: return false; } - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_injured_rainspeaker_oracleAI(creature); } @@ -323,7 +323,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_bushwhackerAI(creature); } @@ -428,7 +428,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_engineer_heliceAI(creature); } @@ -587,7 +587,7 @@ public: } }; - CreatureAI *GetAI(Creature *pCreature) const + CreatureAI *GetAI(Creature* pCreature) const { return new npc_jungle_punch_targetAI(pCreature); } @@ -624,13 +624,13 @@ class npc_adventurous_dwarf : public CreatureScript public: npc_adventurous_dwarf() : CreatureScript("npc_adventurous_dwarf") { } - CreatureAI *GetAI(Creature *pCreature) const + CreatureAI *GetAI(Creature* pCreature) const { DoScriptText(SAY_DWARF_OUCH, pCreature); return NULL; } - bool OnGossipHello(Player *pPlayer, Creature *pCreature) + bool OnGossipHello(Player* pPlayer, Creature* pCreature) { if (pPlayer->GetQuestStatus(QUEST_12634) != QUEST_STATUS_INCOMPLETE) return false; @@ -648,7 +648,7 @@ public: return true; } - bool OnGossipSelect(Player *pPlayer, Creature *pCreature, uint32 /*uiSender*/, uint32 uiAction) + bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { pPlayer->PlayerTalkClass->ClearMenus(); uint32 spellId = 0; diff --git a/src/server/scripts/Northrend/storm_peaks.cpp b/src/server/scripts/Northrend/storm_peaks.cpp index 156ee5eb67b..cc5754ffde2 100644 --- a/src/server/scripts/Northrend/storm_peaks.cpp +++ b/src/server/scripts/Northrend/storm_peaks.cpp @@ -46,7 +46,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_agnetta_tyrsdottarAI(creature); } @@ -222,7 +222,7 @@ public: }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_goblin_prisonerAI(creature); } @@ -319,7 +319,7 @@ public: return true; } - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_victorious_challengerAI(creature); } @@ -445,7 +445,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_injured_goblinAI(creature); } @@ -590,7 +590,7 @@ public: enter_timer -= diff; } - void MoveInLineOfSight(Unit *unit) + void MoveInLineOfSight(Unit* unit) { if (!unit || !drake) return; @@ -659,7 +659,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_brunnhildar_prisonerAI(creature); } diff --git a/src/server/scripts/Northrend/zuldrak.cpp b/src/server/scripts/Northrend/zuldrak.cpp index eab88800203..0382f30e04f 100644 --- a/src/server/scripts/Northrend/zuldrak.cpp +++ b/src/server/scripts/Northrend/zuldrak.cpp @@ -62,7 +62,7 @@ public: void LockRageclaw() { - Unit *Rageclaw = Unit::GetCreature(*me, RageclawGUID); + Unit* Rageclaw = Unit::GetCreature(*me, RageclawGUID); // pointer check not needed me->SetInFront(Rageclaw); Rageclaw->SetInFront(me); @@ -76,7 +76,7 @@ public: if (!pWho) return; - Creature *Rageclaw = Unit::GetCreature(*me, RageclawGUID); + Creature* Rageclaw = Unit::GetCreature(*me, RageclawGUID); // pointer check not needed DoCast(Rageclaw, SPELL_FREE_RAGECLAW, true); @@ -102,7 +102,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_drakuru_shacklesAI(creature); } @@ -184,7 +184,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_captured_rageclawAI(creature); } @@ -554,7 +554,7 @@ public: return false; } - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_gurgthockAI(creature); } @@ -613,7 +613,7 @@ public: void EnterEvadeMode() { - if (Creature *pWhisker = me->GetCreature(*me, uiWhisker)) + if (Creature* pWhisker = me->GetCreature(*me, uiWhisker)) pWhisker->RemoveFromWorld(); } @@ -646,7 +646,7 @@ public: if (uiFishyScentTimer <= uiDiff) { - if (Unit *pAffected = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pAffected = SelectTarget(SELECT_TARGET_RANDOM, 0)) { DoCast(pAffected, SPELL_FISHY_SCENT); AffectedGUID = pAffected->GetGUID(); @@ -659,7 +659,7 @@ public: DoScriptText(SAY_CALL_FOR_HELP , me); //DoCast(me->getVictim(), SPELL_SUMMON_WHISKER); petai is not working correctly??? - if (Creature *pWhisker = me->SummonCreature(NPC_WHISKER, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 0)) + if (Creature* pWhisker = me->SummonCreature(NPC_WHISKER, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 0)) uiWhisker = pWhisker->GetGUID(); bSummoned = true; } @@ -675,7 +675,7 @@ public: pSummon->AI()->AttackStart(me->getVictim()); break; case NPC_HUNGRY_PENGUIN: - if (Unit *pAffected = Unit::GetUnit(*me, AffectedGUID)) + if (Unit* pAffected = Unit::GetUnit(*me, AffectedGUID)) { if (pAffected->isAlive()) pSummon->AI()->AttackStart(pAffected); @@ -687,7 +687,7 @@ public: void JustDied(Unit* pKiller) { if (uiWhisker) - if (Creature *pWhisker = me->GetCreature(*me, uiWhisker)) + if (Creature* pWhisker = me->GetCreature(*me, uiWhisker)) pWhisker->RemoveFromWorld(); if (pKiller->GetTypeId() == TYPEID_PLAYER) @@ -696,7 +696,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_orinoko_tuskbreakerAI(creature); } @@ -794,7 +794,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_korrak_bloodragerAI(creature); } @@ -886,7 +886,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_yggdrasAI(creature); } @@ -1019,7 +1019,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_stinkbeardAI(creature); } @@ -1229,7 +1229,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_fiend_elementalAI(creature); } @@ -1263,7 +1263,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_released_offspring_harkoaAI(creature); } @@ -1351,7 +1351,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_crusade_recruitAI(creature); } |