diff options
| author | Kitzunu <24550914+Kitzunu@users.noreply.github.com> | 2021-01-10 14:27:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-10 14:27:55 +0100 |
| commit | da4edd547d03b5a406a54c5f05649d2faec8339a (patch) | |
| tree | 5f5969e24f6ea059ce209a04702c306397c0b0b5 /src/server/scripts | |
| parent | 7cf097eab2fc1425638557903f06a8922ee74ec1 (diff) | |
chore(core): remove malformed whitespaces (#4244)
* from https://www.codefactor.io/repository/github/azerothcore/azerothcore-wotlk/issues?category=Style&groupId=838&lang=5&page=75
Diffstat (limited to 'src/server/scripts')
199 files changed, 2 insertions, 399 deletions
diff --git a/src/server/scripts/Commands/cs_character.cpp b/src/server/scripts/Commands/cs_character.cpp index d762578c65..ca7de48032 100644 --- a/src/server/scripts/Commands/cs_character.cpp +++ b/src/server/scripts/Commands/cs_character.cpp @@ -221,7 +221,6 @@ public: stmt->setUInt32(0, delInfo.lowGuid); if (PreparedQueryResult result = CharacterDatabase.Query(stmt)) sWorld->AddGlobalPlayerData(delInfo.lowGuid, delInfo.accountId, delInfo.name, (*result)[2].GetUInt8(), (*result)[0].GetUInt8(), (*result)[1].GetUInt8(), (*result)[3].GetUInt8(), 0, 0); - } static void HandleCharacterLevel(Player* player, uint64 playerGuid, uint32 oldLevel, uint32 newLevel, ChatHandler* handler) diff --git a/src/server/scripts/Commands/cs_cheat.cpp b/src/server/scripts/Commands/cs_cheat.cpp index c4490c8444..6590391245 100644 --- a/src/server/scripts/Commands/cs_cheat.cpp +++ b/src/server/scripts/Commands/cs_cheat.cpp @@ -14,7 +14,6 @@ public: std::vector<ChatCommand> GetCommands() const override { - static std::vector<ChatCommand> cheatCommandTable = { { "god", SEC_GAMEMASTER, false, &HandleGodModeCheatCommand, "" }, @@ -25,13 +24,11 @@ public: { "status", SEC_GAMEMASTER, false, &HandleCheatStatusCommand, "" }, { "taxi", SEC_GAMEMASTER, false, &HandleTaxiCheatCommand, "" }, { "explore", SEC_GAMEMASTER, false, &HandleExploreCheatCommand, "" }, - }; static std::vector<ChatCommand> commandTable = { { "cheat", SEC_GAMEMASTER, false, nullptr, "", cheatCommandTable }, - }; return commandTable; } diff --git a/src/server/scripts/Commands/cs_gobject.cpp b/src/server/scripts/Commands/cs_gobject.cpp index 23f67baed4..4a5ad5975f 100644 --- a/src/server/scripts/Commands/cs_gobject.cpp +++ b/src/server/scripts/Commands/cs_gobject.cpp @@ -655,7 +655,6 @@ public: if (!object) { - handler->PSendSysMessage(LANG_COMMAND_OBJNOTFOUND, abs(guidLow)); handler->SetSentErrorMessage(true); return false; diff --git a/src/server/scripts/Commands/cs_misc.cpp b/src/server/scripts/Commands/cs_misc.cpp index 0030afee1d..91445e0a47 100644 --- a/src/server/scripts/Commands/cs_misc.cpp +++ b/src/server/scripts/Commands/cs_misc.cpp @@ -1216,7 +1216,6 @@ public: //Not a supported argument return false; - } static bool HandleLinkGraveCommand(ChatHandler* handler, char const* args) diff --git a/src/server/scripts/Commands/cs_wp.cpp b/src/server/scripts/Commands/cs_wp.cpp index 350e64a9e6..2502a31510 100644 --- a/src/server/scripts/Commands/cs_wp.cpp +++ b/src/server/scripts/Commands/cs_wp.cpp @@ -223,7 +223,6 @@ public: static bool HandleWpUnLoadCommand(ChatHandler* handler, const char* /*args*/) { - Creature* target = handler->getSelectedCreature(); if (!target) @@ -877,7 +876,6 @@ public: creature->DeleteFromDB(); creature->AddObjectToRemoveList(); } - } while (result2->NextRow()); if (hasError) diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gyth.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gyth.cpp index 126d6a8ae1..57e532ee64 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gyth.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gyth.cpp @@ -92,7 +92,6 @@ public: void UpdateAI(uint32 diff) override { - if (!SummonedRend && HealthBelowPct(25)) { DoCast(me, SPELL_SUMMON_REND); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_highlord_omokk.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_highlord_omokk.cpp index 97da53078e..72921dcf54 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_highlord_omokk.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_highlord_omokk.cpp @@ -80,7 +80,6 @@ public: DoMeleeAttackIfReady(); } }; - }; void AddSC_boss_highlordomokk() diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_pyroguard_emberseer.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_pyroguard_emberseer.cpp index 97d908ca40..bb0c295b9a 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_pyroguard_emberseer.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_pyroguard_emberseer.cpp @@ -367,7 +367,6 @@ public: void UpdateAI(uint32 diff) override { - if (!UpdateVictim()) { _events.Update(diff); @@ -383,7 +382,6 @@ public: if (Creature* Emberseer = me->FindNearestCreature(NPC_PYROGAURD_EMBERSEER, 30.0f, true)) DoCast(Emberseer, SPELL_ENCAGE_EMBERSEER); break; - } } } diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp index 73beef8e04..8a1eddcecf 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp @@ -87,7 +87,6 @@ public: DoMeleeAttackIfReady(); } }; - }; void AddSC_boss_shadowvosh() diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_chromaggus.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_chromaggus.cpp index b666c5959c..4b3edb2742 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_chromaggus.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_chromaggus.cpp @@ -238,7 +238,6 @@ public: { DoCast(player, SPELL_CHROMATIC_MUT_1); } - } } } diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp index bf41e4209d..c1bdca6d5f 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp @@ -457,7 +457,6 @@ public: me->GetCreatureListWithEntryInGrid(constructList, NPC_BONE_CONSTRUCT, 500.0f); for (std::list<Creature*>::const_iterator itr = constructList.begin(); itr != constructList.end(); ++itr) (*itr)->DespawnOrUnsummon(); - } else DespawnTimer -= diff; @@ -575,7 +574,6 @@ public: bool canDespawn; uint32 DespawnTimer; bool Phase3; - }; CreatureAI* GetAI(Creature* creature) const override diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_ragnaros.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_ragnaros.cpp index ba459b8d87..b4725eebf6 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_ragnaros.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_ragnaros.cpp @@ -254,7 +254,6 @@ public: _hasSubmergedOnce = true; _isBanished = true; _emergeTimer = 90000; - } else { diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp index 16089fe7e6..e297741484 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp @@ -436,7 +436,6 @@ public: OnEffectApply += AuraEffectApplyFn(spell_midnight_fixate_AuraScript::HandleEffectApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); OnEffectRemove += AuraEffectRemoveFn(spell_midnight_fixate_AuraScript::HandleEffectRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } - }; AuraScript* GetAuraScript() const override diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp index a9dfec6136..dbf0ad58c1 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp @@ -265,7 +265,6 @@ public: GetCaster()->RemoveAurasDueToSpell(SPELL_VANISH); GetCaster()->NearTeleportTo(pos.GetPositionX(), pos.GetPositionY(), pos.GetPositionZ(), target->GetOrientation()); } - } void Register() override diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp index 66a285f470..b988feb496 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp @@ -416,7 +416,6 @@ public: } } }; - }; class go_blackened_urn : public GameObjectScript diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp index 6ab296fbd1..5015283de0 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp @@ -195,7 +195,6 @@ public: clearweapons(); positions.clear(); instance->HandleGameObject(instance->GetData64(DATA_GO_NETHER_DOOR), true); - } void clearweapons() @@ -439,7 +438,6 @@ public: DoMeleeAttackIfReady(); } - }; }; @@ -455,7 +453,6 @@ public: struct prince_axesAI : public ScriptedAI { - prince_axesAI(Creature* creature) : ScriptedAI(creature) { Initialize(); diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp index 9284276297..87a7cba28b 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp @@ -132,7 +132,6 @@ public: instance->SetData(DATA_ARAN, DONE); instance->HandleGameObject(instance->GetData64(DATA_GO_LIBRARY_DOOR), true); - } void EnterCombat(Unit* /*who*/) override @@ -142,7 +141,6 @@ public: instance->SetData(DATA_ARAN, IN_PROGRESS); instance->HandleGameObject(instance->GetData64(DATA_GO_LIBRARY_DOOR), false); DoZoneInCombat(); - } void FlameWreathEffect() @@ -570,7 +568,6 @@ public: { water_elementalAI(Creature* creature) : ScriptedAI(creature) { - } uint32 CastTimer; diff --git a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp index f160edae65..ab6ed20a8c 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp @@ -555,12 +555,10 @@ public: default: return 2000; } - } void UpdateAI(uint32 diff) override { - if (YellTimer <= diff) { if (EventStarted) @@ -587,7 +585,6 @@ public: } } }; - }; void AddSC_karazhan() diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp index 1027216129..d4a2b29b0b 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp @@ -385,7 +385,6 @@ struct boss_priestess_lackey_commonAI : public ScriptedAI RecalculateThreat(); events.ScheduleEvent(EVENT_HELPER_RESET_THREAT, urand(8000, 10000)); break; - } } }; @@ -520,7 +519,6 @@ public: struct boss_ellris_duskhallowAI : public boss_priestess_lackey_commonAI { - boss_ellris_duskhallowAI(Creature* creature) : boss_priestess_lackey_commonAI(creature, AI_TYPE_RANGED) { } void EnterCombat(Unit* who) override diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp index 05144e163d..cc0403ce43 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp @@ -911,7 +911,6 @@ public: return false; } - }; /*#### @@ -974,7 +973,6 @@ public: miner->DisappearAndDie(); } }; - }; /*#### @@ -1120,7 +1118,6 @@ public: npc_escortAI::UpdateAI(diff); } }; - }; /*###### @@ -1158,7 +1155,6 @@ public: return true; } - }; void AddSC_the_scarlet_enclave_c1() diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp index 7eda243404..acfdea5982 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp @@ -138,7 +138,6 @@ public: ++speechCounter; DoCastAOE(SPELL_THREAT_PULSE, true); - } else speechTimer -= diff; @@ -149,7 +148,6 @@ public: CombatAI::UpdateAI(diff); } }; - }; /*###### @@ -479,7 +477,6 @@ public: DoMeleeAttackIfReady(); } }; - }; //Koltira & Valroth- Breakout @@ -568,7 +565,6 @@ public: killer->CastSpell(me, SPELL_SUMMON_VALROTH_REMAINS, true); } }; - }; /*###### diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/zone_the_scarlet_enclave.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/zone_the_scarlet_enclave.cpp index 1eb7eb52c8..a7327b318f 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/zone_the_scarlet_enclave.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/zone_the_scarlet_enclave.cpp @@ -112,7 +112,6 @@ public: else FlyBackTimer -= diff; } }; - }; void AddSC_the_scarlet_enclave() diff --git a/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp b/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp index c32e76f544..b3e43c1f79 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp @@ -187,7 +187,6 @@ public: OnEffectApply += AuraEffectApplyFn(spell_scholomance_fixate_AuraScript::HandleEffectApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); OnEffectRemove += AuraEffectRemoveFn(spell_scholomance_fixate_AuraScript::HandleEffectRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } - }; AuraScript* GetAuraScript() const override diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp index 0543ccfa9d..f0239a5ddb 100644 --- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp +++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp @@ -97,7 +97,6 @@ public: private: uint32 _encounters[MAX_ENCOUNTERS]; }; - }; class spell_shadowfang_keep_haunting_spirits : public SpellScriptLoader diff --git a/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp b/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp index 58d222dab1..82cf81abf6 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp @@ -137,7 +137,6 @@ public: baron->AI()->Talk(SAY_BARON_GUARD_DEAD); if (GameObject* gate = instance->GetGameObject(_zigguratDoorsGUID5)) gate->SetGoState(GO_STATE_ACTIVE); - } } diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp index f32c900c10..cf11c13610 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp @@ -508,7 +508,6 @@ public: class AreaTrigger_at_sunwell_madrigosa : public AreaTriggerScript { public: - AreaTrigger_at_sunwell_madrigosa() : AreaTriggerScript("at_sunwell_madrigosa") {} bool OnTrigger(Player* player, AreaTrigger const* /*trigger*/) override diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp index 04e1231c1d..af6df19659 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp @@ -483,7 +483,6 @@ public: class AreaTrigger_at_sunwell_eredar_twins : public AreaTriggerScript { public: - AreaTrigger_at_sunwell_eredar_twins() : AreaTriggerScript("at_sunwell_eredar_twins") {} bool OnTrigger(Player* player, AreaTrigger const* /*trigger*/) override diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp index 8df726e810..1120f502f6 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp @@ -364,7 +364,6 @@ public: case EVENT_LAND_FIGHT: me->GetMotionMaster()->MovePoint(POINT_GROUND, 1500.0f, 552.8f, 26.52f, false, true); break; - } if (!me->HasUnitMovementFlag(MOVEMENTFLAG_DISABLE_GRAVITY)) diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp index abcd511a3f..029b4be8c5 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp @@ -619,7 +619,6 @@ public: me->CastSpell(me, SPELL_ARMAGEDDON_PERIODIC, true); events.ScheduleEvent(EVENT_SPELL_ARMAGEDDON, phase == PHASE_SACRIFICE ? 20000 : 40000); break; - } DoMeleeAttackIfReady(); diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp index d88b4b3429..55d624ea8e 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp @@ -363,7 +363,6 @@ public: DoMeleeAttackIfReady(); } - }; CreatureAI* GetAI(Creature* creature) const override diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp index e548689d90..7e7a36fc07 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp @@ -114,7 +114,6 @@ enum Spells // Koragg SPELL_COLD_STARE = 43593, SPELL_MIGHTY_BLOW = 43592 - }; #define ORIENT 1.5696f @@ -237,7 +236,6 @@ struct boss_hexlord_addAI : public ScriptedAI class boss_hexlord_malacrass : public CreatureScript { public: - boss_hexlord_malacrass() : CreatureScript("boss_hexlord_malacrass") { @@ -507,7 +505,6 @@ public: class boss_thurg : public CreatureScript { public: - boss_thurg() : CreatureScript("boss_thurg") { @@ -515,7 +512,6 @@ public: struct boss_thurgAI : public boss_hexlord_addAI { - boss_thurgAI(Creature* creature) : boss_hexlord_addAI(creature) { } uint32 bloodlust_timer; @@ -707,7 +703,6 @@ struct boss_gazakrothAI : public boss_hexlord_addAI class boss_lord_raadan : public CreatureScript { public: - boss_lord_raadan() : CreatureScript("boss_lord_raadan") { @@ -726,7 +721,6 @@ public: thunderclap_timer = 13000; boss_hexlord_addAI::Reset(); - } void UpdateAI(uint32 diff) override { @@ -760,7 +754,6 @@ public: class boss_darkheart : public CreatureScript { public: - boss_darkheart() : CreatureScript("boss_darkheart") { @@ -802,7 +795,6 @@ public: class boss_slither : public CreatureScript { public: - boss_slither() : CreatureScript("boss_slither") { @@ -861,7 +853,6 @@ public: class boss_fenstalker : public CreatureScript { public: - boss_fenstalker() : CreatureScript("boss_fenstalker") { @@ -877,7 +868,6 @@ public: { volatileinf_timer = 15000; boss_hexlord_addAI::Reset(); - } void UpdateAI(uint32 diff) override { @@ -905,7 +895,6 @@ public: class boss_koragg : public CreatureScript { public: - boss_koragg() : CreatureScript("boss_koragg") { @@ -923,7 +912,6 @@ public: coldstare_timer = 15000; mightyblow_timer = 10000; boss_hexlord_addAI::Reset(); - } void UpdateAI(uint32 diff) override { diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp index 42e66af4cc..3e69bc7c1d 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp @@ -99,7 +99,6 @@ float hatcherway[2][5][3] = class boss_janalai : public CreatureScript { public: - boss_janalai() : CreatureScript("boss_janalai") { @@ -444,7 +443,6 @@ public: class npc_janalai_firebomb : public CreatureScript { public: - npc_janalai_firebomb() : CreatureScript("npc_janalai_firebomb") { @@ -480,7 +478,6 @@ public: class npc_janalai_hatcher : public CreatureScript { public: - npc_janalai_hatcher() : CreatureScript("npc_janalai_hatcher") { @@ -598,7 +595,6 @@ public: } else me->DisappearAndDie(); - } else WaitTimer -= diff; } @@ -614,7 +610,6 @@ public: class npc_janalai_hatchling : public CreatureScript { public: - npc_janalai_hatchling() : CreatureScript("npc_janalai_hatchling") { @@ -697,7 +692,6 @@ public: } } }; - }; void AddSC_boss_janalai() diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp index 766adcdb74..4c195391f1 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp @@ -64,13 +64,11 @@ enum Talks SAY_DEATH, SAY_NALORAKK_EVENT1, // Unimplemented SAY_NALORAKK_EVENT2 // Unimplemented - }; class boss_nalorakk : public CreatureScript { public: - boss_nalorakk() : CreatureScript("boss_nalorakk") { @@ -339,7 +337,6 @@ public: inMove = false; return; } - } } diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp index d573a92201..44f2106429 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp @@ -114,7 +114,6 @@ static TransformStruct Transform[4] = class boss_zuljin : public CreatureScript { public: - boss_zuljin() : CreatureScript("boss_zuljin") { @@ -560,7 +559,6 @@ public: class npc_zuljin_vortex : public CreatureScript { public: - npc_zuljin_vortex() : CreatureScript("npc_zuljin_vortex") { diff --git a/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp b/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp index 7980334fb8..5b26936dfc 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp @@ -392,7 +392,6 @@ public: return 0; } - }; InstanceScript* GetInstanceScript(InstanceMap* map) const override diff --git a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp index 15af23ae76..4ea412fc4d 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp @@ -117,7 +117,6 @@ enum ForestFrog class npc_forest_frog : public CreatureScript { public: - npc_forest_frog() : CreatureScript("npc_forest_frog") { } struct npc_forest_frogAI : public ScriptedAI @@ -584,7 +583,6 @@ enum Weapons class npc_harrison_jones : public CreatureScript { public: - npc_harrison_jones() : CreatureScript("npc_harrison_jones") { } diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp index 40c0b819fd..bbd4d74164 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp @@ -175,7 +175,6 @@ public: class npc_healing_ward : public CreatureScript { public: - npc_healing_ward() : CreatureScript("npc_healing_ward") { @@ -227,7 +226,6 @@ public: class npc_shade_of_jindo : public CreatureScript { public: - npc_shade_of_jindo() : CreatureScript("npc_shade_of_jindo") { @@ -249,7 +247,6 @@ public: void UpdateAI(uint32 diff) override { - //ShadowShock_Timer if (ShadowShock_Timer <= diff) { diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp index 77bb931d05..980b048aed 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp @@ -105,7 +105,6 @@ public: { if (me->GetPositionZ() > 140.0f) { - killCount = 0; events.ScheduleEvent(EVENT_CHECK_START, 1000); if (Creature* speaker = ObjectAccessor::GetCreature(*me, instance->GetData64(NPC_VILEBRANCH_SPEAKER))) @@ -175,7 +174,6 @@ public: { me->SetHomePosition(PosMandokir[0]); instance->SetBossState(DATA_MANDOKIR, NOT_STARTED); - } } } diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp index 84181dd3e3..acc23a1110 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp @@ -400,7 +400,6 @@ public: class npc_zealot_zath : public CreatureScript { public: - npc_zealot_zath() : CreatureScript("npc_zealot_zath") { diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h b/src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h index 35477b8a36..7c3e9eb2d1 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h +++ b/src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h @@ -45,7 +45,6 @@ enum CreatureIds NPC_OHGAN = 14988, // Mandokir Event NPC_VILEBRANCH_SPEAKER = 11391, // Mandokir Event NPC_CHAINED_SPIRT = 15117 // Mandokir Event - }; enum GameobjectIds diff --git a/src/server/scripts/EasternKingdoms/zone_ghostlands.cpp b/src/server/scripts/EasternKingdoms/zone_ghostlands.cpp index 705e6a734b..d93fb7e4c9 100644 --- a/src/server/scripts/EasternKingdoms/zone_ghostlands.cpp +++ b/src/server/scripts/EasternKingdoms/zone_ghostlands.cpp @@ -132,7 +132,6 @@ public: { return new npc_ranger_lilathaAI(creature); } - }; void AddSC_ghostlands() diff --git a/src/server/scripts/Events/brewfest.cpp b/src/server/scripts/Events/brewfest.cpp index a695c04c00..499da074ab 100644 --- a/src/server/scripts/Events/brewfest.cpp +++ b/src/server/scripts/Events/brewfest.cpp @@ -761,7 +761,6 @@ public: sayer->MonsterSay("SOMEONE TRY THIS SUPER BREW!", LANG_UNIVERSAL, 0); //sayer->CastSpell(sayer, SPELL_CREATE_SUPER_BREW, true); sayer->SummonCreature(NPC_SUPER_BREW_TRIGGER, sayer->GetPositionX() + 15 * cos(sayer->GetOrientation()), sayer->GetPositionY() + 15 * sin(sayer->GetOrientation()), sayer->GetPositionZ(), 0.0f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 30000); - } else { @@ -1325,7 +1324,6 @@ public: else target->CastSpell(target, SPELL_RAM_FATIGUE, true); } - } void HandleEffectRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) @@ -1632,7 +1630,6 @@ public: else if ((cr = caster->FindNearestCreature(NPC_NORMAL_GORDOK, 40.0f))) cr->CastSpell(caster, SPELL_THROW_MUG_TO_PLAYER, true); } - } void Register() override diff --git a/src/server/scripts/Events/childrens_week.cpp b/src/server/scripts/Events/childrens_week.cpp index 4b88725a53..2480180054 100644 --- a/src/server/scripts/Events/childrens_week.cpp +++ b/src/server/scripts/Events/childrens_week.cpp @@ -218,7 +218,6 @@ public: int8 phase; uint64 playerGUID; uint64 orphanGUID; - }; CreatureAI* GetAI(Creature* creature) const override @@ -404,7 +403,6 @@ public: uint8 phase; uint64 playerGUID; uint64 orphanGUID; - }; CreatureAI* GetAI(Creature* creature) const override @@ -492,7 +490,6 @@ public: int8 phase; uint64 playerGUID; uint64 orphanGUID; - }; CreatureAI* GetAI(Creature* creature) const override @@ -579,7 +576,6 @@ public: int8 phase; uint64 playerGUID; uint64 orphanGUID; - }; CreatureAI* GetAI(Creature* creature) const override @@ -675,7 +671,6 @@ public: int8 phase; uint64 playerGUID; uint64 orphanGUID; - }; CreatureAI* GetAI(Creature* creature) const override @@ -835,7 +830,6 @@ public: uint32 timer; uint64 playerGUID; uint64 orphanGUID; - }; CreatureAI* GetAI(Creature* creature) const override diff --git a/src/server/scripts/Events/midsummer.cpp b/src/server/scripts/Events/midsummer.cpp index 39db60230e..550a9ed2dd 100644 --- a/src/server/scripts/Events/midsummer.cpp +++ b/src/server/scripts/Events/midsummer.cpp @@ -69,7 +69,6 @@ public: go->SendCustomAnim(1); } } - } }; @@ -230,7 +229,6 @@ public: caster->CastSpell(caster, SPELL_APPLY_DIGUISE, true); caster->setFaction(88); } - } void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) diff --git a/src/server/scripts/Events/pilgrims_bounty.cpp b/src/server/scripts/Events/pilgrims_bounty.cpp index 15a776d135..d3f1a868e3 100644 --- a/src/server/scripts/Events/pilgrims_bounty.cpp +++ b/src/server/scripts/Events/pilgrims_bounty.cpp @@ -325,7 +325,6 @@ public: { switch (passSpell) { - case SPELL_PASS_TURKEY: return SPELL_VISUAL_BOUNCE_TURKEY; case SPELL_PASS_STUFFING: @@ -342,7 +341,6 @@ public: { switch (passSpell) { - case SPELL_PASS_TURKEY: return SPELL_VISUAL_THROW_TURKEY; case SPELL_PASS_STUFFING: diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp index 72b35c0ef1..2b41ee4887 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp @@ -161,7 +161,6 @@ public: DoMeleeAttackIfReady(); } }; - }; class npc_towering_infernal : public CreatureScript @@ -245,7 +244,6 @@ public: DoMeleeAttackIfReady(); } }; - }; void AddSC_boss_anetheron() diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp index fb2711a89c..a7bb7ef9c5 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp @@ -168,7 +168,6 @@ public: DoMeleeAttackIfReady(); } }; - }; class npc_lesser_doomguard : public CreatureScript @@ -265,7 +264,6 @@ public: DoMeleeAttackIfReady(); } }; - }; void AddSC_boss_azgalor() diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp index c559630864..ede2226d1d 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp @@ -152,7 +152,6 @@ public: DoMeleeAttackIfReady(); } }; - }; class spell_mark_of_kazrogal : public SpellScriptLoader 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 9f7d91d0e1..36935b9b85 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp @@ -148,7 +148,6 @@ public: DoMeleeAttackIfReady(); } }; - }; void AddSC_boss_rage_winterchill() diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp index f61f086216..02c5b2a1ce 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp @@ -112,7 +112,6 @@ public: return ai; } - }; class npc_thrall : public CreatureScript @@ -193,7 +192,6 @@ public: return ai; } - }; class npc_tyrande_whisperwind : public CreatureScript @@ -239,7 +237,6 @@ public: SendGossipMenuFor(player, 907, creature->GetGUID()); return true; } - }; void AddSC_hyjal() diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp index 99fa082e50..37f21e9a07 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp @@ -476,7 +476,6 @@ void hyjalAI::SummonCreature(uint32 entry, float Base[4][3]) default: creature = me->SummonCreature(entry, SpawnLoc[0], SpawnLoc[1], SpawnLoc[2], 0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 120000); break; - } if (creature) @@ -706,7 +705,6 @@ void hyjalAI::UpdateAI(uint32 diff) HideNearPos(5037.76f, -1889.71f); for (uint8 i = 0; i < 92; ++i)//summon fires me->SummonGameObject(GO_ROARING_FLAME, AllianceFirePos[i][0], AllianceFirePos[i][1], AllianceFirePos[i][2], AllianceFirePos[i][3], AllianceFirePos[i][4], AllianceFirePos[i][5], AllianceFirePos[i][6], AllianceFirePos[i][7], 0); - } else me->SetVisible(true); break; @@ -719,7 +717,6 @@ void hyjalAI::UpdateAI(uint32 diff) HideNearPos(5542.2f, -2629.36f); for (uint8 i = 0; i < 65; ++i)//summon fires me->SummonGameObject(GO_ROARING_FLAME, HordeFirePos[i][0], HordeFirePos[i][1], HordeFirePos[i][2], HordeFirePos[i][3], HordeFirePos[i][4], HordeFirePos[i][5], HordeFirePos[i][6], HordeFirePos[i][7], 0); - } else me->SetVisible(true); break; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp index 387828c21f..fb3ee7f8ee 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp @@ -135,7 +135,6 @@ float AllianceOverrunWP[55][3] = //waypoints in the alliance base used in the en {5180.41f, -2121.87f, 1292.62f}, //52 garg target3 {5088.68f, -2432.04f, 1441.73f}, //53 garg target4 {5111.26f, -2454.73f, 1449.63f}//54 garg target5 - }; float HordeOverrunWP[21][3] = //waypoints in the horde base used in the end in the cleaning wave @@ -622,7 +621,6 @@ public: DoMeleeAttackIfReady(); } }; - }; class npc_ghoul : public CreatureScript @@ -723,7 +721,6 @@ public: DoMeleeAttackIfReady(); } }; - }; class npc_necromancer : public CreatureScript @@ -849,7 +846,6 @@ public: DoMeleeAttackIfReady(); } }; - }; class npc_banshee : public CreatureScript @@ -953,7 +949,6 @@ public: DoMeleeAttackIfReady(); } }; - }; class npc_crypt_fiend : public CreatureScript @@ -1041,7 +1036,6 @@ public: DoMeleeAttackIfReady(); } }; - }; class npc_fel_stalker : public CreatureScript @@ -1129,7 +1123,6 @@ public: DoMeleeAttackIfReady(); } }; - }; class npc_frost_wyrm : public CreatureScript @@ -1459,7 +1452,6 @@ public: DoMeleeAttackIfReady(); } }; - }; void AddSC_hyjal_trash() diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp index 8c8fbdba57..8751a7e721 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp @@ -275,7 +275,6 @@ public: SaveToDB(); OUT_SAVE_INST_DATA_COMPLETE; } - } uint32 GetData(uint32 type) const override diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp index 6a13cf8663..915203a66f 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp @@ -139,7 +139,6 @@ public: Talk(SAY_SLAY); } }; - }; void AddSC_boss_epoch() diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite.cpp index 006bf66d8d..fc2e14f085 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite.cpp @@ -145,7 +145,6 @@ public: DoMeleeAttackIfReady(); } }; - }; void AddSC_boss_infinite_corruptor() 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 09b4ce2230..0e69f07bb9 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp @@ -155,7 +155,6 @@ public: DoMeleeAttackIfReady(); } }; - }; void AddSC_boss_mal_ganis() diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp index c6b61d48b5..1d9868ac99 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp @@ -101,7 +101,6 @@ public: DoMeleeAttackIfReady(); } }; - }; void AddSC_boss_meathook() diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp index 97f717a0dd..ee0acb5346 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp @@ -145,7 +145,6 @@ public: DoMeleeAttackIfReady(); } }; - }; class spell_boss_salramm_steal_flesh : public SpellScriptLoader 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 abf962dbe6..2e8818dfe9 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp @@ -647,7 +647,6 @@ public: SetEscortPaused(true); eventInRun = true; break; - } } @@ -1427,7 +1426,6 @@ public: arthas->AI()->Reset(); } player->NearTeleportTo(LeaderIntroPos2.GetPositionX(), LeaderIntroPos2.GetPositionY(), LeaderIntroPos2.GetPositionZ(), LeaderIntroPos2.GetOrientation()); - } } 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 8985e085f7..960ebf737f 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 @@ -166,7 +166,6 @@ public: else if (Creature* arthas = instance->GetCreature(_arthasGUID)) Reposition(arthas); return; - } if (type == DATA_ARTHAS_EVENT) @@ -256,7 +255,6 @@ public: if (instance->IsHeroic() && _infiniteGUID) if (Creature* cr = instance->GetCreature(_infiniteGUID)) cr->AI()->DoAction(ACTION_RUN_OUT_OF_TIME); - } else if (div > divAfter) { 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 88443551fa..9a913b8a88 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp @@ -198,13 +198,11 @@ public: me->CastSpell(me, SPELL_CONSECRATION, false); events.ScheduleEvent(EVENT_SPELL_CONSECRATION, 20000); break; - } DoMeleeAttackIfReady(); } }; - }; void AddSC_boss_captain_skarloc() 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 cf808550f4..9fb5d50303 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp @@ -104,7 +104,6 @@ public: DoMeleeAttackIfReady(); } }; - }; void AddSC_boss_epoch_hunter() diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_lieutenant_drake.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_lieutenant_drake.cpp index 7e6bc109a2..36e82c3f46 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_lieutenant_drake.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_lieutenant_drake.cpp @@ -150,7 +150,6 @@ public: EventMap events; Movement::PointsArray pathPoints; }; - }; void AddSC_boss_lieutenant_drake() 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 4a83dabc32..2a0750f2d4 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp @@ -22,7 +22,6 @@ const Position thrallPositions[THRALL_POSITIONS_COUNT] = {2062.9f, 229.93f, 64.454f, 2.45f}, // After Captain Skarloc death {2486.91f, 626.356f, 58.0761f, 0.0f}, // Arrived at Tarren Mill {2660.47f, 659.223f, 62.0f, 5.78f} // Taretha Met - }; class instance_old_hillsbrad : public InstanceMapScript @@ -339,7 +338,6 @@ public: EventMap _events; }; - }; void AddSC_instance_old_hillsbrad() diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp index 8472d1131f..b366e1ff23 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp @@ -174,7 +174,6 @@ enum Events EVENT_THRALL_TALK_6 = 90, EVENT_THRALL_RUN_AWAY = 91, EVENT_TARETHA_TALK_2 = 92 - }; class npc_thrall_old_hillsbrad : public CreatureScript @@ -898,7 +897,6 @@ public: void AttackStart(Unit*) override { } void MoveInLineOfSight(Unit*) override { } }; - }; void AddSC_old_hillsbrad() diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.h b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.h index 1a6c591fef..f21186a896 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.h +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.h @@ -72,7 +72,6 @@ enum MiscIds INSTANCE_POSITIONS_COUNT = 3, THRALL_POSITIONS_COUNT = 5 - }; #endif 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 e6dafe3824..3d3644e9cc 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 @@ -339,7 +339,6 @@ public: protected: EventMap Events; }; - }; void AddSC_instance_the_black_morass() 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 a20a49bb36..91ff58ba6d 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp @@ -246,7 +246,6 @@ public: cr->AI()->Talk(SAY_ORCS_ANSWER); } break; - } } diff --git a/src/server/scripts/Kalimdor/DireMaul/instance_dire_maul.cpp b/src/server/scripts/Kalimdor/DireMaul/instance_dire_maul.cpp index 3dac854ba4..68e644e008 100644 --- a/src/server/scripts/Kalimdor/DireMaul/instance_dire_maul.cpp +++ b/src/server/scripts/Kalimdor/DireMaul/instance_dire_maul.cpp @@ -91,7 +91,6 @@ public: } } break; - } SaveToDB(); diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp index ace60bc492..a252ff7207 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp @@ -122,7 +122,6 @@ public: DoMeleeAttackIfReady(); } }; - }; class boss_vem : public CreatureScript @@ -214,7 +213,6 @@ public: DoMeleeAttackIfReady(); } }; - }; class boss_yauj : public CreatureScript @@ -326,7 +324,6 @@ public: DoMeleeAttackIfReady(); } }; - }; void AddSC_bug_trio() diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp index 16e3f49ee7..7f8f25c04c 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp @@ -438,7 +438,6 @@ public: } } }; - }; class boss_cthun : public CreatureScript @@ -891,7 +890,6 @@ public: } } }; - }; class npc_eye_tentacle : public CreatureScript @@ -969,7 +967,6 @@ public: else MindflayTimer -= diff; } }; - }; class npc_claw_tentacle : public CreatureScript @@ -1083,7 +1080,6 @@ public: DoMeleeAttackIfReady(); } }; - }; class npc_giant_claw_tentacle : public CreatureScript @@ -1207,7 +1203,6 @@ public: DoMeleeAttackIfReady(); } }; - }; class npc_giant_eye_tentacle : public CreatureScript @@ -1273,7 +1268,6 @@ public: else BeamTimer -= diff; } }; - }; class npc_giant_flesh_tentacle : public CreatureScript @@ -1301,7 +1295,6 @@ public: summoner->GetAI()->DoAction(ACTION_FLESH_TENTACLE_KILLED); } }; - }; //GetAIs diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp index 4e54fb5011..be14ffda06 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp @@ -202,7 +202,6 @@ public: DoMeleeAttackIfReady(); } }; - }; void AddSC_boss_fankriss() diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp index 02bc03ccbf..9c540eba82 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp @@ -141,7 +141,6 @@ public: DoMeleeAttackIfReady(); } }; - }; void AddSC_boss_huhuran() diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp index 73cb80ce41..59d9b5401f 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp @@ -131,7 +131,6 @@ public: DoMeleeAttackIfReady(); } }; - }; void AddSC_boss_ouro() diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp index 182783423e..286f39713d 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp @@ -68,7 +68,6 @@ public: AggroReset = false; Enraged = false; EnragedHard = false; - } void EnterCombat(Unit* /*who*/) override @@ -175,7 +174,6 @@ public: } } }; - }; class npc_sartura_royal_guard : public CreatureScript @@ -296,7 +294,6 @@ public: DoMeleeAttackIfReady(); } }; - }; void AddSC_boss_sartura() diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp index 404337004a..d90b722e9a 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp @@ -452,7 +452,6 @@ public: DoMeleeAttackIfReady(); } }; - }; class boss_veklor : public CreatureScript @@ -580,7 +579,6 @@ public: } } }; - }; void AddSC_boss_twinemperors() 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 c232ed2d0c..7e660b5fea 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp @@ -167,7 +167,6 @@ public: } } }; - }; void AddSC_instance_temple_of_ahnqiraj() diff --git a/src/server/scripts/Kalimdor/zone_ashenvale.cpp b/src/server/scripts/Kalimdor/zone_ashenvale.cpp index 51ff2919fd..ccd45096db 100644 --- a/src/server/scripts/Kalimdor/zone_ashenvale.cpp +++ b/src/server/scripts/Kalimdor/zone_ashenvale.cpp @@ -293,7 +293,6 @@ public: uint8 waveId; public: bool _isBrazierExtinguished; - }; CreatureAI* GetAI(Creature* creature) const override diff --git a/src/server/scripts/Kalimdor/zone_desolace.cpp b/src/server/scripts/Kalimdor/zone_desolace.cpp index 7a0a8489f9..a574e484f6 100644 --- a/src/server/scripts/Kalimdor/zone_desolace.cpp +++ b/src/server/scripts/Kalimdor/zone_desolace.cpp @@ -54,7 +54,6 @@ enum Caravan NPC_LESSER_INFERNAL = 4676, NPC_DOOMWARDER = 4677, NPC_NETHER = 4684, - }; class npc_cork_gizelton : public CreatureScript @@ -376,7 +375,6 @@ public: case 282: events.ScheduleEvent(EVENT_RESTART_ESCORT, 1000); break; - } } @@ -429,7 +427,6 @@ enum DyingKodo SPELL_KODO_KOMBO_PLAYER_BUFF = 18172, SPELL_KODO_KOMBO_DESPAWN_BUFF = 18377, SPELL_KODO_KOMBO_GOSSIP = 18362 - }; class npc_aged_dying_ancient_kodo : public CreatureScript @@ -498,7 +495,6 @@ public: { return new npc_aged_dying_ancient_kodoAI(creature); } - }; /*###### diff --git a/src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp b/src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp index 1cc672bfcd..4620d36a93 100644 --- a/src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp +++ b/src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp @@ -66,7 +66,6 @@ public: return true; } - }; /*###### @@ -107,7 +106,6 @@ public: return true; } - }; /*###### @@ -184,7 +182,6 @@ public: } } }; - }; /*###### @@ -298,7 +295,6 @@ public: DoMeleeAttackIfReady(); } }; - }; enum SpellScripts diff --git a/src/server/scripts/Kalimdor/zone_feralas.cpp b/src/server/scripts/Kalimdor/zone_feralas.cpp index 51373c4589..fe9125fbd3 100644 --- a/src/server/scripts/Kalimdor/zone_feralas.cpp +++ b/src/server/scripts/Kalimdor/zone_feralas.cpp @@ -54,7 +54,6 @@ public: SendGossipMenuFor(player, 2433, creature->GetGUID()); return true; } - }; /*###### @@ -101,7 +100,6 @@ public: if (npc_escortAI* pEscortAI = CAST_AI(npc_oox22fe::npc_oox22feAI, creature->AI())) pEscortAI->Start(true, false, player->GetGUID()); - } return true; } @@ -168,7 +166,6 @@ public: summoned->AI()->AttackStart(me); } }; - }; enum GordunniTrap diff --git a/src/server/scripts/Kalimdor/zone_moonglade.cpp b/src/server/scripts/Kalimdor/zone_moonglade.cpp index 4c76affc93..a80180049f 100644 --- a/src/server/scripts/Kalimdor/zone_moonglade.cpp +++ b/src/server/scripts/Kalimdor/zone_moonglade.cpp @@ -92,7 +92,6 @@ public: } return true; } - }; /*###### @@ -150,7 +149,6 @@ public: return true; } - }; /*###### @@ -207,7 +205,6 @@ public: } return true; } - }; /*###### @@ -531,7 +528,6 @@ public: EventOnWait = false; break; } - } else if (EventOnWait) EventTimer -= diff; } @@ -544,7 +540,6 @@ public: EventOnWait = true; } }; - }; /*#### diff --git a/src/server/scripts/Kalimdor/zone_orgrimmar.cpp b/src/server/scripts/Kalimdor/zone_orgrimmar.cpp index f507cbd7f7..976ef30926 100644 --- a/src/server/scripts/Kalimdor/zone_orgrimmar.cpp +++ b/src/server/scripts/Kalimdor/zone_orgrimmar.cpp @@ -116,7 +116,6 @@ public: } } }; - }; /*###### diff --git a/src/server/scripts/Kalimdor/zone_silithus.cpp b/src/server/scripts/Kalimdor/zone_silithus.cpp index 7f5f3346e2..ca321eea65 100644 --- a/src/server/scripts/Kalimdor/zone_silithus.cpp +++ b/src/server/scripts/Kalimdor/zone_silithus.cpp @@ -140,7 +140,6 @@ public: return true; } - }; /*#### @@ -384,7 +383,6 @@ static WaveData WavesInfo[5] = {12, 38, 15414, 0, 0, 24000, 0}, // Qiraji Wasps { 6, 50, 15422, 0, 0, 24000, 0}, // Qiraji Tanks {15, 15, 15423, 0, 0, 24000, 0} // Kaldorei Soldier - }; struct SpawnSpells @@ -723,7 +721,6 @@ public: EnterEvadeMode(); } }; - }; /*###### @@ -840,7 +837,6 @@ public: DoMeleeAttackIfReady(); } }; - }; /*##### @@ -989,7 +985,6 @@ public: EnterEvadeMode(); }; }; - }; void npc_qiraj_war_spawn::npc_qiraj_war_spawnAI::JustDied(Unit* /*slayer*/) @@ -1002,7 +997,6 @@ void npc_qiraj_war_spawn::npc_qiraj_war_spawnAI::JustDied(Unit* /*slayer*/) if (Creature* mob = ObjectAccessor::GetCreature(*me, MobGUID)) if (npc_anachronos_quest_trigger::npc_anachronos_quest_triggerAI* triggerAI = CAST_AI(npc_anachronos_quest_trigger::npc_anachronos_quest_triggerAI, mob->AI())) triggerAI->LiveCounter(); - }; /*##### @@ -1067,7 +1061,6 @@ public: } return true; } - }; /*### diff --git a/src/server/scripts/Kalimdor/zone_stonetalon_mountains.cpp b/src/server/scripts/Kalimdor/zone_stonetalon_mountains.cpp index 3b45847512..db7037fb61 100644 --- a/src/server/scripts/Kalimdor/zone_stonetalon_mountains.cpp +++ b/src/server/scripts/Kalimdor/zone_stonetalon_mountains.cpp @@ -44,7 +44,6 @@ public: { CloseGossipMenuFor(player); creature->CastSpell(player, 6766, false); - } if (action == GOSSIP_ACTION_INFO_DEF + 2) { @@ -74,7 +73,6 @@ public: return true; } - }; /*###### @@ -153,7 +151,6 @@ public: { 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 4a3548f2b9..17746d9794 100644 --- a/src/server/scripts/Kalimdor/zone_tanaris.cpp +++ b/src/server/scripts/Kalimdor/zone_tanaris.cpp @@ -136,7 +136,6 @@ public: DoMeleeAttackIfReady(); } }; - }; /*###### @@ -269,7 +268,6 @@ public: npc_escortAI::UpdateAI(diff); } }; - }; /*###### @@ -315,7 +313,6 @@ public: return true; } - }; /*###### @@ -379,7 +376,6 @@ public: return true; } - }; /*###### @@ -632,7 +628,6 @@ public: DoMeleeAttackIfReady(); } }; - }; void AddSC_tanaris() diff --git a/src/server/scripts/Kalimdor/zone_the_barrens.cpp b/src/server/scripts/Kalimdor/zone_the_barrens.cpp index 3363f89e05..e7b08a759a 100644 --- a/src/server/scripts/Kalimdor/zone_the_barrens.cpp +++ b/src/server/scripts/Kalimdor/zone_the_barrens.cpp @@ -62,7 +62,6 @@ public: SendGossipMenuFor(player, 3557, creature->GetGUID()); return true; } - }; /*###### @@ -160,7 +159,6 @@ public: } } }; - }; /*###### @@ -262,7 +260,6 @@ public: } } }; - }; /*##### @@ -485,7 +482,6 @@ public: } } }; - }; /*##### @@ -649,7 +645,6 @@ public: { return new npc_wizzlecrank_shredderAI(creature); } - }; void AddSC_the_barrens() diff --git a/src/server/scripts/Kalimdor/zone_thousand_needles.cpp b/src/server/scripts/Kalimdor/zone_thousand_needles.cpp index c53d493e30..0d2968179a 100644 --- a/src/server/scripts/Kalimdor/zone_thousand_needles.cpp +++ b/src/server/scripts/Kalimdor/zone_thousand_needles.cpp @@ -114,7 +114,6 @@ public: me->SummonCreature(NPC_GRIM_BANDIT, BanditLoc[i + AmbushId], TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 60000); } }; - }; /*###### @@ -310,7 +309,6 @@ public: DoMeleeAttackIfReady(); } }; - }; enum PantherCage @@ -368,7 +366,6 @@ public: DoMeleeAttackIfReady(); } }; - }; void AddSC_thousand_needles() diff --git a/src/server/scripts/Kalimdor/zone_winterspring.cpp b/src/server/scripts/Kalimdor/zone_winterspring.cpp index aca3f6406d..50d2668025 100644 --- a/src/server/scripts/Kalimdor/zone_winterspring.cpp +++ b/src/server/scripts/Kalimdor/zone_winterspring.cpp @@ -735,7 +735,6 @@ public: default: return nullptr; } - } void UpdateEscortAI(uint32 diff) override diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp index df9044644a..d9c42a4d3d 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp @@ -180,7 +180,6 @@ public: Talk(SAY_HADRONOX_EMOTE); me->GetMotionMaster()->MoveCharge(hadronoxSteps[eventId - 1].GetPositionX(), hadronoxSteps[eventId - 1].GetPositionY(), hadronoxSteps[eventId - 1].GetPositionZ(), 10.0f, 0, NULL, true); break; - } DoMeleeAttackIfReady(); diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp index 13eda93185..34af34750d 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp @@ -51,7 +51,6 @@ public: if (Creature* hadronox = instance->GetCreature(_hadronoxGUID)) hadronox->AI()->JustSummoned(creature); break; - } } diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp index d05a550736..03ba422a95 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp @@ -134,7 +134,6 @@ public: me->SummonCreature(NPC_INITIATE, 366.861f, -721.702f, -16.1797f, 5.65409f); me->SummonCreature(NPC_INITIATE, 362.343f, -718.019f, -16.1797f, 5.51665f); me->SummonCreature(NPC_INITIATE, 358.906f, -714.357f, -16.1797f, 5.35957f); - } } diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp index c5891eabea..867fe426d6 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp @@ -243,7 +243,6 @@ public: m_auiEncounter[i] = NOT_STARTED; spheres = data5; - } else OUT_LOAD_INST_DATA_FAIL; @@ -283,7 +282,6 @@ public: if (!PlayerList.empty()) caster->CastSpell(acore::Containers::SelectRandomContainerElement(PlayerList), caster->GetMap()->IsHeroic() ? SPELL_SHADOW_SICKLE_H : SPELL_SHADOW_SICKLE, true); - } } diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp index ebcde65619..c5dc09ff57 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp @@ -101,7 +101,6 @@ public: if (Creature* halion = instance->GetCreature(HalionGUID)) halion->AI()->JustSummoned(creature); break; - } } diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp index ed9b0effc9..48387ad5b9 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp @@ -145,7 +145,6 @@ public: me->SetFlag(UNIT_FIELD_FLAGS_2, UNIT_FLAG2_FEIGN_DEATH); me->SetFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_DEAD); me->AddUnitState(UNIT_STATE_DIED); - } } @@ -362,7 +361,6 @@ public: { npc_escortAI::UpdateAI(uiDiff); } - }; CreatureAI* GetAI(Creature* pCreature) const override diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp index 21416b6858..0d7ca2ee3e 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp @@ -245,7 +245,6 @@ public: for( uint8 i = 0; i < MAX_ENCOUNTER; ++i ) if( m_auiEncounter[i] == IN_PROGRESS ) m_auiEncounter[i] = NOT_STARTED; - } else OUT_LOAD_INST_DATA_FAIL; @@ -743,7 +742,6 @@ public: pAdd->GetMotionMaster()->MoveFollow(pBoss, 2.0f, (i + 1)*M_PI / 2); pAdd->SetReactState(REACT_PASSIVE); } - } if (!shortver) diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp index f6a2ec928d..2fef2c6630 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp @@ -1987,7 +1987,6 @@ public: DoMeleeAttackIfReady(); } }; - }; enum eEnhShamanSpells @@ -2114,7 +2113,6 @@ public: events.RepeatEvent(30000); EventMapGCD(events, 1500); break; - } DoMeleeAttackIfReady(); @@ -2362,7 +2360,6 @@ public: me->DespawnOrUnsummon(); } }; - }; enum eHunterPetSpells diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp index 54272a12a6..e121c6c1aa 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp @@ -347,7 +347,6 @@ public: me->DespawnOrUnsummon(); } }; - }; class npc_mistress_of_pain : public CreatureScript @@ -429,7 +428,6 @@ public: me->DespawnOrUnsummon(); } }; - }; class spell_toc25_mistress_kiss : public SpellScriptLoader diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp index d183423111..d972e8e50b 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp @@ -1412,7 +1412,6 @@ public: } break; } - } } diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp index 6047fb6a5a..c09779dfd0 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp @@ -240,7 +240,6 @@ public: else timer -= diff; } - } }; diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp index ecb75197c2..65e958ca2d 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp @@ -889,7 +889,6 @@ public: me->ToTempSummon()->DespawnOrUnsummon(1); } }; - }; class npc_shadowy_mercenary : public CreatureScript diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp index 6260122fe8..9fb4cf4bd9 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp @@ -166,7 +166,6 @@ public: break; } NPC_TyrannusEventGUID = creature->GetGUID(); - } break; case NPC_LORALEN: diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp index 977f2c42d7..d4fc72f0b9 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp @@ -88,7 +88,6 @@ public: } else { - events.RescheduleEvent(2, 2500); } } @@ -1402,7 +1401,6 @@ public: class spell_pos_slave_trigger_closestSpellScript : public SpellScript { - PrepareSpellScript(spell_pos_slave_trigger_closestSpellScript); void HandleDummy(SpellEffIndex /*effIndex*/) diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp index ba97985a1d..64dfd12bad 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp @@ -575,7 +575,6 @@ public: _events.ScheduleEvent(EVENT_OUTRO_HORDE_1, 10000); _events.ScheduleEvent(EVENT_OUTRO_HORDE_2, 18000); _events.ScheduleEvent(EVENT_OUTRO_HORDE_3, 24000);*/ - } break; case ACTION_EVADE: diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp index 9024b15c38..660aa2fc60 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp @@ -268,7 +268,6 @@ enum Events EVENT_DESTROY_SOUL, EVENT_TELEPORT_BACK, EVENT_SOUL_RIP, - }; enum EventGroups @@ -694,7 +693,6 @@ public: me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC); me->SetReactState(REACT_PASSIVE); me->SetStandState(UNIT_STAND_STATE_SIT); - } bool CanAIAttack(Unit const* target) const override @@ -828,7 +826,6 @@ public: tirion->PlayDirectSound(17389); } } - } else if (damage >= me->GetHealth()) damage = me->GetHealth() - 1; @@ -2138,7 +2135,6 @@ public: a->SetDuration(0); if (GetCaster()->GetTypeId() == TYPEID_UNIT) GetCaster()->ToCreature()->DespawnOrUnsummon(3000); - } void Register() override diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp index d8eda808be..ab42db630f 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp @@ -1772,7 +1772,6 @@ public: c->getThreatManager().resetAllAggro(); for (ThreatContainer::StorageType::const_iterator iter = me_tl.begin(); iter != me_tl.end(); ++iter) c->getThreatManager().addThreat((*iter)->getTarget(), (*iter)->getThreat()); - } } @@ -2990,7 +2989,6 @@ public: else break; } - } bool CanAIAttack(Unit const* target) const override diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp index 25a190c2e5..1e21e228f0 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp @@ -455,7 +455,6 @@ public: events.ScheduleEvent(EVENT_SPELL_HARVEST_SOUL, urand(5000, 15000)); events.ScheduleEvent(EVENT_TELEPORT, 20000); events.ScheduleEvent(EVENT_CHECK_HEALTH, 1000); - } waveCount++; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp b/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp index f67436725f..5e4b3bffaf 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp @@ -217,7 +217,6 @@ public: me->SetFloatValue(UNIT_FIELD_COMBATREACH, 2.0f + (0.00025f * sizeTimer)); } }; - }; class spell_grobbulus_poison : public SpellScriptLoader diff --git a/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp b/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp index 073cee6ddb..cffdf1c89b 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp @@ -212,7 +212,6 @@ public: pInstance->SetData(DATA_IMMORTAL_FAIL, 0); return; } - } events.RepeatEvent(5000); return; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp index 088f8f0cba..2ad80211a4 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp @@ -183,7 +183,6 @@ public: go->SetGoState(GO_STATE_ACTIVE); } _justSpawned = false; - } void EnterEvadeMode() override diff --git a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp index cb877456fc..be2f6a48b6 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp @@ -93,7 +93,6 @@ public: if (GameObject* go = me->GetMap()->GetGameObject(pInstance->GetData64(DATA_MAEXXNA_GATE))) go->SetGoState(GO_STATE_ACTIVE); } - } void EnterCombat(Unit* who) override diff --git a/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp b/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp index 33f32171ed..2fb33782bf 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp @@ -173,7 +173,6 @@ public: } events.RepeatEvent(1000); break; - } DoMeleeAttackIfReady(); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp index 48b830813f..792984987b 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp @@ -268,7 +268,6 @@ public: case EVENT_FLIGHT_START: if (me->HealthBelowPct(11)) { - return; } events.RepeatEvent(45000); @@ -369,7 +368,6 @@ public: pInstance->SetData(DATA_HUNDRED_CLUB, 0); return; } - } events.RepeatEvent(5000); return; diff --git a/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp b/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp index abbb7d8ef6..c2dfc5f920 100644 --- a/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp +++ b/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp @@ -109,7 +109,6 @@ public: sapphironAchievement = true; heiganAchievement = true; immortalAchievement = 1; - } std::set<GameObject*> HeiganEruption[4]; @@ -909,7 +908,6 @@ public: else OUT_LOAD_INST_DATA_FAIL; } - }; }; class boss_naxxramas_misc : public CreatureScript diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp index 11963460d8..2504733bd1 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp @@ -238,7 +238,6 @@ public: GetUnitOwner()->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); GetUnitOwner()->SetControlled(true, UNIT_STATE_STUNNED); GetUnitOwner()->ToCreature()->LoadEquipment(0, true); - } void HandleRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp index adb453e786..8d5233e5fc 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp @@ -100,7 +100,6 @@ public: pGo->UseDoorOrButton(0, false); } } - } void KilledUnit(Unit* /*victim*/) override diff --git a/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp b/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp index 9d025c6639..8a614c5628 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp @@ -253,7 +253,6 @@ public: for( uint8 i = 0; i < MAX_ENCOUNTER; ++i ) if( m_auiEncounter[i] == IN_PROGRESS ) m_auiEncounter[i] = NOT_STARTED; - } else OUT_LOAD_INST_DATA_FAIL; diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp index 6d95edeaea..8535961395 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp @@ -209,7 +209,6 @@ public: m_auiEncounter[i] = NOT_STARTED; OUT_LOAD_INST_DATA_COMPLETE; - } else OUT_LOAD_INST_DATA_FAIL; diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/brann_bronzebeard.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/brann_bronzebeard.cpp index c1af6c2c4f..ce78920d03 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/brann_bronzebeard.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/brann_bronzebeard.cpp @@ -179,7 +179,6 @@ public: default: break; } - } SendGossipMenuFor(player, TEXT_ID_START, creature->GetGUID()); return true; @@ -223,7 +222,6 @@ public: struct brann_bronzebeardAI : public npc_escortAI { - brann_bronzebeardAI(Creature* c) : npc_escortAI(c), summons(me) { AbedneumGUID = MarnakGUID = KaddrakGUID = 0; @@ -515,7 +513,6 @@ public: } case EVENT_GO_TO_SJONNIR: { - if (GameObject* door = ObjectAccessor::GetGameObject(*me, pInstance->GetData64(GO_SJONNIR_DOOR))) door->SetGoState(GO_STATE_ACTIVE); SetEscortPaused(false); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp index dfb42afd7a..bb6dc63f4d 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp @@ -175,7 +175,6 @@ void RestoreAssemblyHealth(uint64 guid1, uint64 guid2, Creature* me) if(Creature* cr2 = ObjectAccessor::GetCreature(*me, guid2)) if(cr2->IsAlive()) cr2->SetHealth(cr2->GetMaxHealth()); - } class boss_steelbreaker : public CreatureScript diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp index 51308a594e..c57067d62f 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp @@ -121,7 +121,6 @@ enum Texts FLAME_LEVIATHAN_EMOTE_PURSUE, FLAME_LEVIATHAN_EMOTE_OVERLOAD, FLAME_LEVIATHAN_EMOTE_REPAIR - }; enum Sounds @@ -1092,7 +1091,6 @@ public: } } }; - }; class npc_thorims_hammer : public CreatureScript diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp index b87c69ff2c..65aff47fe5 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp @@ -1193,7 +1193,6 @@ public: void HandleEffectPeriodic(AuraEffect const* /*aurEff*/) { - if (Unit* target = GetTarget()) { if (target->GetMapId() == 603) diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp index d5b2ce494d..8f16064df3 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp @@ -1055,7 +1055,6 @@ public: events.ScheduleEvent(EVENT_SPELL_SHOCK_BLAST, 20000); events.ScheduleEvent(EVENT_PROXIMITY_MINES_1, 6000); break; - } } } @@ -1677,7 +1676,6 @@ public: DoZoneInCombat(); events.Reset(); events.ScheduleEvent(EVENT_SPELL_PLASMA_BALL, 0); - } } else if (id == 2 && !immobilized && Phase == 3) // magnetic core diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp index 02eec6f852..e2abb39bde 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp @@ -430,7 +430,6 @@ public: if( npc_entry ) if (Creature* c = me->SummonCreature(npc_entry, x, y, 391.1f, j * M_PI / 2, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 5000)) DoZoneInCombat(c); - } } break; diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp index a089c6e624..a71d77205c 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp @@ -391,7 +391,6 @@ public: // Disabled by stunned state DoMeleeAttackIfReady(); } - }; }; diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.cpp index 93488c4c6e..0322edcf53 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.cpp @@ -368,7 +368,6 @@ public: class AreaTrigger_at_celestial_planetarium_enterance : public AreaTriggerScript { public: - AreaTrigger_at_celestial_planetarium_enterance() : AreaTriggerScript("at_celestial_planetarium_enterance") { diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp index 279aa60588..8f212a8ce6 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp @@ -98,7 +98,6 @@ public: } } }; - }; class boss_keleseth : public CreatureScript @@ -215,7 +214,6 @@ public: DoMeleeAttackIfReady(); } }; - }; enum eSkeletonEnum @@ -329,7 +327,6 @@ public: DoMeleeAttackIfReady(); } }; - }; class spell_frost_tomb : public SpellScriptLoader diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp index f7f040b29f..d99fa9dfdb 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp @@ -371,7 +371,6 @@ public: return false; } }; - }; void AddSC_instance_utgarde_keep() diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp index 0048cbc229..41fe782f65 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp @@ -183,7 +183,6 @@ public: private: bool _setData; EventMap _events; - }; CreatureAI* GetAI(Creature* creature) const override diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp index 1df06b827a..bc309e31ad 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp @@ -167,7 +167,6 @@ public: void DoAction(int32 param) override { - if (param == ACTION_PHASE2) { SecondPhase = true; @@ -306,7 +305,6 @@ public: AchievementHitCount++; if (AchievementHitCount >= 3 && m_pInstance) m_pInstance->SetData(DATA_SKADI_ACHIEVEMENT, true); - } } diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp index d4b7e198f8..7a27d18835 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp @@ -314,7 +314,6 @@ public: events.RepeatEvent(15000); break; } - } DoMeleeAttackIfReady(); diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp index 29bfcaa49f..0fb741e32e 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp @@ -188,7 +188,6 @@ public: case DATA_YMIRON_ACHIEVEMENT: ymironAchievement = (bool)data; return; - } OUT_SAVE_INST_DATA; @@ -229,7 +228,6 @@ public: for (uint8 i = 0; i < MAX_ENCOUNTERS; ++i) if (Encounters[i] == IN_PROGRESS) Encounters[i] = NOT_STARTED; - } else OUT_LOAD_INST_DATA_FAIL; @@ -296,4 +294,4 @@ public: void AddSC_instance_utgarde_pinnacle() { new instance_pinnacle(); -}
\ No newline at end of file +} diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp index ab63fa9336..8a32380f47 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp @@ -35,7 +35,6 @@ enum Events EVENT_FROZEN_ORB_STALKER = 2, EVENT_CAST_WHITEOUT = 3, EVENT_CAST_WHITEOUT_GROUND_EFFECT = 4, - }; enum Misc diff --git a/src/server/scripts/Northrend/zone_borean_tundra.cpp b/src/server/scripts/Northrend/zone_borean_tundra.cpp index b98336de37..246a697c7b 100644 --- a/src/server/scripts/Northrend/zone_borean_tundra.cpp +++ b/src/server/scripts/Northrend/zone_borean_tundra.cpp @@ -197,9 +197,7 @@ public: } } else phaseTimer -= diff; - } - }; CreatureAI* GetAI(Creature* creature) const override @@ -296,7 +294,6 @@ public: player->CastSpell(player, SPELL_SUMMON_WYRMREST_SKYTALON, true); player->CastSpell(player, SPELL_WYRMREST_SKYTALON_RIDE_PERIODIC, true); - } return true; @@ -1270,7 +1267,6 @@ public: return true; } - }; enum BloodsporeRuination diff --git a/src/server/scripts/Northrend/zone_crystalsong_forest.cpp b/src/server/scripts/Northrend/zone_crystalsong_forest.cpp index cfb55a6838..32349959a3 100644 --- a/src/server/scripts/Northrend/zone_crystalsong_forest.cpp +++ b/src/server/scripts/Northrend/zone_crystalsong_forest.cpp @@ -204,12 +204,10 @@ public: if (!targetGUID) if (Creature* pOrb = GetClosestCreatureWithEntry(me, NPC_TRANSITUS_SHIELD_DUMMY, 32.0f)) targetGUID = pOrb->GetGUID(); - } if (Creature* pOrb = ObjectAccessor::GetCreature(*me, targetGUID)) DoCast(pOrb, SPELL_TRANSITUS_SHIELD_BEAM); - } }; diff --git a/src/server/scripts/Northrend/zone_dalaran.cpp b/src/server/scripts/Northrend/zone_dalaran.cpp index f982224e23..3f614fa8fc 100644 --- a/src/server/scripts/Northrend/zone_dalaran.cpp +++ b/src/server/scripts/Northrend/zone_dalaran.cpp @@ -553,7 +553,6 @@ public: void UpdateAI(uint32 diff) override { - if (!sWorld->getBoolConfig(CONFIG_MINIGOB_MANABONK)) return; @@ -620,7 +619,6 @@ public: { npc_dalaran_mageAI(Creature* creature) : ScriptedAI(creature) { - } uint32 CoC_Timer; @@ -649,9 +647,9 @@ public: void EnterCombat(Unit* /*who*/) override { } + void UpdateAI(uint32 diff) override { - if (!UpdateVictim()) return; diff --git a/src/server/scripts/Northrend/zone_dragonblight.cpp b/src/server/scripts/Northrend/zone_dragonblight.cpp index 94320c0652..3647539e61 100644 --- a/src/server/scripts/Northrend/zone_dragonblight.cpp +++ b/src/server/scripts/Northrend/zone_dragonblight.cpp @@ -1008,7 +1008,6 @@ public: } c->ToCreature()->DespawnOrUnsummon(1); } - } break; case 18: // summon vegard @@ -1244,7 +1243,6 @@ public: me->CastSpell(me, SPELL_SAC_EMERGE, true); } } - }; }; diff --git a/src/server/scripts/Northrend/zone_grizzly_hills.cpp b/src/server/scripts/Northrend/zone_grizzly_hills.cpp index 2257f011cc..3d383ce1d2 100644 --- a/src/server/scripts/Northrend/zone_grizzly_hills.cpp +++ b/src/server/scripts/Northrend/zone_grizzly_hills.cpp @@ -21,7 +21,6 @@ enum qRedRocket SPELL_TORPEDO_EXPLODE = 49290, SPELL_ALLIANCE_TORPEDO_KILL_CREDIT = 49510, SPELL_HORDE_TORPEDO_KILL_CREDIT = 49340, - }; class npc_riding_the_red_rocket : public CreatureScript diff --git a/src/server/scripts/Northrend/zone_icecrown.cpp b/src/server/scripts/Northrend/zone_icecrown.cpp index 113f6d1aa8..e0b739e616 100644 --- a/src/server/scripts/Northrend/zone_icecrown.cpp +++ b/src/server/scripts/Northrend/zone_icecrown.cpp @@ -1094,7 +1094,6 @@ public: { return new spell_switch_infragreen_bomber_station_SpellScript(); } - }; class spell_charge_shield_bomber : public SpellScriptLoader @@ -1406,7 +1405,6 @@ public: private: EventMap events; - }; CreatureAI* GetAI(Creature* creature) const override @@ -1457,7 +1455,6 @@ public: who->CastSpell(who, SPELL_TRESPASSER_H, true); else who->CastSpell(who, SPELL_TRESPASSER_A, true); - } }; @@ -1617,14 +1614,12 @@ public: } void MoveInLineOfSight(Unit* /*who*/) override { } - }; CreatureAI* GetAI(Creature* creature) const override { return new npc_tournament_training_dummyAI(creature); } - }; // Battle for Crusaders' Pinnacle diff --git a/src/server/scripts/Northrend/zone_storm_peaks.cpp b/src/server/scripts/Northrend/zone_storm_peaks.cpp index 35d92736dd..367c6eb3c8 100644 --- a/src/server/scripts/Northrend/zone_storm_peaks.cpp +++ b/src/server/scripts/Northrend/zone_storm_peaks.cpp @@ -438,7 +438,6 @@ public: } else Talk(2); - } } @@ -1029,7 +1028,6 @@ public: private: uint8 _counter; - }; AuraScript* GetAuraScript() const override diff --git a/src/server/scripts/Northrend/zone_zuldrak.cpp b/src/server/scripts/Northrend/zone_zuldrak.cpp index 87f6b744fb..28fb3bba7c 100644 --- a/src/server/scripts/Northrend/zone_zuldrak.cpp +++ b/src/server/scripts/Northrend/zone_zuldrak.cpp @@ -159,7 +159,6 @@ public: uint32 GetTaskAura(uint32 itemcode) { return AA_AURA_ID[itemcode % 100]; } uint32 GetTaskItemEntry(uint32 itemcode) { return AA_ITEM_ENTRY[itemcode % 100]; } const char* GetTaskItemName(uint32 itemcode) { return AA_ITEM_NAME[itemcode % 100]; } - }; bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) override @@ -567,7 +566,6 @@ public: playerGUID = 0; EnterEvadeMode(); break; - } if (me->getFaction() == 35 || me->HasUnitState(UNIT_STATE_CASTING | UNIT_STATE_STUNNED)) diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp index bea48bfe3c..89a732250b 100644 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp @@ -757,7 +757,6 @@ void OutdoorPvPEP::SendRemoveWorldStates(Player* player) class OutdoorPvP_eastern_plaguelands : public OutdoorPvPScript { public: - OutdoorPvP_eastern_plaguelands() : OutdoorPvPScript("outdoorpvp_ep") { diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPEP.h b/src/server/scripts/OutdoorPvP/OutdoorPvPEP.h index 13380c5300..7191ad3827 100644 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPEP.h +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPEP.h @@ -174,7 +174,6 @@ class OutdoorPvPEP; class OPvPCapturePointEP_EWT : public OPvPCapturePoint { public: - OPvPCapturePointEP_EWT(OutdoorPvP* pvp); void ChangeState() override; @@ -188,13 +187,11 @@ public: void HandlePlayerLeave(Player* player) override; protected: - void SummonSupportUnitAtNorthpassTower(TeamId teamId); void UpdateTowerState(); protected: - uint32 m_TowerState; TeamId m_UnitsSummonedSideId; @@ -203,7 +200,6 @@ protected: class OPvPCapturePointEP_NPT : public OPvPCapturePoint { public: - OPvPCapturePointEP_NPT(OutdoorPvP* pvp); void ChangeState() override; @@ -217,13 +213,11 @@ public: void HandlePlayerLeave(Player* player) override; protected: - void SummonGO(TeamId teamId); void UpdateTowerState(); protected: - uint32 m_TowerState; TeamId m_SummonedGOSideId; @@ -232,7 +226,6 @@ protected: class OPvPCapturePointEP_CGT : public OPvPCapturePoint { public: - OPvPCapturePointEP_CGT(OutdoorPvP* pvp); void ChangeState() override; @@ -246,13 +239,11 @@ public: void HandlePlayerLeave(Player* player) override; protected: - void LinkGraveyard(TeamId teamId); void UpdateTowerState(); protected: - uint32 m_TowerState; TeamId m_GraveyardSide; @@ -261,7 +252,6 @@ protected: class OPvPCapturePointEP_PWT : public OPvPCapturePoint { public: - OPvPCapturePointEP_PWT(OutdoorPvP* pvp); void ChangeState() override; @@ -275,13 +265,11 @@ public: void HandlePlayerLeave(Player* player) override; protected: - void SummonFlightMaster(TeamId teamId); void UpdateTowerState(); protected: - TeamId m_FlightMasterSpawnedId; uint32 m_TowerState; @@ -290,7 +278,6 @@ protected: class OutdoorPvPEP : public OutdoorPvP { public: - OutdoorPvPEP(); bool SetupOutdoorPvP() override; @@ -309,7 +296,6 @@ public: void SetControlledState(uint32 index, TeamId teamId); private: - // how many towers are controlled TeamId EP_ControlsId[EP_TOWER_NUM]; diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPGH.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPGH.cpp index 56abd2b4ad..2081b47388 100644 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPGH.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPGH.cpp @@ -106,7 +106,6 @@ void OPvPCapturePointGH::ChangeState() class OutdoorPvP_grizzly_hills : public OutdoorPvPScript { public: - OutdoorPvP_grizzly_hills() : OutdoorPvPScript("outdoorpvp_gh") { diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp index a61346512f..ee2f174e4d 100644 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp @@ -351,7 +351,6 @@ void OutdoorPvPHP::SetHordeTowersControlled(uint32 count) class OutdoorPvP_hellfire_peninsula : public OutdoorPvPScript { public: - OutdoorPvP_hellfire_peninsula() : OutdoorPvPScript("outdoorpvp_hp") { diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPHP.h b/src/server/scripts/OutdoorPvP/OutdoorPvPHP.h index e8ec63ae50..6fd5e22b9f 100644 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPHP.h +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPHP.h @@ -77,7 +77,6 @@ const go_type HPTowerFlags[HP_TOWER_NUM] = class OPvPCapturePointHP : public OPvPCapturePoint { public: - OPvPCapturePointHP(OutdoorPvP* pvp, OutdoorPvPHPTowerType type); void ChangeState() override; @@ -91,14 +90,12 @@ public: void HandlePlayerLeave(Player* player) override; private: - OutdoorPvPHPTowerType m_TowerType; }; class OutdoorPvPHP : public OutdoorPvP { public: - OutdoorPvPHP(); bool SetupOutdoorPvP() override; @@ -121,7 +118,6 @@ public: void SetHordeTowersControlled(uint32 count); private: - // how many towers are controlled uint32 m_AllianceTowersControlled; uint32 m_HordeTowersControlled; diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp index 4e95dfab34..a98dc0a51f 100644 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp @@ -650,7 +650,6 @@ void OPvPCapturePointNA::UpdateWyvernRoostWorldState(uint32 roost) class OutdoorPvP_nagrand : public OutdoorPvPScript { public: - OutdoorPvP_nagrand() : OutdoorPvPScript("outdoorpvp_na") { diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPNA.h b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.h index 5224d8b340..4138bc4578 100644 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPNA.h +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.h @@ -242,7 +242,6 @@ class OutdoorPvPNA; class OPvPCapturePointNA : public OPvPCapturePoint { public: - OPvPCapturePointNA(OutdoorPvP* pvp); bool Update(uint32 diff) override; @@ -265,7 +264,6 @@ public: TeamId GetControllingFaction() const; protected: - // called when a faction takes control void FactionTakeOver(TeamId teamId); @@ -279,7 +277,6 @@ protected: void UpdateHalaaWorldState(); private: - bool m_capturable; uint32 m_GuardsAlive; @@ -301,7 +298,6 @@ private: class OutdoorPvPNA : public OutdoorPvP { public: - OutdoorPvPNA(); bool SetupOutdoorPvP() override; @@ -318,7 +314,6 @@ public: void HandleKillImpl(Player* player, Unit* killed) override; private: - OPvPCapturePointNA* m_obj; }; diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp index 86073b4b96..64749e7d7f 100644 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp @@ -234,7 +234,6 @@ bool OutdoorPvPSI::HandleCustomSpell(Player* player, uint32 spellId, GameObject* class OutdoorPvP_silithus : public OutdoorPvPScript { public: - OutdoorPvP_silithus() : OutdoorPvPScript("outdoorpvp_si") { diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPSI.h b/src/server/scripts/OutdoorPvP/OutdoorPvPSI.h index d797f295ce..6ba7ed4b90 100644 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPSI.h +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPSI.h @@ -43,7 +43,6 @@ enum SI_WorldStates class OutdoorPvPSI : public OutdoorPvP { public: - OutdoorPvPSI(); bool SetupOutdoorPvP() override; @@ -66,7 +65,6 @@ public: void UpdateWorldState(); private: - uint32 m_Gathered_A; uint32 m_Gathered_H; diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp index ade26f9e5d..002ecca8f4 100644 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp @@ -350,7 +350,6 @@ void OPvPCapturePointTF::SendChangePhase() class OutdoorPvP_terokkar_forest : public OutdoorPvPScript { public: - OutdoorPvP_terokkar_forest() : OutdoorPvPScript("outdoorpvp_tf") { diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPTF.h b/src/server/scripts/OutdoorPvP/OutdoorPvPTF.h index 1a09ef2b4f..eacf70fc32 100644 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPTF.h +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPTF.h @@ -113,7 +113,6 @@ enum TFTowerStates class OPvPCapturePointTF : public OPvPCapturePoint { public: - OPvPCapturePointTF(OutdoorPvP* pvp, OutdoorPvPTF_TowerType type); bool Update(uint32 diff) override; @@ -131,7 +130,6 @@ public: void UpdateTowerState(); protected: - OutdoorPvPTF_TowerType m_TowerType; uint32 m_TowerState; @@ -140,7 +138,6 @@ protected: class OutdoorPvPTF : public OutdoorPvP { public: - OutdoorPvPTF(); bool SetupOutdoorPvP() override; @@ -163,7 +160,6 @@ public: bool IsLocked() const; private: - bool m_IsLocked; uint32 m_LockTimer; uint32 m_LockTimerUpdate; diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp index fa207b7518..0a719d5c67 100644 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp @@ -444,7 +444,6 @@ void OutdoorPvPZM::SendRemoveWorldStates(Player* player) class OutdoorPvP_zangarmarsh : public OutdoorPvPScript { public: - OutdoorPvP_zangarmarsh() : OutdoorPvPScript("outdoorpvp_zm") { diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.h b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.h index a2d34a3c1f..4dc8e9edda 100644 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.h +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.h @@ -158,7 +158,6 @@ class OutdoorPvPZM; class OPvPCapturePointZM_Beacon : public OPvPCapturePoint { public: - OPvPCapturePointZM_Beacon(OutdoorPvP* pvp, ZM_BeaconType type); void ChangeState() override; @@ -174,7 +173,6 @@ public: void UpdateTowerState(); protected: - ZM_BeaconType m_TowerType; uint32 m_TowerState; }; @@ -189,7 +187,6 @@ enum ZM_GraveYardState class OPvPCapturePointZM_GraveYard : public OPvPCapturePoint { public: - OPvPCapturePointZM_GraveYard(OutdoorPvP* pvp); bool Update(uint32 diff) override; @@ -213,11 +210,9 @@ public: uint32 GetGraveYardState() const; private: - uint32 m_GraveYardState; protected: - TeamId m_BothControllingFactionId; uint64 m_FlagCarrierGUID; }; @@ -225,7 +220,6 @@ protected: class OutdoorPvPZM : public OutdoorPvP { public: - OutdoorPvPZM(); bool SetupOutdoorPvP() override; @@ -248,7 +242,6 @@ public: void SetHordeTowersControlled(uint32 count); private: - OPvPCapturePointZM_GraveYard* m_GraveYard; uint32 m_AllianceTowersControlled; diff --git a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp index a63c4bbcad..3366eab405 100644 --- a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp +++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp @@ -10,7 +10,6 @@ enum eShirrak { - SPELL_INHIBIT_MAGIC = 32264, SPELL_ATTRACT_MAGIC = 32265, SPELL_CARNIVOROUS_BITE_N = 36383, diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp index 2f2a8d5521..322cd52976 100644 --- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp +++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp @@ -106,7 +106,6 @@ public: OUT_LOAD_INST_DATA_COMPLETE; } }; - }; void AddSC_instance_sethekk_halls() diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp index 700fe3c88e..a37de398b9 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp @@ -151,7 +151,6 @@ public: DoMeleeAttackIfReady(); } }; - }; void AddSC_boss_ambassador_hellmaw() diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp index 3c7b1a5224..dbb03eafeb 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp @@ -135,7 +135,6 @@ public: DoMeleeAttackIfReady(); } }; - }; void AddSC_boss_blackheart_the_inciter() diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp index b1affeba3c..da3173cf73 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp @@ -156,7 +156,6 @@ public: OUT_LOAD_INST_DATA_COMPLETE; } }; - }; void AddSC_instance_shadow_labyrinth() diff --git a/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp b/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp index 91624c2980..78ece226a7 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp @@ -183,7 +183,6 @@ public: return me->GetHomePosition().GetExactDist2d(me) > 105.0f; } }; - }; class spell_gurtogg_bloodboil : public SpellScriptLoader diff --git a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp index 6a3b709419..8175afa38a 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp @@ -560,7 +560,6 @@ public: } events.ScheduleEvent(EVENT_ANGER_SEETHE, 1000); break; - } DoMeleeAttackIfReady(); diff --git a/src/server/scripts/Outland/BlackTemple/illidari_council.cpp b/src/server/scripts/Outland/BlackTemple/illidari_council.cpp index c7c367eb11..47a2527d6d 100644 --- a/src/server/scripts/Outland/BlackTemple/illidari_council.cpp +++ b/src/server/scripts/Outland/BlackTemple/illidari_council.cpp @@ -208,7 +208,6 @@ public: me->CastSpell(me, SPELL_EMPYREAL_BALANCE, true); } }; - }; struct boss_illidari_council_memberAI : public ScriptedAI { diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp index 89d1ad9031..00e3878926 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp @@ -264,7 +264,6 @@ public: me->CastSpell(target, SPELL_VILE_SLUDGE, false); events.ScheduleEvent(EVENT_SPELL_VILE_SLUDGE, 15000, GROUP_ABILITIES); break; - } DoMeleeAttackIfReady(); diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp index 762333fe46..9a98053af3 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp @@ -347,7 +347,6 @@ public: if (roll_chance_i(33)) if (Unit* target = GetCaster()->GetAI()->SelectTarget(SELECT_TARGET_RANDOM, 0, 30.0f, true)) target->CastSpell(GetCaster(), SPELL_TAUNT, true); - } void Register() override diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp index 51f5041e30..3a75a7f5b4 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp @@ -244,7 +244,6 @@ public: PreventDefaultAction(); GetUnitOwner()->SetFacingTo(Position::NormalizeOrientation(GetUnitOwner()->GetOrientation() + 0.1f)); GetUnitOwner()->CastSpell(GetUnitOwner(), aurEff->GetAmount(), true); - } void Register() override diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp index 47aa801ed1..93981663f8 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp @@ -45,7 +45,6 @@ enum Misc EVENT_SPELL_EARTHQUAKE = 3, EVENT_SUMMON_MURLOCS = 4, EVENT_KILL_TALK = 5 - }; const uint32 wateryGraveId[4] = {SPELL_WATERY_GRAVE_1, SPELL_WATERY_GRAVE_2, SPELL_WATERY_GRAVE_3, SPELL_WATERY_GRAVE_4}; diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/serpent_shrine.h b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/serpent_shrine.h index d05e0fc947..1dfb8aaf68 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/serpent_shrine.h +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/serpent_shrine.h @@ -27,7 +27,6 @@ enum DataTypes DATA_ALIVE_KEEPERS = 22, DATA_BRIDGE_ACTIVATED = 23, DATA_ACTIVATE_SHIELD = 24, - }; enum SSNPCs diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp index 12ab99d9c5..9bf03fe96b 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp @@ -103,7 +103,6 @@ public: DoMeleeAttackIfReady(); } }; - }; void AddSC_boss_hydromancer_thespia() diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp index 536516f5e4..be30c43ca8 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp @@ -27,7 +27,6 @@ enum MekgineerSteamrigger EVENT_SPELL_SHRINK = 4, EVENT_SPELL_SAW = 5, EVENT_SPELL_NET = 6 - }; class boss_mekgineer_steamrigger : public CreatureScript diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp index c7ae7c9bff..b87f2c5588 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp @@ -110,7 +110,6 @@ public: DoMeleeAttackIfReady(); } }; - }; class npc_naga_distiller : public CreatureScript @@ -165,7 +164,6 @@ public: } } }; - }; void AddSC_boss_warlord_kalithresh() diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp index 5b5fbf4e8e..722586b93f 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp @@ -33,7 +33,6 @@ public: return true; } - }; class instance_steam_vault : public InstanceMapScript diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp index b3b96097cb..f4f81d0ff5 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp @@ -25,7 +25,6 @@ enum eEnums class boss_broggok : public CreatureScript { public: - boss_broggok() : CreatureScript("boss_broggok") { } @@ -90,7 +89,6 @@ public: me->CastSpell(me, SPELL_POISON_CLOUD, false); events.RepeatEvent(20000); break; - } DoMeleeAttackIfReady(); @@ -124,7 +122,6 @@ public: break; } } - }; CreatureAI* GetAI(Creature* creature) const override diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp index d6c11b0b6f..fc28504339 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp @@ -54,7 +54,6 @@ const float ShadowmoonChannelers[5][4] = class boss_kelidan_the_breaker : public CreatureScript { public: - boss_kelidan_the_breaker() : CreatureScript("boss_kelidan_the_breaker") { } @@ -273,7 +272,6 @@ public: class npc_shadowmoon_channeler : public CreatureScript { public: - npc_shadowmoon_channeler() : CreatureScript("npc_shadowmoon_channeler") {} struct npc_shadowmoon_channelerAI : public ScriptedAI diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp index 0c6d1e2739..aaee2df5f5 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp @@ -26,7 +26,6 @@ enum eEnums class boss_the_maker : public CreatureScript { public: - boss_the_maker() : CreatureScript("boss_the_maker") { } @@ -82,7 +81,6 @@ public: instance->SetData(DATA_THE_MAKER, DONE); instance->HandleGameObject(instance->GetData64(DATA_DOOR2), true); instance->HandleGameObject(instance->GetData64(DATA_DOOR3), true); - } void UpdateAI(uint32 diff) override diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp index 126da8aa90..dc83b5ff0b 100644 --- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp @@ -86,7 +86,6 @@ private: class boss_magtheridon : public CreatureScript { public: - boss_magtheridon() : CreatureScript("boss_magtheridon") { } struct boss_magtheridonAI : public BossAI @@ -130,7 +129,6 @@ public: events.ScheduleEvent(EVENT_EMOTE2, 60000); events.ScheduleEvent(EVENT_EMOTE3, 120000); events.ScheduleEvent(EVENT_ENTER_COMBAT, 123000); - } void UpdateAI(uint32 diff) override diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp index 1ec74b2ef4..1747cce315 100644 --- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp @@ -210,7 +210,6 @@ public: std::set<uint64> _wardersSet; std::set<uint64> _cubesSet; std::set<uint64> _columnSet; - }; InstanceScript* GetInstanceScript(InstanceMap* map) const override diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp index 3656dac9da..2d071d695a 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp @@ -62,7 +62,6 @@ enum Misc EVENT_MOVE_TO_PHASE_2 = 20, EVENT_FINISH_DIVE = 21 - }; // Xinef: Ruse of the Ashtongue (10946) diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp index 2cb96bfda8..f68c703426 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp @@ -56,7 +56,6 @@ enum Misc class boss_high_astromancer_solarian : public CreatureScript { public: - boss_high_astromancer_solarian() : CreatureScript("boss_high_astromancer_solarian") { } struct boss_high_astromancer_solarianAI : public BossAI @@ -212,7 +211,6 @@ public: me->CastSpell(me, SPELL_PSYCHIC_SCREAM, false); events.ScheduleEvent(EVENT_SPELL_PSYCHIC_SCREAM, 12000); break; - } DoMeleeAttackIfReady(); diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp index 4cf2e8ba42..e778d11f39 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp @@ -703,7 +703,6 @@ public: { return me->GetHomePosition().GetExactDist2d(me) > 165.0f || !SelectTargetFromPlayerList(165.0f); } - }; CreatureAI* GetAI(Creature* creature) const override { diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp index 46aa62fe1a..304fe9111b 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp @@ -27,7 +27,6 @@ enum voidReaver class boss_void_reaver : public CreatureScript { public: - boss_void_reaver() : CreatureScript("boss_void_reaver") { } struct boss_void_reaverAI : public BossAI diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp index 3db9f25b82..c3462e59dc 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp @@ -176,7 +176,6 @@ public: DoMeleeAttackIfReady(); } - }; CreatureAI* GetAI(Creature* creature) const override { diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp index 077840fec5..41b753182d 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp @@ -171,7 +171,6 @@ public: AttackStart(target); events2.ScheduleEvent(EVENT_SEARCH_FIGHT, 1000); break; - } if (!UpdateVictim()) @@ -224,7 +223,6 @@ public: break; } break; - } DoMeleeAttackIfReady(); @@ -360,7 +358,6 @@ public: me->CastSpell((Unit*)NULL, SPELL_TARGET_OMEGA, false); instance->HandleGameObject(instance->GetData64(DATA_WARDENS_SHIELD), true); instance->SetBossState(DATA_WARDEN_MELLICHAR, NOT_STARTED); - } void DamageTaken(Unit* attacker, uint32& damage, DamageEffectType, SpellSchoolMask) override diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp index 7d6c267c1f..23b051ccb8 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp @@ -40,7 +40,6 @@ enum Misc class boss_high_botanist_freywinn : public CreatureScript { public: - boss_high_botanist_freywinn() : CreatureScript("boss_high_botanist_freywinn") { } diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp index be5528fe70..71d8822fec 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp @@ -45,7 +45,6 @@ enum Misc class boss_laj : public CreatureScript { public: - boss_laj() : CreatureScript("boss_laj") { } struct boss_lajAI : public BossAI diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp index be97c29d59..946f4bf176 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp @@ -34,7 +34,6 @@ enum Misc class boss_warp_splinter : public CreatureScript { public: - boss_warp_splinter() : CreatureScript("boss_warp_splinter") { } struct boss_warp_splinterAI : public BossAI { diff --git a/src/server/scripts/Outland/zone_nagrand.cpp b/src/server/scripts/Outland/zone_nagrand.cpp index f0f62b49d9..2e20f495d7 100644 --- a/src/server/scripts/Outland/zone_nagrand.cpp +++ b/src/server/scripts/Outland/zone_nagrand.cpp @@ -149,7 +149,6 @@ public: summoned->SetWalk(false); summoned->GetMotionMaster()->MovePoint(0, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ()); summoned->AI()->AttackStart(me); - } void SpellHitTarget(Unit* /*target*/, const SpellInfo* spell) override diff --git a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp index cdc8c6c59d..7e4e4627bf 100644 --- a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp +++ b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp @@ -428,7 +428,6 @@ enum EnshlavedNetherwingDrake // Creatures NPC_DRAGONMAW_SUBJUGATOR = 21718, NPC_ESCAPE_DUMMY = 22317 - }; class npc_enslaved_netherwing_drake : public CreatureScript diff --git a/src/server/scripts/Outland/zone_shattrath_city.cpp b/src/server/scripts/Outland/zone_shattrath_city.cpp index ef537267c5..33192c5981 100644 --- a/src/server/scripts/Outland/zone_shattrath_city.cpp +++ b/src/server/scripts/Outland/zone_shattrath_city.cpp @@ -119,7 +119,6 @@ enum Salsalabim // Spells SPELL_MAGNETIC_PULL = 31705 - }; class npc_salsalabim : public CreatureScript diff --git a/src/server/scripts/Spells/spell_dk.cpp b/src/server/scripts/Spells/spell_dk.cpp index 4734b7c821..1a93cc158c 100644 --- a/src/server/scripts/Spells/spell_dk.cpp +++ b/src/server/scripts/Spells/spell_dk.cpp @@ -1760,7 +1760,6 @@ public: { OnEffectHitTarget += SpellEffectFn(spell_dk_death_strike_SpellScript::HandleDummy, EFFECT_2, SPELL_EFFECT_DUMMY); } - }; SpellScript* GetSpellScript() const override diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp index a4883ea3e0..1e372721af 100644 --- a/src/server/scripts/Spells/spell_generic.cpp +++ b/src/server/scripts/Spells/spell_generic.cpp @@ -1243,7 +1243,6 @@ public: OnEffectApply += AuraEffectApplyFn(spell_gen_visual_dummy_stun_AuraScript::HandleEffectApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); OnEffectRemove += AuraEffectRemoveFn(spell_gen_visual_dummy_stun_AuraScript::HandleEffectRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } - }; AuraScript* GetAuraScript() const override @@ -2311,7 +2310,6 @@ public: WorldPacket data2; player->BuildCooldownPacket(data, SPELL_COOLDOWN_FLAG_INCLUDE_GCD, 42292, GetSpellInfo()->CategoryRecoveryTime); // PvP Trinket spell player->GetSession()->SendPacket(&data2); - } } } @@ -3064,7 +3062,6 @@ public: OnEffectApply += AuraEffectApplyFn(spell_gen_damage_reduction_AuraScript::OnApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); OnEffectRemove += AuraEffectRemoveFn(spell_gen_damage_reduction_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); } - }; AuraScript* GetAuraScript() const override @@ -4893,7 +4890,6 @@ public: { return new spell_gen_vendor_bark_trigger_SpellScript(); } - }; enum WhisperGulchYoggSaronWhisper diff --git a/src/server/scripts/Spells/spell_hunter.cpp b/src/server/scripts/Spells/spell_hunter.cpp index 8479385c29..d0b2686765 100644 --- a/src/server/scripts/Spells/spell_hunter.cpp +++ b/src/server/scripts/Spells/spell_hunter.cpp @@ -1151,7 +1151,6 @@ public: player->SendTameFailure(PET_TAME_ANOTHER_SUMMON_ACTIVE); return SPELL_FAILED_DONT_REPORT; } - } else { diff --git a/src/server/scripts/Spells/spell_item.cpp b/src/server/scripts/Spells/spell_item.cpp index 2dd968da77..25266488f0 100644 --- a/src/server/scripts/Spells/spell_item.cpp +++ b/src/server/scripts/Spells/spell_item.cpp @@ -1672,13 +1672,11 @@ public: bool CheckProc(ProcEventInfo& eventInfo) { - SpellInfo const* spellInfo = eventInfo.GetHealInfo()->GetSpellInfo(); if (!spellInfo || !spellInfo->HasEffect(SPELL_EFFECT_HEAL)) return false; return eventInfo.GetHealInfo() && eventInfo.GetHealInfo()->GetHeal() > 0; - } void Register() override diff --git a/src/server/scripts/Spells/spell_quest.cpp b/src/server/scripts/Spells/spell_quest.cpp index 42d27bc255..4722691c63 100644 --- a/src/server/scripts/Spells/spell_quest.cpp +++ b/src/server/scripts/Spells/spell_quest.cpp @@ -85,7 +85,6 @@ public: OnEffectApply += AuraEffectApplyFn(spell_q11065_wrangle_some_aether_rays_AuraScript::HandleEffectApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); OnEffectRemove += AuraEffectRemoveFn(spell_q11065_wrangle_some_aether_rays_AuraScript::HandleEffectRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } - }; AuraScript* GetAuraScript() const override @@ -226,7 +225,6 @@ public: if (m_scriptSpellId == 40825) OnEffectRemove += AuraEffectRemoveFn(spell_q11026_a11051_banish_the_demons_AuraScript::HandleEffectRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } - }; AuraScript* GetAuraScript() const override @@ -290,7 +288,6 @@ public: OnEffectApply += AuraEffectApplyFn(spell_q10525_vision_guide_AuraScript::HandleEffectApply, EFFECT_0, SPELL_AURA_TRANSFORM, AURA_EFFECT_HANDLE_REAL); AfterEffectRemove += AuraEffectRemoveFn(spell_q10525_vision_guide_AuraScript::HandleEffectRemove, EFFECT_0, SPELL_AURA_TRANSFORM, AURA_EFFECT_HANDLE_REAL); } - }; AuraScript* GetAuraScript() const override @@ -528,7 +525,6 @@ public: OnEffectRemove += AuraEffectRemoveFn(spell_q10769_dissension_amongst_the_ranks_AuraScript::HandleEffectRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } } - }; class spell_q10769_dissension_amongst_the_ranks_SpellScript : public SpellScript @@ -635,7 +631,6 @@ public: if (GetSpellInfo()->Effects[effIndex].TriggerSpell == 41064) trigger->CastSpell(trigger, 41284, true); } - } void Register() override @@ -1264,7 +1259,6 @@ public: OnEffectApply += AuraEffectApplyFn(spell_q11396_11399_force_shield_arcane_purple_x3_AuraScript::HandleEffectApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); OnEffectRemove += AuraEffectRemoveFn(spell_q11396_11399_force_shield_arcane_purple_x3_AuraScript::HandleEffectRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } - }; AuraScript* GetAuraScript() const override @@ -1700,7 +1694,6 @@ public: { AfterEffectApply += AuraEffectApplyFn(spell_q12851_going_bearback_AuraScript::HandleEffectApply, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); } - }; AuraScript* GetAuraScript() const override diff --git a/src/server/scripts/Spells/spell_rogue.cpp b/src/server/scripts/Spells/spell_rogue.cpp index 74a0d59dcf..0b59169408 100644 --- a/src/server/scripts/Spells/spell_rogue.cpp +++ b/src/server/scripts/Spells/spell_rogue.cpp @@ -263,7 +263,6 @@ public: if (Unit* target = GetHitUnit()) { - Item* item = player->GetItemByPos(INVENTORY_SLOT_BAG_0, EQUIPMENT_SLOT_MAINHAND); if (item == GetCastItem()) diff --git a/src/server/scripts/Spells/spell_shaman.cpp b/src/server/scripts/Spells/spell_shaman.cpp index d268b70e42..a1cae1c9d3 100644 --- a/src/server/scripts/Spells/spell_shaman.cpp +++ b/src/server/scripts/Spells/spell_shaman.cpp @@ -1233,7 +1233,6 @@ public: { OnEffectHitTarget += SpellEffectFn(spell_sha_lava_lash_SpellScript::HandleDummy, EFFECT_1, SPELL_EFFECT_DUMMY); } - }; SpellScript* GetSpellScript() const override @@ -1272,7 +1271,6 @@ public: { OnEffectHitTarget += SpellEffectFn(spell_sha_mana_spring_totem_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } - }; SpellScript* GetSpellScript() const override diff --git a/src/server/scripts/World/action_ip_logger.cpp b/src/server/scripts/World/action_ip_logger.cpp index 6510668c8f..ddff84fdf1 100644 --- a/src/server/scripts/World/action_ip_logger.cpp +++ b/src/server/scripts/World/action_ip_logger.cpp @@ -10,7 +10,6 @@ enum IPLoggingTypes { - // AccountActionIpLogger(); ACCOUNT_LOGIN = 0, ACCOUNT_FAIL_LOGIN = 1, diff --git a/src/server/scripts/World/areatrigger_scripts.cpp b/src/server/scripts/World/areatrigger_scripts.cpp index 024d0adaf2..8340086db5 100644 --- a/src/server/scripts/World/areatrigger_scripts.cpp +++ b/src/server/scripts/World/areatrigger_scripts.cpp @@ -32,7 +32,6 @@ EndContentData */ class AreaTrigger_at_voltarus_middle : public AreaTriggerScript { public: - AreaTrigger_at_voltarus_middle() : AreaTriggerScript("at_voltarus_middle") { @@ -64,7 +63,6 @@ enum CoilfangGOs class AreaTrigger_at_coilfang_waterfall : public AreaTriggerScript { public: - AreaTrigger_at_coilfang_waterfall() : AreaTriggerScript("at_coilfang_waterfall") { @@ -96,7 +94,6 @@ enum LegionTeleporter class AreaTrigger_at_legion_teleporter : public AreaTriggerScript { public: - AreaTrigger_at_legion_teleporter() : AreaTriggerScript("at_legion_teleporter") { @@ -138,7 +135,6 @@ enum StormwrightShelf class AreaTrigger_at_stormwright_shelf : public AreaTriggerScript { public: - AreaTrigger_at_stormwright_shelf() : AreaTriggerScript("at_stormwright_shelf") { @@ -166,7 +162,6 @@ enum ScentLarkorwi class AreaTrigger_at_scent_larkorwi : public AreaTriggerScript { public: - AreaTrigger_at_scent_larkorwi() : AreaTriggerScript("at_scent_larkorwi") { @@ -197,7 +192,6 @@ enum AtLastRites class AreaTrigger_at_last_rites : public AreaTriggerScript { public: - AreaTrigger_at_last_rites() : AreaTriggerScript("at_last_rites") { @@ -259,7 +253,6 @@ enum Waygate class AreaTrigger_at_sholazar_waygate : public AreaTriggerScript { public: - AreaTrigger_at_sholazar_waygate() : AreaTriggerScript("at_sholazar_waygate") { } bool OnTrigger(Player* player, AreaTrigger const* trigger) override diff --git a/src/server/scripts/World/mob_generic_creature.cpp b/src/server/scripts/World/mob_generic_creature.cpp index 426cfafafc..117e00e549 100644 --- a/src/server/scripts/World/mob_generic_creature.cpp +++ b/src/server/scripts/World/mob_generic_creature.cpp @@ -139,7 +139,6 @@ public: //Set our global cooldown GlobalCooldown = GENERIC_CREATURE_COOLDOWN; - }//If no spells available and we arn't moving run to target else if (IsSelfRooted) { diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp index 6ddffd8829..9de34f2633 100644 --- a/src/server/scripts/World/npcs_special.cpp +++ b/src/server/scripts/World/npcs_special.cpp @@ -1417,7 +1417,6 @@ public: void WaypointReached(uint32 /*waypointId*/) override { - } void UpdateAI(uint32 diff) override |