diff options
| author | Kargatum <dowlandtop@yandex.com> | 2021-01-03 17:47:07 +0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-03 11:47:07 +0100 |
| commit | a32b6b8ac4c81128a56b282f20837fb085bdd9e7 (patch) | |
| tree | dc78724705a27ed8032372f73fbf5b318abbd630 /src/server/scripts | |
| parent | 4ea64b515aa952662dce11fd1012c566ae0d2449 (diff) | |
Core: whitespace cleanup, reduce double blank line to single (#25795)
* Core/Misc: fix double empty line
* worldserver.conf
Diffstat (limited to 'src/server/scripts')
58 files changed, 0 insertions, 77 deletions
diff --git a/src/server/scripts/Battlefield/BattlefieldWG.cpp b/src/server/scripts/Battlefield/BattlefieldWG.cpp index 8b33c154eb3..d13fadbf729 100644 --- a/src/server/scripts/Battlefield/BattlefieldWG.cpp +++ b/src/server/scripts/Battlefield/BattlefieldWG.cpp @@ -482,7 +482,6 @@ bool BattlefieldWG::SetupBattlefield() m_GraveyardList[i] = graveyard; } - Workshops.resize(WG_MAX_WORKSHOP); // Spawn workshop creatures and gameobjects for (uint8 i = 0; i < WG_MAX_WORKSHOP; i++) @@ -578,7 +577,6 @@ void BattlefieldWG::OnBattleStart() else TC_LOG_ERROR("bg.battlefield", "WG: Failed to spawn titan relic."); - // Update tower visibility and update faction for (auto itr = CanonList.begin(); itr != CanonList.end(); ++itr) { diff --git a/src/server/scripts/Commands/cs_ban.cpp b/src/server/scripts/Commands/cs_ban.cpp index 7117df396dd..cd92d182cbb 100644 --- a/src/server/scripts/Commands/cs_ban.cpp +++ b/src/server/scripts/Commands/cs_ban.cpp @@ -389,7 +389,6 @@ public: fields[0].GetCString(), fields[1].GetCString(), permanent ? handler->GetTrinityString(LANG_BANINFO_NEVER) : fields[2].GetCString(), permanent ? handler->GetTrinityString(LANG_BANINFO_INFINITE) : secsToTimeString(fields[3].GetUInt64(), TimeFormat::ShortText).c_str(), fields[4].GetCString(), fields[5].GetCString()); - return true; } diff --git a/src/server/scripts/Commands/cs_list.cpp b/src/server/scripts/Commands/cs_list.cpp index d0b0f20a6d0..81eab255e26 100644 --- a/src/server/scripts/Commands/cs_list.cpp +++ b/src/server/scripts/Commands/cs_list.cpp @@ -666,7 +666,6 @@ public: } }; - void AddSC_list_commandscript() { new list_commandscript(); diff --git a/src/server/scripts/Commands/cs_misc.cpp b/src/server/scripts/Commands/cs_misc.cpp index d863fcc494d..2fd01bda598 100644 --- a/src/server/scripts/Commands/cs_misc.cpp +++ b/src/server/scripts/Commands/cs_misc.cpp @@ -1654,8 +1654,6 @@ public: banReason = fields[3].GetString(); } - - // Can be used to query data from Characters database stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_PINFO_XP); stmt->setUInt32(0, lowguid); diff --git a/src/server/scripts/Custom/custom_script_loader.cpp b/src/server/scripts/Custom/custom_script_loader.cpp index 1df319bc501..9e5e9ba2bfd 100644 --- a/src/server/scripts/Custom/custom_script_loader.cpp +++ b/src/server/scripts/Custom/custom_script_loader.cpp @@ -17,7 +17,6 @@ // This is where scripts' loading functions should be declared: - // The name of this function should match: // void Add${NameOfDirectory}Scripts() void AddCustomScripts() diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_the_beast.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_the_beast.cpp index 5dfc1c5d6b6..0099406adee 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_the_beast.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_the_beast.cpp @@ -225,7 +225,6 @@ class at_trigger_the_beast_movement : public AreaTriggerScript public: at_trigger_the_beast_movement() : AreaTriggerScript("at_trigger_the_beast_movement") { } - bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/) override { if (player->IsGameMaster()) @@ -246,7 +245,6 @@ class at_the_beast_room : public AreaTriggerScript public: at_the_beast_room() : AreaTriggerScript("at_the_beast_room") { } - bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/) override { if (player->IsGameMaster()) diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp index e7d1b1539f9..72883842491 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp @@ -47,7 +47,6 @@ enum Netherspite SPELL_NETHERSPITE_ROAR = 38684, }; - const float PortalCoord[3][3] = { {-11195.353516f, -1613.237183f, 278.237258f}, // Left side diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp index aec4ec96ca9..5be3578763a 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp @@ -124,7 +124,6 @@ public: void JustEngagedWith(Unit* /*who*/) override { } void MoveInLineOfSight(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) override { if (HellfireTimer) diff --git a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp index b0e3def2a95..cc824337359 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp @@ -1007,7 +1007,6 @@ enum JulianneRomulo ROMULO_Y = -1758, }; - enum RAJPhase { PHASE_JULIANNE = 0, diff --git a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp index 6bae4b7af91..8dab20baa03 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp @@ -422,7 +422,6 @@ public: #define SAY_DIALOG_ARCANAGOS_8 "What have you done, wizard? This cannot be! I'm burning from... within!" #define SAY_DIALOG_MEDIVH_9 "He should not have angered me. I must go... recover my strength now..." - static float MedivPos[4] = {-11161.49f, -1902.24f, 91.48f, 1.94f}; static float ArcanagosPos[4] = {-11169.75f, -1881.48f, 95.39f, 4.83f}; diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp index a598bf18d49..6560973be5b 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp @@ -245,8 +245,6 @@ Position const SummonPos[18] = { // Hall of Secrects - - // The Hall of the damned { 177.9624f, -68.23893f, 84.95197f, 3.228859f }, { 183.7705f, -61.43489f, 84.92424f, 5.148721f }, @@ -265,8 +263,6 @@ Position const SummonPos[18] = { 185.6157f, -42.91200f, 75.4812f, 4.45059f }, // Vault of the Ravenian - - }; enum Creatures diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_apothecary_hummel.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_apothecary_hummel.cpp index c737b926af1..51ba08eead4 100644 --- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_apothecary_hummel.cpp +++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_apothecary_hummel.cpp @@ -470,7 +470,6 @@ class spell_apothecary_validate_area : public SpellScriptLoader targets.push_back(target); } - void HandleScript(SpellEffIndex /*effindex*/) { GetHitUnit()->CastSpell(GetHitUnit(), SPELL_BUNNY_LOCKDOWN, true); diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp index 942a5c18475..4f7e1c4a0e0 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp @@ -413,7 +413,6 @@ class npc_akilzon_eagle : public CreatureScript void MoveInLineOfSight(Unit* /*who*/) override { } - void MovementInform(uint32, uint32) override { arrived = true; diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp index bd62cd35b25..e7b185376c5 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp @@ -834,7 +834,6 @@ class boss_darkheart : public CreatureScript } }; - class boss_slither : public CreatureScript { public: diff --git a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp index 6297b3d51d3..879ecdc4dc4 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp @@ -349,7 +349,6 @@ class npc_harrison_jones : public CreatureScript } }; - void AddSC_zulaman() { new npc_zulaman_hostage(); 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 031622f4588..681fcfb95d6 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp @@ -201,7 +201,6 @@ class npc_hearthsinger_forresten_cot : public CreatureScript } } - private: InstanceScript const* const _instance; EventMap _events; diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp index 2027d4d4847..2ae3b7e4ca0 100644 --- a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp +++ b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp @@ -190,7 +190,6 @@ public: summons.Summon(summoned); } - void KilledUnit(Unit* /*victim*/) override { Talk(SAY_KILL); diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp index 9d402d590d7..f20fabca27e 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp @@ -83,7 +83,6 @@ public: _Reset(); } - void JustDied(Unit* /*killer*/) override { if (instance->GetData(DATA_BUG_TRIO_DEATH) < 2)// Unlootable if death 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 8e33bbe0573..71b1fb44da0 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp @@ -38,7 +38,6 @@ ObjectData const creatureData[] = { 0, 0 } // END }; - DoorData const doorData[] = { { AQ40_DOOR_1, DATA_SARTURA, DOOR_TYPE_PASSAGE }, diff --git a/src/server/scripts/Kalimdor/zone_ashenvale.cpp b/src/server/scripts/Kalimdor/zone_ashenvale.cpp index 7b862a64a7e..1363c758a28 100644 --- a/src/server/scripts/Kalimdor/zone_ashenvale.cpp +++ b/src/server/scripts/Kalimdor/zone_ashenvale.cpp @@ -50,8 +50,6 @@ enum RuulSnowhoof SAY_FINISH = 0 }; - - Position const RuulSnowhoofSummonsCoord[6] = { { 3449.218018f, -587.825073f, 174.978867f, 4.714445f }, diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp index d8a4fa39560..abe2d013d15 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp @@ -123,7 +123,6 @@ struct boss_volazj : public BossAI if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE)) damage = 0; - if ((GetHealthPct(0) >= 66 && GetHealthPct(damage) < 66)|| (GetHealthPct(0) >= 33 && GetHealthPct(damage) < 33)) { diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp index 69a9462501b..b711ba107a6 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp @@ -1901,8 +1901,6 @@ class spell_halion_blazing_aura : public SpellScriptLoader } }; - - void AddSC_boss_halion() { new boss_halion(); 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 3dd6216da45..392522de2a9 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp @@ -108,7 +108,6 @@ enum Misc POINT_SUMMONED = 1 }; - struct boss_jaraxxus : public BossAI { boss_jaraxxus(Creature* creature) : BossAI(creature, DATA_JARAXXUS) { } 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 1c1d2bf59d7..2d0ad4ccbed 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp @@ -275,7 +275,6 @@ class npc_pit_of_saron_icicle : public CreatureScript } }; - class spell_pos_ice_shards : public SpellScriptLoader { public: diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp index c8b960276fb..d19b952b705 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp @@ -1081,7 +1081,6 @@ class spell_putricide_unbound_plague : public SpellScript } } - targets.remove_if(Trinity::UnitAuraCheck(true, sSpellMgr->GetSpellIdForDifficulty(SPELL_UNBOUND_PLAGUE, GetCaster()))); Trinity::Containers::RandomResize(targets, 1); } diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp index d05cc534405..dabd3ef350c 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp @@ -129,7 +129,6 @@ enum Actions ACTION_ACQUIRE_TARGET }; - /* Room side checking logic */ static AreaBoundary* const livingSide = new RectangleBoundary(2633.84f, 2750.49f, -3434.0f, -3360.78f); static AreaBoundary* const deadSide = new RectangleBoundary(2633.84f, 2750.49f, -3360.78f, -3285.0f); @@ -166,7 +165,6 @@ static Player* FindEligibleTarget(Creature const* me, bool isGateOpen) return nullptr; } - /* Wave data */ typedef std::pair<uint32, uint8> GothikWaveEntry; // (npcEntry, npcCount) typedef std::set<GothikWaveEntry> GothikWave; @@ -291,7 +289,6 @@ const GothikWaveData waves25 = 0} }; - // GUID of first trigger NPC (used as offset for guid checks) // 0-1 are living side soul triggers, 2-3 are spectral side soul triggers, 4 is living rider spawn trigger, 5-7 are living other spawn trigger, 8-12 are skull pile triggers const uint32 CGUID_TRIGGER = 127618; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp index 236ccf7a042..e31c07fc482 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp @@ -497,7 +497,6 @@ class go_sapphiron_birth : public GameObjectScript } }; - class spell_sapphiron_change_blizzard_target : public SpellScriptLoader { public: diff --git a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp index f998b7ba5e6..7f1c25fd6bb 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp @@ -122,7 +122,6 @@ enum PetMisc OVERLOAD_DISTANCE = 28 }; - //Thaddius enum ThaddiusYells { @@ -1243,7 +1242,6 @@ class achievement_thaddius_shocking : public AchievementCriteriaScript } }; - void AddSC_boss_thaddius() { RegisterNaxxramasCreatureAI(boss_thaddius); diff --git a/src/server/scripts/Northrend/Naxxramas/naxxramas.h b/src/server/scripts/Northrend/Naxxramas/naxxramas.h index 918fe62e218..dfcae04fc8d 100644 --- a/src/server/scripts/Northrend/Naxxramas/naxxramas.h +++ b/src/server/scripts/Northrend/Naxxramas/naxxramas.h @@ -212,7 +212,6 @@ enum NAXInstanceTexts SAY_DIALOGUE_SAPPHIRON_LICH_KING2 = 2 }; - template <class AI, class T> inline AI* GetNaxxramasAI(T* obj) { diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp index fa0eb272cf9..a7967cdcda0 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp @@ -505,7 +505,6 @@ struct npc_pummeller : public ScriptedAI return; } - if (Creature* xt002 = _instance->GetCreature(BOSS_XT002)) xt002->AI()->JustSummoned(me); @@ -616,7 +615,6 @@ private: TaskScheduler _scheduler; }; - struct npc_life_spark : public ScriptedAI { npc_life_spark(Creature* creature) : ScriptedAI(creature) { } diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp index 10bf8aa79e2..a6306f2231a 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp @@ -368,7 +368,6 @@ class spell_frost_tomb : public SpellScriptLoader } }; - class achievement_on_the_rocks : public AchievementCriteriaScript { public: 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 9b5b5a8cb4a..3448b9a3ee3 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp @@ -72,7 +72,6 @@ class instance_utgarde_pinnacle : public InstanceMapScript LoadObjectData(creatureData, gameObjectData); } - void OnGameObjectCreate(GameObject* go) override { InstanceScript::OnGameObjectCreate(go); diff --git a/src/server/scripts/Northrend/zone_borean_tundra.cpp b/src/server/scripts/Northrend/zone_borean_tundra.cpp index 21230347e80..74b4be75a9f 100644 --- a/src/server/scripts/Northrend/zone_borean_tundra.cpp +++ b/src/server/scripts/Northrend/zone_borean_tundra.cpp @@ -135,7 +135,6 @@ public: void JustEngagedWith(Unit* /*who*/) override { } void MoveInLineOfSight(Unit* /*who*/) override { } - void JustDied(Unit* killer) override { if (!killer || killer->GetTypeId() != TYPEID_PLAYER) @@ -267,7 +266,6 @@ public: void JustEngagedWith(Unit* /*who*/) override { } void MoveInLineOfSight(Unit* /*who*/) override { } - void JustDied(Unit* /*killer*/) override { if (GameObject* go_caribou = ObjectAccessor::GetGameObject(*me, go_caribouGUID)) diff --git a/src/server/scripts/Northrend/zone_grizzly_hills.cpp b/src/server/scripts/Northrend/zone_grizzly_hills.cpp index ec4d7df9690..2091c630761 100644 --- a/src/server/scripts/Northrend/zone_grizzly_hills.cpp +++ b/src/server/scripts/Northrend/zone_grizzly_hills.cpp @@ -241,7 +241,6 @@ public: void MoveInLineOfSight(Unit* /*who*/) override { } - void UpdateAI(uint32 /*diff*/) override { if (!UpdateVictim()) diff --git a/src/server/scripts/Northrend/zone_icecrown.cpp b/src/server/scripts/Northrend/zone_icecrown.cpp index 8f3ce98422e..956aed1f29c 100644 --- a/src/server/scripts/Northrend/zone_icecrown.cpp +++ b/src/server/scripts/Northrend/zone_icecrown.cpp @@ -446,7 +446,6 @@ public: void MoveInLineOfSight(Unit* /*who*/) override { } - void JustSummoned(Creature* Summoned) override { Summons.Summon(Summoned); diff --git a/src/server/scripts/Northrend/zone_zuldrak.cpp b/src/server/scripts/Northrend/zone_zuldrak.cpp index 7469dbccb1b..b0d846a8412 100644 --- a/src/server/scripts/Northrend/zone_zuldrak.cpp +++ b/src/server/scripts/Northrend/zone_zuldrak.cpp @@ -164,7 +164,6 @@ public: } }; - /*#### ## npc_released_offspring_harkoa ####*/ diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp index 92fc395c6f2..2fa84167245 100644 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp @@ -37,7 +37,6 @@ uint32 const ZM_GRAVEYARD_ZONE = 3521; // linked when the central tower is controlled uint32 const ZM_GRAVEYARD_ID = 969; - // banners 182527, 182528, 182529, gotta check them ingame go_type const ZM_Banner_A = { 182527, 530, { 253.54f, 7083.81f, 36.7728f, -0.017453f }, { 0.0f, 0.0f, 0.008727f, -0.999962f } }; go_type const ZM_Banner_H = { 182528, 530, { 253.54f, 7083.81f, 36.7728f, -0.017453f }, { 0.0f, 0.0f, 0.008727f, -0.999962f } }; diff --git a/src/server/scripts/Outland/BlackTemple/boss_gurtogg_bloodboil.cpp b/src/server/scripts/Outland/BlackTemple/boss_gurtogg_bloodboil.cpp index 5515ebd1f11..52b66895bfe 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_gurtogg_bloodboil.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_gurtogg_bloodboil.cpp @@ -89,7 +89,6 @@ enum Events EVENT_CHARGE_PLAYER }; - struct boss_gurtogg_bloodboil : public BossAI { boss_gurtogg_bloodboil(Creature* creature) : BossAI(creature, DATA_GURTOGG_BLOODBOIL) diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp index 5c9537f4442..ec7276ed0b7 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp @@ -2127,7 +2127,6 @@ class spell_illidan_demon_transform1 : public AuraScript } }; - // 40398 - Demon Transform 2 class spell_illidan_demon_transform2 : public AuraScript { diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidari_council.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidari_council.cpp index cc8513282ef..3fb8d500063 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_illidari_council.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_illidari_council.cpp @@ -238,7 +238,6 @@ private: bool _inCombat; }; - struct IllidariCouncilBossAI : public BossAI { IllidariCouncilBossAI(Creature* creature, uint32 bossId) : BossAI(creature, bossId), _bossId(bossId) diff --git a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp index b99829c9072..35b01429684 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp @@ -15,7 +15,6 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ - #include "ScriptMgr.h" #include "ScriptedCreature.h" #include "black_temple.h" 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 c17a9c4bad2..709650ec541 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp @@ -760,7 +760,6 @@ class spell_reliquary_of_souls_submerge : public AuraScript GetTarget()->SetByteValue(UNIT_FIELD_BYTES_1, UNIT_BYTES_1_OFFSET_STAND_STATE, UNIT_STAND_STATE_STAND); } - void Register() override { AfterEffectApply += AuraEffectApplyFn(spell_reliquary_of_souls_submerge::OnApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); diff --git a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp index 47e3b10ebdb..ceaa4e6a2b7 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp @@ -198,7 +198,6 @@ static float const MIDDLE_OF_ROOM = 400.0f; static float const FACE_THE_DOOR = 0.08726646f; static float const FACE_THE_PLATFORM = 3.118662f; - struct boss_shade_of_akama : public BossAI { boss_shade_of_akama(Creature* creature) : BossAI(creature, DATA_SHADE_OF_AKAMA) @@ -795,7 +794,6 @@ struct npc_ashtongue_defender : public ScriptedAI _events.ScheduleEvent(EVENT_WINDFURY, 8s, 12s); } - void UpdateAI(uint32 diff) override { if (!UpdateVictim()) 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 a9357a71df8..939342d978a 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 @@ -68,7 +68,6 @@ enum HydrossTheUnstable ENTRY_BEAM_DUMMY = 21934 }; - #define HYDROSS_X -239.439f #define HYDROSS_Y -363.481f diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp index 85d4f1d9a97..677ced1fafd 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp @@ -75,8 +75,6 @@ enum LadyVashj #define SPOREBAT_Z 77.176567f #define SPOREBAT_O 5.223932f - - #define TEXT_NOT_INITIALIZED "Instance script not initialized" #define TEXT_ALREADY_DEACTIVATED "Already deactivated" @@ -610,7 +608,6 @@ public: void MoveInLineOfSight(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) override { if (!VashjGUID) @@ -860,7 +857,6 @@ public: void MoveInLineOfSight(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) override { if (CheckTimer <= diff) 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 415d8abc69c..d9b6c07e8b1 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp @@ -46,7 +46,6 @@ enum Spells SPELL_SUBMERGE = 37550, SPELL_EMERGE = 20568, - // Ambusher spells SPELL_SPREAD_SHOT = 37790, SPELL_SHOOT = 37770, diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp index 22a380c7a9c..fc461700905 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp @@ -48,7 +48,6 @@ enum Misc MIN_KILLS = 30 }; - //NOTE: there are 6 platforms //there should be 3 shatterers and 2 priestess on all platforms, total of 30 elites, else it won't work! //delete all other elites not on platforms! these mobs should only be on those platforms nowhere else. diff --git a/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_hungarfen.cpp b/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_hungarfen.cpp index 175f7571b18..7846ec41524 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_hungarfen.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_hungarfen.cpp @@ -148,7 +148,6 @@ public: void MoveInLineOfSight(Unit* /*who*/) override { } - void AttackStart(Unit* /*who*/) override { } void JustEngagedWith(Unit* /*who*/) override { } diff --git a/src/server/scripts/Outland/zone_blades_edge_mountains.cpp b/src/server/scripts/Outland/zone_blades_edge_mountains.cpp index 282ec59ce7d..a5cf629d0f9 100644 --- a/src/server/scripts/Outland/zone_blades_edge_mountains.cpp +++ b/src/server/scripts/Outland/zone_blades_edge_mountains.cpp @@ -650,7 +650,6 @@ class npc_simon_bunny : public CreatureScript playableSequence.push_back(*i); } - // Remove any existant glowing auras over clusters and set clusters ready for interating with them. void PrepareClusters(bool clustersOnly = false) { diff --git a/src/server/scripts/Pet/pet_shaman.cpp b/src/server/scripts/Pet/pet_shaman.cpp index e997691da51..9ee11397991 100644 --- a/src/server/scripts/Pet/pet_shaman.cpp +++ b/src/server/scripts/Pet/pet_shaman.cpp @@ -50,7 +50,6 @@ class npc_pet_shaman_earth_elemental : public CreatureScript { npc_pet_shaman_earth_elementalAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() override { _events.Reset(); diff --git a/src/server/scripts/Spells/spell_dk.cpp b/src/server/scripts/Spells/spell_dk.cpp index 724343fbf1a..d0db750f8f2 100644 --- a/src/server/scripts/Spells/spell_dk.cpp +++ b/src/server/scripts/Spells/spell_dk.cpp @@ -1845,7 +1845,6 @@ class spell_dk_pestilence : public SpellScriptLoader } }; - // 48266 - Blood Presence // 48263 - Frost Presence // 48265 - Unholy Presence diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp index 066fa6ff192..2770aecfda6 100644 --- a/src/server/scripts/Spells/spell_generic.cpp +++ b/src/server/scripts/Spells/spell_generic.cpp @@ -1789,7 +1789,6 @@ class spell_gen_gadgetzan_transporter_backfire : public SpellScript } }; - class spell_gen_gift_of_naaru : public AuraScript { PrepareAuraScript(spell_gen_gift_of_naaru); diff --git a/src/server/scripts/Spells/spell_item.cpp b/src/server/scripts/Spells/spell_item.cpp index d3935e4b4a2..60e4d4b1f08 100644 --- a/src/server/scripts/Spells/spell_item.cpp +++ b/src/server/scripts/Spells/spell_item.cpp @@ -2730,7 +2730,6 @@ enum ReindeerTransformation SPELL_REINDEER_60 = 25858, }; - class spell_item_reindeer_transformation : public SpellScript { PrepareSpellScript(spell_item_reindeer_transformation); diff --git a/src/server/scripts/Spells/spell_paladin.cpp b/src/server/scripts/Spells/spell_paladin.cpp index 45975e49f1f..27a0da2fdc6 100644 --- a/src/server/scripts/Spells/spell_paladin.cpp +++ b/src/server/scripts/Spells/spell_paladin.cpp @@ -628,7 +628,6 @@ class spell_pal_divine_storm_dummy : public SpellScriptLoader { PrepareSpellScript(spell_pal_divine_storm_dummy_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PALADIN_DIVINE_STORM_HEAL }); diff --git a/src/server/scripts/Spells/spell_pet.cpp b/src/server/scripts/Spells/spell_pet.cpp index 4963e421fc7..6e0c5eb1b27 100644 --- a/src/server/scripts/Spells/spell_pet.cpp +++ b/src/server/scripts/Spells/spell_pet.cpp @@ -550,7 +550,6 @@ public: } }; - class spell_warl_pet_scaling_04 : public SpellScriptLoader { public: @@ -827,7 +826,6 @@ public: } }; - class spell_sha_pet_scaling_04 : public SpellScriptLoader { public: @@ -1445,7 +1443,6 @@ public: } }; - class spell_dk_avoidance_passive : public SpellScriptLoader { public: diff --git a/src/server/scripts/Spells/spell_quest.cpp b/src/server/scripts/Spells/spell_quest.cpp index db49ca3f5c3..ea2808ca930 100644 --- a/src/server/scripts/Spells/spell_quest.cpp +++ b/src/server/scripts/Spells/spell_quest.cpp @@ -2132,7 +2132,6 @@ class spell_q13264_q13276_q13288_q13289_bloated_abom_feign_death : public AuraSc } }; - class spell_q13264_q13276_q13288_q13289_area_restrict_abom : public SpellScript { PrepareSpellScript(spell_q13264_q13276_q13288_q13289_area_restrict_abom); diff --git a/src/server/scripts/Spells/spell_warrior.cpp b/src/server/scripts/Spells/spell_warrior.cpp index 710e2ae76c6..2452a0b8ff9 100644 --- a/src/server/scripts/Spells/spell_warrior.cpp +++ b/src/server/scripts/Spells/spell_warrior.cpp @@ -405,7 +405,6 @@ class spell_warr_execute : public SpellScriptLoader if (AuraEffect* aurEff = caster->GetAuraEffect(SPELL_WARRIOR_GLYPH_OF_EXECUTION, EFFECT_0)) rageUsed += aurEff->GetAmount() * 10; - int32 bp = GetEffectValue() + int32(rageUsed * spellInfo->Effects[effIndex].DamageMultiplier + caster->GetTotalAttackPowerValue(BASE_ATTACK) * 0.2f); CastSpellExtraArgs args(GetOriginalCaster()->GetGUID()); args.AddSpellBP0(bp); diff --git a/src/server/scripts/World/action_ip_logger.cpp b/src/server/scripts/World/action_ip_logger.cpp index f3b5954efb1..4f207baa3c6 100644 --- a/src/server/scripts/World/action_ip_logger.cpp +++ b/src/server/scripts/World/action_ip_logger.cpp @@ -316,7 +316,6 @@ public: } }; - void AddSC_action_ip_logger() { new AccountActionIpLogger(); |
