From da4edd547d03b5a406a54c5f05649d2faec8339a Mon Sep 17 00:00:00 2001 From: Kitzunu <24550914+Kitzunu@users.noreply.github.com> Date: Sun, 10 Jan 2021 14:27:55 +0100 Subject: [PATCH] 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 --- src/common/Collision/DynamicTree.h | 1 - src/common/Collision/RegularGrid.h | 1 - src/common/Collision/VMapTools.h | 2 - src/common/Cryptography/BigNumber.h | 1 - src/common/DataStores/DBCFileLoader.h | 1 - src/common/Database/DatabaseWorkerPool.h | 1 - src/common/Database/Field.h | 2 - src/common/Database/MySQLConnection.cpp | 1 - src/common/Database/QueryHolder.h | 3 +- src/common/Database/QueryResult.h | 1 - .../Debugging/WheatyExceptionReport.cpp | 4 - src/common/Debugging/WheatyExceptionReport.h | 2 - src/common/Packets/ByteBuffer.h | 1 - src/common/Threading/LockedQueue.h | 1 - src/common/Threading/PCQueue.h | 1 - src/common/Threading/ThreadingModel.h | 10 -- src/common/Utilities/ServiceWin32.cpp | 1 - src/common/Utilities/Timer.h | 8 -- src/common/Utilities/Util.cpp | 1 - src/server/game/AI/CoreAI/PetAI.h | 1 - src/server/game/AI/CoreAI/ReactorAI.h | 1 - src/server/game/AI/CoreAI/TotemAI.h | 1 - src/server/game/AI/CreatureAISelector.cpp | 1 - .../game/AI/ScriptedAI/ScriptedEscortAI.cpp | 1 - src/server/game/AI/SmartScripts/SmartAI.cpp | 1 - .../game/AI/SmartScripts/SmartScript.cpp | 1 - src/server/game/AI/SmartScripts/SmartScript.h | 2 - .../game/AI/SmartScripts/SmartScriptMgr.cpp | 1 - .../game/AI/SmartScripts/SmartScriptMgr.h | 2 - .../game/Achievements/AchievementMgr.cpp | 7 -- .../game/AuctionHouse/AuctionHouseMgr.cpp | 1 - .../game/AuctionHouse/AuctionHouseMgr.h | 4 - .../game/Battlefield/Zones/BattlefieldWG.cpp | 1 - src/server/game/Battlegrounds/ArenaTeam.h | 1 - .../game/Battlegrounds/BattlegroundQueue.h | 1 - .../Battlegrounds/Zones/BattlegroundAB.cpp | 1 - .../game/Battlegrounds/Zones/BattlegroundAV.h | 4 - .../Battlegrounds/Zones/BattlegroundBE.cpp | 1 - .../Battlegrounds/Zones/BattlegroundDS.cpp | 1 - .../Battlegrounds/Zones/BattlegroundIC.cpp | 2 - .../Battlegrounds/Zones/BattlegroundNA.cpp | 1 - .../Battlegrounds/Zones/BattlegroundRL.cpp | 1 - src/server/game/Chat/Channels/Channel.cpp | 2 - src/server/game/Chat/Chat.h | 1 - src/server/game/Combat/UnitEvents.h | 1 - src/server/game/Conditions/ConditionMgr.cpp | 2 - src/server/game/DungeonFinding/LFGQueue.h | 1 - src/server/game/Entities/Creature/Creature.h | 1 - src/server/game/Entities/Item/Container/Bag.h | 2 - src/server/game/Entities/Object/Object.h | 2 - src/server/game/Entities/Pet/Pet.cpp | 4 - src/server/game/Entities/Pet/PetDefines.h | 1 - src/server/game/Entities/Player/Player.cpp | 4 - src/server/game/Entities/Player/Player.h | 2 - src/server/game/Entities/Unit/Unit.cpp | 10 -- src/server/game/Entities/Unit/Unit.h | 1 - src/server/game/Events/GameEventMgr.cpp | 3 - src/server/game/Globals/ObjectAccessor.h | 2 - src/server/game/Globals/ObjectMgr.cpp | 22 ---- src/server/game/Grids/Grid.h | 2 - .../game/Handlers/BattleGroundHandler.cpp | 1 - src/server/game/Handlers/NPCHandler.cpp | 1 - src/server/game/Instances/InstanceSaveMgr.h | 2 - src/server/game/Instances/InstanceScript.h | 1 - src/server/game/Maps/Map.h | 1 - src/server/game/Maps/TransportMgr.cpp | 2 - src/server/game/Misc/BanManager.cpp | 1 - src/server/game/Misc/BanManager.h | 1 - src/server/game/Misc/GameGraveyard.cpp | 2 - src/server/game/Misc/GameGraveyard.h | 1 - src/server/game/Movement/FollowerRefManager.h | 1 - src/server/game/Movement/MotionMaster.h | 1 - .../ConfusedMovementGenerator.cpp | 1 - .../HomeMovementGenerator.h | 1 - .../IdleMovementGenerator.h | 1 - .../MovementGenerators/PathGenerator.h | 1 - .../WaypointMovementGenerator.h | 1 - .../game/Movement/Spline/MoveSplineInit.h | 2 - .../Movement/Spline/MovementPacketBuilder.h | 1 - src/server/game/Movement/Spline/Spline.h | 3 - .../Movement/Waypoints/WaypointManager.cpp | 1 - src/server/game/OutdoorPvP/OutdoorPvP.h | 5 - src/server/game/Pools/PoolMgr.cpp | 1 - src/server/game/Scripting/ScriptMgr.cpp | 3 - src/server/game/Scripting/ScriptMgr.h | 110 ------------------ src/server/game/Server/WorldSession.h | 1 - src/server/game/Server/WorldSocket.h | 1 - src/server/game/Server/WorldSocketAcceptor.h | 1 - src/server/game/Server/WorldSocketMgr.cpp | 2 - src/server/game/Spells/Auras/SpellAuras.cpp | 1 - src/server/game/Spells/Auras/SpellAuras.h | 1 - src/server/game/Spells/Spell.cpp | 2 - src/server/game/Spells/Spell.h | 1 - src/server/game/Spells/SpellEffects.cpp | 1 - src/server/game/Spells/SpellMgr.cpp | 5 - src/server/game/Spells/SpellMgr.h | 1 - src/server/game/Spells/SpellScript.h | 1 - src/server/game/Texts/CreatureTextMgr.cpp | 1 - src/server/game/Tickets/TicketMgr.cpp | 2 - src/server/game/Warden/WardenMac.cpp | 1 - src/server/game/Weather/Weather.h | 2 - src/server/scripts/Commands/cs_character.cpp | 1 - src/server/scripts/Commands/cs_cheat.cpp | 3 - src/server/scripts/Commands/cs_gobject.cpp | 1 - src/server/scripts/Commands/cs_misc.cpp | 1 - src/server/scripts/Commands/cs_wp.cpp | 2 - .../BlackrockSpire/boss_gyth.cpp | 1 - .../BlackrockSpire/boss_highlord_omokk.cpp | 1 - .../boss_pyroguard_emberseer.cpp | 2 - .../boss_shadow_hunter_voshgajin.cpp | 1 - .../BlackwingLair/boss_chromaggus.cpp | 1 - .../BlackwingLair/boss_nefarian.cpp | 2 - .../MoltenCore/boss_ragnaros.cpp | 1 - .../Karazhan/boss_midnight.cpp | 1 - .../EasternKingdoms/Karazhan/boss_moroes.cpp | 1 - .../Karazhan/boss_nightbane.cpp | 1 - .../Karazhan/boss_prince_malchezaar.cpp | 3 - .../Karazhan/boss_shade_of_aran.cpp | 3 - .../EasternKingdoms/Karazhan/karazhan.cpp | 3 - .../boss_priestess_delrissa.cpp | 2 - .../ScarletEnclave/chapter1.cpp | 4 - .../ScarletEnclave/chapter2.cpp | 4 - .../zone_the_scarlet_enclave.cpp | 1 - .../Scholomance/instance_scholomance.cpp | 1 - .../instance_shadowfang_keep.cpp | 1 - .../Stratholme/instance_stratholme.cpp | 1 - .../SunwellPlateau/boss_brutallus.cpp | 1 - .../SunwellPlateau/boss_eredar_twins.cpp | 1 - .../SunwellPlateau/boss_felmyst.cpp | 1 - .../SunwellPlateau/boss_kiljaeden.cpp | 1 - .../EasternKingdoms/ZulAman/boss_halazzi.cpp | 1 - .../EasternKingdoms/ZulAman/boss_hexlord.cpp | 12 -- .../EasternKingdoms/ZulAman/boss_janalai.cpp | 6 - .../EasternKingdoms/ZulAman/boss_nalorakk.cpp | 3 - .../EasternKingdoms/ZulAman/boss_zuljin.cpp | 2 - .../ZulAman/instance_zulaman.cpp | 1 - .../EasternKingdoms/ZulAman/zulaman.cpp | 2 - .../EasternKingdoms/ZulGurub/boss_jindo.cpp | 3 - .../ZulGurub/boss_mandokir.cpp | 2 - .../EasternKingdoms/ZulGurub/boss_thekal.cpp | 1 - .../EasternKingdoms/ZulGurub/zulgurub.h | 1 - .../EasternKingdoms/zone_ghostlands.cpp | 1 - src/server/scripts/Events/brewfest.cpp | 3 - src/server/scripts/Events/childrens_week.cpp | 6 - src/server/scripts/Events/midsummer.cpp | 2 - src/server/scripts/Events/pilgrims_bounty.cpp | 2 - .../BattleForMountHyjal/boss_anetheron.cpp | 2 - .../BattleForMountHyjal/boss_azgalor.cpp | 2 - .../BattleForMountHyjal/boss_kazrogal.cpp | 1 - .../boss_rage_winterchill.cpp | 1 - .../BattleForMountHyjal/hyjal.cpp | 3 - .../BattleForMountHyjal/hyjalAI.cpp | 3 - .../BattleForMountHyjal/hyjal_trash.cpp | 8 -- .../BattleForMountHyjal/instance_hyjal.cpp | 1 - .../CullingOfStratholme/boss_epoch.cpp | 1 - .../CullingOfStratholme/boss_infinite.cpp | 1 - .../CullingOfStratholme/boss_mal_ganis.cpp | 1 - .../CullingOfStratholme/boss_meathook.cpp | 1 - .../CullingOfStratholme/boss_salramm.cpp | 1 - .../culling_of_stratholme.cpp | 2 - .../instance_culling_of_stratholme.cpp | 2 - .../boss_captain_skarloc.cpp | 2 - .../boss_epoch_hunter.cpp | 1 - .../boss_lieutenant_drake.cpp | 1 - .../instance_old_hillsbrad.cpp | 2 - .../EscapeFromDurnholdeKeep/old_hillsbrad.cpp | 2 - .../EscapeFromDurnholdeKeep/old_hillsbrad.h | 1 - .../instance_the_black_morass.cpp | 1 - .../TheBlackMorass/the_black_morass.cpp | 1 - .../Kalimdor/DireMaul/instance_dire_maul.cpp | 1 - .../TempleOfAhnQiraj/boss_bug_trio.cpp | 3 - .../Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp | 7 -- .../TempleOfAhnQiraj/boss_fankriss.cpp | 1 - .../TempleOfAhnQiraj/boss_huhuran.cpp | 1 - .../Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp | 1 - .../TempleOfAhnQiraj/boss_sartura.cpp | 3 - .../TempleOfAhnQiraj/boss_twinemperors.cpp | 2 - .../instance_temple_of_ahnqiraj.cpp | 1 - .../scripts/Kalimdor/zone_ashenvale.cpp | 1 - src/server/scripts/Kalimdor/zone_desolace.cpp | 4 - .../Kalimdor/zone_dustwallow_marsh.cpp | 4 - src/server/scripts/Kalimdor/zone_feralas.cpp | 3 - .../scripts/Kalimdor/zone_moonglade.cpp | 5 - .../scripts/Kalimdor/zone_orgrimmar.cpp | 1 - src/server/scripts/Kalimdor/zone_silithus.cpp | 7 -- .../Kalimdor/zone_stonetalon_mountains.cpp | 3 - src/server/scripts/Kalimdor/zone_tanaris.cpp | 5 - .../scripts/Kalimdor/zone_the_barrens.cpp | 5 - .../Kalimdor/zone_thousand_needles.cpp | 3 - .../scripts/Kalimdor/zone_winterspring.cpp | 1 - .../AzjolNerub/AzjolNerub/boss_hadronox.cpp | 1 - .../AzjolNerub/instance_azjol_nerub.cpp | 1 - .../ahnkahet/boss_jedoga_shadowseeker.cpp | 1 - .../AzjolNerub/ahnkahet/instance_ahnkahet.cpp | 2 - .../RubySanctum/instance_ruby_sanctum.cpp | 1 - .../TrialOfTheChampion/boss_black_knight.cpp | 2 - .../instance_trial_of_the_champion.cpp | 2 - .../boss_faction_champions.cpp | 3 - .../TrialOfTheCrusader/boss_lord_jaraxxus.cpp | 2 - .../instance_trial_of_the_crusader.cpp | 1 - .../ForgeOfSouls/boss_bronjahm.cpp | 1 - .../HallsOfReflection/halls_of_reflection.cpp | 1 - .../PitOfSaron/instance_pit_of_saron.cpp | 1 - .../FrozenHalls/PitOfSaron/pit_of_saron.cpp | 2 - .../boss_deathbringer_saurfang.cpp | 1 - .../IcecrownCitadel/boss_the_lich_king.cpp | 4 - .../IcecrownCitadel/icecrown_citadel.cpp | 2 - .../Northrend/Naxxramas/boss_gothik.cpp | 1 - .../Northrend/Naxxramas/boss_grobbulus.cpp | 1 - .../Northrend/Naxxramas/boss_heigan.cpp | 1 - .../Northrend/Naxxramas/boss_kelthuzad.cpp | 1 - .../Northrend/Naxxramas/boss_maexxna.cpp | 1 - .../Northrend/Naxxramas/boss_patchwerk.cpp | 1 - .../Northrend/Naxxramas/boss_sapphiron.cpp | 2 - .../Naxxramas/instance_naxxramas.cpp | 2 - .../Nexus/Nexus/boss_magus_telestra.cpp | 1 - .../Northrend/Nexus/Oculus/boss_drakos.cpp | 1 - .../Nexus/Oculus/instance_oculus.cpp | 1 - .../instance_halls_of_lightning.cpp | 1 - .../Ulduar/HallsOfStone/brann_bronzebeard.cpp | 3 - .../Ulduar/Ulduar/boss_assembly_of_iron.cpp | 1 - .../Ulduar/Ulduar/boss_flame_leviathan.cpp | 2 - .../Northrend/Ulduar/Ulduar/boss_hodir.cpp | 1 - .../Northrend/Ulduar/Ulduar/boss_mimiron.cpp | 2 - .../Ulduar/Ulduar/boss_razorscale.cpp | 1 - .../Northrend/Ulduar/Ulduar/boss_xt002.cpp | 1 - .../Northrend/Ulduar/Ulduar/ulduar.cpp | 1 - .../UtgardeKeep/UtgardeKeep/boss_keleseth.cpp | 3 - .../UtgardeKeep/instance_utgarde_keep.cpp | 1 - .../UtgardeKeep/UtgardeKeep/utgarde_keep.cpp | 1 - .../UtgardePinnacle/boss_skadi.cpp | 2 - .../UtgardePinnacle/boss_ymiron.cpp | 1 - .../instance_utgarde_pinnacle.cpp | 4 +- .../VaultOfArchavon/boss_toravon.cpp | 1 - .../scripts/Northrend/zone_borean_tundra.cpp | 4 - .../Northrend/zone_crystalsong_forest.cpp | 2 - src/server/scripts/Northrend/zone_dalaran.cpp | 4 +- .../scripts/Northrend/zone_dragonblight.cpp | 2 - .../scripts/Northrend/zone_grizzly_hills.cpp | 1 - .../scripts/Northrend/zone_icecrown.cpp | 5 - .../scripts/Northrend/zone_storm_peaks.cpp | 2 - src/server/scripts/Northrend/zone_zuldrak.cpp | 2 - .../scripts/OutdoorPvP/OutdoorPvPEP.cpp | 1 - src/server/scripts/OutdoorPvP/OutdoorPvPEP.h | 14 --- .../scripts/OutdoorPvP/OutdoorPvPGH.cpp | 1 - .../scripts/OutdoorPvP/OutdoorPvPHP.cpp | 1 - src/server/scripts/OutdoorPvP/OutdoorPvPHP.h | 4 - .../scripts/OutdoorPvP/OutdoorPvPNA.cpp | 1 - src/server/scripts/OutdoorPvP/OutdoorPvPNA.h | 5 - .../scripts/OutdoorPvP/OutdoorPvPSI.cpp | 1 - src/server/scripts/OutdoorPvP/OutdoorPvPSI.h | 2 - .../scripts/OutdoorPvP/OutdoorPvPTF.cpp | 1 - src/server/scripts/OutdoorPvP/OutdoorPvPTF.h | 4 - .../scripts/OutdoorPvP/OutdoorPvPZM.cpp | 1 - src/server/scripts/OutdoorPvP/OutdoorPvPZM.h | 7 -- .../boss_shirrak_the_dead_watcher.cpp | 1 - .../SethekkHalls/instance_sethekk_halls.cpp | 1 - .../boss_ambassador_hellmaw.cpp | 1 - .../boss_blackheart_the_inciter.cpp | 1 - .../instance_shadow_labyrinth.cpp | 1 - .../Outland/BlackTemple/boss_bloodboil.cpp | 1 - .../BlackTemple/boss_reliquary_of_souls.cpp | 1 - .../Outland/BlackTemple/illidari_council.cpp | 1 - .../boss_hydross_the_unstable.cpp | 1 - .../boss_leotheras_the_blind.cpp | 1 - .../SerpentShrine/boss_lurker_below.cpp | 1 - .../boss_morogrim_tidewalker.cpp | 1 - .../SerpentShrine/serpent_shrine.h | 1 - .../SteamVault/boss_hydromancer_thespia.cpp | 1 - .../SteamVault/boss_mekgineer_steamrigger.cpp | 1 - .../SteamVault/boss_warlord_kalithresh.cpp | 2 - .../SteamVault/instance_steam_vault.cpp | 1 - .../BloodFurnace/boss_broggok.cpp | 3 - .../BloodFurnace/boss_kelidan_the_breaker.cpp | 2 - .../BloodFurnace/boss_the_maker.cpp | 2 - .../MagtheridonsLair/boss_magtheridon.cpp | 2 - .../instance_magtheridons_lair.cpp | 1 - .../Outland/TempestKeep/Eye/boss_alar.cpp | 1 - .../TempestKeep/Eye/boss_astromancer.cpp | 2 - .../Outland/TempestKeep/Eye/boss_kaelthas.cpp | 1 - .../TempestKeep/Eye/boss_void_reaver.cpp | 1 - .../Mechanar/boss_nethermancer_sepethrea.cpp | 1 - .../Outland/TempestKeep/arcatraz/arcatraz.cpp | 3 - .../botanica/boss_high_botanist_freywinn.cpp | 1 - .../Outland/TempestKeep/botanica/boss_laj.cpp | 1 - .../botanica/boss_warp_splinter.cpp | 1 - src/server/scripts/Outland/zone_nagrand.cpp | 1 - .../Outland/zone_shadowmoon_valley.cpp | 1 - .../scripts/Outland/zone_shattrath_city.cpp | 1 - src/server/scripts/Spells/spell_dk.cpp | 1 - src/server/scripts/Spells/spell_generic.cpp | 4 - src/server/scripts/Spells/spell_hunter.cpp | 1 - src/server/scripts/Spells/spell_item.cpp | 2 - src/server/scripts/Spells/spell_quest.cpp | 7 -- src/server/scripts/Spells/spell_rogue.cpp | 1 - src/server/scripts/Spells/spell_shaman.cpp | 2 - src/server/scripts/World/action_ip_logger.cpp | 1 - .../scripts/World/areatrigger_scripts.cpp | 7 -- .../scripts/World/mob_generic_creature.cpp | 1 - src/server/scripts/World/npcs_special.cpp | 1 - .../worldserver/RemoteAccess/RARunnable.h | 1 - src/tools/map_extractor/adt.h | 1 - src/tools/map_extractor/dbcfile.cpp | 1 - src/tools/map_extractor/mpq_libmpq.cpp | 1 - src/tools/map_extractor/mpq_libmpq04.h | 1 - src/tools/mesh_extractor/MPQ.cpp | 1 - src/tools/mesh_extractor/MPQ.h | 1 - src/tools/mesh_extractor/Utils.cpp | 1 - src/tools/mesh_extractor/WDT.cpp | 1 - .../mesh_extractor/WorldModelHandler.cpp | 2 - src/tools/mmaps_generator/TerrainBuilder.cpp | 2 - src/tools/vmap4_extractor/dbcfile.cpp | 1 - src/tools/vmap4_extractor/model.h | 1 - src/tools/vmap4_extractor/mpq_libmpq.cpp | 1 - src/tools/vmap4_extractor/mpq_libmpq04.h | 1 - 315 files changed, 3 insertions(+), 729 deletions(-) diff --git a/src/common/Collision/DynamicTree.h b/src/common/Collision/DynamicTree.h index c3d233714..e541e8607 100644 --- a/src/common/Collision/DynamicTree.h +++ b/src/common/Collision/DynamicTree.h @@ -23,7 +23,6 @@ class DynamicMapTree DynTreeImpl* impl; public: - DynamicMapTree(); ~DynamicMapTree(); diff --git a/src/common/Collision/RegularGrid.h b/src/common/Collision/RegularGrid.h index 331c4756d..a8571aa57 100644 --- a/src/common/Collision/RegularGrid.h +++ b/src/common/Collision/RegularGrid.h @@ -42,7 +42,6 @@ template(x)) diff --git a/src/common/Cryptography/BigNumber.h b/src/common/Cryptography/BigNumber.h index bd9dd589f..80a1a8991 100644 --- a/src/common/Cryptography/BigNumber.h +++ b/src/common/Cryptography/BigNumber.h @@ -85,6 +85,5 @@ public: private: struct bignum_st* _bn; - }; #endif diff --git a/src/common/DataStores/DBCFileLoader.h b/src/common/DataStores/DBCFileLoader.h index f1f2fee06..bab5b3fff 100644 --- a/src/common/DataStores/DBCFileLoader.h +++ b/src/common/DataStores/DBCFileLoader.h @@ -71,7 +71,6 @@ public: DBCFileLoader& file; friend class DBCFileLoader; - }; // Get record by id diff --git a/src/common/Database/DatabaseWorkerPool.h b/src/common/Database/DatabaseWorkerPool.h index 322644bf7..eadeeaa26 100644 --- a/src/common/Database/DatabaseWorkerPool.h +++ b/src/common/Database/DatabaseWorkerPool.h @@ -216,7 +216,6 @@ public: } private: - void Enqueue(SQLOperation* op) { _queue->enqueue(op); diff --git a/src/common/Database/Field.h b/src/common/Database/Field.h index 9d4431a04..66ebf716c 100644 --- a/src/common/Database/Field.h +++ b/src/common/Database/Field.h @@ -18,7 +18,6 @@ class Field friend class PreparedResultSet; public: - [[nodiscard]] bool GetBool() const // Wrapper, actually gets integer { return (GetUInt8() == 1); @@ -224,7 +223,6 @@ public: } #endif return static_cast(data.value); - } [[nodiscard]] std::string GetString() const diff --git a/src/common/Database/MySQLConnection.cpp b/src/common/Database/MySQLConnection.cpp index b65fa0093..6dbd99ded 100644 --- a/src/common/Database/MySQLConnection.cpp +++ b/src/common/Database/MySQLConnection.cpp @@ -307,7 +307,6 @@ bool MySQLConnection::_Query(PreparedStatement* stmt, MYSQL_RES** pResult, uint6 *pFieldCount = mysql_stmt_field_count(msql_STMT); return true; - } } diff --git a/src/common/Database/QueryHolder.h b/src/common/Database/QueryHolder.h index 3a7fdf016..cfe037042 100644 --- a/src/common/Database/QueryHolder.h +++ b/src/common/Database/QueryHolder.h @@ -40,7 +40,6 @@ public: SQLQueryHolderTask(SQLQueryHolder* holder, QueryResultHolderFuture res) : m_holder(holder), m_result(res) { }; bool Execute() override; - }; -#endif \ No newline at end of file +#endif diff --git a/src/common/Database/QueryResult.h b/src/common/Database/QueryResult.h index a929dd898..68b903884 100644 --- a/src/common/Database/QueryResult.h +++ b/src/common/Database/QueryResult.h @@ -93,7 +93,6 @@ private: void FreeBindBuffer(); void CleanUp(); bool _NextRow(); - }; typedef std::shared_ptr PreparedQueryResult; diff --git a/src/common/Debugging/WheatyExceptionReport.cpp b/src/common/Debugging/WheatyExceptionReport.cpp index 3ed72c5b5..9b305d26c 100644 --- a/src/common/Debugging/WheatyExceptionReport.cpp +++ b/src/common/Debugging/WheatyExceptionReport.cpp @@ -48,7 +48,6 @@ inline LPTSTR ErrorMessage(DWORD dw) sprintf(msgBuf, "Unknown error: %u", dw); return msgBuf; } - } //============================== Global Variables ============================= @@ -794,7 +793,6 @@ void WheatyExceptionReport::WriteStackDetails( &sip.si)) // Address of the SYMBOL_INFO structure (inside "sip" object) { Log(_T("%hs+%I64X"), sip.si.Name, symDisplacement); - } else // No symbol found. Print out the logical address instead. { @@ -837,7 +835,6 @@ void WheatyExceptionReport::WriteStackDetails( Log(_T("\r\n")); } } - } ////////////////////////////////////////////////////////////////////////////// @@ -853,7 +850,6 @@ BOOL CALLBACK WheatyExceptionReport::EnumerateSymbolsCallback( { ClearSymbols(); FormatSymbolValue(pSymInfo, (STACKFRAME64*)UserContext); - } __except (EXCEPTION_EXECUTE_HANDLER) { diff --git a/src/common/Debugging/WheatyExceptionReport.h b/src/common/Debugging/WheatyExceptionReport.h index 5df5ec463..3f15b4cd1 100644 --- a/src/common/Debugging/WheatyExceptionReport.h +++ b/src/common/Debugging/WheatyExceptionReport.h @@ -134,7 +134,6 @@ struct SymbolDetail class WheatyExceptionReport { public: - WheatyExceptionReport(); ~WheatyExceptionReport(); @@ -196,7 +195,6 @@ private: static void PushSymbolDetail(); static void PopSymbolDetail(); static void PrintSymbolDetail(); - }; extern WheatyExceptionReport g_WheatyExceptionReport; // global instance of class diff --git a/src/common/Packets/ByteBuffer.h b/src/common/Packets/ByteBuffer.h index 639df87c3..48be55204 100644 --- a/src/common/Packets/ByteBuffer.h +++ b/src/common/Packets/ByteBuffer.h @@ -367,7 +367,6 @@ public: lt.tm_year = ((packedDate >> 24) & 0x1F) + 100; return uint32(mktime(<)); - } ByteBuffer& ReadPackedTime(uint32& time) diff --git a/src/common/Threading/LockedQueue.h b/src/common/Threading/LockedQueue.h index f74a6303a..1c0d3c544 100644 --- a/src/common/Threading/LockedQueue.h +++ b/src/common/Threading/LockedQueue.h @@ -28,7 +28,6 @@ namespace ACE_Based volatile bool _canceled{false}; public: - //! Create a LockedQueue. LockedQueue() diff --git a/src/common/Threading/PCQueue.h b/src/common/Threading/PCQueue.h index 005c8b5fc..2a594e24d 100644 --- a/src/common/Threading/PCQueue.h +++ b/src/common/Threading/PCQueue.h @@ -23,7 +23,6 @@ private: std::atomic _shutdown; public: - ProducerConsumerQueue() : _shutdown(false) { } void Push(const T& value) diff --git a/src/common/Threading/ThreadingModel.h b/src/common/Threading/ThreadingModel.h index c2b056069..95e1eb213 100644 --- a/src/common/Threading/ThreadingModel.h +++ b/src/common/Threading/ThreadingModel.h @@ -20,7 +20,6 @@ namespace acore class GeneralLock { public: - GeneralLock(MUTEX& m) : i_mutex(m) { @@ -33,7 +32,6 @@ namespace acore } private: - GeneralLock(const GeneralLock&); GeneralLock& operator=(const GeneralLock&); MUTEX& i_mutex; @@ -43,7 +41,6 @@ namespace acore class SingleThreaded { public: - struct Lock // empty object { Lock() @@ -63,7 +60,6 @@ namespace acore class ObjectLevelLockable { public: - ObjectLevelLockable() : i_mtx() { @@ -74,19 +70,16 @@ namespace acore class Lock { public: - Lock(ObjectLevelLockable& host) : i_lock(host.i_mtx) { } private: - GeneralLock i_lock; }; private: - // prevent the compiler creating a copy construct ObjectLevelLockable(const ObjectLevelLockable&); ObjectLevelLockable& operator=(const ObjectLevelLockable&); @@ -98,7 +91,6 @@ namespace acore class ClassLevelLockable { public: - ClassLevelLockable() { } @@ -108,7 +100,6 @@ namespace acore class Lock { public: - Lock(const T& /*host*/) { ClassLevelLockable::si_mtx.lock(); @@ -131,7 +122,6 @@ namespace acore }; private: - static MUTEX si_mtx; }; } diff --git a/src/common/Utilities/ServiceWin32.cpp b/src/common/Utilities/ServiceWin32.cpp index 4d5c1c274..1ca30e7ae 100644 --- a/src/common/Utilities/ServiceWin32.cpp +++ b/src/common/Utilities/ServiceWin32.cpp @@ -102,7 +102,6 @@ bool WinServiceInstall() &sfa); // new data CloseServiceHandle(service); - } } CloseServiceHandle(serviceControlManager); diff --git a/src/common/Utilities/Timer.h b/src/common/Utilities/Timer.h index b8e18252f..c7227417d 100644 --- a/src/common/Utilities/Timer.h +++ b/src/common/Utilities/Timer.h @@ -51,7 +51,6 @@ inline uint32 GetMSTimeDiffToNow(uint32 oldMSTime) struct IntervalTimer { public: - IntervalTimer() { @@ -96,7 +95,6 @@ public: } private: - time_t _interval{0}; time_t _current{0}; }; @@ -104,7 +102,6 @@ private: struct TimeTracker { public: - TimeTracker(time_t expiry) : i_expiryTime(expiry) { @@ -131,14 +128,12 @@ public: } private: - time_t i_expiryTime; }; struct TimeTrackerSmall { public: - TimeTrackerSmall(uint32 expiry = 0) : i_expiryTime(expiry) { @@ -165,14 +160,12 @@ public: } private: - int32 i_expiryTime; }; struct PeriodicTimer { public: - PeriodicTimer(int32 period, int32 start_time) : i_period(period), i_expireTime(start_time) { @@ -199,7 +192,6 @@ public: void TReset(int32 diff, int32 period) { i_expireTime += period > diff ? period : diff; } private: - int32 i_period; int32 i_expireTime; }; diff --git a/src/common/Utilities/Util.cpp b/src/common/Utilities/Util.cpp index 726e5c4e1..526ac26eb 100644 --- a/src/common/Utilities/Util.cpp +++ b/src/common/Utilities/Util.cpp @@ -172,7 +172,6 @@ void stripLineInvisibleChars(std::string& str) str.erase(wpos, str.size()); if (str.find("|TInterface") != std::string::npos) str.clear(); - } std::string secsToTimeString(uint64 timeInSecs, bool shortText) diff --git a/src/server/game/AI/CoreAI/PetAI.h b/src/server/game/AI/CoreAI/PetAI.h index fb05fec65..013736a0c 100644 --- a/src/server/game/AI/CoreAI/PetAI.h +++ b/src/server/game/AI/CoreAI/PetAI.h @@ -35,7 +35,6 @@ enum SpecialPets class PetAI : public CreatureAI { public: - explicit PetAI(Creature* c); void UpdateAI(uint32) override; diff --git a/src/server/game/AI/CoreAI/ReactorAI.h b/src/server/game/AI/CoreAI/ReactorAI.h index b7dc09860..c738f82f6 100644 --- a/src/server/game/AI/CoreAI/ReactorAI.h +++ b/src/server/game/AI/CoreAI/ReactorAI.h @@ -14,7 +14,6 @@ class Unit; class ReactorAI : public CreatureAI { public: - explicit ReactorAI(Creature* c) : CreatureAI(c) {} void MoveInLineOfSight(Unit*) override {} diff --git a/src/server/game/AI/CoreAI/TotemAI.h b/src/server/game/AI/CoreAI/TotemAI.h index 7e6c9dd3a..49d56614f 100644 --- a/src/server/game/AI/CoreAI/TotemAI.h +++ b/src/server/game/AI/CoreAI/TotemAI.h @@ -16,7 +16,6 @@ class Totem; class TotemAI : public CreatureAI { public: - explicit TotemAI(Creature* c); void MoveInLineOfSight(Unit* who) override; diff --git a/src/server/game/AI/CreatureAISelector.cpp b/src/server/game/AI/CreatureAISelector.cpp index 3f3de228c..4973be348 100644 --- a/src/server/game/AI/CreatureAISelector.cpp +++ b/src/server/game/AI/CreatureAISelector.cpp @@ -116,7 +116,6 @@ namespace FactorySelector }*/ return (mv_factory == NULL ? NULL : mv_factory->Create(creature)); - } GameObjectAI* SelectGameObjectAI(GameObject* go) diff --git a/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp b/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp index 3459a7368..0014c6867 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp +++ b/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp @@ -104,7 +104,6 @@ void npc_escortAI::MoveInLineOfSight(Unit* who) } AttackStart(who); } - } void npc_escortAI::JustDied(Unit* /*killer*/) diff --git a/src/server/game/AI/SmartScripts/SmartAI.cpp b/src/server/game/AI/SmartScripts/SmartAI.cpp index 1134786ec..96f71bd5d 100644 --- a/src/server/game/AI/SmartScripts/SmartAI.cpp +++ b/src/server/game/AI/SmartScripts/SmartAI.cpp @@ -1172,7 +1172,6 @@ void SmartGameObjectAI::SpellHit(Unit* unit, const SpellInfo* spellInfo) class SmartTrigger : public AreaTriggerScript { public: - SmartTrigger() : AreaTriggerScript("SmartTrigger") {} bool OnTrigger(Player* player, AreaTrigger const* trigger) override diff --git a/src/server/game/AI/SmartScripts/SmartScript.cpp b/src/server/game/AI/SmartScripts/SmartScript.cpp index 753e34f9f..9e2e3a545 100644 --- a/src/server/game/AI/SmartScripts/SmartScript.cpp +++ b/src/server/game/AI/SmartScripts/SmartScript.cpp @@ -2630,7 +2630,6 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u } else (*itr)->ToCreature()->SetHomePosition((*itr)->GetPositionX(), (*itr)->GetPositionY(), (*itr)->GetPositionZ(), (*itr)->GetOrientation()); - } delete targets; } diff --git a/src/server/game/AI/SmartScripts/SmartScript.h b/src/server/game/AI/SmartScripts/SmartScript.h index 573a7897d..9acaaa25b 100644 --- a/src/server/game/AI/SmartScripts/SmartScript.h +++ b/src/server/game/AI/SmartScripts/SmartScript.h @@ -307,7 +307,6 @@ private: mStoredEvents.erase(i); return; } - } } } @@ -321,7 +320,6 @@ private: { return (*i); } - } } SmartScriptHolder s; diff --git a/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp b/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp index dbec12da7..96f3afb42 100644 --- a/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp +++ b/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp @@ -1099,7 +1099,6 @@ bool SmartAIMgr::IsEventValid(SmartScriptHolder& e) } case SMART_ACTION_EQUIP: { - if (e.GetScriptType() == SMART_SCRIPT_TYPE_CREATURE) { int8 equipId = (int8)e.action.equip.entry; diff --git a/src/server/game/AI/SmartScripts/SmartScriptMgr.h b/src/server/game/AI/SmartScripts/SmartScriptMgr.h index 60aa0e5f2..0c90b4323 100644 --- a/src/server/game/AI/SmartScripts/SmartScriptMgr.h +++ b/src/server/game/AI/SmartScripts/SmartScriptMgr.h @@ -702,7 +702,6 @@ struct SmartAction struct { - uint32 emote1; uint32 emote2; uint32 emote3; @@ -1697,7 +1696,6 @@ public: bool active; bool runOnce; bool enableTimed; - }; typedef std::unordered_map WPPath; diff --git a/src/server/game/Achievements/AchievementMgr.cpp b/src/server/game/Achievements/AchievementMgr.cpp index 810afd663..0c3ec2a4a 100644 --- a/src/server/game/Achievements/AchievementMgr.cpp +++ b/src/server/game/Achievements/AchievementMgr.cpp @@ -614,7 +614,6 @@ void AchievementMgr::LoadFromDB(PreparedQueryResult achievementResult, PreparedQ if (CharTitlesEntry const* titleEntry = sCharTitlesStore.LookupEntry(titleId)) if (!GetPlayer()->HasTitle(titleEntry)) GetPlayer()->SetTitle(titleEntry); - } while (achievementResult->NextRow()); } @@ -758,7 +757,6 @@ static const uint32 achievIdForDungeon[][4] = */ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, uint32 miscValue1 /*= 0*/, uint32 miscValue2 /*= 0*/, Unit* unit /*= NULL*/) { - // disable for gamemasters with GM-mode enabled if (m_player->IsGameMaster()) return; @@ -1114,7 +1112,6 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui continue; SetCriteriaProgress(achievementCriteria, 1, PROGRESS_ACCUMULATE); break; - } case ACHIEVEMENT_CRITERIA_TYPE_KILLED_BY_CREATURE: // AchievementMgr::UpdateAchievementCriteria might also be called on login - skip in this case @@ -2432,7 +2429,6 @@ void AchievementGlobalMgr::LoadAchievementCriteriaList() uint32 loaded = 0; for (uint32 entryId = 0; entryId < sAchievementCriteriaStore.GetNumRows(); ++entryId) { - AchievementCriteriaEntry const* criteria = sAchievementCriteriaStore.LookupEntry(entryId); if (!criteria) continue; @@ -2583,7 +2579,6 @@ void AchievementGlobalMgr::LoadAchievementReferenceList() for (uint32 entryId = 0; entryId < sAchievementStore.GetNumRows(); ++entryId) { - AchievementEntry const* achievement = sAchievementStore.LookupEntry(entryId); if (!achievement || !achievement->refAchievement) continue; @@ -2894,7 +2889,6 @@ void AchievementGlobalMgr::LoadRewards() m_achievementRewards[entry] = reward; ++count; - } while (result->NextRow()); sLog->outString(">> Loaded %u achievement rewards in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); @@ -2939,7 +2933,6 @@ void AchievementGlobalMgr::LoadRewardLocales() ObjectMgr::AddLocaleString(Subject, locale, data.Subject); ObjectMgr::AddLocaleString(Text, locale, data.Text); - } while (result->NextRow()); sLog->outString(">> Loaded %lu Achievement Reward Locale strings in %u ms", (unsigned long)m_achievementRewardLocales.size(), GetMSTimeDiffToNow(oldMSTime)); diff --git a/src/server/game/AuctionHouse/AuctionHouseMgr.cpp b/src/server/game/AuctionHouse/AuctionHouseMgr.cpp index d43d4ce62..2a15d658e 100644 --- a/src/server/game/AuctionHouse/AuctionHouseMgr.cpp +++ b/src/server/game/AuctionHouse/AuctionHouseMgr.cpp @@ -292,7 +292,6 @@ void AuctionHouseMgr::LoadAuctionItems() do { - Field* fields = result->Fetch(); uint32 item_guid = fields[11].GetUInt32(); diff --git a/src/server/game/AuctionHouse/AuctionHouseMgr.h b/src/server/game/AuctionHouse/AuctionHouseMgr.h index 3ab71f945..19d20fab4 100644 --- a/src/server/game/AuctionHouse/AuctionHouseMgr.h +++ b/src/server/game/AuctionHouse/AuctionHouseMgr.h @@ -79,7 +79,6 @@ struct AuctionEntry bool LoadFromFieldList(Field* fields); [[nodiscard]] std::string BuildAuctionMailSubject(MailAuctionAnswers response) const; static std::string BuildAuctionMailBody(uint32 lowGuid, uint32 bid, uint32 buyout, uint32 deposit, uint32 cut); - }; //this class is used as auctionhouse instance @@ -134,7 +133,6 @@ private: ~AuctionHouseMgr(); public: - typedef std::unordered_map ItemMap; static AuctionHouseMgr* instance(); @@ -163,7 +161,6 @@ public: static AuctionHouseEntry const* GetAuctionHouseEntry(uint32 factionTemplateId); public: - //load first auction items, because of check if item exists, when loading void LoadAuctionItems(); void LoadAuctions(); @@ -174,7 +171,6 @@ public: void Update(); private: - AuctionHouseObject mHordeAuctions; AuctionHouseObject mAllianceAuctions; AuctionHouseObject mNeutralAuctions; diff --git a/src/server/game/Battlefield/Zones/BattlefieldWG.cpp b/src/server/game/Battlefield/Zones/BattlefieldWG.cpp index e76fc83b3..cd239678a 100644 --- a/src/server/game/Battlefield/Zones/BattlefieldWG.cpp +++ b/src/server/game/Battlefield/Zones/BattlefieldWG.cpp @@ -983,7 +983,6 @@ void BattlefieldWG::UpdatedDestroyedTowerCount(TeamId team, GameObject* go) if (go && player->GetDistance2d(go) < 100.0f) player->KilledMonsterCredit(NPC_QUEST_VEHICLE_PROTECTED, 0); } - } } diff --git a/src/server/game/Battlegrounds/ArenaTeam.h b/src/server/game/Battlegrounds/ArenaTeam.h index 744f1d889..ff2b3fef9 100644 --- a/src/server/game/Battlegrounds/ArenaTeam.h +++ b/src/server/game/Battlegrounds/ArenaTeam.h @@ -175,7 +175,6 @@ public: void FinishGame(int32 mod, const Map* bgMap); protected: - uint32 TeamId; uint8 Type; std::string TeamName; diff --git a/src/server/game/Battlegrounds/BattlegroundQueue.h b/src/server/game/Battlegrounds/BattlegroundQueue.h index 70e60e2bc..325b15d85 100644 --- a/src/server/game/Battlegrounds/BattlegroundQueue.h +++ b/src/server/game/Battlegrounds/BattlegroundQueue.h @@ -112,7 +112,6 @@ public: //one selection pool for horde, other one for alliance SelectionPool m_SelectionPools[BG_TEAMS_COUNT]; private: - BattlegroundTypeId m_bgTypeId; ArenaType m_arenaType; uint32 m_WaitTimes[BG_TEAMS_COUNT][MAX_BATTLEGROUND_BRACKETS][COUNT_OF_PLAYERS_TO_AVERAGE_WAIT_TIME]; diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundAB.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundAB.cpp index 9aaf0241f..97efe074f 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundAB.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundAB.cpp @@ -117,7 +117,6 @@ void BattlegroundAB::PostUpdateImpl(uint32 diff) void BattlegroundAB::StartingEventCloseDoors() { - for (uint32 obj = BG_AB_OBJECT_BANNER_NEUTRAL; obj < BG_AB_DYNAMIC_NODES_COUNT * BG_AB_OBJECTS_PER_NODE; ++obj) SpawnBGObject(obj, RESPAWN_ONE_DAY); for (uint32 i = 0; i < BG_AB_DYNAMIC_NODES_COUNT * 3; ++i) diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundAV.h b/src/server/game/Battlegrounds/Zones/BattlegroundAV.h index caa484357..2801603ac 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundAV.h +++ b/src/server/game/Battlegrounds/Zones/BattlegroundAV.h @@ -1001,7 +1001,6 @@ const float BG_AV_CreaturePos[AV_CPLACE_MAX][4] = enum BG_AV_CreatureIds { - AV_NPC_A_TOWERDEFENSE = 0, // stormpike bowman AV_NPC_A_GRAVEDEFENSE0 = 1, // stormpike Defender AV_NPC_A_GRAVEDEFENSE1 = 2, // seasoned defender @@ -1053,7 +1052,6 @@ enum BG_AV_CreatureIds AV_NPC_S_MINE_H_4 = 46, AV_NPC_HERALD = 47, AV_NPC_INFO_MAX = 48 - }; const uint32 BG_AV_CreatureInfo[AV_NPC_INFO_MAX] = @@ -1242,7 +1240,6 @@ const float BG_AV_StaticCreaturePos[AV_STATICCPLACE_MAX][5] = {773.651f, -497.482f, 99.0408f, 2.11185f, 46 }, //14284 - Stormpike Battleguard {949.1f, -506.913f, 95.4237f, 3.31613f, 46 }, //14284 - Stormpike Battleguard {-1370.9f, -219.793f, 98.4258f, 5.04381f, 47}, //drek thar - }; const uint32 BG_AV_StaticCreatureInfo[51] = @@ -1452,7 +1449,6 @@ enum BG_AV_WorldStates AV_FROSTWOLFE_UNUSED = 1393, AV_FROSTWOLFW_UNUSED = 1392 */ - }; //alliance_control neutral_control horde_control diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundBE.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundBE.cpp index f209e851d..a0fbf0bdf 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundBE.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundBE.cpp @@ -29,7 +29,6 @@ BattlegroundBE::BattlegroundBE() BattlegroundBE::~BattlegroundBE() { - } void BattlegroundBE::StartingEventCloseDoors() diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundDS.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundDS.cpp index 4ee2b1438..e16773180 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundDS.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundDS.cpp @@ -37,7 +37,6 @@ BattlegroundDS::BattlegroundDS() BattlegroundDS::~BattlegroundDS() { - } void BattlegroundDS::PostUpdateImpl(uint32 diff) diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundIC.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundIC.cpp index 916fc58e2..2df40e77a 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundIC.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundIC.cpp @@ -350,7 +350,6 @@ void BattlegroundIC::HandleAreaTrigger(Player* player, uint32 trigger) player->CastSpell(player, SPELL_BACK_DOOR_JOB, true); break; } - } void BattlegroundIC::UpdatePlayerScore(Player* player, uint32 type, uint32 value, bool doAddHonor) @@ -950,7 +949,6 @@ void BattlegroundIC::DestroyGate(Player* /*player*/, GameObject* go) void BattlegroundIC::EventPlayerDamagedGO(Player* /*player*/, GameObject* /*go*/, uint32 /*eventType*/) { - } GraveyardStruct const* BattlegroundIC::GetClosestGraveyard(Player* player) diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundNA.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundNA.cpp index e562d0209..ccd726725 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundNA.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundNA.cpp @@ -29,7 +29,6 @@ BattlegroundNA::BattlegroundNA() BattlegroundNA::~BattlegroundNA() { - } void BattlegroundNA::StartingEventCloseDoors() diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundRL.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundRL.cpp index 6da969cdb..81808d6fa 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundRL.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundRL.cpp @@ -29,7 +29,6 @@ BattlegroundRL::BattlegroundRL() BattlegroundRL::~BattlegroundRL() { - } void BattlegroundRL::StartingEventCloseDoors() diff --git a/src/server/game/Chat/Channels/Channel.cpp b/src/server/game/Chat/Channels/Channel.cpp index 07c854f5d..11c8030b8 100644 --- a/src/server/game/Chat/Channels/Channel.cpp +++ b/src/server/game/Chat/Channels/Channel.cpp @@ -978,12 +978,10 @@ void Channel::SendToAllWatching(WorldPacket* data) void Channel::Voice(uint64 /*guid1*/, uint64 /*guid2*/) { - } void Channel::DeVoice(uint64 /*guid1*/, uint64 /*guid2*/) { - } void Channel::MakeNotifyPacket(WorldPacket* data, uint8 notify_type) diff --git a/src/server/game/Chat/Chat.h b/src/server/game/Chat/Chat.h index 46a98f550..9d1596c7a 100644 --- a/src/server/game/Chat/Chat.h +++ b/src/server/game/Chat/Chat.h @@ -124,7 +124,6 @@ protected: bool ShowHelpForSubCommands(std::vector const& table, char const* cmd, char const* subcmd); private: - WorldSession* m_session; // != NULL for chat command call and NULL for CLI command // common global flag diff --git a/src/server/game/Combat/UnitEvents.h b/src/server/game/Combat/UnitEvents.h index a1dc4f92b..1ab7df551 100644 --- a/src/server/game/Combat/UnitEvents.h +++ b/src/server/game/Combat/UnitEvents.h @@ -65,7 +65,6 @@ public: [[nodiscard]] bool matchesTypeMask(uint32 pMask) const { return iType & pMask; } void setType(uint32 pType) { iType = pType; } - }; //============================================================== diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp index a71b8b050..f0363f746 100644 --- a/src/server/game/Conditions/ConditionMgr.cpp +++ b/src/server/game/Conditions/ConditionMgr.cpp @@ -717,7 +717,6 @@ bool ConditionMgr::IsObjectMeetToConditionList(ConditionSourceInfo& sourceInfo, sLog->outDebug(LOG_FILTER_CONDITIONSYS, "IsPlayerMeetToConditionList: Reference template -%u not found", (*i)->ReferenceId); #endif } - } else //handle normal condition { @@ -919,7 +918,6 @@ void ConditionMgr::LoadConditions(bool isReload) do { - Field* fields = result->Fetch(); Condition* cond = new Condition(); diff --git a/src/server/game/DungeonFinding/LFGQueue.h b/src/server/game/DungeonFinding/LFGQueue.h index 394693e9e..0242f4e25 100644 --- a/src/server/game/DungeonFinding/LFGQueue.h +++ b/src/server/game/DungeonFinding/LFGQueue.h @@ -64,7 +64,6 @@ namespace lfg class LFGQueue { public: - // Add/Remove from queue void AddToQueue(uint64 guid, bool failedProposal = false); void RemoveFromQueue(uint64 guid, bool partial = false); // xinef: partial remove, dont delete data from list! diff --git a/src/server/game/Entities/Creature/Creature.h b/src/server/game/Entities/Creature/Creature.h index 78980af67..90ab61ca5 100644 --- a/src/server/game/Entities/Creature/Creature.h +++ b/src/server/game/Entities/Creature/Creature.h @@ -436,7 +436,6 @@ typedef std::map CreatureSpellCooldowns; class Creature : public Unit, public GridObject, public MovableMapObject { public: - explicit Creature(bool isWorldObject = false); ~Creature() override; diff --git a/src/server/game/Entities/Item/Container/Bag.h b/src/server/game/Entities/Item/Container/Bag.h index 385b13ab7..aaaedff37 100644 --- a/src/server/game/Entities/Item/Container/Bag.h +++ b/src/server/game/Entities/Item/Container/Bag.h @@ -16,7 +16,6 @@ class Bag : public Item { public: - Bag(); ~Bag() override; @@ -49,7 +48,6 @@ public: void BuildCreateUpdateBlockForPlayer(UpdateData* data, Player* target) const override; protected: - // Bag Storage space Item* m_bagslot[MAX_BAG_SIZE]; }; diff --git a/src/server/game/Entities/Object/Object.h b/src/server/game/Entities/Object/Object.h index 7d7a3bb03..0a2012098 100644 --- a/src/server/game/Entities/Object/Object.h +++ b/src/server/game/Entities/Object/Object.h @@ -328,7 +328,6 @@ public: DataMap CustomData; protected: - Object(); void _InitValues(); @@ -635,7 +634,6 @@ struct MovementInfo } float zspeed, sinAngle, cosAngle, xyspeed; - } jump; // spline diff --git a/src/server/game/Entities/Pet/Pet.cpp b/src/server/game/Entities/Pet/Pet.cpp index 868327a95..9e0bf96d4 100644 --- a/src/server/game/Entities/Pet/Pet.cpp +++ b/src/server/game/Entities/Pet/Pet.cpp @@ -81,7 +81,6 @@ void Pet::AddToWorld() GetCharmInfo()->SetIsFollowing(false); GetCharmInfo()->SetIsReturning(false); } - } void Pet::RemoveFromWorld() @@ -839,7 +838,6 @@ bool Guardian::InitStatsForLevel(uint8 petlevel) } case SUMMON_PET: { - if (pInfo) { SetBaseWeaponDamage(BASE_ATTACK, MINDAMAGE, float(pInfo->min_dmg)); @@ -1192,7 +1190,6 @@ void Pet::_SaveSpellCooldowns(SQLTransaction& trans, bool logout) stmt->setUInt32(1, itr2->first); stmt->setUInt32(2, cooldown); trans->Append(stmt); - } } } @@ -2329,7 +2326,6 @@ void Pet::RemoveSpellCooldown(uint32 spell_id, bool update /* = false */) if (update) { - if (Player* playerOwner = GetCharmerOrOwnerPlayerOrPlayerItself()) { WorldPacket data(SMSG_CLEAR_COOLDOWN, 4 + 8); diff --git a/src/server/game/Entities/Pet/PetDefines.h b/src/server/game/Entities/Pet/PetDefines.h index 0d6519b6c..a6d231cdc 100644 --- a/src/server/game/Entities/Pet/PetDefines.h +++ b/src/server/game/Entities/Pet/PetDefines.h @@ -185,7 +185,6 @@ enum PetScalingSpells SPELL_DK_PET_SCALING_01 = 51996, SPELL_DK_PET_SCALING_02 = 54566, SPELL_DK_PET_SCALING_03 = 61697 - }; #define PET_FOLLOW_DIST 1.0f diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index b985f5303..309289e6f 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -2644,7 +2644,6 @@ void Player::RegenerateAll() // xinef: if grace is started, increase it but no more than cap else if (uint32 grace = GetGracePeriod(i)) { - if (grace < RUNE_GRACE_PERIOD) SetGracePeriod(i, std::min(grace + m_regenTimer, RUNE_GRACE_PERIOD)); } @@ -4110,7 +4109,6 @@ bool Player::IsNeedCastPassiveSpellAtLearn(SpellInfo const* spellInfo) const ShapeshiftForm form = GetShapeshiftForm(); return (!spellInfo->Stances || (form && (spellInfo->Stances & (1 << (form - 1)))) || (!form && spellInfo->HasAttribute(SPELL_ATTR2_NOT_NEED_SHAPESHIFT))); - } void Player::learnSpell(uint32 spellId) @@ -8653,7 +8651,6 @@ void Player::CastItemCombatSpell(Unit* target, WeaponAttackType attType, uint32 if (spellData.SpellPPMRate) { - uint32 WeaponSpeed = GetAttackTime(attType); chance = GetPPMProcChance(WeaponSpeed, spellData.SpellPPMRate, spellInfo); } @@ -18837,7 +18834,6 @@ void Player::_LoadInventory(PreparedQueryResult result, uint32 timeDiff) delete item; continue; } - } // Item's state may have changed after storing diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h index c3f665607..41c5587dc 100644 --- a/src/server/game/Entities/Player/Player.h +++ b/src/server/game/Entities/Player/Player.h @@ -1042,11 +1042,9 @@ public: // constructors void SetInAcceptProcess(bool state) { m_acceptProccess = state; } private: // internal functions - void Update(bool for_trader = true); private: // fields - Player* m_player; // Player who own of this TradeData Player* m_trader; // Player who trade with m_player diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 89bf4c264..8939138aa 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -2375,7 +2375,6 @@ MeleeHitOutcome Unit::RollMeleeOutcomeAgainst(const Unit* victim, WeaponAttackTy MeleeHitOutcome Unit::RollMeleeOutcomeAgainst(const Unit* victim, WeaponAttackType attType, int32 crit_chance, int32 miss_chance, int32 dodge_chance, int32 parry_chance, int32 block_chance) const { - if (victim->GetTypeId() == TYPEID_UNIT && victim->ToCreature()->IsEvadingAttacks()) return MELEE_HIT_EVADE; @@ -9929,7 +9928,6 @@ void Unit::ModifyAuraState(AuraStateType flag, bool apply) if( AuraApplication* aurApp = (*itr).second->GetApplicationOfTarget(GetGUID()) ) (*itr).second->HandleAllEffects(aurApp, AURA_EFFECT_HANDLE_REAL, true); } - } } else @@ -11297,7 +11295,6 @@ int32 Unit::SpellBaseDamageBonusDone(SpellSchoolMask schoolMask) for (AuraEffectList::const_iterator i = mDamageDonebyAP.begin(); i != mDamageDonebyAP.end(); ++i) if ((*i)->GetMiscValue() & schoolMask) DoneAdvertisedBenefit += int32(CalculatePct(GetTotalAttackPowerValue(BASE_ATTACK), (*i)->GetAmount())); - } return DoneAdvertisedBenefit; } @@ -12766,7 +12763,6 @@ void Unit::Dismount() void Unit::SetInCombatWith(Unit* enemy, uint32 duration) { - // Xinef: Dont allow to start combat with triggers if (enemy->GetTypeId() == TYPEID_UNIT && enemy->ToCreature()->IsTrigger()) return; @@ -12793,7 +12789,6 @@ void Unit::SetInCombatWith(Unit* enemy, uint32 duration) void Unit::CombatStart(Unit* target, bool initialAggro) { - // Xinef: Dont allow to start combat with triggers if (target->GetTypeId() == TYPEID_UNIT && target->ToCreature()->IsTrigger()) return; @@ -13078,7 +13073,6 @@ bool Unit::_IsValidAttackTarget(Unit const* target, SpellInfo const* bySpell, Wo if (FactionState const* repState = player->GetReputationMgr().GetState(factionEntry)) if (!(repState->Flags & FACTION_FLAG_AT_WAR)) return false; - } } } @@ -14081,7 +14075,6 @@ int32 Unit::ModSpellDuration(SpellInfo const* spellProto, Unit const* target, in { // else positive mods here, there are no currently // when there will be, change GetTotalAuraModifierByMiscValue to GetTotalPositiveAuraModifierByMiscValue - } // Glyphs which increase duration of selfcasted buffs @@ -15762,7 +15755,6 @@ void Unit::ProcDamageAndSpellFor(bool isVictim, Unit* target, uint32 procFlag, u takeCharges = true; else if (triggeredByAura->GetAmount()) // aura must have amount { - int32 damageLeft = triggeredByAura->GetAmount(); // No damage left if (damageLeft < int32(damage)) @@ -16339,7 +16331,6 @@ float Unit::CalculateDefaultCoefficient(SpellInfo const* spellInfo, DamageEffect float DotFactor = 1.0f; if (damagetype == DOT) { - int32 DotDuration = spellInfo->GetDuration(); if (!spellInfo->IsChanneled() && DotDuration > 0) DotFactor = DotDuration / 15000.0f; @@ -16740,7 +16731,6 @@ bool Unit::HandleAuraRaidProcFromChargeWithValue(AuraEffect* triggeredByAura) // heal CastCustomSpell(this, 33110, &heal, nullptr, nullptr, true, nullptr, nullptr, caster_guid); return true; - } bool Unit::HandleAuraRaidProcFromCharge(AuraEffect* triggeredByAura) { diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h index c6af89835..48477d192 100644 --- a/src/server/game/Entities/Unit/Unit.h +++ b/src/server/game/Entities/Unit/Unit.h @@ -1231,7 +1231,6 @@ public: [[nodiscard]] ReactStates GetPlayerReactState() const { return _oldReactState; } private: - Unit* _unit; UnitActionBarEntry PetActionBar[MAX_UNIT_ACTION_BAR_INDEX]; CharmSpellInfo _charmspells[4]; diff --git a/src/server/game/Events/GameEventMgr.cpp b/src/server/game/Events/GameEventMgr.cpp index be1e3d00b..692b805c6 100644 --- a/src/server/game/Events/GameEventMgr.cpp +++ b/src/server/game/Events/GameEventMgr.cpp @@ -273,7 +273,6 @@ void GameEventMgr::LoadFromDB() SetHolidayEventTime(pGameEvent); } - } while (result->NextRow()); sLog->outString(">> Loaded %u game events in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); @@ -1007,7 +1006,6 @@ void GameEventMgr::LoadHolidayDates() } ++count; - } while (result->NextRow()); sLog->outString(">> Loaded %u holiday dates in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); @@ -1819,7 +1817,6 @@ void GameEventMgr::SetHolidayEventTime(GameEventData& event) // date is due and not a singleDate event, try with next DBC date (modified by holiday_dates) // if none is found we don't modify start date and use the one in game_event } - } } diff --git a/src/server/game/Globals/ObjectAccessor.h b/src/server/game/Globals/ObjectAccessor.h index 33dbfe4ea..05c923063 100644 --- a/src/server/game/Globals/ObjectAccessor.h +++ b/src/server/game/Globals/ObjectAccessor.h @@ -32,7 +32,6 @@ template class HashMapHolder { public: - typedef std::unordered_map MapType; typedef ACE_RW_Thread_Mutex LockType; @@ -60,7 +59,6 @@ public: static LockType* GetLock() { return &i_lock; } private: - //Non instanceable only static HashMapHolder() = default; diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index 55b63370a..a9433d67f 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -385,7 +385,6 @@ void ObjectMgr::LoadCreatureLocales() AddLocaleString(Name, locale, data.Name); AddLocaleString(Title, locale, data.Title); - } while (result->NextRow()); sLog->outString(">> Loaded %lu Сreature Locale strings in %u ms", (unsigned long)_creatureLocaleStore.size(), GetMSTimeDiffToNow(oldMSTime)); @@ -420,7 +419,6 @@ void ObjectMgr::LoadGossipMenuItemsLocales() AddLocaleString(OptionText, locale, data.OptionText); AddLocaleString(BoxText, locale, data.BoxText); - } while (result->NextRow()); sLog->outString(">> Loaded %u Gossip Menu Option Locale strings in %u ms", (uint32)_gossipMenuItemsLocaleStore.size(), GetMSTimeDiffToNow(oldMSTime)); @@ -452,7 +450,6 @@ void ObjectMgr::LoadPointOfInterestLocales() continue; AddLocaleString(Name, locale, data.Name); - } while (result->NextRow()); sLog->outString(">> Loaded %u Points Of Interest Locale strings in %u ms", (uint32)_pointOfInterestLocaleStore.size(), GetMSTimeDiffToNow(oldMSTime)); @@ -1862,7 +1859,6 @@ void ObjectMgr::LoadCreatures() AddCreatureToGrid(guid, &data); ++count; - } while (result->NextRow()); sLog->outString(">> Loaded %u creatures in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); @@ -2306,7 +2302,6 @@ void ObjectMgr::LoadItemLocales() AddLocaleString(Name, locale, data.Name); AddLocaleString(Description, locale, data.Description); - } while (result->NextRow()); sLog->outString(">> Loaded %u Item Locale strings in %u ms", (uint32)_itemLocaleStore.size(), GetMSTimeDiffToNow(oldMSTime)); @@ -2931,7 +2926,6 @@ void ObjectMgr::LoadItemSetNameLocales() continue; AddLocaleString(Name, locale, data.Name); - } while (result->NextRow()); sLog->outString(">> Loaded %u Item Set Name Locale strings in %u ms", uint32(_itemSetNameLocaleStore.size()), GetMSTimeDiffToNow(oldMSTime)); @@ -4667,7 +4661,6 @@ void ObjectMgr::LoadQuestLocales() for (uint8 i = 0; i < 4; ++i) AddLocaleString(fields[i + 7].GetString(), locale, data.ObjectiveText[i]); - } while (result->NextRow()); sLog->outString(">> Loaded %u Quest Locale strings in %u ms", (uint32)_questLocaleStore.size(), GetMSTimeDiffToNow(oldMSTime)); @@ -5100,7 +5093,6 @@ void ObjectMgr::LoadSpellScriptNames() do { - Field* fields = result->Fetch(); int32 spellId = fields[0].GetInt32(); @@ -5246,7 +5238,6 @@ void ObjectMgr::LoadPageTexts() PageTextContainer::const_iterator itr2 = _pageTextStore.find(itr->second.NextPage); if (itr2 == _pageTextStore.end()) sLog->outErrorDb("Page text (Id: %u) has not existing next page (Id: %u)", itr->first, itr->second.NextPage); - } } @@ -5287,7 +5278,6 @@ void ObjectMgr::LoadPageTextLocales() LocaleConstant locale = GetLocaleByName(LocaleName); AddLocaleString(Text, locale, data.Text); - } while (result->NextRow()); sLog->outString(">> Loaded %u Page Text Locale strings in %u ms", (uint32)_pageTextLocaleStore.size(), GetMSTimeDiffToNow(oldMSTime)); @@ -5466,7 +5456,6 @@ void ObjectMgr::LoadGossipText() do { - cic = 0; Field* fields = result->Fetch(); @@ -5508,7 +5497,6 @@ void ObjectMgr::LoadGossipText() } count++; - } while (result->NextRow()); sLog->outString(">> Loaded %u npc texts in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); @@ -5546,7 +5534,6 @@ void ObjectMgr::LoadNpcTextLocales() AddLocaleString(fields[2 + i * 2].GetString(), locale, data.Text_0[i]); AddLocaleString(fields[3 + i * 2].GetString(), locale, data.Text_1[i]); } - } while (result->NextRow()); sLog->outString(">> Loaded %u Npc Text Locale strings in %u ms", (uint32)_npcTextLocaleStore.size(), GetMSTimeDiffToNow(oldMSTime)); @@ -5728,7 +5715,6 @@ void ObjectMgr::LoadQuestAreaTriggers() } _questAreaTriggerStore[trigger_ID] = quest_ID; - } while (result->NextRow()); sLog->outString(">> Loaded %u quest trigger points in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); @@ -5759,7 +5745,6 @@ void ObjectMgr::LoadQuestOfferRewardLocale() QuestOfferRewardLocale& data = _questOfferRewardLocaleStore[id]; AddLocaleString(fields[2].GetString(), locale, data.RewardText); - } while (result->NextRow()); sLog->outString(">> Loaded %lu Quest Offer Reward locale strings in %u ms", _questOfferRewardLocaleStore.size(), GetMSTimeDiffToNow(oldMSTime)); @@ -5789,7 +5774,6 @@ void ObjectMgr::LoadQuestRequestItemsLocale() QuestRequestItemsLocale& data = _questRequestItemsLocaleStore[id]; AddLocaleString(fields[2].GetString(), locale, data.CompletionText); - } while (result->NextRow()); sLog->outString(">> Loaded %lu Quest Request Items locale strings in %u ms", _questRequestItemsLocaleStore.size(), GetMSTimeDiffToNow(oldMSTime)); @@ -6020,7 +6004,6 @@ void ObjectMgr::LoadAreaTriggers() } _areaTriggerStore[at.entry] = at; - } while (result->NextRow()); sLog->outString(">> Loaded %u area trigger definitions in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); @@ -6082,7 +6065,6 @@ void ObjectMgr::LoadAreaTriggerTeleports() } _areaTriggerTeleportStore[Trigger_ID] = at; - } while (result->NextRow()); sLog->outString(">> Loaded %u area trigger teleport definitions in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); @@ -6452,7 +6434,6 @@ void ObjectMgr::LoadGameObjectLocales() AddLocaleString(Name, locale, data.Name); AddLocaleString(CastBarCaption, locale, data.CastBarCaption); - } while (result->NextRow()); sLog->outString(">> Loaded %u Gameobject Locale strings in %u ms", (uint32)_gameObjectLocaleStore.size(), GetMSTimeDiffToNow(oldMSTime)); @@ -7817,7 +7798,6 @@ bool ObjectMgr::LoadAcoreStrings() for (uint8 i = 0; i < TOTAL_LOCALES; ++i) AddLocaleString(fields[i + 1].GetString(), LocaleConstant(i), data.Content); - } while (result->NextRow()); sLog->outString(">> Loaded %u acore strings in %u ms", (uint32)_acoreStringStore.size(), GetMSTimeDiffToNow(oldMSTime)); @@ -8424,7 +8404,6 @@ void ObjectMgr::LoadGossipMenu() } _gossipMenusStore.insert(GossipMenusContainer::value_type(gMenu.MenuID, gMenu)); - } while (result->NextRow()); sLog->outString(">> Loaded %u gossip_menu entries in %u ms", (uint32)_gossipMenusStore.size(), GetMSTimeDiffToNow(oldMSTime)); @@ -8497,7 +8476,6 @@ void ObjectMgr::LoadGossipMenuItems() } _gossipMenuItemsStore.insert(GossipMenuItemsContainer::value_type(gMenuItem.MenuID, gMenuItem)); - } while (result->NextRow()); sLog->outString(">> Loaded %u gossip_menu_option entries in %u ms", uint32(_gossipMenuItemsStore.size()), GetMSTimeDiffToNow(oldMSTime)); diff --git a/src/server/game/Grids/Grid.h b/src/server/game/Grids/Grid.h index fb345790c..75cbfa398 100644 --- a/src/server/game/Grids/Grid.h +++ b/src/server/game/Grids/Grid.h @@ -36,7 +36,6 @@ class Grid // allows the GridLoader to access its internals template friend class GridLoader; public: - /** destructor to clean up its resources. This includes unloading the grid if it has not been unload. */ @@ -113,7 +112,6 @@ public: return i_container.GetElements().isEmpty(); }*/ private: - TypeMapContainer i_container; TypeMapContainer i_objects; //typedef std::set ActiveGridObjects; diff --git a/src/server/game/Handlers/BattleGroundHandler.cpp b/src/server/game/Handlers/BattleGroundHandler.cpp index 451272833..4b6c9a157 100644 --- a/src/server/game/Handlers/BattleGroundHandler.cpp +++ b/src/server/game/Handlers/BattleGroundHandler.cpp @@ -182,7 +182,6 @@ void WorldSession::HandleBattlemasterJoinOpcode(WorldPacket& recvData) SendPacket(&data); sScriptMgr->OnPlayerJoinBG(_player); - } // check if group can queue: else diff --git a/src/server/game/Handlers/NPCHandler.cpp b/src/server/game/Handlers/NPCHandler.cpp index 6d5fc7217..08212c136 100644 --- a/src/server/game/Handlers/NPCHandler.cpp +++ b/src/server/game/Handlers/NPCHandler.cpp @@ -618,7 +618,6 @@ void WorldSession::SendStablePetCallback(PreparedQueryResult result, uint64 guid data.put(wpos, num); // set real data to placeholder SendPacket(&data); - } void WorldSession::SendStableResult(uint8 res) diff --git a/src/server/game/Instances/InstanceSaveMgr.h b/src/server/game/Instances/InstanceSaveMgr.h index 67a5267ab..0b27080e6 100644 --- a/src/server/game/Instances/InstanceSaveMgr.h +++ b/src/server/game/Instances/InstanceSaveMgr.h @@ -46,7 +46,6 @@ class InstanceSave { friend class InstanceSaveManager; public: - InstanceSave(uint16 MapId, uint32 InstanceId, Difficulty difficulty, time_t resetTime, time_t extendedResetTime); ~InstanceSave(); [[nodiscard]] uint32 GetInstanceId() const { return m_instanceid; } @@ -80,7 +79,6 @@ public: typedef std::list PlayerListType; private: - PlayerListType m_playerList; time_t m_resetTime; time_t m_extendedResetTime; diff --git a/src/server/game/Instances/InstanceScript.h b/src/server/game/Instances/InstanceScript.h index fd1c224d4..9810940af 100644 --- a/src/server/game/Instances/InstanceScript.h +++ b/src/server/game/Instances/InstanceScript.h @@ -121,7 +121,6 @@ typedef std::map MinionInfoMap; class InstanceScript : public ZoneScript { public: - explicit InstanceScript(Map* map) : instance(map), completedEncounters(0) {} ~InstanceScript() override {} diff --git a/src/server/game/Maps/Map.h b/src/server/game/Maps/Map.h index b0ab6b8dc..52118ff8b 100644 --- a/src/server/game/Maps/Map.h +++ b/src/server/game/Maps/Map.h @@ -579,7 +579,6 @@ private: void UpdateActiveCells(const float& x, const float& y, const uint32 t_diff); protected: - ACE_Thread_Mutex Lock; ACE_Thread_Mutex GridLock; ACE_RW_Thread_Mutex MMapLock; diff --git a/src/server/game/Maps/TransportMgr.cpp b/src/server/game/Maps/TransportMgr.cpp index 941e0c871..6732ee428 100644 --- a/src/server/game/Maps/TransportMgr.cpp +++ b/src/server/game/Maps/TransportMgr.cpp @@ -428,7 +428,6 @@ void TransportMgr::SpawnContinentTransports() if (!tInfo->inInstance) if (CreateTransport(entry, guid)) ++count; - } while (result->NextRow()); } @@ -456,7 +455,6 @@ void TransportMgr::SpawnContinentTransports() map->LoadGrid(x, y); ++count; } - } while (result->NextRow()); } diff --git a/src/server/game/Misc/BanManager.cpp b/src/server/game/Misc/BanManager.cpp index ec1cca052..ee5d7b4a4 100644 --- a/src/server/game/Misc/BanManager.cpp +++ b/src/server/game/Misc/BanManager.cpp @@ -198,7 +198,6 @@ BanReturn BanManager::BanIP(std::string const& IP, std::string const& Duration, if (WorldSession* session = sWorld->FindOfflineSession(AccountID)) if (session->GetPlayerName() != Author) session->KickPlayer("Ban IP at condition 'FindOfflineSession(account)->GetPlayerName() != author'"); - } while (resultAccounts->NextRow()); LoginDatabase.CommitTransaction(trans); diff --git a/src/server/game/Misc/BanManager.h b/src/server/game/Misc/BanManager.h index 47d4efc04..40baebe18 100644 --- a/src/server/game/Misc/BanManager.h +++ b/src/server/game/Misc/BanManager.h @@ -19,7 +19,6 @@ enum BanReturn class BanManager { public: - static BanManager* instance(); BanReturn BanAccount(std::string const& AccountName, std::string const& Duration, std::string const& Reason, std::string const& Author); diff --git a/src/server/game/Misc/GameGraveyard.cpp b/src/server/game/Misc/GameGraveyard.cpp index 446c25c25..ddb9c41f3 100644 --- a/src/server/game/Misc/GameGraveyard.cpp +++ b/src/server/game/Misc/GameGraveyard.cpp @@ -50,7 +50,6 @@ void Graveyard::LoadGraveyardFromDB() _graveyardStore[ID] = Graveyard; ++Count; - } while (result->NextRow()); sLog->outString(">> Loaded %i graveyard in %u ms", Count, GetMSTimeDiffToNow(oldMSTime)); @@ -347,7 +346,6 @@ void Graveyard::LoadGraveyardZones() if (!AddGraveyardLink(safeLocId, zoneId, teamId, false)) sLog->outErrorDb("Table `graveyard_zone` has a duplicate record for Graveyard (ID: %u) and Zone (ID: %u), skipped.", safeLocId, zoneId); - } while (result->NextRow()); sLog->outString(">> Loaded %u graveyard-zone links in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); diff --git a/src/server/game/Misc/GameGraveyard.h b/src/server/game/Misc/GameGraveyard.h index b8241ac24..588ca6039 100644 --- a/src/server/game/Misc/GameGraveyard.h +++ b/src/server/game/Misc/GameGraveyard.h @@ -44,7 +44,6 @@ public: void LoadGraveyardFromDB(); private: - GraveyardContainer _graveyardStore; // for wintergrasp only diff --git a/src/server/game/Movement/FollowerRefManager.h b/src/server/game/Movement/FollowerRefManager.h index 0af21bc77..d85708ac3 100644 --- a/src/server/game/Movement/FollowerRefManager.h +++ b/src/server/game/Movement/FollowerRefManager.h @@ -14,6 +14,5 @@ class TargetedMovementGeneratorBase; class FollowerRefManager : public RefManager { - }; #endif diff --git a/src/server/game/Movement/MotionMaster.h b/src/server/game/Movement/MotionMaster.h index 34f06ffd3..733ff4d78 100644 --- a/src/server/game/Movement/MotionMaster.h +++ b/src/server/game/Movement/MotionMaster.h @@ -93,7 +93,6 @@ private: } void InitTop(); public: - explicit MotionMaster(Unit* unit) : _expList(nullptr), _top(-1), _owner(unit), _cleanFlag(MMCF_NONE) { for (uint8 i = 0; i < MAX_MOTION_SLOT; ++i) diff --git a/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp index 4a0e7b00e..79f0e93c3 100644 --- a/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp @@ -60,7 +60,6 @@ void ConfusedMovementGenerator::DoInitialize(T* unit) i_waypoints[idx][2] = idx > 0 ? i_waypoints[idx - 1][2] : z; continue; } - } else { diff --git a/src/server/game/Movement/MovementGenerators/HomeMovementGenerator.h b/src/server/game/Movement/MovementGenerators/HomeMovementGenerator.h index 779aa1a1e..1182864dc 100644 --- a/src/server/game/Movement/MovementGenerators/HomeMovementGenerator.h +++ b/src/server/game/Movement/MovementGenerators/HomeMovementGenerator.h @@ -18,7 +18,6 @@ template <> class HomeMovementGenerator : public MovementGeneratorMedium< Creature, HomeMovementGenerator > { public: - HomeMovementGenerator() : arrived(false), i_recalculateTravel(false) {} ~HomeMovementGenerator() {} diff --git a/src/server/game/Movement/MovementGenerators/IdleMovementGenerator.h b/src/server/game/Movement/MovementGenerators/IdleMovementGenerator.h index 760007795..a501838eb 100644 --- a/src/server/game/Movement/MovementGenerators/IdleMovementGenerator.h +++ b/src/server/game/Movement/MovementGenerators/IdleMovementGenerator.h @@ -12,7 +12,6 @@ class IdleMovementGenerator : public MovementGenerator { public: - void Initialize(Unit*) override; void Finalize(Unit*) override { } void Reset(Unit*) override; diff --git a/src/server/game/Movement/MovementGenerators/PathGenerator.h b/src/server/game/Movement/MovementGenerators/PathGenerator.h index bb576f3df..1520ca0d7 100644 --- a/src/server/game/Movement/MovementGenerators/PathGenerator.h +++ b/src/server/game/Movement/MovementGenerators/PathGenerator.h @@ -100,7 +100,6 @@ class PathGenerator } private: - dtPolyRef _pathPolyRefs[MAX_PATH_LENGTH]; // array of detour polygon references uint32 _polyLength; // number of polygons in the path diff --git a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h index d8d4f51d1..4ad5d684e 100644 --- a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h +++ b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h @@ -60,7 +60,6 @@ public: void LoadPath(Creature*); private: - void Stop(int32 time) { i_nextMoveTime.Reset(time);} bool Stopped() { return !i_nextMoveTime.Passed();} diff --git a/src/server/game/Movement/Spline/MoveSplineInit.h b/src/server/game/Movement/Spline/MoveSplineInit.h index d7005318c..7fa69eea0 100644 --- a/src/server/game/Movement/Spline/MoveSplineInit.h +++ b/src/server/game/Movement/Spline/MoveSplineInit.h @@ -59,7 +59,6 @@ namespace Movement class MoveSplineInit { public: - explicit MoveSplineInit(Unit* m); /* Final pass of initialization that launches spline movement. @@ -147,7 +146,6 @@ namespace Movement */ void DisableTransportPathTransformations(); protected: - MoveSplineInitArgs args; Unit* unit; }; diff --git a/src/server/game/Movement/Spline/MovementPacketBuilder.h b/src/server/game/Movement/Spline/MovementPacketBuilder.h index 04717de13..ab8c46d5f 100644 --- a/src/server/game/Movement/Spline/MovementPacketBuilder.h +++ b/src/server/game/Movement/Spline/MovementPacketBuilder.h @@ -24,7 +24,6 @@ namespace Movement { static void WriteCommonMonsterMovePart(const MoveSpline& mov, ByteBuffer& data); public: - static void WriteMonsterMove(const MoveSpline& mov, ByteBuffer& data); static void WriteStopMovement(Vector3 const& loc, uint32 splineId, ByteBuffer& data); static void WriteCreate(const MoveSpline& mov, ByteBuffer& data); diff --git a/src/server/game/Movement/Spline/Spline.h b/src/server/game/Movement/Spline/Spline.h index a6d5c05e6..89070b738 100644 --- a/src/server/game/Movement/Spline/Spline.h +++ b/src/server/game/Movement/Spline/Spline.h @@ -78,7 +78,6 @@ namespace Movement void UninitializedSplineInitMethod(Vector3 const*, index_type, bool, index_type) { ABORT(); } public: - explicit SplineBase() {} /** Caclulates the position for given segment Idx, and percent of segment length t @@ -133,12 +132,10 @@ namespace Movement typedef length_type LengthType; typedef std::vector LengthArray; protected: - LengthArray lengths; [[nodiscard]] index_type computeIndexInBounds(length_type length) const; public: - explicit Spline() = default; /** Calculates the position for given t diff --git a/src/server/game/Movement/Waypoints/WaypointManager.cpp b/src/server/game/Movement/Waypoints/WaypointManager.cpp index e64d88788..b1cd73c62 100644 --- a/src/server/game/Movement/Waypoints/WaypointManager.cpp +++ b/src/server/game/Movement/Waypoints/WaypointManager.cpp @@ -145,6 +145,5 @@ void WaypointMgr::ReloadPath(uint32 id) wp->event_chance = fields[8].GetUInt8(); path.push_back(wp); - } while (result->NextRow()); } diff --git a/src/server/game/OutdoorPvP/OutdoorPvP.h b/src/server/game/OutdoorPvP/OutdoorPvP.h index 8e8fa2819..5e02a721b 100644 --- a/src/server/game/OutdoorPvP/OutdoorPvP.h +++ b/src/server/game/OutdoorPvP/OutdoorPvP.h @@ -77,7 +77,6 @@ typedef std::set PlayerSet; class OPvPCapturePoint { public: - OPvPCapturePoint(OutdoorPvP* pvp); virtual ~OPvPCapturePoint() {} @@ -129,7 +128,6 @@ public: float rotation0 = 0, float rotation1 = 0, float rotation2 = 0, float rotation3 = 0); protected: - bool AddObject(uint32 type, uint32 entry, uint32 map, float x, float y, float z, float o, float rotation0, float rotation1, float rotation2, float rotation3); bool AddCreature(uint32 type, uint32 entry, uint32 map, float x, float y, float z, float o, uint32 spawntimedelay = 0); @@ -140,7 +138,6 @@ protected: bool DelCapturePoint(); protected: - // active players in the area of the objective, 0 - alliance, 1 - horde PlayerSet m_activePlayers[2]; @@ -180,7 +177,6 @@ class OutdoorPvP : public ZoneScript friend class OutdoorPvPMgr; public: - // ctor OutdoorPvP(); @@ -237,7 +233,6 @@ public: void TeamApplyBuff(TeamId teamId, uint32 spellId, uint32 spellId2 = 0, Player* sameMapPlr = nullptr); protected: - // the map of the objectives belonging to this outdoorpvp OPvPCapturePointMap m_capturePoints; diff --git a/src/server/game/Pools/PoolMgr.cpp b/src/server/game/Pools/PoolMgr.cpp index fc07442f6..af378a058 100644 --- a/src/server/game/Pools/PoolMgr.cpp +++ b/src/server/game/Pools/PoolMgr.cpp @@ -942,7 +942,6 @@ void PoolMgr::LoadFromDB() void PoolMgr::LoadQuestPools() { - } void PoolMgr::SaveQuestsToDB(bool daily, bool weekly, bool other) diff --git a/src/server/game/Scripting/ScriptMgr.cpp b/src/server/game/Scripting/ScriptMgr.cpp index 194ce278f..06008186e 100644 --- a/src/server/game/Scripting/ScriptMgr.cpp +++ b/src/server/game/Scripting/ScriptMgr.cpp @@ -70,7 +70,6 @@ template class ScriptRegistry; ScriptMgr::ScriptMgr() : _scriptCount(0), _scheduledScripts(0) { - } ScriptMgr::~ScriptMgr() @@ -498,7 +497,6 @@ void ScriptMgr::OnGroupRateCalculation(float& rate, uint32 count, bool isRaid) continue; \ if (C->MapID == V->GetId()) \ { - #define SCR_MAP_END \ return; \ } \ @@ -720,7 +718,6 @@ bool ScriptMgr::OnItemRemove(Player* player, Item* item) #endif GET_SCRIPT_RET(ItemScript, item->GetScriptId(), tmpscript, false); return tmpscript->OnRemove(player, item); - } bool ScriptMgr::OnCastItemCombatSpell(Player* player, Unit* victim, SpellInfo const* spellInfo, Item* item) diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h index d2cf44995..db6dd0830 100644 --- a/src/server/game/Scripting/ScriptMgr.h +++ b/src/server/game/Scripting/ScriptMgr.h @@ -148,7 +148,6 @@ class ScriptObject friend class ScriptMgr; public: - // Do not override this in scripts; it should be overridden by the various script type classes. It indicates // whether or not this script type must be assigned in the database. [[nodiscard]] virtual bool IsDatabaseBound() const { return false; } @@ -158,7 +157,6 @@ public: [[nodiscard]] const std::string& GetName() const { return _name; } protected: - ScriptObject(const char* name) : _name(std::string(name)) { @@ -167,29 +165,24 @@ protected: virtual ~ScriptObject() = default; private: - const std::string _name; }; template class UpdatableScript { protected: - UpdatableScript() = default; public: - virtual void OnUpdate(TObject* /*obj*/, uint32 /*diff*/) { } }; class SpellScriptLoader : public ScriptObject { protected: - SpellScriptLoader(const char* name); public: - [[nodiscard]] bool IsDatabaseBound() const override { return true; } // Should return a fully valid SpellScript pointer. @@ -202,11 +195,9 @@ public: class ServerScript : public ScriptObject { protected: - ServerScript(const char* name); public: - // Called when reactive socket I/O is started (WorldSocketMgr). virtual void OnNetworkStart() { } @@ -232,11 +223,9 @@ public: class WorldScript : public ScriptObject { protected: - WorldScript(const char* name); public: - // Called when the open/closed state of the world changes. virtual void OnOpenStateChange(bool /*open*/) { } @@ -271,11 +260,9 @@ public: class FormulaScript : public ScriptObject { protected: - FormulaScript(const char* name); public: - // Called after calculating honor. virtual void OnHonorCalculation(float& /*honor*/, uint8 /*level*/, float /*multiplier*/) { } @@ -307,7 +294,6 @@ template class MapScript : public UpdatableScript uint32 _mapId; protected: - MapScript(uint32 mapId) : _mapId(mapId) { @@ -350,11 +336,9 @@ public: class WorldMapScript : public ScriptObject, public MapScript { protected: - WorldMapScript(const char* name, uint32 mapId); public: - [[nodiscard]] bool isAfterLoadScript() const override { return true; } void checkValidity() override @@ -369,11 +353,9 @@ public: class InstanceMapScript : public ScriptObject, public MapScript { protected: - InstanceMapScript(const char* name, uint32 mapId); public: - [[nodiscard]] bool IsDatabaseBound() const override { return true; } void checkValidity() override @@ -391,11 +373,9 @@ public: class BattlegroundMapScript : public ScriptObject, public MapScript { protected: - BattlegroundMapScript(const char* name, uint32 mapId); public: - [[nodiscard]] bool isAfterLoadScript() const override { return true; } void checkValidity() override @@ -410,11 +390,9 @@ public: class ItemScript : public ScriptObject { protected: - ItemScript(const char* name); public: - [[nodiscard]] bool IsDatabaseBound() const override { return true; } // Called when a player accepts a quest from the item. @@ -442,7 +420,6 @@ public: class UnitScript : public ScriptObject { protected: - UnitScript(const char* name, bool addToScripts = true); public: @@ -474,11 +451,9 @@ public: class MovementHandlerScript : public ScriptObject { protected: - MovementHandlerScript(const char* name); public: - //Called whenever a player moves virtual void OnPlayerMove(Player* /*player*/, MovementInfo /*movementInfo*/, uint32 /*opcode*/) { } }; @@ -486,11 +461,9 @@ public: class AllMapScript : public ScriptObject { protected: - AllMapScript(const char* name); public: - // Called when a player enters any Map virtual void OnPlayerEnterAll(Map* /*map*/, Player* /*player*/) { } @@ -501,11 +474,9 @@ public: class AllCreatureScript : public ScriptObject { protected: - AllCreatureScript(const char* name); public: - // Called from End of Creature Update. virtual void OnAllCreatureUpdate(Creature* /*creature*/, uint32 /*diff*/) { } @@ -516,11 +487,9 @@ public: class CreatureScript : public ScriptObject, public UpdatableScript { protected: - CreatureScript(const char* name); public: - [[nodiscard]] bool IsDatabaseBound() const override { return true; } // Called when a player opens a gossip dialog with the creature. @@ -554,11 +523,9 @@ public: class GameObjectScript : public ScriptObject, public UpdatableScript { protected: - GameObjectScript(const char* name); public: - [[nodiscard]] bool IsDatabaseBound() const override { return true; } // Called when a player opens a gossip dialog with the gameobject. @@ -598,11 +565,9 @@ public: class AreaTriggerScript : public ScriptObject { protected: - AreaTriggerScript(const char* name); public: - [[nodiscard]] bool IsDatabaseBound() const override { return true; } // Called when the area trigger is activated by a player. @@ -612,11 +577,9 @@ public: class BattlegroundScript : public ScriptObject { protected: - BattlegroundScript(const char* name); public: - [[nodiscard]] bool IsDatabaseBound() const override { return true; } // Should return a fully valid Battleground object for the type ID. @@ -627,11 +590,9 @@ public: class OutdoorPvPScript : public ScriptObject { protected: - OutdoorPvPScript(const char* name); public: - [[nodiscard]] bool IsDatabaseBound() const override { return true; } // Should return a fully valid OutdoorPvP object for the type ID. @@ -641,11 +602,9 @@ public: class CommandScript : public ScriptObject { protected: - CommandScript(const char* name); public: - // Should return a pointer to a valid command table (ChatCommand array) to be used by ChatHandler. [[nodiscard]] virtual std::vector GetCommands() const = 0; }; @@ -653,11 +612,9 @@ public: class WeatherScript : public ScriptObject, public UpdatableScript { protected: - WeatherScript(const char* name); public: - [[nodiscard]] bool IsDatabaseBound() const override { return true; } // Called when the weather changes in the zone this script is associated with. @@ -667,11 +624,9 @@ public: class AuctionHouseScript : public ScriptObject { protected: - AuctionHouseScript(const char* name); public: - // Called when an auction is added to an auction house. virtual void OnAuctionAdd(AuctionHouseObject* /*ah*/, AuctionEntry* /*entry*/) { } @@ -709,11 +664,9 @@ public: class ConditionScript : public ScriptObject { protected: - ConditionScript(const char* name); public: - [[nodiscard]] bool IsDatabaseBound() const override { return true; } // Called when a single condition is checked for a player. @@ -723,11 +676,9 @@ public: class VehicleScript : public ScriptObject { protected: - VehicleScript(const char* name); public: - // Called after a vehicle is installed. virtual void OnInstall(Vehicle* /*veh*/) { } @@ -750,18 +701,15 @@ public: class DynamicObjectScript : public ScriptObject, public UpdatableScript { protected: - DynamicObjectScript(const char* name); }; class TransportScript : public ScriptObject, public UpdatableScript { protected: - TransportScript(const char* name); public: - [[nodiscard]] bool IsDatabaseBound() const override { return true; } // Called when a player boards the transport. @@ -780,11 +728,9 @@ public: class AchievementCriteriaScript : public ScriptObject { protected: - AchievementCriteriaScript(const char* name); public: - [[nodiscard]] bool IsDatabaseBound() const override { return true; } // deprecated/legacy @@ -794,7 +740,6 @@ public: class PlayerScript : public ScriptObject { protected: - PlayerScript(const char* name); public: @@ -1009,11 +954,9 @@ public: class AccountScript : public ScriptObject { protected: - AccountScript(const char* name); public: - // Called when an account logged in successfully virtual void OnAccountLogin(uint32 /*accountId*/) { } @@ -1036,11 +979,9 @@ public: class GuildScript : public ScriptObject { protected: - GuildScript(const char* name); public: - [[nodiscard]] bool IsDatabaseBound() const override { return false; } // Called when a member is added to the guild. @@ -1079,11 +1020,9 @@ public: class GroupScript : public ScriptObject { protected: - GroupScript(const char* name); public: - [[nodiscard]] bool IsDatabaseBound() const override { return false; } // Called when a member is added to a group. @@ -1106,11 +1045,9 @@ public: class GlobalScript : public ScriptObject { protected: - GlobalScript(const char* name); public: - // items virtual void OnItemDelFromDB(SQLTransaction& /*trans*/, uint32 /*itemGuid*/) { } virtual void OnMirrorImageDisplayItem(const Item* /*item*/, uint32& /*display*/) { } @@ -1136,11 +1073,9 @@ public: class BGScript : public ScriptObject { protected: - BGScript(const char* name); public: - [[nodiscard]] bool IsDatabaseBound() const override { return false; } // Start Battlegroud @@ -1191,16 +1126,13 @@ public: class SpellSC : public ScriptObject { protected: - SpellSC(const char* name); public: - [[nodiscard]] bool IsDatabaseBound() const override { return false; } // Calculate max duration in applying aura virtual void OnCalcMaxDuration(Aura const* /*aura*/, int32& /*maxDuration*/) { } - }; // this class can be used to be extended by Modules @@ -1208,7 +1140,6 @@ public: class ModuleScript : public ScriptObject { protected: - ModuleScript(const char* name); }; @@ -1228,11 +1159,9 @@ public: class MailScript : public ScriptObject { protected: - MailScript(const char* name); public: - // Called before mail is sent virtual void OnBeforeMailDraftSendMailTo(MailDraft* /*mailDraft*/, MailReceiver const& /*receiver*/, MailSender const& /*sender*/, MailCheckMask& /*checked*/, uint32& /*deliver_delay*/, uint32& /*custom_expiration*/, bool& /*deleteMailItemsFromDB*/, bool& /*sendMail*/) { } }; @@ -1243,12 +1172,10 @@ class ScriptMgr friend class ScriptObject; private: - ScriptMgr(); virtual ~ScriptMgr(); public: /* Initialization */ - static ScriptMgr* instance(); void Initialize(); void LoadDatabase(); @@ -1261,17 +1188,14 @@ public: /* Initialization */ uint32 GetScriptCount() const { return _scriptCount; } public: /* Unloading */ - void Unload(); public: /* SpellScriptLoader */ - void CreateSpellScripts(uint32 spellId, std::list& scriptVector); void CreateAuraScripts(uint32 spellId, std::list& scriptVector); void CreateSpellScriptLoaders(uint32 spellId, std::vector::iterator> >& scriptVector); public: /* ServerScript */ - void OnNetworkStart(); void OnNetworkStop(); void OnSocketOpen(WorldSocket* socket); @@ -1280,7 +1204,6 @@ public: /* ServerScript */ void OnPacketSend(WorldSession* session, WorldPacket const& packet); public: /* WorldScript */ - void OnLoadCustomDatabaseTable(); void OnOpenStateChange(bool open); void OnBeforeConfigLoad(bool reload); @@ -1293,7 +1216,6 @@ public: /* WorldScript */ void OnShutdown(); public: /* FormulaScript */ - void OnHonorCalculation(float& honor, uint8 level, float multiplier); void OnGrayLevelCalculation(uint8& grayLevel, uint8 playerLevel); void OnColorCodeCalculation(XPColorChar& color, uint8 playerLevel, uint8 mobLevel); @@ -1304,7 +1226,6 @@ public: /* FormulaScript */ void OnAfterArenaRatingCalculation(Battleground* const bg, int32& winnerMatchmakerChange, int32& loserMatchmakerChange, int32& winnerChange, int32& loserChange); public: /* MapScript */ - void OnCreateMap(Map* map); void OnDestroyMap(Map* map); void OnLoadGridMap(Map* map, GridMap* gmap, uint32 gx, uint32 gy); @@ -1314,11 +1235,9 @@ public: /* MapScript */ void OnMapUpdate(Map* map, uint32 diff); public: /* InstanceMapScript */ - InstanceScript* CreateInstanceScript(InstanceMap* map); public: /* ItemScript */ - bool OnQuestAccept(Player* player, Item* item, Quest const* quest); bool OnItemUse(Player* player, Item* item, SpellCastTargets const& targets); bool OnItemExpire(Player* player, ItemTemplate const* proto); @@ -1328,7 +1247,6 @@ public: /* ItemScript */ void OnGossipSelectCode(Player* player, Item* item, uint32 sender, uint32 action, const char* code); public: /* CreatureScript */ - bool OnGossipHello(Player* player, Creature* creature); bool OnGossipSelect(Player* player, Creature* creature, uint32 sender, uint32 action); bool OnGossipSelectCode(Player* player, Creature* creature, uint32 sender, uint32 action, const char* code); @@ -1341,7 +1259,6 @@ public: /* CreatureScript */ void OnCreatureUpdate(Creature* creature, uint32 diff); public: /* GameObjectScript */ - bool OnGossipHello(Player* player, GameObject* go); bool OnGossipSelect(Player* player, GameObject* go, uint32 sender, uint32 action); bool OnGossipSelectCode(Player* player, GameObject* go, uint32 sender, uint32 action, const char* code); @@ -1356,28 +1273,22 @@ public: /* GameObjectScript */ GameObjectAI* GetGameObjectAI(GameObject* go); public: /* AreaTriggerScript */ - bool OnAreaTrigger(Player* player, AreaTrigger const* trigger); public: /* BattlegroundScript */ - Battleground* CreateBattleground(BattlegroundTypeId typeId); public: /* OutdoorPvPScript */ - OutdoorPvP* CreateOutdoorPvP(OutdoorPvPData const* data); public: /* CommandScript */ - std::vector GetChatCommands(); public: /* WeatherScript */ - void OnWeatherChange(Weather* weather, WeatherState state, float grade); void OnWeatherUpdate(Weather* weather, uint32 diff); public: /* AuctionHouseScript */ - void OnAuctionAdd(AuctionHouseObject* ah, AuctionEntry* entry); void OnAuctionRemove(AuctionHouseObject* ah, AuctionEntry* entry); void OnAuctionSuccessful(AuctionHouseObject* ah, AuctionEntry* entry); @@ -1391,11 +1302,9 @@ public: /* AuctionHouseScript */ void OnBeforeAuctionHouseMgrUpdate(); public: /* ConditionScript */ - bool OnConditionCheck(Condition* condition, ConditionSourceInfo& sourceInfo); public: /* VehicleScript */ - void OnInstall(Vehicle* veh); void OnUninstall(Vehicle* veh); void OnReset(Vehicle* veh); @@ -1404,11 +1313,9 @@ public: /* VehicleScript */ void OnRemovePassenger(Vehicle* veh, Unit* passenger); public: /* DynamicObjectScript */ - void OnDynamicObjectUpdate(DynamicObject* dynobj, uint32 diff); public: /* TransportScript */ - void OnAddPassenger(Transport* transport, Player* player); void OnAddCreaturePassenger(Transport* transport, Creature* creature); void OnRemovePassenger(Transport* transport, Player* player); @@ -1416,11 +1323,9 @@ public: /* TransportScript */ void OnRelocate(Transport* transport, uint32 waypointId, uint32 mapId, float x, float y, float z); public: /* AchievementCriteriaScript */ - bool OnCriteriaCheck(uint32 scriptId, Player* source, Unit* target); public: /* PlayerScript */ - void OnBeforePlayerUpdate(Player* player, uint32 p_time); void OnPlayerReleasedGhost(Player* player); void OnPVPKill(Player* killer, Player* killed); @@ -1496,7 +1401,6 @@ public: /* PlayerScript */ void OnBeforeLoadPetFromDB(Player* player, uint32& petentry, uint32& petnumber, bool& current, bool& forceLoadFromDB); public: /* AccountScript */ - void OnAccountLogin(uint32 accountId); void OnFailedAccountLogin(uint32 accountId); void OnEmailChange(uint32 accountId); @@ -1505,7 +1409,6 @@ public: /* AccountScript */ void OnFailedPasswordChange(uint32 accountId); public: /* GuildScript */ - void OnGuildAddMember(Guild* guild, Player* player, uint8& plRank); void OnGuildRemoveMember(Guild* guild, Player* player, bool isDisbanding, bool isKicked); void OnGuildMOTDChanged(Guild* guild, const std::string& newMotd); @@ -1520,7 +1423,6 @@ public: /* GuildScript */ void OnGuildBankEvent(Guild* guild, uint8 eventType, uint8 tabId, uint32 playerGuid, uint32 itemOrMoney, uint16 itemStackCount, uint8 destTabId); public: /* GroupScript */ - void OnGroupAddMember(Group* group, uint64 guid); void OnGroupInviteMember(Group* group, uint64 guid); void OnGroupRemoveMember(Group* group, uint64 guid, RemoveMethod method, uint64 kicker, const char* reason); @@ -1540,14 +1442,12 @@ public: /* GlobalScript */ void OnBeforeWorldObjectSetPhaseMask(WorldObject const* worldObject, uint32& oldPhaseMask, uint32& newPhaseMask, bool& useCombinedPhases, bool& update); public: /* Scheduled scripts */ - uint32 IncreaseScheduledScriptsCount() { return ++_scheduledScripts; } uint32 DecreaseScheduledScriptCount() { return --_scheduledScripts; } uint32 DecreaseScheduledScriptCount(size_t count) { return _scheduledScripts -= count; } bool IsScriptScheduled() const { return _scheduledScripts > 0; } public: /* UnitScript */ - void OnHeal(Unit* healer, Unit* reciever, uint32& gain); void OnDamage(Unit* attacker, Unit* victim, uint32& damage); void ModifyPeriodicDamageAurasTick(Unit* target, Unit* attacker, uint32& damage); @@ -1558,23 +1458,19 @@ public: /* UnitScript */ void OnBeforeRollMeleeOutcomeAgainst(const Unit* attacker, const Unit* victim, WeaponAttackType attType, int32& attackerMaxSkillValueForLevel, int32& victimMaxSkillValueForLevel, int32& attackerWeaponSkill, int32& victimDefenseSkill, int32& crit_chance, int32& miss_chance, int32& dodge_chance, int32& parry_chance, int32& block_chance); public: /* MovementHandlerScript */ - void OnPlayerMove(Player* player, MovementInfo movementInfo, uint32 opcode); public: /* AllCreatureScript */ - //listener function (OnAllCreatureUpdate) is called by OnCreatureUpdate //void OnAllCreatureUpdate(Creature* creature, uint32 diff); void Creature_SelectLevel(const CreatureTemplate* cinfo, Creature* creature); public: /* AllMapScript */ - //listener functions are called by OnPlayerEnterMap and OnPlayerLeaveMap //void OnPlayerEnterAll(Map* map, Player* player); //void OnPlayerLeaveAll(Map* map, Player* player); public: /* BGScript */ - void OnBattlegroundStart(Battleground* bg); void OnBattlegroundEndReward(Battleground* bg, Player* player, TeamId winnerTeamId); void OnBattlegroundUpdate(Battleground* bg, uint32 diff); @@ -1589,7 +1485,6 @@ public: /* BGScript */ bool CanSendMessageQueue(BattlegroundQueue* queue, Player* leader, Battleground* bg, PvPDifficultyEntry const* bracketEntry); public: /* Arena Team Script */ - void OnGetSlotByType(const uint32 type, uint8& slot); void OnGetArenaPoints(ArenaTeam* at, float& points); void OnArenaTypeIDToQueueID(const BattlegroundTypeId bgTypeId, const uint8 arenaType, uint32& queueTypeID); @@ -1597,20 +1492,16 @@ public: /* Arena Team Script */ void OnSetArenaMaxPlayersPerTeam(const uint8 arenaType, uint32& maxPlayerPerTeam); public: /* SpellSC */ - void OnCalcMaxDuration(Aura const* aura, int32& maxDuration); public: /* GameEventScript */ - void OnGameEventStart(uint16 EventID); void OnGameEventStop(uint16 EventID); public: /* MailScript */ - void OnBeforeMailDraftSendMailTo(MailDraft* mailDraft, MailReceiver const& receiver, MailSender const& sender, MailCheckMask& checked, uint32& deliver_delay, uint32& custom_expiration, bool& deleteMailItemsFromDB, bool& sendMail); private: - uint32 _scriptCount; //atomic op counter for active scripts amount @@ -1623,7 +1514,6 @@ template class ScriptRegistry { public: - typedef std::map ScriptMap; typedef typename ScriptMap::iterator ScriptMapIterator; diff --git a/src/server/game/Server/WorldSession.h b/src/server/game/Server/WorldSession.h index 7d3cf766c..4de5a2790 100644 --- a/src/server/game/Server/WorldSession.h +++ b/src/server/game/Server/WorldSession.h @@ -389,7 +389,6 @@ public: void SetCalendarEventCreationCooldown(time_t cooldown) { _calendarEventCreationCooldown = cooldown; } public: // opcodes handlers - void Handle_NULL(WorldPacket& recvPacket); // not used void Handle_EarlyProccess(WorldPacket& recvPacket); // just mark packets processed in WorldSocket::OnRead void Handle_ServerSide(WorldPacket& recvPacket); // sever side only, can't be accepted from client diff --git a/src/server/game/Server/WorldSocket.h b/src/server/game/Server/WorldSocket.h index 036390327..564a0abc1 100644 --- a/src/server/game/Server/WorldSocket.h +++ b/src/server/game/Server/WorldSocket.h @@ -191,7 +191,6 @@ private: bool m_OutActive; uint32 m_Seed; - }; #endif /* _WORLDSOCKET_H */ diff --git a/src/server/game/Server/WorldSocketAcceptor.h b/src/server/game/Server/WorldSocketAcceptor.h index 25a6ac11a..65a228676 100644 --- a/src/server/game/Server/WorldSocketAcceptor.h +++ b/src/server/game/Server/WorldSocketAcceptor.h @@ -30,7 +30,6 @@ public: } protected: - virtual int handle_timeout(const ACE_Time_Value& /*current_time*/, const void* /*act = 0*/) { sLog->outBasic("Resuming acceptor"); diff --git a/src/server/game/Server/WorldSocketMgr.cpp b/src/server/game/Server/WorldSocketMgr.cpp index 70838b06c..c3185332d 100644 --- a/src/server/game/Server/WorldSocketMgr.cpp +++ b/src/server/game/Server/WorldSocketMgr.cpp @@ -42,7 +42,6 @@ class ReactorRunnable : protected ACE_Task_Base { public: - ReactorRunnable() : m_Reactor(0), m_Connections(0), @@ -115,7 +114,6 @@ public: } protected: - void AddNewSockets() { ACORE_GUARD(ACE_Thread_Mutex, m_NewSockets_Lock); diff --git a/src/server/game/Spells/Auras/SpellAuras.cpp b/src/server/game/Spells/Auras/SpellAuras.cpp index 177ebcf4d..c65a6df9f 100644 --- a/src/server/game/Spells/Auras/SpellAuras.cpp +++ b/src/server/game/Spells/Auras/SpellAuras.cpp @@ -1511,7 +1511,6 @@ void Aura::HandleAuraSpecificMods(AuraApplication const* aurApp, Unit* caster, b } break; } - } // mods at aura remove else diff --git a/src/server/game/Spells/Auras/SpellAuras.h b/src/server/game/Spells/Auras/SpellAuras.h index dcce57d20..d3eb25974 100644 --- a/src/server/game/Spells/Auras/SpellAuras.h +++ b/src/server/game/Spells/Auras/SpellAuras.h @@ -48,7 +48,6 @@ private: void _InitFlags(Unit* caster, uint8 effMask); void _HandleEffect(uint8 effIndex, bool apply); public: - Unit* GetTarget() const { return _target; } Aura* GetBase() const { return _base; } diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index 651179ec9..f889b09e7 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -784,7 +784,6 @@ void Spell::SelectExplicitTargets() m_targets.SetUnitTarget(redirect); m_spellFlags |= SPELL_FLAG_REDIRECTED; } - } } } @@ -5589,7 +5588,6 @@ SpellCastResult Spell::CheckCast(bool strict) } break; } - } // Spell casted only on battleground if (m_spellInfo->HasAttribute(SPELL_ATTR3_BATTLEGROUND) && m_caster->GetTypeId() == TYPEID_PLAYER) diff --git a/src/server/game/Spells/Spell.h b/src/server/game/Spells/Spell.h index 31cd9ccd4..cf9039609 100644 --- a/src/server/game/Spells/Spell.h +++ b/src/server/game/Spells/Spell.h @@ -241,7 +241,6 @@ class Spell friend void Unit::SetCurrentCastedSpell(Spell* pSpell); friend class SpellScript; public: - void EffectNULL(SpellEffIndex effIndex); void EffectUnused(SpellEffIndex effIndex); void EffectDistract(SpellEffIndex effIndex); diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index 535100827..628395dca 100644 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -3005,7 +3005,6 @@ void Spell::EffectEnchantItemTmp(SpellEffIndex effIndex) { sLog->outError("Spell::EffectEnchantItemTmp: unknown spell id %i", spell_id); return; - } for (int j = BASE_ATTACK; j <= OFF_ATTACK; ++j) diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp index bf085c8fd..7cfff25d6 100644 --- a/src/server/game/Spells/SpellMgr.cpp +++ b/src/server/game/Spells/SpellMgr.cpp @@ -387,7 +387,6 @@ bool SpellMgr::ComputeIsSpellValid(SpellInfo const* spellInfo, bool msg) sLog->outErrorDb("Craft spell %u not have create item entry.", spellInfo->Id); return false; } - } // also possible IsLootCrafting case but fake item must exist anyway else if (!sObjectMgr->GetItemTemplate(spellInfo->Effects[i].ItemType)) @@ -1422,7 +1421,6 @@ void SpellMgr::LoadSpellRequired() // xinef: fill additionalTalentInfo data, currently Blessing of Sanctuary only if (GetTalentSpellCost(spellReq) > 0) mTalentSpellAdditionalSet.insert(spellId); - } while (result->NextRow()); sLog->outString(">> Loaded %u spell required records in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); @@ -1531,7 +1529,6 @@ void SpellMgr::LoadSpellTargetPositions() sLog->outErrorDb("Spell (Id: %u, effIndex: %u) listed in `spell_target_position` does not have target TARGET_DEST_DB (17).", Spell_ID, effIndex); continue; } - } while (result->NextRow()); /* @@ -2368,7 +2365,6 @@ void SpellMgr::LoadPetDefaultSpells() CreatureTemplateContainer const* ctc = sObjectMgr->GetCreatureTemplates(); for (CreatureTemplateContainer::const_iterator itr = ctc->begin(); itr != ctc->end(); ++itr) { - if (!itr->second.PetSpellDataId) continue; @@ -7237,7 +7233,6 @@ void SpellMgr::LoadDbcDataCorrections() spellInfo2->rangeIndex = 187; // 300yd } } - } if (spellInfo->activeIconID == 2158) // flight diff --git a/src/server/game/Spells/SpellMgr.h b/src/server/game/Spells/SpellMgr.h index faf5ab5c5..d4b360fd9 100644 --- a/src/server/game/Spells/SpellMgr.h +++ b/src/server/game/Spells/SpellMgr.h @@ -694,7 +694,6 @@ private: // Modifiers public: - // Loading data at server startup void UnloadSpellInfoChains(); void LoadSpellTalentRanks(); diff --git a/src/server/game/Spells/SpellScript.h b/src/server/game/Spells/SpellScript.h index ee7efe826..74245592e 100644 --- a/src/server/game/Spells/SpellScript.h +++ b/src/server/game/Spells/SpellScript.h @@ -461,7 +461,6 @@ class AuraScript : public _SpellScript // internal use classes & functions // DO NOT THESE IN SCRIPTS public: - #define AURASCRIPT_FUNCTION_TYPE_DEFINES(CLASSNAME) \ typedef bool(CLASSNAME::*AuraCheckAreaTargetFnType)(Unit* target); \ typedef void(CLASSNAME::*AuraDispelFnType)(DispelInfo* dispelInfo); \ diff --git a/src/server/game/Texts/CreatureTextMgr.cpp b/src/server/game/Texts/CreatureTextMgr.cpp index 8f3651aa1..ec7fde75b 100644 --- a/src/server/game/Texts/CreatureTextMgr.cpp +++ b/src/server/game/Texts/CreatureTextMgr.cpp @@ -183,7 +183,6 @@ void CreatureTextMgr::LoadCreatureTextLocales() continue; ObjectMgr::AddLocaleString(Text, locale, data.Text); - } while (result->NextRow()); sLog->outString(">> Loaded %u Creature Text Locale in %u ms", uint32(mLocaleTextMap.size()), GetMSTimeDiffToNow(oldMSTime)); diff --git a/src/server/game/Tickets/TicketMgr.cpp b/src/server/game/Tickets/TicketMgr.cpp index f787c795c..cb2c6057f 100644 --- a/src/server/game/Tickets/TicketMgr.cpp +++ b/src/server/game/Tickets/TicketMgr.cpp @@ -319,7 +319,6 @@ void TicketMgr::LoadTickets() } while (result->NextRow()); sLog->outString(">> Loaded %u GM tickets in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); - } void TicketMgr::LoadSurveys() @@ -332,7 +331,6 @@ void TicketMgr::LoadSurveys() _lastSurveyId = (*result)[0].GetUInt32(); sLog->outString(">> Loaded GM Survey count from database in %u ms", GetMSTimeDiffToNow(oldMSTime)); - } void TicketMgr::AddTicket(GmTicket* ticket) diff --git a/src/server/game/Warden/WardenMac.cpp b/src/server/game/Warden/WardenMac.cpp index 6259baf1a..120684e4c 100644 --- a/src/server/game/Warden/WardenMac.cpp +++ b/src/server/game/Warden/WardenMac.cpp @@ -128,7 +128,6 @@ struct keyData void WardenMac::HandleHashResult(ByteBuffer& buff) { - // test int keyIn[4]; diff --git a/src/server/game/Weather/Weather.h b/src/server/game/Weather/Weather.h index cbe5c0d64..bbba4945e 100644 --- a/src/server/game/Weather/Weather.h +++ b/src/server/game/Weather/Weather.h @@ -53,7 +53,6 @@ enum WeatherState class Weather { public: - Weather(uint32 zone, WeatherData const* weatherChances); ~Weather() = default;; @@ -69,7 +68,6 @@ public: [[nodiscard]] uint32 GetScriptId() const { return m_weatherChances->ScriptId; } private: - [[nodiscard]] WeatherState GetWeatherState() const; uint32 m_zone; WeatherType m_type; diff --git a/src/server/scripts/Commands/cs_character.cpp b/src/server/scripts/Commands/cs_character.cpp index d762578c6..ca7de4803 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 c4490c844..659039124 100644 --- a/src/server/scripts/Commands/cs_cheat.cpp +++ b/src/server/scripts/Commands/cs_cheat.cpp @@ -14,7 +14,6 @@ public: std::vector GetCommands() const override { - static std::vector 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 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 23f67baed..4a5ad5975 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 0030afee1..91445e0a4 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 350e64a9e..2502a3151 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 126d6a8ae..57e532ee6 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 97da53078..72921dcf5 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 97d908ca4..bb0c295b9 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 73beef8e0..8a1eddcec 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 b666c5959..4b3edb274 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 bf41e4209..c1bdca6d5 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::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 ba459b8d8..b4725eebf 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 16089fe7e..e29774148 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 a9dfec613..dbf0ad58c 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 66a285f47..b988feb49 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 6ab296fbd..5015283de 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 928427629..87a7cba28 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 f160edae6..ab6ed20a8 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 102721612..d4a2b29b0 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 05144e163..cc0403ce4 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 7eda24340..acfdea598 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 1eb7eb52c..a7327b318 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 c32e76f54..b3e43c1f7 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 0543ccfa9..f0239a5dd 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 58d222dab..82cf81abf 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 f32c900c1..cf11c1361 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 04e1231c1..af6df1965 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 8df726e81..1120f502f 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 abcd511a3..029b4be8c 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 d88b4b342..55d624ea8 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 e548689d9..7e7a36fc0 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 42e66af4c..3e69bc7c1 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 766adcdb7..4c195391f 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 d573a9220..44f210642 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 7980334fb..5b26936df 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 15af23ae7..4ea412fc4 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 40c0b819f..bbd4d7416 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 77bb931d0..980b048ae 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 84181dd3e..acc23a111 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 35477b8a3..7c3e9eb2d 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 705e6a734..d93fb7e4c 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 a695c04c0..499da074a 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 4b88725a5..248018005 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 39db60230..550a9ed2d 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 15a776d13..d3f1a868e 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 72b35c0ef..2b41ee488 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 fb2711a89..a7bb7ef9c 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 c55963086..ede2226d1 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 9f7d91d0e..36935b9b8 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 f61f08621..02c5b2a1c 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 99fa082e5..37f21e9a0 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 387828c21..fb3ee7f8e 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 8c8fbdba5..8751a7e72 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 6a13cf866..915203a66 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 006bf66d8..fc2e14f08 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 09b4ce223..0e69f07bb 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 c6b61d48b..1d9868ac9 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 97f717a0d..ee0acb534 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 abf962dbe..2e8818dfe 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 8985e085f..960ebf737 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 88443551f..9a913b8a8 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 cf808550f..9fb5d5030 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 7e6bc109a..36e82c3f4 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 4a83dabc3..2a0750f2d 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 8472d1131..b366e1ff2 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 1a6c591fe..f21186a89 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 e6dafe382..3d3644e9c 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 a20a49bb3..91ff58ba6 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 3dac854ba..68e644e00 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 ace60bc49..a252ff720 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 16e3f49ee..7f8f25c04 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 4e54fb501..be14ffda0 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 02bc03ccb..9c540eba8 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 73cb80ce4..59d9b5401 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 182783423..286f39713 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 404337004..d90b722e9 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 c232ed2d0..7e660b5fe 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 51ff2919f..ccd45096d 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 7a0a8489f..a574e484f 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 1cc672bfc..4620d36a9 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 51373c458..fe9125fbd 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 4c76affc9..a80180049 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 f507cbd7f..976ef3092 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 7f5f3346e..ca321eea6 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 3b4584751..db7037fb6 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 4a3548f2b..17746d979 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 3363f89e0..e7b08a759 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 c53d493e3..0d2968179 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 aca3f6406..50d266802 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 df9044644..d9c42a4d3 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 13eda9318..34af34750 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 d05a55073..03ba422a9 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 c5891eabe..867fe426d 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 ebcde6561..c5dc09ff5 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 ed9b0effc..48387ad5b 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 21416b685..0d7ca2ee3 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 f6a2ec928..2fef2c663 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 54272a12a..e121c6c1a 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 d18342311..d972e8e50 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 6047fb6a5..c09779dfd 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 ecb75197c..65e958ca2 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 6260122fe..9fb4cf4bd 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 977f2c42d..d4fc72f0b 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 ba97985a1..64dfd12ba 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 9024b15c3..660aa2fc6 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 d8eda808b..ab42db630 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 25a190c2e..1e21e228f 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 f67436725..5e4b3bffa 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 073cee6dd..cffdf1c89 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 088f8f0cb..2ad80211a 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 cb877456f..be2f6a48b 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 33f32171e..2fb33782b 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 48b830813..792984987 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 abbb7d8ef..c2dfc5f92 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 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 11963460d..2504733bd 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 adb453e78..8d5233e5f 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 9d025c663..8a614c562 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 6d95edeae..853596139 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 c1af6c2c4..ce78920d0 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 dfb42afd7..bb6dc63f4 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 51308a594..c57067d62 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 b87c69ff2..65aff47fe 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 d5b2ce494..8f16064df 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 02eec6f85..e2abb39bd 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 a089c6e62..a71d77205 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 93488c4c6..0322edcf5 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 279aa6058..8f212a8ce 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 f7f040b29..d99fa9dfd 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 0048cbc22..41fe782f6 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 1df06b827..bc309e31a 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 d4b7e198f..7a27d1883 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 29bfcaa49..0fb741e32 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 ab63fa933..8a32380f4 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 b98336de3..246a697c7 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 cfb55a683..32349959a 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 f982224e2..3f614fa8f 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 94320c065..3647539e6 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 2257f011c..3d383ce1d 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 113f6d1aa..e0b739e61 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 35d92736d..367c6eb3c 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 87f6b744f..28fb3bba7 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 bea48bfe3..89a732250 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 13380c530..7191ad382 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 56abd2b4a..2081b4738 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 a61346512..ee2f174e4 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 e8ec63ae5..6fd5e22b9 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 4e95dfab3..a98dc0a51 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 5224d8b34..4138bc457 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 86073b4b9..64749e7d7 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 d797f295c..6ba7ed4b9 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 ade26f9e5..002ecca8f 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 1a09ef2b4..eacf70fc3 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 fa207b751..0a719d5c6 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 a2d34a3c1..4dc8e9edd 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 a63c4bbca..3366eab40 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 2f2a8d552..322cd5297 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 700fe3c88..a37de398b 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 3c7b1a522..dbb03eafe 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 b1affeba3..da3173cf7 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 91624c298..78ece226a 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 6a3b70941..8175afa38 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 c7c367eb1..47a2527d6 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 89d1ad903..00e387892 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 762333fe4..9a98053af 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 51f5041e3..3a75a7f5b 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 47aa801ed..93981663f 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 d05e0fc94..1dfb8aaf6 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 12ab99d9c..9bf03fe96 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 536516f5e..be30c43ca 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 c7ae7c9bf..b87f2c558 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 5b5fbf4e8..722586b93 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 b3b96097c..f4f81d0ff 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 d6c11b0b6..fc2850433 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 0c6d1e273..aaee2df5f 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 126da8aa9..dc83b5ff0 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 1ec74b2ef..1747cce31 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 _wardersSet; std::set _cubesSet; std::set _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 3656dac9d..2d071d695 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 2cb96bfda..f68c70342 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 4cf2e8ba4..e778d11f3 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 46aa62fe1..304fe9111 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 3db9f25b8..c3462e59d 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 077840fec..41b753182 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 7d6c267c1..23b051ccb 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 be5528fe7..71d8822fe 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 be97c29d5..946f4bf17 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 f0f62b49d..2e20f495d 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 cdc8c6c59..7e4e4627b 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 ef537267c..33192c598 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 4734b7c82..1a93cc158 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 a4883ea3e..1e372721a 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 8479385c2..d0b268676 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 2dd968da7..25266488f 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 42d27bc25..4722691c6 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 74a0d59dc..0b5916940 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 d268b70e4..a1cae1c9d 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 6510668c8..ddff84fdf 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 024d0adaf..8340086db 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 426cfafaf..117e00e54 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 6ddffd882..9de34f263 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 diff --git a/src/server/worldserver/RemoteAccess/RARunnable.h b/src/server/worldserver/RemoteAccess/RARunnable.h index a59852916..2d182bcdf 100644 --- a/src/server/worldserver/RemoteAccess/RARunnable.h +++ b/src/server/worldserver/RemoteAccess/RARunnable.h @@ -24,7 +24,6 @@ public: private: ACE_Reactor* m_Reactor; - }; #endif /* _ACORE_RARUNNABLE_H_ */ diff --git a/src/tools/map_extractor/adt.h b/src/tools/map_extractor/adt.h index 4e0d253a3..cf82f0628 100644 --- a/src/tools/map_extractor/adt.h +++ b/src/tools/map_extractor/adt.h @@ -254,7 +254,6 @@ public: else return 0xFFFFFFFFFFFFFFFFuLL; } - }; // Adt file min/max height chunk diff --git a/src/tools/map_extractor/dbcfile.cpp b/src/tools/map_extractor/dbcfile.cpp index a90fcee02..f20f5e4ac 100644 --- a/src/tools/map_extractor/dbcfile.cpp +++ b/src/tools/map_extractor/dbcfile.cpp @@ -14,7 +14,6 @@ DBCFile::DBCFile(std::string filename): filename(std::move(filename)), recordSize(0), recordCount(0), fieldCount(0), stringSize(0), data(nullptr), stringTable(nullptr) { - } bool DBCFile::open() diff --git a/src/tools/map_extractor/mpq_libmpq.cpp b/src/tools/map_extractor/mpq_libmpq.cpp index 873d7bb00..390195122 100644 --- a/src/tools/map_extractor/mpq_libmpq.cpp +++ b/src/tools/map_extractor/mpq_libmpq.cpp @@ -77,7 +77,6 @@ MPQFile::MPQFile(const char* filename): libmpq__file_read(mpq_a, filenum, (unsigned char*)buffer, size, &transferred); /*libmpq_file_getdata(&mpq_a, hash, fileno, (unsigned char*)buffer);*/ return; - } eof = true; buffer = nullptr; diff --git a/src/tools/map_extractor/mpq_libmpq04.h b/src/tools/map_extractor/mpq_libmpq04.h index 6af3a9174..95c992a32 100644 --- a/src/tools/map_extractor/mpq_libmpq04.h +++ b/src/tools/map_extractor/mpq_libmpq04.h @@ -19,7 +19,6 @@ using namespace std; class MPQArchive { - public: mpq_archive_s* mpq_a; diff --git a/src/tools/mesh_extractor/MPQ.cpp b/src/tools/mesh_extractor/MPQ.cpp index f82e058e7..3b002bcb4 100644 --- a/src/tools/mesh_extractor/MPQ.cpp +++ b/src/tools/mesh_extractor/MPQ.cpp @@ -72,7 +72,6 @@ MPQFile::MPQFile(const char* filename): libmpq__file_read(mpq_a, filenum, (unsigned char*)buffer, size, &transferred); /*libmpq_file_getdata(&mpq_a, hash, fileno, (unsigned char*)buffer);*/ return; - } eof = true; buffer = 0; diff --git a/src/tools/mesh_extractor/MPQ.h b/src/tools/mesh_extractor/MPQ.h index a83c9cb1f..38bca059d 100644 --- a/src/tools/mesh_extractor/MPQ.h +++ b/src/tools/mesh_extractor/MPQ.h @@ -18,7 +18,6 @@ class MPQArchive { - public: mpq_archive_s* mpq_a; diff --git a/src/tools/mesh_extractor/Utils.cpp b/src/tools/mesh_extractor/Utils.cpp index 458a5ccd7..2b306ba73 100644 --- a/src/tools/mesh_extractor/Utils.cpp +++ b/src/tools/mesh_extractor/Utils.cpp @@ -344,7 +344,6 @@ void ModelHeader::Read(FILE* stream) if (count != 51) printf("ModelHeader::Read: Failed to read some data expected 51, read %d\n", count); - } WorldModelHeader WorldModelHeader::Read(FILE* stream) diff --git a/src/tools/mesh_extractor/WDT.cpp b/src/tools/mesh_extractor/WDT.cpp index c77d0e726..4346059c4 100644 --- a/src/tools/mesh_extractor/WDT.cpp +++ b/src/tools/mesh_extractor/WDT.cpp @@ -53,7 +53,6 @@ void WDT::ReadTileTable() if (flags & hasTileFlag) TileTable.push_back(TilePos(x, y)); - } } } diff --git a/src/tools/mesh_extractor/WorldModelHandler.cpp b/src/tools/mesh_extractor/WorldModelHandler.cpp index a3459c08f..53a94817f 100644 --- a/src/tools/mesh_extractor/WorldModelHandler.cpp +++ b/src/tools/mesh_extractor/WorldModelHandler.cpp @@ -151,7 +151,6 @@ void WorldModelHandler::InsertModelGeometry( std::vector& verts, std::v { for (uint32 x = 0; x < liquidHeader.Width; x++) { - if (!liquidDataGeometry.ShouldRender(x, y)) continue; @@ -173,7 +172,6 @@ void WorldModelHandler::InsertModelGeometry( std::vector& verts, std::v tris.push_back(Triangle(Constants::TRIANGLE_TYPE_WATER, vertOffset, vertOffset + 2, vertOffset + 1)); tris.push_back(Triangle(Constants::TRIANGLE_TYPE_WATER, vertOffset + 2, vertOffset + 3, vertOffset + 1)); - } } } diff --git a/src/tools/mmaps_generator/TerrainBuilder.cpp b/src/tools/mmaps_generator/TerrainBuilder.cpp index 97c17561a..3c56e49c3 100644 --- a/src/tools/mmaps_generator/TerrainBuilder.cpp +++ b/src/tools/mmaps_generator/TerrainBuilder.cpp @@ -593,7 +593,6 @@ namespace MMAP | \| 258---259 ... 515 */ - } /**************************************************************************/ @@ -938,7 +937,6 @@ namespace MMAP meshData.offMeshConnectionsAreas.append((unsigned char)0xFF); meshData.offMeshConnectionsFlags.append((unsigned short)0xFF); // all movement masks can make this path } - } delete [] buf; diff --git a/src/tools/vmap4_extractor/dbcfile.cpp b/src/tools/vmap4_extractor/dbcfile.cpp index 57a847755..b83714cca 100644 --- a/src/tools/vmap4_extractor/dbcfile.cpp +++ b/src/tools/vmap4_extractor/dbcfile.cpp @@ -15,7 +15,6 @@ DBCFile::DBCFile(std::string filename): filename(std::move(filename)), recordSize(0), recordCount(0), fieldCount(0), stringSize(0), data(nullptr), stringTable(nullptr) { - } bool DBCFile::open() diff --git a/src/tools/vmap4_extractor/model.h b/src/tools/vmap4_extractor/model.h index acc035265..008fce4c0 100644 --- a/src/tools/vmap4_extractor/model.h +++ b/src/tools/vmap4_extractor/model.h @@ -49,7 +49,6 @@ public: ModelInstance() {} ModelInstance(MPQFile& f, char const* ModelInstName, uint32 mapID, uint32 tileX, uint32 tileY, FILE* pDirfile); - }; #endif diff --git a/src/tools/vmap4_extractor/mpq_libmpq.cpp b/src/tools/vmap4_extractor/mpq_libmpq.cpp index dbc887ee3..b40b2be98 100644 --- a/src/tools/vmap4_extractor/mpq_libmpq.cpp +++ b/src/tools/vmap4_extractor/mpq_libmpq.cpp @@ -77,7 +77,6 @@ MPQFile::MPQFile(const char* filename): libmpq__file_read(mpq_a, filenum, (unsigned char*)buffer, size, &transferred); /*libmpq_file_getdata(&mpq_a, hash, fileno, (unsigned char*)buffer);*/ return; - } eof = true; buffer = nullptr; diff --git a/src/tools/vmap4_extractor/mpq_libmpq04.h b/src/tools/vmap4_extractor/mpq_libmpq04.h index 1c8562c8a..329a79876 100644 --- a/src/tools/vmap4_extractor/mpq_libmpq04.h +++ b/src/tools/vmap4_extractor/mpq_libmpq04.h @@ -19,7 +19,6 @@ using namespace std; class MPQArchive { - public: mpq_archive_s* mpq_a;