diff options
| author | Nay <dnpd.dd@gmail.com> | 2013-07-06 20:21:45 +0100 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2013-07-06 20:21:45 +0100 |
| commit | 3561ab98bae1dc111530223aaf25f58bb3267677 (patch) | |
| tree | 93cd9c541564b8469f617871dd51407609f3dee7 /src/server/scripts/Kalimdor | |
| parent | 0c911af24c263c4e931c7264242c9755074d270d (diff) | |
Misc: Use override and final C++11 keywords in a few places (mostly scripts)
OVERRIDE and FINAL are TC macros (expand to nothing if compiler does not support C++11)
Diffstat (limited to 'src/server/scripts/Kalimdor')
86 files changed, 968 insertions, 945 deletions
diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp index 81e1136f94f..7872b42912f 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp @@ -40,7 +40,7 @@ class go_blackfathom_altar : public GameObjectScript public: go_blackfathom_altar() : GameObjectScript("go_blackfathom_altar") { } - bool OnGossipHello(Player* player, GameObject* /*go*/) + bool OnGossipHello(Player* player, GameObject* /*go*/) OVERRIDE { if (!player->HasAura(SPELL_BLESSING_OF_BLACKFATHOM)) player->AddAura(SPELL_BLESSING_OF_BLACKFATHOM, player); @@ -53,7 +53,7 @@ class go_blackfathom_fire : public GameObjectScript public: go_blackfathom_fire() : GameObjectScript("go_blackfathom_fire") { } - bool OnGossipHello(Player* /*player*/, GameObject* go) + bool OnGossipHello(Player* /*player*/, GameObject* go) OVERRIDE { InstanceScript* instance = go->GetInstanceScript(); @@ -73,7 +73,7 @@ class npc_blackfathom_deeps_event : public CreatureScript public: npc_blackfathom_deeps_event() : CreatureScript("npc_blackfathom_deeps_event") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_blackfathom_deeps_eventAI (creature); } @@ -99,7 +99,7 @@ public: bool Flee; - void Reset() + void Reset() OVERRIDE { Flee = false; @@ -132,7 +132,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -181,7 +181,7 @@ public: DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (me->IsSummon()) //we are not a normal spawn. if (instance) @@ -201,7 +201,7 @@ class npc_morridune : public CreatureScript public: npc_morridune() : CreatureScript("npc_morridune") { } - bool OnGossipSelect(Player* player, Creature* /*creature*/, uint32 /*sender*/, uint32 action) + bool OnGossipSelect(Player* player, Creature* /*creature*/, uint32 /*sender*/, uint32 action) OVERRIDE { player->PlayerTalkClass->ClearMenus(); switch (action) @@ -214,7 +214,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_MORRIDUNE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); @@ -222,7 +222,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_morriduneAI (creature); } @@ -236,7 +236,7 @@ public: Start(false, false, 0); } - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { switch (waypointId) { diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp index 525f71b7d01..7f1909ce4a7 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp @@ -40,24 +40,24 @@ public: { boss_aku_maiAI(Creature* creature) : BossAI(creature, TYPE_AKU_MAI) { } - void Reset() + void Reset() OVERRIDE { IsEnraged = false; _Reset(); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { events.ScheduleEvent(EVENT_POISON_CLOUD, urand(5000, 9000)); _EnterCombat(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { _JustDied(); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -90,7 +90,7 @@ public: bool IsEnraged; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_aku_maiAI (creature); } diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_gelihast.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_gelihast.cpp index 4fa9edd40c6..9816bdc49da 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_gelihast.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_gelihast.cpp @@ -29,7 +29,7 @@ class boss_gelihast : public CreatureScript public: boss_gelihast() : CreatureScript("boss_gelihast") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_gelihastAI (creature); } @@ -45,26 +45,26 @@ public: InstanceScript* instance; - void Reset() + void Reset() OVERRIDE { netTimer = urand(2000, 4000); if (instance) instance->SetData(TYPE_GELIHAST, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { if (instance) instance->SetData(TYPE_GELIHAST, IN_PROGRESS); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) instance->SetData(TYPE_GELIHAST, DONE); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp index 72992c477a8..4216935a946 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp @@ -34,7 +34,7 @@ class boss_kelris : public CreatureScript public: boss_kelris() : CreatureScript("boss_kelris") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_kelrisAI (creature); } @@ -51,7 +51,7 @@ public: InstanceScript* instance; - void Reset() + void Reset() OVERRIDE { mindBlastTimer = urand(2000, 5000); sleepTimer = urand(9000, 12000); @@ -59,21 +59,21 @@ public: instance->SetData(TYPE_KELRIS, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); if (instance) instance->SetData(TYPE_KELRIS, IN_PROGRESS); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); if (instance) instance->SetData(TYPE_KELRIS, DONE); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp index 2d64553454d..c403246cc04 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp @@ -57,7 +57,7 @@ class instance_blackfathom_deeps : public InstanceMapScript public: instance_blackfathom_deeps() : InstanceMapScript("instance_blackfathom_deeps", 48) { } - InstanceScript* GetInstanceScript(InstanceMap* map) const + InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE { return new instance_blackfathom_deeps_InstanceMapScript(map); } @@ -142,7 +142,7 @@ public: } } - void SetData(uint32 type, uint32 data) + void SetData(uint32 type, uint32 data) OVERRIDE { switch (type) { @@ -212,7 +212,7 @@ public: } } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { switch (type) { @@ -233,7 +233,7 @@ public: return 0; } - uint64 GetData64(uint32 data) const + uint64 GetData64(uint32 data) const OVERRIDE { switch (data) { diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp index 7f6f779c60e..db74bd37c8d 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp @@ -45,7 +45,7 @@ class boss_anetheron : public CreatureScript public: boss_anetheron() : CreatureScript("boss_anetheron") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_anetheronAI (creature); } @@ -64,7 +64,7 @@ public: uint32 InfernoTimer; bool go; - void Reset() + void Reset() OVERRIDE { damageTaken = 0; SwarmTimer = 45000; @@ -76,19 +76,19 @@ public: instance->SetData(DATA_ANETHERONEVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { if (instance && IsEvent) instance->SetData(DATA_ANETHERONEVENT, IN_PROGRESS); Talk(SAY_ONAGGRO); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_ONSLAY); } - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { if (waypointId == 7 && instance) { @@ -98,7 +98,7 @@ public: } } - void JustDied(Unit* killer) + void JustDied(Unit* killer) OVERRIDE { hyjal_trashAI::JustDied(killer); if (instance && IsEvent) @@ -106,7 +106,7 @@ public: Talk(SAY_ONDEATH); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (IsEvent) { @@ -177,7 +177,7 @@ class npc_towering_infernal : public CreatureScript public: npc_towering_infernal() : CreatureScript("npc_towering_infernal") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_towering_infernalAI (creature); } @@ -196,32 +196,33 @@ public: uint64 AnetheronGUID; InstanceScript* instance; - void Reset() + void Reset() OVERRIDE { DoCast(me, SPELL_INFERNO_EFFECT); ImmolationTimer = 5000; CheckTimer = 5000; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (me->IsWithinDist(who, 50) && !me->IsInCombat() && me->IsValidAttackTarget(who)) AttackStart(who); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (CheckTimer <= diff) { diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp index 757206f7fe3..7450b500b46 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp @@ -81,7 +81,7 @@ class npc_ancient_wisp : public CreatureScript public: npc_ancient_wisp() : CreatureScript("npc_ancient_wisp") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_ancient_wispAI(creature); } @@ -98,7 +98,7 @@ public: uint64 ArchimondeGUID; uint32 CheckTimer; - void Reset() + void Reset() OVERRIDE { CheckTimer = 1000; @@ -108,14 +108,14 @@ public: me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void DamageTaken(Unit* /*done_by*/, uint32 &damage) + void DamageTaken(Unit* /*done_by*/, uint32 &damage) OVERRIDE { damage = 0; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (CheckTimer <= diff) { @@ -139,7 +139,7 @@ class npc_doomfire : public CreatureScript public: npc_doomfire() : CreatureScript("npc_doomfire") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_doomfireAI(creature); } @@ -148,12 +148,13 @@ public: { npc_doomfireAI(Creature* creature) : ScriptedAI(creature) {} - void Reset() { } + void Reset() OVERRIDE {} - void MoveInLineOfSight(Unit* /*who*/) {} - void EnterCombat(Unit* /*who*/) {} + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} - void DamageTaken(Unit* /*done_by*/, uint32 &damage) + void EnterCombat(Unit* /*who*/) OVERRIDE {} + + void DamageTaken(Unit* /*done_by*/, uint32 &damage) OVERRIDE { damage = 0; } @@ -167,7 +168,7 @@ class npc_doomfire_targetting : public CreatureScript public: npc_doomfire_targetting() : CreatureScript("npc_doomfire_targetting") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_doomfire_targettingAI(creature); } @@ -179,13 +180,14 @@ public: uint64 TargetGUID; uint32 ChangeTargetTimer; - void Reset() + void Reset() OVERRIDE { TargetGUID = 0; ChangeTargetTimer = 5000; } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { //will update once TargetGUID is 0. In case noone actually moves(not likely) and this is 0 //when UpdateAI needs it, it will be forced to select randomPoint @@ -193,14 +195,14 @@ public: TargetGUID = who->GetGUID(); } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void DamageTaken(Unit* /*done_by*/, uint32 &damage) + void DamageTaken(Unit* /*done_by*/, uint32 &damage) OVERRIDE { damage = 0; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (ChangeTargetTimer <= diff) { @@ -235,7 +237,7 @@ class boss_archimonde : public CreatureScript public: boss_archimonde() : CreatureScript("boss_archimonde") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_archimondeAI (creature); } @@ -271,7 +273,7 @@ public: bool HasProtected; bool IsChanneling; - void Reset() + void Reset() OVERRIDE { if (instance) instance->SetData(DATA_ARCHIMONDEEVENT, NOT_STARTED); @@ -300,7 +302,7 @@ public: IsChanneling = false; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { me->InterruptSpell(CURRENT_CHANNELED_SPELL); Talk(SAY_AGGRO); @@ -310,7 +312,7 @@ public: instance->SetData(DATA_ARCHIMONDEEVENT, IN_PROGRESS); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) OVERRIDE { Talk(SAY_SLAY); @@ -343,7 +345,7 @@ public: ++SoulChargeCount; } - void JustDied(Unit* killer) + void JustDied(Unit* killer) OVERRIDE { hyjal_trashAI::JustDied(killer); Talk(SAY_DEATH); @@ -388,7 +390,7 @@ public: return false; } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { if (summoned->GetEntry() == CREATURE_ANCIENT_WISP) summoned->AI()->AttackStart(me); @@ -465,7 +467,7 @@ public: SoulChargeTimer = urand(2000, 30000); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!me->IsInCombat()) { @@ -636,7 +638,7 @@ public: DoMeleeAttackIfReady(); } - void WaypointReached(uint32 /*waypointId*/) { } + void WaypointReached(uint32 /*waypointId*/) OVERRIDE {} }; }; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp index da7ade178d6..a0aeab0fe84 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp @@ -46,7 +46,7 @@ class boss_azgalor : public CreatureScript public: boss_azgalor() : CreatureScript("boss_azgalor") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_azgalorAI (creature); } @@ -68,7 +68,7 @@ public: bool go; - void Reset() + void Reset() OVERRIDE { damageTaken = 0; RainTimer = 20000; @@ -82,19 +82,19 @@ public: instance->SetData(DATA_AZGALOREVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { if (instance && IsEvent) instance->SetData(DATA_AZGALOREVENT, IN_PROGRESS); Talk(SAY_ONAGGRO); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_ONSLAY); } - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { if (waypointId == 7 && instance) { @@ -104,7 +104,7 @@ public: } } - void JustDied(Unit* killer) + void JustDied(Unit* killer) OVERRIDE { hyjal_trashAI::JustDied(killer); if (instance && IsEvent) @@ -112,7 +112,7 @@ public: Talk(SAY_ONDEATH); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (IsEvent) { @@ -184,7 +184,7 @@ class npc_lesser_doomguard : public CreatureScript public: npc_lesser_doomguard() : CreatureScript("npc_lesser_doomguard") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_lesser_doomguardAI (creature); } @@ -204,7 +204,7 @@ public: uint64 AzgalorGUID; InstanceScript* instance; - void Reset() + void Reset() OVERRIDE { CrippleTimer = 50000; WarstompTimer = 10000; @@ -212,29 +212,30 @@ public: CheckTimer = 5000; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { } - void WaypointReached(uint32 /*waypointId*/) + void WaypointReached(uint32 /*waypointId*/) OVERRIDE { } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (me->IsWithinDist(who, 50) && !me->IsInCombat() && me->IsValidAttackTarget(who)) AttackStart(who); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (CheckTimer <= diff) { diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp index c24eda9b38e..a5fa3f6485f 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp @@ -47,7 +47,7 @@ class boss_kazrogal : public CreatureScript public: boss_kazrogal() : CreatureScript("boss_kazrogal") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_kazrogalAI (creature); } @@ -66,7 +66,7 @@ public: uint32 MarkTimerBase; bool go; - void Reset() + void Reset() OVERRIDE { damageTaken = 0; CleaveTimer = 5000; @@ -78,19 +78,19 @@ public: instance->SetData(DATA_KAZROGALEVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { if (instance && IsEvent) instance->SetData(DATA_KAZROGALEVENT, IN_PROGRESS); Talk(SAY_ONAGGRO); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_ONSLAY); } - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { if (waypointId == 7 && instance) { @@ -100,7 +100,7 @@ public: } } - void JustDied(Unit* killer) + void JustDied(Unit* killer) OVERRIDE { hyjal_trashAI::JustDied(killer); if (instance && IsEvent) @@ -108,7 +108,7 @@ public: DoPlaySoundToSet(me, SOUND_ONDEATH); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (IsEvent) { @@ -191,7 +191,7 @@ class spell_mark_of_kazrogal : public SpellScriptLoader targets.remove_if(MarkTargetFilter()); } - void Register() + void Register() OVERRIDE { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_mark_of_kazrogal_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } @@ -201,7 +201,7 @@ class spell_mark_of_kazrogal : public SpellScriptLoader { PrepareAuraScript(spell_mark_of_kazrogal_AuraScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_MARK_DAMAGE)) return false; @@ -220,7 +220,7 @@ class spell_mark_of_kazrogal : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectPeriodic += AuraEffectPeriodicFn(spell_mark_of_kazrogal_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_MANA_LEECH); } @@ -231,7 +231,7 @@ class spell_mark_of_kazrogal : public SpellScriptLoader return new spell_mark_of_kazrogal_SpellScript(); } - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_mark_of_kazrogal_AuraScript(); } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp index 966aed69374..71d832c6970 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp @@ -42,7 +42,7 @@ class boss_rage_winterchill : public CreatureScript public: boss_rage_winterchill() : CreatureScript("boss_rage_winterchill") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_rage_winterchillAI (creature); } @@ -61,7 +61,7 @@ public: uint32 IceboltTimer; bool go; - void Reset() + void Reset() OVERRIDE { damageTaken = 0; FrostArmorTimer = 37000; @@ -73,19 +73,19 @@ public: instance->SetData(DATA_RAGEWINTERCHILLEVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { if (instance && IsEvent) instance->SetData(DATA_RAGEWINTERCHILLEVENT, IN_PROGRESS); Talk(SAY_ONAGGRO); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_ONSLAY); } - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { if (waypointId == 7 && instance) { @@ -95,7 +95,7 @@ public: } } - void JustDied(Unit* killer) + void JustDied(Unit* killer) OVERRIDE { hyjal_trashAI::JustDied(killer); if (instance && IsEvent) @@ -103,7 +103,7 @@ public: Talk(SAY_ONDEATH); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (IsEvent) { diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp index 8445b4fc6c0..336bee39da5 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp @@ -53,7 +53,7 @@ class npc_jaina_proudmoore : public CreatureScript public: npc_jaina_proudmoore() : CreatureScript("npc_jaina_proudmoore") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE { player->PlayerTalkClass->ClearMenus(); hyjalAI* ai = CAST_AI(hyjalAI, creature->AI()); @@ -78,7 +78,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { hyjalAI* ai = CAST_AI(hyjalAI, creature->AI()); if (ai->EventBegun) @@ -100,7 +100,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { hyjalAI* ai = new hyjalAI(creature); @@ -129,7 +129,7 @@ class npc_thrall : public CreatureScript public: npc_thrall() : CreatureScript("npc_thrall") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE { player->PlayerTalkClass->ClearMenus(); hyjalAI* ai = CAST_AI(hyjalAI, creature->AI()); @@ -155,7 +155,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { hyjalAI* ai = CAST_AI(hyjalAI, creature->AI()); if (ai->EventBegun) @@ -182,7 +182,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { hyjalAI* ai = new hyjalAI(creature); @@ -207,7 +207,7 @@ class npc_tyrande_whisperwind : public CreatureScript public: npc_tyrande_whisperwind() : CreatureScript("npc_tyrande_whisperwind") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { hyjalAI* ai = new hyjalAI(creature); ai->Reset(); @@ -215,7 +215,7 @@ public: return ai; } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE { player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_ACTION_INFO_DEF) @@ -231,7 +231,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { hyjalAI* ai = CAST_AI(hyjalAI, creature->AI()); uint32 AzgalorEvent = ai->GetInstanceData(DATA_AZGALOREVENT); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp index f6a12103824..24d0422e06e 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp @@ -436,16 +436,16 @@ public: uint32 FlameBuffetTimer; bool imol; - void Reset() + void Reset() OVERRIDE { spawnTimer = 2000; FlameBuffetTimer= 2000; imol = false; } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { if (waypointId == 0 && instance && !IsOverrun) { @@ -458,7 +458,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (Delay <= diff) { @@ -535,7 +535,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_giant_infernalAI(creature); } @@ -546,7 +546,7 @@ class npc_abomination : public CreatureScript public: npc_abomination() : CreatureScript("npc_abomination") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_abominationAI(creature); } @@ -562,12 +562,12 @@ public: bool go; uint32 KnockDownTimer; - void Reset() + void Reset() OVERRIDE { KnockDownTimer = 10000; } - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { if (waypointId == 7 && instance && !IsOverrun) { @@ -594,9 +594,9 @@ public: } } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { hyjal_trashAI::UpdateAI(diff); if (IsEvent || IsOverrun) @@ -644,7 +644,7 @@ class npc_ghoul : public CreatureScript public: npc_ghoul() : CreatureScript("npc_ghoul") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_ghoulAI(creature); } @@ -662,14 +662,14 @@ public: uint32 FrenzyTimer; uint32 MoveTimer; bool RandomMove; - void Reset() + void Reset() OVERRIDE { FrenzyTimer = 5000+rand()%5000; MoveTimer = 2000; RandomMove = false; } - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { if (waypointId == 7 && instance && !IsOverrun) { @@ -697,9 +697,9 @@ public: } } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { hyjal_trashAI::UpdateAI(diff); if (IsEvent || IsOverrun) @@ -746,7 +746,7 @@ class npc_necromancer : public CreatureScript public: npc_necromancer() : CreatureScript("npc_necromancer") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_necromancerAI(creature); } @@ -764,13 +764,13 @@ public: bool go; uint32 ShadowBoltTimer; - void Reset() + void Reset() OVERRIDE { ShadowBoltTimer = 1000+rand()%5000; summons.DespawnAll(); } - void JustSummoned(Creature* summon) + void JustSummoned(Creature* summon) OVERRIDE { Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 30, true); if (target) @@ -778,12 +778,12 @@ public: summons.Summon(summon); } - void SummonedCreatureDespawn(Creature* summon) + void SummonedCreatureDespawn(Creature* summon) OVERRIDE { summons.Despawn(summon); } - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { if (waypointId == 7 && instance && !IsOverrun) { @@ -802,7 +802,7 @@ public: } } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { switch (urand(0, 2)) { @@ -820,9 +820,9 @@ public: } } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { hyjal_trashAI::UpdateAI(diff); @@ -873,7 +873,7 @@ class npc_banshee : public CreatureScript public: npc_banshee() : CreatureScript("npc_banshee") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_bansheeAI(creature); } @@ -892,14 +892,14 @@ public: uint32 WailTimer; uint32 ShellTimer; - void Reset() + void Reset() OVERRIDE { CourseTimer = 20000+rand()%5000; WailTimer = 15000+rand()%5000; ShellTimer = 50000+rand()%10000; } - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { if (waypointId == 7 && instance && !IsOverrun) { @@ -918,9 +918,9 @@ public: } } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { hyjal_trashAI::UpdateAI(diff); if (IsEvent || IsOverrun) @@ -976,7 +976,7 @@ class npc_crypt_fiend : public CreatureScript public: npc_crypt_fiend() : CreatureScript("npc_crypt_fiend") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_crypt_fiendAI(creature); } @@ -993,12 +993,12 @@ public: bool go; uint32 WebTimer; - void Reset() + void Reset() OVERRIDE { WebTimer = 20000+rand()%5000; } - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { if (waypointId == 7 && instance && !IsOverrun) { @@ -1017,9 +1017,9 @@ public: } } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { hyjal_trashAI::UpdateAI(diff); if (IsEvent || IsOverrun) @@ -1066,7 +1066,7 @@ class npc_fel_stalker : public CreatureScript public: npc_fel_stalker() : CreatureScript("npc_fel_stalker") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_fel_stalkerAI(creature); } @@ -1083,12 +1083,12 @@ public: bool go; uint32 ManaBurnTimer; - void Reset() + void Reset() OVERRIDE { ManaBurnTimer = 9000+rand()%5000; } - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { if (waypointId == 7 && instance && !IsOverrun) { @@ -1107,9 +1107,9 @@ public: } } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { hyjal_trashAI::UpdateAI(diff); if (IsEvent || IsOverrun) @@ -1156,7 +1156,7 @@ class npc_frost_wyrm : public CreatureScript public: npc_frost_wyrm() : CreatureScript("npc_frost_wyrm") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_frost_wyrmAI(creature); } @@ -1174,14 +1174,14 @@ public: uint32 FrostBreathTimer; uint32 MoveTimer; - void Reset() + void Reset() OVERRIDE { FrostBreathTimer = 5000; MoveTimer = 0; me->SetDisableGravity(true); } - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { if (waypointId == 2 && instance && !IsOverrun) { @@ -1194,7 +1194,7 @@ public: } } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance && IsEvent) instance->SetData(DATA_TRASH, 0);//signal trash is dead @@ -1206,9 +1206,9 @@ public: me->SetPosition(x, y, z, 0); } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { hyjal_trashAI::UpdateAI(diff); if (IsEvent || IsOverrun) @@ -1268,7 +1268,7 @@ class npc_gargoyle : public CreatureScript public: npc_gargoyle() : CreatureScript("npc_gargoyle") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_gargoyleAI(creature); } @@ -1289,7 +1289,7 @@ public: float Zpos; bool forcemove; - void Reset() + void Reset() OVERRIDE { forcemove = true; Zpos = 10.0f; @@ -1298,7 +1298,7 @@ public: me->SetDisableGravity(true); } - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { if (waypointId == 2 && instance && !IsOverrun) { @@ -1311,7 +1311,7 @@ public: } } - void JustDied(Unit* killer) + void JustDied(Unit* killer) OVERRIDE { float x, y, z; me->GetPosition(x, y, z); @@ -1321,7 +1321,7 @@ public: hyjal_trashAI::JustDied(killer); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { hyjal_trashAI::UpdateAI(diff); if (IsEvent || IsOverrun) @@ -1403,7 +1403,7 @@ class alliance_rifleman : public CreatureScript public: alliance_rifleman() : CreatureScript("alliance_rifleman") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new alliance_riflemanAI(creature); } @@ -1417,16 +1417,17 @@ public: uint32 ExplodeTimer; - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { } - void Reset() + void Reset() OVERRIDE { ExplodeTimer = 5000+rand()%5000; } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (!who || me->GetVictim()) return; @@ -1439,11 +1440,11 @@ public: } } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Check if we have a target if (!UpdateVictim()) diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp index abe6da8e363..8a96a8fa3fc 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp @@ -50,7 +50,7 @@ class instance_hyjal : public InstanceMapScript public: instance_hyjal() : InstanceMapScript("instance_hyjal", 534) { } - InstanceScript* GetInstanceScript(InstanceMap* map) const + InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE { return new instance_mount_hyjal_InstanceMapScript(map); } @@ -159,7 +159,7 @@ public: } } - uint64 GetData64(uint32 identifier) const + uint64 GetData64(uint32 identifier) const OVERRIDE { switch (identifier) { @@ -176,7 +176,7 @@ public: return 0; } - void SetData(uint32 type, uint32 data) + void SetData(uint32 type, uint32 data) OVERRIDE { switch (type) { @@ -296,7 +296,7 @@ public: } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { switch (type) { diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_chrono_lord_epoch.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_chrono_lord_epoch.cpp index adc2ad1c6ac..b365b09b3c3 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_chrono_lord_epoch.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_chrono_lord_epoch.cpp @@ -50,7 +50,7 @@ class boss_epoch : public CreatureScript public: boss_epoch() : CreatureScript("boss_epoch") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_epochAI (creature); } @@ -72,7 +72,7 @@ public: InstanceScript* instance; - void Reset() + void Reset() OVERRIDE { uiStep = 1; uiStepTimer = 26000; @@ -85,7 +85,7 @@ public: instance->SetData(DATA_EPOCH_EVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); @@ -93,7 +93,7 @@ public: instance->SetData(DATA_EPOCH_EVENT, IN_PROGRESS); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) @@ -128,7 +128,7 @@ public: DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); @@ -136,7 +136,7 @@ public: instance->SetData(DATA_EPOCH_EVENT, DONE); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) OVERRIDE { if (victim->GetTypeId() != TYPEID_PLAYER) return; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite_corruptor.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite_corruptor.cpp index 262f8a76509..54438e3b8a9 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite_corruptor.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite_corruptor.cpp @@ -37,7 +37,7 @@ class boss_infinite_corruptor : public CreatureScript public: boss_infinite_corruptor() : CreatureScript("boss_infinite_corruptor") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_infinite_corruptorAI(creature); } @@ -51,20 +51,20 @@ public: InstanceScript* instance; - void Reset() + void Reset() OVERRIDE { if (instance) instance->SetData(DATA_INFINITE_EVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); if (instance) instance->SetData(DATA_INFINITE_EVENT, IN_PROGRESS); } - void UpdateAI(uint32 /*diff*/) + void UpdateAI(uint32 /*diff*/) OVERRIDE { //Return since we have no target if (!UpdateVictim()) @@ -73,7 +73,7 @@ public: DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); if (instance) diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp index 6c945e4d2b2..bba812989ce 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp @@ -64,7 +64,7 @@ class boss_mal_ganis : public CreatureScript public: boss_mal_ganis() : CreatureScript("boss_mal_ganis") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_mal_ganisAI (creature); } @@ -91,7 +91,7 @@ public: InstanceScript* instance; - void Reset() + void Reset() OVERRIDE { bYelled = false; bYelled2 = false; @@ -106,20 +106,20 @@ public: instance->SetData(DATA_MAL_GANIS_EVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); if (instance) instance->SetData(DATA_MAL_GANIS_EVENT, IN_PROGRESS); } - void DamageTaken(Unit* done_by, uint32 &damage) + void DamageTaken(Unit* done_by, uint32 &damage) OVERRIDE { if (damage >= me->GetHealth() && done_by != me) damage = me->GetHealth()-1; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { switch (Phase) { @@ -226,7 +226,7 @@ public: } } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) { @@ -237,7 +237,7 @@ public: } } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) OVERRIDE { if (victim->GetTypeId() != TYPEID_PLAYER) return; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp index 68f2fe1992b..32499b1bef5 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp @@ -49,7 +49,7 @@ class boss_meathook : public CreatureScript public: boss_meathook() : CreatureScript("boss_meathook") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_meathookAI (creature); } @@ -69,7 +69,7 @@ public: InstanceScript* instance; - void Reset() + void Reset() OVERRIDE { uiChainTimer = urand(12000, 17000); //seen on video 13, 17, 15, 12, 16 uiDiseaseTimer = urand(2000, 4000); //approx 3s @@ -79,7 +79,7 @@ public: instance->SetData(DATA_MEATHOOK_EVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); @@ -87,7 +87,7 @@ public: instance->SetData(DATA_MEATHOOK_EVENT, IN_PROGRESS); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) @@ -115,7 +115,7 @@ public: DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); @@ -123,7 +123,7 @@ public: instance->SetData(DATA_MEATHOOK_EVENT, DONE); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) OVERRIDE { if (victim->GetTypeId() != TYPEID_PLAYER) return; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp index ba4439907ba..fd63822fea3 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp @@ -54,7 +54,7 @@ class boss_salramm : public CreatureScript public: boss_salramm() : CreatureScript("boss_salramm") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_salrammAI (creature); } @@ -76,7 +76,7 @@ public: InstanceScript* instance; - void Reset() + void Reset() OVERRIDE { uiCurseFleshTimer = 30000; //30s DBM uiExplodeGhoulTimer = urand(25000, 28000); //approx 6 sec after summon ghouls @@ -88,7 +88,7 @@ public: instance->SetData(DATA_SALRAMM_EVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); @@ -96,7 +96,7 @@ public: instance->SetData(DATA_SALRAMM_EVENT, IN_PROGRESS); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) @@ -138,7 +138,7 @@ public: DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); @@ -146,7 +146,7 @@ public: instance->SetData(DATA_SALRAMM_EVENT, DONE); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) OVERRIDE { if (victim->GetTypeId() != TYPEID_PLAYER) return; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp index dfaec601b58..dbead663cff 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp @@ -255,7 +255,7 @@ class npc_arthas : public CreatureScript public: npc_arthas() : CreatureScript("npc_arthas") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE { player->PlayerTalkClass->ClearMenus(); npc_arthasAI* ai = CAST_AI(npc_arthas::npc_arthasAI, creature->AI()); @@ -298,7 +298,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { npc_arthasAI* ai = CAST_AI(npc_arthas::npc_arthasAI, creature->AI()); @@ -342,7 +342,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_arthasAI(creature); } @@ -379,7 +379,7 @@ public: uint32 exorcismTimer; - void Reset() + void Reset() OVERRIDE { utherGUID = 0; jainaGUID = 0; @@ -417,12 +417,12 @@ public: } } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { DoCast(me, SPELL_ARTHAS_AURA); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) instance->SetData(DATA_ARTHAS_EVENT, FAIL); @@ -470,7 +470,7 @@ public: ++step; } - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { switch (waypointId) { @@ -589,7 +589,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { npc_escortAI::UpdateAI(diff); @@ -1243,7 +1243,7 @@ class npc_crate_helper : public CreatureScript _marked = false; } - void SpellHit(Unit* /*caster*/, SpellInfo const* spell) + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) OVERRIDE { if (spell->Id == SPELL_ARCANE_DISRUPTION && !_marked) { @@ -1262,7 +1262,7 @@ class npc_crate_helper : public CreatureScript bool _marked; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_crate_helperAI(creature); } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp index 30ef1427d63..7df66c89594 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp @@ -45,7 +45,7 @@ class instance_culling_of_stratholme : public InstanceMapScript public: instance_culling_of_stratholme() : InstanceMapScript("instance_culling_of_stratholme", 595) { } - InstanceScript* GetInstanceScript(InstanceMap* map) const + InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE { return new instance_culling_of_stratholme_InstanceMapScript(map); } @@ -143,7 +143,7 @@ class instance_culling_of_stratholme : public InstanceMapScript } } - void SetData(uint32 type, uint32 data) + void SetData(uint32 type, uint32 data) OVERRIDE { switch (type) { @@ -198,7 +198,7 @@ class instance_culling_of_stratholme : public InstanceMapScript SaveToDB(); } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { switch (type) { @@ -218,7 +218,7 @@ class instance_culling_of_stratholme : public InstanceMapScript return 0; } - uint64 GetData64(uint32 identifier) const + uint64 GetData64(uint32 identifier) const OVERRIDE { switch (identifier) { diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp index 31e3c033833..056dc887c68 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp @@ -52,7 +52,7 @@ class boss_captain_skarloc : public CreatureScript public: boss_captain_skarloc() : CreatureScript("boss_captain_skarloc") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_captain_skarlocAI (creature); } @@ -73,7 +73,7 @@ public: uint32 DevotionAura_Timer; uint32 Consecration_Timer; - void Reset() + void Reset() OVERRIDE { Holy_Light_Timer = urand(20000, 30000); Cleanse_Timer = 10000; @@ -83,19 +83,19 @@ public: Consecration_Timer = 8000; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { //This is not correct. Should taunt Thrall before engage in combat Talk(SAY_TAUNT1); Talk(SAY_TAUNT2); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); @@ -103,7 +103,7 @@ public: instance->SetData(TYPE_THRALL_PART1, DONE); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp index 4352740e6f4..1e08d4d6bac 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp @@ -50,7 +50,7 @@ class boss_epoch_hunter : public CreatureScript public: boss_epoch_hunter() : CreatureScript("boss_epoch_hunter") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_epoch_hunterAI (creature); } @@ -69,7 +69,7 @@ public: uint32 WingBuffet_Timer; uint32 Mda_Timer; - void Reset() + void Reset() OVERRIDE { SandBreath_Timer = urand(8000, 16000); ImpendingDeath_Timer = urand(25000, 30000); @@ -77,17 +77,17 @@ public: Mda_Timer = 40000; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); @@ -95,7 +95,7 @@ public: instance->SetData(TYPE_THRALL_PART4, DONE); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp index db2d965f761..337d1f45aba 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp @@ -37,7 +37,7 @@ class go_barrel_old_hillsbrad : public GameObjectScript public: go_barrel_old_hillsbrad() : GameObjectScript("go_barrel_old_hillsbrad") { } - bool OnGossipHello(Player* /*player*/, GameObject* go) + bool OnGossipHello(Player* /*player*/, GameObject* go) OVERRIDE { if (InstanceScript* instance = go->GetInstanceScript()) { @@ -107,7 +107,7 @@ class boss_lieutenant_drake : public CreatureScript public: boss_lieutenant_drake() : CreatureScript("boss_lieutenant_drake") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_lieutenant_drakeAI (creature); } @@ -124,7 +124,7 @@ public: uint32 MortalStrike_Timer; uint32 ExplodingShout_Timer; - void Reset() + void Reset() OVERRIDE { CanPatrol = true; wpId = 0; @@ -135,22 +135,22 @@ public: ExplodingShout_Timer = 25000; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { /// @todo make this work if (CanPatrol && wpId == 0) diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp index a488d8de86f..add2c57335a 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp @@ -45,7 +45,7 @@ class instance_old_hillsbrad : public InstanceMapScript public: instance_old_hillsbrad() : InstanceMapScript("instance_old_hillsbrad", 560) { } - InstanceScript* GetInstanceScript(InstanceMap* map) const + InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE { return new instance_old_hillsbrad_InstanceMapScript(map); } @@ -120,7 +120,7 @@ public: } } - void SetData(uint32 type, uint32 data) + void SetData(uint32 type, uint32 data) OVERRIDE { Player* player = GetPlayerInMap(); @@ -203,7 +203,7 @@ public: } } - uint32 GetData(uint32 data) const + uint32 GetData(uint32 data) const OVERRIDE { switch (data) { @@ -223,7 +223,7 @@ public: return 0; } - uint64 GetData64(uint32 data) const + uint64 GetData64(uint32 data) const OVERRIDE { switch (data) { diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp index ba0cf93e5dd..ffa0eea14f6 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp @@ -56,7 +56,7 @@ class npc_erozion : public CreatureScript public: npc_erozion() : CreatureScript("npc_erozion") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE { player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_ACTION_INFO_DEF+1) @@ -76,7 +76,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -186,12 +186,12 @@ class npc_thrall_old_hillsbrad : public CreatureScript public: npc_thrall_old_hillsbrad() : CreatureScript("npc_thrall_old_hillsbrad") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_thrall_old_hillsbradAI(creature); } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE { player->PlayerTalkClass->ClearMenus(); InstanceScript* instance = creature->GetInstanceScript(); @@ -241,7 +241,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsQuestGiver()) { @@ -289,7 +289,7 @@ public: bool LowHp; bool HadMount; - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { if (!instance) return; @@ -458,7 +458,7 @@ public: } } - void Reset() + void Reset() OVERRIDE { LowHp = false; @@ -493,7 +493,7 @@ public: me->Dismount(); me->SetSpeed(MOVE_RUN, SPEED_RUN); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_TH_RANDOM_AGGRO); if (me->IsMounted()) @@ -503,7 +503,7 @@ public: } } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { switch (summoned->GetEntry()) { @@ -520,11 +520,11 @@ public: } } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_TH_RANDOM_KILL); } - void JustDied(Unit* slayer) + void JustDied(Unit* slayer) OVERRIDE { if (instance) instance->SetData(TYPE_THRALL_EVENT, FAIL); @@ -536,7 +536,7 @@ public: Talk(SAY_TH_RANDOM_DIE); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { npc_escortAI::UpdateAI(diff); @@ -571,12 +571,12 @@ class npc_taretha : public CreatureScript public: npc_taretha() : CreatureScript("npc_taretha") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_tarethaAI(creature); } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE { player->PlayerTalkClass->ClearMenus(); InstanceScript* instance = creature->GetInstanceScript(); @@ -606,7 +606,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { InstanceScript* instance = creature->GetInstanceScript(); if (instance && instance->GetData(TYPE_THRALL_PART3) == DONE && instance->GetData(TYPE_THRALL_PART4) == NOT_STARTED) @@ -626,7 +626,7 @@ public: InstanceScript* instance; - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { switch (waypointId) { @@ -639,10 +639,10 @@ public: } } - void Reset() {} - void EnterCombat(Unit* /*who*/) {} + void Reset() OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { npc_escortAI::UpdateAI(diff); } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_aeonus.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_aeonus.cpp index 39428e07fd8..1b3311500c9 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_aeonus.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_aeonus.cpp @@ -59,9 +59,9 @@ public: { boss_aeonusAI(Creature* creature) : BossAI(creature, TYPE_AEONUS) { } - void Reset() { } + void Reset() OVERRIDE {} - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { events.ScheduleEvent(EVENT_SANDBREATH, urand(15000, 30000)); events.ScheduleEvent(EVENT_TIMESTOP, urand(10000, 15000)); @@ -70,7 +70,8 @@ public: Talk(SAY_AGGRO); } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { //Despawn Time Keeper if (who->GetTypeId() == TYPEID_UNIT && who->GetEntry() == NPC_TIME_KEEPER) @@ -85,7 +86,7 @@ public: ScriptedAI::MoveInLineOfSight(who); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); @@ -96,12 +97,12 @@ public: } } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_SLAY); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) @@ -137,7 +138,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_aeonusAI (creature); } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp index bd217ce51ee..f411e24b283 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp @@ -60,9 +60,9 @@ public: { boss_chrono_lord_dejaAI(Creature* creature) : BossAI(creature, TYPE_CRONO_LORD_DEJA) { } - void Reset() { } + void Reset() OVERRIDE {} - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { events.ScheduleEvent(EVENT_ARCANE_BLAST, urand(18000, 23000)); events.ScheduleEvent(EVENT_TIME_LAPSE, urand(10000, 15000)); @@ -73,7 +73,8 @@ public: Talk(SAY_AGGRO); } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { //Despawn Time Keeper if (who->GetTypeId() == TYPEID_UNIT && who->GetEntry() == NPC_TIME_KEEPER) @@ -88,12 +89,12 @@ public: ScriptedAI::MoveInLineOfSight(who); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); @@ -101,7 +102,7 @@ public: instance->SetData(TYPE_RIFT, SPECIAL); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -142,7 +143,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_chrono_lord_dejaAI (creature); } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_temporus.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_temporus.cpp index f679fa4ee62..eeec1f58a0a 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_temporus.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_temporus.cpp @@ -59,9 +59,9 @@ public: { boss_temporusAI(Creature* creature) : BossAI(creature, TYPE_TEMPORUS) { } - void Reset() { } + void Reset() OVERRIDE {} - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { events.ScheduleEvent(EVENT_HASTE, urand(15000, 23000)); events.ScheduleEvent(EVENT_MORTAL_WOUND, 8000); @@ -72,12 +72,12 @@ public: Talk(SAY_AGGRO); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); @@ -85,7 +85,8 @@ public: instance->SetData(TYPE_RIFT, SPECIAL); } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { //Despawn Time Keeper if (who->GetTypeId() == TYPEID_UNIT && who->GetEntry() == NPC_TIME_KEEPER) @@ -101,7 +102,7 @@ public: ScriptedAI::MoveInLineOfSight(who); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) @@ -140,7 +141,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_temporusAI (creature); } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/instance_the_black_morass.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/instance_the_black_morass.cpp index 7d76cce6ddb..003207eeecf 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/instance_the_black_morass.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/instance_the_black_morass.cpp @@ -73,7 +73,7 @@ class instance_the_black_morass : public InstanceMapScript public: instance_the_black_morass() : InstanceMapScript("instance_the_black_morass", 269) { } - InstanceScript* GetInstanceScript(InstanceMap* map) const + InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE { return new instance_the_black_morass_InstanceMapScript(map); } @@ -165,7 +165,7 @@ public: } } - void SetData(uint32 type, uint32 data) + void SetData(uint32 type, uint32 data) OVERRIDE { switch (type) { @@ -236,7 +236,7 @@ public: } } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { switch (type) { @@ -252,7 +252,7 @@ public: return 0; } - uint64 GetData64(uint32 data) const + uint64 GetData64(uint32 data) const OVERRIDE { if (data == DATA_MEDIVH) return _medivhGUID; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp index d27b4b330b4..6c12dcd5e18 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp @@ -68,7 +68,7 @@ class npc_medivh_bm : public CreatureScript public: npc_medivh_bm() : CreatureScript("npc_medivh_bm") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_medivh_bmAI (creature); } @@ -89,7 +89,7 @@ public: bool Life50; bool Life25; - void Reset() + void Reset() OVERRIDE { SpellCorrupt_Timer = 0; @@ -104,7 +104,8 @@ public: DoCast(me, SPELL_PORTAL_RUNE, true); } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (!instance) return; @@ -138,7 +139,7 @@ public: } } - void AttackStart(Unit* /*who*/) + void AttackStart(Unit* /*who*/) OVERRIDE { //if (instance && instance->GetData(TYPE_MEDIVH) == IN_PROGRESS) //return; @@ -146,9 +147,9 @@ public: //ScriptedAI::AttackStart(who); } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void SpellHit(Unit* /*caster*/, const SpellInfo* spell) + void SpellHit(Unit* /*caster*/, const SpellInfo* spell) OVERRIDE { if (SpellCorrupt_Timer) return; @@ -160,7 +161,7 @@ public: SpellCorrupt_Timer = 3000; } - void JustDied(Unit* killer) + void JustDied(Unit* killer) OVERRIDE { if (killer->GetEntry() == me->GetEntry()) return; @@ -168,7 +169,7 @@ public: Talk(SAY_DEATH); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!instance) return; @@ -261,7 +262,7 @@ class npc_time_rift : public CreatureScript public: npc_time_rift() : CreatureScript("npc_time_rift") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_time_riftAI (creature); } @@ -280,7 +281,7 @@ public: uint8 mPortalCount; uint8 mWaveId; - void Reset() + void Reset() OVERRIDE { TimeRiftWave_Timer = 15000; @@ -298,7 +299,7 @@ public: else mWaveId = 1; } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} void DoSummonAtRift(uint32 creature_entry) { @@ -342,7 +343,7 @@ public: } else DoSummonAtRift(entry); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!instance) return; @@ -379,7 +380,7 @@ class npc_saat : public CreatureScript public: npc_saat() : CreatureScript("npc_saat") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE { player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_ACTION_INFO_DEF+1) @@ -390,7 +391,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); diff --git a/src/server/scripts/Kalimdor/Maraudon/boss_celebras_the_cursed.cpp b/src/server/scripts/Kalimdor/Maraudon/boss_celebras_the_cursed.cpp index 695f9d2973e..687b29353f9 100644 --- a/src/server/scripts/Kalimdor/Maraudon/boss_celebras_the_cursed.cpp +++ b/src/server/scripts/Kalimdor/Maraudon/boss_celebras_the_cursed.cpp @@ -38,7 +38,7 @@ class celebras_the_cursed : public CreatureScript public: celebras_the_cursed() : CreatureScript("celebras_the_cursed") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new celebras_the_cursedAI (creature); } @@ -51,21 +51,21 @@ public: uint32 EntanglingRootsTimer; uint32 CorruptForcesTimer; - void Reset() + void Reset() OVERRIDE { WrathTimer = 8000; EntanglingRootsTimer = 2000; CorruptForcesTimer = 30000; } - void EnterCombat(Unit* /*who*/) { } + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { me->SummonCreature(13716, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 600000); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Kalimdor/Maraudon/boss_landslide.cpp b/src/server/scripts/Kalimdor/Maraudon/boss_landslide.cpp index eea34e1949f..ddfc918f95f 100644 --- a/src/server/scripts/Kalimdor/Maraudon/boss_landslide.cpp +++ b/src/server/scripts/Kalimdor/Maraudon/boss_landslide.cpp @@ -38,7 +38,7 @@ class boss_landslide : public CreatureScript public: boss_landslide() : CreatureScript("boss_landslide") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_landslideAI (creature); } @@ -51,18 +51,18 @@ public: uint32 TrampleTimer; uint32 LandslideTimer; - void Reset() + void Reset() OVERRIDE { KnockAwayTimer = 8000; TrampleTimer = 2000; LandslideTimer = 0; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp b/src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp index 73c3fc179d3..64751e886e5 100644 --- a/src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp +++ b/src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp @@ -37,7 +37,7 @@ class boss_noxxion : public CreatureScript public: boss_noxxion() : CreatureScript("boss_noxxion") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_noxxionAI (creature); } @@ -52,7 +52,7 @@ public: uint32 InvisibleTimer; bool Invisible; - void Reset() + void Reset() OVERRIDE { ToxicVolleyTimer = 7000; UppercutTimer = 16000; @@ -61,7 +61,7 @@ public: Invisible = false; } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} void SummonAdds(Unit* victim) { @@ -69,7 +69,7 @@ public: Add->AI()->AttackStart(victim); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (Invisible && InvisibleTimer <= diff) { diff --git a/src/server/scripts/Kalimdor/Maraudon/boss_princess_theradras.cpp b/src/server/scripts/Kalimdor/Maraudon/boss_princess_theradras.cpp index ddce2f658e7..fbe208df07c 100644 --- a/src/server/scripts/Kalimdor/Maraudon/boss_princess_theradras.cpp +++ b/src/server/scripts/Kalimdor/Maraudon/boss_princess_theradras.cpp @@ -40,7 +40,7 @@ class boss_princess_theradras : public CreatureScript public: boss_princess_theradras() : CreatureScript("boss_princess_theradras") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_ptheradrasAI (creature); } @@ -54,7 +54,7 @@ public: uint32 ThrashTimer; uint32 RepulsiveGazeTimer; - void Reset() + void Reset() OVERRIDE { DustfieldTimer = 8000; BoulderTimer = 2000; @@ -62,14 +62,14 @@ public: RepulsiveGazeTimer = 23000; } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { me->SummonCreature(12238, 28.067f, 61.875f, -123.405f, 4.67f, TEMPSUMMON_TIMED_DESPAWN, 600000); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp index 39df89892cf..62c912021a9 100644 --- a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp +++ b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp @@ -113,7 +113,7 @@ class boss_onyxia : public CreatureScript public: boss_onyxia() : CreatureScript("boss_onyxia") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_onyxiaAI (creature); } @@ -150,7 +150,7 @@ public: uint8 SummonWhelpCount; bool IsMoving; - void Reset() + void Reset() OVERRIDE { if (!IsCombatMovementAllowed()) SetCombatMovement(true); @@ -185,7 +185,7 @@ public: } } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); me->SetInCombatWithZone(); @@ -197,7 +197,7 @@ public: } } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) instance->SetData(DATA_ONYXIA, DONE); @@ -205,7 +205,7 @@ public: Summons.DespawnAll(); } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { summoned->SetInCombatWithZone(); if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) @@ -223,17 +223,17 @@ public: Summons.Summon(summoned); } - void SummonedCreatureDespawn(Creature* summon) + void SummonedCreatureDespawn(Creature* summon) OVERRIDE { Summons.Despawn(summon); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_KILL); } - void SpellHit(Unit* /*pCaster*/, const SpellInfo* Spell) + void SpellHit(Unit* /*pCaster*/, const SpellInfo* Spell) OVERRIDE { if (Spell->Id == SPELL_BREATH_EAST_TO_WEST || Spell->Id == SPELL_BREATH_WEST_TO_EAST || @@ -250,7 +250,7 @@ public: } } - void MovementInform(uint32 type, uint32 id) + void MovementInform(uint32 type, uint32 id) OVERRIDE { if (type == POINT_MOTION_TYPE) { @@ -293,7 +293,7 @@ public: } } - void SpellHitTarget(Unit* target, const SpellInfo* Spell) + void SpellHitTarget(Unit* target, const SpellInfo* Spell) OVERRIDE { //Workaround - Couldn't find a way to group this spells (All Eruption) if (((Spell->Id >= 17086 && Spell->Id <= 17095) || @@ -341,7 +341,7 @@ public: MovePoint = iTemp; } - void UpdateAI(uint32 Diff) + void UpdateAI(uint32 Diff) OVERRIDE { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp b/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp index a779186a5c8..6ae8a2ef709 100644 --- a/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp +++ b/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp @@ -36,7 +36,7 @@ class instance_onyxias_lair : public InstanceMapScript public: instance_onyxias_lair() : InstanceMapScript("instance_onyxias_lair", 249) { } - InstanceScript* GetInstanceScript(InstanceMap* map) const + InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE { return new instance_onyxias_lair_InstanceMapScript(map); } @@ -145,7 +145,7 @@ public: FloorEruptionGUID[1].erase(floorEruptedGUID); } - void SetData(uint32 Type, uint32 Data) + void SetData(uint32 Type, uint32 Data) OVERRIDE { switch (Type) { @@ -178,7 +178,7 @@ public: SaveToDB(); } - void SetData64(uint32 Type, uint64 Data) + void SetData64(uint32 Type, uint64 Data) OVERRIDE { switch (Type) { @@ -190,7 +190,7 @@ public: } } - uint32 GetData(uint32 Type) const + uint32 GetData(uint32 Type) const OVERRIDE { switch (Type) { @@ -201,7 +201,7 @@ public: return 0; } - uint64 GetData64(uint32 Data) const + uint64 GetData64(uint32 Data) const OVERRIDE { switch (Data) { diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp index 46ef908bf37..7d173ea5955 100644 --- a/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp +++ b/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp @@ -45,7 +45,7 @@ class boss_amnennar_the_coldbringer : public CreatureScript public: boss_amnennar_the_coldbringer() : CreatureScript("boss_amnennar_the_coldbringer") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_amnennar_the_coldbringerAI (creature); } @@ -61,7 +61,7 @@ public: bool Spectrals30; bool Hp; - void Reset() + void Reset() OVERRIDE { AmnenarsWrath_Timer = 8000; FrostBolt_Timer = 1000; @@ -71,17 +71,17 @@ public: Hp = false; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_KILL); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp index 58c9731814d..0284cdfce62 100644 --- a/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp +++ b/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp @@ -28,7 +28,7 @@ class instance_razorfen_downs : public InstanceMapScript public: instance_razorfen_downs() : InstanceMapScript("instance_razorfen_downs", 129) { } - InstanceScript* GetInstanceScript(InstanceMap* map) const + InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE { return new instance_razorfen_downs_InstanceMapScript(map); } @@ -115,7 +115,7 @@ public: } } - void SetData(uint32 uiType, uint32 uiData) + void SetData(uint32 uiType, uint32 uiData) OVERRIDE { if (uiType == DATA_GONG_WAVES) { @@ -187,7 +187,7 @@ public: } } - uint32 GetData(uint32 uiType) const + uint32 GetData(uint32 uiType) const OVERRIDE { switch (uiType) { @@ -198,7 +198,7 @@ public: return 0; } - uint64 GetData64(uint32 uiType) const + uint64 GetData64(uint32 uiType) const OVERRIDE { switch (uiType) { diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp index 7d7e050f010..a49b4477f20 100644 --- a/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp +++ b/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp @@ -59,7 +59,7 @@ class npc_henry_stern : public CreatureScript public: npc_henry_stern() : CreatureScript("npc_henry_stern") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE { player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_ACTION_INFO_DEF + 1) @@ -77,7 +77,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (player->GetBaseSkillValue(SKILL_COOKING) >= 175 && !player->HasSpell(SPELL_GOLDTHORN_TEA)) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TEA, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); @@ -99,7 +99,7 @@ class go_gong : public GameObjectScript public: go_gong() : GameObjectScript("go_gong") { } - bool OnGossipHello(Player* /*player*/, GameObject* go) + bool OnGossipHello(Player* /*player*/, GameObject* go) OVERRIDE { //basic support, not blizzlike data is missing... InstanceScript* instance = go->GetInstanceScript(); @@ -125,7 +125,7 @@ class npc_tomb_creature : public CreatureScript public: npc_tomb_creature() : CreatureScript("npc_tomb_creature") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_tomb_creatureAI (creature); } @@ -141,12 +141,12 @@ public: uint32 uiWebTimer; - void Reset() + void Reset() OVERRIDE { uiWebTimer = urand(5000, 8000); } - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { if (!UpdateVictim()) return; @@ -164,7 +164,7 @@ public: DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) instance->SetData(DATA_GONG_WAVES, instance->GetData(DATA_GONG_WAVES)+1); diff --git a/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp b/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp index 242a1c4258b..dc2995540df 100644 --- a/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp +++ b/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp @@ -35,7 +35,7 @@ class instance_razorfen_kraul : public InstanceMapScript public: instance_razorfen_kraul() : InstanceMapScript("instance_razorfen_kraul", 47) { } - InstanceScript* GetInstanceScript(InstanceMap* map) const + InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE { return new instance_razorfen_kraul_InstanceMapScript(map); } @@ -88,7 +88,7 @@ public: } } - void SetData(uint32 type, uint32 /*data*/) + void SetData(uint32 type, uint32 /*data*/) OVERRIDE { switch (type) { diff --git a/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp b/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp index ea669f96efc..13ce8e8c964 100644 --- a/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp +++ b/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp @@ -47,7 +47,7 @@ class npc_willix : public CreatureScript public: npc_willix() : CreatureScript("npc_willix") { } - bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE { if (quest->GetQuestId() == QUEST_WILLIX_THE_IMPORTER) { @@ -59,7 +59,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_willixAI(creature); } @@ -68,7 +68,7 @@ public: { npc_willixAI(Creature* creature) : npc_escortAI(creature) {} - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { Player* player = GetPlayerForEscort(); if (!player) @@ -118,19 +118,19 @@ public: } } - void Reset() {} + void Reset() OVERRIDE {} - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO1); } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { summoned->AI()->AttackStart(me); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (Player* player = GetPlayerForEscort()) player->FailQuest(QUEST_WILLIX_THE_IMPORTER); @@ -164,7 +164,7 @@ struct npc_snufflenose_gopher : public CreatureScript public: npc_snufflenose_gopher() : CreatureScript("npc_snufflenose_gopher") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_snufflenose_gopherAI(creature); } @@ -173,12 +173,12 @@ public: { npc_snufflenose_gopherAI(Creature* creature) : PetAI(creature) { } - void Reset() + void Reset() OVERRIDE { IsMovementActive = false; } - void MovementInform(uint32 type, uint32 id) + void MovementInform(uint32 type, uint32 id) OVERRIDE { if (type == POINT_MOTION_TYPE && id == POINT_TUBBER) { @@ -227,13 +227,13 @@ public: IsMovementActive = true; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!IsMovementActive) PetAI::UpdateAI(diff); } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { if (action == ACTION_FIND_NEW_TUBBER) DoFindNewTubber(); @@ -254,7 +254,7 @@ class spell_snufflenose_command : public SpellScriptLoader { PrepareSpellScript(spell_snufflenose_commandSpellScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } @@ -266,13 +266,13 @@ class spell_snufflenose_command : public SpellScriptLoader target->ToCreature()->AI()->DoAction(ACTION_FIND_NEW_TUBBER); } - void Register() + void Register() OVERRIDE { AfterCast += SpellCastFn(spell_snufflenose_commandSpellScript::HandleAfterCast); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_snufflenose_commandSpellScript(); } diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp index be867ecc33c..327fe0d1358 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp @@ -82,7 +82,7 @@ class boss_ayamiss : public CreatureScript { } - void Reset() + void Reset() OVERRIDE { _Reset(); _phase = PHASE_AIR; @@ -90,7 +90,7 @@ class boss_ayamiss : public CreatureScript SetCombatMovement(false); } - void JustSummoned(Creature* who) + void JustSummoned(Creature* who) OVERRIDE { switch (who->GetEntry()) { @@ -107,7 +107,7 @@ class boss_ayamiss : public CreatureScript } } - void MovementInform(uint32 type, uint32 id) + void MovementInform(uint32 type, uint32 id) OVERRIDE { if (type == POINT_MOTION_TYPE) { @@ -123,13 +123,13 @@ class boss_ayamiss : public CreatureScript } } - void EnterEvadeMode() + void EnterEvadeMode() OVERRIDE { me->ClearUnitState(UNIT_STATE_ROOT); BossAI::EnterEvadeMode(); } - void EnterCombat(Unit* attacker) + void EnterCombat(Unit* attacker) OVERRIDE { BossAI::EnterCombat(attacker); @@ -144,7 +144,7 @@ class boss_ayamiss : public CreatureScript me->GetMotionMaster()->MovePoint(POINT_AIR, AyamissAirPos); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -230,7 +230,7 @@ class boss_ayamiss : public CreatureScript bool _enraged; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_ayamissAI(creature); } @@ -248,7 +248,7 @@ class npc_hive_zara_larva : public CreatureScript _instance = me->GetInstanceScript(); } - void MovementInform(uint32 type, uint32 id) + void MovementInform(uint32 type, uint32 id) OVERRIDE { if (type == POINT_MOTION_TYPE) if (id == POINT_PARALYZE) @@ -256,7 +256,8 @@ class npc_hive_zara_larva : public CreatureScript DoCast(target, SPELL_FEED); // Omnomnom } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (_instance->GetBossState(DATA_AYAMISS) == IN_PROGRESS) return; @@ -264,7 +265,7 @@ class npc_hive_zara_larva : public CreatureScript ScriptedAI::MoveInLineOfSight(who); } - void AttackStart(Unit* victim) + void AttackStart(Unit* victim) OVERRIDE { if (_instance->GetBossState(DATA_AYAMISS) == IN_PROGRESS) return; @@ -272,7 +273,7 @@ class npc_hive_zara_larva : public CreatureScript ScriptedAI::AttackStart(victim); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (_instance->GetBossState(DATA_AYAMISS) == IN_PROGRESS) return; @@ -283,7 +284,7 @@ class npc_hive_zara_larva : public CreatureScript InstanceScript* _instance; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_hive_zara_larvaAI(creature); } diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp index de6924680ef..a0a093246b6 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp @@ -71,7 +71,7 @@ class boss_buru : public CreatureScript { } - void EnterEvadeMode() + void EnterEvadeMode() OVERRIDE { BossAI::EnterEvadeMode(); @@ -82,7 +82,7 @@ class boss_buru : public CreatureScript Eggs.clear(); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { _EnterCombat(); Talk(EMOTE_TARGET, who->GetGUID()); @@ -95,14 +95,14 @@ class boss_buru : public CreatureScript _phase = PHASE_EGG; } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { if (action == ACTION_EXPLODE) if (_phase == PHASE_EGG) me->DealDamage(me, 45000); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) OVERRIDE { if (victim->GetTypeId() == TYPEID_PLAYER) ChaseNewVictim(); @@ -133,7 +133,7 @@ class boss_buru : public CreatureScript events.ScheduleEvent(EVENT_RESPAWN_EGG, 100000); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -186,7 +186,7 @@ class boss_buru : public CreatureScript std::list<uint64> Eggs; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_buruAI(creature); } @@ -205,14 +205,14 @@ class npc_buru_egg : public CreatureScript SetCombatMovement(false); } - void EnterCombat(Unit* attacker) + void EnterCombat(Unit* attacker) OVERRIDE { if (Creature* buru = me->GetMap()->GetCreature(_instance->GetData64(DATA_BURU))) if (!buru->IsInCombat()) buru->AI()->AttackStart(attacker); } - void JustSummoned(Creature* who) + void JustSummoned(Creature* who) OVERRIDE { if (who->GetEntry() == NPC_HATCHLING) if (Creature* buru = me->GetMap()->GetCreature(_instance->GetData64(DATA_BURU))) @@ -220,7 +220,7 @@ class npc_buru_egg : public CreatureScript who->AI()->AttackStart(target); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { DoCastAOE(SPELL_EXPLODE, true); DoCastAOE(SPELL_EXPLODE_2, true); // Unknown purpose @@ -234,7 +234,7 @@ class npc_buru_egg : public CreatureScript InstanceScript* _instance; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_buru_eggAI(creature); } @@ -261,14 +261,14 @@ class spell_egg_explosion : public SpellScriptLoader GetCaster()->DealDamage(target, -16 * GetCaster()->GetDistance(target) + 500); } - void Register() + void Register() OVERRIDE { AfterCast += SpellCastFn(spell_egg_explosion_SpellScript::HandleAfterCast); OnEffectHitTarget += SpellEffectFn(spell_egg_explosion_SpellScript::HandleDummyHitTarget, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_egg_explosion_SpellScript(); } diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp index 043cba277c9..735ecb0c595 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp @@ -55,7 +55,7 @@ class boss_kurinnaxx : public CreatureScript { } - void Reset() + void Reset() OVERRIDE { _Reset(); _enraged = false; @@ -65,7 +65,7 @@ class boss_kurinnaxx : public CreatureScript events.ScheduleEvent(EVENT_WIDE_SLASH, 11000); } - void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) + void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) OVERRIDE { if (!_enraged && HealthBelowPct(30)) { @@ -74,14 +74,14 @@ class boss_kurinnaxx : public CreatureScript } } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { _JustDied(); if (Creature* Ossirian = me->GetMap()->GetCreature(instance->GetData64(DATA_OSSIRIAN))) sCreatureTextMgr->SendChat(Ossirian, SAY_KURINAXX_DEATH, 0, CHAT_MSG_ADDON, LANG_ADDON, TEXT_RANGE_ZONE); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -125,7 +125,7 @@ class boss_kurinnaxx : public CreatureScript bool _enraged; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_kurinnaxxAI (creature); } diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp index dd52872e1da..6a1891e5c62 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp @@ -62,7 +62,7 @@ class boss_moam : public CreatureScript { } - void Reset() + void Reset() OVERRIDE { _Reset(); me->SetPower(POWER_MANA, 0); @@ -71,7 +71,7 @@ class boss_moam : public CreatureScript //events.ScheduleEvent(EVENT_WIDE_SLASH, 11000); } - void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) + void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) OVERRIDE { if (!_isStonePhase && HealthBelowPct(45)) { @@ -80,7 +80,7 @@ class boss_moam : public CreatureScript } } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { switch (action) { @@ -105,7 +105,7 @@ class boss_moam : public CreatureScript } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -175,7 +175,7 @@ class boss_moam : public CreatureScript bool _isStonePhase; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_moamAI(creature); } diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp index bd5f76c0c85..c19f16e0839 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp @@ -96,7 +96,7 @@ class boss_ossirian : public CreatureScript uint8 CrystalIterator; bool SaidIntro; - void Reset() + void Reset() OVERRIDE { _Reset(); CrystalIterator = 0; @@ -104,7 +104,7 @@ class boss_ossirian : public CreatureScript CrystalGUID = 0; } - void SpellHit(Unit* caster, SpellInfo const* spell) + void SpellHit(Unit* caster, SpellInfo const* spell) OVERRIDE { for (uint8 i = 0; i < NUM_WEAKNESS; ++i) { @@ -117,7 +117,7 @@ class boss_ossirian : public CreatureScript } } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { if (action == ACTION_TRIGGER_WEAKNESS) if (Creature* Trigger = me->GetMap()->GetCreature(TriggerGUID)) @@ -125,7 +125,7 @@ class boss_ossirian : public CreatureScript Trigger->CastSpell(Trigger, SpellWeakness[urand(0, 4)], false); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); events.Reset(); @@ -158,19 +158,19 @@ class boss_ossirian : public CreatureScript } } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_SLAY); } - void EnterEvadeMode() + void EnterEvadeMode() OVERRIDE { Cleanup(); summons.DespawnAll(); BossAI::EnterEvadeMode(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Cleanup(); _JustDied(); @@ -202,7 +202,8 @@ class boss_ossirian : public CreatureScript } } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (!SaidIntro) { @@ -212,7 +213,7 @@ class boss_ossirian : public CreatureScript BossAI::MoveInLineOfSight(who); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -270,7 +271,7 @@ class boss_ossirian : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_ossirianAI (creature); } @@ -281,7 +282,7 @@ class go_ossirian_crystal : public GameObjectScript public: go_ossirian_crystal() : GameObjectScript("go_ossirian_crystal") { } - bool OnGossipHello(Player* player, GameObject* /*go*/) + bool OnGossipHello(Player* player, GameObject* /*go*/) OVERRIDE { InstanceScript* Instance = player->GetInstanceScript(); if (!Instance) diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp index a7151ec7c05..87dbe3b0098 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp @@ -67,7 +67,7 @@ class boss_rajaxx : public CreatureScript { } - void Reset() + void Reset() OVERRIDE { _Reset(); enraged = false; @@ -75,18 +75,18 @@ class boss_rajaxx : public CreatureScript events.ScheduleEvent(EVENT_THUNDERCRASH, 12000); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { //SAY_DEATH _JustDied(); } - void EnterCombat(Unit* /*victim*/) + void EnterCombat(Unit* /*victim*/) OVERRIDE { _EnterCombat(); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -119,7 +119,7 @@ class boss_rajaxx : public CreatureScript bool enraged; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_rajaxxAI (creature); } diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp index 658528f1fb4..87e0afeb8cc 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp @@ -72,13 +72,13 @@ class instance_ruins_of_ahnqiraj : public InstanceMapScript return true; } - void SetData64(uint32 type, uint64 data) + void SetData64(uint32 type, uint64 data) OVERRIDE { if (type == DATA_PARALYZED) _paralyzedGUID = data; } - uint64 GetData64(uint32 type) const + uint64 GetData64(uint32 type) const OVERRIDE { switch (type) { @@ -154,7 +154,7 @@ class instance_ruins_of_ahnqiraj : public InstanceMapScript uint64 _paralyzedGUID; }; - InstanceScript* GetInstanceScript(InstanceMap* map) const + InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE { return new instance_ruins_of_ahnqiraj_InstanceMapScript(map); } diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp index 413214e4366..fcc6317b15e 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp @@ -46,7 +46,7 @@ class boss_kri : public CreatureScript public: boss_kri() : CreatureScript("boss_kri") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_kriAI (creature); } @@ -67,7 +67,7 @@ public: bool VemDead; bool Death; - void Reset() + void Reset() OVERRIDE { Cleave_Timer = urand(4000, 8000); ToxicVolley_Timer = urand(6000, 12000); @@ -77,11 +77,11 @@ public: Death = false; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) { @@ -92,7 +92,7 @@ public: instance->SetData(DATA_BUG_TRIO_DEATH, 1); } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) @@ -143,7 +143,7 @@ class boss_vem : public CreatureScript public: boss_vem() : CreatureScript("boss_vem") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_vemAI (creature); } @@ -163,7 +163,7 @@ public: bool Enraged; - void Reset() + void Reset() OVERRIDE { Charge_Timer = urand(15000, 27000); KnockBack_Timer = urand(8000, 20000); @@ -172,7 +172,7 @@ public: Enraged = false; } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) { @@ -184,11 +184,11 @@ public: } } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) @@ -236,7 +236,7 @@ class boss_yauj : public CreatureScript public: boss_yauj() : CreatureScript("boss_yauj") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_yaujAI (creature); } @@ -256,7 +256,7 @@ public: bool VemDead; - void Reset() + void Reset() OVERRIDE { Heal_Timer = urand(25000, 40000); Fear_Timer = urand(12000, 24000); @@ -265,7 +265,7 @@ public: VemDead = false; } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) { @@ -285,11 +285,11 @@ public: } } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp index eaea49327f1..1e9e318f3a9 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp @@ -151,7 +151,7 @@ class boss_eye_of_cthun : public CreatureScript public: boss_eye_of_cthun() : CreatureScript("boss_eye_of_cthun") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new eye_of_cthunAI (creature); } @@ -183,7 +183,7 @@ public: float DarkGlareAngle; bool ClockWise; - void Reset() + void Reset() OVERRIDE { //Phase information PhaseTimer = 50000; //First dark glare in 50 seconds @@ -215,7 +215,7 @@ public: pPortal->SetReactState(REACT_PASSIVE); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { DoZoneInCombat(); if (instance) @@ -230,7 +230,7 @@ public: Spawned->AI()->AttackStart(target); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Check if we have a target if (!UpdateVictim()) @@ -402,7 +402,7 @@ public: } } - void DamageTaken(Unit* /*done_by*/, uint32 &damage) + void DamageTaken(Unit* /*done_by*/, uint32 &damage) OVERRIDE { //No instance if (!instance) @@ -457,7 +457,7 @@ class boss_cthun : public CreatureScript public: boss_cthun() : CreatureScript("boss_cthun") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new cthunAI (creature); } @@ -499,7 +499,7 @@ public: //Stomach map, bool = true then in stomach UNORDERED_MAP<uint64, bool> Stomach_Map; - void Reset() + void Reset() OVERRIDE { //One random wisper every 90 - 300 seconds WisperTimer = 90000; @@ -532,7 +532,7 @@ public: instance->SetData(DATA_CTHUN_PHASE, PHASE_NOT_STARTED); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { DoZoneInCombat(); } @@ -581,7 +581,7 @@ public: return (*j); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Check if we have a target if (!UpdateVictim()) @@ -859,13 +859,13 @@ public: } } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) instance->SetData(DATA_CTHUN_PHASE, PHASE_CTHUN_DONE); } - void DamageTaken(Unit* /*done_by*/, uint32 &damage) + void DamageTaken(Unit* /*done_by*/, uint32 &damage) OVERRIDE { //No instance if (!instance) @@ -895,7 +895,7 @@ public: } } - void DoAction(int32 param) + void DoAction(int32 param) OVERRIDE { switch (param) { @@ -913,7 +913,7 @@ class npc_eye_tentacle : public CreatureScript public: npc_eye_tentacle() : CreatureScript("npc_eye_tentacle") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new eye_tentacleAI (creature); } @@ -935,13 +935,13 @@ public: uint32 KillSelfTimer; uint64 Portal; - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (Unit* p = Unit::GetUnit(*me, Portal)) p->Kill(p); } - void Reset() + void Reset() OVERRIDE { //Mind flay half a second after we spawn MindflayTimer = 500; @@ -950,12 +950,12 @@ public: KillSelfTimer = 35000; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { DoZoneInCombat(); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Check if we have a target if (!UpdateVictim()) @@ -988,7 +988,7 @@ class npc_claw_tentacle : public CreatureScript public: npc_claw_tentacle() : CreatureScript("npc_claw_tentacle") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new claw_tentacleAI (creature); } @@ -1011,13 +1011,13 @@ public: uint32 EvadeTimer; uint64 Portal; - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (Unit* p = Unit::GetUnit(*me, Portal)) p->Kill(p); } - void Reset() + void Reset() OVERRIDE { //First rupture should happen half a second after we spawn GroundRuptureTimer = 500; @@ -1025,12 +1025,12 @@ public: EvadeTimer = 5000; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { DoZoneInCombat(); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Check if we have a target if (!UpdateVictim()) @@ -1098,7 +1098,7 @@ class npc_giant_claw_tentacle : public CreatureScript public: npc_giant_claw_tentacle() : CreatureScript("npc_giant_claw_tentacle") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new giant_claw_tentacleAI (creature); } @@ -1122,13 +1122,13 @@ public: uint32 EvadeTimer; uint64 Portal; - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (Unit* p = Unit::GetUnit(*me, Portal)) p->Kill(p); } - void Reset() + void Reset() OVERRIDE { //First rupture should happen half a second after we spawn GroundRuptureTimer = 500; @@ -1137,12 +1137,12 @@ public: EvadeTimer = 5000; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { DoZoneInCombat(); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Check if we have a target if (!UpdateVictim()) @@ -1217,7 +1217,7 @@ class npc_giant_eye_tentacle : public CreatureScript public: npc_giant_eye_tentacle() : CreatureScript("npc_giant_eye_tentacle") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new giant_eye_tentacleAI (creature); } @@ -1238,24 +1238,24 @@ public: uint32 BeamTimer; uint64 Portal; - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (Unit* p = Unit::GetUnit(*me, Portal)) p->Kill(p); } - void Reset() + void Reset() OVERRIDE { //Green Beam half a second after we spawn BeamTimer = 500; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { DoZoneInCombat(); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Check if we have a target if (!UpdateVictim()) @@ -1281,7 +1281,7 @@ class npc_giant_flesh_tentacle : public CreatureScript public: npc_giant_flesh_tentacle() : CreatureScript("npc_giant_flesh_tentacle") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new flesh_tentacleAI (creature); } @@ -1293,7 +1293,7 @@ public: SetCombatMovement(false); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (TempSummon* summon = me->ToTempSummon()) if (Unit* summoner = summon->GetSummoner()) diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp index c267dd1a8e0..4b4cb15edbf 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp @@ -46,7 +46,7 @@ class boss_fankriss : public CreatureScript public: boss_fankriss() : CreatureScript("boss_fankriss") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_fankrissAI (creature); } @@ -65,7 +65,7 @@ public: Creature* Hatchling; Creature* Spawn; - void Reset() + void Reset() OVERRIDE { MortalWound_Timer = urand(10000, 15000); SpawnHatchlings_Timer = urand(6000, 12000); @@ -96,11 +96,11 @@ public: Spawn->AI()->AttackStart(victim); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp index 5435de8c3ef..c74ce8ef68b 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp @@ -44,7 +44,7 @@ class boss_huhuran : public CreatureScript public: boss_huhuran() : CreatureScript("boss_huhuran") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_huhuranAI (creature); } @@ -63,7 +63,7 @@ public: bool Frenzy; bool Berserk; - void Reset() + void Reset() OVERRIDE { Frenzy_Timer = urand(25000, 35000); Wyvern_Timer = urand(18000, 28000); @@ -76,11 +76,11 @@ public: Berserk = false; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp index d1cc2025be4..f9b78c307c4 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp @@ -41,7 +41,7 @@ class boss_ouro : public CreatureScript public: boss_ouro() : CreatureScript("boss_ouro") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_ouroAI (creature); } @@ -60,7 +60,7 @@ public: bool Enrage; bool Submerged; - void Reset() + void Reset() OVERRIDE { Sweep_Timer = urand(5000, 10000); SandBlast_Timer = urand(20000, 35000); @@ -73,12 +73,12 @@ public: Submerged = false; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { DoCastVictim(SPELL_BIRTH); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp index cadfbe1cd39..008dfac6a11 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp @@ -46,7 +46,7 @@ class boss_sartura : public CreatureScript public: boss_sartura() : CreatureScript("boss_sartura") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_sarturaAI (creature); } @@ -67,7 +67,7 @@ public: bool WhirlWind; bool AggroReset; - void Reset() + void Reset() OVERRIDE { WhirlWind_Timer = 30000; WhirlWindRandom_Timer = urand(3000, 7000); @@ -83,22 +83,22 @@ public: } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_SLAY); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) @@ -189,7 +189,7 @@ class npc_sartura_royal_guard : public CreatureScript public: npc_sartura_royal_guard() : CreatureScript("npc_sartura_royal_guard") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_sartura_royal_guardAI (creature); } @@ -208,7 +208,7 @@ public: bool WhirlWind; bool AggroReset; - void Reset() + void Reset() OVERRIDE { WhirlWind_Timer = 30000; WhirlWindRandom_Timer = urand(3000, 7000); @@ -221,11 +221,11 @@ public: AggroReset = false; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp index 9fb241b961b..1921cd77ce6 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp @@ -57,26 +57,26 @@ class boss_skeram : public CreatureScript { boss_skeramAI(Creature* creature) : BossAI(creature, DATA_SKERAM) { } - void Reset() + void Reset() OVERRIDE { _flag = 0; _hpct = 75.0f; me->SetVisible(true); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_SLAY); } - void EnterEvadeMode() + void EnterEvadeMode() OVERRIDE { ScriptedAI::EnterEvadeMode(); if (me->IsSummon()) ((TempSummon*)me)->UnSummon(); } - void JustSummoned(Creature* creature) + void JustSummoned(Creature* creature) OVERRIDE { // Shift the boss and images (Get it? *Shift*?) uint8 rand = 0; @@ -113,7 +113,7 @@ class boss_skeram : public CreatureScript creature->SetHealth(creature->GetMaxHealth() * (me->GetHealthPct() / 100.0f)); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (!me->IsSummon()) Talk(SAY_DEATH); @@ -121,7 +121,7 @@ class boss_skeram : public CreatureScript me->RemoveCorpse(); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); events.Reset(); @@ -134,7 +134,7 @@ class boss_skeram : public CreatureScript Talk(SAY_AGGRO); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -189,7 +189,7 @@ class boss_skeram : public CreatureScript uint8 _flag; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_skeramAI(creature); } @@ -222,13 +222,13 @@ class spell_skeram_arcane_explosion : public SpellScriptLoader targets.remove_if(PlayerOrPetCheck()); } - void Register() + void Register() OVERRIDE { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_skeram_arcane_explosion_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_skeram_arcane_explosion_SpellScript(); } diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp index 833ba83432b..c20a8b29418 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp @@ -109,7 +109,7 @@ struct boss_twinemperorsAI : public ScriptedAI return NULL; } - void DamageTaken(Unit* /*done_by*/, uint32 &damage) + void DamageTaken(Unit* /*done_by*/, uint32 &damage) OVERRIDE { Unit* pOtherBoss = GetOtherBoss(); if (pOtherBoss) @@ -126,7 +126,7 @@ struct boss_twinemperorsAI : public ScriptedAI } } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Creature* pOtherBoss = GetOtherBoss(); if (pOtherBoss) @@ -140,12 +140,12 @@ struct boss_twinemperorsAI : public ScriptedAI DoPlaySoundToSet(me, IAmVeklor() ? SOUND_VL_DEATH : SOUND_VN_DEATH); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { DoPlaySoundToSet(me, IAmVeklor() ? SOUND_VL_KILL : SOUND_VN_KILL); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { DoZoneInCombat(); Creature* pOtherBoss = GetOtherBoss(); @@ -163,7 +163,7 @@ struct boss_twinemperorsAI : public ScriptedAI } } - void SpellHit(Unit* caster, const SpellInfo* entry) + void SpellHit(Unit* caster, const SpellInfo* entry) OVERRIDE { if (caster == me) return; @@ -292,7 +292,8 @@ struct boss_twinemperorsAI : public ScriptedAI } } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (!who || me->GetVictim()) return; @@ -391,7 +392,7 @@ class boss_veknilash : public CreatureScript public: boss_veknilash() : CreatureScript("boss_veknilash") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_veknilashAI (creature); } @@ -410,7 +411,7 @@ public: Creature* Summoned; - void Reset() + void Reset() OVERRIDE { TwinReset(); UpperCut_Timer = urand(14000, 29000); @@ -429,7 +430,7 @@ public: target->SetFullHealth(); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) @@ -477,7 +478,7 @@ class boss_veklor : public CreatureScript public: boss_veklor() : CreatureScript("boss_veklor") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_veklorAI (creature); } @@ -497,7 +498,7 @@ public: Creature* Summoned; - void Reset() + void Reset() OVERRIDE { TwinReset(); ShadowBolt_Timer = 0; @@ -518,7 +519,7 @@ public: target->SetFullHealth(); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) @@ -579,7 +580,7 @@ public: //DoMeleeAttackIfReady(); } - void AttackStart(Unit* who) + void AttackStart(Unit* who) OVERRIDE { if (!who) return; diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp index 9f9f159ee9e..115d9d0d12c 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp @@ -93,14 +93,14 @@ class boss_viscidus : public CreatureScript { boss_viscidusAI(Creature* creature) : BossAI(creature, DATA_VISCIDUS) { } - void Reset() + void Reset() OVERRIDE { _Reset(); _hitcounter = 0; _phase = PHASE_FROST; } - void DamageTaken(Unit* attacker, uint32& /*damage*/) + void DamageTaken(Unit* attacker, uint32& /*damage*/) OVERRIDE { if (_phase != PHASE_MELEE) return; @@ -139,7 +139,7 @@ class boss_viscidus : public CreatureScript Talk(EMOTE_CRACK); } - void SpellHit(Unit* /*caster*/, SpellInfo const* spell) + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) OVERRIDE { if ((spell->GetSchoolMask() & SPELL_SCHOOL_MASK_FROST) && _phase == PHASE_FROST && me->GetHealthPct() > 5.0f) { @@ -168,7 +168,7 @@ class boss_viscidus : public CreatureScript } } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); events.Reset(); @@ -182,19 +182,19 @@ class boss_viscidus : public CreatureScript events.ScheduleEvent(EVENT_POISON_SHOCK, urand(7000, 12000)); } - void EnterEvadeMode() + void EnterEvadeMode() OVERRIDE { summons.DespawnAll(); ScriptedAI::EnterEvadeMode(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { DoCast(me, SPELL_VISCIDUS_SUICIDE); summons.DespawnAll(); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -245,7 +245,7 @@ class boss_viscidus : public CreatureScript Phases _phase; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_viscidusAI(creature); } @@ -260,7 +260,7 @@ class npc_glob_of_viscidus : public CreatureScript { npc_glob_of_viscidusAI(Creature* creature) : ScriptedAI(creature) { } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { InstanceScript* Instance = me->GetInstanceScript(); if (!Instance) @@ -284,7 +284,7 @@ class npc_glob_of_viscidus : public CreatureScript } } - void MovementInform(uint32 /*type*/, uint32 id) + void MovementInform(uint32 /*type*/, uint32 id) OVERRIDE { if (id == ROOM_CENTER) { @@ -294,7 +294,7 @@ class npc_glob_of_viscidus : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_glob_of_viscidusAI(creature); } diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp index 894849c5835..29b38befe29 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp @@ -32,7 +32,7 @@ class instance_temple_of_ahnqiraj : public InstanceMapScript public: instance_temple_of_ahnqiraj() : InstanceMapScript("instance_temple_of_ahnqiraj", 531) { } - InstanceScript* GetInstanceScript(InstanceMap* map) const + InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE { return new instance_temple_of_ahnqiraj_InstanceMapScript(map); } @@ -105,7 +105,7 @@ class instance_temple_of_ahnqiraj : public InstanceMapScript return false; } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { switch (type) { @@ -133,7 +133,7 @@ class instance_temple_of_ahnqiraj : public InstanceMapScript return 0; } - uint64 GetData64(uint32 identifier) const + uint64 GetData64(uint32 identifier) const OVERRIDE { switch (identifier) { @@ -153,7 +153,7 @@ class instance_temple_of_ahnqiraj : public InstanceMapScript return 0; } // end GetData64 - void SetData(uint32 type, uint32 data) + void SetData(uint32 type, uint32 data) OVERRIDE { switch (type) { diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp index 6161f8bf552..77c72924069 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp @@ -64,7 +64,7 @@ class npc_anubisath_sentinel : public CreatureScript public: npc_anubisath_sentinel() : CreatureScript("npc_anubisath_sentinel") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new aqsentinelAI (creature); } @@ -213,7 +213,7 @@ public: bool gatherOthersWhenAggro; - void Reset() + void Reset() OVERRIDE { if (!me->isDead()) { @@ -237,7 +237,7 @@ public: me->AddAura(id, me); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { if (gatherOthersWhenAggro) GetOtherSentinels(who); @@ -246,7 +246,7 @@ public: DoZoneInCombat(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { for (int ni=0; ni<3; ++ni) { diff --git a/src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp b/src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp index e09a7611f21..c477a82d085 100644 --- a/src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp +++ b/src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp @@ -34,7 +34,7 @@ class instance_wailing_caverns : public InstanceMapScript public: instance_wailing_caverns() : InstanceMapScript("instance_wailing_caverns", 43) { } - InstanceScript* GetInstanceScript(InstanceMap* map) const + InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE { return new instance_wailing_caverns_InstanceMapScript(map); } @@ -62,7 +62,7 @@ public: NaralexGUID = creature->GetGUID(); } - void SetData(uint32 type, uint32 data) + void SetData(uint32 type, uint32 data) OVERRIDE { switch (type) { @@ -80,7 +80,7 @@ public: if (data == DONE)SaveToDB(); } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { switch (type) { @@ -98,7 +98,7 @@ public: return 0; } - uint64 GetData64(uint32 data) const + uint64 GetData64(uint32 data) const OVERRIDE { if (data == DATA_NARALEX)return NaralexGUID; return 0; diff --git a/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp b/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp index a4a5e0d94be..706c6e1804d 100644 --- a/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp +++ b/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp @@ -79,12 +79,12 @@ class npc_disciple_of_naralex : public CreatureScript public: npc_disciple_of_naralex() : CreatureScript("npc_disciple_of_naralex") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_disciple_of_naralexAI(creature); } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE { player->PlayerTalkClass->ClearMenus(); InstanceScript* instance = creature->GetInstanceScript(); @@ -106,7 +106,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { InstanceScript* instance = creature->GetInstanceScript(); @@ -150,7 +150,7 @@ public: uint32 eventProgress; InstanceScript* instance; - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { if (!instance) return; @@ -182,17 +182,17 @@ public: } } - void Reset() + void Reset() OVERRIDE { } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { Talk(SAY_ATTACKED, who->GetGUID()); } - void JustDied(Unit* /*slayer*/) + void JustDied(Unit* /*slayer*/) OVERRIDE { if (instance) { @@ -203,12 +203,12 @@ public: } } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { summoned->AI()->AttackStart(me); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (currentEvent != TYPE_NARALEX_PART3) npc_escortAI::UpdateAI(diff); diff --git a/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp b/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp index 83a6cf4a17a..de27368a227 100644 --- a/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp +++ b/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp @@ -101,7 +101,7 @@ class instance_zulfarrak : public InstanceMapScript public: instance_zulfarrak() : InstanceMapScript("instance_zulfarrak", 209) { } - InstanceScript* GetInstanceScript(InstanceMap* map) const + InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE { return new instance_zulfarrak_InstanceMapScript(map); } @@ -187,7 +187,7 @@ public: } } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { switch (type) { @@ -197,7 +197,7 @@ public: return 0; } - uint64 GetData64(uint32 data) const + uint64 GetData64(uint32 data) const OVERRIDE { switch (data) { @@ -219,7 +219,7 @@ public: return 0; } - void SetData(uint32 type, uint32 data) + void SetData(uint32 type, uint32 data) OVERRIDE { switch (type) { diff --git a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp index af76ea041a8..19d922de2bd 100644 --- a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp +++ b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp @@ -64,7 +64,7 @@ class npc_sergeant_bly : public CreatureScript public: npc_sergeant_bly() : CreatureScript("npc_sergeant_bly") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE { player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_ACTION_INFO_DEF+1) @@ -76,7 +76,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (InstanceScript* instance = creature->GetInstanceScript()) { @@ -95,7 +95,7 @@ public: return false; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_sergeant_blyAI (creature); } @@ -116,7 +116,7 @@ public: uint32 Revenge_Timer; //this is wrong, spell should never be used unless me->GetVictim() dodge, parry or block attack. Trinity support required. uint64 PlayerGUID; - void Reset() + void Reset() OVERRIDE { ShieldBash_Timer = 5000; Revenge_Timer = 8000; @@ -124,7 +124,7 @@ public: me->setFaction(FACTION_FRIENDLY); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (postGossipStep>0 && postGossipStep<4) { @@ -182,7 +182,7 @@ public: DoMeleeAttackIfReady(); } - void DoAction(int32 /*param*/) + void DoAction(int32 /*param*/) OVERRIDE { postGossipStep=1; Text_Timer = 0; @@ -207,7 +207,7 @@ class go_troll_cage : public GameObjectScript public: go_troll_cage() : GameObjectScript("go_troll_cage") { } - bool OnGossipHello(Player* /*player*/, GameObject* go) + bool OnGossipHello(Player* /*player*/, GameObject* go) OVERRIDE { if (InstanceScript* instance = go->GetInstanceScript()) { @@ -261,7 +261,7 @@ class npc_weegli_blastfuse : public CreatureScript public: npc_weegli_blastfuse() : CreatureScript("npc_weegli_blastfuse") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE { player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_ACTION_INFO_DEF+1) @@ -273,7 +273,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (InstanceScript* instance = creature->GetInstanceScript()) { @@ -294,7 +294,7 @@ public: return false; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_weegli_blastfuseAI (creature); } @@ -314,24 +314,24 @@ public: bool destroyingDoor; InstanceScript* instance; - void Reset() + void Reset() OVERRIDE { /*if (instance) instance->SetData(0, NOT_STARTED);*/ } - void AttackStart(Unit* victim) + void AttackStart(Unit* victim) OVERRIDE { AttackStartCaster(victim, 10);//keep back & toss bombs/shoot } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { /*if (instance) instance->SetData(0, DONE);*/ } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -356,7 +356,7 @@ public: } } - void MovementInform(uint32 /*type*/, uint32 /*id*/) + void MovementInform(uint32 /*type*/, uint32 /*id*/) OVERRIDE { if (instance) { @@ -376,7 +376,7 @@ public: } } - void DoAction(int32 /*param*/) + void DoAction(int32 /*param*/) OVERRIDE { DestroyDoor(); } @@ -413,7 +413,7 @@ class go_shallow_grave : public GameObjectScript public: go_shallow_grave() : GameObjectScript("go_shallow_grave") { } - bool OnGossipHello(Player* /*player*/, GameObject* go) + bool OnGossipHello(Player* /*player*/, GameObject* go) OVERRIDE { // randomly summon a zombie or dead hero the first time a grave is used if (go->GetUseCount() == 0) @@ -445,7 +445,7 @@ class at_zumrah : public AreaTriggerScript public: at_zumrah() : AreaTriggerScript("at_zumrah") { } - bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/) + bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/) OVERRIDE { Creature* pZumrah = player->FindNearestCreature(ZUMRAH_ID, 30.0f); diff --git a/src/server/scripts/Kalimdor/boss_azuregos.cpp b/src/server/scripts/Kalimdor/boss_azuregos.cpp index 4f70191810a..229a9035f7c 100644 --- a/src/server/scripts/Kalimdor/boss_azuregos.cpp +++ b/src/server/scripts/Kalimdor/boss_azuregos.cpp @@ -47,7 +47,7 @@ class boss_azuregos : public CreatureScript public: boss_azuregos() : CreatureScript("boss_azuregos") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_azuregosAI (creature); } @@ -66,7 +66,7 @@ public: uint32 EnrageTimer; bool Enraged; - void Reset() + void Reset() OVERRIDE { MarkOfFrostTimer = 35000; ManaStormTimer = urand(5000, 17000); @@ -79,9 +79,9 @@ public: Enraged = false; } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/Kalimdor/zone_ashenvale.cpp b/src/server/scripts/Kalimdor/zone_ashenvale.cpp index 315ee609bca..bd4c2f893c5 100644 --- a/src/server/scripts/Kalimdor/zone_ashenvale.cpp +++ b/src/server/scripts/Kalimdor/zone_ashenvale.cpp @@ -78,7 +78,7 @@ class npc_torek : public CreatureScript uint32 Thunderclap_Timer; bool Completed; - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { if (Player* player = GetPlayerForEscort()) { @@ -108,23 +108,23 @@ class npc_torek : public CreatureScript } } - void Reset() + void Reset() OVERRIDE { Rend_Timer = 5000; Thunderclap_Timer = 8000; Completed = false; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { summoned->AI()->AttackStart(me); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { npc_escortAI::UpdateAI(diff); @@ -145,12 +145,12 @@ class npc_torek : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_torekAI(creature); } - bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE { if (quest->GetQuestId() == QUEST_TOREK_ASSULT) { @@ -200,7 +200,7 @@ class npc_ruul_snowhoof : public CreatureScript { npc_ruul_snowhoofAI(Creature* creature) : npc_escortAI(creature) { } - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { Player* player = GetPlayerForEscort(); if (!player) @@ -229,31 +229,31 @@ class npc_ruul_snowhoof : public CreatureScript } } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void Reset() + void Reset() OVERRIDE { if (GameObject* Cage = me->FindNearestGameObject(GO_CAGE, 20)) Cage->SetGoState(GO_STATE_READY); } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { summoned->AI()->AttackStart(me); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { npc_escortAI::UpdateAI(diff); } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_ruul_snowhoofAI(creature); } - bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE { if (quest->GetQuestId() == QUEST_FREEDOM_TO_RUUL) { @@ -325,12 +325,12 @@ class npc_muglash : public CreatureScript uint32 EventTimer; bool IsBrazierExtinguished; - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { summoned->AI()->AttackStart(me); } - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { if (Player* player = GetPlayerForEscort()) { @@ -362,7 +362,7 @@ class npc_muglash : public CreatureScript } } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { if (Player* player = GetPlayerForEscort()) if (HasEscortState(STATE_ESCORT_PAUSED)) @@ -373,14 +373,14 @@ class npc_muglash : public CreatureScript } } - void Reset() + void Reset() OVERRIDE { EventTimer = 10000; WaveId = 0; IsBrazierExtinguished = false; } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (HasEscortState(STATE_ESCORT_ESCORTING)) if (Player* player = GetPlayerForEscort()) @@ -411,7 +411,7 @@ class npc_muglash : public CreatureScript } } - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { npc_escortAI::UpdateAI(uiDiff); @@ -434,12 +434,12 @@ class npc_muglash : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_muglashAI(creature); } - bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE { if (quest->GetQuestId() == QUEST_VORSHA) { @@ -460,7 +460,7 @@ class go_naga_brazier : public GameObjectScript public: go_naga_brazier() : GameObjectScript("go_naga_brazier") { } - bool OnGossipHello(Player* /*player*/, GameObject* go) + bool OnGossipHello(Player* /*player*/, GameObject* go) OVERRIDE { if (Creature* creature = GetClosestCreatureWithEntry(go, NPC_MUGLASH, INTERACTION_DISTANCE*2)) { diff --git a/src/server/scripts/Kalimdor/zone_azshara.cpp b/src/server/scripts/Kalimdor/zone_azshara.cpp index 1669337b6e9..8eb78cbf438 100644 --- a/src/server/scripts/Kalimdor/zone_azshara.cpp +++ b/src/server/scripts/Kalimdor/zone_azshara.cpp @@ -46,7 +46,7 @@ class npc_spitelashes : public CreatureScript public: npc_spitelashes() : CreatureScript("npc_spitelashes") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_spitelashesAI (creature); } @@ -58,15 +58,15 @@ public: uint32 morphtimer; bool spellhit; - void Reset() + void Reset() OVERRIDE { morphtimer = 0; spellhit = false; } - void EnterCombat(Unit* /*who*/) { } + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void SpellHit(Unit* unit, const SpellInfo* spell) + void SpellHit(Unit* unit, const SpellInfo* spell) OVERRIDE { if (spellhit) return; @@ -89,7 +89,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { // we mustn't remove the Creature in the same round in which we cast the summon spell, otherwise there will be no summons if (spellhit && morphtimer >= 5000) @@ -134,7 +134,7 @@ class npc_loramus_thalipedes : public CreatureScript public: npc_loramus_thalipedes() : CreatureScript("npc_loramus_thalipedes") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE { player->PlayerTalkClass->ClearMenus(); switch (action) @@ -172,7 +172,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -281,7 +281,7 @@ class npc_rizzle_sprysprocket : public CreatureScript public: npc_rizzle_sprysprocket() : CreatureScript("npc_rizzle_sprysprocket") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE { player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_ACTION_INFO_DEF + 1 && player->GetQuestStatus(QUEST_CHASING_THE_MOONSTONE) == QUEST_STATUS_INCOMPLETE) @@ -294,7 +294,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (player->GetQuestStatus(QUEST_CHASING_THE_MOONSTONE) != QUEST_STATUS_INCOMPLETE) return true; @@ -303,7 +303,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_rizzle_sprysprocketAI (creature); } @@ -326,7 +326,7 @@ public: bool ContinueWP; bool Reached; - void Reset() + void Reset() OVERRIDE { SpellEscapeTimer = 1300; TeleportTimer = 3500; @@ -343,7 +343,7 @@ public: Reached = false; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (MustDie) { @@ -436,7 +436,7 @@ public: sWorld->SendServerMessage(SERVER_MSG_STRING, text, player); } - void AttackStart(Unit* who) + void AttackStart(Unit* who) OVERRIDE { if (!who || PlayerGUID) return; @@ -452,9 +452,9 @@ public: } } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void MovementInform(uint32 type, uint32 id) + void MovementInform(uint32 type, uint32 id) OVERRIDE { if (type != POINT_MOTION_TYPE) return; @@ -479,7 +479,7 @@ class npc_depth_charge : public CreatureScript public: npc_depth_charge() : CreatureScript("npc_depth_charge") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_depth_chargeAI (creature); } @@ -491,7 +491,7 @@ public: bool WeMustDie; uint32 WeMustDieTimer; - void Reset() + void Reset() OVERRIDE { me->SetHover(true); me->SetSwim(true); @@ -500,7 +500,7 @@ public: WeMustDieTimer = 1000; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (WeMustDie) { @@ -512,7 +512,8 @@ public: return; } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (!who) return; @@ -525,9 +526,9 @@ public: } } - void AttackStart(Unit* /*who*/) {} + void AttackStart(Unit* /*who*/) OVERRIDE {} - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} }; }; diff --git a/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp b/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp index 9f2c39e9a27..f5902faa3ff 100644 --- a/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp +++ b/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp @@ -61,7 +61,7 @@ class npc_draenei_survivor : public CreatureScript public: npc_draenei_survivor() : CreatureScript("npc_draenei_survivor") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_draenei_survivorAI (creature); } @@ -78,7 +78,7 @@ public: bool CanSayHelp; - void Reset() + void Reset() OVERRIDE { pCaster = 0; @@ -96,9 +96,10 @@ public: me->SetStandState(UNIT_STAND_STATE_SLEEP); } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} + + void MoveInLineOfSight(Unit* who) OVERRIDE - void MoveInLineOfSight(Unit* who) { if (CanSayHelp && who->GetTypeId() == TYPEID_PLAYER && me->IsFriendlyTo(who) && me->IsWithinDistInMap(who, 25.0f)) { @@ -110,7 +111,7 @@ public: } } - void SpellHit(Unit* Caster, const SpellInfo* Spell) + void SpellHit(Unit* Caster, const SpellInfo* Spell) OVERRIDE { if (Spell->SpellFamilyFlags[2] & 0x080000000) { @@ -125,7 +126,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (SayThanksTimer) { @@ -194,7 +195,7 @@ class npc_engineer_spark_overgrind : public CreatureScript public: npc_engineer_spark_overgrind() : CreatureScript("npc_engineer_spark_overgrind") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE { player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_ACTION_INFO_DEF) @@ -206,7 +207,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (player->GetQuestStatus(QUEST_GNOMERCY) == QUEST_STATUS_INCOMPLETE) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_FIGHT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); @@ -215,7 +216,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_engineer_spark_overgrindAI (creature); } @@ -239,7 +240,7 @@ public: bool IsTreeEvent; - void Reset() + void Reset() OVERRIDE { DynamiteTimer = 8000; EmoteTimer = urand(120000, 150000); @@ -250,12 +251,12 @@ public: IsTreeEvent = false; } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { Talk(ATTACK_YELL, who->GetGUID()); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!me->IsInCombat() && !IsTreeEvent) { @@ -293,7 +294,7 @@ class npc_injured_draenei : public CreatureScript public: npc_injured_draenei() : CreatureScript("npc_injured_draenei") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_injured_draeneiAI (creature); } @@ -302,7 +303,7 @@ public: { npc_injured_draeneiAI(Creature* creature) : ScriptedAI(creature) {} - void Reset() + void Reset() OVERRIDE { me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IN_COMBAT); me->SetHealth(me->CountPctFromMaxHealth(15)); @@ -318,11 +319,12 @@ public: } } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} + + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} - void MoveInLineOfSight(Unit* /*who*/) {} - void UpdateAI(uint32 /*diff*/) {} + void UpdateAI(uint32 /*diff*/) OVERRIDE {} }; }; @@ -348,7 +350,7 @@ class npc_magwin : public CreatureScript public: npc_magwin() : CreatureScript("npc_magwin") { } - bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE { if (quest->GetQuestId() == QUEST_A_CRY_FOR_SAY_HELP) { @@ -359,7 +361,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_magwinAI(creature); } @@ -368,7 +370,7 @@ public: { npc_magwinAI(Creature* creature) : npc_escortAI(creature) {} - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { if (Player* player = GetPlayerForEscort()) { @@ -392,12 +394,12 @@ public: } } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { Talk(SAY_AGGRO, who->GetGUID()); } - void Reset() {} + void Reset() OVERRIDE {} }; }; @@ -433,7 +435,7 @@ class npc_geezle : public CreatureScript public: npc_geezle() : CreatureScript("npc_geezle") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_geezleAI(creature); } @@ -449,14 +451,14 @@ public: bool EventStarted; - void Reset() + void Reset() OVERRIDE { SparkGUID = 0; Step = 0; StartEvent(); } - void EnterCombat(Unit* /*who*/){} + void EnterCombat(Unit* /*who*/)OVERRIDE {} void StartEvent() { @@ -556,7 +558,7 @@ public: TC_LOG_ERROR(LOG_FILTER_TSCR, "SD2 ERROR: FlagList is empty!"); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (SayTimer <= diff) { @@ -585,7 +587,7 @@ class go_ravager_cage : public GameObjectScript public: go_ravager_cage() : GameObjectScript("go_ravager_cage") { } - bool OnGossipHello(Player* player, GameObject* go) + bool OnGossipHello(Player* player, GameObject* go) OVERRIDE { go->UseDoorOrButton(); if (player->GetQuestStatus(QUEST_STRENGTH_ONE) == QUEST_STATUS_INCOMPLETE) @@ -606,7 +608,7 @@ class npc_death_ravager : public CreatureScript public: npc_death_ravager() : CreatureScript("npc_death_ravager") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_death_ravagerAI(creature); } @@ -618,7 +620,7 @@ public: uint32 RendTimer; uint32 EnragingBiteTimer; - void Reset() + void Reset() OVERRIDE { RendTimer = 30000; EnragingBiteTimer = 20000; @@ -627,7 +629,7 @@ public: me->SetReactState(REACT_PASSIVE); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -677,7 +679,7 @@ class npc_stillpine_capitive : public CreatureScript { npc_stillpine_capitiveAI(Creature* creature) : ScriptedAI(creature) {} - void Reset() + void Reset() OVERRIDE { if (GameObject* cage = me->FindNearestGameObject(GO_BRISTELIMB_CAGE, 5.0f)) { @@ -701,7 +703,7 @@ class npc_stillpine_capitive : public CreatureScript me->GetMotionMaster()->MovePoint(POINT_INIT, pos); } - void MovementInform(uint32 type, uint32 id) + void MovementInform(uint32 type, uint32 id) OVERRIDE { if (type != POINT_MOTION_TYPE || id != POINT_INIT) return; @@ -713,7 +715,7 @@ class npc_stillpine_capitive : public CreatureScript _events.ScheduleEvent(EVENT_DESPAWN, 3500); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!_movementComplete) return; @@ -730,7 +732,7 @@ class npc_stillpine_capitive : public CreatureScript bool _movementComplete; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_stillpine_capitiveAI(creature); } @@ -741,7 +743,7 @@ class go_bristlelimb_cage : public GameObjectScript public: go_bristlelimb_cage() : GameObjectScript("go_bristlelimb_cage") { } - bool OnGossipHello(Player* player, GameObject* go) + bool OnGossipHello(Player* player, GameObject* go) OVERRIDE { go->SetGoState(GO_STATE_READY); if (player->GetQuestStatus(QUEST_THE_PROPHECY_OF_AKIDA) == QUEST_STATUS_INCOMPLETE) diff --git a/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp b/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp index 713c66b66b8..d9989c5035c 100644 --- a/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp +++ b/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp @@ -45,7 +45,7 @@ class npc_webbed_creature : public CreatureScript public: npc_webbed_creature() : CreatureScript("npc_webbed_creature") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_webbed_creatureAI (creature); } @@ -54,11 +54,11 @@ public: { npc_webbed_creatureAI(Creature* creature) : ScriptedAI(creature) {} - void Reset() {} + void Reset() OVERRIDE {} - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void JustDied(Unit* killer) + void JustDied(Unit* killer) OVERRIDE { uint32 spawnCreatureID = 0; @@ -100,7 +100,7 @@ class npc_captured_sunhawk_agent : public CreatureScript public: npc_captured_sunhawk_agent() : CreatureScript("npc_captured_sunhawk_agent") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE { player->PlayerTalkClass->ClearMenus(); switch (action) @@ -133,7 +133,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (player->HasAura(31609) && player->GetQuestStatus(9756) == QUEST_STATUS_INCOMPLETE) { @@ -166,7 +166,7 @@ class go_princess_stillpines_cage : public GameObjectScript public: go_princess_stillpines_cage() : GameObjectScript("go_princess_stillpines_cage") { } - bool OnGossipHello(Player* player, GameObject* go) + bool OnGossipHello(Player* player, GameObject* go) OVERRIDE { go->SetGoState(GO_STATE_READY); if (Creature* stillpine = go->FindNearestCreature(NPC_PRINCESS_STILLPINE, 25, true)) @@ -187,7 +187,7 @@ public: { npc_princess_stillpineAI(Creature* creature) : ScriptedAI(creature) {} - void MovementInform(uint32 type, uint32 id) + void MovementInform(uint32 type, uint32 id) OVERRIDE { if (type == POINT_MOTION_TYPE && id == 1) { @@ -197,7 +197,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_princess_stillpineAI(creature); } diff --git a/src/server/scripts/Kalimdor/zone_darkshore.cpp b/src/server/scripts/Kalimdor/zone_darkshore.cpp index 1e1cffc93b7..5350693471b 100644 --- a/src/server/scripts/Kalimdor/zone_darkshore.cpp +++ b/src/server/scripts/Kalimdor/zone_darkshore.cpp @@ -63,7 +63,7 @@ class npc_kerlonian : public CreatureScript public: npc_kerlonian() : CreatureScript("npc_kerlonian") { } - bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) + bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) OVERRIDE { if (quest->GetQuestId() == QUEST_SLEEPER_AWAKENED) { @@ -78,7 +78,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_kerlonianAI(creature); } @@ -89,12 +89,13 @@ public: uint32 FallAsleepTimer; - void Reset() + void Reset() OVERRIDE { FallAsleepTimer = urand(10000, 45000); } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { FollowerAI::MoveInLineOfSight(who); @@ -115,7 +116,7 @@ public: } } - void SpellHit(Unit* /*pCaster*/, const SpellInfo* pSpell) + void SpellHit(Unit* /*pCaster*/, const SpellInfo* pSpell) OVERRIDE { if (HasFollowState(STATE_FOLLOW_INPROGRESS | STATE_FOLLOW_PAUSED) && pSpell->Id == SPELL_AWAKEN) ClearSleeping(); @@ -143,7 +144,7 @@ public: SetFollowPaused(false); } - void UpdateFollowerAI(uint32 Diff) + void UpdateFollowerAI(uint32 Diff) OVERRIDE { if (!UpdateVictim()) { @@ -202,7 +203,7 @@ class npc_prospector_remtravel : public CreatureScript public: npc_prospector_remtravel() : CreatureScript("npc_prospector_remtravel") { } - bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) + bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) OVERRIDE { if (quest->GetQuestId() == QUEST_ABSENT_MINDED_PT2) { @@ -215,7 +216,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_prospector_remtravelAI(creature); } @@ -224,7 +225,7 @@ public: { npc_prospector_remtravelAI(Creature* creature) : npc_escortAI(creature) {} - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { if (Player* player = GetPlayerForEscort()) { @@ -285,15 +286,15 @@ public: } } - void Reset() {} + void Reset() OVERRIDE {} - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { if (urand(0, 1)) Talk(SAY_REM_AGGRO, who->GetGUID()); } - void JustSummoned(Creature* /*pSummoned*/) + void JustSummoned(Creature* /*pSummoned*/) OVERRIDE { //unsure if it should be any //pSummoned->AI()->AttackStart(me); @@ -322,7 +323,7 @@ class npc_threshwackonator : public CreatureScript public: npc_threshwackonator() : CreatureScript("npc_threshwackonator") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE { player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_ACTION_INFO_DEF+1) @@ -339,7 +340,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (player->GetQuestStatus(QUEST_GYROMAST_REV) == QUEST_STATUS_INCOMPLETE) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_INSERT_KEY, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); @@ -348,7 +349,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_threshwackonatorAI(creature); } @@ -357,9 +358,10 @@ public: { npc_threshwackonatorAI(Creature* creature) : FollowerAI(creature) { } - void Reset() { } + void Reset() OVERRIDE {} + + void MoveInLineOfSight(Unit* who) OVERRIDE - void MoveInLineOfSight(Unit* who) { FollowerAI::MoveInLineOfSight(who); diff --git a/src/server/scripts/Kalimdor/zone_desolace.cpp b/src/server/scripts/Kalimdor/zone_desolace.cpp index b21cb28e0d5..882bc176932 100644 --- a/src/server/scripts/Kalimdor/zone_desolace.cpp +++ b/src/server/scripts/Kalimdor/zone_desolace.cpp @@ -61,7 +61,7 @@ class npc_aged_dying_ancient_kodo : public CreatureScript public: npc_aged_dying_ancient_kodo() : CreatureScript("npc_aged_dying_ancient_kodo") { } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (player->HasAura(SPELL_KODO_KOMBO_PLAYER_BUFF) && creature->HasAura(SPELL_KODO_KOMBO_DESPAWN_BUFF)) { @@ -77,7 +77,8 @@ public: { npc_aged_dying_ancient_kodoAI(Creature* creature) : ScriptedAI(creature) {} - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (who->GetEntry() == NPC_SMEED && me->IsWithinDistInMap(who, 10.0f) && !me->HasAura(SPELL_KODO_KOMBO_GOSSIP)) { @@ -88,7 +89,7 @@ public: } } - void SpellHit(Unit* caster, SpellInfo const* spell) + void SpellHit(Unit* caster, SpellInfo const* spell) OVERRIDE { if (spell->Id == SPELL_KODO_KOMBO_ITEM) { @@ -110,7 +111,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_aged_dying_ancient_kodoAI(creature); } @@ -133,7 +134,7 @@ class go_iruxos : public GameObjectScript public: go_iruxos() : GameObjectScript("go_iruxos") { } - bool OnGossipHello(Player* player, GameObject* go) + bool OnGossipHello(Player* player, GameObject* go) OVERRIDE { if (player->GetQuestStatus(QUEST_HAND_IRUXOS) == QUEST_STATUS_INCOMPLETE && !go->FindNearestCreature(NPC_DEMON_SPIRIT, 25.0f, true)) player->SummonCreature(NPC_DEMON_SPIRIT, go->GetPositionX(), go->GetPositionY(), go->GetPositionZ(), 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000); @@ -156,7 +157,7 @@ class npc_dalinda : public CreatureScript public: npc_dalinda() : CreatureScript("npc_dalinda") { } - bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE { if (quest->GetQuestId() == QUEST_RETURN_TO_VAHLARRIEL) { @@ -169,7 +170,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_dalindaAI(creature); } @@ -178,7 +179,7 @@ public: { npc_dalindaAI(Creature* creature) : npc_escortAI(creature) { } - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { Player* player = GetPlayerForEscort(); @@ -194,18 +195,18 @@ public: } } - void EnterCombat(Unit* /*who*/) { } + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void Reset() {} + void Reset() OVERRIDE {} - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (Player* player = GetPlayerForEscort()) player->FailQuest(QUEST_RETURN_TO_VAHLARRIEL); return; } - void UpdateAI(uint32 Diff) + void UpdateAI(uint32 Diff) OVERRIDE { npc_escortAI::UpdateAI(Diff); if (!UpdateVictim()) @@ -231,7 +232,7 @@ class go_demon_portal : public GameObjectScript public: go_demon_portal() : GameObjectScript("go_demon_portal") { } - bool OnGossipHello(Player* player, GameObject* go) + bool OnGossipHello(Player* player, GameObject* go) OVERRIDE { if (player->GetQuestStatus(QUEST_PORTAL_OF_THE_LEGION) == QUEST_STATUS_INCOMPLETE && !go->FindNearestCreature(NPC_DEMON_GUARDIAN, 5.0f, true)) { diff --git a/src/server/scripts/Kalimdor/zone_durotar.cpp b/src/server/scripts/Kalimdor/zone_durotar.cpp index 31b710f61a5..63309c0502d 100644 --- a/src/server/scripts/Kalimdor/zone_durotar.cpp +++ b/src/server/scripts/Kalimdor/zone_durotar.cpp @@ -44,7 +44,7 @@ class npc_lazy_peon : public CreatureScript public: npc_lazy_peon() : CreatureScript("npc_lazy_peon") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_lazy_peonAI(creature); } @@ -58,20 +58,20 @@ public: uint32 RebuffTimer; bool work; - void Reset() + void Reset() OVERRIDE { PlayerGUID = 0; RebuffTimer = 0; work = false; } - void MovementInform(uint32 /*type*/, uint32 id) + void MovementInform(uint32 /*type*/, uint32 id) OVERRIDE { if (id == 1) work = true; } - void SpellHit(Unit* caster, const SpellInfo* spell) + void SpellHit(Unit* caster, const SpellInfo* spell) OVERRIDE { if (spell->Id != SPELL_AWAKEN_PEON) return; @@ -87,7 +87,7 @@ public: } } - void UpdateAI(uint32 Diff) + void UpdateAI(uint32 Diff) OVERRIDE { if (work == true) me->HandleEmoteCommand(EMOTE_ONESHOT_WORK_CHOPWOOD); @@ -186,7 +186,7 @@ class npc_tiger_matriarch_credit : public CreatureScript events.ScheduleEvent(EVENT_CHECK_SUMMON_AURA, 2000); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { events.Update(diff); @@ -221,7 +221,7 @@ class npc_tiger_matriarch_credit : public CreatureScript EventMap events; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_tiger_matriarch_creditAI(creature); } @@ -239,14 +239,14 @@ class npc_tiger_matriarch : public CreatureScript { } - void EnterCombat(Unit* /*target*/) + void EnterCombat(Unit* /*target*/) OVERRIDE { _events.Reset(); _events.ScheduleEvent(EVENT_POUNCE, 100); _events.ScheduleEvent(EVENT_NOSUMMON, 50000); } - void IsSummonedBy(Unit* summoner) + void IsSummonedBy(Unit* summoner) OVERRIDE { if (summoner->GetTypeId() != TYPEID_PLAYER || !summoner->GetVehicle()) return; @@ -259,7 +259,7 @@ class npc_tiger_matriarch : public CreatureScript } } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) OVERRIDE { if (victim->GetTypeId() != TYPEID_UNIT || !victim->IsSummon()) return; @@ -274,7 +274,7 @@ class npc_tiger_matriarch : public CreatureScript me->DespawnOrUnsummon(); } - void DamageTaken(Unit* attacker, uint32& damage) + void DamageTaken(Unit* attacker, uint32& damage) OVERRIDE { if (!attacker->IsSummon()) return; @@ -298,7 +298,7 @@ class npc_tiger_matriarch : public CreatureScript } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -338,7 +338,7 @@ class npc_tiger_matriarch : public CreatureScript uint64 _tigerGuid; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_tiger_matriarchAI(creature); } @@ -362,7 +362,7 @@ class npc_troll_volunteer : public CreatureScript { } - void InitializeAI() + void InitializeAI() OVERRIDE { if (me->isDead() || !me->GetOwner()) return; @@ -389,7 +389,7 @@ class npc_troll_volunteer : public CreatureScript me->GetMotionMaster()->MoveFollow(player, 5.0f, float(rand_norm() + 1.0f) * M_PI / 3.0f * 4.0f); } - void Reset() + void Reset() OVERRIDE { _complete = false; me->AddAura(SPELL_VOLUNTEER_AURA, me); @@ -405,7 +405,7 @@ class npc_troll_volunteer : public CreatureScript return _mountModel; } - void MovementInform(uint32 type, uint32 id) + void MovementInform(uint32 type, uint32 id) OVERRIDE { if (type != POINT_MOTION_TYPE) return; @@ -413,7 +413,7 @@ class npc_troll_volunteer : public CreatureScript me->DespawnOrUnsummon(); } - void SpellHit(Unit* caster, SpellInfo const* spell) + void SpellHit(Unit* caster, SpellInfo const* spell) OVERRIDE { if (spell->Id == SPELL_AOE_TURNIN && caster->GetEntry() == NPC_URUZIN && !_complete) { @@ -432,7 +432,7 @@ class npc_troll_volunteer : public CreatureScript bool _complete; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_troll_volunteerAI(creature); } @@ -448,7 +448,7 @@ class spell_mount_check : public SpellScriptLoader class spell_mount_check_AuraScript : public AuraScript { PrepareAuraScript(spell_mount_check_AuraScript) - bool Validate(SpellInfo const* /*spellEntry*/) + bool Validate(SpellInfo const* /*spellEntry*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_MOUNTING_CHECK)) return false; @@ -475,13 +475,13 @@ class spell_mount_check : public SpellScriptLoader target->SetSpeed(MOVE_WALK, owner->GetSpeedRate(MOVE_WALK)); } - void Register() + void Register() OVERRIDE { OnEffectPeriodic += AuraEffectPeriodicFn(spell_mount_check_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_mount_check_AuraScript(); } @@ -495,7 +495,7 @@ class spell_voljin_war_drums : public SpellScriptLoader class spell_voljin_war_drums_SpellScript : public SpellScript { PrepareSpellScript(spell_voljin_war_drums_SpellScript) - bool Validate(SpellInfo const* /*spellEntry*/) + bool Validate(SpellInfo const* /*spellEntry*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_MOTIVATE_1)) return false; @@ -519,13 +519,13 @@ class spell_voljin_war_drums : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_voljin_war_drums_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_voljin_war_drums_SpellScript(); } @@ -552,7 +552,7 @@ class spell_voodoo : public SpellScriptLoader { PrepareSpellScript(spell_voodoo_SpellScript) - bool Validate(SpellInfo const* /*spellEntry*/) + bool Validate(SpellInfo const* /*spellEntry*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_BREW) || !sSpellMgr->GetSpellInfo(SPELL_GHOSTLY) || !sSpellMgr->GetSpellInfo(SPELL_HEX1) || !sSpellMgr->GetSpellInfo(SPELL_HEX2) || @@ -569,13 +569,13 @@ class spell_voodoo : public SpellScriptLoader GetCaster()->CastSpell(target, spellid, false); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_voodoo_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_voodoo_SpellScript(); } diff --git a/src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp b/src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp index ba7c34b6c05..936713a451a 100644 --- a/src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp +++ b/src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp @@ -74,7 +74,7 @@ class npc_risen_husk_spirit : public CreatureScript { npc_risen_husk_spiritAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() + void Reset() OVERRIDE { events.Reset(); if (me->GetEntry() == NPC_RISEN_HUSK) @@ -83,7 +83,7 @@ class npc_risen_husk_spirit : public CreatureScript events.ScheduleEvent(EVENT_INTANGIBLE_PRESENCE, 5000); } - void JustDied(Unit* killer) + void JustDied(Unit* killer) OVERRIDE { if (killer->GetTypeId() == TYPEID_PLAYER) { @@ -95,7 +95,7 @@ class npc_risen_husk_spirit : public CreatureScript } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -126,7 +126,7 @@ class npc_risen_husk_spirit : public CreatureScript EventMap events; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_risen_husk_spiritAI (creature); } @@ -157,7 +157,7 @@ class npc_theramore_guard : public CreatureScript public: npc_theramore_guard() : CreatureScript("npc_theramore_guard") { } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (player->GetQuestStatus(QUEST_DISCREDITING_THE_DESERTERS) == QUEST_STATUS_INCOMPLETE) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_THERAMORE_GUARD, GOSSIP_SENDER_MAIN, GOSSIP_SENDER_INFO); @@ -167,7 +167,7 @@ public: return true; } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE { player->PlayerTalkClass->ClearMenus(); @@ -185,7 +185,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_theramore_guardAI(creature); } @@ -198,13 +198,13 @@ public: uint32 Step; bool bYellTimer; - void Reset() + void Reset() OVERRIDE { bYellTimer = false; Step = 0; } - void UpdateAI(uint32 Diff) + void UpdateAI(uint32 Diff) OVERRIDE { if (!me->HasAura(SPELL_PROPAGANDIZED)) me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); @@ -249,7 +249,7 @@ class npc_lady_jaina_proudmoore : public CreatureScript public: npc_lady_jaina_proudmoore() : CreatureScript("npc_lady_jaina_proudmoore") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE { player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_SENDER_INFO) @@ -260,7 +260,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -289,7 +289,7 @@ class npc_nat_pagle : public CreatureScript public: npc_nat_pagle() : CreatureScript("npc_nat_pagle") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE { player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_ACTION_TRADE) @@ -298,7 +298,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -342,7 +342,7 @@ class npc_private_hendel : public CreatureScript public: npc_private_hendel() : CreatureScript("npc_private_hendel") { } - bool OnQuestAccept(Player* /*player*/, Creature* creature, const Quest* quest) + bool OnQuestAccept(Player* /*player*/, Creature* creature, const Quest* quest) OVERRIDE { if (quest->GetQuestId() == QUEST_MISSING_DIPLO_PT16) creature->setFaction(FACTION_HOSTILE); @@ -350,7 +350,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_private_hendelAI(creature); } @@ -359,12 +359,12 @@ public: { npc_private_hendelAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() + void Reset() OVERRIDE { me->RestoreFaction(); } - void AttackedBy(Unit* pAttacker) + void AttackedBy(Unit* pAttacker) OVERRIDE { if (me->GetVictim()) return; @@ -375,7 +375,7 @@ public: AttackStart(pAttacker); } - void DamageTaken(Unit* pDoneBy, uint32 &Damage) + void DamageTaken(Unit* pDoneBy, uint32 &Damage) OVERRIDE { if (Damage > me->GetHealth() || me->HealthBelowPctDamaged(20, Damage)) { @@ -409,7 +409,7 @@ class npc_zelfrax : public CreatureScript public: npc_zelfrax() : CreatureScript("npc_zelfrax") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_zelfraxAI(creature); } @@ -421,7 +421,7 @@ public: MoveToDock(); } - void AttackStart(Unit* who) + void AttackStart(Unit* who) OVERRIDE { if (!who) return; @@ -436,7 +436,7 @@ public: } } - void MovementInform(uint32 Type, uint32 /*Id*/) + void MovementInform(uint32 Type, uint32 /*Id*/) OVERRIDE { if (Type != POINT_MOTION_TYPE) return; @@ -458,7 +458,7 @@ public: Talk(SAY_ZELFRAX2); } - void UpdateAI(uint32 /*Diff*/) + void UpdateAI(uint32 /*Diff*/) OVERRIDE { if (!UpdateVictim()) return; @@ -494,12 +494,12 @@ class npc_stinky : public CreatureScript public: npc_stinky() : CreatureScript("npc_stinky") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_stinkyAI(creature); } - bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE { if (quest->GetQuestId() == QUEST_STINKYS_ESCAPE_H || quest->GetQuestId() == QUEST_STINKYS_ESCAPE_A) { @@ -518,7 +518,7 @@ public: { npc_stinkyAI(Creature* creature) : npc_escortAI(creature) { } - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { Player* player = GetPlayerForEscort(); if (!player) @@ -563,14 +563,14 @@ public: } } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { Talk(SAY_ATTACKED_1, who->GetGUID()); } - void Reset() {} + void Reset() OVERRIDE {} - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Player* player = GetPlayerForEscort(); if (player && HasEscortState(STATE_ESCORT_ESCORTING)) @@ -583,7 +583,7 @@ public: } } - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { npc_escortAI::UpdateAI(uiDiff); @@ -612,7 +612,7 @@ class spell_ooze_zap : public SpellScriptLoader { PrepareSpellScript(spell_ooze_zap_SpellScript); - bool Validate(SpellInfo const* /*spellEntry*/) + bool Validate(SpellInfo const* /*spellEntry*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_OOZE_ZAP)) return false; @@ -637,14 +637,14 @@ class spell_ooze_zap : public SpellScriptLoader GetCaster()->CastSpell(GetHitUnit(), uint32(GetEffectValue()), true); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_ooze_zap_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); OnCheckCast += SpellCheckCastFn(spell_ooze_zap_SpellScript::CheckRequirement); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_ooze_zap_SpellScript(); } @@ -659,7 +659,7 @@ class spell_ooze_zap_channel_end : public SpellScriptLoader { PrepareSpellScript(spell_ooze_zap_channel_end_SpellScript); - bool Validate(SpellInfo const* /*spellEntry*/) + bool Validate(SpellInfo const* /*spellEntry*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_OOZE_ZAP_CHANNEL_END)) return false; @@ -674,13 +674,13 @@ class spell_ooze_zap_channel_end : public SpellScriptLoader GetHitUnit()->Kill(GetHitUnit()); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_ooze_zap_channel_end_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_ooze_zap_channel_end_SpellScript(); } @@ -695,7 +695,7 @@ class spell_energize_aoe : public SpellScriptLoader { PrepareSpellScript(spell_energize_aoe_SpellScript); - bool Validate(SpellInfo const* /*spellEntry*/) + bool Validate(SpellInfo const* /*spellEntry*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_ENERGIZED)) return false; @@ -720,7 +720,7 @@ class spell_energize_aoe : public SpellScriptLoader GetCaster()->CastSpell(GetCaster(), uint32(GetEffectValue()), true); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_energize_aoe_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_energize_aoe_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); @@ -728,7 +728,7 @@ class spell_energize_aoe : public SpellScriptLoader } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_energize_aoe_SpellScript(); } @@ -749,7 +749,7 @@ class go_blackhoof_cage : public GameObjectScript public: go_blackhoof_cage() : GameObjectScript("go_blackhoof_cage") { } - bool OnGossipHello(Player* player, GameObject* go) + bool OnGossipHello(Player* player, GameObject* go) OVERRIDE { go->UseDoorOrButton(); if (Creature* prisoner = go->FindNearestCreature(NPC_THERAMORE_PRISONER, 1.0f)) diff --git a/src/server/scripts/Kalimdor/zone_felwood.cpp b/src/server/scripts/Kalimdor/zone_felwood.cpp index 35c19ff17ba..45ef955ccbb 100644 --- a/src/server/scripts/Kalimdor/zone_felwood.cpp +++ b/src/server/scripts/Kalimdor/zone_felwood.cpp @@ -54,7 +54,7 @@ class npcs_riverbreeze_and_silversky : public CreatureScript public: npcs_riverbreeze_and_silversky() : CreatureScript("npcs_riverbreeze_and_silversky") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE { player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_ACTION_INFO_DEF+1) @@ -65,7 +65,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); diff --git a/src/server/scripts/Kalimdor/zone_feralas.cpp b/src/server/scripts/Kalimdor/zone_feralas.cpp index 0b0130d3008..3402722e2d7 100644 --- a/src/server/scripts/Kalimdor/zone_feralas.cpp +++ b/src/server/scripts/Kalimdor/zone_feralas.cpp @@ -42,7 +42,7 @@ class npc_gregan_brewspewer : public CreatureScript public: npc_gregan_brewspewer() : CreatureScript("npc_gregan_brewspewer") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE { player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_ACTION_INFO_DEF+1) @@ -55,7 +55,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -97,7 +97,7 @@ class npc_oox22fe : public CreatureScript public: npc_oox22fe() : CreatureScript("npc_oox22fe") { } - bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) + bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) OVERRIDE { if (quest->GetQuestId() == QUEST_RESCUE_OOX22FE) { @@ -118,7 +118,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_oox22feAI(creature); } @@ -127,7 +127,7 @@ public: { npc_oox22feAI(Creature* creature) : npc_escortAI(creature) { } - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { switch (waypointId) { @@ -162,20 +162,20 @@ public: } } - void Reset() + void Reset() OVERRIDE { if (!HasEscortState(STATE_ESCORT_ESCORTING)) me->SetStandState(UNIT_STAND_STATE_DEAD); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { //For an small probability the npc says something when he get aggro if (urand(0, 9) > 7) Talk(SAY_OOX_AGGRO); } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { summoned->AI()->AttackStart(me); } @@ -192,7 +192,7 @@ class npc_screecher_spirit : public CreatureScript public: npc_screecher_spirit() : CreatureScript("npc_screecher_spirit") { } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { player->SEND_GOSSIP_MENU(2039, creature->GetGUID()); player->TalkedToCreature(creature->GetEntry(), creature->GetGUID()); @@ -227,13 +227,13 @@ class spell_gordunni_trap : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnCast += SpellCastFn(spell_gordunni_trap_SpellScript::HandleDummy); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_gordunni_trap_SpellScript(); } diff --git a/src/server/scripts/Kalimdor/zone_moonglade.cpp b/src/server/scripts/Kalimdor/zone_moonglade.cpp index 5e6a0ca1ffa..2b9e89bfbf3 100644 --- a/src/server/scripts/Kalimdor/zone_moonglade.cpp +++ b/src/server/scripts/Kalimdor/zone_moonglade.cpp @@ -62,7 +62,7 @@ class npc_bunthen_plainswind : public CreatureScript public: npc_bunthen_plainswind() : CreatureScript("npc_bunthen_plainswind") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE { player->PlayerTalkClass->ClearMenus(); switch (action) @@ -82,7 +82,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (player->getClass() != CLASS_DRUID) player->SEND_GOSSIP_MENU(4916, creature->GetGUID()); @@ -121,7 +121,7 @@ class npc_great_bear_spirit : public CreatureScript public: npc_great_bear_spirit() : CreatureScript("npc_great_bear_spirit") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE { player->PlayerTalkClass->ClearMenus(); switch (action) @@ -149,7 +149,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { //ally or horde quest if (player->GetQuestStatus(5929) == QUEST_STATUS_INCOMPLETE || player->GetQuestStatus(5930) == QUEST_STATUS_INCOMPLETE) @@ -177,7 +177,7 @@ class npc_silva_filnaveth : public CreatureScript public: npc_silva_filnaveth() : CreatureScript("npc_silva_filnaveth") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE { player->PlayerTalkClass->ClearMenus(); switch (action) @@ -197,7 +197,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (player->getClass() != CLASS_DRUID) player->SEND_GOSSIP_MENU(4913, creature->GetGUID()); @@ -288,7 +288,7 @@ class npc_clintar_spirit : public CreatureScript public: npc_clintar_spirit() : CreatureScript("npc_clintar_spirit") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_clintar_spiritAI (creature); } @@ -310,7 +310,7 @@ public: bool EventOnWait; - void Reset() + void Reset() OVERRIDE { if (!PlayerGUID) { @@ -323,7 +323,7 @@ public: } } - void IsSummonedBy(Unit* /*summoner*/) + void IsSummonedBy(Unit* /*summoner*/) OVERRIDE { std::list<Player*> playerOnQuestList; Trinity::AnyPlayerInObjectRangeCheck checker(me, 5.0f); @@ -345,7 +345,7 @@ public: } } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (!PlayerGUID) return; @@ -359,7 +359,7 @@ public: } } - void EnterEvadeMode() + void EnterEvadeMode() OVERRIDE { Player* player = Unit::GetPlayer(*me, PlayerGUID); if (player && player->IsInCombat() && player->getAttackerForHelper()) @@ -384,7 +384,7 @@ public: return; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { npc_escortAI::UpdateAI(diff); @@ -547,7 +547,7 @@ public: } else if (EventOnWait) EventTimer -= diff; } - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { CurrWP = waypointId; EventTimer = 0; @@ -594,7 +594,7 @@ public: EventMap events; - void MovementInform(uint32 type, uint32 pointId) + void MovementInform(uint32 type, uint32 pointId) OVERRIDE { if (type != POINT_MOTION_TYPE) return; @@ -608,19 +608,19 @@ public: } } - void EnterCombat(Unit* /*attacker*/) + void EnterCombat(Unit* /*attacker*/) OVERRIDE { events.Reset(); events.ScheduleEvent(EVENT_CAST_CLEAVE, urand(3000, 5000)); events.ScheduleEvent(EVENT_CAST_STARFALL, urand(8000, 10000)); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { DoCast(SPELL_OMEN_SUMMON_SPOTLIGHT); } - void SpellHit(Unit* /*caster*/, const SpellInfo* spell) + void SpellHit(Unit* /*caster*/, const SpellInfo* spell) OVERRIDE { if (spell->Id == SPELL_ELUNE_CANDLE) { @@ -631,7 +631,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -655,7 +655,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_omenAI(creature); } @@ -672,13 +672,13 @@ public: EventMap events; - void Reset() + void Reset() OVERRIDE { events.Reset(); events.ScheduleEvent(EVENT_DESPAWN, 5*MINUTE*IN_MILLISECONDS); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { events.Update(diff); @@ -698,7 +698,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_giant_spotlightAI(creature); } diff --git a/src/server/scripts/Kalimdor/zone_mulgore.cpp b/src/server/scripts/Kalimdor/zone_mulgore.cpp index 0a068e4288e..435238cbc0d 100644 --- a/src/server/scripts/Kalimdor/zone_mulgore.cpp +++ b/src/server/scripts/Kalimdor/zone_mulgore.cpp @@ -46,7 +46,7 @@ class npc_skorn_whitecloud : public CreatureScript public: npc_skorn_whitecloud() : CreatureScript("npc_skorn_whitecloud") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE { player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_ACTION_INFO_DEF) @@ -55,7 +55,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -91,7 +91,7 @@ class npc_kyle_frenzied : public CreatureScript public: npc_kyle_frenzied() : CreatureScript("npc_kyle_frenzied") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_kyle_frenziedAI (creature); } @@ -106,7 +106,7 @@ public: uint32 EventTimer; uint8 EventPhase; - void Reset() + void Reset() OVERRIDE { EventActive = false; IsMovingToLunch = false; @@ -118,7 +118,7 @@ public: me->UpdateEntry(NPC_KYLE_FRENZIED); } - void SpellHit(Unit* Caster, SpellInfo const* Spell) + void SpellHit(Unit* Caster, SpellInfo const* Spell) OVERRIDE { if (!me->GetVictim() && !EventActive && Spell->Id == SPELL_LUNCH) { @@ -138,7 +138,7 @@ public: } } - void MovementInform(uint32 Type, uint32 PointId) + void MovementInform(uint32 Type, uint32 PointId) OVERRIDE { if (Type != POINT_MOTION_TYPE || !EventActive) return; @@ -147,7 +147,7 @@ public: IsMovingToLunch = false; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (EventActive) { @@ -264,7 +264,7 @@ class npc_plains_vision : public CreatureScript public: npc_plains_vision() : CreatureScript("npc_plains_vision") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_plains_visionAI (creature); } @@ -277,16 +277,16 @@ public: uint8 WayPointId; uint8 amountWP; - void Reset() + void Reset() OVERRIDE { WayPointId = 0; newWaypoint = true; amountWP = 49; } - void EnterCombat(Unit* /*who*/){} + void EnterCombat(Unit* /*who*/)OVERRIDE {} - void MovementInform(uint32 type, uint32 id) + void MovementInform(uint32 type, uint32 id) OVERRIDE { if (type != POINT_MOTION_TYPE) return; @@ -303,7 +303,7 @@ public: } } - void UpdateAI(uint32 /*diff*/) + void UpdateAI(uint32 /*diff*/) OVERRIDE { if (newWaypoint) { diff --git a/src/server/scripts/Kalimdor/zone_orgrimmar.cpp b/src/server/scripts/Kalimdor/zone_orgrimmar.cpp index a497bc82abc..9f824f0f1f0 100644 --- a/src/server/scripts/Kalimdor/zone_orgrimmar.cpp +++ b/src/server/scripts/Kalimdor/zone_orgrimmar.cpp @@ -47,7 +47,7 @@ class npc_shenthul : public CreatureScript public: npc_shenthul() : CreatureScript("npc_shenthul") { } - bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE { if (quest->GetQuestId() == QUEST_SHATTERED_SALUTE) { @@ -57,7 +57,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_shenthulAI (creature); } @@ -72,7 +72,7 @@ public: uint32 ResetTimer; uint64 PlayerGUID; - void Reset() + void Reset() OVERRIDE { CanTalk = false; CanEmote = false; @@ -81,9 +81,9 @@ public: PlayerGUID = 0; } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (CanEmote) { @@ -114,7 +114,7 @@ public: DoMeleeAttackIfReady(); } - void ReceiveEmote(Player* player, uint32 emote) + void ReceiveEmote(Player* player, uint32 emote) OVERRIDE { if (emote == TEXT_EMOTE_SALUTE && player->GetQuestStatus(QUEST_SHATTERED_SALUTE) == QUEST_STATUS_INCOMPLETE) { @@ -155,7 +155,7 @@ class npc_thrall_warchief : public CreatureScript public: npc_thrall_warchief() : CreatureScript("npc_thrall_warchief") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE { player->PlayerTalkClass->ClearMenus(); switch (action) @@ -192,7 +192,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -204,7 +204,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_thrall_warchiefAI (creature); } @@ -216,15 +216,15 @@ public: uint32 ChainLightningTimer; uint32 ShockTimer; - void Reset() + void Reset() OVERRIDE { ChainLightningTimer = 2000; ShockTimer = 8000; } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Kalimdor/zone_silithus.cpp b/src/server/scripts/Kalimdor/zone_silithus.cpp index c6d92c1dcac..f20266dfb55 100644 --- a/src/server/scripts/Kalimdor/zone_silithus.cpp +++ b/src/server/scripts/Kalimdor/zone_silithus.cpp @@ -52,7 +52,7 @@ class npc_highlord_demitrian : public CreatureScript public: npc_highlord_demitrian() : CreatureScript("npc_highlord_demitrian") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE { player->PlayerTalkClass->ClearMenus(); switch (action) @@ -93,7 +93,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -139,7 +139,7 @@ class npcs_rutgar_and_frankal : public CreatureScript public: npcs_rutgar_and_frankal() : CreatureScript("npcs_rutgar_and_frankal") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE { player->PlayerTalkClass->ClearMenus(); switch (action) @@ -203,7 +203,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -489,7 +489,7 @@ class npc_anachronos_the_ancient : public CreatureScript public: npc_anachronos_the_ancient() : CreatureScript("npc_anachronos_the_ancient") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_anachronos_the_ancientAI(creature); } @@ -509,7 +509,7 @@ public: uint64 PlayerGUID; bool eventEnd; - void Reset() + void Reset() OVERRIDE { AnimationTimer = 1500; AnimationCount = 0; @@ -791,7 +791,7 @@ public: } ++AnimationCount; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (AnimationTimer) { @@ -817,7 +817,7 @@ class npc_qiraj_war_spawn : public CreatureScript public: npc_qiraj_war_spawn() : CreatureScript("npc_qiraj_war_spawn") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_qiraj_war_spawnAI(creature); } @@ -832,7 +832,7 @@ public: bool Timers; bool hasTarget; - void Reset() + void Reset() OVERRIDE { MobGUID = 0; PlayerGUID = 0; @@ -840,10 +840,10 @@ public: hasTarget = false; } - void EnterCombat(Unit* /*who*/) {} - void JustDied(Unit* /*slayer*/); + void EnterCombat(Unit* /*who*/) OVERRIDE {} + void JustDied(Unit* /*slayer*/) OVERRIDE; - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!Timers) { @@ -930,7 +930,7 @@ class npc_anachronos_quest_trigger : public CreatureScript public: npc_anachronos_quest_trigger() : CreatureScript("npc_anachronos_quest_trigger") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_anachronos_quest_triggerAI(creature); } @@ -951,7 +951,7 @@ public: bool Announced; bool Failed; - void Reset() + void Reset() OVERRIDE { PlayerGUID = 0; @@ -1045,7 +1045,7 @@ public: Announced = false; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!PlayerGUID || !EventStarted) return; @@ -1092,7 +1092,7 @@ class go_crystalline_tear : public GameObjectScript public: go_crystalline_tear() : GameObjectScript("go_crystalline_tear") { } - bool OnQuestAccept(Player* player, GameObject* go, Quest const* quest) + bool OnQuestAccept(Player* player, GameObject* go, Quest const* quest) OVERRIDE { if (quest->GetQuestId() == QUEST_A_PAWN_ON_THE_ETERNAL_BOARD) { @@ -1363,7 +1363,7 @@ class go_wind_stone : public GameObjectScript } public: - bool OnGossipHello(Player* player, GameObject* go) + bool OnGossipHello(Player* player, GameObject* go) OVERRIDE { uint8 rank = GetPlayerRank(player); @@ -1441,7 +1441,7 @@ class go_wind_stone : public GameObjectScript return true; } - bool OnGossipSelect(Player* player, GameObject* go, uint32 /*sender*/, uint32 action) + bool OnGossipSelect(Player* player, GameObject* go, uint32 /*sender*/, uint32 action) OVERRIDE { player->PlayerTalkClass->ClearMenus(); player->PlayerTalkClass->SendCloseGossip(); diff --git a/src/server/scripts/Kalimdor/zone_stonetalon_mountains.cpp b/src/server/scripts/Kalimdor/zone_stonetalon_mountains.cpp index bb24a4a6286..058cd19e3b4 100644 --- a/src/server/scripts/Kalimdor/zone_stonetalon_mountains.cpp +++ b/src/server/scripts/Kalimdor/zone_stonetalon_mountains.cpp @@ -49,7 +49,7 @@ class npc_braug_dimspirit : public CreatureScript public: npc_braug_dimspirit() : CreatureScript("npc_braug_dimspirit") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE { player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_ACTION_INFO_DEF+1) @@ -66,7 +66,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -117,7 +117,7 @@ public: { npc_kaya_flathoofAI(Creature* creature) : npc_escortAI(creature) {} - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { Player* player = GetPlayerForEscort(); if (!player) @@ -139,15 +139,15 @@ public: } } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { summoned->AI()->AttackStart(me); } - void Reset(){} + void Reset()OVERRIDE {} }; - bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE { if (quest->GetQuestId() == QUEST_PROTECT_KAYA) { @@ -161,7 +161,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_kaya_flathoofAI(creature); } diff --git a/src/server/scripts/Kalimdor/zone_tanaris.cpp b/src/server/scripts/Kalimdor/zone_tanaris.cpp index 06401766861..7bb499e0fd4 100644 --- a/src/server/scripts/Kalimdor/zone_tanaris.cpp +++ b/src/server/scripts/Kalimdor/zone_tanaris.cpp @@ -58,7 +58,7 @@ class npc_aquementas : public CreatureScript public: npc_aquementas() : CreatureScript("npc_aquementas") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_aquementasAI (creature); } @@ -74,7 +74,7 @@ public: uint32 FrostShockTimer; uint32 AquaJetTimer; - void Reset() + void Reset() OVERRIDE { SendItemTimer = 0; SwitchFactionTimer = 10000; @@ -101,12 +101,12 @@ public: } } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { Talk(AGGRO_YELL_AQUE, who->GetGUID()); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (isFriendly) { @@ -175,7 +175,7 @@ class npc_custodian_of_time : public CreatureScript public: npc_custodian_of_time() : CreatureScript("npc_custodian_of_time") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_custodian_of_timeAI(creature); } @@ -184,7 +184,7 @@ public: { npc_custodian_of_timeAI(Creature* creature) : npc_escortAI(creature) {} - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { if (Player* player = GetPlayerForEscort()) { @@ -251,7 +251,8 @@ public: } } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (HasEscortState(STATE_ESCORT_ESCORTING)) return; @@ -269,10 +270,10 @@ public: } } - void EnterCombat(Unit* /*who*/) {} - void Reset() {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} + void Reset() OVERRIDE {} - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { npc_escortAI::UpdateAI(diff); } @@ -289,7 +290,7 @@ class npc_marin_noggenfogger : public CreatureScript public: npc_marin_noggenfogger() : CreatureScript("npc_marin_noggenfogger") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE { player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_ACTION_TRADE) @@ -298,7 +299,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -324,7 +325,7 @@ class npc_steward_of_time : public CreatureScript public: npc_steward_of_time() : CreatureScript("npc_steward_of_time") { } - bool OnQuestAccept(Player* player, Creature* /*creature*/, Quest const* quest) + bool OnQuestAccept(Player* player, Creature* /*creature*/, Quest const* quest) OVERRIDE { if (quest->GetQuestId() == 10279) //Quest: To The Master's Lair player->CastSpell(player, 34891, true); //(Flight through Caverns) @@ -332,7 +333,7 @@ public: return false; } - bool OnGossipSelect(Player* player, Creature* /*creature*/, uint32 /*sender*/, uint32 action) + bool OnGossipSelect(Player* player, Creature* /*creature*/, uint32 /*sender*/, uint32 action) OVERRIDE { player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_ACTION_INFO_DEF + 1) @@ -341,7 +342,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -375,7 +376,7 @@ class npc_stone_watcher_of_norgannon : public CreatureScript public: npc_stone_watcher_of_norgannon() : CreatureScript("npc_stone_watcher_of_norgannon") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE { player->PlayerTalkClass->ClearMenus(); switch (action) @@ -408,7 +409,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -446,7 +447,7 @@ class npc_OOX17 : public CreatureScript public: npc_OOX17() : CreatureScript("npc_OOX17") { } - bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE { if (quest->GetQuestId() == Q_OOX17) { @@ -462,7 +463,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_OOX17AI(creature); } @@ -471,7 +472,7 @@ public: { npc_OOX17AI(Creature* creature) : npc_escortAI(creature) {} - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { if (Player* player = GetPlayerForEscort()) { @@ -499,14 +500,14 @@ public: } } - void Reset(){} + void Reset()OVERRIDE {} - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_OOX_AGGRO); } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { summoned->AI()->AttackStart(me); } @@ -541,7 +542,7 @@ class npc_tooga : public CreatureScript public: npc_tooga() : CreatureScript("npc_tooga") { } - bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) + bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) OVERRIDE { if (quest->GetQuestId() == QUEST_TOOGA) { @@ -552,7 +553,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_toogaAI(creature); } @@ -567,7 +568,7 @@ public: uint64 TortaGUID; - void Reset() + void Reset() OVERRIDE { CheckSpeechTimer = 2500; PostEventTimer = 1000; @@ -576,7 +577,8 @@ public: TortaGUID = 0; } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { FollowerAI::MoveInLineOfSight(who); @@ -594,7 +596,7 @@ public: } } - void MovementInform(uint32 MotionType, uint32 PointId) + void MovementInform(uint32 MotionType, uint32 PointId) OVERRIDE { FollowerAI::MovementInform(MotionType, PointId); @@ -605,7 +607,7 @@ public: SetFollowComplete(); } - void UpdateFollowerAI(uint32 Diff) + void UpdateFollowerAI(uint32 Diff) OVERRIDE { if (!UpdateVictim()) { diff --git a/src/server/scripts/Kalimdor/zone_teldrassil.cpp b/src/server/scripts/Kalimdor/zone_teldrassil.cpp index 43fb5bf1de8..8cf08953fc2 100644 --- a/src/server/scripts/Kalimdor/zone_teldrassil.cpp +++ b/src/server/scripts/Kalimdor/zone_teldrassil.cpp @@ -50,7 +50,7 @@ class npc_mist : public CreatureScript public: npc_mist() : CreatureScript("npc_mist") { } - bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE { if (quest->GetQuestId() == QUEST_MIST) if (npc_mistAI* pMistAI = CAST_AI(npc_mist::npc_mistAI, creature->AI())) @@ -59,7 +59,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_mistAI(creature); } @@ -68,9 +68,10 @@ public: { npc_mistAI(Creature* creature) : FollowerAI(creature) { } - void Reset() { } + void Reset() OVERRIDE {} + + void MoveInLineOfSight(Unit* who) OVERRIDE - void MoveInLineOfSight(Unit* who) { FollowerAI::MoveInLineOfSight(who); @@ -97,7 +98,7 @@ public: } //call not needed here, no known abilities - /*void UpdateFollowerAI(const uint32 Diff) + /*void UpdateFollowerAI(const uint32 Diff) OVERRIDE { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Kalimdor/zone_the_barrens.cpp b/src/server/scripts/Kalimdor/zone_the_barrens.cpp index 80cb81aaaec..13b254ac0b2 100644 --- a/src/server/scripts/Kalimdor/zone_the_barrens.cpp +++ b/src/server/scripts/Kalimdor/zone_the_barrens.cpp @@ -55,7 +55,7 @@ class npc_beaten_corpse : public CreatureScript public: npc_beaten_corpse() : CreatureScript("npc_beaten_corpse") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE { player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_ACTION_INFO_DEF +1) @@ -66,7 +66,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (player->GetQuestStatus(QUEST_LOST_IN_BATTLE) == QUEST_STATUS_INCOMPLETE || player->GetQuestStatus(QUEST_LOST_IN_BATTLE) == QUEST_STATUS_COMPLETE) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_CORPSE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); @@ -102,7 +102,7 @@ class npc_gilthares : public CreatureScript public: npc_gilthares() : CreatureScript("npc_gilthares") { } - bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) + bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) OVERRIDE { if (quest->GetQuestId() == QUEST_FREE_FROM_HOLD) { @@ -117,7 +117,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_giltharesAI(creature); } @@ -126,9 +126,9 @@ public: { npc_giltharesAI(Creature* creature) : npc_escortAI(creature) { } - void Reset() { } + void Reset() OVERRIDE {} - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { Player* player = GetPlayerForEscort(); if (!player) @@ -158,7 +158,7 @@ public: } } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { //not always use if (rand()%4) @@ -186,7 +186,7 @@ class npc_sputtervalve : public CreatureScript public: npc_sputtervalve() : CreatureScript("npc_sputtervalve") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE { player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_ACTION_INFO_DEF) @@ -197,7 +197,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -227,7 +227,7 @@ class npc_taskmaster_fizzule : public CreatureScript public: npc_taskmaster_fizzule() : CreatureScript("npc_taskmaster_fizzule") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_taskmaster_fizzuleAI(creature); } @@ -244,7 +244,7 @@ public: uint32 ResetTimer; uint8 FlareCount; - void Reset() + void Reset() OVERRIDE { IsFriend = false; ResetTimer = 120000; @@ -265,7 +265,7 @@ public: me->HandleEmoteCommand(EMOTE_ONESHOT_SALUTE); } - void SpellHit(Unit* /*caster*/, const SpellInfo* spell) + void SpellHit(Unit* /*caster*/, const SpellInfo* spell) OVERRIDE { if (spell->Id == SPELL_FLARE || spell->Id == SPELL_FOLLY) { @@ -276,9 +276,9 @@ public: } } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (IsFriend) { @@ -295,7 +295,7 @@ public: DoMeleeAttackIfReady(); } - void ReceiveEmote(Player* /*player*/, uint32 emote) + void ReceiveEmote(Player* /*player*/, uint32 emote) OVERRIDE { if (emote == TEXT_EMOTE_SALUTE) { @@ -343,7 +343,7 @@ class npc_twiggy_flathead : public CreatureScript public: npc_twiggy_flathead() : CreatureScript("npc_twiggy_flathead") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_twiggy_flatheadAI (creature); } @@ -363,7 +363,7 @@ public: uint64 AffrayChallenger[6]; uint64 BigWill; - void Reset() + void Reset() OVERRIDE { EventInProgress = false; EventGrate = false; @@ -381,9 +381,10 @@ public: BigWill = 0; } - void EnterCombat(Unit* /*who*/) { } + void EnterCombat(Unit* /*who*/) OVERRIDE {} + + void MoveInLineOfSight(Unit* who) OVERRIDE - void MoveInLineOfSight(Unit* who) { if (!who || !who->IsAlive() || EventInProgress) return; @@ -397,9 +398,9 @@ public: } } - void KilledUnit(Unit* /*victim*/) { } + void KilledUnit(Unit* /*victim*/) OVERRIDE {} - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (EventInProgress) { Player* pWarrior = NULL; @@ -562,7 +563,7 @@ public: uint32 PostEventTimer; uint32 PostEventCount; - void Reset() + void Reset() OVERRIDE { if (!HasEscortState(STATE_ESCORT_ESCORTING)) { @@ -575,7 +576,7 @@ public: } } - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { switch (waypointId) { @@ -598,7 +599,7 @@ public: } } - void WaypointStart(uint32 PointId) + void WaypointStart(uint32 PointId) OVERRIDE { Player* player = GetPlayerForEscort(); @@ -617,7 +618,7 @@ public: } } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { if (summoned->GetEntry() == NPC_PILOT_WIZZ) me->SetStandState(UNIT_STAND_STATE_DEAD); @@ -626,7 +627,7 @@ public: summoned->AI()->AttackStart(me); } - void UpdateEscortAI(const uint32 Diff) + void UpdateEscortAI(const uint32 Diff) OVERRIDE { if (!UpdateVictim()) { @@ -668,7 +669,7 @@ public: } }; - bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE { if (quest->GetQuestId() == QUEST_ESCAPE) { @@ -679,7 +680,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_wizzlecrank_shredderAI(creature); } diff --git a/src/server/scripts/Kalimdor/zone_thousand_needles.cpp b/src/server/scripts/Kalimdor/zone_thousand_needles.cpp index b4ed931ced4..9afa825972f 100644 --- a/src/server/scripts/Kalimdor/zone_thousand_needles.cpp +++ b/src/server/scripts/Kalimdor/zone_thousand_needles.cpp @@ -57,7 +57,7 @@ class npc_kanati : public CreatureScript public: npc_kanati() : CreatureScript("npc_kanati") { } - bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) + bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) OVERRIDE { if (quest->GetQuestId() == QUEST_PROTECT_KANATI) if (npc_kanatiAI* pEscortAI = CAST_AI(npc_kanati::npc_kanatiAI, creature->AI())) @@ -66,7 +66,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_kanatiAI(creature); } @@ -75,9 +75,9 @@ public: { npc_kanatiAI(Creature* creature) : npc_escortAI(creature) { } - void Reset() {} + void Reset() OVERRIDE {} - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { switch (waypointId) { @@ -98,7 +98,7 @@ public: me->SummonCreature(NPC_GALAK_ASS, GalakLoc, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { summoned->AI()->AttackStart(me); } @@ -142,7 +142,7 @@ class npc_lakota_windsong : public CreatureScript public: npc_lakota_windsong() : CreatureScript("npc_lakota_windsong") { } - bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) + bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) OVERRIDE { if (quest->GetQuestId() == QUEST_FREE_AT_LAST) { @@ -155,7 +155,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_lakota_windsongAI(creature); } @@ -164,9 +164,9 @@ public: { npc_lakota_windsongAI(Creature* creature) : npc_escortAI(creature) { } - void Reset() {} + void Reset() OVERRIDE {} - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { switch (waypointId) { @@ -225,7 +225,7 @@ class npc_paoka_swiftmountain : public CreatureScript public: npc_paoka_swiftmountain() : CreatureScript("npc_paoka_swiftmountain") { } - bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) + bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) OVERRIDE { if (quest->GetQuestId() == QUEST_HOMEWARD) { @@ -238,7 +238,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_paoka_swiftmountainAI(creature); } @@ -247,9 +247,9 @@ public: { npc_paoka_swiftmountainAI(Creature* creature) : npc_escortAI(creature) { } - void Reset() {} + void Reset() OVERRIDE {} - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { switch (waypointId) { @@ -294,7 +294,7 @@ class npc_plucky : public CreatureScript public: npc_plucky() : CreatureScript("npc_plucky") { } - bool OnGossipSelect(Player* player, Creature* /*creature*/, uint32 /*sender*/, uint32 action) + bool OnGossipSelect(Player* player, Creature* /*creature*/, uint32 /*sender*/, uint32 action) OVERRIDE { player->PlayerTalkClass->ClearMenus(); switch (action) @@ -307,7 +307,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (player->GetQuestStatus(QUEST_SCOOP) == QUEST_STATUS_INCOMPLETE) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_P, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); @@ -317,7 +317,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_pluckyAI(creature); } @@ -329,7 +329,7 @@ public: uint32 NormFaction; uint32 ResetTimer; - void Reset() + void Reset() OVERRIDE { ResetTimer = 120000; @@ -342,7 +342,7 @@ public: DoCast(me, SPELL_PLUCKY_CHICKEN, false); } - void ReceiveEmote(Player* player, uint32 TextEmote) + void ReceiveEmote(Player* player, uint32 TextEmote) OVERRIDE { if (player->GetQuestStatus(QUEST_SCOOP) == QUEST_STATUS_INCOMPLETE) { @@ -368,7 +368,7 @@ public: } } - void UpdateAI(uint32 Diff) + void UpdateAI(uint32 Diff) OVERRIDE { if (me->HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP)) { @@ -404,7 +404,7 @@ class go_panther_cage : public GameObjectScript public: go_panther_cage() : GameObjectScript("go_panther_cage") { } - bool OnGossipHello(Player* player, GameObject* go) + bool OnGossipHello(Player* player, GameObject* go) OVERRIDE { go->UseDoorOrButton(); if (player->GetQuestStatus(5151) == QUEST_STATUS_INCOMPLETE) @@ -426,7 +426,7 @@ class npc_enraged_panther : public CreatureScript public: npc_enraged_panther() : CreatureScript("npc_enraged_panther") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_enraged_pantherAI(creature); } @@ -435,13 +435,13 @@ public: { npc_enraged_pantherAI(Creature* creature) : ScriptedAI(creature) {} - void Reset() + void Reset() OVERRIDE { me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); me->SetReactState(REACT_PASSIVE); } - void UpdateAI(uint32 /*diff*/) + void UpdateAI(uint32 /*diff*/) OVERRIDE { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Kalimdor/zone_thunder_bluff.cpp b/src/server/scripts/Kalimdor/zone_thunder_bluff.cpp index f7dd842070e..01dd65755f6 100644 --- a/src/server/scripts/Kalimdor/zone_thunder_bluff.cpp +++ b/src/server/scripts/Kalimdor/zone_thunder_bluff.cpp @@ -48,7 +48,7 @@ class npc_cairne_bloodhoof : public CreatureScript public: npc_cairne_bloodhoof() : CreatureScript("npc_cairne_bloodhoof") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE { player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_SENDER_INFO) @@ -59,7 +59,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -72,7 +72,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_cairne_bloodhoofAI (creature); } @@ -87,7 +87,7 @@ public: uint32 ThunderclapTimer; uint32 UppercutTimer; - void Reset() + void Reset() OVERRIDE { BerserkerChargeTimer = 30000; CleaveTimer = 5000; @@ -96,9 +96,9 @@ public: UppercutTimer = 10000; } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Kalimdor/zone_ungoro_crater.cpp b/src/server/scripts/Kalimdor/zone_ungoro_crater.cpp index 221eed14afe..3dc77e0cf04 100644 --- a/src/server/scripts/Kalimdor/zone_ungoro_crater.cpp +++ b/src/server/scripts/Kalimdor/zone_ungoro_crater.cpp @@ -57,7 +57,7 @@ class npc_ame : public CreatureScript public: npc_ame() : CreatureScript("npc_ame") { } - bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE { if (quest->GetQuestId() == QUEST_CHASING_AME) { @@ -70,7 +70,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_ameAI(creature); } @@ -81,7 +81,7 @@ public: uint32 DemoralizingShoutTimer; - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { if (Player* player = GetPlayerForEscort()) { @@ -110,23 +110,23 @@ public: } } - void Reset() + void Reset() OVERRIDE { DemoralizingShoutTimer = 5000; } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { summoned->AI()->AttackStart(me); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (Player* player = GetPlayerForEscort()) player->FailQuest(QUEST_CHASING_AME); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { npc_escortAI::UpdateAI(diff); if (!UpdateVictim()) @@ -173,7 +173,7 @@ class npc_ringo : public CreatureScript public: npc_ringo() : CreatureScript("npc_ringo") { } - bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) + bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) OVERRIDE { if (quest->GetQuestId() == QUEST_A_LITTLE_HELP) { @@ -187,7 +187,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_ringoAI(creature); } @@ -202,7 +202,7 @@ public: uint64 SpraggleGUID; - void Reset() + void Reset() OVERRIDE { FaintTimer = urand(30000, 60000); EndEventProgress = 0; @@ -210,7 +210,8 @@ public: SpraggleGUID = 0; } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { FollowerAI::MoveInLineOfSight(who); @@ -230,7 +231,7 @@ public: } } - void SpellHit(Unit* /*pCaster*/, const SpellInfo* pSpell) + void SpellHit(Unit* /*pCaster*/, const SpellInfo* pSpell) OVERRIDE { if (HasFollowState(STATE_FOLLOW_INPROGRESS | STATE_FOLLOW_PAUSED) && pSpell->Id == SPELL_REVIVE_RINGO) ClearFaint(); @@ -261,7 +262,7 @@ public: SetFollowPaused(false); } - void UpdateFollowerAI(uint32 Diff) + void UpdateFollowerAI(uint32 Diff) OVERRIDE { if (!UpdateVictim()) { diff --git a/src/server/scripts/Kalimdor/zone_winterspring.cpp b/src/server/scripts/Kalimdor/zone_winterspring.cpp index fe39f1d3abc..e517afe6b46 100644 --- a/src/server/scripts/Kalimdor/zone_winterspring.cpp +++ b/src/server/scripts/Kalimdor/zone_winterspring.cpp @@ -45,7 +45,7 @@ class npc_rivern_frostwind : public CreatureScript public: npc_rivern_frostwind() : CreatureScript("npc_rivern_frostwind") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE { player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_ACTION_TRADE) @@ -54,7 +54,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -294,7 +294,7 @@ class npc_ranshalla : public CreatureScript { public: npc_ranshalla() : CreatureScript("npc_ranshalla") { } - bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE { if (quest->GetQuestId() == QUEST_GUARDIANS_ALTAR) { @@ -309,7 +309,7 @@ public: return false; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_ranshallaAI(creature); } @@ -330,7 +330,7 @@ public: uint64 _voiceEluneGUID; uint64 _altarGUID; - void Reset() + void Reset() OVERRIDE { _delayTimer = 0; } @@ -396,7 +396,7 @@ public: StartNextDialogueText(SAY_PRIESTESS_ALTAR_3); } - void WaypointReached(uint32 pointId) + void WaypointReached(uint32 pointId) OVERRIDE { switch (pointId) { @@ -565,7 +565,7 @@ public: } - void UpdateEscortAI(const uint32 diff) + void UpdateEscortAI(const uint32 diff) OVERRIDE { DialogueUpdate(diff); @@ -598,7 +598,7 @@ class go_elune_fire : public GameObjectScript { public: go_elune_fire() : GameObjectScript("go_elune_fire") { } - bool OnGossipHello(Player* /*player*/, GameObject* go) + bool OnGossipHello(Player* /*player*/, GameObject* go) OVERRIDE { // Check if we are using the torches or the altar bool isAltar = false; |