diff options
| author | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-02-19 18:57:36 +0100 |
|---|---|---|
| committer | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-02-19 18:57:36 +0100 |
| commit | 0c1689077401ced1e09c95ed6518645dacf5da8f (patch) | |
| tree | e43dfd8d062a4505d40cae43a97675c2d8a9b882 /src/server/scripts/Northrend | |
| parent | 71eaceae5de6cc1c517bec78d0ef52e149a59b6e (diff) | |
| parent | 5b414bb81343c7b9fad9f3974021ff0c9e1c739a (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/AI/EventAI/CreatureEventAI.cpp
src/server/game/AI/EventAI/CreatureEventAI.h
src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp
src/server/scripts/EasternKingdoms/boss_kruul.cpp
src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp
src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
src/server/scripts/EasternKingdoms/zone_swamp_of_sorrows.cpp
src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
src/server/scripts/Kalimdor/zone_azshara.cpp
src/server/scripts/Kalimdor/zone_darkshore.cpp
src/server/scripts/Kalimdor/zone_desolace.cpp
src/server/scripts/Kalimdor/zone_durotar.cpp
src/server/scripts/Kalimdor/zone_mulgore.cpp
src/server/scripts/Kalimdor/zone_orgrimmar.cpp
src/server/scripts/Kalimdor/zone_thousand_needles.cpp
src/server/scripts/Kalimdor/zone_ungoro_crater.cpp
Diffstat (limited to 'src/server/scripts/Northrend')
133 files changed, 498 insertions, 498 deletions
diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_amanitar.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_amanitar.cpp index bb08b48ab4a..24335c0e469 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_amanitar.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_amanitar.cpp @@ -129,7 +129,7 @@ public: } } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; @@ -211,7 +211,7 @@ public: void EnterCombat(Unit* /*who*/) {} void AttackStart(Unit* /*victim*/) {} - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp index 2f731017646..6bc6279da79 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp @@ -139,7 +139,7 @@ class boss_elder_nadox : public CreatureScript instance->SetData(DATA_ELDER_NADOX_EVENT, DONE); } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; @@ -218,7 +218,7 @@ class mob_ahnkahar_nerubian : public CreatureScript me->RemoveAurasDueToSpell(SPELL_GUARDIAN_AURA); } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; @@ -266,7 +266,7 @@ public: void EnterCombat(Unit* /*who*/) {} void AttackStart(Unit* /*victim*/) {} void MoveInLineOfSight(Unit* /*who*/) {} - void UpdateAI(const uint32 /*diff*/) {} + void UpdateAI(uint32 /*diff*/) {} }; CreatureAI* GetAI(Creature* creature) const diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp index 38c409ee706..82ac2e8387c 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp @@ -258,7 +258,7 @@ public: } } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { //Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp index 732216420f9..e8b17224179 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp @@ -150,7 +150,7 @@ public: instance->SetData(DATA_JEDOGA_SHADOWSEEKER_EVENT, DONE); } - void DoAction(int32 const action) + void DoAction(int32 action) { if (action == ACTION_INITIAND_KILLED) volunteerWork = false; @@ -280,7 +280,7 @@ public: bCanDown = true; } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (!instance) return; @@ -451,7 +451,7 @@ public: } } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (instance && bCheckTimer <= diff) { @@ -548,7 +548,7 @@ public: void AttackStart(Unit* /*victim*/) {} void MoveInLineOfSight(Unit* /*who*/) {} - void UpdateAI(const uint32 /*diff*/) + void UpdateAI(uint32 /*diff*/) { if (!instance) return; diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp index 53d0ddd6c19..a68cbcb7ee6 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp @@ -121,7 +121,7 @@ public: Talk(SAY_AGGRO); } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; @@ -370,7 +370,7 @@ public: DoCast(me, SPELL_FLAME_SPHERE_DEATH_EFFECT); } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (uiDespawnTimer <= diff) me->DisappearAndDie(); diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp index 06a640be6e4..1ec61488c1b 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp @@ -168,7 +168,7 @@ public: instance->SetData(DATA_ANUBARAK_EVENT, IN_PROGRESS); } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp index e7decdc10fd..eec7959f56f 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp @@ -134,7 +134,7 @@ public: EnterEvadeMode(); } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { //Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp index aa329f12f6a..295f38658e2 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp @@ -138,7 +138,7 @@ public: me->SummonCreature(MOB_SKITTERING_SWARMER, SpawnPoint[7], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS); } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; @@ -239,7 +239,7 @@ public: uiBackstabTimer = 7*IN_MILLISECONDS; } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; @@ -290,7 +290,7 @@ public: uiShadowNovaTimer = 15*IN_MILLISECONDS; } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; @@ -336,7 +336,7 @@ public: uiStrikeTimer = 6*IN_MILLISECONDS; } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; @@ -386,7 +386,7 @@ public: DoCast(me, SPELL_ENRAGE, true); } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; @@ -434,7 +434,7 @@ public: uiBindingWebsTimer = 17*IN_MILLISECONDS; } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; @@ -488,7 +488,7 @@ public: uiPoisonSprayTimer = 15*IN_MILLISECONDS; } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp index 3021e628063..bbec79ea43d 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp @@ -547,7 +547,7 @@ public: (*itr)->CastSpell(target, SPELL_LAVA_STRIKE, true); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(uint32 uiDiff) { //Return since we have no target if (!UpdateVictim()) @@ -954,7 +954,7 @@ struct dummy_dragonAI : public ScriptedAI } } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(uint32 uiDiff) { if (m_bCanMoveFree && m_uiMoveNextTimer) { @@ -1017,7 +1017,7 @@ public: Talk(SAY_TENEBRON_SLAY); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(uint32 uiDiff) { //if no target, update dummy and return if (!UpdateVictim()) @@ -1112,7 +1112,7 @@ public: Talk(SAY_SHADRON_SLAY); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(uint32 uiDiff) { //if no target, update dummy and return if (!UpdateVictim()) @@ -1210,7 +1210,7 @@ public: Talk(SAY_VESPERON_SLAY); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(uint32 uiDiff) { //if no target, update dummy and return if (!UpdateVictim()) @@ -1352,7 +1352,7 @@ public: } } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(uint32 uiDiff) { if (uiDespawnTimer < uiDiff) { @@ -1447,7 +1447,7 @@ public: } } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(uint32 uiDiff) { if (uiDespawnTimer < uiDiff) { @@ -1519,7 +1519,7 @@ public: who->SetInCombatWithZone(); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(uint32 uiDiff) { if (m_uiHatchEggTimer <= uiDiff) { @@ -1573,7 +1573,7 @@ public: entry = 0; } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (Tsunami_Timer <= diff) { @@ -1621,7 +1621,7 @@ public: VoidBlast_Timer = 5000; } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (VoidBlast_Timer <= diff) { @@ -1668,7 +1668,7 @@ public: m_uiFadeArmorTimer = 1000; } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(uint32 uiDiff) { //Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp index 70c1141b6e6..d3a685bc6ba 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp @@ -85,7 +85,7 @@ class boss_baltharus_the_warborn : public CreatureScript instance->SetData(DATA_BALTHARUS_SHARED_HEALTH, me->GetMaxHealth()); } - void DoAction(int32 const action) + void DoAction(int32 action) { switch (action) { @@ -162,7 +162,7 @@ class boss_baltharus_the_warborn : public CreatureScript instance->SetData(DATA_BALTHARUS_SHARED_HEALTH, me->GetHealth() - damage); } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { bool introPhase = events.IsInPhase(PHASE_INTRO); if (!UpdateVictim() && !introPhase) @@ -257,7 +257,7 @@ class npc_baltharus_the_warborn_clone : public CreatureScript killer->Kill(baltharus); } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_general_zarithrian.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_general_zarithrian.cpp index 94325ca015b..c616d44816c 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_general_zarithrian.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_general_zarithrian.cpp @@ -140,7 +140,7 @@ class boss_general_zarithrian : public CreatureScript return (instance->GetBossState(DATA_SAVIANA_RAGEFIRE) == DONE && instance->GetBossState(DATA_BALTHARUS_THE_WARBORN) == DONE); } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp index d84091e3cc7..0e219219eec 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp @@ -242,7 +242,7 @@ struct generic_halionAI : public BossAI _JustReachedHome(); } - void ExecuteEvent(uint32 const eventId) + void ExecuteEvent(uint32 eventId) { switch (eventId) { @@ -261,7 +261,7 @@ struct generic_halionAI : public BossAI } } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim() || me->HasUnitState(UNIT_STATE_CASTING)) return; @@ -388,7 +388,7 @@ class boss_halion : public CreatureScript } } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (events.IsInPhase(PHASE_TWO)) return; @@ -396,7 +396,7 @@ class boss_halion : public CreatureScript generic_halionAI::UpdateAI(diff); } - void ExecuteEvent(uint32 const eventId) + void ExecuteEvent(uint32 eventId) { switch (eventId) { @@ -556,7 +556,7 @@ class boss_twilight_halion : public CreatureScript } } - void ExecuteEvent(uint32 const eventId) + void ExecuteEvent(uint32 eventId) { switch (eventId) { @@ -640,7 +640,7 @@ class npc_halion_controller : public CreatureScript _instance->SetBossState(DATA_HALION, FAIL); } - void DoAction(int32 const action) + void DoAction(int32 action) { switch (action) { @@ -682,7 +682,7 @@ class npc_halion_controller : public CreatureScript } } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { // The isInCombat() check is needed because that check should be false when Halion is // not engaged, while it would return true without as UpdateVictim() checks for @@ -911,7 +911,7 @@ class npc_orb_carrier : public CreatureScript ASSERT(creature->GetVehicleKit()); } - void UpdateAI(uint32 const /*diff*/) + void UpdateAI(uint32 /*diff*/) { /// According to sniffs this spell is cast every 1 or 2 seconds. /// However, refreshing it looks bad, so just cast the spell if @@ -927,7 +927,7 @@ class npc_orb_carrier : public CreatureScript me->SetFacingToObject(rotationFocus); // setInFront } - void DoAction(int32 const action) + void DoAction(int32 action) { if (action == ACTION_SHOOT) { @@ -980,7 +980,7 @@ class npc_meteor_strike_initial : public CreatureScript SetCombatMovement(false); } - void DoAction(int32 const action) + void DoAction(int32 action) { switch (action) { @@ -1028,7 +1028,7 @@ class npc_meteor_strike_initial : public CreatureScript } } - void UpdateAI(uint32 const /*diff*/) { } + void UpdateAI(uint32 /*diff*/) { } void EnterEvadeMode() { } private: InstanceScript* _instance; @@ -1057,7 +1057,7 @@ class npc_meteor_strike : public CreatureScript SetCombatMovement(false); } - void DoAction(int32 const action) + void DoAction(int32 action) { if (action == ACTION_METEOR_STRIKE_BURN) { @@ -1074,7 +1074,7 @@ class npc_meteor_strike : public CreatureScript controller->AI()->JustSummoned(me); } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (_spawnCount > 5) return; @@ -1169,7 +1169,7 @@ class npc_combustion_consumption : public CreatureScript summoner->CastCustomSpell(_explosionSpell, SPELLVALUE_BASE_POINT0, damage, summoner); } - void UpdateAI(uint32 const /*diff*/) { } + void UpdateAI(uint32 /*diff*/) { } private: InstanceScript* _instance; @@ -1248,7 +1248,7 @@ class npc_living_ember : public CreatureScript me->DespawnOrUnsummon(1); } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim() || me->HasUnitState(UNIT_STATE_CASTING)) return; diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp index 06743858ec0..d391abb0d4d 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp @@ -141,7 +141,7 @@ class boss_saviana_ragefire : public CreatureScript Talk(SAY_KILL); } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.cpp index 5baae66e65b..2623b2c542a 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.cpp @@ -66,7 +66,7 @@ class npc_xerestrasza : public CreatureScript me->RemoveFlag(UNIT_NPC_FLAGS, GOSSIP_OPTION_QUESTGIVER); } - void DoAction(int32 const action) + void DoAction(int32 action) { if (action == ACTION_BALTHARUS_DEATH) { @@ -92,7 +92,7 @@ class npc_xerestrasza : public CreatureScript } } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (_isIntro) return; diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp index fb0f0fbaee1..553b836da8f 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp @@ -175,7 +175,7 @@ public: me->DisappearAndDie(); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(uint32 uiDiff) { if (bDone && uiResetTimer <= uiDiff) { @@ -299,7 +299,7 @@ public: me->DisappearAndDie(); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(uint32 uiDiff) { if (bDone && uiResetTimer <= uiDiff) { @@ -403,7 +403,7 @@ public: uiWakingNightmare = 7000; } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(uint32 uiDiff) { if (!UpdateVictim()) return; @@ -545,7 +545,7 @@ public: uiWaypoint = uiType; } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(uint32 uiDiff) { npc_escortAI::UpdateAI(uiDiff); diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp index ceb9724a078..b253d15773d 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp @@ -153,7 +153,7 @@ public: summon->AI()->AttackStart(me->getVictim()); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(uint32 uiDiff) { //Return since we have no target if (!UpdateVictim()) @@ -320,7 +320,7 @@ public: uiAttackTimer = 3500; } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(uint32 uiDiff) { if (!UpdateVictim()) return; @@ -362,7 +362,7 @@ public: } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(uint32 uiDiff) { npc_escortAI::UpdateAI(uiDiff); diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp index 9413791af96..5cc8f517533 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp @@ -233,7 +233,7 @@ public: DoCast(me, SPELL_SHIELD, true); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(uint32 uiDiff) { npc_escortAI::UpdateAI(uiDiff); @@ -360,7 +360,7 @@ public: bHome = false; } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(uint32 uiDiff) { if (!bDone && GrandChampionsOutVehicle(me)) { @@ -494,7 +494,7 @@ public: bHome = false; } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(uint32 uiDiff) { if (!bDone && GrandChampionsOutVehicle(me)) { @@ -639,7 +639,7 @@ public: bHome = false; } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(uint32 uiDiff) { if (!bDone && GrandChampionsOutVehicle(me)) { @@ -785,7 +785,7 @@ public: bHome = false; } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(uint32 uiDiff) { if (!bDone && GrandChampionsOutVehicle(me)) { @@ -933,7 +933,7 @@ public: bHome = false; } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(uint32 uiDiff) { if (!bDone && GrandChampionsOutVehicle(me)) { diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp index 7e4a740cb13..472048501a5 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp @@ -412,7 +412,7 @@ public: } } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(uint32 uiDiff) { ScriptedAI::UpdateAI(uiDiff); diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp index 17b804ca31e..9c6d481c207 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp @@ -284,7 +284,7 @@ class boss_anubarak_trial : public CreatureScript _sphereGUID[i] = summoned->GetGUID(); } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; @@ -451,7 +451,7 @@ class mob_swarm_scarab : public CreatureScript Anubarak->AI()->JustSummoned(me); } - void DoAction(const int32 actionId) + void DoAction(int32 actionId) { switch (actionId) { @@ -469,7 +469,7 @@ class mob_swarm_scarab : public CreatureScript DoCast(killer, RAID_MODE(SPELL_TRAITOR_KING_10, SPELL_TRAITOR_KING_25)); } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (_instance && _instance->GetBossState(BOSS_ANUBARAK) != IN_PROGRESS) me->DisappearAndDie(); @@ -525,7 +525,7 @@ class mob_nerubian_burrower : public CreatureScript Anubarak->AI()->JustSummoned(me); } - void DoAction(const int32 actionId) + void DoAction(int32 actionId) { switch (actionId) { @@ -539,7 +539,7 @@ class mob_nerubian_burrower : public CreatureScript } } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (_instance && _instance->GetBossState(BOSS_ANUBARAK) != IN_PROGRESS) me->DisappearAndDie(); @@ -700,7 +700,7 @@ class mob_anubarak_spike : public CreatureScript uiDamage = 0; } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) { diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp index ba554c3703d..f1bf0579187 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp @@ -710,7 +710,7 @@ struct boss_faction_championsAI : public BossAI } } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { _events.Update(diff); @@ -773,7 +773,7 @@ class mob_toc_druid : public CreatureScript SetEquipmentSlots(false, 51799, EQUIP_NO_CHANGE, EQUIP_NO_CHANGE); } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; @@ -865,7 +865,7 @@ class mob_toc_shaman : public CreatureScript SetEquipmentSlots(false, 49992, EQUIP_NO_CHANGE, EQUIP_NO_CHANGE); } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; @@ -959,7 +959,7 @@ class mob_toc_paladin : public CreatureScript SetEquipmentSlots(false, 50771, 47079, EQUIP_NO_CHANGE); } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; @@ -1062,7 +1062,7 @@ class mob_toc_priest : public CreatureScript SetEquipmentSlots(false, 49992, EQUIP_NO_CHANGE, EQUIP_NO_CHANGE); } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; @@ -1152,7 +1152,7 @@ class mob_toc_shadow_priest : public CreatureScript DoCast(me, SPELL_SHADOWFORM); } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; @@ -1251,7 +1251,7 @@ class mob_toc_warlock : public CreatureScript DoCast(SPELL_SUMMON_FELHUNTER); } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; @@ -1337,7 +1337,7 @@ class mob_toc_mage : public CreatureScript SetEquipmentSlots(false, 47524, EQUIP_NO_CHANGE, EQUIP_NO_CHANGE); } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; @@ -1437,7 +1437,7 @@ class mob_toc_hunter : public CreatureScript DoCast(SPELL_CALL_PET); } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; @@ -1534,7 +1534,7 @@ class mob_toc_boomkin : public CreatureScript SetEquipmentSlots(false, 50966, EQUIP_NO_CHANGE, EQUIP_NO_CHANGE); } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; @@ -1629,7 +1629,7 @@ class mob_toc_warrior : public CreatureScript SetEquipmentSlots(false, 47427, 46964, EQUIP_NO_CHANGE); } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; @@ -1728,7 +1728,7 @@ class mob_toc_dk : public CreatureScript SetEquipmentSlots(false, 47518, 51021, EQUIP_NO_CHANGE); } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; @@ -1827,7 +1827,7 @@ class mob_toc_rogue : public CreatureScript me->SetMaxPower(POWER_ENERGY, 100); } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; @@ -1967,7 +1967,7 @@ class mob_toc_enh_shaman : public CreatureScript summons.DespawnAll(); } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; @@ -2062,7 +2062,7 @@ class mob_toc_retro_paladin : public CreatureScript DoCast(SPELL_SEAL_OF_COMMAND); } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; @@ -2155,7 +2155,7 @@ class mob_toc_pet_warlock : public CreatureScript events.ScheduleEvent(EVENT_SPELL_LOCK, urand(15*IN_MILLISECONDS, 30*IN_MILLISECONDS)); } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; @@ -2206,7 +2206,7 @@ class mob_toc_pet_hunter : public CreatureScript _clawTimer = urand(5*IN_MILLISECONDS, 10*IN_MILLISECONDS); } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp index a44938e0f82..74324d6c515 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp @@ -149,7 +149,7 @@ class boss_jaraxxus : public CreatureScript Talk(SAY_AGGRO); } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; @@ -238,7 +238,7 @@ class mob_legion_flame : public CreatureScript DoCast(SPELL_LEGION_FLAME_EFFECT); } - void UpdateAI(const uint32 /*diff*/) + void UpdateAI(uint32 /*diff*/) { UpdateVictim(); if (_instance && _instance->GetBossState(BOSS_JARAXXUS) != IN_PROGRESS) @@ -296,7 +296,7 @@ class mob_infernal_volcano : public CreatureScript me->DespawnOrUnsummon(); } - void UpdateAI(uint32 const /*diff*/) {} + void UpdateAI(uint32 /*diff*/) {} private: SummonList _summons; @@ -326,7 +326,7 @@ class mob_fel_infernal : public CreatureScript me->SetInCombatWithZone(); } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (_instance && _instance->GetBossState(BOSS_JARAXXUS) != IN_PROGRESS) { @@ -400,7 +400,7 @@ class mob_nether_portal : public CreatureScript me->DespawnOrUnsummon(); } - void UpdateAI(uint32 const /*diff*/) {} + void UpdateAI(uint32 /*diff*/) {} private: SummonList _summons; @@ -441,7 +441,7 @@ class mob_mistress_of_pain : public CreatureScript _instance->SetData(DATA_MISTRESS_OF_PAIN_COUNT, DECREASE); } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (_instance && _instance->GetBossState(BOSS_JARAXXUS) != IN_PROGRESS) { diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp index 95f59903141..c39b8403474 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp @@ -235,7 +235,7 @@ class boss_gormok : public CreatureScript pSnobold->ToCreature()->DespawnOrUnsummon(); } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; @@ -359,7 +359,7 @@ class mob_snobold_vassal : public CreatureScript _instance->SetData(DATA_SNOBOLD_COUNT, DECREASE); } - void DoAction(int32 const action) + void DoAction(int32 action) { switch (action) { @@ -374,7 +374,7 @@ class mob_snobold_vassal : public CreatureScript } } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim() || _targetDied) return; @@ -481,7 +481,7 @@ class npc_firebomb : public CreatureScript me->SetDisplayId(me->GetCreatureTemplate()->Modelid2); } - void UpdateAI(uint32 const /*diff*/) + void UpdateAI(uint32 /*diff*/) { if (_instance->GetData(TYPE_NORTHREND_BEASTS) != GORMOK_IN_PROGRESS) me->DespawnOrUnsummon(); @@ -558,7 +558,7 @@ struct boss_jormungarAI : public BossAI instance->SetData(TYPE_NORTHREND_BEASTS, SNAKES_IN_PROGRESS); } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; @@ -804,7 +804,7 @@ class mob_slime_pool : public CreatureScript me->SetReactState(REACT_PASSIVE); } - void UpdateAI(uint32 const /*diff*/) + void UpdateAI(uint32 /*diff*/) { if (!_cast) { @@ -972,7 +972,7 @@ class boss_icehowl : public CreatureScript } } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp index 2509c3d0d59..b41e986741b 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp @@ -270,7 +270,7 @@ struct boss_twin_baseAI : public BossAI DoCast(me, SurgeSpellId); } - void DoAction(const int32 action) + void DoAction(int32 action) { switch (action) { @@ -292,7 +292,7 @@ struct boss_twin_baseAI : public BossAI me->UpdateDamagePhysical(mode ? OFF_ATTACK : BASE_ATTACK); } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (!instance || !UpdateVictim()) return; @@ -594,7 +594,7 @@ class mob_unleashed_dark : public CreatureScript { mob_unleashed_darkAI(Creature* creature) : mob_unleashed_ballAI(creature) {} - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (RangeCheckTimer < diff) { @@ -626,7 +626,7 @@ class mob_unleashed_light : public CreatureScript { mob_unleashed_lightAI(Creature* creature) : mob_unleashed_ballAI(creature) {} - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (RangeCheckTimer < diff) { @@ -666,7 +666,7 @@ class mob_bullet_controller : public CreatureScript DoCastAOE(SPELL_CONTROLLER_PERIODIC); } - void UpdateAI(const uint32 /*diff*/) + void UpdateAI(uint32 /*diff*/) { UpdateVictim(); } diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp index 3e3fbf51cd0..a68ea1025d5 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp @@ -267,7 +267,7 @@ class boss_lich_king_toc : public CreatureScript } } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(uint32 uiDiff) { if (!_instance) return; @@ -415,7 +415,7 @@ class npc_fizzlebang_toc : public CreatureScript _summons.Summon(summoned); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(uint32 uiDiff) { if (!_instance) return; @@ -548,7 +548,7 @@ class npc_tirion_toc : public CreatureScript void AttackStart(Unit* /*who*/) {} - void UpdateAI(const uint32 uiDiff) + void UpdateAI(uint32 uiDiff) { if (!_instance) return; @@ -836,7 +836,7 @@ class npc_garrosh_toc : public CreatureScript void AttackStart(Unit* /*who*/) {} - void UpdateAI(const uint32 uiDiff) + void UpdateAI(uint32 uiDiff) { if (!_instance) return; @@ -920,7 +920,7 @@ class npc_varian_toc : public CreatureScript void AttackStart(Unit* /*who*/) {} - void UpdateAI(const uint32 uiDiff) + void UpdateAI(uint32 uiDiff) { if (!_instance) return; diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_dred.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_dred.cpp index 6cb970f6ab7..923f8a23d6f 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_dred.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_dred.cpp @@ -86,7 +86,7 @@ class boss_dred : public CreatureScript instance->SetData(DATA_DRED_EVENT, IN_PROGRESS); } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; @@ -148,7 +148,7 @@ class boss_dred : public CreatureScript DoMeleeAttackIfReady(); } - void DoAction(int32 const action) + void DoAction(int32 action) { if (action == ACTION_RAPTOR_KILLED) ++raptorsKilled; @@ -196,7 +196,7 @@ class npc_drakkari_gutripper : public CreatureScript GutRipTimer = urand(10000, 15000); } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; @@ -246,7 +246,7 @@ class npc_drakkari_scytheclaw : public CreatureScript uiRendTimer = urand(10000, 15000); } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp index e99128fbbf9..6eedfb357db 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp @@ -112,7 +112,7 @@ public: DoStartNoMovement(target); } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim() || _bubbled) return; @@ -141,7 +141,7 @@ public: } } - void DoAction(int32 const action) + void DoAction(int32 action) { if (action == ACTION_CRYSTAL_HANDLER_DIED) CrystalHandlerDied(); @@ -279,7 +279,7 @@ public: _temp = 0; } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (_spell) { diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp index 1f30b805f8a..0ca7ccd196a 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp @@ -107,7 +107,7 @@ public: instance->SetData(DATA_THARON_JA_EVENT, IN_PROGRESS); } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { //Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp index bcec5fc1547..9e9ecc561d5 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp @@ -108,7 +108,7 @@ public: instance->SetData(DATA_TROLLGORE_EVENT, IN_PROGRESS); } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { //Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp index 5d261fd3804..516a3e0f7c9 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp @@ -136,7 +136,7 @@ class boss_bronjahm : public CreatureScript summon->CastSpell(summon, SPELL_PURPLE_BANISH_VISUAL, true); } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp index b3781f89e06..623124f441f 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp @@ -247,7 +247,7 @@ class boss_devourer_of_souls : public CreatureScript return 0; } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { // Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp index b5d95dfb0f6..efc687eb409 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp @@ -95,7 +95,7 @@ public: phase = PHASE_NORMAL; } - void DoAction(const int32 actionId) + void DoAction(int32 actionId) { switch (actionId) { @@ -109,7 +109,7 @@ public: } } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (phase == PHASE_INTRO) { @@ -221,7 +221,7 @@ public: phase = PHASE_NORMAL; } - void DoAction(const int32 actionId) + void DoAction(int32 actionId) { switch (actionId) { @@ -235,7 +235,7 @@ public: } } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (phase == PHASE_INTRO) { diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp index 2278bfe409a..5e13fd22c47 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp @@ -95,7 +95,7 @@ public: Talk(SAY_SLAY); } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { // Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp index 1d7e405585f..191465a52f3 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp @@ -91,7 +91,7 @@ public: Talk(SAY_SLAY); } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { // Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp index e0a2f90b082..c6093d6bc0f 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp @@ -233,7 +233,7 @@ public: me->SetVisible(true); } - void DoAction(const int32 actionId) + void DoAction(int32 actionId) { switch (actionId) { @@ -246,7 +246,7 @@ public: } } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { events.Update(diff); switch (events.ExecuteEvent()) @@ -657,7 +657,7 @@ public: events.ScheduleEvent(EVENT_DARK_MENDING, 20000); } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; @@ -740,7 +740,7 @@ public: events.ScheduleEvent(EVENT_HALLUCINATION, 40000); } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; @@ -840,7 +840,7 @@ public: events.ScheduleEvent(EVENT_KIDNEY_SHOT, 12000); } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; @@ -910,7 +910,7 @@ public: events.ScheduleEvent(EVENT_TORTURED_ENRAGE, 15000); } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; @@ -976,7 +976,7 @@ public: events.ScheduleEvent(EVENT_ICE_SHOT, 15000); } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h index a8bd92cc070..2cab1cca214 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h @@ -102,7 +102,7 @@ struct boss_horAI : ScriptedAI uiDamage = 0; } - void DoAction(const int32 actionID) + void DoAction(int32 actionID) { switch (actionID) { diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp index cc25e450340..822adbb9201 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp @@ -186,7 +186,7 @@ enum Events return _permafrostStack; } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp index f657c8e19b5..182f79b6ea0 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp @@ -203,7 +203,7 @@ class boss_ick : public CreatureScript me->AddThreat(target, _tempThreat); } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (!me->isInCombat()) return; @@ -338,7 +338,7 @@ class boss_krick : public CreatureScript } } - void DoAction(const int32 actionId) + void DoAction(int32 actionId) { if (actionId == ACTION_OUTRO) { @@ -365,7 +365,7 @@ class boss_krick : public CreatureScript _events.ScheduleEvent(EVENT_OUTRO_1, 1000); } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (_phase != PHASE_OUTRO) return; diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp index 165cd8d647a..8b771f507c2 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp @@ -201,7 +201,7 @@ class boss_tyrannus : public CreatureScript rimefang->AI()->DoAction(ACTION_END_COMBAT); } - void DoAction(const int32 actionId) + void DoAction(int32 actionId) { if (actionId == ACTION_START_INTRO) { @@ -215,7 +215,7 @@ class boss_tyrannus : public CreatureScript } } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim() && !events.IsInPhase(PHASE_INTRO)) return; @@ -313,7 +313,7 @@ class boss_rimefang : public CreatureScript _vehicle->InstallAllAccessories(false); } - void DoAction(const int32 actionId) + void DoAction(int32 actionId) { if (actionId == ACTION_START_RIMEFANG) { @@ -335,7 +335,7 @@ class boss_rimefang : public CreatureScript } } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim() && !_events.IsInPhase(PHASE_COMBAT)) return; @@ -409,7 +409,7 @@ class player_overlord_brandAI : public PlayerAI me->CastCustomSpell(SPELL_OVERLORD_BRAND_HEAL, SPELLVALUE_BASE_POINT0, int32(addHealth*5.5f), tyrannus, true, NULL, NULL, tyrannus->GetGUID()); } - void UpdateAI(const uint32 /*diff*/) { } + void UpdateAI(uint32 /*diff*/) { } private: Creature* tyrannus; diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp index 246d389e0e7..42d912e2bd2 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp @@ -60,7 +60,7 @@ class mob_ymirjar_flamebearer : public CreatureScript _events.ScheduleEvent(EVENT_TACTICAL_BLINK, 15000); } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; @@ -125,7 +125,7 @@ class mob_iceborn_protodrake : public CreatureScript _vehicle->RemoveAllPassengers(); } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; @@ -178,7 +178,7 @@ class mob_geist_ambusher : public CreatureScript DoCast(who, SPELL_LEAPING_FACE_MAUL); } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp b/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp index 76b2e7bac7e..1ec29224763 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp @@ -140,7 +140,7 @@ class boss_drakkari_colossus : public CreatureScript instance->SetData(DATA_DRAKKARI_COLOSSUS_EVENT, FAIL); } - void DoAction(const int32 action) + void DoAction(int32 action) { switch (action) { @@ -208,7 +208,7 @@ class boss_drakkari_colossus : public CreatureScript introDone = data; } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; @@ -285,7 +285,7 @@ class boss_drakkari_elemental : public CreatureScript } } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; @@ -311,7 +311,7 @@ class boss_drakkari_elemental : public CreatureScript DoMeleeAttackIfReady(); } - void DoAction(const int32 action) + void DoAction(int32 action) { switch (action) { @@ -466,7 +466,7 @@ public: } } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { //Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/Northrend/Gundrak/boss_eck.cpp b/src/server/scripts/Northrend/Gundrak/boss_eck.cpp index d169fb163b2..df949c7a962 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_eck.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_eck.cpp @@ -75,7 +75,7 @@ public: instance->SetData(DATA_ECK_THE_FEROCIOUS_EVENT, IN_PROGRESS); } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { //Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp b/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp index baba9d5396b..e4cdf89c165 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp @@ -127,7 +127,7 @@ public: instance->SetData(DATA_GAL_DARAH_EVENT, IN_PROGRESS); } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp b/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp index 8f325dafc82..97c75b5f391 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp @@ -91,7 +91,7 @@ public: instance->SetData(DATA_MOORABI_EVENT, IN_PROGRESS); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(uint32 uiDiff) { //Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp b/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp index 1b5f6e5d426..6deb0c20676 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp @@ -122,7 +122,7 @@ public: instance->SetData(DATA_SLAD_RAN_EVENT, IN_PROGRESS); } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { //Return since we have no target if (!UpdateVictim()) @@ -231,7 +231,7 @@ public: uiGripOfSladRanTimer = 1*IN_MILLISECONDS; } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; @@ -286,7 +286,7 @@ public: uiVenomousBiteTimer = 2*IN_MILLISECONDS; } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp index cb073b1c569..833649b576d 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp @@ -282,7 +282,7 @@ class boss_blood_council_controller : public CreatureScript } } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; @@ -477,7 +477,7 @@ class boss_prince_keleseth_icc : public CreatureScript Talk(SAY_KELESETH_KILL); } - void DoAction(int32 const action) + void DoAction(int32 action) { switch (action) { @@ -522,7 +522,7 @@ class boss_prince_keleseth_icc : public CreatureScript return true; } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim() || !CheckRoom()) return; @@ -695,7 +695,7 @@ class boss_prince_taldaram_icc : public CreatureScript Talk(SAY_TALDARAM_KILL); } - void DoAction(int32 const action) + void DoAction(int32 action) { switch (action) { @@ -740,7 +740,7 @@ class boss_prince_taldaram_icc : public CreatureScript return true; } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim() || !CheckRoom()) return; @@ -933,7 +933,7 @@ class boss_prince_valanar_icc : public CreatureScript Talk(SAY_VALANAR_KILL); } - void DoAction(int32 const action) + void DoAction(int32 action) { switch (action) { @@ -978,7 +978,7 @@ class boss_prince_valanar_icc : public CreatureScript return true; } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim() || !CheckRoom()) return; @@ -1090,7 +1090,7 @@ class npc_blood_queen_lana_thel : public CreatureScript me->SetVisible(false); } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (!_events.GetPhaseMask()) return; @@ -1168,7 +1168,7 @@ class npc_ball_of_flame : public CreatureScript _chaseGUID = guid; } - void DoAction(int32 const action) + void DoAction(int32 action) { if (action == ACTION_FLAME_BALL_CHASE) if (Player* target = ObjectAccessor::GetPlayer(*me, _chaseGUID)) @@ -1189,7 +1189,7 @@ class npc_ball_of_flame : public CreatureScript _instance->SetData(DATA_ORB_WHISPERER_ACHIEVEMENT, uint32(false)); } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (!_despawnTimer) return; @@ -1236,7 +1236,7 @@ class npc_kinetic_bomb : public CreatureScript _groundZ = me->GetMap()->GetHeight(me->GetPhaseMask(), _x, _y, _groundZ, true, 500.0f); } - void DoAction(int32 const action) + void DoAction(int32 action) { if (action == SPELL_KINETIC_BOMB_EXPLOSION) _events.ScheduleEvent(EVENT_BOMB_DESPAWN, 1000); @@ -1248,7 +1248,7 @@ class npc_kinetic_bomb : public CreatureScript } } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { _events.Update(diff); @@ -1328,7 +1328,7 @@ class npc_dark_nucleus : public CreatureScript me->AddThreat(attacker, 500000000.0f); } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp index 4b1ccabe682..f4df90c49e8 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp @@ -226,7 +226,7 @@ class boss_blood_queen_lana_thel : public CreatureScript instance->DoRemoveAurasDueToSpellOnPlayers(PRESENCE_OF_THE_DARKFALLEN); } - void DoAction(int32 const action) + void DoAction(int32 action) { if (action != ACTION_KILL_MINCHAR) return; @@ -334,7 +334,7 @@ class boss_blood_queen_lana_thel : public CreatureScript } } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim() || !CheckInRoom()) return; @@ -481,7 +481,7 @@ class boss_blood_queen_lana_thel : public CreatureScript for (std::list<HostileReference*>::const_iterator itr = threatlist.begin(); itr != threatlist.end(); ++itr) if (Unit* refTarget = (*itr)->getTarget()) - if (refTarget != me->getVictim() && refTarget->GetTypeId() == TYPEID_PLAYER && (includeOfftank ? true : (refTarget != _offtank))) + if (refTarget != me->getVictim() && refTarget->GetTypeId() == TYPEID_PLAYER && (includeOfftank || (refTarget != _offtank))) tempTargets.push_back(refTarget->ToPlayer()); if (tempTargets.empty()) diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp index c92f10e8b95..fe135ea70a4 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp @@ -420,7 +420,7 @@ class boss_deathbringer_saurfang : public CreatureScript bloodPower->RecalculateAmountOfEffects(); } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim() && !(events.IsInPhase(PHASE_INTRO_A) || events.IsInPhase(PHASE_INTRO_H))) return; @@ -512,7 +512,7 @@ class boss_deathbringer_saurfang : public CreatureScript } // intro setup - void DoAction(int32 const action) + void DoAction(int32 action) { switch (action) { @@ -603,7 +603,7 @@ class npc_high_overlord_saurfang_icc : public CreatureScript _events.Reset(); } - void DoAction(int32 const action) + void DoAction(int32 action) { switch (action) { @@ -708,7 +708,7 @@ class npc_high_overlord_saurfang_icc : public CreatureScript } } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { _events.Update(diff); while (uint32 eventId = _events.ExecuteEvent()) @@ -812,7 +812,7 @@ class npc_muradin_bronzebeard_icc : public CreatureScript _events.Reset(); } - void DoAction(int32 const action) + void DoAction(int32 action) { switch (action) { @@ -888,7 +888,7 @@ class npc_muradin_bronzebeard_icc : public CreatureScript } } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { _events.Update(diff); while (uint32 eventId = _events.ExecuteEvent()) @@ -970,7 +970,7 @@ class npc_saurfang_event : public CreatureScript } } - void DoAction(int32 const action) + void DoAction(int32 action) { if (action == ACTION_CHARGE && _index) me->GetMotionMaster()->MoveCharge(chargePos[_index].GetPositionX(), chargePos[_index].GetPositionY(), chargePos[_index].GetPositionZ(), 13.0f, POINT_CHARGE); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp index 70cb585422d..4ec945fcb77 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp @@ -162,7 +162,7 @@ class boss_festergut : public CreatureScript target->RemoveAurasDueToSpell(INOCULATED_HELPER); } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim() || !CheckInRoom()) return; @@ -298,7 +298,7 @@ class npc_stinky_icc : public CreatureScript DoCast(me, SPELL_PLAGUE_STENCH); } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp index 8854a8d1f1a..a78f25bd394 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp @@ -401,7 +401,7 @@ class boss_lady_deathwhisper : public CreatureScript summon->CastSpell(summon, SPELL_ADHERENT_S_DETERMINATION, true); } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if ((!UpdateVictim() && !events.IsInPhase(PHASE_INTRO)) || !CheckInRoom()) return; @@ -656,7 +656,7 @@ class npc_cult_fanatic : public CreatureScript } } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; @@ -734,7 +734,7 @@ class npc_cult_adherent : public CreatureScript } } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; @@ -879,7 +879,7 @@ class npc_darnavan : public CreatureScript Talk(SAY_DARNAVAN_AGGRO); } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp index d7b8408b7c4..40e74baf09f 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp @@ -189,7 +189,7 @@ class boss_lord_marrowgar : public CreatureScript } } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim() || !CheckInRoom()) return; @@ -322,7 +322,7 @@ class boss_lord_marrowgar : public CreatureScript } } - void DoAction(int32 const action) + void DoAction(int32 action) { if (action != ACTION_CLEAR_SPIKE_IMMUNITIES) return; @@ -395,7 +395,7 @@ class npc_coldflame : public CreatureScript _events.ScheduleEvent(EVENT_COLDFLAME_TRIGGER, 500); } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { _events.Update(diff); @@ -474,7 +474,7 @@ class npc_bone_spike : public CreatureScript passenger->ClearUnitState(UNIT_STATE_ONVEHICLE); } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (!_hasTrappedUnit) return; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp index 103c72e947d..e377f5f8d07 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp @@ -413,7 +413,7 @@ class boss_professor_putricide : public CreatureScript } } - void DoAction(int32 const action) + void DoAction(int32 action) { switch (action) { @@ -563,7 +563,7 @@ class boss_professor_putricide : public CreatureScript _experimentState = bool(data); } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if ((!(events.IsInPhase(PHASE_ROTFACE) || events.IsInPhase(PHASE_FESTERGUT)) && !UpdateVictim()) || !CheckInRoom()) return; @@ -742,7 +742,7 @@ class npc_putricide_oozeAI : public ScriptedAI _newTargetSelectTimer = 1000; } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim() && !_newTargetSelectTimer) return; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp index db5f373a753..f398ad55603 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp @@ -162,7 +162,7 @@ class boss_rotface : public CreatureScript // don't enter combat } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim() || !CheckInRoom()) return; @@ -239,7 +239,7 @@ class npc_little_ooze : public CreatureScript me->DespawnOrUnsummon(); } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; @@ -296,13 +296,13 @@ class npc_big_ooze : public CreatureScript me->DespawnOrUnsummon(); } - void DoAction(const int32 action) + void DoAction(int32 action) { if (action == EVENT_STICKY_OOZE) events.CancelEvent(EVENT_STICKY_OOZE); } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; @@ -377,7 +377,7 @@ class npc_precious_icc : public CreatureScript rotface->AI()->Talk(SAY_PRECIOUS_DIES); } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp index 5c7f575413a..ea74d8ec61c 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp @@ -269,7 +269,7 @@ class boss_sindragosa : public CreatureScript Talk(SAY_KILL); } - void DoAction(int32 const action) + void DoAction(int32 action) { if (action == ACTION_START_FROSTWYRM) { @@ -394,7 +394,7 @@ class boss_sindragosa : public CreatureScript } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim() || !CheckInRoom()) return; @@ -559,7 +559,7 @@ class npc_ice_tomb : public CreatureScript } } - void DoAction(int32 const action) + void DoAction(int32 action) { if (action == ACTION_TRIGGER_ASPHYXIATION) if (Player* player = ObjectAccessor::GetPlayer(*me, _trappedPlayerGUID)) @@ -578,7 +578,7 @@ class npc_ice_tomb : public CreatureScript } } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (!_trappedPlayerGUID) return; @@ -657,7 +657,7 @@ class npc_spinestalker : public CreatureScript _events.Reset(); } - void DoAction(int32 const action) + void DoAction(int32 action) { if (action == ACTION_START_FROSTWYRM) { @@ -694,7 +694,7 @@ class npc_spinestalker : public CreatureScript me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; @@ -787,7 +787,7 @@ class npc_rimefang : public CreatureScript _events.Reset(); } - void DoAction(int32 const action) + void DoAction(int32 action) { if (action == ACTION_START_FROSTWYRM) { @@ -829,7 +829,7 @@ class npc_rimefang : public CreatureScript DoCast(me, SPELL_FROST_AURA_RIMEFANG, true); } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; @@ -957,7 +957,7 @@ class npc_sindragosa_trash : public CreatureScript return 0; } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp index 7730a0448fe..6727b20b602 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp @@ -564,7 +564,7 @@ class boss_the_lich_king : public CreatureScript Talk(SAY_LK_KILL); } - void DoAction(int32 const action) + void DoAction(int32 action) { switch (action) { @@ -841,7 +841,7 @@ class boss_the_lich_king : public CreatureScript } } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { // check phase first to prevent updating victim and entering evade mode when not wanted if (!(events.IsInPhase(PHASE_OUTRO) || events.IsInPhase(PHASE_INTRO) || events.IsInPhase(PHASE_FROSTMOURNE))) @@ -1175,7 +1175,7 @@ class npc_tirion_fordring_tft : public CreatureScript } } - void DoAction(int32 const action) + void DoAction(int32 action) { switch (action) { @@ -1222,7 +1222,7 @@ class npc_tirion_fordring_tft : public CreatureScript me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim() && !(_events.IsInPhase(PHASE_OUTRO) || _events.IsInPhase(PHASE_INTRO))) return; @@ -1316,7 +1316,7 @@ class npc_shambling_horror_icc : public CreatureScript } } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; @@ -1396,7 +1396,7 @@ class npc_raging_spirit : public CreatureScript summon->SetTempSummonType(TEMPSUMMON_CORPSE_DESPAWN); } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; @@ -1531,7 +1531,7 @@ class npc_valkyr_shadowguard : public CreatureScript _grabbedPlayer = guid; } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; @@ -1606,7 +1606,7 @@ class npc_strangulate_vehicle : public CreatureScript lichKing->AI()->JustSummoned(me); } - void DoAction(int32 const action) + void DoAction(int32 action) { if (action != ACTION_TELEPORT_BACK) return; @@ -1624,7 +1624,7 @@ class npc_strangulate_vehicle : public CreatureScript lichKing->AI()->SummonedCreatureDespawn(me); } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { UpdateVictim(); @@ -1705,7 +1705,7 @@ class npc_terenas_menethil : public CreatureScript return target->GetEntry() != NPC_THE_LICH_KING; } - void DoAction(int32 const action) + void DoAction(int32 action) { switch (action) { @@ -1774,7 +1774,7 @@ class npc_terenas_menethil : public CreatureScript _events.ScheduleEvent(EVENT_OUTRO_TERENAS_TALK_2, 14000, 0, PHASE_OUTRO); } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { UpdateVictim(); @@ -1866,7 +1866,7 @@ class npc_spirit_warden : public CreatureScript terenas->AI()->DoAction(ACTION_TELEPORT_BACK); } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; @@ -1934,7 +1934,7 @@ class npc_spirit_bomb : public CreatureScript { } - void UpdateAI(uint32 const /*diff*/) + void UpdateAI(uint32 /*diff*/) { UpdateVictim(); // no melee attacks @@ -1969,7 +1969,7 @@ class npc_broken_frostmourne : public CreatureScript _events.ScheduleEvent(EVENT_OUTRO_KNOCK_BACK, 3000, 0, PHASE_OUTRO); } - void DoAction(int32 const action) + void DoAction(int32 action) { if (action == ACTION_SUMMON_TERENAS) _events.ScheduleEvent(EVENT_OUTRO_SUMMON_TERENAS, 6000, 0, PHASE_OUTRO); @@ -1979,7 +1979,7 @@ class npc_broken_frostmourne : public CreatureScript { } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { UpdateVictim(); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp index df23abd8312..97a70f43c27 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp @@ -316,7 +316,7 @@ class boss_valithria_dreamwalker : public CreatureScript { } - void DoAction(int32 const action) + void DoAction(int32 action) { if (action != ACTION_ENTER_COMBAT) return; @@ -423,7 +423,7 @@ class boss_valithria_dreamwalker : public CreatureScript ++_missedPortals; } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { // does not enter combat if (_instance->GetBossState(DATA_VALITHRIA_DREAMWALKER) != IN_PROGRESS) @@ -536,7 +536,7 @@ class npc_green_dragon_combat_trigger : public CreatureScript DoAction(ACTION_DEATH); } - void DoAction(int32 const action) + void DoAction(int32 action) { if (action == ACTION_DEATH) { @@ -545,7 +545,7 @@ class npc_green_dragon_combat_trigger : public CreatureScript } } - void UpdateAI(uint32 const /*diff*/) + void UpdateAI(uint32 /*diff*/) { if (!me->isInCombat()) return; @@ -624,7 +624,7 @@ class npc_the_lich_king_controller : public CreatureScript summon->AI()->AttackStart(target); } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; @@ -716,7 +716,7 @@ class npc_risen_archmage : public CreatureScript } } - void DoAction(int32 const action) + void DoAction(int32 action) { if (action != ACTION_ENTER_COMBAT) return; @@ -734,7 +734,7 @@ class npc_risen_archmage : public CreatureScript summon->DespawnOrUnsummon(36000); } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (!me->isInCombat()) if (me->GetDBTableGUIDLow()) @@ -805,7 +805,7 @@ class npc_blazing_skeleton : public CreatureScript _events.ScheduleEvent(EVENT_LEY_WASTE, urand(15000, 20000)); } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; @@ -871,7 +871,7 @@ class npc_suppresser : public CreatureScript AttackStart(valithria); } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; @@ -928,7 +928,7 @@ class npc_blistering_zombie : public CreatureScript DoCast(me, SPELL_ACID_BURST, true); } - void UpdateAI(uint32 const /*diff*/) + void UpdateAI(uint32 /*diff*/) { if (!UpdateVictim()) return; @@ -965,7 +965,7 @@ class npc_gluttonous_abomination : public CreatureScript DoCast(me, SPELL_ROT_WORM_SPAWNER, true); } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; @@ -1024,7 +1024,7 @@ class npc_dream_portal : public CreatureScript return (type == MISSED_PORTALS && _used) ? 0 : 1; } - void UpdateAI(uint32 const /*diff*/) + void UpdateAI(uint32 /*diff*/) { UpdateVictim(); } @@ -1059,7 +1059,7 @@ class npc_dream_cloud : public CreatureScript me->LoadCreaturesAddon(true); } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { // trigger if (_instance->GetBossState(DATA_VALITHRIA_DREAMWALKER) != IN_PROGRESS) diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp index 5621f9b7a50..3ffa6a0c4be 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp @@ -460,7 +460,7 @@ class npc_highlord_tirion_fordring_lh : public CreatureScript } } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (_damnedKills != 2) return; @@ -611,7 +611,7 @@ class npc_rotting_frost_giant : public CreatureScript _events.Reset(); } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; @@ -671,7 +671,7 @@ class npc_frost_freeze_trap : public CreatureScript SetCombatMovement(false); } - void DoAction(int32 const action) + void DoAction(int32 action) { switch (action) { @@ -684,7 +684,7 @@ class npc_frost_freeze_trap : public CreatureScript } } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { _events.Update(diff); @@ -808,7 +808,7 @@ class boss_sister_svalna : public CreatureScript me->SetHover(false); } - void DoAction(int32 const action) + void DoAction(int32 action) { switch (action) { @@ -877,7 +877,7 @@ class boss_sister_svalna : public CreatureScript } } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim() && !_isEventInProgress) return; @@ -956,7 +956,7 @@ class npc_crok_scourgebane : public CreatureScript _wipeCheckTimer = 1000; } - void DoAction(int32 const action) + void DoAction(int32 action) { if (action == ACTION_START_GAUNTLET) { @@ -1238,7 +1238,7 @@ struct npc_argent_captainAI : public ScriptedAI Talk(SAY_CAPTAIN_KILL); } - void DoAction(int32 const action) + void DoAction(int32 action) { if (action == ACTION_START_GAUNTLET) { @@ -1356,7 +1356,7 @@ class npc_captain_arnath : public CreatureScript Events.ScheduleEvent(EVENT_ARNATH_DOMINATE_MIND, urand(22000, 27000)); } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; @@ -1437,7 +1437,7 @@ class npc_captain_brandon : public CreatureScript Events.ScheduleEvent(EVENT_BRANDON_HAMMER_OF_BETRAYAL, urand(25000, 30000)); } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; @@ -1505,7 +1505,7 @@ class npc_captain_grondel : public CreatureScript Events.ScheduleEvent(EVENT_GRONDEL_CONFLAGRATION, urand(12000, 17000)); } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; @@ -1570,7 +1570,7 @@ class npc_captain_rupert : public CreatureScript Events.ScheduleEvent(EVENT_RUPERT_ROCKET_LAUNCH, urand(10000, 15000)); } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; @@ -1655,7 +1655,7 @@ class npc_impaling_spear : public CreatureScript _vehicleCheckTimer = 500; } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (_vehicleCheckTimer <= diff) { @@ -1696,7 +1696,7 @@ class npc_arthas_teleport_visual : public CreatureScript _events.ScheduleEvent(EVENT_SOUL_MISSILE, urand(1000, 6000)); } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (_events.Empty()) return; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp b/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp index 14e2d05a7c1..d4b16594bc8 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp @@ -144,7 +144,7 @@ public: summon->CastSpell(summon, SPELL_SUMMON_CORPSE_SCARABS_MOB, true, NULL, NULL, me->GetGUID()); } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim() || !CheckInRoom()) return; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp b/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp index 4d5efe4e89c..35f23db24f7 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp @@ -122,7 +122,7 @@ class boss_faerlina : public CreatureScript return 0; } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp index e037f627bee..9013b051b9a 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp @@ -326,7 +326,7 @@ public: events.ScheduleEvent(EVENT_BERSERK, 15*100*1000); } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (nextWP && movementStarted && !movementCompleted && !nextMovementStarted) { diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp index c735107968a..723b2538fc8 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp @@ -93,7 +93,7 @@ public: summons.Summon(summon); } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (!UpdateVictimWithGaze() || !CheckInRoom()) return; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp index 21f3141393a..451992b1d91 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp @@ -393,7 +393,7 @@ class boss_gothik : public CreatureScript } } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim() || !CheckInRoom()) return; @@ -524,7 +524,7 @@ class mob_gothik_minion : public CreatureScript return (liveSide == IN_LIVE_SIDE(who)); } - void DoAction(int32 const param) + void DoAction(int32 param) { gateClose = param; } @@ -574,7 +574,7 @@ class mob_gothik_minion : public CreatureScript Reset(); } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (gateClose && (!isOnSameSide(me) || (me->getVictim() && !isOnSameSide(me->getVictim())))) { diff --git a/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp b/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp index 99d3bfe59b0..3e44fe9eba4 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp @@ -78,7 +78,7 @@ public: boss_grobbulus() : CreatureScript("boss_grobbulus") { } } } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; @@ -140,7 +140,7 @@ public: me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (Cloud_Timer <= diff) { diff --git a/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp b/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp index c88ac807421..ec2335df8e1 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp @@ -133,7 +133,7 @@ public: } } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim() || !CheckInRoom()) return; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp index 1b34e2a93a7..1ee32c8a36e 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp @@ -382,7 +382,7 @@ public: KTTriggerGUID = instance ? instance->GetData64(DATA_KELTHUZAD_TRIGGER) : 0; } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; @@ -735,7 +735,7 @@ class npc_kelthuzad_abomination : public CreatureScript DoCast(me, SPELL_FRENZY, true); } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp b/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp index 75fe66b9faf..3664a166a9f 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp @@ -93,7 +93,7 @@ class boss_loatheb : public CreatureScript return uint32(_sporeLoserData); } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp index 28def13a0d2..dfac6049875 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp @@ -85,7 +85,7 @@ public: events.ScheduleEvent(EVENT_SUMMON, 30000); } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim() || !CheckInRoom()) return; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp index 89b65615a2e..d0034628424 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp @@ -145,7 +145,7 @@ public: } } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim() || !CheckInRoom()) return; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp b/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp index e77a9708ba5..13a5340fa8e 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp @@ -98,7 +98,7 @@ public: instance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_MAKE_QUICK_WERK_OF_HIM_STARTING_EVENT); } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp b/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp index 52dfd60f5f8..0829ecb094d 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp @@ -99,7 +99,7 @@ public: events.ScheduleEvent(EVENT_KNIFE, 10000); } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp index cd68d7ecac3..878107ab35d 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp @@ -159,7 +159,7 @@ class boss_sapphiron : public CreatureScript events.ScheduleEvent(EVENT_LIFTOFF, 0); } - void DoAction(int32 const param) + void DoAction(int32 param) { if (param == DATA_SAPPHIRON_BIRTH) { @@ -217,7 +217,7 @@ class boss_sapphiron : public CreatureScript return 0; } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (!_phase) return; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp index 6c09e7156fe..ea50c67ad1c 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp @@ -159,7 +159,7 @@ public: Talk(SAY_DEATH); } - void DoAction(const int32 action) + void DoAction(int32 action) { switch (action) { @@ -218,7 +218,7 @@ public: return uint32(polaritySwitch); } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (checkFeugenAlive && checkStalaggAlive) uiAddsTimer = 0; @@ -331,7 +331,7 @@ public: pThaddius->AI()->DoAction(ACTION_STALAGG_DIED); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(uint32 uiDiff) { if (!UpdateVictim()) return; @@ -423,7 +423,7 @@ public: pThaddius->AI()->DoAction(ACTION_FEUGEN_DIED); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(uint32 uiDiff) { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp index 1be93dcbaa5..b0a34047c0e 100644 --- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp +++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp @@ -501,7 +501,7 @@ public: } } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; @@ -771,7 +771,7 @@ public: } } - void UpdateAI(uint32 const /*diff*/) + void UpdateAI(uint32 /*diff*/) { // When duration of oppened riff visual ends, // closed one should be cast @@ -841,7 +841,7 @@ public: } } - void UpdateAI(uint32 const /*diff*/) + void UpdateAI(uint32 /*diff*/) { if (!_instance) return; @@ -941,7 +941,7 @@ public: // we dont evade } - void DoAction(int32 const action) + void DoAction(int32 action) { if (me->GetEntry() != NPC_HOVER_DISK_CASTER) return; @@ -1010,7 +1010,7 @@ public: DoCast(me, SPELL_ARCANE_OVERLOAD, false); } - void UpdateAI(uint32 const /*diff*/) + void UpdateAI(uint32 /*diff*/) { // we dont do melee damage! } @@ -1066,7 +1066,7 @@ public: _events.ScheduleEvent(EVENT_YELL_1, 0); } - void UpdateAI(uint32 const /*diff*/) + void UpdateAI(uint32 /*diff*/) { while (uint32 eventId = _events.ExecuteEvent()) { diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp index fd5841a7727..8d1420ce12e 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp @@ -124,7 +124,7 @@ class boss_anomalus : public CreatureScript chaosTheory = false; } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; @@ -212,7 +212,7 @@ class mob_chaotic_rift : public CreatureScript DoCast(me, SPELL_ARCANEFORM, false); } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_commander_kolurg.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_commander_kolurg.cpp index fedb1f5cebc..7f32b2bc4a5 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_commander_kolurg.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_commander_kolurg.cpp @@ -56,7 +56,7 @@ public: void EnterCombat(Unit* /*who*/) {} void AttackStart(Unit* /*who*/) {} void MoveInLineOfSight(Unit* /*who*/) {} - void UpdateAI(const uint32 /*diff*/) + void UpdateAI(uint32 /*diff*/) { //Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_commander_stoutbeard.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_commander_stoutbeard.cpp index 39c93f15d6f..e257b898426 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_commander_stoutbeard.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_commander_stoutbeard.cpp @@ -53,7 +53,7 @@ public: void Reset() {} void AttackStart(Unit* /*who*/) {} void MoveInLineOfSight(Unit* /*who*/) {} - void UpdateAI(const uint32 /*diff*/) + void UpdateAI(uint32 /*diff*/) { //Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp index d1a9227c6fb..8c06895f08f 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp @@ -167,7 +167,7 @@ public: intenseColdList.push_back(guid); } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp index 7679ae53c80..26bf80cb32e 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp @@ -140,7 +140,7 @@ public: Talk(SAY_KILL); } - void DoAction(int32 const action) + void DoAction(int32 action) { if (action == ACTION_MAGUS_DEAD) { @@ -213,7 +213,7 @@ public: } } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { //Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp index c9cfe70b8de..0f480b1d101 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp @@ -109,7 +109,7 @@ public: Talk(SAY_KILL); } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; @@ -219,7 +219,7 @@ public: return type == DATA_COUNT ? _count : 0; } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (_despawntimer <= diff) { diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp index feb801450b1..1a820cd3727 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp @@ -81,7 +81,7 @@ public: Talk(SAY_AGGRO); } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { //Return since we have no target if (!UpdateVictim()) @@ -170,7 +170,7 @@ public: deathTimer = 19000; } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (pulseTimer <= diff) { diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp index 0af498f24c6..d27909328a5 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp @@ -141,7 +141,7 @@ public: return 0; } - void DoAction(const int32 action) + void DoAction(int32 action) { if (action != ACTION_SET_NORMAL_EVENTS) return; @@ -194,7 +194,7 @@ public: } } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { //Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp index 07f19ce9760..57a9c9958df 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp @@ -240,7 +240,7 @@ public: Talk(SAY_PLAYER_KILL); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(uint32 uiDiff) { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp index d8c65d54698..111e6b2c7aa 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp @@ -95,7 +95,7 @@ public: return coreEnergizeOrientation; } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { //Return since we have no target if (!UpdateVictim()) @@ -186,7 +186,7 @@ class npc_azure_ring_captain : public CreatureScript } } - void UpdateAI(const uint32 /*diff*/) + void UpdateAI(uint32 /*diff*/) { if (!UpdateVictim()) return; @@ -206,7 +206,7 @@ class npc_azure_ring_captain : public CreatureScript DoCast(target, SPELL_ICE_BEAM); } - void DoAction(const int32 action) + void DoAction(int32 action) { switch (action) { diff --git a/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp b/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp index f152d0011aa..1f8ba3edade 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp @@ -355,7 +355,7 @@ public: } } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (!(instance->GetBossState(DATA_VAROS_EVENT) == DONE)) { diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp index 16e705e45ab..6a16a644b5c 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp @@ -223,7 +223,7 @@ public: } } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(uint32 uiDiff) { //Return since we have no target if (!UpdateVictim()) @@ -412,7 +412,7 @@ public: } } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(uint32 uiDiff) { //Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp index dc0ffcd2c63..9ce8ea3c52c 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp @@ -213,7 +213,7 @@ public: lSparkList.Despawn(summoned); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(uint32 uiDiff) { //Return since we have no target if (!UpdateVictim()) @@ -335,7 +335,7 @@ public: uiDamage = 0; } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(uint32 uiDiff) { // Despawn if the encounter is not running if (instance && instance->GetData(TYPE_IONAR) != IN_PROGRESS) diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp index df99ab33467..fe6c1c27155 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp @@ -123,7 +123,7 @@ public: Talk(SAY_SLAY); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(uint32 uiDiff) { //Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp index 9b22003bb1c..1e41f346942 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp @@ -226,7 +226,7 @@ public: return 0; } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(uint32 uiDiff) { if (!UpdateVictim()) return; @@ -427,7 +427,7 @@ public: me->DespawnOrUnsummon(); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(uint32 uiDiff) { // Return since we have no target or if we are frozen if (!UpdateVictim() || m_bIsFrozen) diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp index c9a4d2ba5bd..e24ce570c5a 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp @@ -99,7 +99,7 @@ public: instance->SetData(DATA_KRYSTALLUS_EVENT, IN_PROGRESS); } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { //Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp index 8accb3182ce..71222aba88b 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp @@ -107,7 +107,7 @@ public: } } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { //Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp index 9e4c97ea0fc..3b0faa08574 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp @@ -147,7 +147,7 @@ public: } } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { //Return since we have no target if (!UpdateVictim()) @@ -228,7 +228,7 @@ public: Talk(SAY_SLAY); } - void DoAction(int32 const action) + void DoAction(int32 action) { if (action == ACTION_OOZE_DEAD) ++abuseTheOoze; @@ -266,7 +266,7 @@ public: uiMergeTimer = 10000; } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (uiMergeTimer <= diff) { diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp index f1d690f32e0..0a9ae889588 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp @@ -204,7 +204,7 @@ public: }*/ } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (bKaddrakActivated) { diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp index e5ab119e3dc..53fe63195cc 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp @@ -328,7 +328,7 @@ class boss_algalon_the_observer : public CreatureScript } } - void DoAction(int32 const action) + void DoAction(int32 action) { switch (action) { @@ -537,7 +537,7 @@ class boss_algalon_the_observer : public CreatureScript } } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if ((!(events.IsInPhase(PHASE_ROLE_PLAY) || events.IsInPhase(PHASE_BIG_BANG)) && !UpdateVictim()) || !CheckInRoom()) return; @@ -730,7 +730,7 @@ class npc_living_constellation : public CreatureScript return _isActive ? 1 : 0; } - void DoAction(int32 const action) + void DoAction(int32 action) { switch (action) { @@ -767,7 +767,7 @@ class npc_living_constellation : public CreatureScript caster->ToCreature()->DespawnOrUnsummon(1); } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (!(_events.IsInPhase(PHASE_ROLE_PLAY) || _events.IsInPhase(PHASE_BIG_BANG)) && !UpdateVictim()) return; @@ -861,7 +861,7 @@ class npc_brann_bronzebeard_algalon : public CreatureScript { } - void DoAction(int32 const action) + void DoAction(int32 action) { switch (action) { @@ -912,7 +912,7 @@ class npc_brann_bronzebeard_algalon : public CreatureScript _events.ScheduleEvent(EVENT_BRANN_MOVE_INTRO, delay); } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { UpdateVictim(); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp index 451ad6ed915..6ad70d38635 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp @@ -158,7 +158,7 @@ class boss_steelbreaker : public CreatureScript events.ScheduleEvent(EVENT_FUSION_PUNCH, 15000); } - void DoAction(int32 const action) + void DoAction(int32 action) { switch (action) { @@ -212,7 +212,7 @@ class boss_steelbreaker : public CreatureScript DoCast(me, SPELL_ELECTRICAL_CHARGE); } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; @@ -287,7 +287,7 @@ class boss_runemaster_molgeim : public CreatureScript events.ScheduleEvent(EVENT_RUNE_OF_POWER, 20000); } - void DoAction(int32 const action) + void DoAction(int32 action) { switch (action) { @@ -338,7 +338,7 @@ class boss_runemaster_molgeim : public CreatureScript Talk(SAY_MOLGEIM_SLAY); } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; @@ -440,7 +440,7 @@ class boss_stormcaller_brundir : public CreatureScript events.ScheduleEvent(EVENT_OVERLOAD, urand(60000, 120000)); } - void DoAction(int32 const action) + void DoAction(int32 action) { switch (action) { @@ -499,7 +499,7 @@ class boss_stormcaller_brundir : public CreatureScript Talk(SAY_BRUNDIR_SLAY); } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp index aa8c7a96898..5faa2cc4628 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp @@ -154,7 +154,7 @@ class boss_auriaya : public CreatureScript } } - void DoAction(int32 const action) + void DoAction(int32 action) { switch (action) { @@ -207,7 +207,7 @@ class boss_auriaya : public CreatureScript Talk(SAY_DEATH); } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; @@ -299,7 +299,7 @@ class npc_auriaya_seeping_trigger : public CreatureScript DoCast(me, SPELL_SEEPING_ESSENCE); } - void UpdateAI(uint32 const /*diff*/) + void UpdateAI(uint32 /*diff*/) { if (instance->GetBossState(BOSS_AURIAYA) != IN_PROGRESS) me->DespawnOrUnsummon(); @@ -338,7 +338,7 @@ class npc_sanctum_sentry : public CreatureScript DoCast(me, SPELL_STRENGHT_PACK, true); } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; @@ -408,7 +408,7 @@ class npc_feral_defender : public CreatureScript events.ScheduleEvent(EVENT_RUSH, 10000); } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp index 89ddbb7ac38..236791a4f6f 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp @@ -362,7 +362,7 @@ class boss_flame_leviathan : public CreatureScript Unbroken = data ? true : false; } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim() || !CheckInRoom()) return; @@ -467,7 +467,7 @@ class boss_flame_leviathan : public CreatureScript _pursueTarget = target->GetGUID(); } - void DoAction(int32 const action) + void DoAction(int32 action) { if (action && action <= 4) // Tower destruction, debuff leviathan loot and reduce active tower count { @@ -638,7 +638,7 @@ class boss_flame_leviathan_defense_cannon : public CreatureScript DoCast(me, AURA_STEALTH_DETECTION); } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; @@ -752,7 +752,7 @@ class boss_flame_leviathan_safety_container : public CreatureScript me->SetPosition(x, y, z, 0); } - void UpdateAI(uint32 const /*diff*/) + void UpdateAI(uint32 /*diff*/) { } }; @@ -802,7 +802,7 @@ class npc_mechanolift : public CreatureScript container->EnterVehicle(me); } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (MoveTimer <= diff) { @@ -851,7 +851,7 @@ class npc_pool_of_tar : public CreatureScript me->CastSpell(me, SPELL_BLAZE, true); } - void UpdateAI(uint32 const /*diff*/) {} + void UpdateAI(uint32 /*diff*/) {} }; CreatureAI* GetAI(Creature* creature) const @@ -880,7 +880,7 @@ class npc_colossus : public CreatureScript instance->SetData(DATA_COLOSSUS, instance->GetData(DATA_COLOSSUS)+1); } - void UpdateAI(uint32 const /*diff*/) + void UpdateAI(uint32 /*diff*/) { if (!UpdateVictim()) return; @@ -917,7 +917,7 @@ class npc_thorims_hammer : public CreatureScript } } - void UpdateAI(uint32 const /*diff*/) + void UpdateAI(uint32 /*diff*/) { if (!me->HasAura(AURA_DUMMY_BLUE)) me->CastSpell(me, AURA_DUMMY_BLUE, true); @@ -963,7 +963,7 @@ public: uint32 infernoTimer; - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { npc_escortAI::UpdateAI(diff); @@ -1012,7 +1012,7 @@ class npc_hodirs_fury : public CreatureScript } } - void UpdateAI(uint32 const /*diff*/) + void UpdateAI(uint32 /*diff*/) { if (!me->HasAura(AURA_DUMMY_GREEN)) me->CastSpell(me, AURA_DUMMY_GREEN, true); @@ -1046,7 +1046,7 @@ class npc_freyas_ward : public CreatureScript summonTimer = 5000; } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (summonTimer <= diff) { @@ -1089,7 +1089,7 @@ class npc_freya_ward_summon : public CreatureScript lashTimer = 5000; } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; @@ -1127,7 +1127,7 @@ class npc_lorekeeper : public CreatureScript { } - void DoAction(int32 const action) + void DoAction(int32 action) { // Start encounter if (action == ACTION_SPAWN_VEHICLES) diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp index 0a873bc5792..33a14aaa3df 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp @@ -387,7 +387,7 @@ class boss_freya : public CreatureScript return 0; } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; @@ -722,7 +722,7 @@ class boss_elder_brightleaf : public CreatureScript Talk(SAY_ELDER_AGGRO); } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim() || me->HasAura(SPELL_DRAINED_OF_POWER)) return; @@ -765,7 +765,7 @@ class boss_elder_brightleaf : public CreatureScript DoMeleeAttackIfReady(); } - void DoAction(int32 const action) + void DoAction(int32 action) { switch (action) { @@ -856,7 +856,7 @@ class boss_elder_stonebark : public CreatureScript } } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim() || me->HasAura(SPELL_DRAINED_OF_POWER)) return; @@ -892,7 +892,7 @@ class boss_elder_stonebark : public CreatureScript DoMeleeAttackIfReady(); } - void DoAction(int32 const action) + void DoAction(int32 action) { switch (action) { @@ -970,7 +970,7 @@ class boss_elder_ironbranch : public CreatureScript Talk(SAY_ELDER_AGGRO); } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim() || me->HasAura(SPELL_DRAINED_OF_POWER)) return; @@ -1006,7 +1006,7 @@ class boss_elder_ironbranch : public CreatureScript DoMeleeAttackIfReady(); } - void DoAction(int32 const action) + void DoAction(int32 action) { switch (action) { @@ -1051,7 +1051,7 @@ class npc_detonating_lasher : public CreatureScript changeTargetTimer = 7500; } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; @@ -1110,7 +1110,7 @@ class npc_ancient_water_spirit : public CreatureScript tidalWaveTimer = 10000; } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; @@ -1171,7 +1171,7 @@ class npc_storm_lasher : public CreatureScript stormboltTimer = 5000; } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; @@ -1232,7 +1232,7 @@ class npc_snaplasher : public CreatureScript waveCount = CAST_AI(boss_freya::boss_freyaAI, Freya->AI())->trioWaveCount; } - void UpdateAI(uint32 const /*diff*/) + void UpdateAI(uint32 /*diff*/) { if (!UpdateVictim()) return; @@ -1297,7 +1297,7 @@ class npc_ancient_conservator : public CreatureScript DoCast(who, SPELL_CONSERVATOR_GRIP, true); } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; @@ -1374,7 +1374,7 @@ class npc_healthy_spore : public CreatureScript lifeTimer = urand(22000, 30000); } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (lifeTimer <= diff) { @@ -1413,7 +1413,7 @@ class npc_eonars_gift : public CreatureScript DoCast(me, SPELL_EONAR_VISUAL, true); } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (lifeBindersGiftTimer <= diff) { @@ -1451,7 +1451,7 @@ class npc_nature_bomb : public CreatureScript DoCast(SPELL_OBJECT_BOMB); } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (bombTimer <= diff) { @@ -1496,7 +1496,7 @@ class npc_unstable_sun_beam : public CreatureScript me->SetReactState(REACT_PASSIVE); } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (despawnTimer <= diff) { diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp index 6fa2c7127e6..1642cc0483f 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp @@ -135,7 +135,7 @@ class boss_general_vezax : public CreatureScript events.ScheduleEvent(EVENT_BERSERK, 600000); } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; @@ -250,7 +250,7 @@ class boss_general_vezax : public CreatureScript return 0; } - void DoAction(int32 const action) + void DoAction(int32 action) { switch (action) { @@ -333,7 +333,7 @@ class boss_saronite_animus : public CreatureScript Vezax->AI()->DoAction(ACTION_ANIMUS_DIE); } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; @@ -392,7 +392,7 @@ class npc_saronite_vapors : public CreatureScript events.ScheduleEvent(EVENT_RANDOM_MOVE, urand(5000, 7500)); } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { events.Update(diff); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp index 26d15d78e59..95ac326aa84 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp @@ -193,7 +193,7 @@ class npc_flash_freeze : public CreatureScript checkDespawnTimer = 1000; } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim() || me->getVictim()->HasAura(SPELL_BLOCK_OF_ICE) || me->getVictim()->HasAura(SPELL_FLASH_FREEZE_HELPER)) return; @@ -381,7 +381,7 @@ class boss_hodir : public CreatureScript } } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; @@ -460,7 +460,7 @@ class boss_hodir : public CreatureScript DoMeleeAttackIfReady(); } - void DoAction(int32 const action) + void DoAction(int32 action) { switch (action) { @@ -525,7 +525,7 @@ class npc_icicle : public CreatureScript icicleTimer = 2500; } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (icicleTimer <= diff) { @@ -573,7 +573,7 @@ class npc_snowpacked_icicle : public CreatureScript despawnTimer = 12000; } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (despawnTimer <= diff) { @@ -611,7 +611,7 @@ class npc_hodir_priest : public CreatureScript events.ScheduleEvent(EVENT_DISPEL_MAGIC, urand(15000, 20000)); } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim() || me->HasUnitState(UNIT_STATE_STUNNED) || me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_STUNNED)) return; @@ -687,7 +687,7 @@ class npc_hodir_shaman : public CreatureScript events.ScheduleEvent(EVENT_STORM_CLOUD, urand(10000, 12500)); } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim() || me->HasUnitState(UNIT_STATE_STUNNED) || me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_STUNNED)) return; @@ -749,7 +749,7 @@ class npc_hodir_druid : public CreatureScript events.ScheduleEvent(EVENT_STARLIGHT, urand(15000, 17500)); } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim() || me->HasUnitState(UNIT_STATE_STUNNED) || me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_STUNNED)) return; @@ -824,7 +824,7 @@ class npc_hodir_mage : public CreatureScript summons.remove(summoned->GetGUID()); } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim() || me->HasUnitState(UNIT_STATE_STUNNED) || me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_STUNNED)) return; diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp index f525bc874f7..b040a64c75a 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp @@ -180,7 +180,7 @@ class boss_ignis : public CreatureScript summons.Summon(summon); } - void DoAction(const int32 action) + void DoAction(int32 action) { if (action != ACTION_REMOVE_BUFF) return; @@ -193,7 +193,7 @@ class boss_ignis : public CreatureScript _firstConstructKill = secondKill; } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; @@ -319,7 +319,7 @@ class npc_iron_construct : public CreatureScript } } - void UpdateAI(const uint32 /*uiDiff*/) + void UpdateAI(uint32 /*uiDiff*/) { if (!UpdateVictim()) return; @@ -392,7 +392,7 @@ class npc_scorch_ground : public CreatureScript _heatTimer = 0; } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(uint32 uiDiff) { if (_heat) { diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp index 24282340278..94df327d3da 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp @@ -242,7 +242,7 @@ class boss_kologarn : public CreatureScript } } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp index b51c6994dd5..b74c4109fd7 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp @@ -224,7 +224,7 @@ class boss_razorscale_controller : public CreatureScript _JustDied(); } - void DoAction(int32 const action) + void DoAction(int32 action) { if (instance->GetBossState(BOSS_RAZORSCALE) != IN_PROGRESS) return; @@ -243,7 +243,7 @@ class boss_razorscale_controller : public CreatureScript } } - void UpdateAI(uint32 const Diff) + void UpdateAI(uint32 Diff) { events.Update(Diff); @@ -394,7 +394,7 @@ class boss_razorscale : public CreatureScript return 0; } - void UpdateAI(uint32 const Diff) + void UpdateAI(uint32 Diff) { if (!UpdateVictim()) return; @@ -562,7 +562,7 @@ class boss_razorscale : public CreatureScript } } - void DoAction(int32 const action) + void DoAction(int32 action) { switch (action) { @@ -625,7 +625,7 @@ class npc_expedition_commander : public CreatureScript summons.push_back(summoned->GetGUID()); } - void DoAction(int32 const action) + void DoAction(int32 action) { switch (action) { @@ -639,7 +639,7 @@ class npc_expedition_commander : public CreatureScript } } - void UpdateAI(uint32 const Diff) + void UpdateAI(uint32 Diff) { if (AttackStartTimer <= Diff) { @@ -762,7 +762,7 @@ class npc_mole_machine_trigger : public CreatureScript NpcSummoned = false; } - void UpdateAI(uint32 const Diff) + void UpdateAI(uint32 Diff) { if (!GobSummoned && SummonGobTimer <= Diff) { @@ -857,7 +857,7 @@ class npc_darkrune_watcher : public CreatureScript LightTimer = urand(1000, 3000); } - void UpdateAI(uint32 const Diff) + void UpdateAI(uint32 Diff) { if (!UpdateVictim()) return; @@ -917,7 +917,7 @@ class npc_darkrune_guardian : public CreatureScript } - void UpdateAI(uint32 const Diff) + void UpdateAI(uint32 Diff) { if (!UpdateVictim()) return; @@ -963,7 +963,7 @@ class npc_darkrune_sentinel : public CreatureScript ShoutTimer = urand(15000, 30000); } - void UpdateAI(uint32 const Diff) + void UpdateAI(uint32 Diff) { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp index 564087088d3..b75a6a67a30 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp @@ -78,7 +78,7 @@ class boss_thorim : public CreatureScript _EnterCombat(); } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp index 1ae6a35403b..a358fc41db0 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp @@ -241,7 +241,7 @@ class boss_xt002 : public CreatureScript instance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_MUST_DECONSTRUCT_FASTER); } - void DoAction(const int32 action) + void DoAction(int32 action) { switch (action) { @@ -269,7 +269,7 @@ class boss_xt002 : public CreatureScript ExposeHeart(); } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim() || !CheckInRoom()) return; @@ -459,7 +459,7 @@ class mob_xt002_heart : public CreatureScript SetCombatMovement(false); } - void UpdateAI(uint32 const /*diff*/) { } + void UpdateAI(uint32 /*diff*/) { } void JustDied(Unit* /*killer*/) { @@ -513,7 +513,7 @@ class mob_scrapbot : public CreatureScript me->GetMotionMaster()->MoveFollow(pXT002, 0.0f, 0.0f); } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (_rangeCheckTimer <= diff) { @@ -574,7 +574,7 @@ class mob_pummeller : public CreatureScript } } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; @@ -704,7 +704,7 @@ class mob_boombot : public CreatureScript } } - void UpdateAI(uint32 const /*diff*/) + void UpdateAI(uint32 /*diff*/) { if (!UpdateVictim()) return; @@ -746,7 +746,7 @@ class mob_life_spark : public CreatureScript _shockTimer = 0; // first one is immediate. } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp index dbf2058546f..215630ac5fa 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp @@ -204,7 +204,7 @@ public: Talk(bIsUndead ? YELL_KILL_1 : YELL_KILL_2); } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim() && !events.IsInPhase(PHASE_EVENT)) return; @@ -358,7 +358,7 @@ public: void AttackStart(Unit* /*who*/) {} void MoveInLineOfSight(Unit* /*who*/) {} void EnterCombat(Unit* /*who*/) {} - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (uiResurectTimer) { diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp index 6e532a88396..896421909ad 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp @@ -94,7 +94,7 @@ public: instance = creature->GetInstanceScript(); } - void UpdateAI(const uint32 /*diff*/) {} + void UpdateAI(uint32 /*diff*/) {} void JustDied(Unit* /*killer*/) { @@ -193,7 +193,7 @@ public: return 0; } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; @@ -288,7 +288,7 @@ public: } } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp index 05822aa2595..ef7ad659a24 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp @@ -180,7 +180,7 @@ public: } } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (ghost) { @@ -340,7 +340,7 @@ public: } } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (ghost) { diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp index 7103095b252..4f7f0e844bb 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp @@ -146,7 +146,7 @@ public: return near_f > 0 && near_f < 4 ? near_f : 0; } - void UpdateAI(uint32 const /* diff */) + void UpdateAI(uint32 /* diff */) { if (fm_Type == 0) fm_Type = GetForgeMasterType(); @@ -291,7 +291,7 @@ public: } } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp index 36506227287..2b1d850ab25 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp @@ -174,7 +174,7 @@ public: } } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (currentPhase != PHASE_GORTOK_PALEHOOF) return; @@ -325,7 +325,7 @@ public: } } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { //Return since we have no target if (!UpdateVictim()) @@ -438,7 +438,7 @@ public: } } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { //Return since we have no target if (!UpdateVictim()) @@ -554,7 +554,7 @@ public: } } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { //Return since we have no target if (!UpdateVictim()) @@ -674,7 +674,7 @@ public: } } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { //Return since we have no target if (!UpdateVictim()) @@ -771,7 +771,7 @@ public: me->SetSpeed(MOVE_FLIGHT, 0.5f); } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (currentPhase == PHASE_NONE) return; diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp index 2514cb3de78..3a74eebd947 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp @@ -303,7 +303,7 @@ public: } } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { switch (Phase) { diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp index 1442dddb120..f2090f6a2e6 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp @@ -250,7 +250,7 @@ public: } } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (Phase == IDLE) return; @@ -479,7 +479,7 @@ public: DoCast(me, SPELL_SHADOWS_IN_THE_DARK); } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (me->HasUnitState(UNIT_STATE_CASTING)) return; @@ -601,7 +601,7 @@ class npc_scourge_hulk : public CreatureScript killedByRitualStrike = true; } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp index 99d987e63a4..f4c65216f4a 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp @@ -207,7 +207,7 @@ public: return 0; } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (m_bIsWalking) { diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp index 33e0619c7e5..a4ea8649ff9 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp @@ -76,7 +76,7 @@ class boss_archavon : public CreatureScript } // Below UpdateAI may need review/debug. - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; @@ -156,7 +156,7 @@ class mob_archavon_warder : public CreatureScript DoZoneInCombat(); } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp index b8b6acce54d..baed96453dc 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp @@ -115,7 +115,7 @@ class boss_emalon : public CreatureScript _EnterCombat(); } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; @@ -215,7 +215,7 @@ class mob_tempest_minion : public CreatureScript } } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { //Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp index fafeba6a570..50cb8f017b3 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp @@ -73,7 +73,7 @@ class boss_koralon : public CreatureScript _EnterCombat(); } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; @@ -149,7 +149,7 @@ class mob_flame_warder : public CreatureScript events.ScheduleEvent(EVENT_FW_METEOR_FISTS_A, 10000); } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp index 688e7d818df..3068049e322 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp @@ -74,7 +74,7 @@ class boss_toravon : public CreatureScript _EnterCombat(); } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; @@ -142,7 +142,7 @@ class mob_frost_warder : public CreatureScript events.ScheduleEvent(EVENT_FROST_BLAST, 5000); } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; @@ -196,7 +196,7 @@ public: DoZoneInCombat(); } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (!done) { @@ -248,7 +248,7 @@ class mob_frozen_orb_stalker : public CreatureScript SetCombatMovement(false); } - void UpdateAI(const uint32 /*diff*/) + void UpdateAI(uint32 /*diff*/) { if (spawned) return; diff --git a/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp index 1f12685a4b0..d524e3fb708 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp @@ -89,7 +89,7 @@ public: void MoveInLineOfSight(Unit* /*who*/) {} - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (instance && instance->GetData(DATA_REMOVE_NPC) == 1) { diff --git a/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp b/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp index 6c16bb98ff1..9dbb10be601 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp @@ -144,7 +144,7 @@ public: void MoveInLineOfSight(Unit* /*who*/) {} - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { //Return since we have no target if (!UpdateVictim()) @@ -303,7 +303,7 @@ public: void MoveInLineOfSight(Unit* /*who*/) {} - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp index fb4297f595f..364602f8fa1 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp @@ -151,7 +151,7 @@ public: } } - void DoAction(const int32 param) + void DoAction(int32 param) { if (!me->isAlive()) return; @@ -205,7 +205,7 @@ public: void MoveInLineOfSight(Unit* /*who*/) {} - void UpdateAI(const uint32 uiDiff) + void UpdateAI(uint32 uiDiff) { if (!UpdateVictim()) return; @@ -362,7 +362,7 @@ public: return; } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(uint32 uiDiff) { if (uiRangeCheck_Timer < uiDiff) { diff --git a/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp b/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp index dc0b320b307..187cf5d6b30 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp @@ -102,7 +102,7 @@ public: void MoveInLineOfSight(Unit* /*who*/) {} - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { //Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp b/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp index d40f3b14f87..d308c6c696b 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp @@ -95,7 +95,7 @@ public: void MoveInLineOfSight(Unit* /*who*/) {} - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { //Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp b/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp index 891b91c6dfb..b14a9e0dec5 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp @@ -154,7 +154,7 @@ public: void MoveInLineOfSight(Unit* /*who*/) {} - void UpdateAI(const uint32 uiDiff) + void UpdateAI(uint32 uiDiff) { //Return since we have no target if (!UpdateVictim()) @@ -251,7 +251,7 @@ public: uiRangeCheck_Timer = 1000; } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(uint32 uiDiff) { //Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp b/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp index cf0ee82c01c..0f150fe88b8 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp @@ -122,7 +122,7 @@ public: void MoveInLineOfSight(Unit* /*who*/) {} - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { //Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp index 5ebc2eaf973..fbbf3fa3df5 100644 --- a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp +++ b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp @@ -342,7 +342,7 @@ public: } } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(uint32 uiDiff) { ScriptedAI::UpdateAI(uiDiff); @@ -481,7 +481,7 @@ public: } } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (instance && instance->GetData(DATA_MAIN_EVENT_PHASE) != IN_PROGRESS) me->CastStop(); @@ -578,7 +578,7 @@ public: void MoveInLineOfSight(Unit* /*who*/) {} - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (!instance) //Massive usage of instance, global check return; @@ -724,7 +724,7 @@ struct violet_hold_trashAI : public npc_escortAI } } - void UpdateAI(const uint32) + void UpdateAI(uint32) { if (instance && instance->GetData(DATA_MAIN_EVENT_PHASE) != IN_PROGRESS) me->CastStop(); @@ -832,7 +832,7 @@ public: uiSunderArmorTimer = 4000; } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { violet_hold_trashAI::UpdateAI(diff); npc_escortAI::UpdateAI(diff); @@ -910,7 +910,7 @@ public: uiFrostboltTimer = 4000; } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { violet_hold_trashAI::UpdateAI(diff); npc_escortAI::UpdateAI(diff); @@ -984,7 +984,7 @@ public: uiSpellLockTimer = 5000; } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { violet_hold_trashAI::UpdateAI(diff); npc_escortAI::UpdateAI(diff); @@ -1044,7 +1044,7 @@ public: uiMagicReflectionTimer = 8000; } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { violet_hold_trashAI::UpdateAI(diff); npc_escortAI::UpdateAI(diff); @@ -1097,7 +1097,7 @@ public: TacticalBlinkCasted =false; } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { violet_hold_trashAI::UpdateAI(diff); npc_escortAI::UpdateAI(diff); @@ -1159,7 +1159,7 @@ public: uiConeOfColdTimer = 4000; } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { violet_hold_trashAI::UpdateAI(diff); npc_escortAI::UpdateAI(diff); @@ -1239,7 +1239,7 @@ public: uiWhirlwindTimer = 8000; } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { violet_hold_trashAI::UpdateAI(diff); npc_escortAI::UpdateAI(diff); @@ -1293,7 +1293,7 @@ public: uiManaDetonationTimer = 5000; } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { violet_hold_trashAI::UpdateAI(diff); npc_escortAI::UpdateAI(diff); diff --git a/src/server/scripts/Northrend/zone_borean_tundra.cpp b/src/server/scripts/Northrend/zone_borean_tundra.cpp index 760156dc1c3..fef900e1dfd 100644 --- a/src/server/scripts/Northrend/zone_borean_tundra.cpp +++ b/src/server/scripts/Northrend/zone_borean_tundra.cpp @@ -92,7 +92,7 @@ public: void EnterCombat(Unit* /*who*/){} - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (!phase) return; @@ -436,7 +436,7 @@ public: DoCast(me, SPELL_DROP_CRATE, true); } - void UpdateAI(const uint32 /*diff*/) + void UpdateAI(uint32 /*diff*/) { if (setCrateNumber) { @@ -576,7 +576,7 @@ public: go_caribou->SetGoState(GO_STATE_READY); } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (phaseTimer <= diff) { @@ -701,7 +701,7 @@ public: } } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (IntroPhase) { @@ -867,7 +867,7 @@ public: } } - void UpdateAI(const uint32 /*diff*/) + void UpdateAI(uint32 /*diff*/) { if (WithRedDragonBlood && HarpoonerGUID && !me->HasAura(SPELL_RED_DRAGONBLOOD)) { @@ -1017,7 +1017,7 @@ public: } } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(uint32 uiDiff) { npc_escortAI::UpdateAI(uiDiff); @@ -1360,7 +1360,7 @@ public: CAST_AI(npc_thassarian::npc_thassarianAI, CAST_CRE(summoner)->AI())->talbotInPosition = true; } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(uint32 uiDiff) { if (bCheck) { @@ -1482,7 +1482,7 @@ public: } } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(uint32 uiDiff) { ScriptedAI::UpdateAI(uiDiff); @@ -1622,7 +1622,7 @@ public: } } - void UpdateAI(const uint32 /*uiDiff*/) + void UpdateAI(uint32 /*uiDiff*/) { if (!UpdateVictim()) return; @@ -1674,7 +1674,7 @@ public: rebuff = 0; } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { UpdateVictim(); @@ -1990,7 +1990,7 @@ public: } } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (bStarted) { @@ -2005,7 +2005,7 @@ public: } } - void DoAction(const int32 param) + void DoAction(int32 param) { if (param == 1) bStarted = true; @@ -2105,7 +2105,7 @@ public: uiExplosionTimer = urand(5000, 10000); } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (uiExplosionTimer < diff) { @@ -2160,7 +2160,7 @@ public: uiTimer = urand(13000, 18000); } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { if (uiTimer <= diff) { @@ -2222,7 +2222,7 @@ public: void AttackStart(Unit* /*who*/) {} - void UpdateAI(const uint32 uiDiff) + void UpdateAI(uint32 uiDiff) { if (m_uiTimer <= uiDiff) { @@ -2358,7 +2358,7 @@ public: me->RestoreFaction(); } - void DoAction(const int32 /*iParam*/) + void DoAction(int32 /*iParam*/) { me->StopMoving(); me->SetUInt32Value(UNIT_NPC_FLAGS, 0); @@ -2383,7 +2383,7 @@ public: me->AI()->AttackStart(player); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(uint32 uiDiff) { if (uiEventTimer && uiEventTimer <= uiDiff) { diff --git a/src/server/scripts/Northrend/zone_crystalsong_forest.cpp b/src/server/scripts/Northrend/zone_crystalsong_forest.cpp index 963778dd802..d05e442b0f4 100644 --- a/src/server/scripts/Northrend/zone_crystalsong_forest.cpp +++ b/src/server/scripts/Northrend/zone_crystalsong_forest.cpp @@ -63,7 +63,7 @@ public: uiTargetGUID = 0; } - void UpdateAI(const uint32 /*uiDiff*/) + void UpdateAI(uint32 /*uiDiff*/) { if (me->IsNonMeleeSpellCasted(false)) return; diff --git a/src/server/scripts/Northrend/zone_dalaran.cpp b/src/server/scripts/Northrend/zone_dalaran.cpp index fad88d84d4f..d3d77cdd9da 100644 --- a/src/server/scripts/Northrend/zone_dalaran.cpp +++ b/src/server/scripts/Northrend/zone_dalaran.cpp @@ -117,7 +117,7 @@ public: return; } - void UpdateAI(const uint32 /*diff*/){} + void UpdateAI(uint32 /*diff*/){} }; CreatureAI* GetAI(Creature* creature) const diff --git a/src/server/scripts/Northrend/zone_dragonblight.cpp b/src/server/scripts/Northrend/zone_dragonblight.cpp index a8fb0215902..ed7354acb50 100644 --- a/src/server/scripts/Northrend/zone_dragonblight.cpp +++ b/src/server/scripts/Northrend/zone_dragonblight.cpp @@ -248,7 +248,7 @@ class npc_wyrmrest_defender : public CreatureScript RenewRecoveryChecker = 0; } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { // Check system for Health Warning should happen first time whenever get under 30%, // after it should be able to happen only after recovery of last renew is fully done (20 sec), diff --git a/src/server/scripts/Northrend/zone_grizzly_hills.cpp b/src/server/scripts/Northrend/zone_grizzly_hills.cpp index fe1f561071c..e8eddea6ef7 100644 --- a/src/server/scripts/Northrend/zone_grizzly_hills.cpp +++ b/src/server/scripts/Northrend/zone_grizzly_hills.cpp @@ -192,7 +192,7 @@ public: RWORGGUID = 0; } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(uint32 uiDiff) { npc_escortAI::UpdateAI(uiDiff); @@ -264,7 +264,7 @@ public: void MoveInLineOfSight(Unit* /*who*/) {} - void UpdateAI(const uint32 /*diff*/) + void UpdateAI(uint32 /*diff*/) { if (!UpdateVictim()) return; @@ -369,7 +369,7 @@ public: m_uiPhase = 1; } - void UpdateAI(const uint32 /*uiDiff*/) + void UpdateAI(uint32 /*uiDiff*/) { if (m_uiPhase == 1) { @@ -416,7 +416,7 @@ public: m_uiPhase = 1; } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(uint32 uiDiff) { // call this each update tick? if (me->FindNearestCreature(TALLHORN_STAG, 0.2f)) @@ -510,7 +510,7 @@ public: } } - void UpdateAI(const uint32 /*diff*/) + void UpdateAI(uint32 /*diff*/) { if (!UpdateVictim()) return; @@ -558,7 +558,7 @@ public: uiChargedSentryTotem = urand(10000, 12000); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(uint32 uiDiff) { if (!UpdateVictim()) return; @@ -624,7 +624,7 @@ class npc_venture_co_straggler : public CreatureScript me->SetReactState(REACT_AGGRESSIVE); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(uint32 uiDiff) { if (uiPlayerGUID && uiRunAwayTimer <= uiDiff) { diff --git a/src/server/scripts/Northrend/zone_icecrown.cpp b/src/server/scripts/Northrend/zone_icecrown.cpp index 70210844394..d5641b0fcc7 100644 --- a/src/server/scripts/Northrend/zone_icecrown.cpp +++ b/src/server/scripts/Northrend/zone_icecrown.cpp @@ -219,7 +219,7 @@ public: } } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(uint32 uiDiff) { if (!UpdateVictim()) return; @@ -448,7 +448,7 @@ class npc_tournament_training_dummy : public CreatureScript isVulnerable = true; } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { events.Update(diff); @@ -637,7 +637,7 @@ public: me->DespawnOrUnsummon(); } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { events.Update(diff); diff --git a/src/server/scripts/Northrend/zone_sholazar_basin.cpp b/src/server/scripts/Northrend/zone_sholazar_basin.cpp index 7db2ae4707b..63143673185 100644 --- a/src/server/scripts/Northrend/zone_sholazar_basin.cpp +++ b/src/server/scripts/Northrend/zone_sholazar_basin.cpp @@ -321,7 +321,7 @@ public: Reset(); } - void UpdateAI(const uint32 /*uiDiff*/) + void UpdateAI(uint32 /*uiDiff*/) { if (!UpdateVictim()) return; @@ -420,7 +420,7 @@ public: } } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(uint32 uiDiff) { npc_escortAI::UpdateAI(uiDiff); @@ -582,7 +582,7 @@ public: timer -= diff; } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(uint32 uiDiff) { if (phase) proceedCwEvent(uiDiff); @@ -1120,7 +1120,7 @@ public: } } - void UpdateAI(const uint32 /*diff*/) {} + void UpdateAI(uint32 /*diff*/) {} }; CreatureAI* GetAI(Creature* creature) const diff --git a/src/server/scripts/Northrend/zone_storm_peaks.cpp b/src/server/scripts/Northrend/zone_storm_peaks.cpp index d9528446bcf..ba725d2dda4 100644 --- a/src/server/scripts/Northrend/zone_storm_peaks.cpp +++ b/src/server/scripts/Northrend/zone_storm_peaks.cpp @@ -186,7 +186,7 @@ public: player->FailQuest(QUEST_BITTER_DEPARTURE); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(uint32 uiDiff) { npc_escortAI::UpdateAI(uiDiff); if (!UpdateVictim()) @@ -318,7 +318,7 @@ public: Reset(); } - void UpdateAI(const uint32 /*diff*/) + void UpdateAI(uint32 /*diff*/) { if (!freed) return; @@ -396,7 +396,7 @@ public: events.ScheduleEvent(EVENT_REACHED_HOME, 2000); } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { events.Update(diff); @@ -477,7 +477,7 @@ public: { } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 diff) { npc_escortAI::UpdateAI(diff); @@ -516,7 +516,7 @@ class npc_hyldsmeet_protodrake : public CreatureScript _accessoryRespawnTimer = 5 * MINUTE * IN_MILLISECONDS; } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 diff) { //! We need to manually reinstall accessories because the vehicle itself is friendly to players, //! so EnterEvadeMode is never triggered. The accessory on the other hand is hostile and killable. diff --git a/src/server/scripts/Northrend/zone_wintergrasp.cpp b/src/server/scripts/Northrend/zone_wintergrasp.cpp index 8c255d49d25..ce0eaefac90 100644 --- a/src/server/scripts/Northrend/zone_wintergrasp.cpp +++ b/src/server/scripts/Northrend/zone_wintergrasp.cpp @@ -224,7 +224,7 @@ class npc_wg_spirit_guide : public CreatureScript { npc_wg_spirit_guideAI(Creature* creature) : ScriptedAI(creature) { } - void UpdateAI(uint32 const /*diff*/) + void UpdateAI(uint32 /*diff*/) { if (!me->HasUnitState(UNIT_STATE_CASTING)) DoCast(me, SPELL_CHANNEL_SPIRIT_HEAL); diff --git a/src/server/scripts/Northrend/zone_zuldrak.cpp b/src/server/scripts/Northrend/zone_zuldrak.cpp index 69e8d900435..33a573b9b35 100644 --- a/src/server/scripts/Northrend/zone_zuldrak.cpp +++ b/src/server/scripts/Northrend/zone_zuldrak.cpp @@ -170,7 +170,7 @@ public: } } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(uint32 uiDiff) { if (UpdateVictim()) { @@ -409,7 +409,7 @@ public: } } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(uint32 uiDiff) { ScriptedAI::UpdateAI(uiDiff); @@ -636,7 +636,7 @@ public: DoCast(who, SPELL_IMPALE); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(uint32 uiDiff) { if (!UpdateVictim()) return; @@ -761,7 +761,7 @@ public: DoCast(me, SPELL_GROW); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(uint32 uiDiff) { npc_escortAI::UpdateAI(uiDiff); @@ -832,7 +832,7 @@ public: uiCorrodeFleshTimer = 6000; } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(uint32 uiDiff) { if (!UpdateVictim()) return; @@ -950,7 +950,7 @@ public: } } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(uint32 uiDiff) { npc_escortAI::UpdateAI(uiDiff); @@ -1099,7 +1099,7 @@ public: } } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(uint32 uiDiff) { if (!UpdateVictim()) return; @@ -1213,7 +1213,7 @@ public: } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(uint32 uiDiff) { if (!UpdateVictim()) return; @@ -1309,7 +1309,7 @@ public: m_heading = me->GetOrientation(); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(uint32 uiDiff) { if (m_uiPhase) { |
