diff options
Diffstat (limited to 'src/server/scripts/EasternKingdoms')
125 files changed, 557 insertions, 550 deletions
diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp index 261c15d3cca..dea747b97b8 100644 --- a/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp +++ b/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp @@ -58,7 +58,7 @@ class mob_av_marshal_or_warmaster : public CreatureScript struct mob_av_marshal_or_warmasterAI : public ScriptedAI { - mob_av_marshal_or_warmasterAI(Creature *c) : ScriptedAI(c) {} + mob_av_marshal_or_warmasterAI(Creature* c) : ScriptedAI(c) {} uint32 uiChargeTimer; uint32 uiCleaveTimer; diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp index fc3c469771a..d78fefa1592 100644 --- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp +++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp @@ -48,7 +48,7 @@ public: struct mob_water_elementalAI : public ScriptedAI { - mob_water_elementalAI(Creature *c) : ScriptedAI(c) {} + mob_water_elementalAI(Creature* c) : ScriptedAI(c) {} uint32 uiWaterBoltTimer; uint64 uiBalindaGUID; @@ -74,7 +74,7 @@ public: // check if creature is not outside of building if (uiResetTimer < diff) { - if (Creature *pBalinda = Unit::GetCreature(*me, uiBalindaGUID)) + if (Creature* pBalinda = Unit::GetCreature(*me, uiBalindaGUID)) if (me->GetDistance2d(pBalinda->GetHomePosition().GetPositionX(), pBalinda->GetHomePosition().GetPositionY()) > 50) EnterEvadeMode(); uiResetTimer = 5*IN_MILLISECONDS; @@ -84,7 +84,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new mob_water_elementalAI(creature); } @@ -97,7 +97,7 @@ public: struct boss_balindaAI : public ScriptedAI { - boss_balindaAI(Creature *c) : ScriptedAI(c), Summons(me) {} + boss_balindaAI(Creature* c) : ScriptedAI(c), Summons(me) {} uint32 uiArcaneExplosionTimer; uint32 uiConeOfColdTimer; @@ -194,7 +194,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new boss_balindaAI(creature); } diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp index 2e162dde5b8..7e4e6f15384 100644 --- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp +++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp @@ -48,7 +48,7 @@ public: struct boss_drektharAI : public ScriptedAI { - boss_drektharAI(Creature *c) : ScriptedAI(c) {} + boss_drektharAI(Creature* c) : ScriptedAI(c) {} uint32 uiWhirlwindTimer; uint32 uiWhirlwind2Timer; @@ -128,7 +128,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new boss_drektharAI(creature); } diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp index e25df98863b..783be5bf7a3 100644 --- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp +++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp @@ -39,7 +39,7 @@ public: struct boss_galvangarAI : public ScriptedAI { - boss_galvangarAI(Creature *c) : ScriptedAI(c) {} + boss_galvangarAI(Creature* c) : ScriptedAI(c) {} uint32 uiCleaveTimer; uint32 uiFrighteningShoutTimer; @@ -118,7 +118,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new boss_galvangarAI(creature); } diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp index dbaf7a77fa0..c5b600c8807 100644 --- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp +++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp @@ -46,7 +46,7 @@ public: struct boss_vanndarAI : public ScriptedAI { - boss_vanndarAI(Creature *c) : ScriptedAI(c) {} + boss_vanndarAI(Creature* c) : ScriptedAI(c) {} uint32 uiAvatarTimer; uint32 uiThunderclapTimer; @@ -118,7 +118,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new boss_vanndarAI(creature); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp index 78db15f0441..9cfd1e60b2b 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp @@ -150,7 +150,7 @@ public: struct npc_grimstoneAI : public npc_escortAI { - npc_grimstoneAI(Creature *c) : npc_escortAI(c) + npc_grimstoneAI(Creature* c) : npc_escortAI(c) { pInstance = c->GetInstanceScript(); MobSpawnId = rand()%6; @@ -263,7 +263,7 @@ public: if (RingBossGUID) { - Creature *boss = Unit::GetCreature(*me, RingBossGUID); + Creature* boss = Unit::GetCreature(*me, RingBossGUID); if (boss && !boss->isAlive() && boss->isDead()) { RingBossGUID = 0; @@ -276,7 +276,7 @@ public: for (uint8 i = 0; i < MAX_MOB_AMOUNT; ++i) { - Creature *mob = Unit::GetCreature(*me, RingMobGUID[i]); + Creature* mob = Unit::GetCreature(*me, RingMobGUID[i]); if (mob && !mob->isAlive() && mob->isDead()) { RingMobGUID[i] = 0; @@ -391,7 +391,7 @@ public: struct mob_phalanxAI : public ScriptedAI { - mob_phalanxAI(Creature *c) : ScriptedAI(c) {} + mob_phalanxAI(Creature* c) : ScriptedAI(c) {} uint32 ThunderClap_Timer; uint32 FireballVolley_Timer; @@ -658,7 +658,7 @@ public: struct npc_dughal_stormwingAI : public npc_escortAI { - npc_dughal_stormwingAI(Creature *c) : npc_escortAI(c) {} + npc_dughal_stormwingAI(Creature* c) : npc_escortAI(c) {} void WaypointReached(uint32 i) { @@ -778,7 +778,7 @@ public: struct npc_marshal_windsorAI : public npc_escortAI { - npc_marshal_windsorAI(Creature *c) : npc_escortAI(c) + npc_marshal_windsorAI(Creature* c) : npc_escortAI(c) { pInstance = c->GetInstanceScript(); } @@ -840,7 +840,7 @@ public: void Reset() {} - void JustDied(Unit *slayer) + void JustDied(Unit* slayer) { pInstance->SetData(DATA_QUEST_JAIL_BREAK, ENCOUNTER_STATE_FAILED); } @@ -952,7 +952,7 @@ public: struct npc_marshal_reginald_windsorAI : public npc_escortAI { - npc_marshal_reginald_windsorAI(Creature *c) : npc_escortAI(c) + npc_marshal_reginald_windsorAI(Creature* c) : npc_escortAI(c) { } @@ -1014,7 +1014,7 @@ public: } } - void MoveInLineOfSight(Unit *who) + void MoveInLineOfSight(Unit* who) { if (HasEscortState(STATE_ESCORT_ESCORTING)) return; @@ -1044,7 +1044,7 @@ public: } void Reset() {} - void JustDied(Unit *slayer) + void JustDied(Unit* slayer) { pInstance->SetData(DATA_QUEST_JAIL_BREAK, ENCOUNTER_STATE_FAILED); } @@ -1148,7 +1148,7 @@ public: struct npc_tobias_seecherAI : public npc_escortAI { - npc_tobias_seecherAI(Creature *c) :npc_escortAI(c) {} + npc_tobias_seecherAI(Creature* c) :npc_escortAI(c) {} void EnterCombat(Unit* who) {} void Reset() {} @@ -1263,7 +1263,7 @@ public: struct npc_rocknotAI : public npc_escortAI { - npc_rocknotAI(Creature *c) : npc_escortAI(c) + npc_rocknotAI(Creature* c) : npc_escortAI(c) { pInstance = c->GetInstanceScript(); } @@ -1337,7 +1337,7 @@ public: DoGo(DATA_GO_BAR_KEG_TRAP, 0); //doesn't work very well, leaving code here for future //spell by trap has effect61, this indicate the bar go hostile - if (Unit *tmp = Unit::GetUnit(*me, pInstance->GetData64(DATA_PHALANX))) + if (Unit* tmp = Unit::GetUnit(*me, pInstance->GetData64(DATA_PHALANX))) tmp->setFaction(14); //for later, this event(s) has alot more to it. diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_ambassador_flamelash.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_ambassador_flamelash.cpp index 238e72474b7..faaf94dbc65 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_ambassador_flamelash.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_ambassador_flamelash.cpp @@ -42,7 +42,7 @@ public: struct boss_ambassador_flamelashAI : public ScriptedAI { - boss_ambassador_flamelashAI(Creature *c) : ScriptedAI(c) {} + boss_ambassador_flamelashAI(Creature* c) : ScriptedAI(c) {} uint32 FireBlast_Timer; uint32 Spirit_Timer; @@ -57,7 +57,7 @@ public: void SummonSpirits(Unit* victim) { - if (Creature *Spirit = DoSpawnCreature(9178, float(irand(-9, 9)), float(irand(-9, 9)), 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 60000)) + if (Creature* Spirit = DoSpawnCreature(9178, float(irand(-9, 9)), float(irand(-9, 9)), 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 60000)) Spirit->AI()->AttackStart(victim); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_anubshiah.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_anubshiah.cpp index db6e2547381..0186abdf600 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_anubshiah.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_anubshiah.cpp @@ -46,7 +46,7 @@ public: struct boss_anubshiahAI : public ScriptedAI { - boss_anubshiahAI(Creature *c) : ScriptedAI(c) {} + boss_anubshiahAI(Creature* c) : ScriptedAI(c) {} uint32 ShadowBolt_Timer; uint32 CurseOfTongues_Timer; @@ -83,7 +83,7 @@ public: //CurseOfTongues_Timer if (CurseOfTongues_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_CURSEOFTONGUES); CurseOfTongues_Timer = 18000; } else CurseOfTongues_Timer -= diff; @@ -105,7 +105,7 @@ public: //EnvelopingWeb_Timer if (EnvelopingWeb_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_ENVELOPINGWEB); EnvelopingWeb_Timer = 12000; } else EnvelopingWeb_Timer -= diff; diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp index 7a662d8e99b..fed30b98056 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp @@ -49,7 +49,7 @@ public: struct boss_draganthaurissanAI : public ScriptedAI { - boss_draganthaurissanAI(Creature *c) : ScriptedAI(c) {} + boss_draganthaurissanAI(Creature* c) : ScriptedAI(c) {} uint32 HandOfThaurissan_Timer; uint32 AvatarOfFlame_Timer; @@ -81,7 +81,7 @@ public: if (HandOfThaurissan_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_HANDOFTHAURISSAN); //3 Hands of Thaurissan will be casted diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_general_angerforge.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_general_angerforge.cpp index 33f72025dfc..65d1d78b30e 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_general_angerforge.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_general_angerforge.cpp @@ -44,7 +44,7 @@ public: struct boss_general_angerforgeAI : public ScriptedAI { - boss_general_angerforgeAI(Creature *c) : ScriptedAI(c) {} + boss_general_angerforgeAI(Creature* c) : ScriptedAI(c) {} uint32 MightyBlow_Timer; uint32 HamString_Timer; @@ -67,13 +67,13 @@ public: void SummonAdds(Unit* victim) { - if (Creature *SummonedAdd = DoSpawnCreature(8901, float(irand(-14, 14)), float(irand(-14, 14)), 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 120000)) + if (Creature* SummonedAdd = DoSpawnCreature(8901, float(irand(-14, 14)), float(irand(-14, 14)), 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 120000)) SummonedAdd->AI()->AttackStart(victim); } void SummonMedics(Unit* victim) { - if (Creature *SummonedMedic = DoSpawnCreature(8894, float(irand(-9, 9)), float(irand(-9, 9)), 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 120000)) + if (Creature* SummonedMedic = DoSpawnCreature(8894, float(irand(-9, 9)), float(irand(-9, 9)), 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 120000)) SummonedMedic->AI()->AttackStart(victim); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_gorosh_the_dervish.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_gorosh_the_dervish.cpp index 414748bccca..6e5f597ce45 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_gorosh_the_dervish.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_gorosh_the_dervish.cpp @@ -43,7 +43,7 @@ public: struct boss_gorosh_the_dervishAI : public ScriptedAI { - boss_gorosh_the_dervishAI(Creature *c) : ScriptedAI(c) {} + boss_gorosh_the_dervishAI(Creature* c) : ScriptedAI(c) {} uint32 WhirlWind_Timer; uint32 MortalStrike_Timer; diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_grizzle.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_grizzle.cpp index 9303475328b..60d6b017ac8 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_grizzle.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_grizzle.cpp @@ -43,7 +43,7 @@ public: struct boss_grizzleAI : public ScriptedAI { - boss_grizzleAI(Creature *c) : ScriptedAI(c) {} + boss_grizzleAI(Creature* c) : ScriptedAI(c) {} uint32 GroundTremor_Timer; uint32 Frenzy_Timer; diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_high_interrogator_gerstahn.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_high_interrogator_gerstahn.cpp index 1403c0e44d9..7909d9e6e39 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_high_interrogator_gerstahn.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_high_interrogator_gerstahn.cpp @@ -45,7 +45,7 @@ public: struct boss_high_interrogator_gerstahnAI : public ScriptedAI { - boss_high_interrogator_gerstahnAI(Creature *c) : ScriptedAI(c) {} + boss_high_interrogator_gerstahnAI(Creature* c) : ScriptedAI(c) {} uint32 ShadowWordPain_Timer; uint32 ManaBurn_Timer; @@ -73,7 +73,7 @@ public: //ShadowWordPain_Timer if (ShadowWordPain_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_SHADOWWORDPAIN); ShadowWordPain_Timer = 7000; } else ShadowWordPain_Timer -= diff; @@ -81,7 +81,7 @@ public: //ManaBurn_Timer if (ManaBurn_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_MANABURN); ManaBurn_Timer = 10000; } else ManaBurn_Timer -= diff; diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_magmus.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_magmus.cpp index 0ff398193d1..ce1cee169d7 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_magmus.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_magmus.cpp @@ -48,7 +48,7 @@ public: struct boss_magmusAI : public ScriptedAI { - boss_magmusAI(Creature *c) : ScriptedAI(c) {} + boss_magmusAI(Creature* c) : ScriptedAI(c) {} uint32 FieryBurst_Timer; uint32 WarStomp_Timer; @@ -89,7 +89,7 @@ public: DoMeleeAttackIfReady(); } // When he die open door to last chamber - void JustDied(Unit *who) + void JustDied(Unit* who) { if (InstanceScript* pInstance = who->GetInstanceScript()) pInstance->HandleGameObject(pInstance->GetData64(DATA_THRONE_DOOR), true); diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_moira_bronzebeard.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_moira_bronzebeard.cpp index 4247a7d3ea4..79fc21e6164 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_moira_bronzebeard.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_moira_bronzebeard.cpp @@ -47,7 +47,7 @@ public: struct boss_moira_bronzebeardAI : public ScriptedAI { - boss_moira_bronzebeardAI(Creature *c) : ScriptedAI(c) {} + boss_moira_bronzebeardAI(Creature* c) : ScriptedAI(c) {} uint32 Heal_Timer; uint32 MindBlast_Timer; diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_tomb_of_seven.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_tomb_of_seven.cpp index 684002acfd3..a29156785e0 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_tomb_of_seven.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_tomb_of_seven.cpp @@ -150,7 +150,7 @@ public: struct boss_doomrelAI : public ScriptedAI { - boss_doomrelAI(Creature *c) : ScriptedAI(c) + boss_doomrelAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -222,7 +222,7 @@ public: //Immolate_Timer if (Immolate_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_IMMOLATE); Immolate_Timer = 25000; diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp index 92b0f216fff..f93775a006e 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp @@ -378,7 +378,7 @@ public: { boss->setFaction(FACTION_HOSTILE); boss->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); - if (Unit *pTarget = boss->SelectNearestTarget(500)) + if (Unit* pTarget = boss->SelectNearestTarget(500)) boss->AI()->AttackStart(pTarget); } } diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp index be6aa718a98..922fb5cd5c1 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp @@ -86,7 +86,7 @@ public: events.ScheduleEvent(EVENT_CURSE_OF_BLOOD, 45*IN_MILLISECONDS); break; case EVENT_HEX: - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_HEX); events.ScheduleEvent(EVENT_HEX, 15*IN_MILLISECONDS); break; diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_broodlord_lashlayer.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_broodlord_lashlayer.cpp index fd870eb0f2f..4e69f1a7e42 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_broodlord_lashlayer.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_broodlord_lashlayer.cpp @@ -45,7 +45,7 @@ public: struct boss_broodlordAI : public ScriptedAI { - boss_broodlordAI(Creature *c) : ScriptedAI(c) {} + boss_broodlordAI(Creature* c) : ScriptedAI(c) {} uint32 Cleave_Timer; uint32 BlastWave_Timer; diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_chromaggus.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_chromaggus.cpp index 766c74563cf..8d95df9c949 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_chromaggus.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_chromaggus.cpp @@ -71,7 +71,7 @@ public: struct boss_chromaggusAI : public ScriptedAI { - boss_chromaggusAI(Creature *c) : ScriptedAI(c) + boss_chromaggusAI(Creature* c) : ScriptedAI(c) { //Select the 2 breaths that we are going to use until despawned //5 possiblities for the first breath, 4 for the second, 20 total possiblites diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_ebonroc.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_ebonroc.cpp index 019db29a508..653da086b68 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_ebonroc.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_ebonroc.cpp @@ -42,7 +42,7 @@ public: struct boss_ebonrocAI : public ScriptedAI { - boss_ebonrocAI(Creature *c) : ScriptedAI(c) {} + boss_ebonrocAI(Creature* c) : ScriptedAI(c) {} uint32 ShadowFlame_Timer; uint32 WingBuffet_Timer; diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_firemaw.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_firemaw.cpp index 7a300e9a368..f27d190b7a0 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_firemaw.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_firemaw.cpp @@ -41,7 +41,7 @@ public: struct boss_firemawAI : public ScriptedAI { - boss_firemawAI(Creature *c) : ScriptedAI(c) {} + boss_firemawAI(Creature* c) : ScriptedAI(c) {} uint32 ShadowFlame_Timer; uint32 WingBuffet_Timer; diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_flamegor.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_flamegor.cpp index 848e95f6e1c..279b99c1163 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_flamegor.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_flamegor.cpp @@ -43,7 +43,7 @@ public: struct boss_flamegorAI : public ScriptedAI { - boss_flamegorAI(Creature *c) : ScriptedAI(c) {} + boss_flamegorAI(Creature* c) : ScriptedAI(c) {} uint32 ShadowFlame_Timer; uint32 WingBuffet_Timer; diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_nefarian.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_nefarian.cpp index e92483ff734..bb122b173fe 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_nefarian.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_nefarian.cpp @@ -72,7 +72,7 @@ public: struct boss_nefarianAI : public ScriptedAI { - boss_nefarianAI(Creature *c) : ScriptedAI(c) {} + boss_nefarianAI(Creature* c) : ScriptedAI(c) {} uint32 ShadowFlame_Timer; uint32 BellowingRoar_Timer; diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_razorgore.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_razorgore.cpp index 424d8b723dc..4303e53199a 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_razorgore.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_razorgore.cpp @@ -49,7 +49,7 @@ public: struct boss_razorgoreAI : public ScriptedAI { - boss_razorgoreAI(Creature *c) : ScriptedAI(c) {} + boss_razorgoreAI(Creature* c) : ScriptedAI(c) {} uint32 Cleave_Timer; uint32 WarStomp_Timer; @@ -114,7 +114,7 @@ public: // Aura Check. If the gamer is affected by confliguration we attack a random gamer. if (me->getVictim() && me->getVictim()->HasAura(SPELL_CONFLAGRATION)) - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true)) me->TauntApply(pTarget); DoMeleeAttackIfReady(); diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_vaelastrasz.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_vaelastrasz.cpp index dd10305638f..0f34e0b2b34 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_vaelastrasz.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_vaelastrasz.cpp @@ -81,7 +81,7 @@ public: struct boss_vaelAI : public ScriptedAI { - boss_vaelAI(Creature *c) : ScriptedAI(c) + boss_vaelAI(Creature* c) : ScriptedAI(c) { c->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); c->setFaction(35); @@ -115,7 +115,7 @@ public: DoingSpeech = false; } - void BeginSpeech(Unit *pTarget) + void BeginSpeech(Unit* pTarget) { //Stand up and begin speach PlayerGUID = pTarget->GetGUID(); @@ -208,7 +208,7 @@ public: //BurningAdrenalineCaster_Timer if (BurningAdrenalineCaster_Timer <= diff) { - Unit *pTarget = NULL; + Unit* pTarget = NULL; uint8 i = 0; while (i < 3) // max 3 tries to get a random target with power_mana diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp index 57a34de3804..d13e5db8238 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp @@ -110,7 +110,7 @@ public: struct boss_victor_nefariusAI : public ScriptedAI { - boss_victor_nefariusAI(Creature *c) : ScriptedAI(c) + boss_victor_nefariusAI(Creature* c) : ScriptedAI(c) { NefarianGUID = 0; switch (urand(0, 19)) @@ -224,7 +224,7 @@ public: me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); } - void BeginEvent(Player *pTarget) + void BeginEvent(Player* pTarget) { DoScriptText(SAY_GAMESBEGIN_2, me); @@ -247,7 +247,7 @@ public: { } - void MoveInLineOfSight(Unit *who) + void MoveInLineOfSight(Unit* who) { //We simply use this function to find players until we can use pMap->GetPlayers() @@ -269,7 +269,7 @@ public: //ShadowBoltTimer if (ShadowBoltTimer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_SHADOWBOLT); ShadowBoltTimer = urand(3000, 10000); @@ -278,7 +278,7 @@ public: //FearTimer if (FearTimer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_FEAR); FearTimer = 10000 + (rand()%10000); @@ -290,7 +290,7 @@ public: //Spawn 2 random types of creatures at the 2 locations uint32 CreatureID; Creature* Spawned = NULL; - Unit *pTarget = NULL; + Unit* pTarget = NULL; //1 in 3 chance it will be a chromatic if (urand(0, 2) == 0) diff --git a/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp b/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp index 1ad7e927309..9b43dc457a9 100644 --- a/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp +++ b/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp @@ -174,9 +174,9 @@ public: { if (pGo) { - if (Creature *trigger = pGo->SummonTrigger(pGo->GetPositionX(), pGo->GetPositionY(), pGo->GetPositionZ(), 0, 1)) + if (Creature* trigger = pGo->SummonTrigger(pGo->GetPositionX(), pGo->GetPositionY(), pGo->GetPositionZ(), 0, 1)) { - //visual effects are not working! ¬¬ + //visual effects are not working! trigger->CastSpell(trigger, 11542, true); trigger->CastSpell(trigger, 35470, true); } diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp index 858374a8399..56e28dbdcc2 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp @@ -55,7 +55,7 @@ public: struct boss_curatorAI : public ScriptedAI { - boss_curatorAI(Creature *c) : ScriptedAI(c) {} + boss_curatorAI(Creature* c) : ScriptedAI(c) {} uint32 AddTimer; uint32 HatefulBoltTimer; @@ -132,7 +132,7 @@ public: { //Summon Astral Flare Creature* AstralFlare = DoSpawnCreature(17096, float(rand()%37), float(rand()%37), 0, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); - Unit *pTarget = NULL; + Unit* pTarget = NULL; pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (AstralFlare && pTarget) @@ -184,7 +184,7 @@ public: else HatefulBoltTimer = 15000; - if (Unit *pTarget = SelectTarget(SELECT_TARGET_TOPAGGRO, 1)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_TOPAGGRO, 1)) DoCast(pTarget, SPELL_HATEFUL_BOLT); } else HatefulBoltTimer -= diff; diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp index d06e68ddf37..39c210e7395 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp @@ -51,7 +51,7 @@ public: struct boss_maiden_of_virtueAI : public ScriptedAI { - boss_maiden_of_virtueAI(Creature *c) : ScriptedAI(c) {} + boss_maiden_of_virtueAI(Creature* c) : ScriptedAI(c) {} uint32 Repentance_Timer; uint32 Holyfire_Timer; @@ -115,7 +115,7 @@ public: if (Holyfire_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_HOLYFIRE); Holyfire_Timer = urand(8000, 23000); //Anywhere from 8 to 23 seconds, good luck having several of those in a row! @@ -123,7 +123,7 @@ public: if (Holywrath_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_HOLYWRATH); Holywrath_Timer = urand(20000, 25000); //20-30 secs sounds nice diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp index 1ccb913d8ba..b380d559ae0 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp @@ -58,7 +58,7 @@ public: struct boss_attumenAI : public ScriptedAI { - boss_attumenAI(Creature *c) : ScriptedAI(c) + boss_attumenAI(Creature* c) : ScriptedAI(c) { Phase = 1; @@ -92,7 +92,7 @@ public: void JustDied(Unit* /*victim*/) { DoScriptText(SAY_DEATH, me); - if (Unit *pMidnight = Unit::GetUnit(*me, Midnight)) + if (Unit* pMidnight = Unit::GetUnit(*me, Midnight)) pMidnight->Kill(pMidnight); } @@ -119,7 +119,7 @@ public: struct boss_midnightAI : public ScriptedAI { - boss_midnightAI(Creature *c) : ScriptedAI(c) {} + boss_midnightAI(Creature* c) : ScriptedAI(c) {} uint64 Attumen; uint8 Phase; @@ -141,7 +141,7 @@ public: { if (Phase == 2) { - if (Unit *pUnit = Unit::GetUnit(*me, Attumen)) + if (Unit* pUnit = Unit::GetUnit(*me, Attumen)) DoScriptText(SAY_MIDNIGHT_KILL, pUnit); } } @@ -164,7 +164,7 @@ public: } else if (Phase == 2 && HealthBelowPct(25)) { - if (Unit *pAttumen = Unit::GetUnit(*me, Attumen)) + if (Unit* pAttumen = Unit::GetUnit(*me, Attumen)) Mount(pAttumen); } else if (Phase == 3) @@ -176,7 +176,7 @@ public: Mount_Timer = 0; me->SetVisible(false); me->GetMotionMaster()->MoveIdle(); - if (Unit *pAttumen = Unit::GetUnit(*me, Attumen)) + if (Unit* pAttumen = Unit::GetUnit(*me, Attumen)) { pAttumen->SetDisplayId(MOUNTED_DISPLAYID); pAttumen->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); @@ -195,7 +195,7 @@ public: DoMeleeAttackIfReady(); } - void Mount(Unit *pAttumen) + void Mount(Unit* pAttumen) { DoScriptText(SAY_MOUNT, pAttumen); Phase = 3; @@ -220,7 +220,7 @@ public: Mount_Timer = 1000; } - void SetMidnight(Creature *pAttumen, uint64 value) + void SetMidnight(Creature* pAttumen, uint64 value) { CAST_AI(boss_attumen::boss_attumenAI, pAttumen->AI())->Midnight = value; } @@ -235,7 +235,7 @@ void boss_attumen::boss_attumenAI::UpdateAI(const uint32 diff) if (ResetTimer <= diff) { ResetTimer = 0; - Unit *pMidnight = Unit::GetUnit(*me, Midnight); + Unit* pMidnight = Unit::GetUnit(*me, Midnight); if (pMidnight) { pMidnight->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); @@ -276,9 +276,9 @@ void boss_attumen::boss_attumenAI::UpdateAI(const uint32 diff) { if (ChargeTimer <= diff) { - 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()); @@ -297,7 +297,7 @@ void boss_attumen::boss_attumenAI::UpdateAI(const uint32 diff) { if (HealthBelowPct(25)) { - Creature *pMidnight = Unit::GetCreature(*me, Midnight); + Creature* pMidnight = Unit::GetCreature(*me, Midnight); if (pMidnight && pMidnight->GetTypeId() == TYPEID_UNIT) { CAST_AI(boss_midnight::boss_midnightAI, (pMidnight->AI()))->Mount(me); diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp index 80a86c62318..4fbf14be475 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp @@ -72,7 +72,7 @@ public: struct boss_moroesAI : public ScriptedAI { - boss_moroesAI(Creature *c) : ScriptedAI(c) + boss_moroesAI(Creature* c) : ScriptedAI(c) { for (uint8 i = 0; i < 4; ++i) { @@ -155,7 +155,7 @@ public: DeSpawnAdds(); if (isAddlistEmpty()) { - Creature *pCreature = NULL; + Creature* pCreature = NULL; std::vector<uint32> AddList; for (uint8 i = 0; i < 6; ++i) @@ -181,7 +181,7 @@ public: { for (uint8 i = 0; i < 4; ++i) { - Creature *pCreature = me->SummonCreature(AddId[i], Locations[i][0], Locations[i][1], POS_Z, Locations[i][2], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000); + Creature* pCreature = me->SummonCreature(AddId[i], Locations[i][0], Locations[i][1], POS_Z, Locations[i][2], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000); if (pCreature) { AddGUID[i] = pCreature->GetGUID(); @@ -302,7 +302,7 @@ public: { DoScriptText(RAND(SAY_SPECIAL_1, SAY_SPECIAL_2), me); - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) pTarget->CastSpell(pTarget, SPELL_GARROTE, true); InVanish = false; @@ -417,7 +417,7 @@ public: struct boss_baroness_dorothea_millstipeAI : public boss_moroes_guestAI { //Shadow Priest - boss_baroness_dorothea_millstipeAI(Creature *c) : boss_moroes_guestAI(c) {} + boss_baroness_dorothea_millstipeAI(Creature* c) : boss_moroes_guestAI(c) {} uint32 ManaBurn_Timer; uint32 MindFlay_Timer; @@ -449,7 +449,7 @@ public: if (ManaBurn_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) if (pTarget->getPowerType() == POWER_MANA) DoCast(pTarget, SPELL_MANABURN); ManaBurn_Timer = 5000; // 3 sec cast @@ -457,7 +457,7 @@ public: if (ShadowWordPain_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) { DoCast(pTarget, SPELL_SWPAIN); ShadowWordPain_Timer = 7000; @@ -481,7 +481,7 @@ public: struct boss_baron_rafe_dreugerAI : public boss_moroes_guestAI { //Retr Pally - boss_baron_rafe_dreugerAI(Creature *c) : boss_moroes_guestAI(c){} + boss_baron_rafe_dreugerAI(Creature* c) : boss_moroes_guestAI(c){} uint32 HammerOfJustice_Timer; uint32 SealOfCommand_Timer; @@ -539,7 +539,7 @@ public: struct boss_lady_catriona_von_indiAI : public boss_moroes_guestAI { //Holy Priest - boss_lady_catriona_von_indiAI(Creature *c) : boss_moroes_guestAI(c) {} + boss_lady_catriona_von_indiAI(Creature* c) : boss_moroes_guestAI(c) {} uint32 DispelMagic_Timer; uint32 GreaterHeal_Timer; @@ -573,7 +573,7 @@ public: if (GreaterHeal_Timer <= diff) { - Unit *pTarget = SelectGuestTarget(); + Unit* pTarget = SelectGuestTarget(); DoCast(pTarget, SPELL_GREATERHEAL); GreaterHeal_Timer = 17000; @@ -587,7 +587,7 @@ public: if (DispelMagic_Timer <= diff) { - if (Unit *pTarget = RAND(SelectGuestTarget(), SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))) + if (Unit* pTarget = RAND(SelectGuestTarget(), SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))) DoCast(pTarget, SPELL_DISPELMAGIC); DispelMagic_Timer = 25000; @@ -610,7 +610,7 @@ public: struct boss_lady_keira_berrybuckAI : public boss_moroes_guestAI { //Holy Pally - boss_lady_keira_berrybuckAI(Creature *c) : boss_moroes_guestAI(c) {} + boss_lady_keira_berrybuckAI(Creature* c) : boss_moroes_guestAI(c) {} uint32 Cleanse_Timer; uint32 GreaterBless_Timer; @@ -644,7 +644,7 @@ public: if (HolyLight_Timer <= diff) { - Unit *pTarget = SelectGuestTarget(); + Unit* pTarget = SelectGuestTarget(); DoCast(pTarget, SPELL_HOLYLIGHT); HolyLight_Timer = 10000; @@ -652,7 +652,7 @@ public: if (GreaterBless_Timer <= diff) { - Unit *pTarget = SelectGuestTarget(); + Unit* pTarget = SelectGuestTarget(); DoCast(pTarget, SPELL_GREATERBLESSOFMIGHT); @@ -661,7 +661,7 @@ public: if (Cleanse_Timer <= diff) { - Unit *pTarget = SelectGuestTarget(); + Unit* pTarget = SelectGuestTarget(); DoCast(pTarget, SPELL_CLEANSE); @@ -685,7 +685,7 @@ public: struct boss_lord_robin_darisAI : public boss_moroes_guestAI { //Arms Warr - boss_lord_robin_darisAI(Creature *c) : boss_moroes_guestAI(c) {} + boss_lord_robin_darisAI(Creature* c) : boss_moroes_guestAI(c) {} uint32 Hamstring_Timer; uint32 MortalStrike_Timer; @@ -742,7 +742,7 @@ public: struct boss_lord_crispin_ferenceAI : public boss_moroes_guestAI { //Arms Warr - boss_lord_crispin_ferenceAI(Creature *c) : boss_moroes_guestAI(c) {} + boss_lord_crispin_ferenceAI(Creature* c) : boss_moroes_guestAI(c) {} uint32 Disarm_Timer; uint32 HeroicStrike_Timer; diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp index 1e17b720220..efc4a2d3442 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp @@ -63,7 +63,7 @@ class boss_netherspite : public CreatureScript public: boss_netherspite() : CreatureScript("boss_netherspite") { } - CreatureAI* GetAI(Creature *pCreature) const + CreatureAI* GetAI(Creature* pCreature) const { return new boss_netherspiteAI(pCreature); } @@ -141,7 +141,7 @@ public: pos[BLUE_PORTAL] = (r>1 ? 1: 2); // Blue Portal not on the left side (0) for (int i=0; i<3; ++i) - if (Creature *portal = me->SummonCreature(PortalID[i], PortalCoord[pos[i]][0], PortalCoord[pos[i]][1], PortalCoord[pos[i]][2], 0, TEMPSUMMON_TIMED_DESPAWN, 60000)) + if (Creature* portal = me->SummonCreature(PortalID[i], PortalCoord[pos[i]][0], PortalCoord[pos[i]][1], PortalCoord[pos[i]][2], 0, TEMPSUMMON_TIMED_DESPAWN, 60000)) { PortalGUID[i] = portal->GetGUID(); portal->AddAura(PortalVisual[i], portal); @@ -152,9 +152,9 @@ public: { for (int i=0; i<3; ++i) { - if (Creature *portal = Unit::GetCreature(*me, PortalGUID[i])) + if (Creature* portal = Unit::GetCreature(*me, PortalGUID[i])) portal->DisappearAndDie(); - if (Creature *portal = Unit::GetCreature(*me, BeamerGUID[i])) + if (Creature* portal = Unit::GetCreature(*me, BeamerGUID[i])) portal->DisappearAndDie(); PortalGUID[i] = 0; BeamTarget[i] = 0; @@ -164,12 +164,12 @@ public: void UpdatePortals() // Here we handle the beams' behavior { for (int j=0; j<3; ++j) // j = color - if (Creature *portal = Unit::GetCreature(*me, PortalGUID[j])) + if (Creature* portal = Unit::GetCreature(*me, PortalGUID[j])) { // the one who's been casted upon before - Unit *current = Unit::GetUnit(*portal, BeamTarget[j]); + Unit* current = Unit::GetUnit(*portal, BeamTarget[j]); // temporary store for the best suitable beam reciever - Unit *pTarget = me; + Unit* pTarget = me; if (Map* map = me->GetMap()) { @@ -199,14 +199,14 @@ public: { BeamTarget[j] = pTarget->GetGUID(); // remove currently beaming portal - if (Creature *beamer = Unit::GetCreature(*portal, BeamerGUID[j])) + if (Creature* beamer = Unit::GetCreature(*portal, BeamerGUID[j])) { beamer->CastSpell(pTarget, PortalBeam[j], false); beamer->DisappearAndDie(); BeamerGUID[j] = 0; } // create new one and start beaming on the target - if (Creature *beamer = portal->SummonCreature(PortalID[j], portal->GetPositionX(), portal->GetPositionY(), portal->GetPositionZ(), portal->GetOrientation(), TEMPSUMMON_TIMED_DESPAWN, 60000)) + if (Creature* beamer = portal->SummonCreature(PortalID[j], portal->GetPositionX(), portal->GetPositionY(), portal->GetPositionZ(), portal->GetOrientation(), TEMPSUMMON_TIMED_DESPAWN, 60000)) { beamer->CastSpell(pTarget, PortalBeam[j], false); BeamerGUID[j] = beamer->GetGUID(); @@ -247,7 +247,7 @@ public: void HandleDoors(bool open) // Massive Door switcher { - if (GameObject *Door = GameObject::GetGameObject(*me, pInstance ? pInstance->GetData64(DATA_GO_MASSIVE_DOOR) : 0)) + if (GameObject* Door = GameObject::GetGameObject(*me, pInstance ? pInstance->GetData64(DATA_GO_MASSIVE_DOOR) : 0)) Door->SetGoState(open ? GO_STATE_ACTIVE : GO_STATE_READY); } @@ -314,7 +314,7 @@ public: // Netherbreath if (NetherbreathTimer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 40, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 40, true)) DoCast(pTarget, SPELL_NETHERBREATH); NetherbreathTimer = urand(5000, 7000); } else NetherbreathTimer -= diff; diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp index 6beaf3a906b..3e4d92f0e97 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp @@ -177,7 +177,7 @@ public: HandleTerraceDoors(true); } - void MoveInLineOfSight(Unit *who) + void MoveInLineOfSight(Unit* who) { if (!Intro && !Flying) ScriptedAI::MoveInLineOfSight(who); @@ -229,7 +229,7 @@ public: } } - void JustSummoned(Creature *summoned) + void JustSummoned(Creature* summoned) { summoned->AI()->AttackStart(me->getVictim()); } @@ -321,14 +321,14 @@ public: if (CharredEarthTimer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_CHARRED_EARTH); CharredEarthTimer = 20000; } else CharredEarthTimer -= diff; if (TailSweepTimer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) if (!me->HasInArc(M_PI, pTarget)) DoCast(pTarget, SPELL_TAIL_SWEEP); TailSweepTimer = 15000; @@ -336,7 +336,7 @@ public: if (SearingCindersTimer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_SEARING_CINDERS); SearingCindersTimer = 10000; } else SearingCindersTimer -= diff; @@ -378,7 +378,7 @@ public: if (DistractingAshTimer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_DISTRACTING_ASH); DistractingAshTimer = 2000; //timer wrong } else DistractingAshTimer -= diff; @@ -395,7 +395,7 @@ public: if (FireballBarrageTimer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_FARTHEST, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_FARTHEST, 0)) DoCast(pTarget, SPELL_FIREBALL_BARRAGE); FireballBarrageTimer = 20000; } else FireballBarrageTimer -= diff; diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp index f0c38af0ab6..788c9fb171a 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp @@ -108,7 +108,7 @@ public: struct netherspite_infernalAI : public ScriptedAI { - netherspite_infernalAI(Creature *c) : ScriptedAI(c) , + netherspite_infernalAI(Creature* c) : ScriptedAI(c) , HellfireTimer(0), CleanupTimer(0), malchezaar(0), point(NULL) {} uint32 HellfireTimer; @@ -142,9 +142,9 @@ public: } } - void KilledUnit(Unit *who) + void KilledUnit(Unit* who) { - Unit *pMalchezaar = Unit::GetUnit(*me, malchezaar); + Unit* pMalchezaar = Unit::GetUnit(*me, malchezaar); if (pMalchezaar) CAST_CRE(pMalchezaar)->AI()->KilledUnit(who); } @@ -160,7 +160,7 @@ public: } } - void DamageTaken(Unit *done_by, uint32 &damage) + void DamageTaken(Unit* done_by, uint32 &damage) { if (done_by->GetGUID() != malchezaar) damage = 0; @@ -183,7 +183,7 @@ public: struct boss_malchezaarAI : public ScriptedAI { - boss_malchezaarAI(Creature *c) : ScriptedAI(c) + boss_malchezaarAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -271,7 +271,7 @@ public: { //Infernal Cleanup for (std::vector<uint64>::const_iterator itr = infernals.begin(); itr != infernals.end(); ++itr) - if (Unit *pInfernal = Unit::GetUnit(*me, *itr)) + if (Unit* pInfernal = Unit::GetUnit(*me, *itr)) if (pInfernal->isAlive()) { pInfernal->SetVisible(false); @@ -285,7 +285,7 @@ public: { for (uint8 i = 0; i < 2; ++i) { - Unit *axe = Unit::GetUnit(*me, axes[i]); + Unit* axe = Unit::GetUnit(*me, axes[i]); if (axe && axe->isAlive()) axe->Kill(axe); axes[i] = 0; @@ -310,7 +310,7 @@ public: return; std::list<HostileReference *> t_list = me->getThreatManager().getThreatList(); - std::vector<Unit *> targets; + std::vector<Unit* > targets; if (!t_list.size()) return; @@ -319,7 +319,7 @@ public: std::list<HostileReference *>::const_iterator itr = t_list.begin(); std::advance(itr, 1); for (; itr != t_list.end(); ++itr) //store the threat list in a different container - if (Unit *pTarget = Unit::GetUnit(*me, (*itr)->getUnitGuid())) + if (Unit* pTarget = Unit::GetUnit(*me, (*itr)->getUnitGuid())) if (pTarget->isAlive() && pTarget->GetTypeId() == TYPEID_PLAYER) targets.push_back(pTarget); @@ -328,8 +328,8 @@ public: targets.erase(targets.begin()+rand()%targets.size()); uint32 i = 0; - for (std::vector<Unit *>::const_iterator iter = targets.begin(); iter != targets.end(); ++iter, ++i) - if (Unit *pTarget = *iter) + for (std::vector<Unit* >::const_iterator iter = targets.begin(); iter != targets.end(); ++iter, ++i) + if (Unit* pTarget = *iter) { enfeeble_targets[i] = pTarget->GetGUID(); enfeeble_health[i] = pTarget->GetHealth(); @@ -343,7 +343,7 @@ public: { for (uint8 i = 0; i < 5; ++i) { - Unit *pTarget = Unit::GetUnit(*me, enfeeble_targets[i]); + Unit* pTarget = Unit::GetUnit(*me, enfeeble_targets[i]); if (pTarget && pTarget->isAlive()) pTarget->SetHealth(enfeeble_health[i]); enfeeble_targets[i] = 0; @@ -365,7 +365,7 @@ public: pos.Relocate(point->x, point->y, INFERNAL_Z); } - Creature *Infernal = me->SummonCreature(NETHERSPITE_INFERNAL, pos, TEMPSUMMON_TIMED_DESPAWN, 180000); + Creature* Infernal = me->SummonCreature(NETHERSPITE_INFERNAL, pos, TEMPSUMMON_TIMED_DESPAWN, 180000); if (Infernal) { @@ -449,10 +449,10 @@ public: DoScriptText(SAY_AXE_TOSS2, me); - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); + Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); for (uint8 i = 0; i < 2; ++i) { - Creature *axe = me->SummonCreature(MALCHEZARS_AXE, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 1000); + Creature* axe = me->SummonCreature(MALCHEZARS_AXE, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 1000); if (axe) { axe->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); @@ -494,11 +494,11 @@ public: { AxesTargetSwitchTimer = urand(7500, 20000); - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) { for (uint8 i = 0; i < 2; ++i) { - if (Unit *axe = Unit::GetUnit(*me, axes[i])) + if (Unit* axe = Unit::GetUnit(*me, axes[i])) { if (axe->getVictim()) DoModifyThreatPercent(axe->getVictim(), -100); @@ -513,7 +513,7 @@ public: if (AmplifyDamageTimer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_AMPLIFY_DAMAGE); AmplifyDamageTimer = urand(20000, 30000); } else AmplifyDamageTimer -= diff; @@ -536,7 +536,7 @@ public: { if (SWPainTimer <= diff) { - Unit *pTarget = NULL; + Unit* pTarget = NULL; if (phase == 1) pTarget = me->getVictim(); // the tank else // anyone but the tank @@ -585,7 +585,7 @@ public: } } - void Cleanup(Creature *infernal, InfernalPoint *point) + void Cleanup(Creature* infernal, InfernalPoint *point) { for (std::vector<uint64>::iterator itr = infernals.begin(); itr!= infernals.end(); ++itr) if (*itr == infernal->GetGUID()) @@ -602,7 +602,7 @@ public: void netherspite_infernal::netherspite_infernalAI::Cleanup() { - Unit *pMalchezaar = Unit::GetUnit(*me, malchezaar); + Unit* pMalchezaar = Unit::GetUnit(*me, malchezaar); if (pMalchezaar && pMalchezaar->isAlive()) CAST_AI(boss_malchezaar::boss_malchezaarAI, CAST_CRE(pMalchezaar)->AI())->Cleanup(me, point); diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp index d30494333a2..537af931b08 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp @@ -93,7 +93,7 @@ public: struct boss_aranAI : public ScriptedAI { - boss_aranAI(Creature *c) : ScriptedAI(c) + boss_aranAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -195,7 +195,7 @@ public: //store the threat list in a different container for (std::list<HostileReference *>::const_iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) { - Unit *pTarget = Unit::GetUnit(*me, (*itr)->getUnitGuid()); + Unit* pTarget = Unit::GetUnit(*me, (*itr)->getUnitGuid()); //only on alive players if (pTarget && pTarget->isAlive() && pTarget->GetTypeId() == TYPEID_PLAYER) targets.push_back(pTarget); @@ -309,7 +309,7 @@ public: { if (!me->IsNonMeleeSpellCasted(false)) { - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); + Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); if (!pTarget) return; @@ -523,7 +523,7 @@ public: struct water_elementalAI : public ScriptedAI { - water_elementalAI(Creature *c) : ScriptedAI(c) {} + water_elementalAI(Creature* c) : ScriptedAI(c) {} uint32 CastTimer; diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp index e11f85c02ca..93eaf7098c2 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp @@ -68,7 +68,7 @@ public: struct mob_kilrekAI : public ScriptedAI { - mob_kilrekAI(Creature *c) : ScriptedAI(c) + mob_kilrekAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -140,7 +140,7 @@ public: struct mob_demon_chainAI : public ScriptedAI { - mob_demon_chainAI(Creature *c) : ScriptedAI(c) {} + mob_demon_chainAI(Creature* c) : ScriptedAI(c) {} uint64 SacrificeGUID; @@ -178,7 +178,7 @@ public: struct mob_fiendish_portalAI : public PassiveAI { - mob_fiendish_portalAI(Creature *c) : PassiveAI(c), summons(me){} + mob_fiendish_portalAI(Creature* c) : PassiveAI(c), summons(me){} SummonList summons; @@ -215,7 +215,7 @@ public: struct mob_fiendish_impAI : public ScriptedAI { - mob_fiendish_impAI(Creature *c) : ScriptedAI(c) {} + mob_fiendish_impAI(Creature* c) : ScriptedAI(c) {} uint32 FireboltTimer; @@ -258,7 +258,7 @@ public: struct boss_terestianAI : public ScriptedAI { - boss_terestianAI(Creature *c) : ScriptedAI(c) + boss_terestianAI(Creature* c) : ScriptedAI(c) { for (uint8 i = 0; i < 2; ++i) PortalGUID[i] = 0; @@ -370,7 +370,7 @@ public: if (SacrificeTimer <= diff) { - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true); + Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true); if (pTarget && pTarget->isAlive()) { DoCast(pTarget, SPELL_SACRIFICE, true); diff --git a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp index ddb5970d155..5feb1ff924e 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp @@ -388,7 +388,7 @@ public: if (BrainWipeTimer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_BRAIN_WIPE); BrainWipeTimer = 20000; } else BrainWipeTimer -= diff; @@ -869,7 +869,7 @@ public: { if (!IsChasing) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) { DoScriptText(SAY_WOLF_HOOD, me); DoCast(pTarget, SPELL_LITTLE_RED_RIDING_HOOD, true); @@ -886,7 +886,7 @@ public: { IsChasing = false; - if (Unit *pTarget = Unit::GetUnit((*me), HoodGUID)) + if (Unit* pTarget = Unit::GetUnit((*me), HoodGUID)) { HoodGUID = 0; if (DoGetThreat(pTarget)) @@ -977,7 +977,7 @@ void PretendToDie(Creature* pCreature) pCreature->SetStandState(UNIT_STAND_STATE_DEAD); }; -void Resurrect(Creature *pTarget) +void Resurrect(Creature* pTarget) { pTarget->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); pTarget->SetFullHealth(); @@ -1289,7 +1289,7 @@ public: if (BackwardLungeTimer <= diff) { - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true); + Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true); if (pTarget && !me->HasInArc(M_PI, pTarget)) { DoCast(pTarget, SPELL_BACKWARD_LUNGE); @@ -1305,7 +1305,7 @@ public: if (DeadlySwatheTimer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_DEADLY_SWATHE); DeadlySwatheTimer = urand(15000, 25000); } else DeadlySwatheTimer -= diff; @@ -1410,7 +1410,7 @@ void boss_julianne::boss_julianneAI::UpdateAI(const uint32 diff) if (BlindingPassionTimer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_BLINDING_PASSION); BlindingPassionTimer = urand(30000, 45000); } else BlindingPassionTimer -= diff; diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp index 253878eefe7..8b9bc02e364 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp @@ -173,7 +173,7 @@ public: //Close the encounter door, open it in JustDied/Reset } - void MoveInLineOfSight(Unit *who) + void MoveInLineOfSight(Unit* who) { if (!HasTaunted && me->IsWithinDistInMap(who, 40.0f)) { @@ -302,7 +302,7 @@ public: if (PhoenixTimer <= diff) { - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1); + Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1); uint8 random = urand(1, 2); float x = KaelLocations[random][0]; @@ -323,7 +323,7 @@ public: if (FlameStrikeTimer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) { me->InterruptSpell(CURRENT_CHANNELED_SPELL); me->InterruptSpell(CURRENT_GENERIC_SPELL); @@ -395,7 +395,7 @@ public: for (uint8 i = 0; i < 3; ++i) { - Unit *pTarget = NULL; + Unit* pTarget = NULL; pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); Creature* Orb = DoSpawnCreature(CREATURE_ARCANE_SPHERE, 5, 5, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 30000); @@ -441,7 +441,7 @@ public: struct mob_felkael_flamestrikeAI : public ScriptedAI { - mob_felkael_flamestrikeAI(Creature *c) : ScriptedAI(c) + mob_felkael_flamestrikeAI(Creature* c) : ScriptedAI(c) { } @@ -603,7 +603,7 @@ public: struct mob_felkael_phoenix_eggAI : public ScriptedAI { - mob_felkael_phoenix_eggAI(Creature *c) : ScriptedAI(c) {} + mob_felkael_phoenix_eggAI(Creature* c) : ScriptedAI(c) {} uint32 HatchTimer; @@ -640,7 +640,7 @@ public: struct mob_arcane_sphereAI : public ScriptedAI { - mob_arcane_sphereAI(Creature *c) : ScriptedAI(c) { Reset(); } + mob_arcane_sphereAI(Creature* c) : ScriptedAI(c) { Reset(); } uint32 DespawnTimer; uint32 ChangeTargetTimer; @@ -671,7 +671,7 @@ public: if (ChangeTargetTimer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) { me->AddThreat(pTarget, 1.0f); me->TauntApply(pTarget); diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp index cc17f4b15af..1e2177cab74 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp @@ -256,7 +256,7 @@ public: if (HealTimer <= diff) { uint32 health = me->GetHealth(); - Unit *pTarget = me; + Unit* pTarget = me; for (uint8 i = 0; i < MAX_ACTIVE_LACKEY; ++i) { if (Unit* pAdd = Unit::GetUnit(*me, m_auiLackeyGUID[i])) @@ -272,7 +272,7 @@ public: if (RenewTimer <= diff) { - Unit *pTarget = me; + Unit* pTarget = me; if (urand(0, 1)) if (Unit* pAdd = Unit::GetUnit(*me, m_auiLackeyGUID[rand()%MAX_ACTIVE_LACKEY])) @@ -285,7 +285,7 @@ public: if (ShieldTimer <= diff) { - Unit *pTarget = me; + Unit* pTarget = me; if (urand(0, 1)) if (Unit* pAdd = Unit::GetUnit(*me, m_auiLackeyGUID[rand()%MAX_ACTIVE_LACKEY])) @@ -298,7 +298,7 @@ public: if (DispelTimer <= diff) { - Unit *pTarget = NULL; + Unit* pTarget = NULL; if (urand(0, 1)) pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); @@ -494,7 +494,7 @@ public: struct boss_kagani_nightstrikeAI : public boss_priestess_lackey_commonAI { //Rogue - boss_kagani_nightstrikeAI(Creature *c) : boss_priestess_lackey_commonAI(c) {} + boss_kagani_nightstrikeAI(Creature* c) : boss_priestess_lackey_commonAI(c) {} uint32 Gouge_Timer; uint32 Kick_Timer; @@ -599,7 +599,7 @@ public: struct boss_ellris_duskhallowAI : public boss_priestess_lackey_commonAI { //Warlock - boss_ellris_duskhallowAI(Creature *c) : boss_priestess_lackey_commonAI(c) {} + boss_ellris_duskhallowAI(Creature* c) : boss_priestess_lackey_commonAI(c) {} uint32 Immolate_Timer; uint32 Shadow_Bolt_Timer; @@ -691,7 +691,7 @@ public: struct boss_eramas_brightblazeAI : public boss_priestess_lackey_commonAI { //Monk - boss_eramas_brightblazeAI(Creature *c) : boss_priestess_lackey_commonAI(c) {} + boss_eramas_brightblazeAI(Creature* c) : boss_priestess_lackey_commonAI(c) {} uint32 Knockdown_Timer; uint32 Snap_Kick_Timer; @@ -753,7 +753,7 @@ public: struct boss_yazzaiAI : public boss_priestess_lackey_commonAI { //Mage - boss_yazzaiAI(Creature *c) : boss_priestess_lackey_commonAI(c) {} + boss_yazzaiAI(Creature* c) : boss_priestess_lackey_commonAI(c) {} bool HasIceBlocked; @@ -791,7 +791,7 @@ public: if (Polymorph_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) { DoCast(pTarget, SPELL_POLYMORPH); Polymorph_Timer = 20000; @@ -836,7 +836,7 @@ public: std::list<HostileReference*>& t_list = me->getThreatManager().getThreatList(); for (std::list<HostileReference*>::const_iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) { - if (Unit *pTarget = Unit::GetUnit(*me, (*itr)->getUnitGuid())) + if (Unit* pTarget = Unit::GetUnit(*me, (*itr)->getUnitGuid())) { //if in melee range if (pTarget->IsWithinDistInMap(me, 5)) @@ -884,7 +884,7 @@ public: struct boss_warlord_salarisAI : public boss_priestess_lackey_commonAI { //Warrior - boss_warlord_salarisAI(Creature *c) : boss_priestess_lackey_commonAI(c) {} + boss_warlord_salarisAI(Creature* c) : boss_priestess_lackey_commonAI(c) {} uint32 Intercept_Stun_Timer; uint32 Disarm_Timer; @@ -923,7 +923,7 @@ public: std::list<HostileReference*>& t_list = me->getThreatManager().getThreatList(); for (std::list<HostileReference*>::const_iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) { - if (Unit *pTarget = Unit::GetUnit(*me, (*itr)->getUnitGuid())) + if (Unit* pTarget = Unit::GetUnit(*me, (*itr)->getUnitGuid())) { //if in melee range if (pTarget->IsWithinDistInMap(me, ATTACK_DISTANCE)) @@ -1005,7 +1005,7 @@ public: struct boss_garaxxasAI : public boss_priestess_lackey_commonAI { //Hunter - boss_garaxxasAI(Creature *c) : boss_priestess_lackey_commonAI(c) { m_uiPetGUID = 0; } + boss_garaxxasAI(Creature* c) : boss_priestess_lackey_commonAI(c) { m_uiPetGUID = 0; } uint64 m_uiPetGUID; @@ -1125,7 +1125,7 @@ public: struct boss_apokoAI : public boss_priestess_lackey_commonAI { //Shaman - boss_apokoAI(Creature *c) : boss_priestess_lackey_commonAI(c) {} + boss_apokoAI(Creature* c) : boss_priestess_lackey_commonAI(c) {} uint32 Totem_Timer; uint8 Totem_Amount; @@ -1224,7 +1224,7 @@ public: struct boss_zelfanAI : public boss_priestess_lackey_commonAI { //Engineer - boss_zelfanAI(Creature *c) : boss_priestess_lackey_commonAI(c) {} + boss_zelfanAI(Creature* c) : boss_priestess_lackey_commonAI(c) {} uint32 Goblin_Dragon_Gun_Timer; uint32 Rocket_Launch_Timer; diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp index 384b4f6e664..025c121a178 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp @@ -333,7 +333,7 @@ public: struct mob_fel_crystalAI : public ScriptedAI { - mob_fel_crystalAI(Creature *c) : ScriptedAI(c) {} + mob_fel_crystalAI(Creature* c) : ScriptedAI(c) {} void Reset() {} void EnterCombat(Unit* /*who*/) {} diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp index 0bf0b8f0129..ad3b6896968 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp @@ -71,7 +71,7 @@ public: struct boss_vexallusAI : public ScriptedAI { - boss_vexallusAI(Creature *c) : ScriptedAI(c) + boss_vexallusAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -115,9 +115,9 @@ public: pInstance->SetData(DATA_VEXALLUS_EVENT, IN_PROGRESS); } - void JustSummoned(Creature *summoned) + void JustSummoned(Creature* summoned) { - if (Unit *temp = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* temp = SelectTarget(SELECT_TARGET_RANDOM, 0)) summoned->GetMotionMaster()->MoveFollow(temp, 0, 0); //spells are SUMMON_TYPE_GUARDIAN, so using setOwner should be ok @@ -163,7 +163,7 @@ public: if (ChainLightningTimer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_CHAIN_LIGHTNING); ChainLightningTimer = 8000; @@ -171,7 +171,7 @@ public: if (ArcaneShockTimer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) if (pTarget) DoCast(pTarget, SPELL_ARCANE_SHOCK); @@ -206,13 +206,13 @@ public: struct mob_pure_energyAI : public ScriptedAI { - mob_pure_energyAI(Creature *c) : ScriptedAI(c) {} + mob_pure_energyAI(Creature* c) : ScriptedAI(c) {} void Reset() {} void JustDied(Unit* slayer) { - if (Unit *temp = me->GetOwner()) + if (Unit* temp = me->GetOwner()) { if (temp && temp->isAlive()) slayer->CastSpell(slayer, SPELL_ENERGY_FEEDBACK, true, 0, 0, temp->GetGUID()); diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_baron_geddon.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_baron_geddon.cpp index 19ce6288c78..6c3e7f7d4f6 100644 --- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_baron_geddon.cpp +++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_baron_geddon.cpp @@ -52,7 +52,7 @@ class boss_baron_geddon : public CreatureScript struct boss_baron_geddonAI : public BossAI { - boss_baron_geddonAI(Creature *pCreature) : BossAI(pCreature, BOSS_BARON_GEDDON) + boss_baron_geddonAI(Creature* pCreature) : BossAI(pCreature, BOSS_BARON_GEDDON) { } diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_magmadar.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_magmadar.cpp index 6f17c9e8079..384599041da 100644 --- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_magmadar.cpp +++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_magmadar.cpp @@ -55,7 +55,7 @@ class boss_magmadar : public CreatureScript struct boss_magmadarAI : public BossAI { - boss_magmadarAI(Creature *pCreature) : BossAI(pCreature, BOSS_MAGMADAR) + boss_magmadarAI(Creature* pCreature) : BossAI(pCreature, BOSS_MAGMADAR) { } diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_majordomo_executus.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_majordomo_executus.cpp index ad2f02ca77b..c7c80015f63 100644 --- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_majordomo_executus.cpp +++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_majordomo_executus.cpp @@ -76,7 +76,7 @@ class boss_majordomo : public CreatureScript struct boss_majordomoAI : public BossAI { - boss_majordomoAI(Creature *pCreature) : BossAI(pCreature, BOSS_MAJORDOMO_EXECUTUS) + boss_majordomoAI(Creature* pCreature) : BossAI(pCreature, BOSS_MAJORDOMO_EXECUTUS) { } diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_ragnaros.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_ragnaros.cpp index a1f6e47c755..9180edde7a0 100644 --- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_ragnaros.cpp +++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_ragnaros.cpp @@ -79,7 +79,7 @@ class boss_ragnaros : public CreatureScript struct boss_ragnarosAI : public BossAI { - boss_ragnarosAI(Creature *pCreature) : BossAI(pCreature, BOSS_RAGNAROS) + boss_ragnarosAI(Creature* pCreature) : BossAI(pCreature, BOSS_RAGNAROS) { _introState = 0; me->SetReactState(REACT_PASSIVE); @@ -316,7 +316,7 @@ class mob_son_of_flame : public CreatureScript struct mob_son_of_flameAI : public ScriptedAI //didnt work correctly in EAI for me... { - mob_son_of_flameAI(Creature *c) : ScriptedAI(c) + mob_son_of_flameAI(Creature* c) : ScriptedAI(c) { instance = me->GetInstanceScript(); } diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp index 4ef1ad7ee2e..bc25fe7a753 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp @@ -102,7 +102,7 @@ public: struct npc_unworthy_initiateAI : public ScriptedAI { - npc_unworthy_initiateAI(Creature *c) : ScriptedAI(c) + npc_unworthy_initiateAI(Creature* c) : ScriptedAI(c) { me->SetReactState(REACT_PASSIVE); if (!me->GetEquipmentId()) @@ -155,7 +155,7 @@ public: } } - void EventStart(Creature* anchor, Player *pTarget) + void EventStart(Creature* anchor, Player* pTarget) { wait_timer = 5000; phase = PHASE_TO_EQUIP; @@ -178,7 +178,7 @@ public: case PHASE_CHAINED: if (!anchorGUID) { - if (Creature *anchor = me->FindNearestCreature(29521, 30)) + if (Creature* anchor = me->FindNearestCreature(29521, 30)) { anchor->AI()->SetGUID(me->GetGUID()); anchor->CastSpell(me, SPELL_SOUL_PRISON_CHAIN, true); @@ -188,7 +188,7 @@ public: sLog->outError("npc_unworthy_initiateAI: unable to find anchor!"); float dist = 99.0f; - GameObject *prison = NULL; + GameObject* prison = NULL; for (uint8 i = 0; i < 12; ++i) { @@ -233,7 +233,7 @@ public: me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); phase = PHASE_ATTACKING; - if (Player *pTarget = Unit::GetPlayer(*me, playerGUID)) + if (Player* pTarget = Unit::GetPlayer(*me, playerGUID)) me->AI()->AttackStart(pTarget); wait_timer = 0; } @@ -293,7 +293,7 @@ public: struct npc_unworthy_initiate_anchorAI : public PassiveAI { - npc_unworthy_initiate_anchorAI(Creature *c) : PassiveAI(c), prisonerGUID(0) {} + npc_unworthy_initiate_anchorAI(Creature* c) : PassiveAI(c), prisonerGUID(0) {} uint64 prisonerGUID; @@ -315,7 +315,7 @@ public: bool OnGossipHello(Player* pPlayer, GameObject* pGo) { - if (Creature *anchor = pGo->FindNearestCreature(29521, 15)) + if (Creature* anchor = pGo->FindNearestCreature(29521, 15)) if (uint64 prisonerGUID = anchor->AI()->GetGUID()) if (Creature* prisoner = Creature::GetCreature(*pPlayer, prisonerGUID)) CAST_AI(npc_unworthy_initiate::npc_unworthy_initiateAI, prisoner->AI())->EventStart(anchor, pPlayer); @@ -531,7 +531,7 @@ public: struct npc_dark_rider_of_acherusAI : public ScriptedAI { - npc_dark_rider_of_acherusAI(Creature *c) : ScriptedAI(c) {} + npc_dark_rider_of_acherusAI(Creature* c) : ScriptedAI(c) {} uint32 PhaseTimer; uint32 Phase; @@ -561,7 +561,7 @@ public: Phase = 1; break; case 1: - if (Unit *pTarget = Unit::GetUnit(*me, TargetGUID)) + if (Unit* pTarget = Unit::GetUnit(*me, TargetGUID)) DoCast(pTarget, DESPAWN_HORSE, true); PhaseTimer = 3000; Phase = 2; @@ -581,7 +581,7 @@ public: } - void InitDespawnHorse(Unit *who) + void InitDespawnHorse(Unit* who) { if (!who) return; @@ -623,15 +623,15 @@ public: struct npc_salanar_the_horsemanAI : public ScriptedAI { - npc_salanar_the_horsemanAI(Creature *c) : ScriptedAI(c) {} + npc_salanar_the_horsemanAI(Creature* c) : ScriptedAI(c) {} - void SpellHit(Unit *caster, const SpellEntry *spell) + void SpellHit(Unit* caster, const SpellEntry *spell) { if (spell->Id == DELIVER_STOLEN_HORSE) { if (caster->GetTypeId() == TYPEID_UNIT && caster->IsVehicle()) { - if (Unit *charmer = caster->GetCharmer()) + if (Unit* charmer = caster->GetCharmer()) { if (charmer->HasAura(EFFECT_STOLEN_HORSE)) { @@ -647,13 +647,13 @@ public: } } - void MoveInLineOfSight(Unit *who) + void MoveInLineOfSight(Unit* who) { ScriptedAI::MoveInLineOfSight(who); if (who->GetTypeId() == TYPEID_UNIT && who->IsVehicle() && me->IsWithinDistInMap(who, 5.0f)) { - if (Unit *charmer = who->GetCharmer()) + if (Unit* charmer = who->GetCharmer()) { if (charmer->GetTypeId() == TYPEID_PLAYER) { @@ -692,7 +692,7 @@ public: struct npc_ros_dark_riderAI : public ScriptedAI { - npc_ros_dark_riderAI(Creature *c) : ScriptedAI(c) {} + npc_ros_dark_riderAI(Creature* c) : ScriptedAI(c) {} void EnterCombat(Unit* /*who*/) { @@ -743,15 +743,15 @@ public: struct npc_dkc1_gothikAI : public ScriptedAI { - npc_dkc1_gothikAI(Creature *c) : ScriptedAI(c) {} + npc_dkc1_gothikAI(Creature* c) : ScriptedAI(c) {} - void MoveInLineOfSight(Unit *who) + void MoveInLineOfSight(Unit* who) { ScriptedAI::MoveInLineOfSight(who); if (who->GetEntry() == GHOULS && me->IsWithinDistInMap(who, 10.0f)) { - if (Unit *owner = who->GetOwner()) + if (Unit* owner = who->GetOwner()) { if (owner->GetTypeId() == TYPEID_PLAYER) { @@ -785,7 +785,7 @@ public: struct npc_scarlet_ghoulAI : public ScriptedAI { - npc_scarlet_ghoulAI(Creature *c) : ScriptedAI(c) + npc_scarlet_ghoulAI(Creature* c) : ScriptedAI(c) { // Ghouls should display their Birth Animation // Crawling out of the ground @@ -794,7 +794,7 @@ public: me->SetReactState(REACT_DEFENSIVE); } - void FindMinions(Unit *owner) + void FindMinions(Unit* owner) { std::list<Creature*> MinionList; owner->GetAllMinionsByEntry(MinionList, GHOULS); @@ -818,7 +818,7 @@ public: { if (!me->isInCombat()) { - if (Unit *owner = me->GetOwner()) + if (Unit* owner = me->GetOwner()) { if (owner->GetTypeId() == TYPEID_PLAYER && CAST_PLR(owner)->isInCombat()) { @@ -868,14 +868,14 @@ class npc_scarlet_miner_cart : public CreatureScript public: npc_scarlet_miner_cart() : CreatureScript("npc_scarlet_miner_cart") { } - CreatureAI* GetAI(Creature *_Creature) const + CreatureAI* GetAI(Creature* _Creature) const { return new npc_scarlet_miner_cartAI(_Creature); } struct npc_scarlet_miner_cartAI : public PassiveAI { - npc_scarlet_miner_cartAI(Creature *c) : PassiveAI(c), minerGUID(0) + npc_scarlet_miner_cartAI(Creature* c) : PassiveAI(c), minerGUID(0) { me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); me->SetDisplayId(me->GetCreatureInfo()->Modelid1); // Modelid2 is a horse. @@ -890,7 +890,7 @@ public: void DoAction(const int32 /*param*/) { - if (Creature *miner = Unit::GetCreature(*me, minerGUID)) + if (Creature* miner = Unit::GetCreature(*me, minerGUID)) { me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); @@ -905,7 +905,7 @@ public: void PassengerBoarded(Unit* /*who*/, int8 /*seatId*/, bool apply) { if (!apply) - if (Creature *miner = Unit::GetCreature(*me, minerGUID)) + if (Creature* miner = Unit::GetCreature(*me, minerGUID)) miner->DisappearAndDie(); } }; @@ -924,14 +924,14 @@ class npc_scarlet_miner : public CreatureScript public: npc_scarlet_miner() : CreatureScript("npc_scarlet_miner") { } - CreatureAI* GetAI(Creature *_Creature) const + CreatureAI* GetAI(Creature* _Creature) const { return new npc_scarlet_minerAI(_Creature); } struct npc_scarlet_minerAI : public npc_escortAI { - npc_scarlet_minerAI(Creature *c) : npc_escortAI(c) + npc_scarlet_minerAI(Creature* c) : npc_escortAI(c) { me->SetReactState(REACT_PASSIVE); } @@ -980,7 +980,7 @@ public: } } - void InitCartQuest(Player *who) + void InitCartQuest(Player* who) { carGUID = who->GetVehicleBase()->GetGUID(); InitWaypoint(); @@ -993,7 +993,7 @@ public: switch (i) { case 1: - if (Unit *car = Unit::GetCreature(*me, carGUID)) + if (Unit* car = Unit::GetCreature(*me, carGUID)) { me->SetInFront(car); me->SendMovementFlagUpdate(); @@ -1004,7 +1004,7 @@ public: IntroPhase = 1; break; case 17: - if (Unit *car = Unit::GetCreature(*me, carGUID)) + if (Unit* car = Unit::GetCreature(*me, carGUID)) { me->SetInFront(car); me->SendMovementFlagUpdate(); @@ -1027,14 +1027,14 @@ public: { if (IntroPhase == 1) { - if (Creature *car = Unit::GetCreature(*me, carGUID)) + if (Creature* car = Unit::GetCreature(*me, carGUID)) DoCast(car, SPELL_CART_DRAG); IntroTimer = 800; IntroPhase = 2; } else { - if (Creature *car = Unit::GetCreature(*me, carGUID)) + if (Creature* car = Unit::GetCreature(*me, carGUID)) car->AI()->DoAction(0); IntroPhase = 0; } @@ -1062,10 +1062,10 @@ public: if (pPlayer->GetQuestStatus(12701) == QUEST_STATUS_INCOMPLETE) { // Hack Why Trinity Dont Support Custom Summon Location - if (Creature *miner = pPlayer->SummonCreature(28841, 2383.869629f, -5900.312500f, 107.996086f, pPlayer->GetOrientation(), TEMPSUMMON_DEAD_DESPAWN, 1)) + if (Creature* miner = pPlayer->SummonCreature(28841, 2383.869629f, -5900.312500f, 107.996086f, pPlayer->GetOrientation(), TEMPSUMMON_DEAD_DESPAWN, 1)) { pPlayer->CastSpell(pPlayer, SPELL_CART_SUMM, true); - if (Creature *car = pPlayer->GetVehicleCreatureBase()) + if (Creature* car = pPlayer->GetVehicleCreatureBase()) { if (car->GetEntry() == 28817) { diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp index 3f22aee29cd..50f761b4fa7 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp @@ -56,7 +56,7 @@ public: struct npc_crusade_persuadedAI : public ScriptedAI { - npc_crusade_persuadedAI(Creature *pCreature) : ScriptedAI(pCreature) {} + npc_crusade_persuadedAI(Creature* pCreature) : ScriptedAI(pCreature) {} uint32 uiSpeech_timer; uint32 uiSpeech_counter; @@ -71,7 +71,7 @@ public: me->RestoreFaction(); } - void SpellHit(Unit *caster, const SpellEntry *spell) + void SpellHit(Unit* caster, const SpellEntry *spell) { if (spell->Id == SPELL_PERSUASIVE_STRIKE && caster->GetTypeId() == TYPEID_PLAYER && me->isAlive() && !uiSpeech_counter) { @@ -196,7 +196,7 @@ public: struct npc_koltira_deathweaverAI : public npc_escortAI { - npc_koltira_deathweaverAI(Creature *pCreature) : npc_escortAI(pCreature) + npc_koltira_deathweaverAI(Creature* pCreature) : npc_escortAI(pCreature) { me->SetReactState(REACT_DEFENSIVE); } @@ -363,7 +363,7 @@ public: struct mob_scarlet_courierAI : public ScriptedAI { - mob_scarlet_courierAI(Creature *pCreature) : ScriptedAI(pCreature) {} + mob_scarlet_courierAI(Creature* pCreature) : ScriptedAI(pCreature) {} uint32 uiStage; uint32 uiStage_timer; @@ -411,7 +411,7 @@ public: break; case 2: if (GameObject* tree = me->FindNearestGameObject(GO_INCONSPICUOUS_TREE, 40.0f)) - if (Unit *unit = tree->GetOwner()) + if (Unit* unit = tree->GetOwner()) AttackStart(unit); break; } @@ -457,7 +457,7 @@ public: struct mob_high_inquisitor_valrothAI : public ScriptedAI { - mob_high_inquisitor_valrothAI(Creature *pCreature) : ScriptedAI(pCreature) {} + mob_high_inquisitor_valrothAI(Creature* pCreature) : ScriptedAI(pCreature) {} uint32 uiRenew_timer; uint32 uiInquisitor_Penance_timer; @@ -593,7 +593,7 @@ public: struct npc_a_special_surpriseAI : public ScriptedAI { - npc_a_special_surpriseAI(Creature *pCreature) : ScriptedAI(pCreature) {} + npc_a_special_surpriseAI(Creature* pCreature) : ScriptedAI(pCreature) {} uint32 ExecuteSpeech_Timer; uint32 ExecuteSpeech_Counter; diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp index d5965aa2dbf..04d8244ffc7 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp @@ -321,7 +321,7 @@ public: struct npc_highlord_darion_mograineAI : public npc_escortAI { - npc_highlord_darion_mograineAI(Creature *pCreature) : npc_escortAI(pCreature) + npc_highlord_darion_mograineAI(Creature* pCreature) : npc_escortAI(pCreature) { Reset(); } diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/the_scarlet_enclave.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/the_scarlet_enclave.cpp index 1d6f8014ec7..487ec83e682 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/the_scarlet_enclave.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/the_scarlet_enclave.cpp @@ -35,7 +35,7 @@ public: struct npc_valkyr_battle_maidenAI : public PassiveAI { - npc_valkyr_battle_maidenAI(Creature *c) : PassiveAI(c) {} + npc_valkyr_battle_maidenAI(Creature* c) : PassiveAI(c) {} uint32 FlyBackTimer; float x, y, z; @@ -60,9 +60,9 @@ public: { if (FlyBackTimer <= diff) { - Player *plr = NULL; + Player* plr = NULL; if (me->isSummon()) - if (Unit *summoner = me->ToTempSummon()->GetSummoner()) + if (Unit* summoner = me->ToTempSummon()->GetSummoner()) if (summoner->GetTypeId() == TYPEID_PLAYER) plr = CAST_PLR(summoner); diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp index 3aba9f3ffca..3ac8928f7b8 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp @@ -49,7 +49,7 @@ public: struct boss_arcanist_doanAI : public ScriptedAI { - boss_arcanist_doanAI(Creature *c) : ScriptedAI(c) {} + boss_arcanist_doanAI(Creature* c) : ScriptedAI(c) {} uint32 Polymorph_Timer; uint32 AoESilence_Timer; @@ -101,7 +101,7 @@ public: if (Polymorph_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1)) DoCast(pTarget, SPELL_POLYMORPH); Polymorph_Timer = 20000; diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp index d0dcc4c9d83..04e525a3985 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp @@ -41,7 +41,7 @@ public: struct boss_azshir_the_sleeplessAI : public ScriptedAI { - boss_azshir_the_sleeplessAI(Creature *c) : ScriptedAI(c) {} + boss_azshir_the_sleeplessAI(Creature* c) : ScriptedAI(c) {} uint32 SoulSiphon_Timer; uint32 CallOftheGrave_Timer; diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp index f5a8479faa3..852b21de423 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp @@ -49,7 +49,7 @@ public: struct boss_bloodmage_thalnosAI : public ScriptedAI { - boss_bloodmage_thalnosAI(Creature *c) : ScriptedAI(c) {} + boss_bloodmage_thalnosAI(Creature* c) : ScriptedAI(c) {} bool HpYell; uint32 FlameShock_Timer; diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp index dd877a2d257..f897f6fc90c 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp @@ -140,7 +140,7 @@ public: struct mob_wisp_invisAI : public ScriptedAI { - mob_wisp_invisAI(Creature *c) : ScriptedAI(c) + mob_wisp_invisAI(Creature* c) : ScriptedAI(c) { Creaturetype = delay = spell = spell2 = 0; //that's hack but there are no info about range of this spells in dbc @@ -189,7 +189,7 @@ public: me->SetDisplayId(2027); } - void MoveInLineOfSight(Unit *who) + void MoveInLineOfSight(Unit* who) { if (!who || Creaturetype != 1 || !who->isTargetableForAttack()) return; @@ -227,7 +227,7 @@ public: struct mob_headAI : public ScriptedAI { - mob_headAI(Creature *c) : ScriptedAI(c) {} + mob_headAI(Creature* c) : ScriptedAI(c) {} uint64 bodyGUID; @@ -249,11 +249,11 @@ public: } void EnterCombat(Unit* /*who*/) {} - void SaySound(int32 textEntry, Unit *pTarget = 0) + void SaySound(int32 textEntry, Unit* pTarget = 0) { DoScriptText(textEntry, me, pTarget); //DoCast(me, SPELL_HEAD_SPEAKS, true); - Creature *speaker = DoSpawnCreature(HELPER, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN, 1000); + Creature* speaker = DoSpawnCreature(HELPER, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN, 1000); if (speaker) speaker->CastSpell(speaker, SPELL_HEAD_SPEAKS, false); laugh += 3000; @@ -290,7 +290,7 @@ public: } } - void SpellHit(Unit *caster, const SpellEntry* spell) + void SpellHit(Unit* caster, const SpellEntry* spell) { if (!withbody) return; @@ -330,7 +330,7 @@ public: laugh = urand(15000, 30000); DoPlaySoundToSet(me, RandomLaugh[urand(0, 2)]); //DoCast(me, SPELL_HEAD_SPEAKS, true); //this spell remove buff "head" - Creature *speaker = DoSpawnCreature(HELPER, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN, 1000); + Creature* speaker = DoSpawnCreature(HELPER, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN, 1000); if (speaker) speaker->CastSpell(speaker, SPELL_HEAD_SPEAKS, false); me->MonsterTextEmote(EMOTE_LAUGHS, 0); @@ -343,7 +343,7 @@ public: if (wait <= diff) { die = false; - if (Unit *body = Unit::GetUnit((*me), bodyGUID)) + if (Unit* body = Unit::GetUnit((*me), bodyGUID)) body->Kill(body); me->Kill(me); } else wait -= diff; @@ -366,7 +366,7 @@ public: struct boss_headless_horsemanAI : public ScriptedAI { - boss_headless_horsemanAI(Creature *c) : ScriptedAI(c) + boss_headless_horsemanAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -451,7 +451,7 @@ public: break; case 1: { - if (Creature *smoke = me->SummonCreature(HELPER, Spawn[1].x, Spawn[1].y, Spawn[1].z, 0, TEMPSUMMON_TIMED_DESPAWN, 20000)) + if (Creature* smoke = me->SummonCreature(HELPER, Spawn[1].x, Spawn[1].y, Spawn[1].z, 0, TEMPSUMMON_TIMED_DESPAWN, 20000)) CAST_AI(mob_wisp_invis::mob_wisp_invisAI, smoke->AI())->SetType(3); DoCast(me, SPELL_RHYME_BIG); break; @@ -470,7 +470,7 @@ public: wp_reached = false; me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); SaySound(SAY_ENTRANCE); - if (Unit *plr = Unit::GetUnit((*me), PlayerGUID)) + if (Unit* plr = Unit::GetUnit((*me), PlayerGUID)) DoStartMovement(plr); break; } @@ -485,24 +485,24 @@ public: DoZoneInCombat(); } void AttackStart(Unit* who) {ScriptedAI::AttackStart(who);} - void MoveInLineOfSight(Unit *who) + void MoveInLineOfSight(Unit* who) { if (withhead && Phase != 0) ScriptedAI::MoveInLineOfSight(who); } - void KilledUnit(Unit *plr) + void KilledUnit(Unit* plr) { if (plr->GetTypeId() == TYPEID_PLAYER) { if (withhead) SaySound(SAY_PLAYER_DEATH); //maybe possible when player dies from conflagration - else if (Creature *Head = Unit::GetCreature((*me), headGUID)) + else if (Creature* Head = Unit::GetCreature((*me), headGUID)) CAST_AI(mob_head::mob_headAI, Head->AI())->SaySound(SAY_PLAYER_DEATH); } } - void SaySound(int32 textEntry, Unit *pTarget = 0) + void SaySound(int32 textEntry, Unit* pTarget = 0) { DoScriptText(textEntry, me, pTarget); laugh += 4000; @@ -545,15 +545,15 @@ public: me->StopMoving(); //me->GetMotionMaster()->MoveIdle(); SaySound(SAY_DEATH); - if (Creature *flame = DoSpawnCreature(HELPER, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN, 60000)) + if (Creature* flame = DoSpawnCreature(HELPER, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN, 60000)) flame->CastSpell(flame, SPELL_BODY_FLAME, false); - if (Creature *wisp = DoSpawnCreature(WISP_INVIS, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN, 60000)) + if (Creature* wisp = DoSpawnCreature(WISP_INVIS, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN, 60000)) CAST_AI(mob_wisp_invis::mob_wisp_invisAI, wisp->AI())->SetType(4); if (pInstance) pInstance->SetData(DATA_HORSEMAN_EVENT, DONE); } - void SpellHit(Unit *caster, const SpellEntry* spell) + void SpellHit(Unit* caster, const SpellEntry* spell) { if (withhead) return; @@ -583,7 +583,7 @@ public: } } - void DamageTaken(Unit *done_by, uint32 &damage) + void DamageTaken(Unit* done_by, uint32 &damage) { if (damage >= me->GetHealth() && withhead) { @@ -625,7 +625,7 @@ public: if (say_timer <= diff) { say_timer = 3000; - Player *plr = SelectRandomPlayer(100.0f, false); + Player* plr = SelectRandomPlayer(100.0f, false); if (count < 3) { if (plr) @@ -663,7 +663,7 @@ public: break; if (burn <= diff) { - if (Creature *flame = me->SummonCreature(HELPER, Spawn[0].x, Spawn[0].y, Spawn[0].z, 0, TEMPSUMMON_TIMED_DESPAWN, 17000)) + if (Creature* flame = me->SummonCreature(HELPER, Spawn[0].x, Spawn[0].y, Spawn[0].z, 0, TEMPSUMMON_TIMED_DESPAWN, 17000)) CAST_AI(mob_wisp_invis::mob_wisp_invisAI, flame->AI())->SetType(2); burned = true; } else burn -= diff; @@ -671,7 +671,7 @@ public: case 2: if (conflagrate <= diff) { - if (Unit *plr = SelectRandomPlayer(30.0f)) + if (Unit* plr = SelectRandomPlayer(30.0f)) DoCast(plr, SPELL_CONFLAGRATION, false); conflagrate = urand(10000, 16000); } else conflagrate -= diff; @@ -755,7 +755,7 @@ public: struct mob_pulsing_pumpkinAI : public ScriptedAI { - mob_pulsing_pumpkinAI(Creature *c) : ScriptedAI(c) {} + mob_pulsing_pumpkinAI(Creature* c) : ScriptedAI(c) {} bool sprouted; uint64 debuffGUID; @@ -766,7 +766,7 @@ public: me->GetPosition(x, y, z); //this visual aura some under ground me->GetMap()->CreatureRelocation(me, x, y, z + 0.35f, 0.0f); Despawn(); - Creature *debuff = DoSpawnCreature(HELPER, 0, 0, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 14500); + Creature* debuff = DoSpawnCreature(HELPER, 0, 0, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 14500); if (debuff) { debuff->SetDisplayId(me->GetDisplayId()); @@ -798,7 +798,7 @@ public: void Despawn() { if (!debuffGUID) return; - Unit *debuff = Unit::GetUnit((*me), debuffGUID); + Unit* debuff = Unit::GetUnit((*me), debuffGUID); if (debuff) debuff->SetVisible(false); debuffGUID = 0; @@ -806,7 +806,7 @@ public: void JustDied(Unit* /*killer*/) { if (!sprouted) Despawn(); } - void MoveInLineOfSight(Unit *who) + void MoveInLineOfSight(Unit* who) { if (!who || !who->isTargetableForAttack() || !me->IsHostileTo(who) || me->getVictim()) return; @@ -847,7 +847,7 @@ public: if (plr->GetQuestStatus(11405) == QUEST_STATUS_INCOMPLETE && plr->getLevel() > 64) { */ pPlayer->AreaExploredOrEventHappens(11405); - if (Creature *horseman = soil->SummonCreature(HH_MOUNTED, FlightPoint[20].x, FlightPoint[20].y, FlightPoint[20].z, 0, TEMPSUMMON_MANUAL_DESPAWN, 0)) + if (Creature* horseman = soil->SummonCreature(HH_MOUNTED, FlightPoint[20].x, FlightPoint[20].y, FlightPoint[20].z, 0, TEMPSUMMON_MANUAL_DESPAWN, 0)) { CAST_AI(boss_headless_horseman::boss_headless_horsemanAI, horseman->AI())->PlayerGUID = pPlayer->GetGUID(); CAST_AI(boss_headless_horseman::boss_headless_horsemanAI, horseman->AI())->FlyMode(); @@ -864,7 +864,7 @@ void mob_head::mob_headAI::Disappear() return; if (bodyGUID) { - Creature *body = Unit::GetCreature((*me), bodyGUID); + Creature* body = Unit::GetCreature((*me), bodyGUID); if (body && body->isAlive()) { withbody = true; diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp index 3ec4d9c91fa..6950f312f90 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp @@ -52,7 +52,7 @@ public: struct boss_herodAI : public ScriptedAI { - boss_herodAI(Creature *c) : ScriptedAI(c) {} + boss_herodAI(Creature* c) : ScriptedAI(c) {} bool Enrage; @@ -130,7 +130,7 @@ public: struct mob_scarlet_traineeAI : public npc_escortAI { - mob_scarlet_traineeAI(Creature *c) : npc_escortAI(c) + mob_scarlet_traineeAI(Creature* c) : npc_escortAI(c) { Start_Timer = urand(1000, 6000); } diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp index 664521dd7a2..ddbbd43b1d0 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp @@ -47,7 +47,7 @@ public: struct boss_high_inquisitor_fairbanksAI : public ScriptedAI { - boss_high_inquisitor_fairbanksAI(Creature *c) : ScriptedAI(c) {} + boss_high_inquisitor_fairbanksAI(Creature* c) : ScriptedAI(c) {} uint32 CurseOfBlood_Timer; uint32 DispelMagic_Timer; @@ -87,7 +87,7 @@ public: //Fear_Timer if (Fear_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1)) DoCast(pTarget, SPELL_FEAR); Fear_Timer = 40000; @@ -96,7 +96,7 @@ public: //Sleep_Timer if (Sleep_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_TOPAGGRO, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_TOPAGGRO, 0)) DoCast(pTarget, SPELL_SLEEP); Sleep_Timer = 30000; @@ -112,7 +112,7 @@ public: //Dispel_Timer if (Dispel_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_DISPELMAGIC); DispelMagic_Timer = 30000; diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp index 4aa6b74681a..351b0681423 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp @@ -44,7 +44,7 @@ public: struct boss_houndmaster_lokseyAI : public ScriptedAI { - boss_houndmaster_lokseyAI(Creature *c) : ScriptedAI(c) {} + boss_houndmaster_lokseyAI(Creature* c) : ScriptedAI(c) {} uint32 BloodLust_Timer; diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp index 6168b5d8939..d369cd8b247 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp @@ -49,7 +49,7 @@ public: struct boss_interrogator_vishasAI : public ScriptedAI { - boss_interrogator_vishasAI(Creature *c) : ScriptedAI(c) + boss_interrogator_vishasAI(Creature* c) : ScriptedAI(c) { pInstance = me->GetInstanceScript(); } @@ -81,7 +81,7 @@ public: return; //Any other actions to do with vorrel? setStandState? - if (Unit *vorrel = Unit::GetUnit(*me, pInstance->GetData64(DATA_VORREL))) + if (Unit* vorrel = Unit::GetUnit(*me, pInstance->GetData64(DATA_VORREL))) DoScriptText(SAY_TRIGGER_VORREL, vorrel); } diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp index de190f9d260..5b025a7c579 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp @@ -42,7 +42,7 @@ public: struct boss_scornAI : public ScriptedAI { - boss_scornAI(Creature *c) : ScriptedAI(c) {} + boss_scornAI(Creature* c) : ScriptedAI(c) {} uint32 LichSlap_Timer; uint32 FrostboltVolley_Timer; diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp index a303761e500..96ebeef1a0e 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp @@ -62,7 +62,7 @@ public: struct boss_darkmaster_gandlingAI : public ScriptedAI { - boss_darkmaster_gandlingAI(Creature *c) : ScriptedAI(c) + boss_darkmaster_gandlingAI(Creature* c) : ScriptedAI(c) { pInstance = me->GetInstanceScript(); } @@ -124,14 +124,14 @@ public: { if (Teleport_Timer <= diff) { - Unit *pTarget = NULL; + Unit* pTarget = NULL; pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget && pTarget->GetTypeId() == TYPEID_PLAYER) { if (DoGetThreat(pTarget)) DoModifyThreatPercent(pTarget, -100); - Creature *Summoned = NULL; + Creature* Summoned = NULL; switch(rand()%6) { case 0: diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_death_knight_darkreaver.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_death_knight_darkreaver.cpp index ea07e6d5da9..e11ed41024b 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_death_knight_darkreaver.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_death_knight_darkreaver.cpp @@ -37,7 +37,7 @@ public: struct boss_death_knight_darkreaverAI : public ScriptedAI { - boss_death_knight_darkreaverAI(Creature *c) : ScriptedAI(c) {} + boss_death_knight_darkreaverAI(Creature* c) : ScriptedAI(c) {} void Reset() { diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp index 3591431e0db..a11e37d4321 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp @@ -45,7 +45,7 @@ public: struct boss_theolenkrastinovAI : public ScriptedAI { - boss_theolenkrastinovAI(Creature *c) : ScriptedAI(c) {} + boss_theolenkrastinovAI(Creature* c) : ScriptedAI(c) {} uint32 m_uiRend_Timer; uint32 m_uiBackhand_Timer; diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp index 80e35195bd2..858a829854b 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp @@ -43,7 +43,7 @@ public: struct boss_illuciabarovAI : public ScriptedAI { - boss_illuciabarovAI(Creature *c) : ScriptedAI(c) {} + boss_illuciabarovAI(Creature* c) : ScriptedAI(c) {} uint32 CurseOfAgony_Timer; uint32 ShadowShock_Timer; @@ -89,7 +89,7 @@ public: //ShadowShock_Timer if (ShadowShock_Timer <= diff) { - Unit *pTarget = NULL; + Unit* pTarget = NULL; pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget) DoCast(pTarget, SPELL_SHADOWSHOCK); diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp index 74d6c994464..24e064a5752 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp @@ -44,7 +44,7 @@ public: struct boss_instructormaliciaAI : public ScriptedAI { - boss_instructormaliciaAI(Creature *c) : ScriptedAI(c) {} + boss_instructormaliciaAI(Creature* c) : ScriptedAI(c) {} uint32 CallOfGraves_Timer; uint32 Corruption_Timer; @@ -96,7 +96,7 @@ public: //Corruption_Timer if (Corruption_Timer <= diff) { - Unit *pTarget = NULL; + Unit* pTarget = NULL; pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget) DoCast(pTarget, SPELL_CORRUPTION); diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp index f75042b5d8e..26b944fc7a5 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp @@ -43,7 +43,7 @@ public: struct boss_jandicebarovAI : public ScriptedAI { - boss_jandicebarovAI(Creature *c) : ScriptedAI(c) {} + boss_jandicebarovAI(Creature* c) : ScriptedAI(c) {} uint32 CurseOfBlood_Timer; uint32 Illusion_Timer; @@ -65,7 +65,7 @@ public: void SummonIllusions(Unit* victim) { - if (Creature *Illusion = DoSpawnCreature(11439, float(irand(-9, 9)), float(irand(-9, 9)), 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 60000)) + if (Creature* Illusion = DoSpawnCreature(11439, float(irand(-9, 9)), float(irand(-9, 9)), 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 60000)) Illusion->AI()->AttackStart(victim); } @@ -111,7 +111,7 @@ public: DoModifyThreatPercent(me->getVictim(), -99); //Summon 10 Illusions attacking random gamers - Unit *pTarget = NULL; + Unit* pTarget = NULL; for (uint8 i = 0; i < 10; ++i) { pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); @@ -165,7 +165,7 @@ public: struct mob_illusionofjandicebarovAI : public ScriptedAI { - mob_illusionofjandicebarovAI(Creature *c) : ScriptedAI(c) {} + mob_illusionofjandicebarovAI(Creature* c) : ScriptedAI(c) {} uint32 Cleave_Timer; diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp index 25a2b9ed10d..311a32d9a54 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp @@ -40,7 +40,7 @@ public: struct boss_kormokAI : public ScriptedAI { - boss_kormokAI(Creature *c) : ScriptedAI(c) {} + boss_kormokAI(Creature* c) : ScriptedAI(c) {} uint32 ShadowVolley_Timer; uint32 BoneShield_Timer; @@ -63,13 +63,13 @@ public: void SummonMinions(Unit* victim) { - if (Creature *SummonedMinion = DoSpawnCreature(16119, float(irand(-7, 7)), float(irand(-7, 7)), 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 120000)) + if (Creature* SummonedMinion = DoSpawnCreature(16119, float(irand(-7, 7)), float(irand(-7, 7)), 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 120000)) SummonedMinion->AI()->AttackStart(victim); } void SummonMages(Unit* victim) { - if (Creature *SummonedMage = DoSpawnCreature(16120, float(irand(-9, 9)), float(irand(-9, 9)), 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 120000)) + if (Creature* SummonedMage = DoSpawnCreature(16120, float(irand(-9, 9)), float(irand(-9, 9)), 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 120000)) SummonedMage->AI()->AttackStart(victim); } diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp index 269364bca1a..c2875fbedc5 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp @@ -41,7 +41,7 @@ public: struct boss_lordalexeibarovAI : public ScriptedAI { - boss_lordalexeibarovAI(Creature *c) : ScriptedAI(c) {} + boss_lordalexeibarovAI(Creature* c) : ScriptedAI(c) {} uint32 Immolate_Timer; uint32 VeilofShadow_Timer; @@ -78,7 +78,7 @@ public: //Immolate_Timer if (Immolate_Timer <= diff) { - Unit *pTarget = NULL; + Unit* pTarget = NULL; pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget) DoCast(pTarget, SPELL_IMMOLATE); diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp index 149b51ab397..6f7814e3481 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp @@ -43,7 +43,7 @@ public: struct boss_lorekeeperpolkeltAI : public ScriptedAI { - boss_lorekeeperpolkeltAI(Creature *c) : ScriptedAI(c) {} + boss_lorekeeperpolkeltAI(Creature* c) : ScriptedAI(c) {} uint32 VolatileInfection_Timer; uint32 Darkplague_Timer; diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp index 8444a426ebc..75ac2ac8e6b 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp @@ -44,7 +44,7 @@ public: struct boss_rasfrostAI : public ScriptedAI { - boss_rasfrostAI(Creature *c) : ScriptedAI(c) {} + boss_rasfrostAI(Creature* c) : ScriptedAI(c) {} uint32 IceArmor_Timer; uint32 Frostbolt_Timer; @@ -82,7 +82,7 @@ public: //Frostbolt_Timer if (Frostbolt_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_FROSTBOLT); Frostbolt_Timer = 8000; diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp index 19a3183c91d..3afe86dc9c9 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp @@ -43,7 +43,7 @@ public: struct boss_theravenianAI : public ScriptedAI { - boss_theravenianAI(Creature *c) : ScriptedAI(c) {} + boss_theravenianAI(Creature* c) : ScriptedAI(c) {} uint32 Trample_Timer; uint32 Cleave_Timer; diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp index 3ae6a763afb..5c8bd795669 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp @@ -45,7 +45,7 @@ public: struct boss_vectusAI : public ScriptedAI { - boss_vectusAI(Creature *c) : ScriptedAI(c) {} + boss_vectusAI(Creature* c) : ScriptedAI(c) {} uint32 m_uiFireShield_Timer; uint32 m_uiBlastWave_Timer; diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp index e1f8ee39ae1..0a003e39fdb 100644 --- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp +++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp @@ -90,7 +90,7 @@ public: struct npc_shadowfang_prisonerAI : public npc_escortAI { - npc_shadowfang_prisonerAI(Creature *c) : npc_escortAI(c) + npc_shadowfang_prisonerAI(Creature* c) : npc_escortAI(c) { pInstance = c->GetInstanceScript(); uiNpcEntry = c->GetEntry(); diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp index 004996845e3..5165291ce4c 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp @@ -89,7 +89,7 @@ public: struct boss_baron_rivendareAI : public ScriptedAI { - boss_baron_rivendareAI(Creature *c) : ScriptedAI(c) + boss_baron_rivendareAI(Creature* c) : ScriptedAI(c) { pInstance = me->GetInstanceScript(); } @@ -122,7 +122,7 @@ public: void JustSummoned(Creature* summoned) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) summoned->AI()->AttackStart(pTarget); } diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp index d27990be43b..85818ecbe69 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp @@ -43,7 +43,7 @@ public: struct boss_baroness_anastariAI : public ScriptedAI { - boss_baroness_anastariAI(Creature *c) : ScriptedAI(c) + boss_baroness_anastariAI(Creature* c) : ScriptedAI(c) { pInstance = me->GetInstanceScript(); } @@ -111,7 +111,7 @@ public: //Cast if (rand()%100 < 65) { - Unit *pTarget = NULL; + Unit* pTarget = NULL; pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); if (pTarget)DoCast(pTarget, SPELL_POSSESS); } diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp index e86521225ba..57293f18641 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp @@ -88,7 +88,7 @@ public: struct boss_cannon_master_willeyAI : public ScriptedAI { - boss_cannon_master_willeyAI(Creature *c) : ScriptedAI(c) {} + boss_cannon_master_willeyAI(Creature* c) : ScriptedAI(c) {} uint32 KnockAway_Timer; uint32 Pummel_Timer; diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp index 5f8a91c65a6..f6a6639264b 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp @@ -77,7 +77,7 @@ public: struct boss_dathrohan_balnazzarAI : public ScriptedAI { - boss_dathrohan_balnazzarAI(Creature *c) : ScriptedAI(c) {} + boss_dathrohan_balnazzarAI(Creature* c) : ScriptedAI(c) {} uint32 m_uiCrusadersHammer_Timer; uint32 m_uiCrusaderStrike_Timer; @@ -195,7 +195,7 @@ public: //DeepSleep if (m_uiDeepSleep_Timer <= uiDiff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_SLEEP); m_uiDeepSleep_Timer = 15000; diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_magistrate_barthilas.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_magistrate_barthilas.cpp index dada1176cf0..1388547c26b 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_magistrate_barthilas.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_magistrate_barthilas.cpp @@ -46,7 +46,7 @@ public: struct boss_magistrate_barthilasAI : public ScriptedAI { - boss_magistrate_barthilasAI(Creature *c) : ScriptedAI(c) {} + boss_magistrate_barthilasAI(Creature* c) : ScriptedAI(c) {} uint32 DrainingBlow_Timer; uint32 CrowdPummel_Timer; @@ -68,7 +68,7 @@ public: me->SetDisplayId(MODEL_HUMAN); } - void MoveInLineOfSight(Unit *who) + void MoveInLineOfSight(Unit* who) { //nothing to see here yet diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp index ac4ad7f63a7..8056a1d13bd 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp @@ -43,7 +43,7 @@ public: struct boss_maleki_the_pallidAI : public ScriptedAI { - boss_maleki_the_pallidAI(Creature *c) : ScriptedAI(c) + boss_maleki_the_pallidAI(Creature* c) : ScriptedAI(c) { pInstance = me->GetInstanceScript(); } diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_nerubenkan.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_nerubenkan.cpp index 6413a953bd2..6e18eda0768 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_nerubenkan.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_nerubenkan.cpp @@ -43,7 +43,7 @@ public: struct boss_nerubenkanAI : public ScriptedAI { - boss_nerubenkanAI(Creature *c) : ScriptedAI(c) + boss_nerubenkanAI(Creature* c) : ScriptedAI(c) { pInstance = me->GetInstanceScript(); } diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_postmaster_malown.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_postmaster_malown.cpp index 04a9e4690aa..43aaccbeda6 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_postmaster_malown.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_postmaster_malown.cpp @@ -48,7 +48,7 @@ public: struct boss_postmaster_malownAI : public ScriptedAI { - boss_postmaster_malownAI(Creature *c) : ScriptedAI(c) {} + boss_postmaster_malownAI(Creature* c) : ScriptedAI(c) {} uint32 WailingDead_Timer; uint32 Backhand_Timer; diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp index 54cdcf2ae04..b53c77acac5 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp @@ -43,7 +43,7 @@ public: struct boss_ramstein_the_gorgerAI : public ScriptedAI { - boss_ramstein_the_gorgerAI(Creature *c) : ScriptedAI(c) + boss_ramstein_the_gorgerAI(Creature* c) : ScriptedAI(c) { pInstance = me->GetInstanceScript(); } diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_timmy_the_cruel.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_timmy_the_cruel.cpp index 129d9ead38e..7637d9bf60b 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_timmy_the_cruel.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_timmy_the_cruel.cpp @@ -41,7 +41,7 @@ public: struct boss_timmy_the_cruelAI : public ScriptedAI { - boss_timmy_the_cruelAI(Creature *c) : ScriptedAI(c) {} + boss_timmy_the_cruelAI(Creature* c) : ScriptedAI(c) {} uint32 RavenousClaw_Timer; bool HasYelled; diff --git a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp index d8b33bbae93..01535bbae55 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp @@ -99,7 +99,7 @@ public: struct mob_freed_soulAI : public ScriptedAI { - mob_freed_soulAI(Creature *c) : ScriptedAI(c) {} + mob_freed_soulAI(Creature* c) : ScriptedAI(c) {} void Reset() { @@ -133,7 +133,7 @@ public: struct mob_restless_soulAI : public ScriptedAI { - mob_restless_soulAI(Creature *c) : ScriptedAI(c) {} + mob_restless_soulAI(Creature* c) : ScriptedAI(c) {} uint64 Tagger; uint32 Die_Timer; @@ -148,7 +148,7 @@ public: void EnterCombat(Unit* /*who*/) {} - void SpellHit(Unit *caster, const SpellEntry *spell) + void SpellHit(Unit* caster, const SpellEntry *spell) { if (caster->GetTypeId() == TYPEID_PLAYER) { @@ -160,7 +160,7 @@ public: } } - void JustSummoned(Creature *summoned) + void JustSummoned(Creature* summoned) { summoned->CastSpell(summoned, SPELL_SOUL_FREED, false); } @@ -211,7 +211,7 @@ public: struct mobs_spectral_ghostly_citizenAI : public ScriptedAI { - mobs_spectral_ghostly_citizenAI(Creature *c) : ScriptedAI(c) {} + mobs_spectral_ghostly_citizenAI(Creature* c) : ScriptedAI(c) {} uint32 Die_Timer; bool Tagged; diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp index b0c6c42876d..2903fb34c53 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp @@ -78,7 +78,7 @@ public: struct boss_brutallusAI : public ScriptedAI { - boss_brutallusAI(Creature *c) : ScriptedAI(c) + boss_brutallusAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); Intro = true; @@ -155,7 +155,7 @@ public: { if (!Intro || IsIntro) return; - Creature *Madrigosa = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_MADRIGOSA) : 0); + Creature* Madrigosa = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_MADRIGOSA) : 0); if (Madrigosa) { Madrigosa->Respawn(); @@ -191,7 +191,7 @@ public: void DoIntro() { - Creature *Madrigosa = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_MADRIGOSA) : 0); + Creature* Madrigosa = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_MADRIGOSA) : 0); if (!Madrigosa) return; @@ -267,7 +267,7 @@ public: } } - void MoveInLineOfSight(Unit *who) + void MoveInLineOfSight(Unit* who) { if (!who->isTargetableForAttack() || !me->IsHostileTo(who)) return; @@ -292,7 +292,7 @@ public: { if (IntroFrostBoltTimer <= diff) { - if (Creature *Madrigosa = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_MADRIGOSA) : 0)) + if (Creature* Madrigosa = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_MADRIGOSA) : 0)) { Madrigosa->CastSpell(me, SPELL_INTRO_FROSTBOLT, true); IntroFrostBoltTimer = 2000; diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp index 2f03d57af91..e1b2f087462 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp @@ -97,7 +97,7 @@ public: struct boss_sacrolashAI : public ScriptedAI { - boss_sacrolashAI(Creature *c) : ScriptedAI(c) + boss_sacrolashAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -181,7 +181,7 @@ public: me->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE); } - void SpellHitTarget(Unit *pTarget, const SpellEntry* spell) + void SpellHitTarget(Unit* pTarget, const SpellEntry* spell) { switch(spell->Id) { @@ -197,7 +197,7 @@ public: } } - void HandleTouchedSpells(Unit *pTarget, uint32 TouchedType) + void HandleTouchedSpells(Unit* pTarget, uint32 TouchedType) { switch(TouchedType) { @@ -252,7 +252,7 @@ public: if (!me->IsNonMeleeSpellCasted(false)) { me->InterruptSpell(CURRENT_GENERIC_SPELL); - Unit *pTarget = NULL; + Unit* pTarget = NULL; pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget) DoCast(pTarget, SPELL_CONFLAGRATION); @@ -266,7 +266,7 @@ public: { if (!me->IsNonMeleeSpellCasted(false)) { - Unit *pTarget = NULL; + Unit* pTarget = NULL; pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget) DoCast(pTarget, SPELL_SHADOW_NOVA); @@ -286,7 +286,7 @@ public: { if (!me->IsNonMeleeSpellCasted(false)) { - Unit *pTarget = NULL; + Unit* pTarget = NULL; pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget) DoCast(pTarget, SPELL_CONFOUNDING_BLOW); @@ -296,7 +296,7 @@ public: if (ShadowimageTimer <= diff) { - Unit *pTarget = NULL; + Unit* pTarget = NULL; Creature* temp = NULL; for (uint8 i = 0; i<3; ++i) { @@ -355,7 +355,7 @@ public: struct boss_alythessAI : public Scripted_NoMovementAI { - boss_alythessAI(Creature *c) : Scripted_NoMovementAI(c) + boss_alythessAI(Creature* c) : Scripted_NoMovementAI(c) { pInstance = c->GetInstanceScript(); IntroStepCounter = 10; @@ -424,7 +424,7 @@ public: pInstance->SetData(DATA_EREDAR_TWINS_EVENT, IN_PROGRESS); } - void AttackStart(Unit *who) + void AttackStart(Unit* who) { if (!me->isInCombat()) { @@ -432,7 +432,7 @@ public: } } - void MoveInLineOfSight(Unit *who) + void MoveInLineOfSight(Unit* who) { if (!who || me->getVictim()) return; @@ -476,7 +476,7 @@ public: me->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE); } - void SpellHitTarget(Unit *pTarget, const SpellEntry* spell) + void SpellHitTarget(Unit* pTarget, const SpellEntry* spell) { switch(spell->Id) { @@ -493,7 +493,7 @@ public: } } - void HandleTouchedSpells(Unit *pTarget, uint32 TouchedType) + void HandleTouchedSpells(Unit* pTarget, uint32 TouchedType) { switch(TouchedType) { @@ -601,7 +601,7 @@ public: { if (!me->IsNonMeleeSpellCasted(false)) { - Unit *pTarget = NULL; + Unit* pTarget = NULL; pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget) DoCast(pTarget, SPELL_SHADOW_NOVA); @@ -616,7 +616,7 @@ public: if (!me->IsNonMeleeSpellCasted(false)) { me->InterruptSpell(CURRENT_GENERIC_SPELL); - Unit *pTarget = NULL; + Unit* pTarget = NULL; pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget) DoCast(pTarget, SPELL_CONFLAGRATION); @@ -685,7 +685,7 @@ public: struct mob_shadow_imageAI : public ScriptedAI { - mob_shadow_imageAI(Creature *c) : ScriptedAI(c) {} + mob_shadow_imageAI(Creature* c) : ScriptedAI(c) {} uint32 ShadowfuryTimer; uint32 KillTimer; @@ -701,7 +701,7 @@ public: void EnterCombat(Unit* /*who*/){} - void SpellHitTarget(Unit *pTarget, const SpellEntry* spell) + void SpellHitTarget(Unit* pTarget, const SpellEntry* spell) { switch(spell->Id) { diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp index 3d8673d712c..e7e9d95e19a 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp @@ -115,7 +115,7 @@ public: struct boss_felmystAI : public ScriptedAI { - boss_felmystAI(Creature *c) : ScriptedAI(c) + boss_felmystAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); @@ -173,13 +173,13 @@ public: pInstance->SetData(DATA_FELMYST_EVENT, IN_PROGRESS); } - void AttackStart(Unit *who) + void AttackStart(Unit* who) { if (phase != PHASE_FLIGHT) ScriptedAI::AttackStart(who); } - void MoveInLineOfSight(Unit *who) + void MoveInLineOfSight(Unit* who) { if (phase != PHASE_FLIGHT) ScriptedAI::MoveInLineOfSight(who); @@ -203,7 +203,7 @@ public: pInstance->SetData(DATA_FELMYST_EVENT, DONE); } - void SpellHit(Unit *caster, const SpellEntry *spell) + void SpellHit(Unit* caster, const SpellEntry *spell) { // workaround for linked aura /*if (spell->Id == SPELL_VAPOR_FORCE) @@ -226,7 +226,7 @@ public: } } - void JustSummoned(Creature *summon) + void JustSummoned(Creature* summon) { if (summon->GetEntry() == MOB_DEAD) { @@ -293,7 +293,7 @@ public: break; case 2: { - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 150, true); + Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 150, true); if (!pTarget) pTarget = Unit::GetUnit(*me, pInstance ? pInstance->GetData64(DATA_PLAYER_GUID) : 0); @@ -320,7 +320,7 @@ public: DespawnSummons(MOB_VAPOR_TRAIL); //DoCast(me, SPELL_VAPOR_SELECT); need core support - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 150, true); + Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 150, true); if (!pTarget) pTarget = Unit::GetUnit(*me, pInstance ? pInstance->GetData64(DATA_PLAYER_GUID) : 0); @@ -350,7 +350,7 @@ public: break; case 5: { - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 150, true); + Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 150, true); if (!pTarget) pTarget = Unit::GetUnit(*me, pInstance ? pInstance->GetData64(DATA_PLAYER_GUID) : 0); @@ -393,7 +393,7 @@ public: uiFlightCount = 4; break; case 9: - if (Unit *pTarget = SelectTarget(SELECT_TARGET_TOPAGGRO)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_TOPAGGRO)) DoStartMovement(pTarget); else { @@ -447,7 +447,7 @@ public: events.ScheduleEvent(EVENT_GAS_NOVA, urand(20000, 25000)); break; case EVENT_ENCAPSULATE: - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 150, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 150, true)) DoCast(pTarget, SPELL_ENCAPSULATE_CHANNEL, false); events.ScheduleEvent(EVENT_ENCAPSULATE, urand(25000, 30000)); break; @@ -476,7 +476,7 @@ public: float x, y, z; me->GetPosition(x, y, z); me->UpdateGroundPositionZ(x, y, z); - if (Creature *Fog = me->SummonCreature(MOB_VAPOR_TRAIL, x, y, z, 0, TEMPSUMMON_TIMED_DESPAWN, 10000)) + if (Creature* Fog = me->SummonCreature(MOB_VAPOR_TRAIL, x, y, z, 0, TEMPSUMMON_TIMED_DESPAWN, 10000)) { Fog->RemoveAurasDueToSpell(SPELL_TRAIL_TRIGGER); Fog->CastSpell(Fog, SPELL_FOG_TRIGGER, true); @@ -534,7 +534,7 @@ public: struct mob_felmyst_vaporAI : public ScriptedAI { - mob_felmyst_vaporAI(Creature *c) : ScriptedAI(c) + mob_felmyst_vaporAI(Creature* c) : ScriptedAI(c) { me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); me->SetSpeed(MOVE_RUN, 0.8f); @@ -548,7 +548,7 @@ public: void UpdateAI(const uint32 /*diff*/) { if (!me->getVictim()) - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) AttackStart(pTarget); } }; @@ -567,7 +567,7 @@ public: struct mob_felmyst_trailAI : public ScriptedAI { - mob_felmyst_trailAI(Creature *c) : ScriptedAI(c) + mob_felmyst_trailAI(Creature* c) : ScriptedAI(c) { me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); DoCast(me, SPELL_TRAIL_TRIGGER, true); diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp index bdce8d1dd15..7bea5943981 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp @@ -115,7 +115,7 @@ public: struct boss_kalecgosAI : public ScriptedAI { - boss_kalecgosAI(Creature *c) : ScriptedAI(c) + boss_kalecgosAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); SathGUID = 0; @@ -155,7 +155,7 @@ public: pInstance->SetData(DATA_KALECGOS_EVENT, NOT_STARTED); } - if (Creature *Sath = Unit::GetCreature(*me, SathGUID)) + if (Creature* Sath = Unit::GetCreature(*me, SathGUID)) Sath->AI()->EnterEvadeMode(); me->setFaction(14); @@ -329,7 +329,7 @@ public: } } - void MoveInLineOfSight(Unit *who) + void MoveInLineOfSight(Unit* who) { if (bJustReset)//boss is invisible, don't attack return; @@ -342,7 +342,7 @@ public: } } - void DamageTaken(Unit *done_by, uint32 &damage) + void DamageTaken(Unit* done_by, uint32 &damage) { if (damage >= me->GetHealth() && done_by != me) damage = 0; @@ -459,7 +459,7 @@ public: bool isEnraged; // if demon is enraged - boss_kalecAI(Creature *c) : ScriptedAI(c) + boss_kalecAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -477,7 +477,7 @@ public: isEnraged = false; } - void DamageTaken(Unit *done_by, uint32 &damage) + void DamageTaken(Unit* done_by, uint32 &damage) { if (done_by->GetGUID() != SathGUID) damage = 0; @@ -578,7 +578,7 @@ public: struct boss_sathrovarrAI : public ScriptedAI { - boss_sathrovarrAI(Creature *c) : ScriptedAI(c) + boss_sathrovarrAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); KalecGUID = 0; @@ -629,7 +629,7 @@ public: void EnterCombat(Unit* /*who*/) { - if (Creature *Kalec = me->SummonCreature(MOB_KALEC, me->GetPositionX() + 10, me->GetPositionY() + 5, me->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 0)) + if (Creature* Kalec = me->SummonCreature(MOB_KALEC, me->GetPositionX() + 10, me->GetPositionY() + 5, me->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 0)) { KalecGUID = Kalec->GetGUID(); me->CombatStart(Kalec); @@ -639,18 +639,18 @@ public: DoScriptText(SAY_SATH_AGGRO, me); } - void DamageTaken(Unit *done_by, uint32 &damage) + void DamageTaken(Unit* done_by, uint32 &damage) { if (damage >= me->GetHealth() && done_by != me) damage = 0; } - void KilledUnit(Unit *pTarget) + void KilledUnit(Unit* pTarget) { if (pTarget->GetGUID() == KalecGUID) { TeleportAllPlayersBack(); - if (Creature *Kalecgos = Unit::GetCreature(*me, KalecgosGUID)) + if (Creature* Kalecgos = Unit::GetCreature(*me, KalecgosGUID)) { CAST_AI(boss_kalecgos::boss_kalecgosAI, Kalecgos->AI())->TalkTimer = 1; CAST_AI(boss_kalecgos::boss_kalecgosAI, Kalecgos->AI())->isFriendly = false; @@ -666,7 +666,7 @@ public: DoScriptText(SAY_SATH_DEATH, me); me->GetMap()->CreatureRelocation(me, me->GetPositionX(), me->GetPositionY(), DRAGON_REALM_Z, me->GetOrientation()); TeleportAllPlayersBack(); - if (Creature *Kalecgos = Unit::GetCreature(*me, KalecgosGUID)) + if (Creature* Kalecgos = Unit::GetCreature(*me, KalecgosGUID)) { CAST_AI(boss_kalecgos::boss_kalecgosAI, Kalecgos->AI())->TalkTimer = 1; CAST_AI(boss_kalecgos::boss_kalecgosAI, Kalecgos->AI())->isFriendly = true; @@ -715,10 +715,10 @@ public: if (CheckTimer <= diff) { - Creature *Kalec = Unit::GetCreature(*me, KalecGUID); + Creature* Kalec = Unit::GetCreature(*me, KalecGUID); if (!Kalec || (Kalec && !Kalec->isAlive())) { - if (Creature *Kalecgos = Unit::GetCreature(*me, KalecgosGUID)) + if (Creature* Kalecgos = Unit::GetCreature(*me, KalecgosGUID)) Kalecgos->AI()->EnterEvadeMode(); return; } @@ -728,7 +728,7 @@ public: Kalecgos->AI()->DoAction(DO_ENRAGE); DoAction(DO_ENRAGE); } - Creature *Kalecgos = Unit::GetCreature(*me, KalecgosGUID); + Creature* Kalecgos = Unit::GetCreature(*me, KalecgosGUID); if (Kalecgos) { if (!Kalecgos->isInCombat()) @@ -783,7 +783,7 @@ public: if (AgonyCurseTimer <= diff) { - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); + Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (!pTarget) pTarget = me->getVictim(); DoCast(pTarget, SPELL_AGONY_CURSE); AgonyCurseTimer = 20000; diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp index a9fbc693bd5..8588c81ecd6 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp @@ -661,7 +661,7 @@ public: for (uint8 i = 0; i < 4; ++i) { float x, y, z; - Unit *pTarget = NULL; + Unit* pTarget = NULL; for (uint8 z = 0; z < 6; ++z) { pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); @@ -842,7 +842,7 @@ public: TimerIsDeactivated[TIMER_ORBS_EMPOWER] = true; break; case TIMER_ARMAGEDDON: //Phase 4 - Unit *pTarget = NULL; + Unit* pTarget = NULL; for (uint8 z = 0; z < 6; ++z) { pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp index 83ea67c33e3..5f95128b64a 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp @@ -113,7 +113,7 @@ public: struct boss_entropiusAI : public ScriptedAI { - boss_entropiusAI(Creature *c) : ScriptedAI(c), Summons(me) + boss_entropiusAI(Creature* c) : ScriptedAI(c), Summons(me) { pInstance = c->GetInstanceScript(); } @@ -213,7 +213,7 @@ public: struct boss_muruAI : public Scripted_NoMovementAI { - boss_muruAI(Creature *c) : Scripted_NoMovementAI(c), Summons(me) + boss_muruAI(Creature* c) : Scripted_NoMovementAI(c), Summons(me) { pInstance = c->GetInstanceScript(); } @@ -378,7 +378,7 @@ public: struct npc_muru_portalAI : public Scripted_NoMovementAI { - npc_muru_portalAI(Creature *c) : Scripted_NoMovementAI(c), Summons(me) + npc_muru_portalAI(Creature* c) : Scripted_NoMovementAI(c), Summons(me) { pInstance = c->GetInstanceScript(); } @@ -462,7 +462,7 @@ public: struct npc_dark_fiendAI : public ScriptedAI { - npc_dark_fiendAI(Creature *c) : ScriptedAI(c) {} + npc_dark_fiendAI(Creature* c) : ScriptedAI(c) {} uint32 WaitTimer; bool InAction; @@ -525,7 +525,7 @@ public: struct npc_void_sentinelAI : public ScriptedAI { - npc_void_sentinelAI(Creature *c) : ScriptedAI(c){} + npc_void_sentinelAI(Creature* c) : ScriptedAI(c){} uint32 PulseTimer; uint32 VoidBlastTimer; @@ -581,7 +581,7 @@ public: struct npc_blackholeAI : public ScriptedAI { - npc_blackholeAI(Creature *c) : ScriptedAI(c) + npc_blackholeAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } diff --git a/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp b/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp index ae3db51890a..16eabd71512 100644 --- a/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp +++ b/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp @@ -232,7 +232,7 @@ class mob_archaedas_minions : public CreatureScript struct mob_archaedas_minionsAI : public ScriptedAI { - mob_archaedas_minionsAI(Creature *c) : ScriptedAI(c) + mob_archaedas_minionsAI(Creature* c) : ScriptedAI(c) { pInstance = me->GetInstanceScript(); } @@ -276,7 +276,7 @@ class mob_archaedas_minions : public CreatureScript } } - void MoveInLineOfSight(Unit *who) + void MoveInLineOfSight(Unit* who) { if (bAmIAwake) ScriptedAI::MoveInLineOfSight(who); diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp index bdca5ad1fa3..495365067e9 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp @@ -73,7 +73,7 @@ class boss_akilzon : public CreatureScript struct boss_akilzonAI : public ScriptedAI { - boss_akilzonAI(Creature *c) : ScriptedAI(c) + boss_akilzonAI(Creature* c) : ScriptedAI(c) { SpellEntry *TempSpell = GET_SPELL(SPELL_ELECTRICAL_DAMAGE); if (TempSpell) @@ -184,7 +184,7 @@ class boss_akilzon : public CreatureScript pMap->SendToPlayers(&data); } - void HandleStormSequence(Unit *Cloud) // 1: begin, 2-9: tick, 10: end + void HandleStormSequence(Unit* Cloud) // 1: begin, 2-9: tick, 10: end { if (StormCount < 10 && StormCount > 1) { @@ -198,7 +198,7 @@ class boss_akilzon : public CreatureScript cell.data.Part.reserved = ALL_DISTRICT; cell.SetNoCreate(); - std::list<Unit *> tempUnitMap; + std::list<Unit* > tempUnitMap; { Trinity::AnyAoETargetUnitInObjectRangeCheck u_check(me, me, 999); @@ -225,7 +225,7 @@ class boss_akilzon : public CreatureScript { x = 343.0f+rand()%60; y = 1380.0f+rand()%60; - if (Unit *trigger = me->SummonTrigger(x, y, z, 0, 2000)) + if (Unit* trigger = me->SummonTrigger(x, y, z, 0, 2000)) { trigger->setFaction(35); trigger->SetMaxHealth(100000); @@ -258,7 +258,7 @@ class boss_akilzon : public CreatureScript if (StormCount) { - Unit *pTarget = Unit::GetUnit(*me, CloudGUID); + Unit* pTarget = Unit::GetUnit(*me, CloudGUID); if (!pTarget || !pTarget->isAlive()) { EnterEvadeMode(); @@ -285,7 +285,7 @@ class boss_akilzon : public CreatureScript if (StaticDisruption_Timer <= diff) { - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1); + Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1); if (!pTarget) pTarget = me->getVictim(); TargetGUID = pTarget->GetGUID(); DoCast(pTarget, SPELL_STATIC_DISRUPTION, false); @@ -298,7 +298,7 @@ class boss_akilzon : public CreatureScript if (GustOfWind_Timer <= diff) { - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1); + Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1); if (!pTarget) pTarget = me->getVictim(); DoCast(pTarget, SPELL_GUST_OF_WIND); GustOfWind_Timer = (20+rand()%10)*1000; //20 to 30 seconds(bosskillers) @@ -317,7 +317,7 @@ class boss_akilzon : public CreatureScript } if (ElectricalStorm_Timer <= diff) { - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 50, true); + Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 50, true); if (!pTarget) { EnterEvadeMode(); @@ -332,7 +332,7 @@ class boss_akilzon : public CreatureScript pTarget->SetUnitMovementFlags(MOVEMENTFLAG_LEVITATING); pTarget->SendMonsterMove(x, y, me->GetPositionZ()+15, 0); } - Unit *Cloud = me->SummonTrigger(x, y, me->GetPositionZ()+16, 0, 15000); + Unit* Cloud = me->SummonTrigger(x, y, me->GetPositionZ()+16, 0, 15000); if (Cloud) { CloudGUID = Cloud->GetGUID(); @@ -362,7 +362,7 @@ class boss_akilzon : public CreatureScript Unit* bird = Unit::GetUnit(*me, BirdGUIDs[i]); if (!bird) //they despawned on die { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) { x = pTarget->GetPositionX() + irand(-10, 10); y = pTarget->GetPositionY() + irand(-10, 10); @@ -370,7 +370,7 @@ class boss_akilzon : public CreatureScript if (z > 95) z = 95.0f - urand(0, 5); } - Creature *pCreature = me->SummonCreature(MOB_SOARING_EAGLE, x, y, z, 0, TEMPSUMMON_CORPSE_DESPAWN, 0); + Creature* pCreature = me->SummonCreature(MOB_SOARING_EAGLE, x, y, z, 0, TEMPSUMMON_CORPSE_DESPAWN, 0); if (pCreature) { pCreature->AddThreat(me->getVictim(), 1.0f); @@ -403,7 +403,7 @@ class mob_akilzon_eagle : public CreatureScript struct mob_akilzon_eagleAI : public ScriptedAI { - mob_akilzon_eagleAI(Creature *c) : ScriptedAI(c) {} + mob_akilzon_eagleAI(Creature* c) : ScriptedAI(c) {} uint32 EagleSwoop_Timer; bool arrived; @@ -426,7 +426,7 @@ class mob_akilzon_eagle : public CreatureScript arrived = true; if (TargetGUID) { - if (Unit *pTarget = Unit::GetUnit(*me, TargetGUID)) + if (Unit* pTarget = Unit::GetUnit(*me, TargetGUID)) DoCast(pTarget, SPELL_EAGLE_SWOOP, true); TargetGUID = 0; me->SetSpeed(MOVE_RUN, 1.2f); @@ -443,7 +443,7 @@ class mob_akilzon_eagle : public CreatureScript if (arrived) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) { float x, y, z; if (EagleSwoop_Timer) diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp index f38ffe564b5..8b8a24226af 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp @@ -84,7 +84,7 @@ class boss_halazzi : public CreatureScript struct boss_halazziAI : public ScriptedAI { - boss_halazziAI(Creature *c) : ScriptedAI(c) + boss_halazziAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); // need to find out what controls totem's spell cooldown @@ -153,7 +153,7 @@ class boss_halazzi : public CreatureScript EnterPhase(PHASE_HUMAN); } - void AttackStart(Unit *who) + void AttackStart(Unit* who) { if (Phase != PHASE_MERGE) ScriptedAI::AttackStart(who); } @@ -170,7 +170,7 @@ class boss_halazzi : public CreatureScript me->Attack(me->getVictim(), true); me->GetMotionMaster()->MoveChase(me->getVictim()); } - if (Creature *Lynx = Unit::GetCreature(*me, LynxGUID)) + if (Creature* Lynx = Unit::GetCreature(*me, LynxGUID)) Lynx->DisappearAndDie(); me->SetMaxHealth(600000); me->SetHealth(600000 - 150000 * TransformCount); @@ -193,7 +193,7 @@ class boss_halazzi : public CreatureScript TotemTimer = 12000; break; case PHASE_MERGE: - if (Unit *pLynx = Unit::GetUnit(*me, LynxGUID)) + if (Unit* pLynx = Unit::GetUnit(*me, LynxGUID)) { me->MonsterYell(YELL_MERGE, LANG_UNIVERSAL, 0); DoPlaySoundToSet(me, SOUND_MERGE); @@ -262,7 +262,7 @@ class boss_halazzi : public CreatureScript if (ShockTimer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) { if (pTarget->IsNonMeleeSpellCasted(false)) DoCast(pTarget, SPELL_EARTHSHOCK); @@ -280,7 +280,7 @@ class boss_halazzi : public CreatureScript EnterPhase(PHASE_MERGE); else { - Unit *Lynx = Unit::GetUnit(*me, LynxGUID); + Unit* Lynx = Unit::GetUnit(*me, LynxGUID); if (Lynx && !Lynx->HealthAbovePct(20) /*Lynx->HealthBelowPct(10)*/) EnterPhase(PHASE_MERGE); } @@ -293,7 +293,7 @@ class boss_halazzi : public CreatureScript { if (CheckTimer <= diff) { - Unit *Lynx = Unit::GetUnit(*me, LynxGUID); + Unit* Lynx = Unit::GetUnit(*me, LynxGUID); if (Lynx) { Lynx->GetMotionMaster()->MoveFollow(me, 0, 0); @@ -357,7 +357,7 @@ class mob_halazzi_lynx : public CreatureScript struct mob_halazzi_lynxAI : public ScriptedAI { - mob_halazzi_lynxAI(Creature *c) : ScriptedAI(c) {} + mob_halazzi_lynxAI(Creature* c) : ScriptedAI(c) {} uint32 FrenzyTimer; uint32 shredder_timer; @@ -374,7 +374,7 @@ class mob_halazzi_lynx : public CreatureScript damage = 0; } - void AttackStart(Unit *who) + void AttackStart(Unit* who) { if (!me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) ScriptedAI::AttackStart(who); diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp index 4a7f4eaa9c8..3f574f5da43 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp @@ -211,7 +211,7 @@ class boss_hexlord_malacrass : public CreatureScript struct boss_hex_lord_malacrassAI : public ScriptedAI { - boss_hex_lord_malacrassAI(Creature *c) : ScriptedAI(c) + boss_hex_lord_malacrassAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); SelectAddEntry(); @@ -325,7 +325,7 @@ class boss_hexlord_malacrass : public CreatureScript { for (uint8 i = 0; i < 4; ++i) { - Creature *pCreature = (Unit::GetCreature((*me), AddGUID[i])); + Creature* pCreature = (Unit::GetCreature((*me), AddGUID[i])); if (!pCreature || !pCreature->isAlive()) { if (pCreature) pCreature->setDeathState(DEAD); @@ -359,7 +359,7 @@ class boss_hexlord_malacrass : public CreatureScript if (CheckAddState_Timer <= diff) { for (uint8 i = 0; i < 4; ++i) - if (Creature *pTemp = Unit::GetCreature(*me, AddGUID[i])) + if (Creature* pTemp = Unit::GetCreature(*me, AddGUID[i])) if (pTemp->isAlive() && !pTemp->getVictim()) pTemp->AI()->AttackStart(me->getVictim()); @@ -391,8 +391,8 @@ class boss_hexlord_malacrass : public CreatureScript if (SiphonSoul_Timer <= diff) { - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 70, true); - Unit *trigger = DoSpawnCreature(MOB_TEMP_TRIGGER, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN, 30000); + Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 70, true); + Unit* trigger = DoSpawnCreature(MOB_TEMP_TRIGGER, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN, 30000); if (!pTarget || !trigger) { EnterEvadeMode(); @@ -424,7 +424,7 @@ class boss_hexlord_malacrass : public CreatureScript if (PlayerAbility_Timer <= diff) { - //Unit *pTarget = Unit::GetUnit(*me, PlayerGUID); + //Unit* pTarget = Unit::GetUnit(*me, PlayerGUID); //if (pTarget && pTarget->isAlive()) //{ UseAbility(); @@ -438,7 +438,7 @@ class boss_hexlord_malacrass : public CreatureScript void UseAbility() { uint8 random = urand(0, 2); - Unit *pTarget = NULL; + Unit* pTarget = NULL; switch(PlayerAbility[PlayerClass][random].target) { case ABILITY_TARGET_SELF: @@ -488,7 +488,7 @@ class boss_thurg : public CreatureScript struct boss_thurgAI : public boss_hexlord_addAI { - boss_thurgAI(Creature *c) : boss_hexlord_addAI(c) {} + boss_thurgAI(Creature* c) : boss_hexlord_addAI(c) {} uint32 bloodlust_timer; uint32 cleave_timer; @@ -511,7 +511,7 @@ class boss_thurg : public CreatureScript std::list<Creature*> templist = DoFindFriendlyMissingBuff(50, SPELL_BLOODLUST); if (!templist.empty()) { - if (Unit *pTarget = *(templist.begin())) + if (Unit* pTarget = *(templist.begin())) DoCast(pTarget, SPELL_BLOODLUST, false); } bloodlust_timer = 12000; @@ -548,7 +548,7 @@ class boss_alyson_antille : public CreatureScript struct boss_alyson_antilleAI : public boss_hexlord_addAI { //Holy Priest - boss_alyson_antilleAI(Creature *c) : boss_hexlord_addAI(c) {} + boss_alyson_antilleAI(Creature* c) : boss_hexlord_addAI(c) {} uint32 flashheal_timer; uint32 dispelmagic_timer; @@ -585,7 +585,7 @@ class boss_alyson_antille : public CreatureScript if (flashheal_timer <= diff) { - Unit *pTarget = DoSelectLowestHpFriendly(99, 30000); + Unit* pTarget = DoSelectLowestHpFriendly(99, 30000); if (pTarget) { if (pTarget->IsWithinDistInMap(me, 50)) @@ -613,7 +613,7 @@ class boss_alyson_antille : public CreatureScript { if (urand(0, 1)) { - Unit *pTarget = SelectTarget(); + Unit* pTarget = SelectTarget(); DoCast(pTarget, SPELL_DISPEL_MAGIC, false); } @@ -637,7 +637,7 @@ class boss_alyson_antille : public CreatureScript struct boss_gazakrothAI : public boss_hexlord_addAI { - boss_gazakrothAI(Creature *c) : boss_hexlord_addAI(c) {} + boss_gazakrothAI(Creature* c) : boss_hexlord_addAI(c) {} uint32 firebolt_timer; @@ -691,7 +691,7 @@ class boss_lord_raadan : public CreatureScript struct boss_lord_raadanAI : public boss_hexlord_addAI { - boss_lord_raadanAI(Creature *c) : boss_hexlord_addAI(c) {} + boss_lord_raadanAI(Creature* c) : boss_hexlord_addAI(c) {} uint32 flamebreath_timer; uint32 thunderclap_timer; @@ -744,7 +744,7 @@ class boss_darkheart : public CreatureScript struct boss_darkheartAI : public boss_hexlord_addAI { - boss_darkheartAI(Creature *c) : boss_hexlord_addAI(c) {} + boss_darkheartAI(Creature* c) : boss_hexlord_addAI(c) {} uint32 psychicwail_timer; @@ -787,7 +787,7 @@ class boss_slither : public CreatureScript struct boss_slitherAI : public boss_hexlord_addAI { - boss_slitherAI(Creature *c) : boss_hexlord_addAI(c) {} + boss_slitherAI(Creature* c) : boss_hexlord_addAI(c) {} uint32 venomspit_timer; @@ -847,7 +847,7 @@ class boss_fenstalker : public CreatureScript struct boss_fenstalkerAI : public boss_hexlord_addAI { - boss_fenstalkerAI(Creature *c) : boss_hexlord_addAI(c) {} + boss_fenstalkerAI(Creature* c) : boss_hexlord_addAI(c) {} uint32 volatileinf_timer; @@ -894,7 +894,7 @@ class boss_koragg : public CreatureScript struct boss_koraggAI : public boss_hexlord_addAI { - boss_koraggAI(Creature *c) : boss_hexlord_addAI(c) {} + boss_koraggAI(Creature* c) : boss_hexlord_addAI(c) {} uint32 coldstare_timer; uint32 mightyblow_timer; diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp index bfe833cbed8..c1f80fb50af 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp @@ -113,7 +113,7 @@ class boss_janalai : public CreatureScript struct boss_janalaiAI : public ScriptedAI { - boss_janalaiAI(Creature *c) : ScriptedAI(c) + boss_janalaiAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -181,7 +181,7 @@ class boss_janalai : public CreatureScript // DoZoneInCombat(); } - void DamageDealt(Unit *pTarget, uint32 &damage, DamageEffectType /*damagetype*/) + void DamageDealt(Unit* pTarget, uint32 &damage, DamageEffectType /*damagetype*/) { if (isFlameBreathing) { @@ -290,7 +290,7 @@ class boss_janalai : public CreatureScript { if (BombCount < 40) { - if (Unit *FireBomb = Unit::GetUnit((*me), FireBombGUIDs[BombCount])) + if (Unit* FireBomb = Unit::GetUnit((*me), FireBombGUIDs[BombCount])) { FireBomb->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); DoCast(FireBomb, SPELL_FIRE_BOMB_THROW, true); @@ -420,7 +420,7 @@ class boss_janalai : public CreatureScript if (FireBreathTimer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) { me->AttackStop(); me->GetMotionMaster()->Clear(); @@ -450,7 +450,7 @@ class mob_janalai_firebomb : public CreatureScript struct mob_janalai_firebombAI : public ScriptedAI { - mob_janalai_firebombAI(Creature *c) : ScriptedAI(c){} + mob_janalai_firebombAI(Creature* c) : ScriptedAI(c){} void Reset() {} @@ -486,7 +486,7 @@ class mob_janalai_hatcher : public CreatureScript struct mob_janalai_hatcherAI : public ScriptedAI { - mob_janalai_hatcherAI(Creature *c) : ScriptedAI(c) + mob_janalai_hatcherAI(Creature* c) : ScriptedAI(c) { pInstance =c->GetInstanceScript(); } @@ -619,7 +619,7 @@ class mob_janalai_hatchling : public CreatureScript struct mob_janalai_hatchlingAI : public ScriptedAI { - mob_janalai_hatchlingAI(Creature *c) : ScriptedAI(c) + mob_janalai_hatchlingAI(Creature* c) : ScriptedAI(c) { pInstance =c->GetInstanceScript(); } diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp index 69e051f52f6..3a6ccacf753 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp @@ -101,7 +101,7 @@ class boss_nalorakk : public CreatureScript struct boss_nalorakkAI : public ScriptedAI { - boss_nalorakkAI(Creature *c) : ScriptedAI(c) + boss_nalorakkAI(Creature* c) : ScriptedAI(c) { MoveEvent = true; MovePhase = 0; @@ -155,7 +155,7 @@ class boss_nalorakk : public CreatureScript // me->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID + 1, 5122); // TODO: find the correct equipment id } - void SendAttacker(Unit *pTarget) + void SendAttacker(Unit* pTarget) { std::list<Creature*> templist; float x, y, z; @@ -194,7 +194,7 @@ class boss_nalorakk : public CreatureScript ScriptedAI::AttackStart(who); } - void MoveInLineOfSight(Unit *who) + void MoveInLineOfSight(Unit* who) { if (!MoveEvent) { @@ -414,7 +414,7 @@ class boss_nalorakk : public CreatureScript { me->MonsterYell(YELL_SURGE, LANG_UNIVERSAL, 0); DoPlaySoundToSet(me, SOUND_YELL_SURGE); - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1, 45, true); + Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1, 45, true); if (pTarget) DoCast(pTarget, SPELL_SURGE); Surge_Timer = 15000 + rand()%5000; diff --git a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp index c301447fa61..b7de5302fd9 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp @@ -91,7 +91,7 @@ class npc_forest_frog : public CreatureScript } } - void SpellHit(Unit *caster, const SpellEntry *spell) + void SpellHit(Unit* caster, const SpellEntry *spell) { if (spell->Id == SPELL_REMOVE_AMANI_CURSE && caster->GetTypeId() == TYPEID_PLAYER && me->GetEntry() == ENTRY_FOREST_FROG) { @@ -128,7 +128,7 @@ class npc_zulaman_hostage : public CreatureScript struct npc_zulaman_hostageAI : public ScriptedAI { - npc_zulaman_hostageAI(Creature *c) : ScriptedAI(c) {IsLoot = false;} + npc_zulaman_hostageAI(Creature* c) : ScriptedAI(c) {IsLoot = false;} bool IsLoot; uint64 PlayerGUID; void Reset() {} diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp index dbbe60d7cef..7f506af0525 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp @@ -130,7 +130,7 @@ class boss_arlokk : public CreatureScript void DoSummonPhanters() { - if (Unit *pMarkedTarget = Unit::GetUnit(*me, MarkedTargetGUID)) + if (Unit* pMarkedTarget = Unit::GetUnit(*me, MarkedTargetGUID)) DoScriptText(SAY_FEAST_PANTHER, me, pMarkedTarget); me->SummonCreature(NPC_ZULIAN_PROWLER, -11532.7998f, -1649.6734f, 41.4800f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); @@ -139,7 +139,7 @@ class boss_arlokk : public CreatureScript void JustSummoned(Creature* pSummoned) { - if (Unit *pMarkedTarget = Unit::GetUnit(*me, MarkedTargetGUID)) + if (Unit* pMarkedTarget = Unit::GetUnit(*me, MarkedTargetGUID)) pSummoned->AI()->AttackStart(pMarkedTarget); ++m_uiSummonCount; @@ -162,7 +162,7 @@ class boss_arlokk : public CreatureScript if (m_uiMark_Timer <= uiDiff) { - Unit *pMarkedTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); + Unit* pMarkedTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pMarkedTarget) { diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp index 2eac011f8c9..c515b625e6f 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp @@ -40,7 +40,7 @@ class boss_gahzranka : public CreatureScript struct boss_gahzrankaAI : public ScriptedAI { - boss_gahzrankaAI(Creature *c) : ScriptedAI(c) {} + boss_gahzrankaAI(Creature* c) : ScriptedAI(c) {} uint32 Frostbreath_Timer; uint32 MassiveGeyser_Timer; uint32 Slam_Timer; diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp index 0fb323982f1..fe5e8a98476 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp @@ -40,7 +40,7 @@ class boss_grilek : public CreatureScript struct boss_grilekAI : public ScriptedAI { - boss_grilekAI(Creature *c) : ScriptedAI(c) {} + boss_grilekAI(Creature* c) : ScriptedAI(c) {} uint32 Avartar_Timer; uint32 GroundTremor_Timer; @@ -66,7 +66,7 @@ class boss_grilek : public CreatureScript { DoCast(me, SPELL_AVARTAR); - Unit *pTarget = NULL; + Unit* pTarget = NULL; pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1); diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp index f1f65e4408d..16cd74ba0f3 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp @@ -55,7 +55,7 @@ class boss_hakkar : public CreatureScript struct boss_hakkarAI : public ScriptedAI { - boss_hakkarAI(Creature *c) : ScriptedAI(c) + boss_hakkarAI(Creature* c) : ScriptedAI(c) { m_pInstance = c->GetInstanceScript(); } @@ -132,7 +132,7 @@ class boss_hakkar : public CreatureScript //CauseInsanity_Timer /*if (CauseInsanity_Timer <= diff) { - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_CAUSEINSANITY); CauseInsanity_Timer = 35000 + rand()%8000; @@ -141,7 +141,7 @@ class boss_hakkar : public CreatureScript //WillOfHakkar_Timer if (WillOfHakkar_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_WILLOFHAKKAR); WillOfHakkar_Timer = 25000 + rand()%10000; diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp index db8182113ce..1e2b990eb5b 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp @@ -40,7 +40,7 @@ class boss_hazzarah : public CreatureScript struct boss_hazzarahAI : public ScriptedAI { - boss_hazzarahAI(Creature *c) : ScriptedAI(c) {} + boss_hazzarahAI(Creature* c) : ScriptedAI(c) {} uint32 ManaBurn_Timer; uint32 Sleep_Timer; @@ -81,14 +81,14 @@ class boss_hazzarah : public CreatureScript { //We will summon 3 illusions that will spawn on a random gamer and attack this gamer //We will just use one model for the beginning - Unit *pTarget = NULL; + Unit* pTarget = NULL; for (uint8 i = 0; i < 3; ++i) { pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (!pTarget) return; - Creature *Illusion = me->SummonCreature(15163, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 30000); + Creature* Illusion = me->SummonCreature(15163, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 30000); if (Illusion) Illusion->AI()->AttackStart(pTarget); } diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp index 706fc14327e..f64fd167c06 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp @@ -54,7 +54,7 @@ class boss_jeklik : public CreatureScript struct boss_jeklikAI : public ScriptedAI { - boss_jeklikAI(Creature *c) : ScriptedAI(c) + boss_jeklikAI(Creature* c) : ScriptedAI(c) { m_pInstance = c->GetInstanceScript(); } @@ -113,7 +113,7 @@ class boss_jeklik : public CreatureScript { if (Charge_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) { DoCast(pTarget, SPELL_CHARGE); AttackStart(pTarget); @@ -136,7 +136,7 @@ class boss_jeklik : public CreatureScript if (SpawnBats_Timer <= diff) { - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); + Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); Creature* Bat = NULL; Bat = me->SummonCreature(11368, -12291.6220f, -1380.2640f, 144.8304f, 5.483f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); @@ -165,7 +165,7 @@ class boss_jeklik : public CreatureScript { if (PhaseTwo && ShadowWordPain_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) { DoCast(pTarget, SPELL_SHADOW_WORD_PAIN); ShadowWordPain_Timer = 12000 + rand()%6000; @@ -194,7 +194,7 @@ class boss_jeklik : public CreatureScript if (SpawnFlyingBats_Timer <= diff) { - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); + Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (!pTarget) return; @@ -236,7 +236,7 @@ class mob_batrider : public CreatureScript struct mob_batriderAI : public ScriptedAI { - mob_batriderAI(Creature *c) : ScriptedAI(c) + mob_batriderAI(Creature* c) : ScriptedAI(c) { m_pInstance = c->GetInstanceScript(); } @@ -264,7 +264,7 @@ class mob_batrider : public CreatureScript //Bomb_Timer if (Bomb_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) { DoCast(pTarget, SPELL_BOMB); Bomb_Timer = 5000; diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp index c9ac816ecea..81bd6ba9032 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp @@ -52,7 +52,7 @@ class boss_jindo : public CreatureScript struct boss_jindoAI : public ScriptedAI { - boss_jindoAI(Creature *c) : ScriptedAI(c) {} + boss_jindoAI(Creature* c) : ScriptedAI(c) {} uint32 BrainWashTotem_Timer; uint32 HealingWard_Timer; @@ -108,11 +108,11 @@ class boss_jindo : public CreatureScript //Casting the delusion curse with a shade. So shade will attack the same target with the curse. if (Delusions_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) { DoCast(pTarget, SPELL_DELUSIONSOFJINDO); - Creature *Shade = me->SummonCreature(14986, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + Creature* Shade = me->SummonCreature(14986, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (Shade) Shade->AI()->AttackStart(pTarget); } @@ -123,7 +123,7 @@ class boss_jindo : public CreatureScript //Teleporting a random gamer and spawning 9 skeletons that will attack this gamer if (Teleport_Timer <= diff) { - Unit *pTarget = NULL; + Unit* pTarget = NULL; pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget && pTarget->GetTypeId() == TYPEID_PLAYER) { @@ -132,7 +132,7 @@ class boss_jindo : public CreatureScript if (DoGetThreat(me->getVictim())) DoModifyThreatPercent(pTarget, -100); - Creature *Skeletons; + Creature* Skeletons; Skeletons = me->SummonCreature(14826, pTarget->GetPositionX()+2, pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (Skeletons) Skeletons->AI()->AttackStart(pTarget); @@ -187,7 +187,7 @@ class mob_healing_ward : public CreatureScript struct mob_healing_wardAI : public ScriptedAI { - mob_healing_wardAI(Creature *c) : ScriptedAI(c) + mob_healing_wardAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -212,7 +212,7 @@ class mob_healing_ward : public CreatureScript { if (pInstance) { - Unit *pJindo = Unit::GetUnit((*me), pInstance->GetData64(DATA_JINDO)); + Unit* pJindo = Unit::GetUnit((*me), pInstance->GetData64(DATA_JINDO)); if (pJindo) DoCast(pJindo, SPELL_HEAL); } @@ -241,7 +241,7 @@ class mob_shade_of_jindo : public CreatureScript struct mob_shade_of_jindoAI : public ScriptedAI { - mob_shade_of_jindoAI(Creature *c) : ScriptedAI(c) {} + mob_shade_of_jindoAI(Creature* c) : ScriptedAI(c) {} uint32 ShadowShock_Timer; diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp index 60db1387276..59b305b974a 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp @@ -55,7 +55,7 @@ class boss_mandokir : public CreatureScript struct boss_mandokirAI : public ScriptedAI { - boss_mandokirAI(Creature *c) : ScriptedAI(c) + boss_mandokirAI(Creature* c) : ScriptedAI(c) { m_pInstance = c->GetInstanceScript(); } @@ -294,7 +294,7 @@ class mob_ohgan : public CreatureScript struct mob_ohganAI : public ScriptedAI { - mob_ohganAI(Creature *c) : ScriptedAI(c) + mob_ohganAI(Creature* c) : ScriptedAI(c) { m_pInstance = c->GetInstanceScript(); } diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp index fa6fe02f5a0..da6f41d4ca0 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp @@ -51,7 +51,7 @@ class boss_marli : public CreatureScript struct boss_marliAI : public ScriptedAI { - boss_marliAI(Creature *c) : ScriptedAI(c) + boss_marliAI(Creature* c) : ScriptedAI(c) { m_pInstance = c->GetInstanceScript(); } @@ -118,11 +118,11 @@ class boss_marli : public CreatureScript { DoScriptText(SAY_SPIDER_SPAWN, me); - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); + Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (!pTarget) return; - Creature *Spider = NULL; + Creature* Spider = NULL; Spider = me->SummonCreature(15041, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (Spider) @@ -142,11 +142,11 @@ class boss_marli : public CreatureScript if (SpawnSpider_Timer <= diff) { - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); + Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (!pTarget) return; - Creature *Spider = me->SummonCreature(15041, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + Creature* Spider = me->SummonCreature(15041, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (Spider) Spider->AI()->AttackStart(pTarget); SpawnSpider_Timer = 12000 + rand()%5000; @@ -173,7 +173,7 @@ class boss_marli : public CreatureScript { if (Charge_Timer <= diff) { - Unit *pTarget = NULL; + Unit* pTarget = NULL; int i = 0; while (i < 3) // max 3 tries to get a random target with power_mana { @@ -230,7 +230,7 @@ class mob_spawn_of_marli : public CreatureScript struct mob_spawn_of_marliAI : public ScriptedAI { - mob_spawn_of_marliAI(Creature *c) : ScriptedAI(c) {} + mob_spawn_of_marliAI(Creature* c) : ScriptedAI(c) {} uint32 LevelUp_Timer; diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp index d534c1788eb..c05bc2e6fcb 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp @@ -42,7 +42,7 @@ class boss_renataki : public CreatureScript struct boss_renatakiAI : public ScriptedAI { - boss_renatakiAI(Creature *c) : ScriptedAI(c) {} + boss_renatakiAI(Creature* c) : ScriptedAI(c) {} uint32 Invisible_Timer; uint32 Ambush_Timer; @@ -92,7 +92,7 @@ class boss_renataki : public CreatureScript { if (Ambush_Timer <= diff) { - Unit *pTarget = NULL; + Unit* pTarget = NULL; pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget) { @@ -126,7 +126,7 @@ class boss_renataki : public CreatureScript { if (Aggro_Timer <= diff) { - Unit *pTarget = NULL; + Unit* pTarget = NULL; pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1); if (DoGetThreat(me->getVictim())) diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp index efdd095681e..cd6294d1751 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp @@ -66,7 +66,7 @@ class boss_thekal : public CreatureScript struct boss_thekalAI : public ScriptedAI { - boss_thekalAI(Creature *c) : ScriptedAI(c) + boss_thekalAI(Creature* c) : ScriptedAI(c) { m_pInstance = c->GetInstanceScript(); } @@ -134,7 +134,7 @@ class boss_thekal : public CreatureScript if (m_pInstance->GetData(TYPE_LORKHAN) == SPECIAL) { //Resurrect LorKhan - if (Unit *pLorKhan = Unit::GetUnit((*me), m_pInstance->GetData64(DATA_LORKHAN))) + if (Unit* pLorKhan = Unit::GetUnit((*me), m_pInstance->GetData64(DATA_LORKHAN))) { pLorKhan->SetUInt32Value(UNIT_FIELD_BYTES_1, 0); pLorKhan->setFaction(14); @@ -148,7 +148,7 @@ class boss_thekal : public CreatureScript if (m_pInstance->GetData(TYPE_ZATH) == SPECIAL) { //Resurrect Zath - Unit *pZath = Unit::GetUnit((*me), m_pInstance->GetData64(DATA_ZATH)); + Unit* pZath = Unit::GetUnit((*me), m_pInstance->GetData64(DATA_ZATH)); if (pZath) { pZath->SetUInt32Value(UNIT_FIELD_BYTES_1, 0); @@ -219,7 +219,7 @@ class boss_thekal : public CreatureScript { if (Charge_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) { DoCast(pTarget, SPELL_CHARGE); DoResetThreat(); @@ -277,7 +277,7 @@ class mob_zealot_lorkhan : public CreatureScript struct mob_zealot_lorkhanAI : public ScriptedAI { - mob_zealot_lorkhanAI(Creature *c) : ScriptedAI(c) + mob_zealot_lorkhanAI(Creature* c) : ScriptedAI(c) { m_pInstance = c->GetInstanceScript(); } @@ -337,8 +337,8 @@ class mob_zealot_lorkhan : public CreatureScript { if (m_pInstance) { - Unit *pThekal = Unit::GetUnit((*me), m_pInstance->GetData64(DATA_THEKAL)); - Unit *pZath = Unit::GetUnit((*me), m_pInstance->GetData64(DATA_ZATH)); + Unit* pThekal = Unit::GetUnit((*me), m_pInstance->GetData64(DATA_THEKAL)); + Unit* pZath = Unit::GetUnit((*me), m_pInstance->GetData64(DATA_ZATH)); if (!pThekal || !pZath) return; @@ -374,7 +374,7 @@ class mob_zealot_lorkhan : public CreatureScript if (m_pInstance->GetData(TYPE_THEKAL) == SPECIAL) { //Resurrect Thekal - if (Unit *pThekal = Unit::GetUnit((*me), m_pInstance->GetData64(DATA_THEKAL))) + if (Unit* pThekal = Unit::GetUnit((*me), m_pInstance->GetData64(DATA_THEKAL))) { pThekal->SetUInt32Value(UNIT_FIELD_BYTES_1, 0); pThekal->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); @@ -386,7 +386,7 @@ class mob_zealot_lorkhan : public CreatureScript if (m_pInstance->GetData(TYPE_ZATH) == SPECIAL) { //Resurrect Zath - if (Unit *pZath = Unit::GetUnit((*me), m_pInstance->GetData64(DATA_ZATH))) + if (Unit* pZath = Unit::GetUnit((*me), m_pInstance->GetData64(DATA_ZATH))) { pZath->SetUInt32Value(UNIT_FIELD_BYTES_1, 0); pZath->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); @@ -437,7 +437,7 @@ class mob_zealot_zath : public CreatureScript struct mob_zealot_zathAI : public ScriptedAI { - mob_zealot_zathAI(Creature *c) : ScriptedAI(c) + mob_zealot_zathAI(Creature* c) : ScriptedAI(c) { m_pInstance = c->GetInstanceScript(); } @@ -527,7 +527,7 @@ class mob_zealot_zath : public CreatureScript if (m_pInstance->GetData(TYPE_LORKHAN) == SPECIAL) { //Resurrect LorKhan - if (Unit *pLorKhan = Unit::GetUnit((*me), m_pInstance->GetData64(DATA_LORKHAN))) + if (Unit* pLorKhan = Unit::GetUnit((*me), m_pInstance->GetData64(DATA_LORKHAN))) { pLorKhan->SetUInt32Value(UNIT_FIELD_BYTES_1, 0); pLorKhan->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); @@ -539,7 +539,7 @@ class mob_zealot_zath : public CreatureScript if (m_pInstance->GetData(TYPE_THEKAL) == SPECIAL) { //Resurrect Thekal - if (Unit *pThekal = Unit::GetUnit((*me), m_pInstance->GetData64(DATA_THEKAL))) + if (Unit* pThekal = Unit::GetUnit((*me), m_pInstance->GetData64(DATA_THEKAL))) { pThekal->SetUInt32Value(UNIT_FIELD_BYTES_1, 0); pThekal->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp index 9973dcd8724..a22bc45c753 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp @@ -50,7 +50,7 @@ class boss_venoxis : public CreatureScript struct boss_venoxisAI : public ScriptedAI { - boss_venoxisAI(Creature *c) : ScriptedAI(c) + boss_venoxisAI(Creature* c) : ScriptedAI(c) { m_pInstance = c->GetInstanceScript(); } @@ -125,7 +125,7 @@ class boss_venoxis : public CreatureScript TargetInRange = 0; for (uint8 i = 0; i < 10; ++i) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_TOPAGGRO, i)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_TOPAGGRO, i)) if (me->IsWithinMeleeRange(pTarget)) ++TargetInRange; } @@ -144,7 +144,7 @@ class boss_venoxis : public CreatureScript if (HolyFire_Timer < diff && TargetInRange < 3) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_HOLY_FIRE); HolyFire_Timer = 8000; @@ -174,7 +174,7 @@ class boss_venoxis : public CreatureScript if (PhaseTwo && VenomSpit_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_VENOMSPIT); VenomSpit_Timer = 15000 + rand()%5000; diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp index 9ea2dbdcf91..9857ba68ffc 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp @@ -40,7 +40,7 @@ class boss_wushoolay : public CreatureScript struct boss_wushoolayAI : public ScriptedAI { - boss_wushoolayAI(Creature *c) : ScriptedAI(c) {} + boss_wushoolayAI(Creature* c) : ScriptedAI(c) {} uint32 LightningCloud_Timer; uint32 LightningWave_Timer; @@ -70,7 +70,7 @@ class boss_wushoolay : public CreatureScript //LightningWave_Timer if (LightningWave_Timer <= diff) { - Unit *pTarget = NULL; + Unit* pTarget = NULL; pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget) DoCast(pTarget, SPELL_LIGHTNINGWAVE); diff --git a/src/server/scripts/EasternKingdoms/arathi_highlands.cpp b/src/server/scripts/EasternKingdoms/arathi_highlands.cpp index 45a8d19b803..adbeebdaf12 100644 --- a/src/server/scripts/EasternKingdoms/arathi_highlands.cpp +++ b/src/server/scripts/EasternKingdoms/arathi_highlands.cpp @@ -62,7 +62,7 @@ class npc_professor_phizzlethorpe : public CreatureScript struct npc_professor_phizzlethorpeAI : public npc_escortAI { - npc_professor_phizzlethorpeAI(Creature *c) : npc_escortAI(c) {} + npc_professor_phizzlethorpeAI(Creature* c) : npc_escortAI(c) {} void WaypointReached(uint32 uiPointId) { diff --git a/src/server/scripts/EasternKingdoms/boss_kruul.cpp b/src/server/scripts/EasternKingdoms/boss_kruul.cpp index d1c2220c262..1cc110d3eb7 100644 --- a/src/server/scripts/EasternKingdoms/boss_kruul.cpp +++ b/src/server/scripts/EasternKingdoms/boss_kruul.cpp @@ -45,7 +45,7 @@ public: struct boss_kruulAI : public ScriptedAI { - boss_kruulAI(Creature *c) : ScriptedAI(c) {} + boss_kruulAI(Creature* c) : ScriptedAI(c) {} uint32 ShadowVolley_Timer; uint32 Cleave_Timer; @@ -78,7 +78,7 @@ public: void SummonHounds(Unit* pVictim) { - if (Creature *Hound = DoSpawnCreature(19207, float(irand(-9, 9)), float(irand(-9, 9)), 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 300000)) + if (Creature* Hound = DoSpawnCreature(19207, float(irand(-9, 9)), float(irand(-9, 9)), 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 300000)) Hound->AI()->AttackStart(pVictim); } diff --git a/src/server/scripts/EasternKingdoms/burning_steppes.cpp b/src/server/scripts/EasternKingdoms/burning_steppes.cpp index 42435714261..6e517937cb0 100644 --- a/src/server/scripts/EasternKingdoms/burning_steppes.cpp +++ b/src/server/scripts/EasternKingdoms/burning_steppes.cpp @@ -127,11 +127,11 @@ public: struct npc_ragged_johnAI : public ScriptedAI { - npc_ragged_johnAI(Creature *c) : ScriptedAI(c) {} + npc_ragged_johnAI(Creature* c) : ScriptedAI(c) {} void Reset() {} - void MoveInLineOfSight(Unit *who) + void MoveInLineOfSight(Unit* who) { if (who->HasAura(16468)) { diff --git a/src/server/scripts/EasternKingdoms/duskwood.cpp b/src/server/scripts/EasternKingdoms/duskwood.cpp index 6a550d55a0b..9e2fd198df2 100644 --- a/src/server/scripts/EasternKingdoms/duskwood.cpp +++ b/src/server/scripts/EasternKingdoms/duskwood.cpp @@ -75,7 +75,7 @@ public: struct boss_twilight_corrupterAI : public ScriptedAI { - boss_twilight_corrupterAI(Creature *c) : ScriptedAI(c) {} + boss_twilight_corrupterAI(Creature* c) : ScriptedAI(c) {} uint32 SoulCorruption_Timer; uint32 CreatureOfNightmare_Timer; @@ -116,6 +116,7 @@ public: DoCast(me->getVictim(), SPELL_SOUL_CORRUPTION); SoulCorruption_Timer = rand()%4000+15000; //gotta confirm Timers } else SoulCorruption_Timer-=diff; + if (CreatureOfNightmare_Timer <= diff) { DoCast(me->getVictim(), SPELL_CREATURE_OF_NIGHTMARE); diff --git a/src/server/scripts/EasternKingdoms/eastern_plaguelands.cpp b/src/server/scripts/EasternKingdoms/eastern_plaguelands.cpp index 0457c58b2f7..ce07f3bbd7a 100644 --- a/src/server/scripts/EasternKingdoms/eastern_plaguelands.cpp +++ b/src/server/scripts/EasternKingdoms/eastern_plaguelands.cpp @@ -48,7 +48,7 @@ public: struct mobs_ghoul_flayerAI : public ScriptedAI { - mobs_ghoul_flayerAI(Creature *c) : ScriptedAI(c) {} + mobs_ghoul_flayerAI(Creature* c) : ScriptedAI(c) {} void Reset() {} @@ -120,7 +120,7 @@ public: struct npc_darrowshire_spiritAI : public ScriptedAI { - npc_darrowshire_spiritAI(Creature *c) : ScriptedAI(c) {} + npc_darrowshire_spiritAI(Creature* c) : ScriptedAI(c) {} void Reset() { diff --git a/src/server/scripts/EasternKingdoms/eversong_woods.cpp b/src/server/scripts/EasternKingdoms/eversong_woods.cpp index d720b37f056..aaf226474e1 100644 --- a/src/server/scripts/EasternKingdoms/eversong_woods.cpp +++ b/src/server/scripts/EasternKingdoms/eversong_woods.cpp @@ -88,7 +88,7 @@ public: struct npc_prospector_anvilwardAI : public npc_escortAI { // CreatureAI functions - npc_prospector_anvilwardAI(Creature *c) : npc_escortAI(c) {} + npc_prospector_anvilwardAI(Creature* c) : npc_escortAI(c) {} // Pure Virtual Functions void WaypointReached(uint32 i) @@ -259,7 +259,7 @@ public: me->setFaction(FACTION_HOSTILE); questPhase = 0; - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) { me->AddThreat(pTarget, 5000000.0f); AttackStart(pTarget); @@ -379,7 +379,7 @@ public: struct master_kelerun_bloodmournAI : public ScriptedAI { - master_kelerun_bloodmournAI(Creature *c) : ScriptedAI(c) {} + master_kelerun_bloodmournAI(Creature* c) : ScriptedAI(c) {} uint8 questPhase; uint8 paladinPhase; @@ -456,7 +456,7 @@ public: { // no player check, quest can be finished as group, so no complex PlayerGUID/group search code for (uint8 i = 0; i < 4; ++i) - if (Creature *pSummoned = DoSpawnCreature(PaladinEntry[i], SpawnPosition[i].x, SpawnPosition[i].y, SpawnPosition[i].z, SpawnPosition[i].o, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 180000)) + if (Creature* pSummoned = DoSpawnCreature(PaladinEntry[i], SpawnPosition[i].x, SpawnPosition[i].y, SpawnPosition[i].z, SpawnPosition[i].o, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 180000)) paladinGuid[i] = pSummoned->GetGUID(); timer = OFFSET_NEXT_ATTACK; @@ -485,7 +485,7 @@ void npc_second_trial_paladin::npc_secondTrialAI::JustDied(Unit* Killer) { if (Killer->GetTypeId() == TYPEID_PLAYER) { - if (Creature *pSummoner = Unit::GetCreature((*me), summonerGuid)) + if (Creature* pSummoner = Unit::GetCreature((*me), summonerGuid)) CAST_AI(npc_second_trial_controller::master_kelerun_bloodmournAI, pSummoner->AI())->SecondTrialKill(); // last kill quest complete for group @@ -508,7 +508,7 @@ public: bool OnGossipHello(Player* /*pPlayer*/, GameObject* pGO) { // find spawn :: master_kelerun_bloodmourn - if (Creature *pCreature = pGO->FindNearestCreature(MASTER_KELERUN_BLOODMOURN, 30.0f)) + if (Creature* pCreature = pGO->FindNearestCreature(MASTER_KELERUN_BLOODMOURN, 30.0f)) CAST_AI(npc_second_trial_controller::master_kelerun_bloodmournAI, pCreature->AI())->StartEvent(); return true; @@ -563,7 +563,7 @@ public: void EnterCombat(Unit* /*who*/){} - void JustSummoned(Creature *summoned) + void JustSummoned(Creature* summoned) { summoned->AI()->AttackStart(me); Summons.Summon(summoned); @@ -668,7 +668,7 @@ public: } } - void JustSummoned(Creature *summoned) + void JustSummoned(Creature* summoned) { summoned->AI()->AttackStart(me); } diff --git a/src/server/scripts/EasternKingdoms/ghostlands.cpp b/src/server/scripts/EasternKingdoms/ghostlands.cpp index 6c527275864..290d2f1b5ee 100644 --- a/src/server/scripts/EasternKingdoms/ghostlands.cpp +++ b/src/server/scripts/EasternKingdoms/ghostlands.cpp @@ -50,7 +50,7 @@ public: if (uiAction == GOSSIP_ACTION_INFO_DEF+1) { ItemPosCountVec dest; - uint8 msg = pPlayer->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, 24226, 1, false); + uint8 msg = pPlayer->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, 24226, 1, NULL); if (msg == EQUIP_ERR_OK) { pPlayer->StoreNewItem(dest, 24226, 1, true); @@ -169,7 +169,7 @@ public: struct npc_ranger_lilathaAI : public npc_escortAI { - npc_ranger_lilathaAI(Creature *c) : npc_escortAI(c) {} + npc_ranger_lilathaAI(Creature* c) : npc_escortAI(c) {} void WaypointReached(uint32 i) { diff --git a/src/server/scripts/EasternKingdoms/isle_of_queldanas.cpp b/src/server/scripts/EasternKingdoms/isle_of_queldanas.cpp index 6c598cb85b6..188959cbd23 100644 --- a/src/server/scripts/EasternKingdoms/isle_of_queldanas.cpp +++ b/src/server/scripts/EasternKingdoms/isle_of_queldanas.cpp @@ -51,7 +51,7 @@ public: struct npc_converted_sentryAI : public ScriptedAI { - npc_converted_sentryAI(Creature *c) : ScriptedAI(c) {} + npc_converted_sentryAI(Creature* c) : ScriptedAI(c) {} bool Credit; uint32 Timer; diff --git a/src/server/scripts/EasternKingdoms/silvermoon_city.cpp b/src/server/scripts/EasternKingdoms/silvermoon_city.cpp index 7fb5a028d41..36f26a957d1 100644 --- a/src/server/scripts/EasternKingdoms/silvermoon_city.cpp +++ b/src/server/scripts/EasternKingdoms/silvermoon_city.cpp @@ -53,7 +53,7 @@ public: struct npc_blood_knight_stillbladeAI : public ScriptedAI { - npc_blood_knight_stillbladeAI(Creature *c) : ScriptedAI(c) {} + npc_blood_knight_stillbladeAI(Creature* c) : ScriptedAI(c) {} uint32 lifeTimer; bool spellHit; @@ -85,7 +85,7 @@ public: } } - void SpellHit(Unit *Hitter, const SpellEntry *Spellkind) + void SpellHit(Unit* Hitter, const SpellEntry *Spellkind) { if ((Spellkind->Id == SPELL_SHIMMERING_VESSEL) && !spellHit && (Hitter->GetTypeId() == TYPEID_PLAYER) && (CAST_PLR(Hitter)->IsActiveQuest(QUEST_REDEEMING_THE_DEAD))) diff --git a/src/server/scripts/EasternKingdoms/silverpine_forest.cpp b/src/server/scripts/EasternKingdoms/silverpine_forest.cpp index 6446b8d2dfe..0d02499d9c0 100644 --- a/src/server/scripts/EasternKingdoms/silverpine_forest.cpp +++ b/src/server/scripts/EasternKingdoms/silverpine_forest.cpp @@ -80,7 +80,7 @@ public: struct npc_astor_hadrenAI : public ScriptedAI { - npc_astor_hadrenAI(Creature *c) : ScriptedAI(c) {} + npc_astor_hadrenAI(Creature* c) : ScriptedAI(c) {} void Reset() { @@ -132,7 +132,7 @@ public: struct npc_deathstalker_erlandAI : public npc_escortAI { - npc_deathstalker_erlandAI(Creature *c) : npc_escortAI(c) {} + npc_deathstalker_erlandAI(Creature* c) : npc_escortAI(c) {} void WaypointReached(uint32 i) { @@ -225,7 +225,7 @@ class pyrewood_ambush : public CreatureScript public: pyrewood_ambush() : CreatureScript("pyrewood_ambush") { } - bool OnQuestAccept(Player *pPlayer, Creature *pCreature, const Quest *pQuest) + bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest *pQuest) { if (pQuest->GetQuestId() == QUEST_PYREWOOD_AMBUSH && !CAST_AI(pyrewood_ambush::pyrewood_ambushAI, pCreature->AI())->QuestInProgress) { @@ -238,14 +238,14 @@ public: return true; } - CreatureAI* GetAI(Creature *pCreature) const + CreatureAI* GetAI(Creature* pCreature) const { return new pyrewood_ambushAI (pCreature); } struct pyrewood_ambushAI : public ScriptedAI { - pyrewood_ambushAI(Creature *c) : ScriptedAI(c), Summons(me) + pyrewood_ambushAI(Creature* c) : ScriptedAI(c), Summons(me) { QuestInProgress = false; } @@ -273,13 +273,13 @@ public: void EnterCombat(Unit* /*who*/){} - void JustSummoned(Creature *pSummoned) + void JustSummoned(Creature* pSummoned) { Summons.Summon(pSummoned); ++KillCount; } - void SummonedCreatureDespawn(Creature *pSummoned) + void SummonedCreatureDespawn(Creature* pSummoned) { Summons.Despawn(pSummoned); --KillCount; @@ -287,10 +287,10 @@ public: void SummonCreatureWithRandomTarget(uint32 creatureId, int position) { - if (Creature *pSummoned = me->SummonCreature(creatureId, PyrewoodSpawnPoints[position][0], PyrewoodSpawnPoints[position][1], PyrewoodSpawnPoints[position][2], PyrewoodSpawnPoints[position][3], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 15000)) + if (Creature* pSummoned = me->SummonCreature(creatureId, PyrewoodSpawnPoints[position][0], PyrewoodSpawnPoints[position][1], PyrewoodSpawnPoints[position][2], PyrewoodSpawnPoints[position][3], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 15000)) { - Player *pPlayer = NULL; - Unit *pTarget = NULL; + Player* pPlayer = NULL; + Unit* pTarget = NULL; if (PlayerGUID) { pPlayer = Unit::GetPlayer(*me, PlayerGUID); @@ -311,7 +311,7 @@ public: void JustDied(Unit* /*pKiller*/) { if (PlayerGUID) - if (Player *pPlayer = Unit::GetPlayer(*me, PlayerGUID)) + if (Player* pPlayer = Unit::GetPlayer(*me, PlayerGUID)) if (pPlayer->GetQuestStatus(QUEST_PYREWOOD_AMBUSH) == QUEST_STATUS_INCOMPLETE) pPlayer->FailQuest(QUEST_PYREWOOD_AMBUSH); } @@ -364,7 +364,7 @@ public: case 5: //end if (PlayerGUID) { - if (Player *pPlayer = Unit::GetPlayer(*me, PlayerGUID)) + if (Player* pPlayer = Unit::GetPlayer(*me, PlayerGUID)) { me->MonsterSay(NPCSAY_END, LANG_UNIVERSAL, 0); //not blizzlike pPlayer->GroupEventHappens(QUEST_PYREWOOD_AMBUSH, me); diff --git a/src/server/scripts/EasternKingdoms/stormwind_city.cpp b/src/server/scripts/EasternKingdoms/stormwind_city.cpp index cc395416382..eb52472fafd 100644 --- a/src/server/scripts/EasternKingdoms/stormwind_city.cpp +++ b/src/server/scripts/EasternKingdoms/stormwind_city.cpp @@ -107,7 +107,7 @@ public: struct npc_bartlebyAI : public ScriptedAI { - npc_bartlebyAI(Creature *c) : ScriptedAI(c) + npc_bartlebyAI(Creature* c) : ScriptedAI(c) { m_uiNormalFaction = c->getFaction(); } @@ -179,7 +179,7 @@ public: struct npc_dashel_stonefistAI : public ScriptedAI { - npc_dashel_stonefistAI(Creature *c) : ScriptedAI(c) + npc_dashel_stonefistAI(Creature* c) : ScriptedAI(c) { m_uiNormalFaction = c->getFaction(); } @@ -328,7 +328,7 @@ public: { me->DisappearAndDie(); - if (Creature *pMarzon = Unit::GetCreature(*me, MarzonGUID)) + if (Creature* pMarzon = Unit::GetCreature(*me, MarzonGUID)) { if (pMarzon->isAlive()) pMarzon->DisappearAndDie(); @@ -337,7 +337,7 @@ public: void EnterCombat(Unit* pWho) { - if (Creature *pMarzon = Unit::GetCreature(*me, MarzonGUID)) + if (Creature* pMarzon = Unit::GetCreature(*me, MarzonGUID)) { if (pMarzon->isAlive() && !pMarzon->isInCombat()) pMarzon->AI()->AttackStart(pWho); @@ -356,7 +356,7 @@ public: break; case 16: SetEscortPaused(true); - if (Creature *pMarzon = me->SummonCreature(NPC_MARZON_BLADE, -8411.360352f, 480.069733f, 123.760895f, 4.941504f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 1000)) + if (Creature* pMarzon = me->SummonCreature(NPC_MARZON_BLADE, -8411.360352f, 480.069733f, 123.760895f, 4.941504f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 1000)) { pMarzon->GetMotionMaster()->MovePoint(0, -8408.000977f, 468.611450f, 123.759903f); MarzonGUID = pMarzon->GetGUID(); @@ -411,7 +411,7 @@ public: uiPhase = 0; break; case 5: - if (Creature *pMarzon = Unit::GetCreature(*me, MarzonGUID)) + if (Creature* pMarzon = Unit::GetCreature(*me, MarzonGUID)) DoScriptText(SAY_MARZON_1, pMarzon); uiTimer = 3000; uiPhase = 6; @@ -426,7 +426,7 @@ public: case 7: if (Creature* pTyrion = me->FindNearestCreature(NPC_TYRION, 20.0f, true)) DoScriptText(SAY_TYRION_2, pTyrion); - if (Creature *pMarzon = Unit::GetCreature(*me, MarzonGUID)) + if (Creature* pMarzon = Unit::GetCreature(*me, MarzonGUID)) pMarzon->setFaction(14); me->setFaction(14); uiTimer = 0; @@ -507,10 +507,16 @@ public: if (me->isSummon()) { - if (Unit* pSummoner = me->ToTempSummon()->GetSummoner()) + Unit* pSummoner = me->ToTempSummon()->GetSummoner(); + if (pSummoner && pSummoner->GetTypeId() == TYPEID_UNIT && pSummoner->IsAIEnabled) { - CAST_AI(npc_lord_gregor_lescovar::npc_lord_gregor_lescovarAI, pSummoner->GetAI())->uiTimer = 2000; - CAST_AI(npc_lord_gregor_lescovar::npc_lord_gregor_lescovarAI, pSummoner->GetAI())->uiPhase = 5; + npc_lord_gregor_lescovar::npc_lord_gregor_lescovarAI *ai = + CAST_AI(npc_lord_gregor_lescovar::npc_lord_gregor_lescovarAI, pSummoner->GetAI()); + if (ai) + { + ai->uiTimer = 2000; + ai->uiPhase = 5; + } //me->ChangeOrient(0.0f, pSummoner); } } diff --git a/src/server/scripts/EasternKingdoms/stranglethorn_vale.cpp b/src/server/scripts/EasternKingdoms/stranglethorn_vale.cpp index 0908e4e994a..73b24bd81a8 100644 --- a/src/server/scripts/EasternKingdoms/stranglethorn_vale.cpp +++ b/src/server/scripts/EasternKingdoms/stranglethorn_vale.cpp @@ -45,7 +45,7 @@ public: struct mob_yennikuAI : public ScriptedAI { - mob_yennikuAI(Creature *c) : ScriptedAI(c) + mob_yennikuAI(Creature* c) : ScriptedAI(c) { bReset = false; } @@ -59,7 +59,7 @@ public: me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_NONE); } - void SpellHit(Unit *caster, const SpellEntry *spell) + void SpellHit(Unit* caster, const SpellEntry *spell) { if (caster->GetTypeId() == TYPEID_PLAYER) { diff --git a/src/server/scripts/EasternKingdoms/tirisfal_glades.cpp b/src/server/scripts/EasternKingdoms/tirisfal_glades.cpp index 1e220276a96..8d81fbc3bd8 100644 --- a/src/server/scripts/EasternKingdoms/tirisfal_glades.cpp +++ b/src/server/scripts/EasternKingdoms/tirisfal_glades.cpp @@ -130,7 +130,7 @@ public: ++m_uiPhase; break; case 2: - if (Player *pPlayer = Unit::GetPlayer(*me, m_uiPlayerGUID)) + if (Player* pPlayer = Unit::GetPlayer(*me, m_uiPlayerGUID)) pPlayer->AreaExploredOrEventHappens(QUEST_590); DoCast(me, SPELL_DRINK, true); diff --git a/src/server/scripts/EasternKingdoms/undercity.cpp b/src/server/scripts/EasternKingdoms/undercity.cpp index cbd9c1fe665..78ac16227e3 100644 --- a/src/server/scripts/EasternKingdoms/undercity.cpp +++ b/src/server/scripts/EasternKingdoms/undercity.cpp @@ -88,7 +88,7 @@ public: struct npc_lady_sylvanas_windrunnerAI : public ScriptedAI { - npc_lady_sylvanas_windrunnerAI(Creature *c) : ScriptedAI(c) {} + npc_lady_sylvanas_windrunnerAI(Creature* c) : ScriptedAI(c) {} uint32 LamentEvent_Timer; bool LamentEvent; @@ -103,11 +103,11 @@ public: void EnterCombat(Unit* /*who*/) {} - void JustSummoned(Creature *summoned) + void JustSummoned(Creature* summoned) { if (summoned->GetEntry() == ENTRY_HIGHBORNE_BUNNY) { - if (Unit *pTarget = Unit::GetUnit(*summoned, targetGUID)) + if (Unit* pTarget = Unit::GetUnit(*summoned, targetGUID)) { pTarget->SendMonsterMove(pTarget->GetPositionX(), pTarget->GetPositionY(), me->GetPositionZ()+15.0f, 0); pTarget->GetMap()->CreatureRelocation(me, pTarget->GetPositionX(), pTarget->GetPositionY(), me->GetPositionZ()+15.0f, 0.0f); @@ -162,7 +162,7 @@ public: struct npc_highborne_lamenterAI : public ScriptedAI { - npc_highborne_lamenterAI(Creature *c) : ScriptedAI(c) {} + npc_highborne_lamenterAI(Creature* c) : ScriptedAI(c) {} uint32 EventMove_Timer; uint32 EventCast_Timer; diff --git a/src/server/scripts/EasternKingdoms/western_plaguelands.cpp b/src/server/scripts/EasternKingdoms/western_plaguelands.cpp index 76ef5be0561..91fc1ee1076 100644 --- a/src/server/scripts/EasternKingdoms/western_plaguelands.cpp +++ b/src/server/scripts/EasternKingdoms/western_plaguelands.cpp @@ -168,7 +168,7 @@ public: struct npc_the_scourge_cauldronAI : public ScriptedAI { - npc_the_scourge_cauldronAI(Creature *c) : ScriptedAI(c) {} + npc_the_scourge_cauldronAI(Creature* c) : ScriptedAI(c) {} void Reset() {} @@ -184,7 +184,7 @@ public: me->SetRespawnDelay(600); } - void MoveInLineOfSight(Unit *who) + void MoveInLineOfSight(Unit* who) { if (!who || who->GetTypeId() != TYPEID_PLAYER) return; @@ -253,7 +253,7 @@ public: struct npc_andorhal_towerAI : public Scripted_NoMovementAI { - npc_andorhal_towerAI(Creature *c) : Scripted_NoMovementAI(c) {} + npc_andorhal_towerAI(Creature* c) : Scripted_NoMovementAI(c) {} void MoveInLineOfSight(Unit* pWho) { diff --git a/src/server/scripts/EasternKingdoms/westfall.cpp b/src/server/scripts/EasternKingdoms/westfall.cpp index 424d5427238..35e43abe0be 100644 --- a/src/server/scripts/EasternKingdoms/westfall.cpp +++ b/src/server/scripts/EasternKingdoms/westfall.cpp @@ -225,7 +225,7 @@ public: struct npc_defias_traitorAI : public npc_escortAI { - npc_defias_traitorAI(Creature *c) : npc_escortAI(c) { Reset(); } + npc_defias_traitorAI(Creature* c) : npc_escortAI(c) { Reset(); } void WaypointReached(uint32 i) { |