From ea93a5c1a159912fac22dae9659e72b60f197f87 Mon Sep 17 00:00:00 2001 From: Kargatum Date: Sat, 9 Jan 2021 17:59:50 +0700 Subject: [PATCH] feat(CI/Codestyle): added codestyle check (#3668) --- .github/workflows/codestyle.yml | 15 +++++ apps/ci/ci-codestyle.sh | 23 +++++++ src/CMakeLists.txt | 2 +- src/cmake/ac_macros.cmake | 1 - src/cmake/compiler/msvc/settings.cmake | 2 +- src/cmake/macros/CheckBuildDir.cmake | 2 +- src/cmake/macros/EnsureVersion.cmake | 1 - src/cmake/macros/FindMySQL.cmake | 6 +- src/cmake/macros/FindOpenSSL.cmake | 2 +- src/cmake/platform/settings.cmake | 1 - src/cmake/showoptions.cmake | 1 - .../Collision/BoundingIntervalHierarchy.h | 2 +- .../BoundingIntervalHierarchyWrapper.h | 1 - src/common/Collision/Management/MMapFactory.h | 1 - src/common/Collision/Management/MMapManager.h | 1 - src/common/Collision/Maps/TileAssembler.cpp | 2 - src/common/Collision/Maps/TileAssembler.h | 1 - src/common/Collision/Models/GameObjectModel.h | 1 - src/common/Collision/RegularGrid.h | 2 - src/common/Common.cpp | 1 - .../Cryptography/Authentication/AuthCrypt.cpp | 1 - src/common/Cryptography/BigNumber.cpp | 2 - src/common/Cryptography/BigNumber.h | 1 - src/common/Cryptography/HMACSHA1.h | 1 - src/common/Cryptography/SHA1.cpp | 1 - src/common/Cryptography/SHA1.h | 1 - src/common/Database/DatabaseEnv.h | 1 - src/common/Database/Field.h | 1 - src/common/Database/PreparedStatement.cpp | 1 - src/common/Database/QueryResult.h | 1 - .../Debugging/WheatyExceptionReport.cpp | 2 - src/common/Dynamic/LinkedList.h | 2 +- .../Dynamic/LinkedReference/RefManager.h | 1 - src/common/Dynamic/TypeContainer.h | 1 - src/common/Dynamic/TypeContainerFunctions.h | 1 - .../Dynamic/TypeContainerFunctionsPtr.h | 1 - src/common/Dynamic/TypeContainerVisitor.h | 1 - src/common/Dynamic/TypeList.h | 1 - src/common/Logging/ILog.h | 1 - src/common/Logging/Log.cpp | 1 - src/common/Logging/Log.h | 1 - src/common/Packets/ByteBuffer.h | 2 +- src/common/Packets/WorldPacket.h | 2 +- src/common/Threading/LockedQueue.h | 2 +- src/common/Threading/Threading.cpp | 1 - src/common/Utilities/ByteConverter.h | 1 - src/common/Utilities/Optional.h | 2 +- src/common/Utilities/ServiceWin32.cpp | 1 - src/common/Utilities/ServiceWin32.h | 1 - src/common/Utilities/Timer.h | 2 +- src/server/authserver/Main.cpp | 2 +- src/server/authserver/Server/AuthSocket.cpp | 1 - src/server/authserver/authserver.conf.dist | 1 - src/server/game/AI/CoreAI/CombatAI.h | 1 - src/server/game/AI/CoreAI/PassiveAI.h | 1 - src/server/game/AI/CoreAI/TotemAI.h | 1 - src/server/game/AI/CoreAI/UnitAI.cpp | 1 - src/server/game/AI/CoreAI/UnitAI.h | 1 - src/server/game/AI/CreatureAIImpl.h | 1 - src/server/game/AI/CreatureAIRegistry.cpp | 1 - src/server/game/AI/CreatureAIRegistry.h | 1 - src/server/game/AI/CreatureAISelector.cpp | 1 - src/server/game/AI/CreatureAISelector.h | 1 - .../game/AI/ScriptedAI/ScriptedEscortAI.h | 1 - src/server/game/AI/SmartScripts/SmartAI.cpp | 1 - src/server/game/Accounts/AccountMgr.cpp | 1 - src/server/game/Achievements/AchievementMgr.h | 2 +- src/server/game/Addons/AddonMgr.h | 1 - src/server/game/Battlefield/Battlefield.cpp | 1 - src/server/game/Battlefield/Battlefield.h | 1 - .../game/Battlefield/Zones/BattlefieldWG.cpp | 2 - .../game/Battlefield/Zones/BattlefieldWG.h | 2 - src/server/game/Battlegrounds/ArenaTeam.h | 1 - .../game/Battlegrounds/ArenaTeamMgr.cpp | 2 - .../game/Battlegrounds/Battleground.cpp | 1 - .../game/Battlegrounds/BattlegroundQueue.cpp | 1 - .../game/Battlegrounds/Zones/BattlegroundAB.h | 1 - .../game/Battlegrounds/Zones/BattlegroundEY.h | 1 - .../Battlegrounds/Zones/BattlegroundSA.cpp | 1 - .../Battlegrounds/Zones/BattlegroundWS.cpp | 1 - .../game/Battlegrounds/Zones/BattlegroundWS.h | 1 - src/server/game/Chat/Channels/Channel.h | 1 - src/server/game/Chat/Channels/ChannelMgr.cpp | 1 - src/server/game/Chat/ChatLink.h | 1 - src/server/game/Combat/HostileRefManager.h | 1 - src/server/game/Combat/UnitEvents.h | 1 - src/server/game/DataStores/DBCStores.cpp | 2 - src/server/game/DungeonFinding/LFG.cpp | 1 - src/server/game/DungeonFinding/LFG.h | 2 - src/server/game/DungeonFinding/LFGMgr.cpp | 1 - .../game/Entities/Creature/Creature.cpp | 3 - .../game/Entities/GameObject/GameObject.cpp | 1 - .../game/Entities/Item/Container/Bag.cpp | 1 - src/server/game/Entities/Item/Container/Bag.h | 1 - .../game/Entities/Item/ItemEnchantmentMgr.cpp | 1 - .../game/Entities/Item/ItemEnchantmentMgr.h | 1 - src/server/game/Entities/Object/Object.cpp | 3 - src/server/game/Entities/Object/Object.h | 2 - .../Entities/Object/Updates/UpdateData.cpp | 1 - .../game/Entities/Object/Updates/UpdateData.h | 1 - src/server/game/Entities/Pet/Pet.cpp | 1 - src/server/game/Entities/Pet/Pet.h | 1 - src/server/game/Entities/Player/Player.cpp | 9 --- src/server/game/Entities/Player/SocialMgr.h | 2 +- src/server/game/Entities/Totem/Totem.cpp | 1 - src/server/game/Entities/Unit/StatSystem.cpp | 2 - src/server/game/Entities/Unit/Unit.cpp | 7 -- src/server/game/Events/GameEventMgr.h | 1 - src/server/game/Globals/ObjectAccessor.cpp | 1 - src/server/game/Globals/ObjectMgr.cpp | 1 - src/server/game/Globals/ObjectMgr.h | 2 +- src/server/game/Grids/Cells/Cell.h | 1 - src/server/game/Grids/Cells/CellImpl.h | 1 - src/server/game/Grids/Grid.h | 1 - src/server/game/Grids/GridLoader.h | 1 - src/server/game/Grids/GridRefManager.h | 1 - src/server/game/Grids/GridReference.h | 1 - src/server/game/Grids/NGrid.h | 1 - .../game/Grids/Notifiers/GridNotifiers.cpp | 1 - .../game/Grids/Notifiers/GridNotifiersImpl.h | 1 - src/server/game/Groups/Group.cpp | 1 - src/server/game/Groups/GroupMgr.h | 1 - src/server/game/Groups/GroupRefManager.h | 1 - src/server/game/Groups/GroupReference.cpp | 1 - src/server/game/Groups/GroupReference.h | 1 - src/server/game/Guilds/Guild.cpp | 2 - .../game/Handlers/AuctionHouseHandler.cpp | 1 - .../game/Handlers/BattleGroundHandler.cpp | 1 - src/server/game/Handlers/CharacterHandler.cpp | 3 - src/server/game/Handlers/GuildHandler.cpp | 1 - src/server/game/Handlers/MiscHandler.cpp | 2 - src/server/game/Handlers/MovementHandler.cpp | 1 - src/server/game/Handlers/NPCHandler.cpp | 1 - src/server/game/Handlers/NPCHandler.h | 1 - src/server/game/Handlers/PetHandler.cpp | 1 - src/server/game/Handlers/PetitionsHandler.cpp | 2 - src/server/game/Handlers/Socialhandler.cpp | 1 - src/server/game/Handlers/SpellHandler.cpp | 2 - src/server/game/Handlers/VoiceChatHandler.cpp | 1 - src/server/game/Maps/Map.cpp | 4 -- src/server/game/Maps/Map.h | 2 - src/server/game/Maps/MapRefManager.h | 1 - src/server/game/Maps/MapReference.h | 1 - src/server/game/Miscellaneous/Language.h | 7 +- src/server/game/Miscellaneous/SharedDefines.h | 1 - .../EscortMovementGenerator.h | 1 - .../TargetedMovementGenerator.cpp | 2 +- .../game/Movement/Spline/MoveSplineInitArgs.h | 2 +- src/server/game/Petitions/PetitionMgr.cpp | 3 - src/server/game/Quests/QuestDef.h | 2 +- src/server/game/Scripting/ScriptMgr.cpp | 3 - src/server/game/Scripting/ScriptMgr.h | 7 -- src/server/game/Scripting/ScriptMgrMacros.h | 1 - src/server/game/Server/WorldSession.cpp | 3 - src/server/game/Server/WorldSocket.h | 1 - .../game/Spells/Auras/SpellAuraEffects.cpp | 2 - .../game/Spells/Auras/SpellAuraEffects.h | 1 - src/server/game/Spells/Auras/SpellAuras.cpp | 1 - src/server/game/Spells/Spell.cpp | 6 -- src/server/game/Spells/SpellEffects.cpp | 2 - src/server/game/Spells/SpellMgr.cpp | 12 ---- src/server/game/Spells/SpellMgr.h | 4 +- src/server/game/Spells/SpellScript.cpp | 1 - src/server/game/Tickets/TicketMgr.cpp | 1 - .../game/Tools/CharacterDatabaseCleaner.cpp | 1 - src/server/game/Weather/Weather.cpp | 1 - src/server/game/World/World.cpp | 5 +- src/server/scripts/Commands/cs_account.cpp | 1 - src/server/scripts/Commands/cs_ban.cpp | 1 - src/server/scripts/Commands/cs_cheat.cpp | 1 - src/server/scripts/Commands/cs_misc.cpp | 2 - .../BlackrockDepths/blackrock_depths.cpp | 1 - .../boss_pyroguard_emberseer.cpp | 1 - .../BlackrockSpire/boss_rend_blackhand.cpp | 2 - .../MoltenCore/boss_ragnaros.cpp | 1 - .../scripts/EasternKingdoms/CMakeLists.txt | 2 +- .../EasternKingdoms/Deadmines/deadmines.h | 1 - .../Karazhan/boss_netherspite.cpp | 1 - .../Karazhan/boss_prince_malchezaar.cpp | 5 -- .../Karazhan/boss_terestian_illhoof.cpp | 3 - .../EasternKingdoms/Karazhan/bosses_opera.cpp | 6 -- .../Karazhan/instance_karazhan.cpp | 1 - .../EasternKingdoms/Karazhan/karazhan.cpp | 1 - .../boss_felblood_kaelthas.cpp | 1 - .../MagistersTerrace/magisters_terrace.h | 2 - .../ScarletEnclave/chapter1.cpp | 1 - .../instance_shadowfang_keep.cpp | 2 - .../Stratholme/instance_stratholme.cpp | 3 - .../EasternKingdoms/Stratholme/stratholme.h | 1 - .../SunwellPlateau/boss_felmyst.cpp | 1 - .../SunwellPlateau/boss_kalecgos.cpp | 1 - .../SunwellPlateau/sunwell_plateau.h | 1 - .../EasternKingdoms/ZulAman/boss_akilzon.cpp | 2 - .../EasternKingdoms/ZulAman/boss_hexlord.cpp | 2 - .../EasternKingdoms/ZulAman/boss_janalai.cpp | 2 - .../EasternKingdoms/ZulAman/boss_nalorakk.cpp | 1 - .../EasternKingdoms/ZulAman/boss_zuljin.cpp | 1 - .../ZulAman/instance_zulaman.cpp | 1 - .../EasternKingdoms/ZulGurub/boss_grilek.cpp | 1 - .../EasternKingdoms/ZulGurub/boss_hakkar.cpp | 1 - .../ZulGurub/boss_renataki.cpp | 1 - .../ZulGurub/boss_wushoolay.cpp | 1 - .../zone_eastern_plaguelands.cpp | 1 - .../EasternKingdoms/zone_eversong_woods.cpp | 1 - .../zone_isle_of_queldanas.cpp | 2 - .../EasternKingdoms/zone_undercity.cpp | 1 - src/server/scripts/Events/brewfest.cpp | 3 - src/server/scripts/Events/hallows_end.cpp | 2 - src/server/scripts/Events/love_in_air.cpp | 4 +- src/server/scripts/Events/midsummer.cpp | 1 - src/server/scripts/Events/winter_veil.cpp | 1 - src/server/scripts/Kalimdor/CMakeLists.txt | 2 +- .../CavernsOfTime/BattleForMountHyjal/hyjal.h | 1 - .../BattleForMountHyjal/hyjalAI.h | 1 - .../culling_of_stratholme.cpp | 1 - .../boss_epoch_hunter.cpp | 1 - .../EscapeFromDurnholdeKeep/old_hillsbrad.h | 1 - .../instance_the_black_morass.cpp | 1 - .../TheBlackMorass/the_black_morass.cpp | 3 - .../Kalimdor/OnyxiasLair/boss_onyxia.cpp | 8 +-- .../TempleOfAhnQiraj/boss_twinemperors.cpp | 2 - .../TempleOfAhnQiraj/temple_of_ahnqiraj.h | 1 - .../scripts/Kalimdor/zone_bloodmyst_isle.cpp | 4 +- .../scripts/Kalimdor/zone_darkshore.cpp | 1 - src/server/scripts/Kalimdor/zone_desolace.cpp | 1 - .../scripts/Kalimdor/zone_winterspring.cpp | 1 - .../AzjolNerub/ahnkahet/boss_elder_nadox.cpp | 1 - .../ahnkahet/boss_jedoga_shadowseeker.cpp | 1 - src/server/scripts/Northrend/CMakeLists.txt | 2 +- .../ObsidianSanctum/boss_sartharion.cpp | 2 +- .../RubySanctum/boss_halion.cpp | 2 - .../boss_argent_challenge.cpp | 3 +- .../TrialOfTheChampion/boss_black_knight.cpp | 5 +- .../boss_grand_champions.cpp | 6 +- .../instance_trial_of_the_champion.cpp | 2 +- .../boss_anubarak_trial.cpp | 9 ++- .../boss_faction_champions.cpp | 4 +- .../TrialOfTheCrusader/boss_lord_jaraxxus.cpp | 5 +- .../boss_northrend_beasts.cpp | 16 ++--- .../TrialOfTheCrusader/boss_twin_valkyr.cpp | 6 +- .../instance_trial_of_the_crusader.cpp | 64 +++++++++---------- .../trial_of_the_crusader.h | 1 - .../ForgeOfSouls/boss_bronjahm.cpp | 8 +-- .../ForgeOfSouls/boss_devourer_of_souls.cpp | 2 - .../ForgeOfSouls/forge_of_souls.cpp | 18 +++--- .../PitOfSaron/boss_forgemaster_garfrost.cpp | 2 +- .../PitOfSaron/boss_krickandick.cpp | 25 ++++---- .../PitOfSaron/boss_scourgelord_tyrannus.cpp | 4 +- .../FrozenHalls/PitOfSaron/pit_of_saron.cpp | 54 ++++++++-------- .../Gundrak/boss_drakkari_colossus.cpp | 1 - .../boss_lady_deathwhisper.cpp | 1 - .../IcecrownCitadel/boss_lord_marrowgar.cpp | 1 - .../boss_professor_putricide.cpp | 1 - .../IcecrownCitadel/boss_rotface.cpp | 1 - .../IcecrownCitadel/boss_sindragosa.cpp | 3 - .../IcecrownCitadel/boss_the_lich_king.cpp | 7 -- .../IcecrownCitadel/icecrown_citadel.cpp | 2 - .../instance_icecrown_citadel.cpp | 3 +- .../Northrend/Naxxramas/boss_anubrekhan.cpp | 3 +- .../Naxxramas/boss_four_horsemen.cpp | 4 +- .../Northrend/Naxxramas/boss_gluth.cpp | 3 +- .../Northrend/Naxxramas/boss_gothik.cpp | 12 ++-- .../Northrend/Naxxramas/boss_grobbulus.cpp | 2 +- .../Northrend/Naxxramas/boss_kelthuzad.cpp | 5 +- .../Northrend/Naxxramas/boss_loatheb.cpp | 2 +- .../Northrend/Naxxramas/boss_maexxna.cpp | 4 +- .../Northrend/Naxxramas/boss_patchwerk.cpp | 4 +- .../Northrend/Naxxramas/boss_razuvious.cpp | 1 - .../Northrend/Naxxramas/boss_sapphiron.cpp | 6 +- .../Northrend/Naxxramas/boss_thaddius.cpp | 6 +- .../Naxxramas/instance_naxxramas.cpp | 3 +- .../scripts/Northrend/Naxxramas/naxxramas.h | 1 - .../Nexus/EyeOfEternity/boss_malygos.cpp | 15 +---- .../Northrend/Nexus/Oculus/boss_drakos.cpp | 2 +- .../Nexus/Oculus/instance_oculus.cpp | 1 - .../HallsOfLightning/boss_bjarngrim.cpp | 1 - .../instance_halls_of_lightning.cpp | 1 - .../Ulduar/HallsOfStone/boss_krystallus.cpp | 1 - .../Ulduar/HallsOfStone/brann_bronzebeard.cpp | 1 - .../HallsOfStone/instance_halls_of_stone.cpp | 1 - .../Ulduar/boss_algalon_the_observer.cpp | 1 - .../Ulduar/Ulduar/boss_assembly_of_iron.cpp | 2 - .../Ulduar/Ulduar/boss_flame_leviathan.cpp | 2 - .../Northrend/Ulduar/Ulduar/boss_freya.cpp | 2 - .../Ulduar/Ulduar/boss_general_vezax.cpp | 1 - .../Northrend/Ulduar/Ulduar/boss_hodir.cpp | 1 - .../Northrend/Ulduar/Ulduar/boss_ignis.cpp | 1 - .../Northrend/Ulduar/Ulduar/boss_kologarn.cpp | 1 - .../Northrend/Ulduar/Ulduar/boss_mimiron.cpp | 9 --- .../Ulduar/Ulduar/boss_razorscale.cpp | 1 - .../Northrend/Ulduar/Ulduar/boss_thorim.cpp | 1 - .../Northrend/Ulduar/Ulduar/boss_xt002.cpp | 2 - .../Ulduar/Ulduar/boss_yoggsaron.cpp | 5 -- .../Ulduar/Ulduar/instance_ulduar.cpp | 3 - .../Northrend/Ulduar/Ulduar/ulduar.cpp | 1 - .../scripts/Northrend/Ulduar/Ulduar/ulduar.h | 2 - .../VaultOfArchavon/boss_archavon.cpp | 5 +- .../VaultOfArchavon/boss_toravon.cpp | 2 - .../VaultOfArchavon/vault_of_archavon.h | 1 - .../Northrend/VioletHold/boss_cyanigosa.cpp | 3 +- .../Northrend/VioletHold/boss_erekem.cpp | 2 - .../Northrend/VioletHold/boss_ichoron.cpp | 2 - .../Northrend/VioletHold/violet_hold.cpp | 3 - .../scripts/Northrend/zone_borean_tundra.cpp | 1 - src/server/scripts/Northrend/zone_dalaran.cpp | 1 - .../scripts/Northrend/zone_dragonblight.cpp | 4 -- .../scripts/Northrend/zone_grizzly_hills.cpp | 2 - .../scripts/Northrend/zone_howling_fjord.cpp | 1 - .../scripts/Northrend/zone_icecrown.cpp | 3 - .../scripts/Northrend/zone_sholazar_basin.cpp | 2 - .../scripts/Northrend/zone_storm_peaks.cpp | 1 - .../scripts/Northrend/zone_wintergrasp.cpp | 2 - src/server/scripts/Northrend/zone_zuldrak.cpp | 4 -- src/server/scripts/OutdoorPvP/CMakeLists.txt | 2 +- .../boss_shirrak_the_dead_watcher.cpp | 1 - .../ManaTombs/boss_nexusprince_shaffar.cpp | 1 - .../Auchindoun/ManaTombs/boss_pandemonius.cpp | 1 - .../ShadowLabyrinth/shadow_labyrinth.h | 1 - .../Outland/BlackTemple/boss_illidan.cpp | 1 - .../BlackTemple/boss_reliquary_of_souls.cpp | 1 - src/server/scripts/Outland/CMakeLists.txt | 2 +- .../SerpentShrine/instance_serpent_shrine.cpp | 1 - .../SerpentShrine/serpent_shrine.h | 2 - .../SteamVault/steam_vault.h | 1 - .../underbog/boss_the_black_stalker.cpp | 1 - .../BloodFurnace/blood_furnace.h | 1 - .../BloodFurnace/boss_kelidan_the_breaker.cpp | 1 - .../BloodFurnace/boss_the_maker.cpp | 1 - .../BloodFurnace/instance_blood_furnace.cpp | 1 - .../boss_omor_the_unscarred.cpp | 1 - .../MagtheridonsLair/boss_magtheridon.cpp | 3 - .../instance_magtheridons_lair.cpp | 2 - .../MagtheridonsLair/magtheridons_lair.h | 1 - .../TempestKeep/Eye/boss_astromancer.cpp | 3 - .../Outland/TempestKeep/Eye/boss_kaelthas.cpp | 1 - .../TempestKeep/Eye/boss_void_reaver.cpp | 1 - .../Mechanar/boss_gatewatcher_ironhand.cpp | 1 - .../boss_pathaleon_the_calculator.cpp | 1 - .../Outland/TempestKeep/arcatraz/arcatraz.cpp | 1 - .../arcatraz/boss_harbinger_skyriss.cpp | 1 - .../arcatraz/boss_zereketh_the_unbound.cpp | 1 - .../arcatraz/instance_arcatraz.cpp | 1 - .../botanica/boss_high_botanist_freywinn.cpp | 1 - .../Outland/TempestKeep/botanica/boss_laj.cpp | 1 - .../botanica/boss_thorngrin_the_tender.cpp | 1 - .../botanica/boss_warp_splinter.cpp | 1 - .../Outland/zone_blades_edge_mountains.cpp | 1 - .../Outland/zone_hellfire_peninsula.cpp | 1 - .../scripts/Outland/zone_netherstorm.cpp | 1 - .../Outland/zone_shadowmoon_valley.cpp | 2 - .../scripts/Outland/zone_terokkar_forest.cpp | 1 - .../scripts/Outland/zone_zangarmarsh.cpp | 1 - src/server/scripts/Pet/CMakeLists.txt | 2 +- src/server/scripts/Pet/pet_generic.cpp | 1 - src/server/scripts/Pet/pet_shaman.cpp | 1 - .../scripts/PrecompiledHeaders/ScriptPCH.h | 1 - src/server/scripts/ScriptLoader.cpp | 2 - src/server/scripts/Spells/CMakeLists.txt | 2 +- src/server/scripts/Spells/spell_dk.cpp | 1 - src/server/scripts/Spells/spell_druid.cpp | 2 - src/server/scripts/Spells/spell_generic.cpp | 3 - src/server/scripts/Spells/spell_hunter.cpp | 4 -- src/server/scripts/Spells/spell_mage.cpp | 2 - src/server/scripts/Spells/spell_paladin.cpp | 1 - src/server/scripts/Spells/spell_priest.cpp | 1 - src/server/scripts/Spells/spell_quest.cpp | 3 - src/server/scripts/Spells/spell_rogue.cpp | 1 - src/server/scripts/Spells/spell_shaman.cpp | 1 - src/server/scripts/Spells/spell_warrior.cpp | 3 - src/server/scripts/World/CMakeLists.txt | 2 +- src/server/scripts/World/action_ip_logger.cpp | 1 - .../scripts/World/areatrigger_scripts.cpp | 2 - src/server/scripts/World/go_scripts.cpp | 1 - src/server/scripts/World/npc_innkeeper.cpp | 1 - src/server/scripts/World/npc_professions.cpp | 3 - src/server/scripts/World/npcs_special.cpp | 4 -- src/server/shared/CMakeLists.txt | 2 +- src/server/shared/Network/RealmSocket.cpp | 5 +- src/server/worldserver/CMakeLists.txt | 2 +- src/server/worldserver/Master.cpp | 3 +- .../worldserver/RemoteAccess/RASocket.cpp | 1 - src/server/worldserver/worldserver.conf.dist | 32 ++++------ src/tools/CMakeLists.txt | 2 +- src/tools/map_extractor/System.cpp | 1 - src/tools/map_extractor/dbcfile.cpp | 1 - src/tools/map_extractor/dbcfile.h | 1 - src/tools/mesh_extractor/DoodadHandler.h | 1 - src/tools/mesh_extractor/Geometry.cpp | 1 - src/tools/mesh_extractor/MeshExtractor.cpp | 1 - src/tools/mesh_extractor/Model.cpp | 1 - .../mesh_extractor/WorldModelHandler.cpp | 1 - src/tools/mmaps_generator/Info/readme.txt | 1 - .../mmaps_generator/IntermediateValues.cpp | 1 - src/tools/mmaps_generator/MapBuilder.cpp | 4 +- src/tools/mmaps_generator/TerrainBuilder.cpp | 1 - src/tools/mmaps_generator/TerrainBuilder.h | 1 - src/tools/vmap4_extractor/adtfile.h | 1 - src/tools/vmap4_extractor/model.cpp | 1 - src/tools/vmap4_extractor/vec3d.h | 2 - src/tools/vmap4_extractor/vmapexport.cpp | 2 - 400 files changed, 238 insertions(+), 748 deletions(-) create mode 100644 .github/workflows/codestyle.yml create mode 100644 apps/ci/ci-codestyle.sh diff --git a/.github/workflows/codestyle.yml b/.github/workflows/codestyle.yml new file mode 100644 index 000000000..ed76d020f --- /dev/null +++ b/.github/workflows/codestyle.yml @@ -0,0 +1,15 @@ +name: check-codestyle +on: + push: + pull_request: + +jobs: + check-codestyle: + strategy: + fail-fast: false + runs-on: ubuntu-20.04 + name: check codestyle + steps: + - uses: actions/checkout@v2 + - name: Check core codestyle + run: source ./apps/ci/ci-codestyle.sh diff --git a/apps/ci/ci-codestyle.sh b/apps/ci/ci-codestyle.sh new file mode 100644 index 000000000..0477a9f48 --- /dev/null +++ b/apps/ci/ci-codestyle.sh @@ -0,0 +1,23 @@ +#!/bin/bash +set -e + +echo "Codestyle check script:" +echo + +declare -A singleLineRegexChecks=( + ["[[:blank:]]$"]="Remove whitespace at the end of the lines above" + ["\t"]="Replace tabs with 4 spaces in the lines above" +) + +for check in ${!singleLineRegexChecks[@]}; do + echo " Checking RegEx: '${check}'" + + if grep -P -r -I -n ${check} src; then + echo + echo "${singleLineRegexChecks[$check]}" + exit 1 + fi +done + +echo +echo "Everything looks good" diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 12df31174..301865290 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) +# Copyright (C) # # This file is free software; as a special exception the author gives # unlimited permission to copy and/or distribute it, with or without diff --git a/src/cmake/ac_macros.cmake b/src/cmake/ac_macros.cmake index 7c406e7c1..838210ed9 100644 --- a/src/cmake/ac_macros.cmake +++ b/src/cmake/ac_macros.cmake @@ -29,7 +29,6 @@ MACRO(AC_ADD_SCRIPT_LOADER script_dec include) CU_ADD_GLOBAL("AC_ADD_SCRIPTS_LIST" "Add${script_dec}Scripts()\;") endif() - if (NOT ${include} STREQUAL "") CU_GET_GLOBAL("AC_ADD_SCRIPTS_INCLUDE") if (NOT ";${AC_ADD_SCRIPTS_INCLUDE};" MATCHES ";${include};") diff --git a/src/cmake/compiler/msvc/settings.cmake b/src/cmake/compiler/msvc/settings.cmake index 0840778ed..872922b6e 100644 --- a/src/cmake/compiler/msvc/settings.cmake +++ b/src/cmake/compiler/msvc/settings.cmake @@ -96,7 +96,7 @@ if(NOT WITH_WARNINGS) /wd4267 /wd4619 # /wd4512 - ) + ) message(STATUS "MSVC: Disabled generic compiletime warnings") endif() endif() diff --git a/src/cmake/macros/CheckBuildDir.cmake b/src/cmake/macros/CheckBuildDir.cmake index 085ca3274..091a52eaa 100644 --- a/src/cmake/macros/CheckBuildDir.cmake +++ b/src/cmake/macros/CheckBuildDir.cmake @@ -1,4 +1,4 @@ -# Copyright (C) +# Copyright (C) # # This file is free software; as a special exception the author gives # unlimited permission to copy and/or distribute it, with or without diff --git a/src/cmake/macros/EnsureVersion.cmake b/src/cmake/macros/EnsureVersion.cmake index a85e12abb..867b35968 100644 --- a/src/cmake/macros/EnsureVersion.cmake +++ b/src/cmake/macros/EnsureVersion.cmake @@ -58,7 +58,6 @@ # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. - MACRO(NORMALIZE_VERSION _requested_version _normalized_version) STRING(REGEX MATCH "[^0-9]*[0-9]+\\.[0-9]+\\.[0-9]+.*" _threePartMatch "${_requested_version}") if (_threePartMatch) diff --git a/src/cmake/macros/FindMySQL.cmake b/src/cmake/macros/FindMySQL.cmake index 6ad931239..88b49578f 100644 --- a/src/cmake/macros/FindMySQL.cmake +++ b/src/cmake/macros/FindMySQL.cmake @@ -1,6 +1,6 @@ # # Find the MySQL client includes and library -# +# # This module defines # MYSQL_INCLUDE_DIR, where to find mysql.h @@ -160,7 +160,7 @@ find_path(MYSQL_INCLUDE_DIR if( UNIX ) foreach(LIB ${MYSQL_ADD_LIBRARIES}) - find_library( MYSQL_LIBRARY + find_library( MYSQL_LIBRARY NAMES mysql libmysql ${LIB} PATHS @@ -176,7 +176,7 @@ if( UNIX ) endif( UNIX ) if( WIN32 ) - find_library( MYSQL_LIBRARY + find_library( MYSQL_LIBRARY NAMES libmysql PATHS diff --git a/src/cmake/macros/FindOpenSSL.cmake b/src/cmake/macros/FindOpenSSL.cmake index c684109aa..2e22bea4b 100644 --- a/src/cmake/macros/FindOpenSSL.cmake +++ b/src/cmake/macros/FindOpenSSL.cmake @@ -182,7 +182,7 @@ ENDIF(WIN32 AND NOT CYGWIN) include(FindPackageHandleStandardArgs) find_package_handle_standard_args(OpenSSL DEFAULT_MSG - OPENSSL_LIBRARIES + OPENSSL_LIBRARIES OPENSSL_INCLUDE_DIR ) diff --git a/src/cmake/platform/settings.cmake b/src/cmake/platform/settings.cmake index 6df5bc216..a4679a88e 100644 --- a/src/cmake/platform/settings.cmake +++ b/src/cmake/platform/settings.cmake @@ -2,4 +2,3 @@ if( PREFIX ) set(CMAKE_INSTALL_PREFIX "${PREFIX}") endif() - diff --git a/src/cmake/showoptions.cmake b/src/cmake/showoptions.cmake index 7ecae8c8a..5822cd82c 100644 --- a/src/cmake/showoptions.cmake +++ b/src/cmake/showoptions.cmake @@ -145,4 +145,3 @@ else() endif() message("") - diff --git a/src/common/Collision/BoundingIntervalHierarchy.h b/src/common/Collision/BoundingIntervalHierarchy.h index ab97f17a0..54d1a472e 100644 --- a/src/common/Collision/BoundingIntervalHierarchy.h +++ b/src/common/Collision/BoundingIntervalHierarchy.h @@ -364,7 +364,7 @@ protected: int numBVH2{0}; public: - BuildStats() + BuildStats() { for (int & i : numLeavesN) i = 0; } diff --git a/src/common/Collision/BoundingIntervalHierarchyWrapper.h b/src/common/Collision/BoundingIntervalHierarchyWrapper.h index 29c693928..86e70a77a 100644 --- a/src/common/Collision/BoundingIntervalHierarchyWrapper.h +++ b/src/common/Collision/BoundingIntervalHierarchyWrapper.h @@ -12,7 +12,6 @@ #include "G3D/Set.h" #include "BoundingIntervalHierarchy.h" - template> class BIHWrap { diff --git a/src/common/Collision/Management/MMapFactory.h b/src/common/Collision/Management/MMapFactory.h index fb17f84af..b4038a212 100644 --- a/src/common/Collision/Management/MMapFactory.h +++ b/src/common/Collision/Management/MMapFactory.h @@ -38,4 +38,3 @@ namespace MMAP } #endif - diff --git a/src/common/Collision/Management/MMapManager.h b/src/common/Collision/Management/MMapManager.h index e8e801d5c..514379283 100644 --- a/src/common/Collision/Management/MMapManager.h +++ b/src/common/Collision/Management/MMapManager.h @@ -50,7 +50,6 @@ namespace MMAP MMapTileSet mmapLoadedTiles; // maps [map grid coords] to [dtTile] }; - typedef std::unordered_map MMapDataSet; // singleton class diff --git a/src/common/Collision/Maps/TileAssembler.cpp b/src/common/Collision/Maps/TileAssembler.cpp index 7e1fdbce0..8fd9fb63d 100644 --- a/src/common/Collision/Maps/TileAssembler.cpp +++ b/src/common/Collision/Maps/TileAssembler.cpp @@ -408,7 +408,6 @@ namespace VMAP READ_OR_RETURN(&mogpflags, sizeof(uint32)); READ_OR_RETURN(&GroupWMOID, sizeof(uint32)); - Vector3 vec1, vec2; READ_OR_RETURN(&vec1, sizeof(Vector3)); @@ -482,7 +481,6 @@ namespace VMAP return true; } - GroupModel_Raw::~GroupModel_Raw() { delete liquid; diff --git a/src/common/Collision/Maps/TileAssembler.h b/src/common/Collision/Maps/TileAssembler.h index 9d0bfc611..3a7481689 100644 --- a/src/common/Collision/Maps/TileAssembler.h +++ b/src/common/Collision/Maps/TileAssembler.h @@ -63,7 +63,6 @@ namespace VMAP std::vector vertexArray; class WmoLiquid* liquid; - GroupModel_Raw() : liquid(nullptr) { } ~GroupModel_Raw(); diff --git a/src/common/Collision/Models/GameObjectModel.h b/src/common/Collision/Models/GameObjectModel.h index 61182442d..a0d977039 100644 --- a/src/common/Collision/Models/GameObjectModel.h +++ b/src/common/Collision/Models/GameObjectModel.h @@ -34,7 +34,6 @@ class GameObjectModel /*, public Intersectable*/ VMAP::WorldModel* iModel; GameObject const* owner; - GameObjectModel() : iModel(nullptr), owner(nullptr) { } bool initialize(const GameObject& go, const GameObjectDisplayInfoEntry& info); diff --git a/src/common/Collision/RegularGrid.h b/src/common/Collision/RegularGrid.h index 0477c694e..331c4756d 100644 --- a/src/common/Collision/RegularGrid.h +++ b/src/common/Collision/RegularGrid.h @@ -1,7 +1,6 @@ #ifndef _REGULAR_GRID_H #define _REGULAR_GRID_H - #include #include #include @@ -143,7 +142,6 @@ public: bool isValid() const { return x >= 0 && x < CELL_NUMBER && y >= 0 && y < CELL_NUMBER;} }; - Node& getGridFor(float fx, float fy) { Cell c = Cell::ComputeCell(fx, fy); diff --git a/src/common/Common.cpp b/src/common/Common.cpp index d11755406..1d092f407 100644 --- a/src/common/Common.cpp +++ b/src/common/Common.cpp @@ -35,4 +35,3 @@ void CleanStringForMysqlQuery(std::string& str) while ((n = str.find('"')) != str.npos) str.erase(n, 1); while ((n = str.find('\'')) != str.npos) str.erase(n, 1); } - diff --git a/src/common/Cryptography/Authentication/AuthCrypt.cpp b/src/common/Cryptography/Authentication/AuthCrypt.cpp index 669ae20ca..d88f71087 100644 --- a/src/common/Cryptography/Authentication/AuthCrypt.cpp +++ b/src/common/Cryptography/Authentication/AuthCrypt.cpp @@ -58,4 +58,3 @@ void AuthCrypt::EncryptSend(uint8* data, size_t len) _serverEncrypt.UpdateData(len, data); } - diff --git a/src/common/Cryptography/BigNumber.cpp b/src/common/Cryptography/BigNumber.cpp index a60168c14..53e3f5601 100644 --- a/src/common/Cryptography/BigNumber.cpp +++ b/src/common/Cryptography/BigNumber.cpp @@ -4,7 +4,6 @@ * Copyright (C) 2005-2009 MaNGOS */ - #include "Cryptography/BigNumber.h" #include #include @@ -186,4 +185,3 @@ char* BigNumber::AsDecStr() const { return BN_bn2dec(_bn); } - diff --git a/src/common/Cryptography/BigNumber.h b/src/common/Cryptography/BigNumber.h index 75698bffb..bd9dd589f 100644 --- a/src/common/Cryptography/BigNumber.h +++ b/src/common/Cryptography/BigNumber.h @@ -88,4 +88,3 @@ private: }; #endif - diff --git a/src/common/Cryptography/HMACSHA1.h b/src/common/Cryptography/HMACSHA1.h index 5be49a63d..e1da965ed 100644 --- a/src/common/Cryptography/HMACSHA1.h +++ b/src/common/Cryptography/HMACSHA1.h @@ -32,4 +32,3 @@ private: uint8 m_digest[SHA_DIGEST_LENGTH]; }; #endif - diff --git a/src/common/Cryptography/SHA1.cpp b/src/common/Cryptography/SHA1.cpp index 6e80d9fd0..fffd031e4 100644 --- a/src/common/Cryptography/SHA1.cpp +++ b/src/common/Cryptography/SHA1.cpp @@ -53,4 +53,3 @@ void SHA1Hash::Finalize(void) { SHA1_Final(mDigest, &mC); } - diff --git a/src/common/Cryptography/SHA1.h b/src/common/Cryptography/SHA1.h index a641115cb..8ec38fecf 100644 --- a/src/common/Cryptography/SHA1.h +++ b/src/common/Cryptography/SHA1.h @@ -35,4 +35,3 @@ private: uint8 mDigest[SHA_DIGEST_LENGTH]; }; #endif - diff --git a/src/common/Database/DatabaseEnv.h b/src/common/Database/DatabaseEnv.h index 04d655c0b..864a9dc0d 100644 --- a/src/common/Database/DatabaseEnv.h +++ b/src/common/Database/DatabaseEnv.h @@ -31,4 +31,3 @@ extern CharacterDatabaseWorkerPool CharacterDatabase; extern LoginDatabaseWorkerPool LoginDatabase; #endif - diff --git a/src/common/Database/Field.h b/src/common/Database/Field.h index 4b837ff34..9d4431a04 100644 --- a/src/common/Database/Field.h +++ b/src/common/Database/Field.h @@ -410,4 +410,3 @@ private: }; #endif - diff --git a/src/common/Database/PreparedStatement.cpp b/src/common/Database/PreparedStatement.cpp index f70b024de..d453cbf2d 100644 --- a/src/common/Database/PreparedStatement.cpp +++ b/src/common/Database/PreparedStatement.cpp @@ -451,7 +451,6 @@ PreparedStatementTask::PreparedStatementTask(PreparedStatement* stmt, PreparedQu { } - PreparedStatementTask::~PreparedStatementTask() { delete m_stmt; diff --git a/src/common/Database/QueryResult.h b/src/common/Database/QueryResult.h index 6a6b8cbc6..a929dd898 100644 --- a/src/common/Database/QueryResult.h +++ b/src/common/Database/QueryResult.h @@ -99,4 +99,3 @@ private: typedef std::shared_ptr PreparedQueryResult; #endif - diff --git a/src/common/Debugging/WheatyExceptionReport.cpp b/src/common/Debugging/WheatyExceptionReport.cpp index 40440c35a..3ed72c5b5 100644 --- a/src/common/Debugging/WheatyExceptionReport.cpp +++ b/src/common/Debugging/WheatyExceptionReport.cpp @@ -70,7 +70,6 @@ bool WheatyExceptionReport::alreadyCrashed; std::mutex WheatyExceptionReport::alreadyCrashedLock; WheatyExceptionReport::pRtlGetVersion WheatyExceptionReport::RtlGetVersion; - // Declare global instance of class WheatyExceptionReport g_WheatyExceptionReport; @@ -1230,7 +1229,6 @@ void WheatyExceptionReport::DumpTypeIndex( dataKind == DataIsStaticMember) continue; - symbolDetails.top().HasChildren = true; if (!logChildren) { diff --git a/src/common/Dynamic/LinkedList.h b/src/common/Dynamic/LinkedList.h index 717c59ec6..21d64bb84 100644 --- a/src/common/Dynamic/LinkedList.h +++ b/src/common/Dynamic/LinkedList.h @@ -75,7 +75,7 @@ private: LinkedListElement iLast; uint32 iSize{0}; public: - LinkedListHead() + LinkedListHead() { // create empty list diff --git a/src/common/Dynamic/LinkedReference/RefManager.h b/src/common/Dynamic/LinkedReference/RefManager.h index 27040c59c..674980936 100644 --- a/src/common/Dynamic/LinkedReference/RefManager.h +++ b/src/common/Dynamic/LinkedReference/RefManager.h @@ -41,4 +41,3 @@ public: //===================================================== #endif - diff --git a/src/common/Dynamic/TypeContainer.h b/src/common/Dynamic/TypeContainer.h index a54f958a7..1f99c9b41 100644 --- a/src/common/Dynamic/TypeContainer.h +++ b/src/common/Dynamic/TypeContainer.h @@ -109,4 +109,3 @@ private: ContainerMapList i_elements; }; #endif - diff --git a/src/common/Dynamic/TypeContainerFunctions.h b/src/common/Dynamic/TypeContainerFunctions.h index 59dd84014..d885aa774 100644 --- a/src/common/Dynamic/TypeContainerFunctions.h +++ b/src/common/Dynamic/TypeContainerFunctions.h @@ -98,4 +98,3 @@ namespace acore //} } #endif - diff --git a/src/common/Dynamic/TypeContainerFunctionsPtr.h b/src/common/Dynamic/TypeContainerFunctionsPtr.h index a0722d507..d785a95b8 100644 --- a/src/common/Dynamic/TypeContainerFunctionsPtr.h +++ b/src/common/Dynamic/TypeContainerFunctionsPtr.h @@ -153,4 +153,3 @@ namespace acore } #endif - diff --git a/src/common/Dynamic/TypeContainerVisitor.h b/src/common/Dynamic/TypeContainerVisitor.h index 0c4fc850d..cc6df825a 100644 --- a/src/common/Dynamic/TypeContainerVisitor.h +++ b/src/common/Dynamic/TypeContainerVisitor.h @@ -96,4 +96,3 @@ private: VISITOR& i_visitor; }; #endif - diff --git a/src/common/Dynamic/TypeList.h b/src/common/Dynamic/TypeList.h index 16148ba58..fc8a242b3 100644 --- a/src/common/Dynamic/TypeList.h +++ b/src/common/Dynamic/TypeList.h @@ -29,4 +29,3 @@ struct TypeList #define TYPELIST_4(T1, T2, T3, T4) TypeList #define TYPELIST_5(T1, T2, T3, T4, T5) TypeList #endif - diff --git a/src/common/Logging/ILog.h b/src/common/Logging/ILog.h index 0b0a3b383..62ee0289b 100644 --- a/src/common/Logging/ILog.h +++ b/src/common/Logging/ILog.h @@ -127,5 +127,4 @@ public: virtual bool GetSQLDriverQueryLogging() const = 0; }; - #endif //AZEROTHCORE_ILOG_H diff --git a/src/common/Logging/Log.cpp b/src/common/Logging/Log.cpp index b8923f7a9..d1598d5fc 100644 --- a/src/common/Logging/Log.cpp +++ b/src/common/Logging/Log.cpp @@ -64,7 +64,6 @@ Log::~Log() miscLogFile = NULL; } - std::unique_ptr& getLogInstance() { static std::unique_ptr instance = std::make_unique(); diff --git a/src/common/Logging/Log.h b/src/common/Logging/Log.h index a94038efe..a5f770fa7 100644 --- a/src/common/Logging/Log.h +++ b/src/common/Logging/Log.h @@ -118,4 +118,3 @@ std::unique_ptr& getLogInstance(); #define sLog getLogInstance() #endif - diff --git a/src/common/Packets/ByteBuffer.h b/src/common/Packets/ByteBuffer.h index c58dc3231..639df87c3 100644 --- a/src/common/Packets/ByteBuffer.h +++ b/src/common/Packets/ByteBuffer.h @@ -53,7 +53,7 @@ public: const static size_t DEFAULT_SIZE = 0x1000; // constructor - ByteBuffer() + ByteBuffer() { _storage.reserve(DEFAULT_SIZE); } diff --git a/src/common/Packets/WorldPacket.h b/src/common/Packets/WorldPacket.h index 817083cd1..194a26721 100644 --- a/src/common/Packets/WorldPacket.h +++ b/src/common/Packets/WorldPacket.h @@ -14,7 +14,7 @@ class WorldPacket : public ByteBuffer { public: // just container for later use - WorldPacket() : ByteBuffer(0) + WorldPacket() : ByteBuffer(0) { } explicit WorldPacket(uint16 opcode, size_t res = 200) : ByteBuffer(res), m_opcode(opcode) { } diff --git a/src/common/Threading/LockedQueue.h b/src/common/Threading/LockedQueue.h index 92c7443ad..f74a6303a 100644 --- a/src/common/Threading/LockedQueue.h +++ b/src/common/Threading/LockedQueue.h @@ -31,7 +31,7 @@ namespace ACE_Based //! Create a LockedQueue. LockedQueue() - + { } diff --git a/src/common/Threading/Threading.cpp b/src/common/Threading/Threading.cpp index 0476faa8d..3406f8f30 100644 --- a/src/common/Threading/Threading.cpp +++ b/src/common/Threading/Threading.cpp @@ -117,7 +117,6 @@ void Thread::setPriority(Priority priority) break; } - // remove this ASSERT in case you don't want to know is thread priority change was successful or not ASSERT(_ok); } diff --git a/src/common/Utilities/ByteConverter.h b/src/common/Utilities/ByteConverter.h index 5b5086b1a..936b869f2 100644 --- a/src/common/Utilities/ByteConverter.h +++ b/src/common/Utilities/ByteConverter.h @@ -53,4 +53,3 @@ inline void EndianConvertReverse(uint8&) { } inline void EndianConvertReverse( int8&) { } #endif - diff --git a/src/common/Utilities/Optional.h b/src/common/Utilities/Optional.h index fc5b6e851..c219f2050 100644 --- a/src/common/Utilities/Optional.h +++ b/src/common/Utilities/Optional.h @@ -1,6 +1,6 @@ /* * Copyright (C) 2016+ AzerothCore , released under GNU GPL v2 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-GPL2 - * Copyright (C) 2008-2016 TrinityCore + * Copyright (C) 2008-2016 TrinityCore */ #ifndef ACORE_OPTIONAL_H diff --git a/src/common/Utilities/ServiceWin32.cpp b/src/common/Utilities/ServiceWin32.cpp index 61b981bb0..4d5c1c274 100644 --- a/src/common/Utilities/ServiceWin32.cpp +++ b/src/common/Utilities/ServiceWin32.cpp @@ -249,4 +249,3 @@ bool WinServiceRun() return true; } #endif - diff --git a/src/common/Utilities/ServiceWin32.h b/src/common/Utilities/ServiceWin32.h index 1cb538411..c5f725a8d 100644 --- a/src/common/Utilities/ServiceWin32.h +++ b/src/common/Utilities/ServiceWin32.h @@ -14,4 +14,3 @@ bool WinServiceRun(); #endif // _WIN32_SERVICE_ #endif // _WIN32 - diff --git a/src/common/Utilities/Timer.h b/src/common/Utilities/Timer.h index 3aa3e52d5..b8e18252f 100644 --- a/src/common/Utilities/Timer.h +++ b/src/common/Utilities/Timer.h @@ -53,7 +53,7 @@ struct IntervalTimer public: IntervalTimer() - + { } diff --git a/src/server/authserver/Main.cpp b/src/server/authserver/Main.cpp index 967b1d07d..32799c76a 100644 --- a/src/server/authserver/Main.cpp +++ b/src/server/authserver/Main.cpp @@ -113,7 +113,7 @@ extern int main(int argc, char** argv) sLog->outString(" ╚██████╗╚██████╔╝██║ ██║███████╗"); sLog->outString(" ╚═════╝ ╚═════╝ ╚═╝ ╚═╝╚══════╝\n"); - sLog->outString(" AzerothCore 3.3.5a - www.azerothcore.org\n"); + sLog->outString(" AzerothCore 3.3.5a - www.azerothcore.org\n"); sLog->outString("Using configuration file %s.", configFile); diff --git a/src/server/authserver/Server/AuthSocket.cpp b/src/server/authserver/Server/AuthSocket.cpp index 353907d52..156a28a13 100644 --- a/src/server/authserver/Server/AuthSocket.cpp +++ b/src/server/authserver/Server/AuthSocket.cpp @@ -580,7 +580,6 @@ bool AuthSocket::_HandleLogonChallenge() for (int i = 0; i < 4; ++i) _localizationName[i] = ch->country[4 - i - 1]; - #if defined(ENABLE_EXTRAS) && defined(ENABLE_EXTRA_LOGS) sLog->outDebug( LOG_FILTER_NETWORKIO, "'%s:%d' [AuthChallenge] account %s is using '%c%c%c%c' locale (%u)", socket().getRemoteAddress().c_str(), socket().getRemotePort(), _login.c_str (), ch->country[3], ch->country[2], ch->country[1], ch->country[0], GetLocaleByName(_localizationName) ); #endif diff --git a/src/server/authserver/authserver.conf.dist b/src/server/authserver/authserver.conf.dist index 5e79d5e2e..1ef4263c9 100644 --- a/src/server/authserver/authserver.conf.dist +++ b/src/server/authserver/authserver.conf.dist @@ -242,7 +242,6 @@ WrongPass.BanType = 0 WrongPass.Logging = 0 - # ################################################################################################### diff --git a/src/server/game/AI/CoreAI/CombatAI.h b/src/server/game/AI/CoreAI/CombatAI.h index 1b896b816..3b5ab21e8 100644 --- a/src/server/game/AI/CoreAI/CombatAI.h +++ b/src/server/game/AI/CoreAI/CombatAI.h @@ -61,7 +61,6 @@ public: void AttackStart(Unit* who) override; void UpdateAI(uint32 diff) override; - static int Permissible(Creature const* /*creature*/) { return PERMIT_BASE_NO; } protected: diff --git a/src/server/game/AI/CoreAI/PassiveAI.h b/src/server/game/AI/CoreAI/PassiveAI.h index dd5b4f416..964d53d8f 100644 --- a/src/server/game/AI/CoreAI/PassiveAI.h +++ b/src/server/game/AI/CoreAI/PassiveAI.h @@ -74,4 +74,3 @@ public: }; #endif - diff --git a/src/server/game/AI/CoreAI/TotemAI.h b/src/server/game/AI/CoreAI/TotemAI.h index d233683bf..7e6c9dd3a 100644 --- a/src/server/game/AI/CoreAI/TotemAI.h +++ b/src/server/game/AI/CoreAI/TotemAI.h @@ -47,4 +47,3 @@ protected: }; #endif - diff --git a/src/server/game/AI/CoreAI/UnitAI.cpp b/src/server/game/AI/CoreAI/UnitAI.cpp index 56a119b4c..884fa2ffd 100644 --- a/src/server/game/AI/CoreAI/UnitAI.cpp +++ b/src/server/game/AI/CoreAI/UnitAI.cpp @@ -296,7 +296,6 @@ bool SpellTargetSelector::operator()(Unit const* target) const float max_range = _caster->GetSpellMaxRangeForTarget(target, _spellInfo); float min_range = _caster->GetSpellMinRangeForTarget(target, _spellInfo); - if (target && target != _caster) { if (range_type == SPELL_RANGE_MELEE) diff --git a/src/server/game/AI/CoreAI/UnitAI.h b/src/server/game/AI/CoreAI/UnitAI.h index 266546001..9b6ca0f64 100644 --- a/src/server/game/AI/CoreAI/UnitAI.h +++ b/src/server/game/AI/CoreAI/UnitAI.h @@ -111,7 +111,6 @@ struct PowerUsersSelector : public acore::unary_function float const _dist; bool const _playerOnly; - PowerUsersSelector(Unit const* unit, Powers power, float dist, bool playerOnly) : _me(unit), _power(power), _dist(dist), _playerOnly(playerOnly) { } bool operator()(Unit const* target) const diff --git a/src/server/game/AI/CreatureAIImpl.h b/src/server/game/AI/CreatureAIImpl.h index aa0ea152a..5bb947d94 100644 --- a/src/server/game/AI/CreatureAIImpl.h +++ b/src/server/game/AI/CreatureAIImpl.h @@ -55,4 +55,3 @@ struct AISpellInfoType AISpellInfoType* GetAISpellInfo(uint32 i); #endif - diff --git a/src/server/game/AI/CreatureAIRegistry.cpp b/src/server/game/AI/CreatureAIRegistry.cpp index b30e068b0..ddb3fa174 100644 --- a/src/server/game/AI/CreatureAIRegistry.cpp +++ b/src/server/game/AI/CreatureAIRegistry.cpp @@ -44,4 +44,3 @@ namespace AIRegistry (new MovementGeneratorFactory >(WAYPOINT_MOTION_TYPE))->RegisterSelf(); } } - diff --git a/src/server/game/AI/CreatureAIRegistry.h b/src/server/game/AI/CreatureAIRegistry.h index fe403a5e5..ea393bd7e 100644 --- a/src/server/game/AI/CreatureAIRegistry.h +++ b/src/server/game/AI/CreatureAIRegistry.h @@ -12,4 +12,3 @@ namespace AIRegistry void Initialize(void); } #endif - diff --git a/src/server/game/AI/CreatureAISelector.cpp b/src/server/game/AI/CreatureAISelector.cpp index 4785222c0..3f3de228c 100644 --- a/src/server/game/AI/CreatureAISelector.cpp +++ b/src/server/game/AI/CreatureAISelector.cpp @@ -139,4 +139,3 @@ namespace FactorySelector return (ai_factory == NULL ? new NullGameObjectAI(go) : ai_factory->Create(go)); } } - diff --git a/src/server/game/AI/CreatureAISelector.h b/src/server/game/AI/CreatureAISelector.h index 88eee68f7..0aedbba06 100644 --- a/src/server/game/AI/CreatureAISelector.h +++ b/src/server/game/AI/CreatureAISelector.h @@ -20,4 +20,3 @@ namespace FactorySelector GameObjectAI* SelectGameObjectAI(GameObject*); } #endif - diff --git a/src/server/game/AI/ScriptedAI/ScriptedEscortAI.h b/src/server/game/AI/ScriptedAI/ScriptedEscortAI.h index 8283c6a0b..5afcfa299 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedEscortAI.h +++ b/src/server/game/AI/ScriptedAI/ScriptedEscortAI.h @@ -126,4 +126,3 @@ private: bool HasImmuneToNPCFlags; }; #endif - diff --git a/src/server/game/AI/SmartScripts/SmartAI.cpp b/src/server/game/AI/SmartScripts/SmartAI.cpp index 9462a531b..1134786ec 100644 --- a/src/server/game/AI/SmartScripts/SmartAI.cpp +++ b/src/server/game/AI/SmartScripts/SmartAI.cpp @@ -450,7 +450,6 @@ void SmartAI::UpdatePath(const uint32 diff) } } - void SmartAI::CheckConditions(const uint32 diff) { Vehicle* vehicle = me->GetVehicleKit(); diff --git a/src/server/game/Accounts/AccountMgr.cpp b/src/server/game/Accounts/AccountMgr.cpp index cce625b70..8ff8f38a3 100644 --- a/src/server/game/Accounts/AccountMgr.cpp +++ b/src/server/game/Accounts/AccountMgr.cpp @@ -121,7 +121,6 @@ namespace AccountMgr return AOR_OK; } - AccountOpResult ChangeUsername(uint32 accountId, std::string newUsername, std::string newPassword) { // Check if accounts exists diff --git a/src/server/game/Achievements/AchievementMgr.h b/src/server/game/Achievements/AchievementMgr.h index b4828b203..90455985e 100644 --- a/src/server/game/Achievements/AchievementMgr.h +++ b/src/server/game/Achievements/AchievementMgr.h @@ -186,7 +186,7 @@ struct AchievementCriteriaData }; uint32 ScriptId; - AchievementCriteriaData() + AchievementCriteriaData() { raw.value1 = 0; raw.value2 = 0; diff --git a/src/server/game/Addons/AddonMgr.h b/src/server/game/Addons/AddonMgr.h index 9c324d822..8b13edd68 100644 --- a/src/server/game/Addons/AddonMgr.h +++ b/src/server/game/Addons/AddonMgr.h @@ -56,4 +56,3 @@ namespace AddonMgr } #endif - diff --git a/src/server/game/Battlefield/Battlefield.cpp b/src/server/game/Battlefield/Battlefield.cpp index 38bd656c6..f8436cf8c 100644 --- a/src/server/game/Battlefield/Battlefield.cpp +++ b/src/server/game/Battlefield/Battlefield.cpp @@ -189,7 +189,6 @@ bool Battlefield::Update(uint32 diff) objective_changed = true; } - if (m_LastResurectTimer <= diff) { for (uint8 i = 0; i < m_GraveyardList.size(); i++) diff --git a/src/server/game/Battlefield/Battlefield.h b/src/server/game/Battlefield/Battlefield.h index 28cd415bb..66a6c1089 100644 --- a/src/server/game/Battlefield/Battlefield.h +++ b/src/server/game/Battlefield/Battlefield.h @@ -49,7 +49,6 @@ enum BattlefieldTimers BATTLEFIELD_OBJECTIVE_UPDATE_INTERVAL = 1000 }; - const uint32 BattlefieldFactions[BG_TEAMS_COUNT] = { 1732, // Alliance diff --git a/src/server/game/Battlefield/Zones/BattlefieldWG.cpp b/src/server/game/Battlefield/Zones/BattlefieldWG.cpp index c6eaeae39..e76fc83b3 100644 --- a/src/server/game/Battlefield/Zones/BattlefieldWG.cpp +++ b/src/server/game/Battlefield/Zones/BattlefieldWG.cpp @@ -96,7 +96,6 @@ bool BattlefieldWG::SetupBattlefield() m_GraveyardList[i] = graveyard; } - // Spawn workshop creatures and gameobjects for (uint8 i = 0; i < WG_MAX_WORKSHOP; i++) { @@ -223,7 +222,6 @@ void BattlefieldWG::OnBattleStart() else sLog->outError("WG: Failed to spawn titan relic."); - // Update tower visibility and update faction for (GuidSet::const_iterator itr = CanonList.begin(); itr != CanonList.end(); ++itr) { diff --git a/src/server/game/Battlefield/Zones/BattlefieldWG.h b/src/server/game/Battlefield/Zones/BattlefieldWG.h index a2305e1cd..bbcd324cc 100644 --- a/src/server/game/Battlefield/Zones/BattlefieldWG.h +++ b/src/server/game/Battlefield/Zones/BattlefieldWG.h @@ -25,14 +25,12 @@ typedef std::set Workshop; typedef std::set GroupSet; //typedef std::set CapturePointSet; unused ? - const uint32 VehNumWorldState[2] = { 3680, 3490 }; const uint32 MaxVehNumWorldState[2] = { 3681, 3491 }; const uint32 ClockWorldState[2] = { 3781, 4354 }; const uint32 WintergraspFaction[3] = { 1, 2, 35 }; float const WintergraspStalkerPos[4] = { 4948.985f, 2937.789f, 550.5172f, 1.815142f }; - enum WintergraspSpells { // Wartime auras diff --git a/src/server/game/Battlegrounds/ArenaTeam.h b/src/server/game/Battlegrounds/ArenaTeam.h index 00d7a6afd..744f1d889 100644 --- a/src/server/game/Battlegrounds/ArenaTeam.h +++ b/src/server/game/Battlegrounds/ArenaTeam.h @@ -191,4 +191,3 @@ protected: ArenaTeamStats Stats; }; #endif - diff --git a/src/server/game/Battlegrounds/ArenaTeamMgr.cpp b/src/server/game/Battlegrounds/ArenaTeamMgr.cpp index 3a8eda017..994acc135 100644 --- a/src/server/game/Battlegrounds/ArenaTeamMgr.cpp +++ b/src/server/game/Battlegrounds/ArenaTeamMgr.cpp @@ -58,7 +58,6 @@ ArenaTeam* ArenaTeamMgr::GetArenaTeamByName(const std::string& arenaTeamName) co return nullptr; } - ArenaTeam* ArenaTeamMgr::GetArenaTeamByName(std::string const& arenaTeamName, const uint32 type) const { std::string search = arenaTeamName; @@ -91,7 +90,6 @@ ArenaTeam* ArenaTeamMgr::GetArenaTeamByCaptain(uint64 guid) const return nullptr; } - ArenaTeam* ArenaTeamMgr::GetArenaTeamByCaptain(uint64 guid, const uint32 type) const { for (ArenaTeamContainer::const_iterator itr = ArenaTeamStore.begin(); itr != ArenaTeamStore.end(); ++itr) diff --git a/src/server/game/Battlegrounds/Battleground.cpp b/src/server/game/Battlegrounds/Battleground.cpp index 02b00904d..445464d1f 100644 --- a/src/server/game/Battlegrounds/Battleground.cpp +++ b/src/server/game/Battlegrounds/Battleground.cpp @@ -714,7 +714,6 @@ uint32 Battleground::GetRealRepFactionForPlayer(uint32 factionId, Player* player return factionId; } - void Battleground::UpdateWorldState(uint32 Field, uint32 Value) { WorldPacket data; diff --git a/src/server/game/Battlegrounds/BattlegroundQueue.cpp b/src/server/game/Battlegrounds/BattlegroundQueue.cpp index 140bb8d48..c9c4cd53e 100644 --- a/src/server/game/Battlegrounds/BattlegroundQueue.cpp +++ b/src/server/game/Battlegrounds/BattlegroundQueue.cpp @@ -384,7 +384,6 @@ void BattlegroundQueue::FillPlayersToBG(Battleground* bg, const int32 aliFree, c auto Ali_itr = m_QueuedGroups[bracket_id][BG_QUEUE_NORMAL_ALLIANCE].begin(); for (; Ali_itr != m_QueuedGroups[bracket_id][BG_QUEUE_NORMAL_ALLIANCE].end() && m_SelectionPools[TEAM_ALLIANCE].AddGroup((*Ali_itr), aliFree); ++Ali_itr); - // horde: at first fill as much as possible auto Horde_itr = m_QueuedGroups[bracket_id][BG_QUEUE_NORMAL_HORDE].begin(); for (; Horde_itr != m_QueuedGroups[bracket_id][BG_QUEUE_NORMAL_HORDE].end() && m_SelectionPools[TEAM_HORDE].AddGroup((*Horde_itr), hordeFree); ++Horde_itr); diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundAB.h b/src/server/game/Battlegrounds/Zones/BattlegroundAB.h index 7b49ff0f7..2e268beb8 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundAB.h +++ b/src/server/game/Battlegrounds/Zones/BattlegroundAB.h @@ -277,4 +277,3 @@ private: bool _teamScores500Disadvantage[BG_TEAMS_COUNT] {}; }; #endif - diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundEY.h b/src/server/game/Battlegrounds/Zones/BattlegroundEY.h index 754a497d8..58c1785df 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundEY.h +++ b/src/server/game/Battlegrounds/Zones/BattlegroundEY.h @@ -396,4 +396,3 @@ private: uint32 _flagCapturedObject; }; #endif - diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp index aaa3caf4d..702ac4998 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp @@ -795,7 +795,6 @@ GraveyardStruct const* BattlegroundSA::GetClosestGraveyard(Player* player) if (!closest && GraveyardStatus[BG_SA_BEACH_GY] == player->GetTeamId()) return sGraveyard->GetGraveyard(BG_SA_GYEntries[BG_SA_BEACH_GY]); - return closest; } diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundWS.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundWS.cpp index ff335f5b4..665f5eaa3 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundWS.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundWS.cpp @@ -405,7 +405,6 @@ bool BattlegroundWS::SetupBattleground() AddObject(BG_WS_OBJECT_DOOR_H_3, BG_OBJECT_DOOR_H_3_WS_ENTRY, 949.9523f, 1422.751f, 344.9273f, 0.0f, 0, 0, 0, 1, RESPAWN_IMMEDIATELY); AddObject(BG_WS_OBJECT_DOOR_H_4, BG_OBJECT_DOOR_H_4_WS_ENTRY, 950.7952f, 1459.583f, 342.1523f, 0.05235988f, 0, 0, 0.02617695f, 0.9996573f, RESPAWN_IMMEDIATELY); - GraveyardStruct const* sg = sGraveyard->GetGraveyard(WS_GRAVEYARD_MAIN_ALLIANCE); AddSpiritGuide(WS_SPIRIT_MAIN_ALLIANCE, sg->x, sg->y, sg->z, 3.124139f, TEAM_ALLIANCE); diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundWS.h b/src/server/game/Battlegrounds/Zones/BattlegroundWS.h index ef0a1f792..cb7905521 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundWS.h +++ b/src/server/game/Battlegrounds/Zones/BattlegroundWS.h @@ -127,7 +127,6 @@ enum BG_WS_CreatureTypes BG_CREATURES_MAX_WS = 2 }; - enum BG_WS_Objectives { WS_OBJECTIVE_CAPTURE_FLAG = 42, diff --git a/src/server/game/Chat/Channels/Channel.h b/src/server/game/Chat/Channels/Channel.h index 9312d9534..c611d353e 100644 --- a/src/server/game/Chat/Channels/Channel.h +++ b/src/server/game/Chat/Channels/Channel.h @@ -333,4 +333,3 @@ private: PlayersWatchingContainer playersWatchingStore; }; #endif - diff --git a/src/server/game/Chat/Channels/ChannelMgr.cpp b/src/server/game/Chat/Channels/ChannelMgr.cpp index 4c8c847cf..871c59ea3 100644 --- a/src/server/game/Chat/Channels/ChannelMgr.cpp +++ b/src/server/game/Chat/Channels/ChannelMgr.cpp @@ -124,7 +124,6 @@ Channel* ChannelMgr::GetChannel(std::string const& name, Player* player, bool pk return i->second; } - uint32 ChannelMgr::_channelIdMax = 0; ChannelMgr::ChannelRightsMap ChannelMgr::channels_rights; ChannelRights ChannelMgr::channelRightsEmpty; diff --git a/src/server/game/Chat/ChatLink.h b/src/server/game/Chat/ChatLink.h index c9c8def72..0dff0d8cf 100644 --- a/src/server/game/Chat/ChatLink.h +++ b/src/server/game/Chat/ChatLink.h @@ -161,5 +161,4 @@ private: std::istringstream _iss; }; - #endif diff --git a/src/server/game/Combat/HostileRefManager.h b/src/server/game/Combat/HostileRefManager.h index 8a12b67c8..8789322e4 100644 --- a/src/server/game/Combat/HostileRefManager.h +++ b/src/server/game/Combat/HostileRefManager.h @@ -62,4 +62,3 @@ public: }; //================================================= #endif - diff --git a/src/server/game/Combat/UnitEvents.h b/src/server/game/Combat/UnitEvents.h index 739becae8..a1dc4f92b 100644 --- a/src/server/game/Combat/UnitEvents.h +++ b/src/server/game/Combat/UnitEvents.h @@ -122,4 +122,3 @@ public: //============================================================== #endif - diff --git a/src/server/game/DataStores/DBCStores.cpp b/src/server/game/DataStores/DBCStores.cpp index 0ab7daf2e..c78e7bf87 100644 --- a/src/server/game/DataStores/DBCStores.cpp +++ b/src/server/game/DataStores/DBCStores.cpp @@ -464,8 +464,6 @@ void LoadDBCStores(const std::string& dataPath) if (TaxiPathEntry const* entry = sTaxiPathStore.LookupEntry(i)) sTaxiPathSetBySource[entry->from][entry->to] = TaxiPathBySourceAndDestination(entry->ID, entry->price); - - // Calculate path nodes count uint32 pathCount = sTaxiPathStore.GetNumRows(); std::vector pathLength; diff --git a/src/server/game/DungeonFinding/LFG.cpp b/src/server/game/DungeonFinding/LFG.cpp index 2419b9738..f3bcc7aa9 100644 --- a/src/server/game/DungeonFinding/LFG.cpp +++ b/src/server/game/DungeonFinding/LFG.cpp @@ -95,4 +95,3 @@ namespace lfg } } // namespace lfg - diff --git a/src/server/game/DungeonFinding/LFG.h b/src/server/game/DungeonFinding/LFG.h index 18e6e7edb..dc093faee 100644 --- a/src/server/game/DungeonFinding/LFG.h +++ b/src/server/game/DungeonFinding/LFG.h @@ -188,7 +188,6 @@ namespace lfg guid[2] = guid[1]; } - guid[1] = guid[0]; guid[0] = g; @@ -479,7 +478,6 @@ namespace lfg std::string GetRolesString(uint8 roles); std::string GetStateString(LfgState state); - } // namespace lfg #endif diff --git a/src/server/game/DungeonFinding/LFGMgr.cpp b/src/server/game/DungeonFinding/LFGMgr.cpp index 3ed818450..14de600b3 100644 --- a/src/server/game/DungeonFinding/LFGMgr.cpp +++ b/src/server/game/DungeonFinding/LFGMgr.cpp @@ -424,7 +424,6 @@ namespace lfg lockData = LFG_LOCKSTATUS_MISSING_ITEM; } - sScriptMgr->OnInitializeLockedDungeons(player, level, lockData); /* TODO VoA closed if WG is not under team control (LFG_LOCKSTATUS_RAID_LOCKED) diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index b2f2dfc16..7169232a0 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -615,7 +615,6 @@ void Creature::Update(uint32 diff) m_moveBackwardsMovementTime = MOVE_BACKWARDS_CHECK_INTERVAL; } - if (!IsInEvadeMode() && IsAIEnabled) { // do not allow the AI to be changed during update @@ -791,7 +790,6 @@ void Creature::RegenerateHealth() addvalue = uint32(Spirit * 0.80 * HealthIncreaseRate); } - // Apply modifiers (if any). AuraEffectList const& ModPowerRegenPCTAuras = GetAuraEffectsByType(SPELL_AURA_MOD_HEALTH_REGEN_PERCENT); for (AuraEffectList::const_iterator i = ModPowerRegenPCTAuras.begin(); i != ModPowerRegenPCTAuras.end(); ++i) @@ -1364,7 +1362,6 @@ bool Creature::CreateFromProto(uint32 guidlow, uint32 Entry, uint32 vehId, const else CreateVehicleKit(vehId, Entry); - if (!UpdateEntry(Entry, data)) return false; diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp index a4f82ab1b..aef9d2d93 100644 --- a/src/server/game/Entities/GameObject/GameObject.cpp +++ b/src/server/game/Entities/GameObject/GameObject.cpp @@ -1190,7 +1190,6 @@ GameObject* GameObject::LookupFishingHoleAround(float range) { GameObject* ok = nullptr; - CellCoord p(acore::ComputeCellCoord(GetPositionX(), GetPositionY())); Cell cell(p); acore::NearestGameObjectFishingHole u_check(*this, range); diff --git a/src/server/game/Entities/Item/Container/Bag.cpp b/src/server/game/Entities/Item/Container/Bag.cpp index d073758a7..4cca1bfb6 100644 --- a/src/server/game/Entities/Item/Container/Bag.cpp +++ b/src/server/game/Entities/Item/Container/Bag.cpp @@ -230,4 +230,3 @@ Item* Bag::GetItemByPos(uint8 slot) const return nullptr; } - diff --git a/src/server/game/Entities/Item/Container/Bag.h b/src/server/game/Entities/Item/Container/Bag.h index ced1bcbe2..385b13ab7 100644 --- a/src/server/game/Entities/Item/Container/Bag.h +++ b/src/server/game/Entities/Item/Container/Bag.h @@ -59,4 +59,3 @@ inline Item* NewItemOrBag(ItemTemplate const* proto) return (proto->InventoryType == INVTYPE_BAG) ? new Bag : new Item; } #endif - diff --git a/src/server/game/Entities/Item/ItemEnchantmentMgr.cpp b/src/server/game/Entities/Item/ItemEnchantmentMgr.cpp index 34bfcb46a..7d5a6809b 100644 --- a/src/server/game/Entities/Item/ItemEnchantmentMgr.cpp +++ b/src/server/game/Entities/Item/ItemEnchantmentMgr.cpp @@ -188,4 +188,3 @@ uint32 GenerateEnchSuffixFactor(uint32 item_id) } return 0; } - diff --git a/src/server/game/Entities/Item/ItemEnchantmentMgr.h b/src/server/game/Entities/Item/ItemEnchantmentMgr.h index 259bf0eb9..eae496475 100644 --- a/src/server/game/Entities/Item/ItemEnchantmentMgr.h +++ b/src/server/game/Entities/Item/ItemEnchantmentMgr.h @@ -13,4 +13,3 @@ void LoadRandomEnchantmentsTable(); uint32 GetItemEnchantMod(int32 entry); uint32 GenerateEnchSuffixFactor(uint32 item_id); #endif - diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp index a694983ef..7554a44d9 100644 --- a/src/server/game/Entities/Object/Object.cpp +++ b/src/server/game/Entities/Object/Object.cpp @@ -1845,7 +1845,6 @@ bool WorldObject::CanDetectStealthOf(WorldObject const* obj, bool checkAlert) co if (checkAlert) visibilityRange += (visibilityRange * 0.08f) + 1.5f; - Unit const* targetUnit = obj->ToUnit(); // If checking for alert, and creature's visibility range is greater than aggro distance, No alert @@ -2623,7 +2622,6 @@ void WorldObject::GetContactPoint(const WorldObject* obj, float& x, float& y, fl } } - void WorldObject::GetChargeContactPoint(const WorldObject* obj, float& x, float& y, float& z, float distance2d) const { // angle to face `obj` to `this` using distance includes size of `obj` @@ -2985,7 +2983,6 @@ void WorldObject::PlayDirectSound(uint32 sound_id, Player* target /*= NULL*/) SendMessageToSet(&data, true); } - void WorldObject::PlayDirectMusic(uint32 music_id, Player* target /*= NULL*/) { WorldPacket data(SMSG_PLAY_MUSIC, 4); diff --git a/src/server/game/Entities/Object/Object.h b/src/server/game/Entities/Object/Object.h index cf7ba2268..7d7a3bb03 100644 --- a/src/server/game/Entities/Object/Object.h +++ b/src/server/game/Entities/Object/Object.h @@ -485,7 +485,6 @@ struct Position [[nodiscard]] Position GetPosition() const { return *this; } - Position::PositionXYZStreamer PositionXYZStream() { return PositionXYZStreamer(*this); @@ -593,7 +592,6 @@ ByteBuffer& operator >> (ByteBuffer& buf, Position::PositionXYZStreamer const& s ByteBuffer& operator<<(ByteBuffer& buf, Position::PositionXYZOStreamer const& streamer); ByteBuffer& operator >> (ByteBuffer& buf, Position::PositionXYZOStreamer const& streamer); - struct MovementInfo { // common diff --git a/src/server/game/Entities/Object/Updates/UpdateData.cpp b/src/server/game/Entities/Object/Updates/UpdateData.cpp index e70459c4f..2258490ab 100644 --- a/src/server/game/Entities/Object/Updates/UpdateData.cpp +++ b/src/server/game/Entities/Object/Updates/UpdateData.cpp @@ -142,4 +142,3 @@ void UpdateData::Clear() m_outOfRangeGUIDs.clear(); m_blockCount = 0; } - diff --git a/src/server/game/Entities/Object/Updates/UpdateData.h b/src/server/game/Entities/Object/Updates/UpdateData.h index 50c9c506e..a77f84153 100644 --- a/src/server/game/Entities/Object/Updates/UpdateData.h +++ b/src/server/game/Entities/Object/Updates/UpdateData.h @@ -55,4 +55,3 @@ protected: void Compress(void* dst, uint32* dst_size, void* src, int src_size); }; #endif - diff --git a/src/server/game/Entities/Pet/Pet.cpp b/src/server/game/Entities/Pet/Pet.cpp index 40d1269ec..868327a95 100644 --- a/src/server/game/Entities/Pet/Pet.cpp +++ b/src/server/game/Entities/Pet/Pet.cpp @@ -2155,7 +2155,6 @@ void Pet::HandleAsynchLoadSucceed() if (spell->GetSpellInfo()->HasEffect(SPELL_EFFECT_SUMMON_PET)) CastSpell(this, 32752, true, nullptr, nullptr, GetGUID()); - if (owner->NeedSendSpectatorData() && GetCreatureTemplate()->family) { ArenaSpectator::SendCommand_UInt32Value(owner->FindMap(), owner->GetGUID(), "PHP", (uint32)GetHealthPct()); diff --git a/src/server/game/Entities/Pet/Pet.h b/src/server/game/Entities/Pet/Pet.h index cea9c8909..4cedc34e2 100644 --- a/src/server/game/Entities/Pet/Pet.h +++ b/src/server/game/Entities/Pet/Pet.h @@ -21,7 +21,6 @@ struct PetSpell PetSpellType type; }; - class AsynchPetSummon { public: diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 7bde02c25..b985f5303 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -7577,7 +7577,6 @@ uint32 Player::GetArenaTeamIdFromStorage(uint32 guid, uint8 slot) return 0; } - void Player::SetArenaTeamInfoField(uint8 slot, ArenaTeamInfoType type, uint32 value) { if (slot < MAX_ARENA_SLOT) @@ -8287,7 +8286,6 @@ void Player::_ApplyItemBonuses(ItemTemplate const* proto, uint8 slot, bool apply if (CanUseAttackType(attType)) _ApplyWeaponDamage(slot, proto, ssv, apply); - // Druids get feral AP bonus from weapon dps (also use DPS from ScalingStatValue) if (getClass() == CLASS_DRUID) { @@ -12645,7 +12643,6 @@ Item* Player::StoreNewItem(ItemPosCountVec const& dest, uint32 item, bool update UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_OWN_ITEM, item, count); pItem = StoreItem(dest, pItem, update); - if (allowedLooters.size() > 1 && pItem->GetTemplate()->GetMaxStackSize() == 1 && pItem->IsSoulBound()) { pItem->SetSoulboundTradeable(allowedLooters); @@ -19145,7 +19142,6 @@ void Player::_LoadMail() m->stationery = fields[12].GetUInt8(); m->mailTemplateId = fields[13].GetInt16(); - if (m->mailTemplateId && !sMailTemplateStore.LookupEntry(m->mailTemplateId)) { sLog->outError("Player::_LoadMail - Mail (%u) have not existed MailTemplateId (%u), remove at load", m->messageID, m->mailTemplateId); @@ -21638,7 +21634,6 @@ void Player::LeaveAllArenaTeams(uint64 guid) } while (result->NextRow()); } - uint32 Player::GetArenaTeamId(uint8 slot) const { uint32 rtVal = 0; @@ -21654,7 +21649,6 @@ uint32 Player::GetArenaTeamId(uint8 slot) const return rtVal; } - uint32 Player::GetArenaPersonalRating(uint8 slot) const { uint32 rtVal = 0; @@ -23224,7 +23218,6 @@ void Player::AddComboPoints(Unit* target, int8 count) else if (*comboPoints < 0) *comboPoints = 0; - SendComboPoints(); } @@ -24730,7 +24723,6 @@ void Player::UpdateUnderwaterState(Map* m, float x, float y, float z) _lastLiquid = nullptr; } - // All liquids type - check under water position if (liquid_status.type_flags & (MAP_LIQUID_TYPE_WATER | MAP_LIQUID_TYPE_OCEAN | MAP_LIQUID_TYPE_MAGMA | MAP_LIQUID_TYPE_SLIME)) { @@ -25568,7 +25560,6 @@ uint32 Player::GetPhaseMaskForSpawn() const if (!phase) phase = PHASEMASK_NORMAL; - // some aura phases include 1 normal map in addition to phase itself uint32 n_phase = phase & ~PHASEMASK_NORMAL; if (n_phase > 0) diff --git a/src/server/game/Entities/Player/SocialMgr.h b/src/server/game/Entities/Player/SocialMgr.h index 82d9765e7..df1bb65c0 100644 --- a/src/server/game/Entities/Player/SocialMgr.h +++ b/src/server/game/Entities/Player/SocialMgr.h @@ -116,7 +116,7 @@ class SocialMgr private: SocialMgr(); ~SocialMgr(); - + public: static SocialMgr* instance(); // Misc diff --git a/src/server/game/Entities/Totem/Totem.cpp b/src/server/game/Entities/Totem/Totem.cpp index 20ec5631a..c391dc797 100644 --- a/src/server/game/Entities/Totem/Totem.cpp +++ b/src/server/game/Entities/Totem/Totem.cpp @@ -70,7 +70,6 @@ void Totem::InitStats(uint32 duration) if (totemSpell->CalcCastTime()) // If spell has cast time -> its an active totem m_type = TOTEM_ACTIVE; - m_duration = duration; } diff --git a/src/server/game/Entities/Unit/StatSystem.cpp b/src/server/game/Entities/Unit/StatSystem.cpp index c9b0f5011..6d7fa2b54 100644 --- a/src/server/game/Entities/Unit/StatSystem.cpp +++ b/src/server/game/Entities/Unit/StatSystem.cpp @@ -1101,8 +1101,6 @@ void Creature::CalculateMinMaxDamage(WeaponAttackType attType, bool normalized, ######## ######## #######################################*/ - - bool Guardian::UpdateStats(Stats stat) { if (stat >= MAX_STATS) diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 79d2caf56..a2c9445e6 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -1764,7 +1764,6 @@ float Unit::GetEffectiveResistChance(Unit const* owner, SpellSchoolMask schoolMa if (owner) victimResistance += std::max((float(victim->getLevel()) - float(owner->getLevel())) * 5.0f, 0.0f); - static uint32 const BOSS_LEVEL = 83; static float const BOSS_RESISTANCE_CONSTANT = 510.0f; uint32 level = victim->getLevel(); @@ -9056,7 +9055,6 @@ bool Unit::HandleProcTriggerSpell(Unit* victim, uint32 damage, AuraEffect* trigg } } - // Custom basepoints/target for exist spell // dummy basepoints or other customs switch (trigger_spell_id) @@ -9452,7 +9450,6 @@ bool Unit::HandleOverrideClassScriptAuraProc(Unit* victim, uint32 /*damage*/, Au return true; } - void Unit::setPowerType(Powers new_powertype) { SetByteValue(UNIT_FIELD_BYTES_0, 3, new_powertype); @@ -9565,7 +9562,6 @@ ReputationRank Unit::GetReactionTo(Unit const* target) const return *repRank; } - if (HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PVP_ATTACKABLE)) { if (target->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PVP_ATTACKABLE)) @@ -11154,7 +11150,6 @@ uint32 Unit::SpellDamageBonusTaken(Unit* caster, SpellInfo const* spellProto, ui if (spellProto->ValidateAttribute6SpellDamageMods(caster, *i, damagetype == DOT)) AddPct(TakenTotalMod, (*i)->GetAmount()); - // .. taken pct: dummy auras AuraEffectList const& mDummyAuras = GetAuraEffectsByType(SPELL_AURA_DUMMY); for (AuraEffectList::const_iterator i = mDummyAuras.begin(); i != mDummyAuras.end(); ++i) @@ -14315,7 +14310,6 @@ float Unit::GetSpellMinRangeForTarget(Unit const* target, SpellInfo const* spell return spellInfo->GetMinRange(!IsHostileTo(target)); } - uint32 Unit::GetCreatureType() const { if (GetTypeId() == TYPEID_PLAYER) @@ -17879,7 +17873,6 @@ bool Unit::IsInRaidWith(Unit const* unit) const return false; } - void Unit::GetPartyMembers(std::list& TagUnitMap) { Unit* owner = GetCharmerOrOwnerOrSelf(); diff --git a/src/server/game/Events/GameEventMgr.h b/src/server/game/Events/GameEventMgr.h index 467463b70..68389cf70 100644 --- a/src/server/game/Events/GameEventMgr.h +++ b/src/server/game/Events/GameEventMgr.h @@ -171,4 +171,3 @@ bool IsHolidayActive(HolidayIds id); bool IsEventActive(uint16 event_id); #endif - diff --git a/src/server/game/Globals/ObjectAccessor.cpp b/src/server/game/Globals/ObjectAccessor.cpp index 8a6dc6d6a..f84ea27dd 100644 --- a/src/server/game/Globals/ObjectAccessor.cpp +++ b/src/server/game/Globals/ObjectAccessor.cpp @@ -530,7 +530,6 @@ void ObjectAccessor::UnloadAll() std::map ObjectAccessor::playerNameToPlayerPointer; - /// Global definitions for the hashmap storage template class HashMapHolder; diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index e90a81b6e..55b63370a 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -492,7 +492,6 @@ void ObjectMgr::LoadCreatureTemplates() uint32 entry = fields[0].GetUInt32(); - CreatureTemplate& creatureTemplate = _creatureTemplateStore[entry]; creatureTemplate.Entry = entry; diff --git a/src/server/game/Globals/ObjectMgr.h b/src/server/game/Globals/ObjectMgr.h index 94d29aa5d..161eb7768 100644 --- a/src/server/game/Globals/ObjectMgr.h +++ b/src/server/game/Globals/ObjectMgr.h @@ -421,7 +421,7 @@ struct AreaTrigger struct BroadcastText { - BroadcastText() + BroadcastText() { MaleText.resize(DEFAULT_LOCALE + 1); FemaleText.resize(DEFAULT_LOCALE + 1); diff --git a/src/server/game/Grids/Cells/Cell.h b/src/server/game/Grids/Cells/Cell.h index e191ce3fa..cf17e7898 100644 --- a/src/server/game/Grids/Cells/Cell.h +++ b/src/server/game/Grids/Cells/Cell.h @@ -103,4 +103,3 @@ private: }; #endif - diff --git a/src/server/game/Grids/Cells/CellImpl.h b/src/server/game/Grids/Cells/CellImpl.h index 920b5340e..2f56e330c 100644 --- a/src/server/game/Grids/Cells/CellImpl.h +++ b/src/server/game/Grids/Cells/CellImpl.h @@ -166,4 +166,3 @@ inline void Cell::VisitCircle(TypeContainerVisitor& visitor, Map& } } #endif - diff --git a/src/server/game/Grids/Grid.h b/src/server/game/Grids/Grid.h index b368cf8c1..fb345790c 100644 --- a/src/server/game/Grids/Grid.h +++ b/src/server/game/Grids/Grid.h @@ -120,4 +120,3 @@ private: //ActiveGridObjects m_activeGridObjects; }; #endif - diff --git a/src/server/game/Grids/GridLoader.h b/src/server/game/Grids/GridLoader.h index affc0722a..e774dc984 100644 --- a/src/server/game/Grids/GridLoader.h +++ b/src/server/game/Grids/GridLoader.h @@ -63,4 +63,3 @@ class GridLoader }; */ #endif - diff --git a/src/server/game/Grids/GridRefManager.h b/src/server/game/Grids/GridRefManager.h index d799e8f43..157b798cd 100644 --- a/src/server/game/Grids/GridRefManager.h +++ b/src/server/game/Grids/GridRefManager.h @@ -27,4 +27,3 @@ public: iterator rend() { return iterator(nullptr); } }; #endif - diff --git a/src/server/game/Grids/GridReference.h b/src/server/game/Grids/GridReference.h index 04d783a26..9257ccb1b 100644 --- a/src/server/game/Grids/GridReference.h +++ b/src/server/game/Grids/GridReference.h @@ -38,4 +38,3 @@ public: GridReference* next() { return (GridReference*)Reference, OBJECT>::next(); } }; #endif - diff --git a/src/server/game/Grids/NGrid.h b/src/server/game/Grids/NGrid.h index 583413e4d..331c85e04 100644 --- a/src/server/game/Grids/NGrid.h +++ b/src/server/game/Grids/NGrid.h @@ -101,4 +101,3 @@ private: bool i_GridObjectDataLoaded; }; #endif - diff --git a/src/server/game/Grids/Notifiers/GridNotifiers.cpp b/src/server/game/Grids/Notifiers/GridNotifiers.cpp index 20aa03b0a..d5c769cf1 100644 --- a/src/server/game/Grids/Notifiers/GridNotifiers.cpp +++ b/src/server/game/Grids/Notifiers/GridNotifiers.cpp @@ -18,7 +18,6 @@ using namespace acore; - void VisibleNotifier::Visit(GameObjectMapType& m) { for (GameObjectMapType::iterator iter = m.begin(); iter != m.end(); ++iter) diff --git a/src/server/game/Grids/Notifiers/GridNotifiersImpl.h b/src/server/game/Grids/Notifiers/GridNotifiersImpl.h index f8efb25e0..b111bfa9e 100644 --- a/src/server/game/Grids/Notifiers/GridNotifiersImpl.h +++ b/src/server/game/Grids/Notifiers/GridNotifiersImpl.h @@ -151,7 +151,6 @@ void acore::WorldObjectSearcher::Visit(DynamicObjectMapType& m) } } - template void acore::WorldObjectLastSearcher::Visit(GameObjectMapType& m) { diff --git a/src/server/game/Groups/Group.cpp b/src/server/game/Groups/Group.cpp index 75a7ef91b..577e8896d 100644 --- a/src/server/game/Groups/Group.cpp +++ b/src/server/game/Groups/Group.cpp @@ -141,7 +141,6 @@ bool Group::Create(Player* leader) CharacterDatabase.Execute(stmt); - ASSERT(AddMember(leader)); // If the leader can't be added to a new group because it appears full, something is clearly wrong. } else if (!AddMember(leader)) diff --git a/src/server/game/Groups/GroupMgr.h b/src/server/game/Groups/GroupMgr.h index a5ecc0b7d..5f404d952 100644 --- a/src/server/game/Groups/GroupMgr.h +++ b/src/server/game/Groups/GroupMgr.h @@ -30,7 +30,6 @@ public: void AddGroup(Group* group); void RemoveGroup(Group* group); - protected: typedef std::vector GroupIds; GroupIds _groupIds; diff --git a/src/server/game/Groups/GroupRefManager.h b/src/server/game/Groups/GroupRefManager.h index 2332621a4..c98f293eb 100644 --- a/src/server/game/Groups/GroupRefManager.h +++ b/src/server/game/Groups/GroupRefManager.h @@ -20,4 +20,3 @@ public: GroupReference const* getFirst() const { return ((GroupReference const*)RefManager::getFirst()); } }; #endif - diff --git a/src/server/game/Groups/GroupReference.cpp b/src/server/game/Groups/GroupReference.cpp index f06dcc5b0..160115bc8 100644 --- a/src/server/game/Groups/GroupReference.cpp +++ b/src/server/game/Groups/GroupReference.cpp @@ -22,4 +22,3 @@ void GroupReference::sourceObjectDestroyLink() { // called from invalidate() } - diff --git a/src/server/game/Groups/GroupReference.h b/src/server/game/Groups/GroupReference.h index dba91a8bf..010afb2ad 100644 --- a/src/server/game/Groups/GroupReference.h +++ b/src/server/game/Groups/GroupReference.h @@ -28,4 +28,3 @@ public: void setSubGroup(uint8 pSubGroup) { iSubGroup = pSubGroup; } }; #endif - diff --git a/src/server/game/Guilds/Guild.cpp b/src/server/game/Guilds/Guild.cpp index 6d6768e27..22a6156b2 100644 --- a/src/server/game/Guilds/Guild.cpp +++ b/src/server/game/Guilds/Guild.cpp @@ -471,7 +471,6 @@ bool Guild::BankTab::WriteSlotPacket(WorldPacket& data, uint8 slotId, bool ignor { data << uint32(0); // 3.3.0 (0x00018020, 0x00018000) - if (uint32 random = pItem->GetItemRandomPropertyId()) { data << uint32(random); // Random item property id @@ -1306,7 +1305,6 @@ void Guild::HandleRoster(WorldSession* session) for (Members::const_iterator itr = m_members.begin(); itr != m_members.end(); ++itr) itr->second->WritePacket(data, _HasRankRight(session->GetPlayer(), GR_RIGHT_VIEWOFFNOTE)); - #if defined(ENABLE_EXTRAS) && defined(ENABLE_EXTRA_LOGS) sLog->outDebug(LOG_FILTER_GUILD, "SMSG_GUILD_ROSTER [%s]", session->GetPlayerInfo().c_str()); #endif diff --git a/src/server/game/Handlers/AuctionHouseHandler.cpp b/src/server/game/Handlers/AuctionHouseHandler.cpp index e06f10234..5214352f3 100644 --- a/src/server/game/Handlers/AuctionHouseHandler.cpp +++ b/src/server/game/Handlers/AuctionHouseHandler.cpp @@ -666,7 +666,6 @@ void WorldSession::HandleAuctionListOwnerItems(WorldPacket& recvData) _player->m_Events.AddEvent(new AuctionListOwnerItemsDelayEvent(guid, _player->GetGUID(), true), _player->m_Events.CalculateTime(delay - diff)); } - void WorldSession::HandleAuctionListOwnerItemsEvent(uint64 creatureGuid) { #if defined(ENABLE_EXTRAS) && defined(ENABLE_EXTRA_LOGS) diff --git a/src/server/game/Handlers/BattleGroundHandler.cpp b/src/server/game/Handlers/BattleGroundHandler.cpp index 370eb3b79..451272833 100644 --- a/src/server/game/Handlers/BattleGroundHandler.cpp +++ b/src/server/game/Handlers/BattleGroundHandler.cpp @@ -715,7 +715,6 @@ void WorldSession::HandleBattlemasterJoinArena(WorldPacket& recvData) member->RemoveBattlegroundQueueId(mqtid); } - uint32 ateamId = 0; uint32 arenaRating = 0; uint32 matchmakerRating = 0; diff --git a/src/server/game/Handlers/CharacterHandler.cpp b/src/server/game/Handlers/CharacterHandler.cpp index 484ca222b..8e02cda7d 100644 --- a/src/server/game/Handlers/CharacterHandler.cpp +++ b/src/server/game/Handlers/CharacterHandler.cpp @@ -433,7 +433,6 @@ void WorldSession::HandleCharCreateCallback(PreparedQueryResult result, Characte return; } - ASSERT(_charCreateCallback.GetParam() == createInfo); PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_SUM_CHARS); @@ -946,7 +945,6 @@ void WorldSession::HandlePlayerLoginFromDB(LoginQueryHolder* holder) pCurrChar->SetRank(0); } - data.Initialize(SMSG_LEARNED_DANCE_MOVES, 4 + 4); data << uint32(0); data << uint32(0); @@ -1139,7 +1137,6 @@ void WorldSession::HandlePlayerLoginFromDB(LoginQueryHolder* holder) m_playerLoading = false; - // Handle Login-Achievements (should be handled after loading) _player->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_ON_LOGIN, 1); diff --git a/src/server/game/Handlers/GuildHandler.cpp b/src/server/game/Handlers/GuildHandler.cpp index 4198b5cd7..3e2b7e897 100644 --- a/src/server/game/Handlers/GuildHandler.cpp +++ b/src/server/game/Handlers/GuildHandler.cpp @@ -564,7 +564,6 @@ void WorldSession::HandleGuildBankBuyTab(WorldPacket& recvData) sLog->outDebug(LOG_FILTER_GUILD, "CMSG_GUILD_BANK_BUY_TAB [%s]: Go: [" UI64FMTD "], TabId: %u", GetPlayerInfo().c_str(), guid, tabId); #endif - if (GetPlayer()->GetGameObjectIfCanInteractWith(guid, GAMEOBJECT_TYPE_GUILD_BANK)) if (Guild* guild = GetPlayer()->GetGuild()) guild->HandleBuyBankTab(this, tabId); diff --git a/src/server/game/Handlers/MiscHandler.cpp b/src/server/game/Handlers/MiscHandler.cpp index f5154df99..ec0e0bbc5 100644 --- a/src/server/game/Handlers/MiscHandler.cpp +++ b/src/server/game/Handlers/MiscHandler.cpp @@ -411,7 +411,6 @@ void WorldSession::HandleWhoOpcode(WorldPacket& recvData) // sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Send SMSG_WHO Message"); } - void WorldSession::HandleLogoutRequestOpcode(WorldPacket& /*recv_data*/) { #if defined(ENABLE_EXTRAS) && defined(ENABLE_EXTRA_LOGS) @@ -612,7 +611,6 @@ void WorldSession::HandleBugOpcode(WorldPacket& recv_data) recv_data >> typelen >> type; - #if defined(ENABLE_EXTRAS) && defined(ENABLE_EXTRA_LOGS) if (suggestion == 0) sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_BUG [Bug Report]"); diff --git a/src/server/game/Handlers/MovementHandler.cpp b/src/server/game/Handlers/MovementHandler.cpp index 45172030f..efd5110fd 100644 --- a/src/server/game/Handlers/MovementHandler.cpp +++ b/src/server/game/Handlers/MovementHandler.cpp @@ -477,7 +477,6 @@ void WorldSession::HandleMovementOpcodes(WorldPacket& recvData) if (opcode == MSG_MOVE_FALL_LAND || opcode == MSG_MOVE_START_SWIM) mover->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_LANDING); // Parachutes - if (plrMover) // nothing is charmed, or player charmed { if (plrMover->IsSitState() && (movementInfo.flags & (MOVEMENTFLAG_MASK_MOVING | MOVEMENTFLAG_MASK_TURNING))) diff --git a/src/server/game/Handlers/NPCHandler.cpp b/src/server/game/Handlers/NPCHandler.cpp index f92bdb00b..6d5fc7217 100644 --- a/src/server/game/Handlers/NPCHandler.cpp +++ b/src/server/game/Handlers/NPCHandler.cpp @@ -1038,4 +1038,3 @@ void WorldSession::HandleRepairItemOpcode(WorldPacket& recvData) _player->DurabilityRepairAll(true, discountMod, guildBank); } } - diff --git a/src/server/game/Handlers/NPCHandler.h b/src/server/game/Handlers/NPCHandler.h index 35970f653..bf812577e 100644 --- a/src/server/game/Handlers/NPCHandler.h +++ b/src/server/game/Handlers/NPCHandler.h @@ -45,4 +45,3 @@ struct NpcTextLocale std::vector Text_1; }; #endif - diff --git a/src/server/game/Handlers/PetHandler.cpp b/src/server/game/Handlers/PetHandler.cpp index 6cbc092fa..42c703f00 100644 --- a/src/server/game/Handlers/PetHandler.cpp +++ b/src/server/game/Handlers/PetHandler.cpp @@ -508,7 +508,6 @@ void WorldSession::HandlePetActionHelper(Unit* pet, uint64 guid1, uint16 spellid if (pet->ToPet()) pet->ToPet()->ClearCastWhenWillAvailable(); - charmInfo->SetForcedSpell(0); charmInfo->SetForcedTargetGUID(0); break; diff --git a/src/server/game/Handlers/PetitionsHandler.cpp b/src/server/game/Handlers/PetitionsHandler.cpp index a4e4a5567..36fb6d3f6 100644 --- a/src/server/game/Handlers/PetitionsHandler.cpp +++ b/src/server/game/Handlers/PetitionsHandler.cpp @@ -425,7 +425,6 @@ void WorldSession::HandlePetitionSignOpcode(WorldPacket& recvData) recvData >> petitionGuid; // petition guid recvData >> unk; - Petition const* petition = sPetitionMgr->GetPetition(GUID_LOPART(petitionGuid)); if (!petition) { @@ -492,7 +491,6 @@ void WorldSession::HandlePetitionSignOpcode(WorldPacket& recvData) } } - uint32 signs = signatures->signatureMap.size(); if (++signs > type) // client signs maximum return; diff --git a/src/server/game/Handlers/Socialhandler.cpp b/src/server/game/Handlers/Socialhandler.cpp index 03ede8c35..bb1b0dedc 100644 --- a/src/server/game/Handlers/Socialhandler.cpp +++ b/src/server/game/Handlers/Socialhandler.cpp @@ -4,7 +4,6 @@ * Copyright (C) 2005-2009 MaNGOS */ - #include "WorldSession.h" #include "AccountMgr.h" #include "Log.h" diff --git a/src/server/game/Handlers/SpellHandler.cpp b/src/server/game/Handlers/SpellHandler.cpp index d7f7ec198..593b9c00c 100644 --- a/src/server/game/Handlers/SpellHandler.cpp +++ b/src/server/game/Handlers/SpellHandler.cpp @@ -153,7 +153,6 @@ void WorldSession::HandleUseItemOpcode(WorldPacket& recvPacket) targets.Read(recvPacket, pUser); HandleClientCastFlags(recvPacket, castFlags, targets); - // Note: If script stop casting it must send appropriate data to client to prevent stuck item in gray state. if (!sScriptMgr->OnItemUse(pUser, pItem, targets)) { @@ -260,7 +259,6 @@ void WorldSession::HandleOpenWrappedItemCallback(PreparedQueryResult result, uin if (item->GetGUIDLow() != itemLowGUID || !item->HasFlag(ITEM_FIELD_FLAGS, ITEM_FIELD_FLAG_WRAPPED)) // during getting result, gift was swapped with another item return; - if (!result) { sLog->outError("Wrapped item %u don't have record in character_gifts table and will deleted", item->GetGUIDLow()); diff --git a/src/server/game/Handlers/VoiceChatHandler.cpp b/src/server/game/Handlers/VoiceChatHandler.cpp index 1dc0e22e1..ca11053ef 100644 --- a/src/server/game/Handlers/VoiceChatHandler.cpp +++ b/src/server/game/Handlers/VoiceChatHandler.cpp @@ -36,4 +36,3 @@ void WorldSession::HandleSetActiveVoiceChannel(WorldPacket& recvData) recvData.read_skip(); recvData.read_skip(); } - diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp index 129f2e85d..51e4cf630 100644 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -400,7 +400,6 @@ void Map::DeleteFromWorld(Player* player) delete player; } - void Map::EnsureGridCreated(const GridCoord& p) { if (getNGrid(p.x_coord, p.y_coord)) // pussywizard @@ -628,7 +627,6 @@ bool Map::IsGridLoaded(const GridCoord& p) const return (getNGrid(p.x_coord, p.y_coord) && isGridObjectDataLoaded(p.x_coord, p.y_coord)); } - void Map::VisitNearbyCellsOfPlayer(Player* player, TypeContainerVisitor& gridVisitor, TypeContainerVisitor& worldVisitor, TypeContainerVisitor& largeGridVisitor, @@ -1993,7 +1991,6 @@ float Map::GetMinHeight(float x, float y) const return -500.0f; } - inline bool IsOutdoorWMO(uint32 mogpFlags, int32 /*adtId*/, int32 /*rootId*/, int32 /*groupId*/, WMOAreaTableEntry const* wmoEntry, AreaTableEntry const* atEntry) { bool outdoor = true; @@ -3477,7 +3474,6 @@ bool Map::CanReachPositionAndGetCoords(Unit* who, float startX, float startY, fl destZ = _map->GetHeight(who->GetPhaseMask(), destX, destY, destZ, true); } - if (destZ <= INVALID_HEIGHT || (destZ - startZ) > maxHeight) { return false; diff --git a/src/server/game/Maps/Map.h b/src/server/game/Maps/Map.h index baa6fb934..b0ab6b8dc 100644 --- a/src/server/game/Maps/Map.h +++ b/src/server/game/Maps/Map.h @@ -191,7 +191,6 @@ class GridMap uint8 _liquidWidth; uint8 _liquidHeight; - bool loadAreaData(FILE* in, uint32 offset, uint32 size); bool loadHeightData(FILE* in, uint32 offset, uint32 size); bool loadLiquidData(FILE* in, uint32 offset, uint32 size); @@ -666,7 +665,6 @@ private: uint32 _defaultLight; }; - enum InstanceResetMethod { INSTANCE_RESET_ALL, // reset all option under portrait, resets only normal 5-mans diff --git a/src/server/game/Maps/MapRefManager.h b/src/server/game/Maps/MapRefManager.h index 861d30313..b2a381a8d 100644 --- a/src/server/game/Maps/MapRefManager.h +++ b/src/server/game/Maps/MapRefManager.h @@ -30,4 +30,3 @@ public: [[nodiscard]] const_iterator end() const { return const_iterator(nullptr); } }; #endif - diff --git a/src/server/game/Maps/MapReference.h b/src/server/game/Maps/MapReference.h index a7a811db1..620c81fee 100644 --- a/src/server/game/Maps/MapReference.h +++ b/src/server/game/Maps/MapReference.h @@ -38,4 +38,3 @@ public: [[nodiscard]] MapReference const* nocheck_prev() const { return (MapReference const*)Reference::nocheck_prev(); } }; #endif - diff --git a/src/server/game/Miscellaneous/Language.h b/src/server/game/Miscellaneous/Language.h index d49bb8179..913f060a9 100644 --- a/src/server/game/Miscellaneous/Language.h +++ b/src/server/game/Miscellaneous/Language.h @@ -96,7 +96,6 @@ enum AcoreStrings LANG_PVPSTATS_DISABLED = 81, // Free 82 - 95 - LANG_GUILD_RENAME_ALREADY_EXISTS = 96, LANG_GUILD_RENAME_DONE = 97, LANG_RENAME_PLAYER_ALREADY_EXISTS = 98, @@ -879,7 +878,6 @@ enum AcoreStrings // Room for more level 4 1031-1099 not used LANG_ACCOUNT_PASS_TOO_LONG = 1031, - // Level 3 (continue) LANG_ACCOUNT_SETADDON = 1100, LANG_MOTD_NEW = 1101, @@ -1291,7 +1289,6 @@ enum AcoreStrings LANG_BAN_ACCOUNT_YOUBANNEDMESSAGE_WORLD = 11006, LANG_BAN_ACCOUNT_YOUPERMBANNEDMESSAGE_WORLD = 11007, - LANG_NPCINFO_INHABIT_TYPE = 11008, LANG_NPCINFO_FLAGS_EXTRA = 11009, LANG_INSTANCE_LOGIN_GAMEMASTER_EXCEPTION = 11010, @@ -1304,8 +1301,8 @@ enum AcoreStrings LANG_SELECT_PLAYER_OR_PET = 11016, // Continue show Ban in world (ip) - LANG_BAN_IP_YOUBANNEDMESSAGE_WORLD = 11017, - LANG_BAN_IP_YOUPERMBANNEDMESSAGE_WORLD = 11018, + LANG_BAN_IP_YOUBANNEDMESSAGE_WORLD = 11017, + LANG_BAN_IP_YOUPERMBANNEDMESSAGE_WORLD = 11018, LANG_MUTED_PLAYER = 30000, // Mute for player 2 hour diff --git a/src/server/game/Miscellaneous/SharedDefines.h b/src/server/game/Miscellaneous/SharedDefines.h index 5b65e4229..5c6ca3c7c 100644 --- a/src/server/game/Miscellaneous/SharedDefines.h +++ b/src/server/game/Miscellaneous/SharedDefines.h @@ -3588,7 +3588,6 @@ static_assert(sizeof(MmapTileHeader) == (sizeof(MmapTileHeader::mmapMagic) + sizeof(MmapTileHeader::usesLiquids) + sizeof(MmapTileHeader::padding)), "MmapTileHeader has uninitialized padding fields"); - enum NavTerrain { NAV_EMPTY = 0x00, diff --git a/src/server/game/Movement/MovementGenerators/EscortMovementGenerator.h b/src/server/game/Movement/MovementGenerators/EscortMovementGenerator.h index a911c4134..ea14ab71e 100644 --- a/src/server/game/Movement/MovementGenerators/EscortMovementGenerator.h +++ b/src/server/game/Movement/MovementGenerators/EscortMovementGenerator.h @@ -36,4 +36,3 @@ private: }; #endif - diff --git a/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp index 98d93ce0c..8f6b7766f 100644 --- a/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp @@ -191,7 +191,7 @@ void TargetedMovementGeneratorMedium::_setTargetLocation(T* owner, bool in float maxDist = MELEE_RANGE + owner->GetMeleeReach() + i_target->GetMeleeReach(); if (!forceDest && (i_path->GetPathType() & PATHFIND_NOPATH || (!i_offset && !isPlayerPet && i_target->GetExactDistSq(i_path->GetActualEndPosition().x, i_path->GetActualEndPosition().y, i_path->GetActualEndPosition().z) > maxDist * maxDist))) { - if (owner->GetTypeId() == TYPEID_UNIT) + if (owner->GetTypeId() == TYPEID_UNIT) { owner->ToCreature()->SetCannotReachTarget(false); } diff --git a/src/server/game/Movement/Spline/MoveSplineInitArgs.h b/src/server/game/Movement/Spline/MoveSplineInitArgs.h index 076c67f0e..78d69e322 100644 --- a/src/server/game/Movement/Spline/MoveSplineInitArgs.h +++ b/src/server/game/Movement/Spline/MoveSplineInitArgs.h @@ -32,7 +32,7 @@ namespace Movement struct MoveSplineInitArgs { - MoveSplineInitArgs(size_t path_capacity = 16) + MoveSplineInitArgs(size_t path_capacity = 16) { path.reserve(path_capacity); } diff --git a/src/server/game/Petitions/PetitionMgr.cpp b/src/server/game/Petitions/PetitionMgr.cpp index 6bec181b0..07984aa46 100644 --- a/src/server/game/Petitions/PetitionMgr.cpp +++ b/src/server/game/Petitions/PetitionMgr.cpp @@ -8,7 +8,6 @@ Xinef #include "Log.h" #include "DatabaseEnv.h" - PetitionMgr::PetitionMgr() { } @@ -163,5 +162,3 @@ void PetitionMgr::RemoveSignaturesByPlayerAndType(uint32 playerGuid, uint8 type) itr->second.signatureMap.erase(signItr); } } - - diff --git a/src/server/game/Quests/QuestDef.h b/src/server/game/Quests/QuestDef.h index 85c8c1dd5..f2e4ae4c8 100644 --- a/src/server/game/Quests/QuestDef.h +++ b/src/server/game/Quests/QuestDef.h @@ -388,7 +388,7 @@ protected: struct QuestStatusData { - QuestStatusData() + QuestStatusData() { memset(ItemCount, 0, QUEST_ITEM_OBJECTIVES_COUNT * sizeof(uint16)); memset(CreatureOrGOCount, 0, QUEST_OBJECTIVES_COUNT * sizeof(uint16)); diff --git a/src/server/game/Scripting/ScriptMgr.cpp b/src/server/game/Scripting/ScriptMgr.cpp index fbbade441..194ce278f 100644 --- a/src/server/game/Scripting/ScriptMgr.cpp +++ b/src/server/game/Scripting/ScriptMgr.cpp @@ -392,7 +392,6 @@ void ScriptMgr::OnPacketSend(WorldSession* session, WorldPacket const& packet) FOREACH_SCRIPT(ServerScript)->OnPacketSend(session, copy); } - void ScriptMgr::OnOpenStateChange(bool open) { #ifdef ELUNA @@ -401,7 +400,6 @@ void ScriptMgr::OnOpenStateChange(bool open) FOREACH_SCRIPT(WorldScript)->OnOpenStateChange(open); } - void ScriptMgr::OnLoadCustomDatabaseTable() { FOREACH_SCRIPT(WorldScript)->OnLoadCustomDatabaseTable(); @@ -2395,4 +2393,3 @@ MailScript::MailScript(const char* name) { ScriptRegistry::AddScript(this); } - diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h index 999db2fad..d2cf44995 100644 --- a/src/server/game/Scripting/ScriptMgr.h +++ b/src/server/game/Scripting/ScriptMgr.h @@ -1017,23 +1017,18 @@ public: // Called when an account logged in successfully virtual void OnAccountLogin(uint32 /*accountId*/) { } - // Called when an account login failed virtual void OnFailedAccountLogin(uint32 /*accountId*/) { } - // Called when Email is successfully changed for Account virtual void OnEmailChange(uint32 /*accountId*/) { } - // Called when Email failed to change for Account virtual void OnFailedEmailChange(uint32 /*accountId*/) { } - // Called when Password is successfully changed for Account virtual void OnPasswordChange(uint32 /*accountId*/) { } - // Called when Password failed to change for Account virtual void OnFailedPasswordChange(uint32 /*accountId*/) { } }; @@ -1332,7 +1327,6 @@ public: /* ItemScript */ void OnGossipSelect(Player* player, Item* item, uint32 sender, uint32 action); void OnGossipSelectCode(Player* player, Item* item, uint32 sender, uint32 action, const char* code); - public: /* CreatureScript */ bool OnGossipHello(Player* player, Creature* creature); @@ -1563,7 +1557,6 @@ public: /* UnitScript */ uint32 DealDamage(Unit* AttackerUnit, Unit* pVictim, uint32 damage, DamageEffectType damagetype); 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); diff --git a/src/server/game/Scripting/ScriptMgrMacros.h b/src/server/game/Scripting/ScriptMgrMacros.h index 7390e93b1..f5857576f 100644 --- a/src/server/game/Scripting/ScriptMgrMacros.h +++ b/src/server/game/Scripting/ScriptMgrMacros.h @@ -32,4 +32,3 @@ T* V = ScriptRegistry::GetScriptById(I); \ if (!V) \ return R; - diff --git a/src/server/game/Server/WorldSession.cpp b/src/server/game/Server/WorldSession.cpp index 04c7f7423..3ef92e726 100644 --- a/src/server/game/Server/WorldSession.cpp +++ b/src/server/game/Server/WorldSession.cpp @@ -879,7 +879,6 @@ void WorldSession::ReadMovementInfo(WorldPacket& data, MovementInfo* mi) mi->RemoveMovementFlag((maskToRemove)); #endif - /*! This must be a packet spoofing attempt. MOVEMENTFLAG_ROOT sent from the client is not valid in conjunction with any of the moving movement flags such as MOVEMENTFLAG_FORWARD. It will freeze clients that receive this player's movement info. @@ -927,7 +926,6 @@ void WorldSession::ReadMovementInfo(WorldPacket& data, MovementInfo* mi) e.g. aerial combat. */ - REMOVE_VIOLATING_FLAGS(mi->HasMovementFlag(MOVEMENTFLAG_FLYING | MOVEMENTFLAG_CAN_FLY) && GetSecurity() == SEC_PLAYER && !GetPlayer()->m_mover->HasAuraType(SPELL_AURA_FLY) && !GetPlayer()->m_mover->HasAuraType(SPELL_AURA_MOD_INCREASE_MOUNTED_FLIGHT_SPEED), MOVEMENTFLAG_FLYING | MOVEMENTFLAG_CAN_FLY); @@ -935,7 +933,6 @@ void WorldSession::ReadMovementInfo(WorldPacket& data, MovementInfo* mi) REMOVE_VIOLATING_FLAGS(mi->HasMovementFlag(MOVEMENTFLAG_CAN_FLY | MOVEMENTFLAG_DISABLE_GRAVITY) && mi->HasMovementFlag(MOVEMENTFLAG_FALLING), MOVEMENTFLAG_FALLING); - REMOVE_VIOLATING_FLAGS(mi->HasMovementFlag(MOVEMENTFLAG_SPLINE_ENABLED) && (!GetPlayer()->movespline->Initialized() || GetPlayer()->movespline->Finalized()), MOVEMENTFLAG_SPLINE_ENABLED); diff --git a/src/server/game/Server/WorldSocket.h b/src/server/game/Server/WorldSocket.h index 63e71ecaf..036390327 100644 --- a/src/server/game/Server/WorldSocket.h +++ b/src/server/game/Server/WorldSocket.h @@ -197,4 +197,3 @@ private: #endif /* _WORLDSOCKET_H */ /// @} - diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp index 620107fa9..29cbf63ee 100644 --- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp +++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp @@ -6328,7 +6328,6 @@ void AuraEffect::HandlePeriodicHealthLeechAuraTick(Unit* target, Unit* caster) c if (caster) caster->SendSpellNonMeleeDamageLog(target, GetId(), damage + absorb + resist, GetSpellInfo()->GetSchoolMask(), absorb, resist, false, 0, crit); - int32 new_damage; new_damage = Unit::DealDamage(caster, target, damage, &cleanDamage, DOT, GetSpellInfo()->GetSchoolMask(), GetSpellInfo(), false); @@ -6824,7 +6823,6 @@ void AuraEffect::HandleRaidProcFromChargeAuraProc(AuraApplication* aurApp, ProcE target->CastSpell(target, triggerSpellId, true, NULL, this, GetCasterGUID()); } - void AuraEffect::HandleRaidProcFromChargeWithValueAuraProc(AuraApplication* aurApp, ProcEventInfo& /*eventInfo*/) { Unit* target = aurApp->GetTarget(); diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.h b/src/server/game/Spells/Auras/SpellAuraEffects.h index 51a846b88..8e1307f89 100644 --- a/src/server/game/Spells/Auras/SpellAuraEffects.h +++ b/src/server/game/Spells/Auras/SpellAuraEffects.h @@ -116,7 +116,6 @@ private: // xinef: channel information for channel triggering ChannelTargetData* m_channelData; - SpellModifier* m_spellmod; int32 m_periodicTimer; diff --git a/src/server/game/Spells/Auras/SpellAuras.cpp b/src/server/game/Spells/Auras/SpellAuras.cpp index a9cc92965..177ebcf4d 100644 --- a/src/server/game/Spells/Auras/SpellAuras.cpp +++ b/src/server/game/Spells/Auras/SpellAuras.cpp @@ -2758,4 +2758,3 @@ void DynObjAura::FillTargetMap(std::map& targets, Unit* /*caster*/ } } } - diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index 4fc4aec21..651179ec9 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -263,7 +263,6 @@ GameObject* SpellCastTargets::GetGOTarget() const return nullptr; } - void SpellCastTargets::SetGOTarget(GameObject* target) { if (!target) @@ -1817,7 +1816,6 @@ void Spell::SelectImplicitTrajTargets(SpellEffIndex effIndex, SpellImplicitTarge float srcToDestDelta = m_targets.GetDstPos()->m_positionZ - m_targets.GetSrcPos()->m_positionZ; - // xinef: supply correct target type, DEST_DEST and similar are ALWAYS undefined // xinef: correct target is stored in TRIGGERED SPELL, however as far as i noticed, all checks are ENTRY, ENEMY std::list targets; @@ -3407,7 +3405,6 @@ SpellCastResult Spell::prepare(SpellCastTargets const* targets, AuraEffect const return SPELL_FAILED_SPELL_IN_PROGRESS; } - LoadScripts(); OnSpellLaunch(); @@ -5356,7 +5353,6 @@ SpellCastResult Spell::CheckCast(bool strict) return SPELL_FAILED_NOT_READY; } - if (m_spellInfo->HasAttribute(SPELL_ATTR7_IS_CHEAT_SPELL) && !m_caster->HasFlag(UNIT_FIELD_FLAGS_2, UNIT_FLAG2_ALLOW_CHEAT_SPELLS)) { m_customError = SPELL_CUSTOM_ERROR_GM_ONLY; @@ -5481,7 +5477,6 @@ SpellCastResult Spell::CheckCast(bool strict) return SPELL_FAILED_MOVING; } - Vehicle* vehicle = m_caster->GetVehicle(); if (vehicle && !(_triggeredCastFlags & TRIGGERED_IGNORE_CASTER_MOUNTED_OR_ON_VEHICLE)) { @@ -8561,4 +8556,3 @@ namespace acore } } //namespace acore - diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index 6ec4d9683..535100827 100644 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -1717,10 +1717,8 @@ void Spell::DoCreateItem(uint8 /*effIndex*/, uint32 itemId) /* == gem perfection handling over == */ - /* == profession specialization handling == */ - // init items_count to 1, since 1 item will be created regardless of specialization int32 itemsCount = 1; float additionalCreateChance = 0.0f; diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp index 80323a008..bf085c8fd 100644 --- a/src/server/game/Spells/SpellMgr.cpp +++ b/src/server/game/Spells/SpellMgr.cpp @@ -1631,7 +1631,6 @@ void SpellMgr::LoadSpellGroups() ++count; } while (result->NextRow()); - sLog->outString(">> Loaded %u spell group definitions in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); sLog->outString(); } @@ -1672,7 +1671,6 @@ void SpellMgr::LoadSpellGroupStackRules() break; } - if (!present) { sLog->outErrorDb("SpellGroup id %u listed in `spell_group_stack_rules` does not exist", group_id); @@ -3978,7 +3976,6 @@ void SpellMgr::LoadDbcDataCorrections() spellInfo->Dispel = DISPEL_NONE; }); - ////////////////////////////////////////// ////////// ULDUAR ////////////////////////////////////////// @@ -7243,7 +7240,6 @@ void SpellMgr::LoadDbcDataCorrections() } - if (spellInfo->activeIconID == 2158) // flight { spellInfo->Attributes |= SPELL_ATTR0_PASSIVE; @@ -7275,7 +7271,6 @@ void SpellMgr::LoadDbcDataCorrections() areaEntry->flags |= AREA_FLAG_REST_ZONE_ALLIANCE; } - // Xinef: fix for something? SummonPropertiesEntry* properties = const_cast(sSummonPropertiesStore.LookupEntry(121)); properties->Type = SUMMON_TYPE_TOTEM; @@ -7291,21 +7286,18 @@ void SpellMgr::LoadDbcDataCorrections() CreatureDisplayInfoEntry* displayEntry = const_cast(sCreatureDisplayInfoStore.LookupEntry(17028)); // Kurken displayEntry->scale = 2.5f; - // Oracles and Frenzyheart faction FactionEntry* factionEntry = const_cast(sFactionStore.LookupEntry(1104)); factionEntry->ReputationFlags[0] = 0; factionEntry = const_cast(sFactionStore.LookupEntry(1105)); factionEntry->ReputationFlags[0] = 0; - // Various factions, added 14, 16 to hostile mask FactionTemplateEntry* factionTemplateEntry = const_cast(sFactionTemplateStore.LookupEntry(1978)); // Warsong Offensive factionTemplateEntry->hostileMask |= 8; factionTemplateEntry = const_cast(sFactionTemplateStore.LookupEntry(1921)); // The Taunka factionTemplateEntry->hostileMask |= 8; - // Remove vehicles attr, making accessories selectable VehicleSeatEntry* vse = const_cast(sVehicleSeatStore.LookupEntry(4689)); // Siege Engine, Accessory vse->m_flags &= ~VEHICLE_SEAT_FLAG_PASSENGER_NOT_SELECTABLE; @@ -7318,7 +7310,6 @@ void SpellMgr::LoadDbcDataCorrections() vse = const_cast(sVehicleSeatStore.LookupEntry(3077)); // Salvaged Demolisher Seat, Ulduar - not allow to change seats vse->m_flags &= ~VEHICLE_SEAT_FLAG_CAN_SWITCH; - // pussywizard: fix z offset for some vehicles: vse = const_cast(sVehicleSeatStore.LookupEntry(6206)); // Marrowgar - Bone Spike vse->m_attachmentOffsetZ = 4.0f; @@ -7348,13 +7339,10 @@ void SpellMgr::LoadDbcDataCorrections() vse->m_attachmentOffsetX += 0.0f; vse->m_attachmentOffsetY += 1.6f; - - // Once Bitten, Twice Shy (10 player) - Icecrown Citadel AchievementEntry* achievement = const_cast(sAchievementStore.LookupEntry(4539)); achievement->mapID = 631; // Correct map requirement (currently has Ulduar) - // Ring of Valor starting Locations GraveyardStruct const* entry = sGraveyard->GetGraveyard(1364); const_cast(entry)->z += 6.0f; diff --git a/src/server/game/Spells/SpellMgr.h b/src/server/game/Spells/SpellMgr.h index 85bc27fd4..faf5ab5c5 100644 --- a/src/server/game/Spells/SpellMgr.h +++ b/src/server/game/Spells/SpellMgr.h @@ -77,7 +77,6 @@ enum SpellFamilyFlag SPELLFAMILYFLAG_SHAMAN_TOTEM_EFFECTS = 0x04000000, // Seems to be linked to most totems and some totem effects }; - #define SPELL_LINKED_MAX_SPELLS 200000 enum SpellLinkedType @@ -88,7 +87,6 @@ enum SpellLinkedType SPELL_LINK_REMOVE = 0, }; - // Spell proc event related declarations (accessed using SpellMgr functions) enum ProcFlags { @@ -444,7 +442,7 @@ private: typedef std::unordered_map PetAuraMap; public: - PetAura() + PetAura() { auras.clear(); } diff --git a/src/server/game/Spells/SpellScript.cpp b/src/server/game/Spells/SpellScript.cpp index 94d3c8041..42128ee61 100644 --- a/src/server/game/Spells/SpellScript.cpp +++ b/src/server/game/Spells/SpellScript.cpp @@ -1148,4 +1148,3 @@ AuraApplication const* AuraScript::GetTargetApplication() const { return m_auraApplication; } - diff --git a/src/server/game/Tickets/TicketMgr.cpp b/src/server/game/Tickets/TicketMgr.cpp index 9a42ddabb..f787c795c 100644 --- a/src/server/game/Tickets/TicketMgr.cpp +++ b/src/server/game/Tickets/TicketMgr.cpp @@ -379,7 +379,6 @@ void TicketMgr::ResolveAndCloseTicket(uint32 ticketId, int64 source) } } - void TicketMgr::ShowList(ChatHandler& handler, bool onlineOnly) const { handler.SendSysMessage(onlineOnly ? LANG_COMMAND_TICKETSHOWONLINELIST : LANG_COMMAND_TICKETSHOWLIST); diff --git a/src/server/game/Tools/CharacterDatabaseCleaner.cpp b/src/server/game/Tools/CharacterDatabaseCleaner.cpp index 116d27513..831dd892f 100644 --- a/src/server/game/Tools/CharacterDatabaseCleaner.cpp +++ b/src/server/game/Tools/CharacterDatabaseCleaner.cpp @@ -142,4 +142,3 @@ void CharacterDatabaseCleaner::CleanCharacterQuestStatus() { CharacterDatabase.DirectExecute("DELETE FROM character_queststatus WHERE status = 0"); } - diff --git a/src/server/game/Weather/Weather.cpp b/src/server/game/Weather/Weather.cpp index 0c239e4bb..4f1e325cd 100644 --- a/src/server/game/Weather/Weather.cpp +++ b/src/server/game/Weather/Weather.cpp @@ -312,4 +312,3 @@ WeatherState Weather::GetWeatherState() const return WEATHER_STATE_FINE; } } - diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp index ff72fe66b..bdd343930 100644 --- a/src/server/game/World/World.cpp +++ b/src/server/game/World/World.cpp @@ -1142,7 +1142,7 @@ void World::LoadConfigSettings(bool reload) sLog->outError("Battleground.BuffRespawn (%i) must be >0. Using 180 instead.", m_int_configs[CONFIG_BATTLEGROUND_BUFF_RESPAWN]); m_int_configs[CONFIG_BATTLEGROUND_BUFF_RESPAWN] = 180; } - + m_int_configs[CONFIG_ARENA_MAX_RATING_DIFFERENCE] = sConfigMgr->GetIntDefault ("Arena.MaxRatingDifference", 150); m_int_configs[CONFIG_ARENA_RATING_DISCARD_TIMER] = sConfigMgr->GetIntDefault ("Arena.RatingDiscardTimer", 10 * MINUTE * IN_MILLISECONDS); m_bool_configs[CONFIG_ARENA_AUTO_DISTRIBUTE_POINTS] = sConfigMgr->GetBoolDefault("Arena.AutoDistributePoints", false); @@ -1923,8 +1923,6 @@ void World::SetInitialWorldSettings() LoginDatabase.PExecute("INSERT INTO uptime (realmid, starttime, uptime, revision) VALUES(%u, %u, 0, '%s')", realmID, uint32(m_startTime), GitRevision::GetFullVersion()); // One-time query - - m_timers[WUPDATE_WEATHERS].SetInterval(1 * IN_MILLISECONDS); m_timers[WUPDATE_AUCTIONS].SetInterval(MINUTE * IN_MILLISECONDS); m_timers[WUPDATE_AUCTIONS].SetCurrent(MINUTE * IN_MILLISECONDS); @@ -2430,7 +2428,6 @@ namespace acore } } - uint32 i_textId; va_list* i_args; }; diff --git a/src/server/scripts/Commands/cs_account.cpp b/src/server/scripts/Commands/cs_account.cpp index 83acf9f15..3d4dc5c4a 100644 --- a/src/server/scripts/Commands/cs_account.cpp +++ b/src/server/scripts/Commands/cs_account.cpp @@ -577,7 +577,6 @@ public: LoginDatabase.Execute(stmt); } - handler->PSendSysMessage(LANG_YOU_CHANGE_SECURITY, targetAccountName.c_str(), gm); return true; } diff --git a/src/server/scripts/Commands/cs_ban.cpp b/src/server/scripts/Commands/cs_ban.cpp index f35f33b89..a1dc081d0 100644 --- a/src/server/scripts/Commands/cs_ban.cpp +++ b/src/server/scripts/Commands/cs_ban.cpp @@ -373,7 +373,6 @@ public: fields[0].GetCString(), fields[1].GetCString(), permanent ? handler->GetAcoreString(LANG_BANINFO_NEVER) : fields[2].GetCString(), permanent ? handler->GetAcoreString(LANG_BANINFO_INFINITE) : secsToTimeString(fields[3].GetUInt64(), true).c_str(), fields[4].GetCString(), fields[5].GetCString()); - return true; } diff --git a/src/server/scripts/Commands/cs_cheat.cpp b/src/server/scripts/Commands/cs_cheat.cpp index e19416270..c4490c844 100644 --- a/src/server/scripts/Commands/cs_cheat.cpp +++ b/src/server/scripts/Commands/cs_cheat.cpp @@ -185,7 +185,6 @@ public: return true; } - static bool HandleTaxiCheatCommand(ChatHandler* handler, char const* args) { std::string argStr = (char*)args; diff --git a/src/server/scripts/Commands/cs_misc.cpp b/src/server/scripts/Commands/cs_misc.cpp index 6b73d8605..0030afee1 100644 --- a/src/server/scripts/Commands/cs_misc.cpp +++ b/src/server/scripts/Commands/cs_misc.cpp @@ -1651,7 +1651,6 @@ public: return true; } - static bool HandleMaxSkillCommand(ChatHandler* handler, char const* /*args*/) { Player* SelectedPlayer = handler->getSelectedPlayer(); @@ -2076,7 +2075,6 @@ public: break; } - handler->PSendSysMessage(LANG_PINFO_CHR_RACE, (gender == 0 ? handler->GetAcoreString(LANG_CHARACTER_GENDER_MALE) : handler->GetAcoreString(LANG_CHARACTER_GENDER_FEMALE)), raceStr.c_str(), classStr.c_str()); // Output XII. LANG_PINFO_CHR_ALIVE diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.cpp index df9bac0e1..f3187e058 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.cpp @@ -431,7 +431,6 @@ public: if (creature->IsVendor() && player->GetReputationRank(59) >= REP_FRIENDLY) AddGossipItemFor(player, 4781, 0, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); - if (player->GetQuestRewardStatus(QUEST_A_BINDING_CONTRACT) != 1 && !player->HasItemCount(ITEM_THRORIUM_BROTHERHOOD_CONTRACT, 1, true) && player->HasItemCount(ITEM_SULFURON_INGOT)) 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 e0db4ab94..97d908ca4 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_pyroguard_emberseer.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_pyroguard_emberseer.cpp @@ -368,7 +368,6 @@ public: void UpdateAI(uint32 diff) override { - if (!UpdateVictim()) { _events.Update(diff); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp index 04c3ec649..addbec6a6 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp @@ -53,7 +53,6 @@ enum Misc REND_PATH_2 = 1379681, }; - struct Wave { uint32 entry; @@ -111,7 +110,6 @@ static Wave Wave6[] = // 27 sec { 10442, 212.2642f, -430.7648f, 110.9807f } }; - /*Position const GythLoc = { 211.762f, -397.5885f, 111.1817f, 4.747295f }; Position const Teleport1Loc = { 194.2993f, -474.0814f, 121.4505f, -0.01225555f }; Position const Teleport2Loc = { 216.485f, -434.93f, 110.888f, -0.01225555f };*/ diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_ragnaros.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_ragnaros.cpp index c99aeab92..ba459b8d8 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_ragnaros.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_ragnaros.cpp @@ -61,7 +61,6 @@ enum Events EVENT_INTRO_5 = 12 }; - class boss_ragnaros : public CreatureScript { public: diff --git a/src/server/scripts/EasternKingdoms/CMakeLists.txt b/src/server/scripts/EasternKingdoms/CMakeLists.txt index f0a0316b8..0e1340f42 100644 --- a/src/server/scripts/EasternKingdoms/CMakeLists.txt +++ b/src/server/scripts/EasternKingdoms/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) +# Copyright (C) # # This file is free software; as a special exception the author gives # unlimited permission to copy and/or distribute it, with or without diff --git a/src/server/scripts/EasternKingdoms/Deadmines/deadmines.h b/src/server/scripts/EasternKingdoms/Deadmines/deadmines.h index ed469b328..636d0ebf9 100644 --- a/src/server/scripts/EasternKingdoms/Deadmines/deadmines.h +++ b/src/server/scripts/EasternKingdoms/Deadmines/deadmines.h @@ -19,4 +19,3 @@ enum GameObjects }; #endif - diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp index 4a4614ae5..39fc6de7a 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp @@ -31,7 +31,6 @@ enum Netherspite SPELL_NETHERSPITE_ROAR = 38684, }; - const float PortalCoord[3][3] = { {-11195.353516f, -1613.237183f, 278.237258f}, // Left side diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp index 7e773a622..6ab296fbd 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp @@ -10,7 +10,6 @@ #include "karazhan.h" #include "SpellInfo.h" - enum PrinceSay { SAY_AGGRO = 0, @@ -74,7 +73,6 @@ struct InfernalPoint { -10935.7f, -1996.0f } };*/ - //---------Infernal code first class netherspite_infernal : public CreatureScript { @@ -100,7 +98,6 @@ public: void EnterCombat(Unit* /*who*/) override { } void MoveInLineOfSight(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) override { if (HellfireTimer) @@ -151,7 +148,6 @@ public: }; }; - class boss_malchezaar : public CreatureScript { public: @@ -469,7 +465,6 @@ public: uint32 AxesTargetSwitchTimer; InstanceScript* instance; - void Initialize() { AxesTargetSwitchTimer = 7500; diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp index 6e607175f..f1fbc7d0e 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp @@ -51,7 +51,6 @@ enum Creatures NPC_PORTAL = 17265 }; - class npc_kilrek : public CreatureScript { public: @@ -142,7 +141,6 @@ public: void AttackStart(Unit* /*who*/) override { } void MoveInLineOfSight(Unit* /*who*/) override { } - void JustDied(Unit* /*killer*/) override { if (SacrificeGUID) @@ -365,7 +363,6 @@ public: } } - if (SummonKilrekTimer <= diff) { DoCast(me, SPELL_SUMMON_IMP, true); diff --git a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp index f9ec7bd07..9b3633af5 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp @@ -133,7 +133,6 @@ public: InstanceScript* instance; - uint32 AggroTimer; uint32 WaterBoltTimer; @@ -143,7 +142,6 @@ public: bool SummonedTito; bool TitoDied; - void Reset() override { Initialize(); @@ -797,11 +795,8 @@ enum RedRidingHood CREATURE_BIG_BAD_WOLF = 17521, }; - #define GOSSIP_GRANDMA "What phat lewtz you have grandmother?" - - class npc_grandmother : public CreatureScript { public: @@ -997,7 +992,6 @@ enum JulianneRomulo ROMULO_Y = -1758, }; - enum RAJPhase { PHASE_JULIANNE = 0, diff --git a/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp b/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp index 19d75d64b..01ad14812 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp @@ -425,7 +425,6 @@ public: } }; - void AddSC_instance_karazhan() { new instance_karazhan(); diff --git a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp index 68c7e0481..f160edae6 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp @@ -413,7 +413,6 @@ public: #define SAY_DIALOG_ARCANAGOS_8 "What have you done, wizard? This cannot be! I'm burning from... within!" #define SAY_DIALOG_MEDIVH_9 "He should not have angered me. I must go... recover my strength now..." - //static float MedivPos[4] = {-11161.49f, -1902.24f, 91.48f, 1.94f}; static float ArcanagosPos[4] = {-11169.75f, -1881.48f, 107.39f, 4.83f}; diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp index 30adbedea..5ea446974 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp @@ -276,7 +276,6 @@ public: break; } - if (events.GetPhaseMask() == 0) DoMeleeAttackIfReady(); } diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.h b/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.h index b491f29de..df6ea5c87 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.h +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.h @@ -18,7 +18,6 @@ enum MTData MAX_ENCOUNTER = 4 }; - enum MTCreatures { NPC_DELRISSA = 24560, @@ -38,5 +37,4 @@ enum MTGameObjects GO_ESCAPE_ORB = 188173 }; - #endif diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp index 031631a66..05144e163 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp @@ -621,7 +621,6 @@ public: }; }; - // Theirs /*###### ##Quest 12848 diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp index 10a948119..0543ccfa9 100644 --- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp +++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp @@ -7,7 +7,6 @@ #include "shadowfang_keep.h" #include "TemporarySummon.h" - enum Creatures { NPC_ASH = 3850, @@ -16,7 +15,6 @@ enum Creatures NPC_ARUGAL_VOIDWALKER = 4627 }; - class instance_shadowfang_keep : public InstanceMapScript { public: diff --git a/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp b/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp index 7b5aa4c9d..58d222dab 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp @@ -238,7 +238,6 @@ public: if (!player) return; - uint32 uiEntry = aPlaguedCritters[urand(0, 2)]; for (uint8 i = 0; i < 30; ++i) { @@ -380,7 +379,6 @@ public: if (_gateTrapsCooldown[i]) break; - // Check that the trap is not on cooldown, if so check if player/pet is in range for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) { @@ -586,7 +584,6 @@ public: } }; - InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_stratholme_InstanceMapScript(map); diff --git a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.h b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.h index 05a1a5362..2e8bf0738 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.h +++ b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.h @@ -78,4 +78,3 @@ enum MiscIds }; #endif - diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp index 9ace12230..8df726e81 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp @@ -156,7 +156,6 @@ public: events2.ScheduleEvent(EVENT_INTRO_2, 3000); } - void KilledUnit(Unit* victim) override { if (victim->GetTypeId() == TYPEID_PLAYER && roll_chance_i(50)) diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp index b15abb92f..fbdac7c26 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp @@ -16,7 +16,6 @@ enum Yells SAY_SATH_SPELL1 = 3, SAY_SATH_SPELL2 = 4, - SAY_EVIL_AGGRO = 0, SAY_EVIL_SLAY = 1, SAY_GOOD_PLRWIN = 2, diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.h b/src/server/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.h index 388c17028..a601c0b82 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.h +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.h @@ -53,7 +53,6 @@ enum CreatureIds NPC_VOID_SENTINEL = 25772, NPC_VOID_SPAWN = 25824, - NPC_KILJAEDEN_CONTROLLER = 25608, NPC_KILJAEDEN = 25315, NPC_ANVEENA = 26046, diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp index 998f7750f..3799ed7c8 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp @@ -395,7 +395,6 @@ public: void MoveInLineOfSight(Unit* /*who*/) override { } - void MovementInform(uint32, uint32) override { arrived = true; @@ -454,4 +453,3 @@ void AddSC_boss_akilzon() new boss_akilzon(); new npc_akilzon_eagle(); } - diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp index 8fa85639a..e548689d9 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp @@ -799,7 +799,6 @@ public: } }; - class boss_slither : public CreatureScript { public: @@ -1000,4 +999,3 @@ void AddSC_boss_hex_lord_malacrass() new boss_alyson_antille(); new spell_hexlord_unstable_affliction(); } - diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp index 25188aaff..42e66af4c 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp @@ -468,7 +468,6 @@ public: void MoveInLineOfSight(Unit* /*who*/) override { } - void UpdateAI(uint32 /*diff*/) override { } }; @@ -709,4 +708,3 @@ void AddSC_boss_janalai() new npc_janalai_hatchling(); new npc_janalai_egg(); } - diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp index 6b0b47ab8..766adcdb7 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp @@ -462,4 +462,3 @@ void AddSC_boss_nalorakk() { new boss_nalorakk(); } - diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp index b5065dc14..d573a9220 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp @@ -599,4 +599,3 @@ void AddSC_boss_zuljin() new boss_zuljin(); new npc_zuljin_vortex(); } - diff --git a/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp b/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp index 10915c79c..7980334fb 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp @@ -405,4 +405,3 @@ void AddSC_instance_zulaman() { new instance_zulaman(); } - diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp index 07c9c0777..150085bb9 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp @@ -102,4 +102,3 @@ void AddSC_boss_grilek() { new boss_grilek(); } - diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp index baaace0d9..5619fa256 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp @@ -168,4 +168,3 @@ void AddSC_boss_hakkar() { new boss_hakkar(); } - diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp index 8236eb510..3f5f53a50 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp @@ -162,4 +162,3 @@ void AddSC_boss_renataki() { new boss_renataki(); } - diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp index f0f8d28a4..b691957da 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp @@ -94,4 +94,3 @@ void AddSC_boss_wushoolay() { new boss_wushoolay(); } - diff --git a/src/server/scripts/EasternKingdoms/zone_eastern_plaguelands.cpp b/src/server/scripts/EasternKingdoms/zone_eastern_plaguelands.cpp index 10b509d30..a3a7b2594 100644 --- a/src/server/scripts/EasternKingdoms/zone_eastern_plaguelands.cpp +++ b/src/server/scripts/EasternKingdoms/zone_eastern_plaguelands.cpp @@ -302,7 +302,6 @@ public: }; }; - // Theirs class npc_ghoul_flayer : public CreatureScript { diff --git a/src/server/scripts/EasternKingdoms/zone_eversong_woods.cpp b/src/server/scripts/EasternKingdoms/zone_eversong_woods.cpp index e421cabd6..43f9d7df7 100644 --- a/src/server/scripts/EasternKingdoms/zone_eversong_woods.cpp +++ b/src/server/scripts/EasternKingdoms/zone_eversong_woods.cpp @@ -14,7 +14,6 @@ EndScriptData */ /* ContentData EndContentData */ - void AddSC_eversong_woods() { } diff --git a/src/server/scripts/EasternKingdoms/zone_isle_of_queldanas.cpp b/src/server/scripts/EasternKingdoms/zone_isle_of_queldanas.cpp index acf498a62..bbc403304 100644 --- a/src/server/scripts/EasternKingdoms/zone_isle_of_queldanas.cpp +++ b/src/server/scripts/EasternKingdoms/zone_isle_of_queldanas.cpp @@ -625,8 +625,6 @@ public: }; }; - - /*###### THEIR: ######*/ /*###### diff --git a/src/server/scripts/EasternKingdoms/zone_undercity.cpp b/src/server/scripts/EasternKingdoms/zone_undercity.cpp index 01d37f80d..989a52896 100644 --- a/src/server/scripts/EasternKingdoms/zone_undercity.cpp +++ b/src/server/scripts/EasternKingdoms/zone_undercity.cpp @@ -481,7 +481,6 @@ enum ThrallMisc THRALL_SAY_THRONE_10 = 34, THRALL_SAY_THRONE_11 = 35, - // Sounds SOUND_THRALL_1 = 16212, SOUND_THRALL_2 = 16214, diff --git a/src/server/scripts/Events/brewfest.cpp b/src/server/scripts/Events/brewfest.cpp index 1812d3945..a695c04c0 100644 --- a/src/server/scripts/Events/brewfest.cpp +++ b/src/server/scripts/Events/brewfest.cpp @@ -297,7 +297,6 @@ public: } } - void EnterCombat(Unit* /*who*/) override { if (me->GetEntry() == NPC_URSULA_DIREBREW) @@ -352,7 +351,6 @@ public: }; }; - enum kegThrowers { QUEST_THERE_AND_BACK_AGAIN_A = 11122, @@ -1129,7 +1127,6 @@ public: } }; - /////////////////////////////////////// ////// SPELLS /////////////////////////////////////// diff --git a/src/server/scripts/Events/hallows_end.cpp b/src/server/scripts/Events/hallows_end.cpp index 5d0d4084d..e6bdaa270 100644 --- a/src/server/scripts/Events/hallows_end.cpp +++ b/src/server/scripts/Events/hallows_end.cpp @@ -918,7 +918,6 @@ enum headlessHorseman SPELL_PUMPKIN_AURA = 42294, SPELL_BURNING_BODY = 43184, - // NP SPELL_HORSEMAN_SMOKE = 42355, SPELL_SPIRIT_PARTICLES_GREEN_CHEST = 43161, @@ -971,7 +970,6 @@ public: for (std::list::iterator itr = unitList.begin(); itr != unitList.end(); ++itr) (*itr)->ToCreature()->DespawnOrUnsummon(500); - Map::PlayerList const& players = me->GetMap()->GetPlayers(); if (!players.isEmpty() && players.begin()->GetSource() && players.begin()->GetSource()->GetGroup()) sLFGMgr->FinishDungeon(players.begin()->GetSource()->GetGroup()->GetGUID(), 285, me->FindMap()); diff --git a/src/server/scripts/Events/love_in_air.cpp b/src/server/scripts/Events/love_in_air.cpp index e9c976fdc..271f34e52 100644 --- a/src/server/scripts/Events/love_in_air.cpp +++ b/src/server/scripts/Events/love_in_air.cpp @@ -377,14 +377,14 @@ public: { EntryCheckPredicate pred(NPC_APOTHECARY_BAXTER); summons.DoAction(ACTION_RELEASE_HELPER, pred); - + break; } case EVENT_CALL_FRYE: { EntryCheckPredicate pred(NPC_APOTHECARY_FRYE); summons.DoAction(ACTION_RELEASE_HELPER, pred); - + break; } case EVENT_SPELL_PERFUME_SPRAY: diff --git a/src/server/scripts/Events/midsummer.cpp b/src/server/scripts/Events/midsummer.cpp index 5f8daa810..39db60230 100644 --- a/src/server/scripts/Events/midsummer.cpp +++ b/src/server/scripts/Events/midsummer.cpp @@ -196,7 +196,6 @@ public: } }; - /////////////////////////////// // SPELLS /////////////////////////////// diff --git a/src/server/scripts/Events/winter_veil.cpp b/src/server/scripts/Events/winter_veil.cpp index e9d297ea6..de51bf09a 100644 --- a/src/server/scripts/Events/winter_veil.cpp +++ b/src/server/scripts/Events/winter_veil.cpp @@ -7,7 +7,6 @@ #include "GameEventMgr.h" #include "Player.h" - /////////////////////////////// // SPELLS /////////////////////////////// diff --git a/src/server/scripts/Kalimdor/CMakeLists.txt b/src/server/scripts/Kalimdor/CMakeLists.txt index 7a37f1436..a31ce64d3 100644 --- a/src/server/scripts/Kalimdor/CMakeLists.txt +++ b/src/server/scripts/Kalimdor/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) +# Copyright (C) # # This file is free software; as a special exception the author gives # unlimited permission to copy and/or distribute it, with or without diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.h b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.h index 5c5d48851..659c794f5 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.h +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.h @@ -85,4 +85,3 @@ enum GameobjectIds }; #endif - diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h index 115034cdc..55cdcf575 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h @@ -195,4 +195,3 @@ private: //std::list CreatureList; }; #endif - 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 2f182d0fc..abf962dbe 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp @@ -135,7 +135,6 @@ enum Spells SPELL_ARTHAS_CRUSADER_STRIKE = 50773, }; - #define GOSSIP_ITEM_ARTHAS_1 "Yes, my Prince. We're ready." #define GOSSIP_ITEM_ARTHAS_2 "We're only doing what is best for Loarderon your Highness." #define GOSSIP_ITEM_ARTHAS_3 "Lead the way Prince Arthas." 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 c5e263381..cf808550f 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp @@ -6,7 +6,6 @@ #include "ScriptedCreature.h" #include "old_hillsbrad.h" - enum EpochHunter { SAY_AGGRO = 3, diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.h b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.h index 8a7461c41..1a6c591fe 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.h +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.h @@ -76,4 +76,3 @@ enum MiscIds }; #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 54088a1d8..e6dafe382 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 @@ -10,7 +10,6 @@ #include "SpellInfo.h" #include "ScriptedCreature.h" - const Position PortalLocation[4] = { {-2041.06f, 7042.08f, 29.99f, 1.30f}, 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 10cfe9c06..a20a49bb3 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp @@ -247,8 +247,6 @@ public: } break; - - } } @@ -267,7 +265,6 @@ public: }; }; - enum timeRift { EVENT_SUMMON_AT_RIFT = 1, diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp index 5ca453d30..e823432aa 100644 --- a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp +++ b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp @@ -373,7 +373,7 @@ public: me->SendMovementFlagUpdate(); me->GetMotionMaster()->MoveTakeoff(11, OnyxiaMoveData[1].x + 1.0f, OnyxiaMoveData[1].y, OnyxiaMoveData[1].z, 12.0f); bManyWhelpsAvailable = true; - + events.RescheduleEvent(EVENT_END_MANY_WHELPS_TIME, 10000); } break; @@ -384,7 +384,7 @@ public: { me->SetSpeed(MOVE_RUN, 2.95f, false); me->GetMotionMaster()->MovePoint(5, OnyxiaMoveData[5].x, OnyxiaMoveData[5].y, OnyxiaMoveData[5].z); - + whelpSpam = true; events.ScheduleEvent(EVENT_WHELP_SPAM, 90000); events.ScheduleEvent(EVENT_SUMMON_LAIR_GUARD, 30000); @@ -417,7 +417,7 @@ public: me->SetFacingToObject(v); me->CastSpell(v, SPELL_FIREBALL, false); } - + events.ScheduleEvent(EVENT_SPELL_FIREBALL_SECOND, 4000); } break; @@ -459,7 +459,7 @@ public: me->SetFacingTo(OnyxiaMoveData[CurrentWP].o); me->MonsterTextEmote("Onyxia takes in a deep breath...", 0, true); me->CastSpell(me, OnyxiaMoveData[CurrentWP].spellId, false); - + events.ScheduleEvent(EVENT_SPELL_BREATH, 8250); } break; diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp index 3869e6cd3..404337004 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp @@ -51,8 +51,6 @@ enum Misc TELEPORTTIME = 30000 }; - - struct boss_twinemperorsAI : public ScriptedAI { boss_twinemperorsAI(Creature* creature): ScriptedAI(creature) diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.h b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.h index 8a706df7f..adf1f5b41 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.h +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.h @@ -48,4 +48,3 @@ enum Creatures NPC_VEKNILASH = 15275 }; #endif - diff --git a/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp b/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp index 12920929b..6129fe447 100644 --- a/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp +++ b/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp @@ -51,7 +51,7 @@ public: switch (urand(0, 2)) { case 0: - if (Player* player = killer->ToPlayer()) + if (Player* player = killer->ToPlayer()) { player->KilledMonsterCredit(NPC_EXPEDITION_RESEARCHER, 0); } @@ -63,7 +63,7 @@ public: break; } - if (spawnCreatureID) + if (spawnCreatureID) { me->SummonCreature(spawnCreatureID, 0.0f, 0.0f, 0.0f, me->GetOrientation(), TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 60000); } diff --git a/src/server/scripts/Kalimdor/zone_darkshore.cpp b/src/server/scripts/Kalimdor/zone_darkshore.cpp index 1235d3cb3..504efd28d 100644 --- a/src/server/scripts/Kalimdor/zone_darkshore.cpp +++ b/src/server/scripts/Kalimdor/zone_darkshore.cpp @@ -149,7 +149,6 @@ public: }; }; - // Theirs /*#### # npc_kerlonian diff --git a/src/server/scripts/Kalimdor/zone_desolace.cpp b/src/server/scripts/Kalimdor/zone_desolace.cpp index 1ae203463..7a0a8489f 100644 --- a/src/server/scripts/Kalimdor/zone_desolace.cpp +++ b/src/server/scripts/Kalimdor/zone_desolace.cpp @@ -412,7 +412,6 @@ public: }; }; - // Theirs enum DyingKodo { diff --git a/src/server/scripts/Kalimdor/zone_winterspring.cpp b/src/server/scripts/Kalimdor/zone_winterspring.cpp index 1bfc35c32..aca3f6406 100644 --- a/src/server/scripts/Kalimdor/zone_winterspring.cpp +++ b/src/server/scripts/Kalimdor/zone_winterspring.cpp @@ -210,7 +210,6 @@ public: }; }; - // Theirs /*###### ## npc_rivern_frostwind diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_elder_nadox.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_elder_nadox.cpp index a5a3369d7..1054d4cdd 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_elder_nadox.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_elder_nadox.cpp @@ -234,7 +234,6 @@ public: { npc_ahnkahar_nerubianAI(Creature* c) : ScriptedAI(c) { } - uint32 uiSprintTimer; void Reset() override { 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 96a764889..d05a55073 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp @@ -6,7 +6,6 @@ #include "ScriptedCreature.h" #include "ahnkahet.h" - enum Yells { TEXT_AGGRO = 0, diff --git a/src/server/scripts/Northrend/CMakeLists.txt b/src/server/scripts/Northrend/CMakeLists.txt index 41218b3f3..6c793ec1a 100644 --- a/src/server/scripts/Northrend/CMakeLists.txt +++ b/src/server/scripts/Northrend/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) +# Copyright (C) # # This file is free software; as a special exception the author gives # unlimited permission to copy and/or distribute it, with or without diff --git a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp index 26934aa6f..7776fd6e4 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp @@ -656,7 +656,7 @@ public: } void RespawnDragons(bool checkCombat) - { + { for (uint8 i = 0; i < MAX_DRAGONS; ++i) { if (instance->GetBossState(dragons[i]) == DONE) diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp index 7f0a941e9..532f9f564 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp @@ -13,7 +13,6 @@ #include "ruby_sanctum.h" #include "Player.h" - enum Texts { // Shared @@ -1466,7 +1465,6 @@ public: } }; - void AddSC_boss_halion() { new boss_halion(); diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp index 236bcfdd4..36574866a 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp @@ -423,7 +423,7 @@ public: case EVENT_MEMORY_SCALE: me->SetObjectScale(1.0f); events.ScheduleEvent(EVENT_MEMORY_START_ATTACK, 5000); - + break; case EVENT_MEMORY_START_ATTACK: me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); @@ -463,7 +463,6 @@ public: } }; - enum ArgentSoldierSpells { // monk 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 fdd526bf1..ed9b0effc 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp @@ -84,7 +84,6 @@ enum Models MODEL_GHOST = 21300 }; - class boss_black_knight : public CreatureScript { public: @@ -239,7 +238,7 @@ public: if( pInstance && !summons.empty() ) if( Creature* ghoul = pInstance->instance->GetCreature(*summons.begin()) ) ghoul->MonsterYell("[Zombie] .... . Brains ....", LANG_UNIVERSAL, 0); - + break; case EVENT_SPELL_PLAGUE_STRIKE: if( me->GetVictim() ) @@ -449,7 +448,7 @@ public: if (me->GetDistance(target) > 5.0f && me->GetDistance(target) < 30.0f) { me->CastSpell(target, SPELL_LEAP, false); - + break; } events.RepeatEvent(1000); diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp index 072b2e9f1..47e94e101 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp @@ -711,7 +711,7 @@ public: me->GetMotionMaster()->MovePoint(7, *mount); events.RepeatEvent(200); break; - } + } } break; case EVENT_MOUNT_CHARGE: @@ -829,7 +829,7 @@ public: /****************** HUNTER ******************/ case EVENT_HUNTER_SPELL_DISENGAGE: - + break; case EVENT_HUNTER_SPELL_LIGHTNING_ARROWS: me->CastSpell((Unit*)NULL, SPELL_LIGHTNING_ARROWS, false); @@ -918,7 +918,7 @@ public: } break; case EVENT_WARRIOR_SPELL_ROLLING_THROW: - + break; /*************** WARRIOR END ****************/ } 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 27b9a8b59..21416b685 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 @@ -962,7 +962,7 @@ public: { if( Creature* tirion = instance->GetCreature(NPC_TirionGUID) ) tirion->AI()->Talk(TEXT_GRATZ_SLAIN_CHAMPIONS); - + HandleGameObject(GO_EnterGateGUID, true); } break; diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp index a0d28f4cf..379241d67 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp @@ -691,7 +691,7 @@ public: me->CastSpell(me, SPELL_EXPOSE_WEAKNESS, true); me->CastSpell(me, SPELL_SPIDER_FRENZY, true); me->CastSpell(me, SPELL_SUBMERGE, false); - + events.DelayEvents(15000); events.RescheduleEvent(EVENT_EMERGE, 10000); } @@ -704,7 +704,7 @@ public: me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); me->CastSpell(me, SPELL_EMERGE, false); me->RemoveAura(SPELL_SUBMERGE); - + events.RescheduleEvent(EVENT_SUBMERGE, 30000); break; } @@ -813,12 +813,12 @@ public: break; case 1: me->CastSpell(me, SPELL_SPIKE_SPEED2, true); - + events.RescheduleEvent(2, 7000); break; case 2: me->CastSpell(me, SPELL_SPIKE_SPEED3, true); - + break; case 3: Reset(); @@ -940,7 +940,6 @@ public: } } - void Register() override { AfterHit += SpellHitFn(spell_gen_leeching_swarm_dmg_SpellScript::HandleAfterHit); 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 965d49a72..f6a2ec928 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp @@ -967,7 +967,7 @@ public: break; case EVENT_SPELL_SUMMON_FELHUNTER: DoSummon(35465, *me); - + break; case EVENT_SPELL_HELLFIRE: if( EnemiesInRange(9.0f) >= 3 ) @@ -1258,7 +1258,7 @@ public: break; case EVENT_SPELL_CALL_PET: DoSummon(35610, *me); - + break; case EVENT_SPELL_AIMED_SHOT: if( me->GetVictim() ) 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 830a86abd..54272a12a 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp @@ -76,7 +76,6 @@ enum JaraxxusEvents EVENT_SPELL_MISTRESS_KISS, }; - class boss_jaraxxus : public CreatureScript { public: @@ -234,14 +233,14 @@ public: Talk(EMOTE_NETHER_PORTAL); Talk(SAY_MISTRESS_OF_PAIN); me->CastSpell((Unit*)NULL, SPELL_SUMMON_NETHER_PORTAL, false); - + events.RescheduleEvent(EVENT_SUMMON_VOLCANO, 60000); break; case EVENT_SUMMON_VOLCANO: Talk(EMOTE_INFERNAL_ERUPTION); Talk(SAY_INFERNAL_ERUPTION); me->CastSpell((Unit*)NULL, SPELL_SUMMON_VOLCANO, false); - + events.RescheduleEvent(EVENT_SUMMON_NETHER_PORTAL, 60000); break; } diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp index c3acc5bfc..d3c36a250 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp @@ -150,7 +150,7 @@ public: case EVENT_SPELL_SNOBOLLED: if( t->GetTypeId() == TYPEID_PLAYER ) me->CastSpell((Unit*)NULL, SPELL_SNOBOLLED, true); - + break; case EVENT_SPELL_BATTER: if( t->GetTypeId() == TYPEID_PLAYER ) @@ -400,7 +400,6 @@ public: }; }; - /*********** ** ACIDMAW AND DREADSCALE ***********/ @@ -582,7 +581,7 @@ struct boss_jormungarAI : public ScriptedAI me->UpdatePosition(Locs[LOC_CENTER].GetPositionX() + cos(angle)*dist, Locs[LOC_CENTER].GetPositionY() + sin(angle)*dist, me->GetPositionZ(), me->GetOrientation(), true); me->StopMovingOnCurrentPos(); DoResetThreat(); - + events.RescheduleEvent(EVENT_EMERGE, 6000); } break; @@ -684,7 +683,6 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const override { return new boss_acidmawAI(creature); @@ -716,7 +714,6 @@ public: } }; - /*********** ** ICEHOWL ***********/ @@ -892,7 +889,7 @@ public: case EVENT_SPELL_MASSIVE_CRASH: me->GetMotionMaster()->Clear(); me->CastSpell((Unit*)NULL, SPELL_MASSIVE_CRASH, false); - + events.RescheduleEvent(EVENT_GAZE, 2000); break; case EVENT_GAZE: @@ -914,7 +911,7 @@ public: me->GetMotionMaster()->MovementExpired(); me->SetReactState(REACT_AGGRESSIVE); } - + break; case EVENT_JUMP_BACK: { @@ -963,7 +960,7 @@ public: me->GetMotionMaster()->MoveCharge(destX, destY, destZ + 1.0f, 65.0f); me->SetUInt64Value(UNIT_FIELD_TARGET, 0); events.RescheduleEvent(EVENT_CHECK_TRAMPLE_PLAYERS, 100); - + break; case EVENT_CHECK_TRAMPLE_PLAYERS: if( DoTrampleIfValid() ) @@ -982,7 +979,7 @@ public: break; case EVENT_REFRESH_POSITION: //me->SetFacingTo(me->GetOrientation()); - + break; } @@ -1025,7 +1022,6 @@ public: }; }; - void AddSC_boss_northrend_beasts() { new boss_gormok(); diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp index 20762b6c9..ed0309048 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp @@ -288,7 +288,7 @@ struct boss_twin_valkyrAI : public ScriptedAI twin->CastSpell(twin, SPELL_BERSERK, true); twin->AI()->Talk(SAY_BERSERK); } - + break; case EVENT_SUMMON_BALLS_1: case EVENT_SUMMON_BALLS_2: @@ -306,7 +306,7 @@ struct boss_twin_valkyrAI : public ScriptedAI if( Creature* ball = me->SummonCreature((i % 2) ? NPC_CONCENTRATED_DARK : NPC_CONCENTRATED_LIGHT, Locs[LOC_CENTER].GetPositionX() + cos(angle) * 47.0f, Locs[LOC_CENTER].GetPositionY() + sin(angle) * 47.0f, Locs[LOC_CENTER].GetPositionZ() + 1.5f, 0.0f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 1500) ) boss_twin_valkyrAI::JustSummoned(ball); } - + switch( eventId ) { case EVENT_SUMMON_BALLS_1: @@ -448,7 +448,7 @@ struct boss_twin_valkyrAI : public ScriptedAI break; case EVENT_REMOVE_DUAL_WIELD: me->SetCanDualWield(false); - + break; } 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 dc113abb3..d18342311 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 @@ -609,7 +609,7 @@ public: { if( Creature* c = instance->GetCreature(NPC_VarianGUID) ) c->AI()->Talk(SAY_STAGE_0_03a); - + events.RescheduleEvent(EVENT_SCENE_003, 5000); } break; @@ -617,7 +617,7 @@ public: { if( Creature* c = instance->GetCreature(NPC_GarroshGUID) ) c->AI()->Talk(SAY_STAGE_0_03h); - + events.RescheduleEvent(EVENT_SCENE_004, 8000); } break; @@ -630,7 +630,7 @@ public: c->AI()->Talk(SAY_STAGE_0_02); HandleGameObject(GO_MainGateGUID, true); HandleGameObject(GO_EnterGateGUID, false); - + events.RescheduleEvent(EVENT_SUMMON_GORMOK, 1000); if (instance->IsHeroic()) { @@ -653,14 +653,14 @@ public: if( Creature* c = instance->GetCreature(NPC_IcehowlGUID) ) if (c->IsAlive()) c->CastSpell(c, 26662, true); - + break; case EVENT_SUMMON_GORMOK: { if( Creature* c = instance->GetCreature(NPC_TirionGUID) ) if( Creature* gormok = c->SummonCreature(NPC_GORMOK, Locs[LOC_BEHIND_GATE].GetPositionX(), Locs[LOC_BEHIND_GATE].GetPositionY(), Locs[LOC_BEHIND_GATE].GetPositionZ(), Locs[LOC_BEHIND_GATE].GetOrientation(), TEMPSUMMON_CORPSE_TIMED_DESPAWN, 30000) ) gormok->GetMotionMaster()->MovePoint(0, Locs[LOC_GATE_FRONT].GetPositionX(), Locs[LOC_GATE_FRONT].GetPositionY(), Locs[LOC_GATE_FRONT].GetPositionZ()); - + events.RescheduleEvent(EVENT_GORMOK_ATTACK, 10000); events.RescheduleEvent(EVENT_CLOSE_GATE, 6000); } @@ -686,7 +686,7 @@ public: northrendBeastsMask |= 16; if( Creature* c = instance->GetCreature(NPC_TirionGUID) ) c->AI()->Talk(SAY_STAGE_0_04); - + events.RescheduleEvent(EVENT_OPEN_GATE, 3000); events.RescheduleEvent(EVENT_SUMMON_ACIDMAW_AND_DREADSCALE, 4000); break; @@ -700,16 +700,16 @@ public: if( Creature* acidmaw = c->SummonCreature(NPC_ACIDMAW, Locs[LOC_ACIDMAW].GetPositionX(), Locs[LOC_ACIDMAW].GetPositionY(), Locs[LOC_ACIDMAW].GetPositionZ(), Locs[LOC_ACIDMAW].GetOrientation(), TEMPSUMMON_MANUAL_DESPAWN) ) acidmaw->AddAura(53421, acidmaw); } - + events.RescheduleEvent(EVENT_SCENE_005_2, 4000); break; } - + case EVENT_SCENE_005_2: { if( Creature* dreadscale = instance->GetCreature(NPC_DreadscaleGUID) ) dreadscale->GetMotionMaster()->MovePoint(0, Locs[LOC_DREADSCALE].GetPositionX(), Locs[LOC_DREADSCALE].GetPositionY(), Locs[LOC_DREADSCALE].GetPositionZ()); - + events.RescheduleEvent(EVENT_ACIDMAW_AND_DREADSCALE_ATTACK, 7000); break; } @@ -747,7 +747,7 @@ public: northrendBeastsMask |= 32; if( Creature* c = instance->GetCreature(NPC_TirionGUID) ) c->AI()->Talk(SAY_STAGE_0_05); - + events.RescheduleEvent(EVENT_OPEN_GATE, 2000); events.RescheduleEvent(EVENT_SUMMON_ICEHOWL, 3000); break; @@ -757,7 +757,7 @@ public: if( Creature* c = instance->GetCreature(NPC_TirionGUID) ) if( Creature* icehowl = c->SummonCreature(NPC_ICEHOWL, Locs[LOC_BEHIND_GATE].GetPositionX(), Locs[LOC_BEHIND_GATE].GetPositionY(), Locs[LOC_BEHIND_GATE].GetPositionZ(), Locs[LOC_BEHIND_GATE].GetOrientation(), TEMPSUMMON_CORPSE_TIMED_DESPAWN, 630000000) ) icehowl->GetMotionMaster()->MovePoint(0, Locs[LOC_GATE_FRONT].GetPositionX(), Locs[LOC_GATE_FRONT].GetPositionY(), Locs[LOC_GATE_FRONT].GetPositionZ()); - + events.RescheduleEvent(EVENT_ICEHOWL_ATTACK, 10000); events.RescheduleEvent(EVENT_CLOSE_GATE, 6000); break; @@ -813,7 +813,7 @@ public: HandleGameObject(GO_MainGateGUID, false); if( Creature* c = instance->GetCreature(NPC_FizzlebangGUID) ) c->AI()->Talk(SAY_STAGE_1_02); - + events.RescheduleEvent(EVENT_SCENE_103, 11000); break; } @@ -826,7 +826,7 @@ public: if( Creature* trigger = c->SummonCreature(NPC_PURPLE_GROUND, Locs[LOC_CENTER].GetPositionX(), Locs[LOC_CENTER].GetPositionY(), Locs[LOC_CENTER].GetPositionZ(), Locs[LOC_CENTER].GetOrientation(), TEMPSUMMON_MANUAL_DESPAWN) ) NPC_PurpleGroundGUID = trigger->GetGUID(); } - + events.RescheduleEvent(EVENT_SCENE_104, 5000); break; } @@ -843,7 +843,7 @@ public: } c->HandleEmoteCommand(EMOTE_STATE_SPELL_PRECAST); } - + events.RescheduleEvent(EVENT_SUMMON_JARAXXUS, 5000); break; } @@ -856,7 +856,7 @@ public: c->HandleEmoteCommand(EMOTE_STATE_NONE); c->AI()->Talk(SAY_STAGE_1_04); } - + events.RescheduleEvent(EVENT_SCENE_105, 3000); break; } @@ -870,7 +870,7 @@ public: if( Creature* c = instance->GetCreature(NPC_PortalGUID) ) c->DespawnOrUnsummon(); NPC_PortalGUID = 0; - + events.RescheduleEvent(EVENT_SCENE_106, 10000); break; } @@ -878,7 +878,7 @@ public: { if( Creature* c = instance->GetCreature(NPC_JaraxxusGUID) ) c->AI()->Talk(SAY_STAGE_1_05); - + events.RescheduleEvent(EVENT_SCENE_107, 5000); break; } @@ -886,7 +886,7 @@ public: { if( Creature* c = instance->GetCreature(NPC_FizzlebangGUID) ) c->AI()->Talk(SAY_STAGE_1_06); - + events.RescheduleEvent(EVENT_SCENE_108, 800); break; } @@ -902,7 +902,7 @@ public: Unit::Kill(f, f); } } - + events.RescheduleEvent(EVENT_SCENE_109, 5000); break; } @@ -912,7 +912,7 @@ public: c->SetFacingTo(3 * M_PI / 2); if( Creature* c = instance->GetCreature(NPC_TirionGUID) ) c->AI()->Talk(SAY_STAGE_1_07); - + events.RescheduleEvent(EVENT_JARAXXUS_ATTACK, 6000); break; } @@ -936,7 +936,7 @@ public: { if( Creature* c = instance->GetCreature(NPC_TirionGUID) ) c->AI()->Talk(SAY_STAGE_1_08); - + events.RescheduleEvent(EVENT_SCENE_111, 18000); break; } @@ -944,7 +944,7 @@ public: { if( Creature* c = instance->GetCreature(NPC_GarroshGUID) ) c->AI()->Talk(SAY_STAGE_1_09); - + events.RescheduleEvent(EVENT_SCENE_112, 9000); break; } @@ -952,7 +952,7 @@ public: { if( Creature* c = instance->GetCreature(NPC_VarianGUID) ) c->AI()->Talk(SAY_STAGE_1_10); - + events.RescheduleEvent(EVENT_SCENE_113, 5000); break; } @@ -963,7 +963,7 @@ public: if( Creature* c = instance->GetCreature(NPC_BarrettGUID) ) c->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); break; - } + } case EVENT_SCENE_201: { // move Jaraxxus to side, can't remove corpse because of loot! @@ -976,7 +976,7 @@ public: if( Creature* c = instance->GetCreature(NPC_TirionGUID) ) c->AI()->Talk(SAY_STAGE_2_01); - + events.RescheduleEvent(EVENT_SCENE_202, 9000); break; } @@ -1009,7 +1009,7 @@ public: { if( Creature* c = instance->GetCreature(NPC_TirionGUID) ) c->AI()->Talk(SAY_STAGE_2_03); - + events.RescheduleEvent(EVENT_SCENE_204, 5000); break; } @@ -1027,7 +1027,7 @@ public: c->AI()->Talk(SAY_STAGE_2_04a); events.RescheduleEvent(EVENT_SCENE_205, 5000); } - + events.RescheduleEvent(EVENT_SUMMON_CHAMPIONS, 2500); break; } @@ -1137,7 +1137,7 @@ public: if( Creature* c = instance->GetCreature(NPC_BarrettGUID) ) c->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); break; - } + } case EVENT_SCENE_301: { if( Creature* c = instance->GetCreature(NPC_TirionGUID) ) @@ -1165,7 +1165,7 @@ public: if( Creature* t = c->SummonCreature(NPC_DARKBANE, Locs[LOC_VALKYR_LEFT].GetPositionX(), Locs[LOC_VALKYR_LEFT].GetPositionY(), Locs[LOC_VALKYR_LEFT].GetPositionZ(), Locs[LOC_VALKYR_LEFT].GetOrientation(), TEMPSUMMON_CORPSE_TIMED_DESPAWN, 630000000) ) t->GetMotionMaster()->MovePoint(0, Locs[LOC_VALKYR_DEST_LEFT].GetPositionX(), Locs[LOC_VALKYR_DEST_LEFT].GetPositionY(), Locs[LOC_VALKYR_DEST_LEFT].GetPositionZ()); } - + events.RescheduleEvent(EVENT_SCENE_304, 6250); break; } @@ -1302,7 +1302,7 @@ public: break; } - + case EVENT_SCENE_407: { if( Creature* c = instance->GetCreature(NPC_LichKingGUID) ) @@ -1336,7 +1336,7 @@ public: InstanceProgress = INSTANCE_PROGRESS_ANUB_ARAK; SpawnAnubArak(); } - + events.RescheduleEvent(EVENT_SCENE_410, 2000); break; } @@ -1412,7 +1412,7 @@ public: } break; } - + } } diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.h b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.h index ce153d000..61216632a 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.h +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.h @@ -361,7 +361,6 @@ enum eAchievementCriteria ACHIEV_CRITERIA_REALM_FIRST_GRAND_CRUSADER = 12350, }; - enum euiWorldStates { UPDATE_STATE_UI_SHOW = 4390, diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp index e31a3d83c..6047fb6a5 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp @@ -159,7 +159,7 @@ public: me->CastSpell(me, SPELL_SOULSTORM, false); me->CastSpell(me, SPELL_TELEPORT_VISUAL, true); me->CastSpell(me, SPELL_SOULSTORM_VISUAL, true); - + break; } @@ -198,7 +198,6 @@ public: } }; - class npc_fos_corrupted_soul_fragment : public CreatureScript { public: @@ -251,7 +250,6 @@ public: } }; - class spell_bronjahm_magic_bane : public SpellScriptLoader { public: @@ -289,7 +287,6 @@ public: } }; - class spell_bronjahm_soulstorm_channel_ooc : public SpellScriptLoader { public: @@ -317,7 +314,6 @@ public: } }; - class spell_bronjahm_soulstorm_visual : public SpellScriptLoader { public: @@ -361,7 +357,6 @@ public: } }; - class spell_bronjahm_soulstorm_targeting : public SpellScriptLoader { public: @@ -388,7 +383,6 @@ public: } }; - void AddSC_boss_bronjahm() { new boss_bronjahm(); diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp index ccb466a49..1cdb43106 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp @@ -294,7 +294,6 @@ public: } }; - class spell_wailing_souls_periodic : public SpellScriptLoader { public: @@ -359,7 +358,6 @@ public: } }; - void AddSC_boss_devourer_of_souls() { new boss_devourer_of_souls(); diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp index 0af473011..0671a6d8f 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp @@ -72,7 +72,7 @@ public: case 0: break; case 1: - + if (me->GetEntry() == NPC_JAINA_PART1) { Talk(SAY_JAINA_INTRO_1); @@ -85,7 +85,7 @@ public: } break; case 2: - + if (me->GetEntry() == NPC_JAINA_PART1) { Talk(SAY_JAINA_INTRO_2); @@ -98,7 +98,7 @@ public: } break; case 3: - + if (me->GetEntry() == NPC_JAINA_PART1) { Talk(SAY_JAINA_INTRO_3); @@ -111,7 +111,7 @@ public: } break; case 4: - + if (me->GetEntry() == NPC_JAINA_PART1) { Talk(SAY_JAINA_INTRO_4); @@ -124,7 +124,7 @@ public: } break; case 5: - + if (me->GetEntry() == NPC_JAINA_PART1) { Talk(SAY_JAINA_INTRO_5); @@ -137,7 +137,7 @@ public: } break; case 6: - + if (me->GetEntry() == NPC_JAINA_PART1) { Talk(SAY_JAINA_INTRO_6); @@ -149,7 +149,7 @@ public: } break; case 7: - + if (me->GetEntry() == NPC_JAINA_PART1) { Talk(SAY_JAINA_INTRO_7); @@ -157,7 +157,7 @@ public: } break; case 8: - + if (me->GetEntry() == NPC_JAINA_PART1) { Talk(SAY_JAINA_INTRO_8); @@ -210,7 +210,6 @@ public: } }; - class npc_fos_leader_second : public CreatureScript { public: @@ -243,7 +242,6 @@ public: } }; - class spell_shield_of_bones : public SpellScriptLoader { public: diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp index e91b460c8..11a22887e 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp @@ -244,7 +244,7 @@ public: me->GetMotionMaster()->MoveJump(northForgePos.GetPositionX(), northForgePos.GetPositionY(), northForgePos.GetPositionZ(), 25.0f, 15.0f, 0); else if (phase == 2) me->GetMotionMaster()->MoveJump(southForgePos.GetPositionX(), southForgePos.GetPositionY(), southForgePos.GetPositionZ(), 25.0f, 15.0f, 0); - + break; case EVENT_SPELL_CHILLING_WAVE: me->CastSpell(me->GetVictim(), SPELL_CHILLING_WAVE, false); diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp index f54a7cffd..dbd06a438 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp @@ -202,7 +202,7 @@ public: me->SetReactState(REACT_AGGRESSIVE); if (!UpdateVictim()) return; - + break; case EVENT_SPECIAL: switch(urand(0, 2)) @@ -315,7 +315,7 @@ public: c->AI()->Reset(); } } - + events.RescheduleEvent(1, 3000); break; case 1: @@ -335,7 +335,7 @@ public: if (Creature* c = pInstance->instance->GetCreature(pInstance->GetData64(DATA_GUARD_1_GUID + i))) c->DespawnOrUnsummon(); } - + events.RescheduleEvent(2, 7000); break; case 2: @@ -350,12 +350,12 @@ public: if (Creature* c = pInstance->instance->GetCreature(pInstance->GetData64(DATA_LEADER_FIRST_GUID))) c->AI()->Talk(c->GetEntry() == NPC_JAINA_PART1 ? SAY_JAINA_KRICK_1 : SAY_SYLVANAS_KRICK_1); } - + events.RescheduleEvent(3, 6500); break; case 3: Talk(SAY_OUTRO_KRICK_2); - + events.RescheduleEvent(4, 17000); break; case 4: @@ -366,12 +366,12 @@ public: if (Creature* c = pInstance->instance->GetCreature(pInstance->GetData64(DATA_LEADER_FIRST_GUID))) c->AI()->Talk(c->GetEntry() == NPC_JAINA_PART1 ? SAY_JAINA_KRICK_2 : SAY_SYLVANAS_KRICK_2); } - + events.RescheduleEvent(5, 6500); break; case 5: Talk(SAY_OUTRO_KRICK_3); - + events.RescheduleEvent(6, 6500); break; case 6: @@ -381,7 +381,7 @@ public: c->SetFacingToObject(me); c->AI()->Talk(SAY_TYRANNUS_KRICK_1); } - + events.RescheduleEvent(7, 4000); break; case 7: @@ -392,12 +392,11 @@ public: me->SendMovementFlagUpdate(); me->GetMotionMaster()->MoveTakeoff(0, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ() + 9.0f, 0.5f * 7.0f); - events.RescheduleEvent(8, 2000); break; case 8: Talk(SAY_OUTRO_KRICK_4); - + events.RescheduleEvent(9, 1500); break; case 9: @@ -415,14 +414,14 @@ public: me->RemoveAllAuras(); me->GetMotionMaster()->MoveFall(0, true); - + events.RescheduleEvent(10, 5000); break; case 10: if (pInstance) if (Creature* c = pInstance->instance->GetCreature(pInstance->GetData64(DATA_TYRANNUS_EVENT_GUID))) c->AI()->Talk(SAY_TYRANNUS_KRICK_2); - + events.RescheduleEvent(11, 9000); break; case 11: @@ -438,7 +437,7 @@ public: } me->setActive(false); Unit::Kill(me, me); - + break; } } diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp index 7cebbd32d..9c2131bf0 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp @@ -146,7 +146,7 @@ public: if (me->IsWithinMeleeRange(me->GetVictim())) { me->CastSpell(me->GetVictim(), SPELL_FORCEFUL_SMASH, false); - + events.RescheduleEvent(EVENT_SPELL_UNHOLY_POWER, 1000); break; } @@ -156,7 +156,7 @@ public: Talk(SAY_SMASH); Talk(EMOTE_SMASH); me->CastSpell(me, SPELL_UNHOLY_POWER, false); - + events.ScheduleEvent(EVENT_SPELL_FORCEFUL_SMASH, urand(40000, 48000)); break; case EVENT_SPELL_OVERLORDS_BRAND: 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 45532b77e..977f2c42d 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,7 @@ public: } else { - + events.RescheduleEvent(2, 2500); } } @@ -100,14 +100,14 @@ public: c->setActive(true); c->AI()->Talk(SAY_TYRANNUS_INTRO_1); } - + events.RescheduleEvent(3, 7000); break; case 3: if (pInstance) if (Creature* c = pInstance->instance->GetCreature(pInstance->GetData64(DATA_TYRANNUS_EVENT_GUID))) c->AI()->Talk(SAY_TYRANNUS_INTRO_2); - + events.RescheduleEvent(4, 14000); break; case 4: @@ -148,19 +148,19 @@ public: } } } - + events.RescheduleEvent(5, 1); break; case 5: Talk(me->GetEntry() == NPC_JAINA_PART1 ? SAY_JAINA_INTRO_1 : SAY_SYLVANAS_INTRO_1); - + events.RescheduleEvent(6, 1000); break; case 6: if (pInstance) if (Creature* c = pInstance->instance->GetCreature(pInstance->GetData64(DATA_TYRANNUS_EVENT_GUID))) c->AI()->Talk(SAY_TYRANNUS_INTRO_3); - + events.RescheduleEvent(7, 5000); break; case 7: @@ -190,14 +190,14 @@ public: c->GetMotionMaster()->MoveTakeoff(0, c->GetPositionX() + dist * cos(angle), c->GetPositionY() + dist * sin(angle), c->GetPositionZ() + 6.0f + (float)urand(0, 4), 1.5f + frand(0.0f, 1.5f)); } } - + events.RescheduleEvent(8, 7000); break; case 8: if (pInstance) if (Creature* c = pInstance->instance->GetCreature(pInstance->GetData64(DATA_TYRANNUS_EVENT_GUID))) c->CastSpell(c, 69753, false); - + events.RescheduleEvent(9, 400); break; case 9: @@ -211,12 +211,12 @@ public: c->RemoveAllAuras(); c->GetMotionMaster()->MoveFall(0, true); } - + events.RescheduleEvent(10, 1000); break; case 10: Talk(me->GetEntry() == NPC_JAINA_PART1 ? SAY_JAINA_INTRO_2 : SAY_SYLVANAS_INTRO_2); - + events.RescheduleEvent(11, 1000); break; case 11: @@ -232,7 +232,7 @@ public: c->SendMovementFlagUpdate(); c->CastSpell(c, 69350, true); } - + events.RescheduleEvent(12, 2000); break; case 12: @@ -253,7 +253,7 @@ public: c->SetReactState(REACT_PASSIVE); } } - + events.RescheduleEvent(13, 3000); break; case 13: @@ -273,7 +273,7 @@ public: c->SetHomePosition(me->GetPositionX() + dist * cos(angle), me->GetPositionY() + dist * sin(angle), me->GetPositionZ(), 0.0f); } } - + events.RescheduleEvent(14, 2000); break; case 14: @@ -292,7 +292,7 @@ public: c->CastSpell(c, 70513, false); } } - + events.RescheduleEvent(15, 2000); break; case 15: @@ -308,7 +308,7 @@ public: c->CastSpell(c, 70464, false); } } - + events.RescheduleEvent(16, 3000); break; case 16: @@ -333,13 +333,13 @@ public: } pInstance->SetData(DATA_INSTANCE_PROGRESS, INSTANCE_PROGRESS_FINISHED_INTRO); } - + events.RescheduleEvent(17, 5000); break; case 17: me->setActive(false); Talk(me->GetEntry() == NPC_JAINA_PART1 ? SAY_JAINA_INTRO_5 : SAY_SYLVANAS_INTRO_4); - + break; } @@ -548,12 +548,12 @@ public: case 2: if (Creature* c = me->SummonCreature(NPC_TYRANNUS_VOICE, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ() - 10.0f, me->GetOrientation(), TEMPSUMMON_TIMED_DESPAWN, 1)) c->AI()->Talk(SAY_TYRANNUS_GARFROST); - + events.RescheduleEvent(3, 4000); break; case 3: Talk(SAY_GENERAL_GARFROST); - + break; } } @@ -1222,26 +1222,26 @@ public: c->SetHover(true); c->GetMotionMaster()->MovePoint(0, TSSindragosaPos2); } - + break; case 2: if (pInstance) if (Creature* c = pInstance->instance->GetCreature(pInstance->GetData64(DATA_MARTIN_OR_GORKUN_GUID))) c->AI()->Talk(SAY_GENERAL_OUTRO_2); - + events.RescheduleEvent(3, me->GetEntry() == NPC_JAINA_PART2 ? 7000 : 8000); break; case 3: Talk(me->GetEntry() == NPC_JAINA_PART2 ? SAY_JAINA_OUTRO_1 : SAY_SYLVANAS_OUTRO_1); me->CastSpell(me, me->GetEntry() == NPC_JAINA_PART2 ? SPELL_TELEPORT_JAINA_VISUAL : SPELL_TELEPORT_SYLVANAS_VISUAL, true); - + events.RescheduleEvent(4, 2000); break; case 4: me->CastSpell(me, me->GetEntry() == NPC_JAINA_PART2 ? SPELL_TELEPORT_JAINA : SPELL_TELEPORT_SYLVANAS, true); if (GameObject* barrier = me->SummonGameObject(203005, 1055.49f, 115.03f, 628.15f, 2.08f, 0.0f, 0.0f, 0.0f, 0.0f, 86400, false)) barrierGUID = barrier->GetGUID(); - + events.RescheduleEvent(5, 1500); break; case 5: @@ -1251,7 +1251,7 @@ public: if (Creature* c = pInstance->instance->GetCreature(pInstance->GetData64(DATA_SINDRAGOSA_GUID))) c->CastSpell(x->GetPositionX(), x->GetPositionY(), x->GetPositionZ(), SPELL_SINDRAGOSA_FROST_BOMB_POS, true); } - + events.RescheduleEvent(6, 5000); events.RescheduleEvent(10, 2000); break; @@ -1259,7 +1259,7 @@ public: if (pInstance) if (Creature* c = pInstance->instance->GetCreature(pInstance->GetData64(DATA_SINDRAGOSA_GUID))) c->GetMotionMaster()->MovePoint(0, TSSindragosaPos1); - + events.RescheduleEvent(7, 4500); break; case 7: @@ -1269,7 +1269,7 @@ public: if (GameObject* barrier = pInstance->instance->GetGameObject(barrierGUID)) barrier->Delete(); barrierGUID = 0; - + events.RescheduleEvent(8, 2000); break; case 8: @@ -1278,7 +1278,7 @@ public: case 10: if (Creature* x = pInstance->instance->GetCreature(pInstance->GetData64(DATA_MARTIN_OR_GORKUN_GUID))) x->AI()->DoAction(3); - + break; } } diff --git a/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp b/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp index ef332d310..9eea54055 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp @@ -301,7 +301,6 @@ public: break; } - DoMeleeAttackIfReady(); } }; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp index 052ae4c66..dae23c0a8 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp @@ -467,7 +467,6 @@ public: minrange = summon->GetExactDist(p); } - summon->ToTempSummon()->DespawnOrUnsummon(30000); } else diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp index db4ee3731..08d35f48a 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp @@ -43,7 +43,6 @@ enum Spells SPELL_COLDFLAME_SUMMON = 69147, }; - enum Events { EVENT_ENABLE_BONE_SLICE = 1, diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp index 5e18b8193..41c640f8d 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp @@ -1265,7 +1265,6 @@ public: } } - targets.remove_if(acore::UnitAuraCheck(true, sSpellMgr->GetSpellIdForDifficulty(SPELL_UNBOUND_PLAGUE, GetCaster()))); acore::Containers::RandomResizeList(targets, 1); } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp index f5f2042f0..cafba3e24 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp @@ -856,7 +856,6 @@ public: } }; - class npc_precious_icc : public CreatureScript { public: diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp index c95fb07e2..5019baed7 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp @@ -1225,7 +1225,6 @@ public: unitList = targetList; } - void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_sindragosa_ice_tomb_SpellScript::FilterTargets, EFFECT_1, TARGET_UNIT_DEST_AREA_ENEMY); @@ -1372,8 +1371,6 @@ public: } }; - - class npc_spinestalker : public CreatureScript { public: 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 3542aed54..9024b15c3 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp @@ -358,7 +358,6 @@ void SendPacketToPlayers(WorldPacket const* data, Unit* source) player->GetSession()->SendPacket(data); } - struct ShadowTrapLKTargetSelector : public acore::unary_function { public: @@ -385,8 +384,6 @@ private: float _maxDist; }; - - struct NonTankLKTargetSelector : public acore::unary_function { public: @@ -421,7 +418,6 @@ private: uint32 _exclude2; }; - struct DefileTargetSelector : public acore::unary_function { public: @@ -612,7 +608,6 @@ private: bool _reverse; }; - class boss_the_lich_king : public CreatureScript { public: @@ -1459,7 +1454,6 @@ public: } break; - case EVENT_OUTRO_LK_TALK_1: if (Creature* theLichKing = ObjectAccessor::GetCreature(*me, _instance->GetData64(DATA_THE_LICH_KING))) { @@ -1627,7 +1621,6 @@ public: me->CastSpell((Unit*)NULL, SPELL_JUMP, false); break; - default: break; } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp index bda6178e5..d8eda808b 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp @@ -2346,7 +2346,6 @@ public: } }; - // pussywizard below: class spell_icc_web_wrap : public SpellScriptLoader @@ -3462,7 +3461,6 @@ public: events.ScheduleEvent(EVENT_SUMMON_BROODLING, 10000 + i * 350); } - void SummonBroodling() { float dist = frand(18.0f, 39.0f); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp index 83816faeb..700446b06 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp @@ -1607,7 +1607,6 @@ public: << ColdflameJetsState << ' ' << BloodQuickeningState << ' ' << BloodQuickeningMinutes << ' ' << WeeklyQuestId10 << ' ' << PutricideEventProgress << ' ' << uint32(LichKingHeroicAvailable ? 1 : 0) << ' ' << BloodPrinceTrashCount << ' ' << uint32(IsBuffAvailable ? 1 : 0); - OUT_SAVE_INST_DATA_COMPLETE; return saveStream.str(); } @@ -1871,7 +1870,7 @@ public: break; } } - + void SetPositionTraps(GameObject* go) { std::vector trapPositions; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp b/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp index 51eb3137f..d26d1bbee 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp @@ -190,7 +190,7 @@ public: } case EVENT_SPELL_BERSERK: me->CastSpell(me, SPELL_BERSERK, true); - + break; } @@ -203,4 +203,3 @@ void AddSC_boss_anubrekhan() { new boss_anubrekhan(); } - diff --git a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp index e300438fe..ffafaa604 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp @@ -89,8 +89,6 @@ const uint32 TABLE_SPELL_PUNISH[4] = {SPELL_ZELIEK_CONDEMNATION, SPELL_BLAUMEUX_ const uint32 TABLE_SPELL_SECONDARY_10[4] = {SPELL_ZELIEK_HOLY_WRATH_10, SPELL_BLAUMEUX_VOID_ZONE_10, 0, 0}; const uint32 TABLE_SPELL_SECONDARY_25[4] = {SPELL_ZELIEK_HOLY_WRATH_25, SPELL_BLAUMEUX_VOID_ZONE_25, 0, 0}; - - const Position WaypointPositions[12] = { // Thane waypoints @@ -310,7 +308,7 @@ public: case EVENT_BERSERK: Talk(SAY_SPECIAL); me->CastSpell(me, SPELL_BERSERK, true); - + return; case EVENT_SPELL_PRIMARY: Talk(SAY_TAUNT); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp index 5c003ac88..ce0e3c42a 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp @@ -166,7 +166,7 @@ public: { case EVENT_SPELL_BERSERK: me->CastSpell(me, SPELL_BERSERK, true); - + break; case EVENT_SPELL_ENRAGE: Talk(EMOTE_ENRAGE); @@ -263,4 +263,3 @@ void AddSC_boss_gluth() new boss_gluth(); new spell_gluth_decimate(); } - diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp index 52dd5d0a6..25a190c2e 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp @@ -389,15 +389,15 @@ public: { case EVENT_INTRO_2: Talk(SAY_INTRO_2); - + break; case EVENT_INTRO_3: Talk(SAY_INTRO_3); - + break; case EVENT_INTRO_4: Talk(SAY_INTRO_4); - + break; case EVENT_SPELL_SHADOW_BOLT: me->CastSpell(me->GetVictim(), RAID_MODE(SPELL_SHADOW_BOLT_10, SPELL_SHADOW_BOLT_25), false); @@ -429,7 +429,7 @@ public: go->SetGoState(GO_STATE_ACTIVE); events.CancelEvent(EVENT_TELEPORT); - + break; } events.RepeatEvent(1000); @@ -455,7 +455,7 @@ public: events.ScheduleEvent(EVENT_SPELL_HARVEST_SOUL, urand(5000, 15000)); events.ScheduleEvent(EVENT_TELEPORT, 20000); events.ScheduleEvent(EVENT_CHECK_HEALTH, 1000); - + } waveCount++; @@ -471,7 +471,7 @@ public: gateOpened = true; Talk(EMOTE_GATE_OPENED); } - + break; } diff --git a/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp b/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp index 2fc101a85..f67436725 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp @@ -148,7 +148,7 @@ public: break; case EVENT_SPELL_BERSERK: me->CastSpell(me, SPELL_BERSERK, true); - + break; case EVENT_SPELL_SLIME_SPRAY: Talk(EMOTE_SLIME); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp index 09e70784b..088f8f0cb 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp @@ -277,7 +277,7 @@ public: go->SetPhaseMask(2, true); } } - + break; case EVENT_SUMMON_SOLDIER: if (Creature* cr = me->SummonCreature(NPC_SOLDIER_OF_THE_FROZEN_WASTES, SummonPositions[urand(0, 5)], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20000)) @@ -527,7 +527,7 @@ public: if (me->HealthBelowPct(35)) { me->CastSpell(me, SPELL_FRENZY, true); - + break; } events.RepeatEvent(1000); @@ -618,7 +618,6 @@ public: } }; - void AddSC_boss_kelthuzad() { new boss_kelthuzad(); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp b/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp index 21f6364dc..cf89cae85 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp @@ -140,7 +140,7 @@ public: break; case EVENT_SPELL_BERSERK: me->CastSpell(me, SPELL_BERSERK, true); - + break; } diff --git a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp index f76d3ccc3..cb877456f 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp @@ -169,7 +169,7 @@ public: if (me->GetHealthPct() < 30) { me->CastSpell(me, RAID_MODE(SPELL_FRENZY_10, SPELL_FRENZY_25), true); - + break; } @@ -198,7 +198,6 @@ public: }; }; - class boss_maexxna_webwrap : public CreatureScript { public: @@ -236,4 +235,3 @@ void AddSC_boss_maexxna() new boss_maexxna(); new boss_maexxna_webwrap(); } - diff --git a/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp b/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp index ea1520e9c..33f32171e 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp @@ -157,7 +157,7 @@ public: Talk(EMOTE_BERSERK); me->CastSpell(me, SPELL_BERSERK, true); events.ScheduleEvent(EVENT_SPELL_SLIME_BOLT, 2000); - + break; case EVENT_SPELL_SLIME_BOLT: me->CastSpell(me, SPELL_SLIME_BOLT, false); @@ -168,7 +168,7 @@ public: { Talk(EMOTE_ENRAGE); me->CastSpell(me, SPELL_FRENZY, true); - + break; } events.RepeatEvent(1000); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp b/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp index 5c5c994bd..18d57bb5d 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp @@ -27,7 +27,6 @@ enum Spells SPELL_BLOOD_STRIKE = 61696, }; - enum Events { EVENT_SPELL_UNBALANCING_STRIKE = 1, diff --git a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp index 0b46eee6f..48b830813 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp @@ -238,7 +238,7 @@ public: { case EVENT_BERSERK: Talk(EMOTE_ENRAGE); - me->CastSpell(me, SPELL_BERSERK, true); + me->CastSpell(me, SPELL_BERSERK, true); return; case EVENT_SPELL_CLEAVE: me->CastSpell(me->GetVictim(), SPELL_CLEAVE, false); @@ -268,7 +268,7 @@ public: case EVENT_FLIGHT_START: if (me->HealthBelowPct(11)) { - + return; } events.RepeatEvent(45000); @@ -352,7 +352,7 @@ public: me->SetDisableGravity(false); me->SetHover(false); - + events.ScheduleEvent(EVENT_GROUND, 1500); return; case EVENT_GROUND: diff --git a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp index 93a82f8b9..838674e49 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp @@ -262,7 +262,7 @@ public: StartEvent(); break; case EVENT_THADDIUS_START_2: - + Talk(SAY_AGGRO); me->SetReactState(REACT_AGGRESSIVE); me->SetControlled(false, UNIT_STATE_STUNNED); @@ -276,7 +276,7 @@ public: return; case EVENT_THADDIUS_SPELL_BERSERK: me->CastSpell(me, SPELL_BERSERK, true); - + break; case EVENT_THADDIUS_SPELL_CHAIN_LIGHTNING: me->CastSpell(me->GetVictim(), RAID_MODE(SPELL_CHAIN_LIGHTNING_10, SPELL_CHAIN_LIGHTNING_25), false); @@ -288,7 +288,7 @@ public: break; case EVENT_ACTIVATE_BALL_LIGHTNING: ballLightningEnabled = true; - + break; } diff --git a/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp b/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp index 44594eb60..abbb7d8ef 100644 --- a/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp +++ b/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp @@ -620,7 +620,6 @@ public: _horsemanTimer = 0; } - if (!InstanceScript::SetBossState(bossId, state)) return false; @@ -822,7 +821,7 @@ public: if (Creature* kelthuzad = instance->GetCreature(_kelthuzadGUID)) kelthuzad->AI()->Talk(_currentWingTaunt); ++_currentWingTaunt; - + break; } } diff --git a/src/server/scripts/Northrend/Naxxramas/naxxramas.h b/src/server/scripts/Northrend/Naxxramas/naxxramas.h index bc3f50741..263ee77e6 100644 --- a/src/server/scripts/Northrend/Naxxramas/naxxramas.h +++ b/src/server/scripts/Northrend/Naxxramas/naxxramas.h @@ -161,4 +161,3 @@ enum NXEvents }; #endif - diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp index 85197be12..f59d8d3e7 100644 --- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp +++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp @@ -181,7 +181,6 @@ enum MalygosLightOverrides LIGHT_OBSCURE_ARCANE_RUNES = 1825, }; - class boss_malygos : public CreatureScript { public: @@ -378,7 +377,7 @@ public: case EVENT_BERSERK: me->CastSpell(me, SPELL_BERSERK, true); Talk(EMOTE_BERSERK); - + break; case EVENT_INTRO_MOVE_CENTER: { @@ -537,7 +536,7 @@ public: } case EVENT_VORTEX_LAND_0: me->GetMotionMaster()->MoveLand(MI_POINT_VORTEX_LAND, CenterPos, 7.0f); - + break; case EVENT_VORTEX_LAND_1: { @@ -842,7 +841,6 @@ public: }; }; - #define VORTEX_DEFAULT_DIFF 250 #define VORTEX_TRAVEL_TIME 3000 //#define VORTEX_RADIUS 25.0f @@ -945,7 +943,6 @@ public: }; }; - class npc_power_spark : public CreatureScript { public: @@ -1042,7 +1039,6 @@ public: }; }; - class npc_nexus_lord : public CreatureScript { public: @@ -1136,7 +1132,6 @@ public: }; }; - class npc_scion_of_eternity : public CreatureScript { public: @@ -1211,7 +1206,6 @@ public: }; }; - class npc_hover_disk : public CreatureScript { public: @@ -1354,7 +1348,6 @@ public: }; }; - class npc_alexstrasza : public CreatureScript { public: @@ -1412,7 +1405,6 @@ public: }; }; - class npc_eoe_wyrmrest_skytalon : public CreatureScript { public: @@ -1449,7 +1441,6 @@ public: }; }; - class go_the_focusing_iris : public GameObjectScript { public: @@ -1467,7 +1458,6 @@ public: } }; - class spell_eoe_ph3_surge_of_power : public SpellScriptLoader { public: @@ -1525,7 +1515,6 @@ public: } }; - void AddSC_boss_malygos() { new boss_malygos(); diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp index 4d69523fb..adb453e78 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp @@ -161,7 +161,7 @@ public: float angle = rand_norm() * 2 * M_PI; me->SummonCreature(NPC_UNSTABLE_SPHERE, me->GetPositionX() + 5.0f * cos(angle), me->GetPositionY() + 5.0f * sin(angle), me->GetPositionZ(), 0.0f, TEMPSUMMON_TIMED_DESPAWN, 18000); } - + break; } } diff --git a/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp b/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp index 25917ef50..9d025c663 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp @@ -221,7 +221,6 @@ public: return 0; } - std::string GetSaveData() override { OUT_SAVE_INST_DATA; diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp index 305c35efb..3fcd23297 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp @@ -419,7 +419,6 @@ public: }; }; - void AddSC_boss_bjarngrim() { new boss_bjarngrim(); 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 5d5abf981..6d95edeae 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 @@ -180,7 +180,6 @@ public: return saveStream.str(); } - void Load(const char* in) override { if (!in) diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp index 04c7acd08..6cbc6c5ff 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp @@ -165,7 +165,6 @@ public: }; }; - class spell_krystallus_shatter : public SpellScriptLoader { public: diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/brann_bronzebeard.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/brann_bronzebeard.cpp index 5c4802059..c1af6c2c4 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/brann_bronzebeard.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/brann_bronzebeard.cpp @@ -497,7 +497,6 @@ public: me->SetUInt32Value(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP | UNIT_NPC_FLAG_QUESTGIVER); - // Spawn Chest and quest credit if (Player* plr = SelectTargetFromPlayerList(200.0f)) { diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp index f0b52b645..bd8e4b72d 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp @@ -119,7 +119,6 @@ public: } } - void OnCreatureCreate(Creature* creature) override { switch(creature->GetEntry()) diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp index 7a2b53d70..6ae3b6660 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp @@ -2,7 +2,6 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ - #include "ObjectMgr.h" #include "ScriptMgr.h" #include "ScriptedCreature.h" 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 bd2604bb1..dfb42afd7 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 @@ -66,7 +66,6 @@ enum AssemblySpells #define SPELL_LIGHTNING_WHIRL RAID_MODE(SPELL_LIGHTNING_WHIRL_10, SPELL_LIGHTNING_WHIRL_25) #define SPELL_LIGHTNING_TENDRILS RAID_MODE(SPELL_LIGHTNING_TENDRILS_10, SPELL_LIGHTNING_TENDRILS_25) - enum eEnums { // Steelbreaker @@ -831,7 +830,6 @@ public: }; }; - class spell_shield_of_runes : public SpellScriptLoader { public: 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 ca3a2e4c3..51308a594 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp @@ -1669,7 +1669,6 @@ public: } } - void HandleScript(SpellEffIndex /*eff*/) { Creature* target = GetHitCreature(); @@ -2027,7 +2026,6 @@ public: } }; - class spell_demolisher_ride_vehicle : public SpellScriptLoader { public: diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp index c5335b5af..216b884a4 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp @@ -42,7 +42,6 @@ enum FreyaSpells SPELL_UNSTABLE_SUN_FREYA_DAMAGE_25 = 62865, SPELL_UNSTABLE_SUN_VISUAL = 62216, - // ELDERS SPELL_DRAINED_OF_POWER = 62467, SPELL_STONEBARK_ESSENCE = 62483, @@ -1055,7 +1054,6 @@ public: }; }; - class boss_freya_healthy_spore : public CreatureScript { public: diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp index d569f6121..d8bcf5495 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp @@ -94,7 +94,6 @@ enum VezaxEvents #define TEXT_VEZAX_DEATH "Oh, what horrors await...." #define TEXT_VEZAX_HARDMODE "Behold, now! Terror, absolute!" - class boss_vezax : public CreatureScript { public: diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp index 0e4bf50f6..b87c69ff2 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp @@ -363,7 +363,6 @@ public: } } - void UpdateAI(uint32 diff) override { if (addSpawnTimer <= diff) diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp index 2d7ea708d..753414b58 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp @@ -76,7 +76,6 @@ enum eEvents EVENT_GRAB, }; - class npc_ulduar_iron_construct : public CreatureScript { public: diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp index 105524a20..302f49327 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp @@ -635,7 +635,6 @@ public: }; }; - // predicate function to select non main tank target class StoneGripTargetSelector : public acore::unary_function { diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp index 3f2d5fdd4..d5b2ce494 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp @@ -71,7 +71,6 @@ enum SpellData SPELL_SLEEP = 64394, }; - enum NPCs { //NPC_MIMIRON = 33350, @@ -87,7 +86,6 @@ enum NPCs NPC_MAGNETIC_CORE = 34068, }; - enum GOs { //GO_MIMIRON_ELEVATOR = 194749, @@ -98,7 +96,6 @@ enum GOs // pads: 194740-48 }; - enum HardMode { SPELL_EMERGENCY_MODE = 64582, @@ -130,7 +127,6 @@ enum HardMode SPELL_ENTER_VEHICLE_4 = 63316, }; - enum EVENTS { // Mimiron: @@ -203,7 +199,6 @@ enum EVENTS EVENT_EMERGENCY_BOT_ATTACK = 70, }; - enum SOUNDS { SOUND_TANK_INTRO = 15611, @@ -227,7 +222,6 @@ enum SOUNDS SOUND_TANK_HARD_INTRO = 15629, }; - #define SPELL_NAPALM_SHELL RAID_MODE(SPELL_NAPALM_SHELL_10, SPELL_NAPALM_SHELL_25) #define SPELL_PLASMA_BLAST RAID_MODE(SPELL_PLASMA_BLAST_10, SPELL_PLASMA_BLAST_25) #define SPELL_MINE_EXPLOSION RAID_MODE(SPELL_MINE_EXPLOSION_10, SPELL_MINE_EXPLOSION_25) @@ -236,7 +230,6 @@ enum SOUNDS #define SPELL_HAND_PULSE_L RAID_MODE(SPELL_HAND_PULSE_10_L, SPELL_HAND_PULSE_25_L) #define SPELL_FROST_BOMB_EXPLOSION RAID_MODE(SPELL_FROST_BOMB_EXPLOSION_10, SPELL_FROST_BOMB_EXPLOSION_25) - #define TEXT_AGGRO "Oh, my! I wasn't expecting company! The workshop is such a mess! How embarrassing!" #define TEXT_BERSERK "Oh, my! It would seem that we are out of time, my friends!" #define TEXT_HARDMODE "Now why would you go and do something like that? Didn't you see the sign that said 'DO NOT PUSH THIS BUTTON!'? How will we finish testing with the self-destruct mechanism active?" @@ -274,8 +267,6 @@ enum ComputerTalks TALK_COMPUTER_ZERO = 12, }; - - #define GetMimiron() ObjectAccessor::GetCreature(*me, pInstance->GetData64(TYPE_MIMIRON)) #define GetLMK2() ObjectAccessor::GetCreature(*me, pInstance->GetData64(DATA_MIMIRON_LEVIATHAN_MKII)) #define GetVX001() ObjectAccessor::GetCreature(*me, pInstance->GetData64(DATA_MIMIRON_VX001)) diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp index 51045b962..02eec6f85 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp @@ -70,7 +70,6 @@ #define TEXT_DEEP_BREATH "Razorscale takes a deep breath..." #define TEXT_GROUNDED_PERMANENTLY "Razorscale grounded permanently!" - #define CORDS_GROUND 588.0f, -166.0f, 391.1f #define CORDS_AIR 588.0f, -178.0f, 490.0f #define REPAIR_POINTS 25 diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp index b74242b32..1255958d8 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp @@ -301,7 +301,6 @@ const Position Middle = {2134.68f, -263.13f, 419.44f, M_PI * 1.5f}; const uint32 RollTable[3] = { 32877, 32878, 32876 }; - class boss_thorim : public CreatureScript { public: diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp index d27190e69..a089c6e62 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp @@ -95,7 +95,6 @@ enum Misc { HEART_VEHICLE_SEAT = 0, - ACTION_AWAKEN_HEART = -5, ACTION_HIDE_HEART = -4, ACTION_HEART_BROKEN = -3, @@ -106,7 +105,6 @@ enum Misc DATA_XT002_GRAVITY_ACHIEV = 51, }; - class boss_xt002 : public CreatureScript { public: diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yoggsaron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yoggsaron.cpp index 600f472af..ae2bf829d 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yoggsaron.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yoggsaron.cpp @@ -285,7 +285,6 @@ enum Misc ACTION_ILLUSION_ICECROWN = 2, ACTION_ILLUSION_STORMWIND = 3, - EVENT_PHASE_ONE = 1, EVENT_PHASE_TWO = 2, EVENT_PHASE_THREE = 3, @@ -319,7 +318,6 @@ static LocationsXY yoggPortalLoc[] = const Position Middle = {1980.28f, -25.5868f, 329.397f, M_PI * 1.5f}; - class boss_yoggsaron_sara : public CreatureScript { public: @@ -1975,7 +1973,6 @@ public: }; }; - class boss_yoggsaron_llane : public CreatureScript { public: @@ -2534,7 +2531,6 @@ public: { PrepareAuraScript(spell_yogg_saron_protective_gaze_AuraScript); - void CalculateAmount(AuraEffect const* /*aurEff*/, int32& amount, bool& /*canBeRecalculated*/) { // Set absorbtion amount to unlimited @@ -2967,7 +2963,6 @@ private: uint8 const _requiredIllusion; }; - class achievement_yogg_saron_kiss_and_make_up : public AchievementCriteriaScript { public: diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp index e97ba6262..b21dba77b 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp @@ -101,7 +101,6 @@ public: uint64 m_keepersgateGUID; uint64 m_keepersGossipGUID[4]; - void Initialize() override { // Bosses @@ -1017,7 +1016,6 @@ public: OUT_LOAD_INST_DATA_COMPLETE; } - void Update(uint32 diff) override { if (_events.Empty()) @@ -1139,7 +1137,6 @@ const Position vehiclePositions[30] = {119.8f, -112.37f, 409.803f, 0.0f}, }; - void instance_ulduar::instance_ulduar_InstanceMapScript::SpawnLeviathanEncounterVehicles(uint8 mode) { if (!_leviathanVehicles.empty()) diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.cpp index fa61adba0..93488c4c6 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.cpp @@ -411,7 +411,6 @@ public: } }; - void AddSC_ulduar() { new npc_ulduar_keeper(); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.h b/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.h index 95fdf5379..34abe9b5b 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.h +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.h @@ -139,7 +139,6 @@ enum UlduarNPCs NPC_SALVAGED_DEMOLISHER_TURRET = 33167, NPC_BRANN_BASE_CAMP = 33579, - // Algalon the Observer NPC_BRANN_BRONZBEARD_ALG = 34064, NPC_AZEROTH = 34246, @@ -252,7 +251,6 @@ enum UlduarMisc ACTION_TOWER_OF_FLAMES_DESTROYED = 3, ACTION_TOWER_OF_LIFE_DESTROYED = 4, - // Algalon the Observer WORLD_STATE_ALGALON_DESPAWN_TIMER = 4131, WORLD_STATE_ALGALON_TIMER_ENABLED = 4132, diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp index 6a4c0f95f..fcb3d7b56 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp @@ -125,7 +125,7 @@ class boss_archavon : public CreatureScript { DoCast(target, SPELL_ROCK_SHARDS); } - + events.RepeatEvent(15000); break; case EVENT_CHOKING_CLOUD: @@ -133,7 +133,7 @@ class boss_archavon : public CreatureScript { DoCast(target, RAID_MODE(SPELL_CRUSHING_LEAP_10, SPELL_CRUSHING_LEAP_25), true); //10y ~ 80y, ignore range } - + events.RepeatEvent(30000); break; case EVENT_STOMP: @@ -216,7 +216,6 @@ class spell_archavon_rock_shards : public SpellScriptLoader } }; - void AddSC_boss_archavon() { new boss_archavon(); diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp index b673982aa..ab63fa933 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp @@ -36,7 +36,6 @@ enum Events EVENT_CAST_WHITEOUT = 3, EVENT_CAST_WHITEOUT_GROUND_EFFECT = 4, - }; enum Misc @@ -45,7 +44,6 @@ enum Misc NPC_FROZEN_ORB_STALKER = 38461, }; - class boss_toravon : public CreatureScript { public: diff --git a/src/server/scripts/Northrend/VaultOfArchavon/vault_of_archavon.h b/src/server/scripts/Northrend/VaultOfArchavon/vault_of_archavon.h index 2d283b032..438e4153c 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/vault_of_archavon.h +++ b/src/server/scripts/Northrend/VaultOfArchavon/vault_of_archavon.h @@ -25,7 +25,6 @@ enum Data DATA_STONED = 5, }; - enum AchievementCriteriaIds { CRITERIA_EARTH_WIND_FIRE_10 = 12018, diff --git a/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp index 28b57b567..3c3d5dde3 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp @@ -94,7 +94,6 @@ public: } } - void UpdateAI(uint32 diff) override { if (!UpdateVictim()) @@ -119,7 +118,7 @@ public: break; case EVENT_UNROOT: me->SetControlled(false, UNIT_STATE_ROOT); - + break; case EVENT_SPELL_BLIZZARD: if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 45.0f, true)) diff --git a/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp b/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp index 000ccbe4c..5cafc0cad 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp @@ -34,7 +34,6 @@ enum Yells SAY_BOTH_ADDS_KILLED = 5 }; - enum eEvents { EVENT_SPELL_BLOODLUST = 1, @@ -220,7 +219,6 @@ enum eGuardEvents EVENT_SPELL_STRIKE }; - class npc_erekem_guard : public CreatureScript { public: diff --git a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp index 8b9fb34f5..2b2a2a756 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp @@ -291,8 +291,6 @@ public: }; }; - - class npc_ichor_globule : public CreatureScript { public: diff --git a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp index ef8bc1d05..5fd6f772e 100644 --- a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp +++ b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp @@ -542,8 +542,6 @@ public: }; }; - - class npc_azure_binder : public CreatureScript { public: @@ -1162,7 +1160,6 @@ public: } }; - class go_violet_hold_gate_lever : public GameObjectScript { public: diff --git a/src/server/scripts/Northrend/zone_borean_tundra.cpp b/src/server/scripts/Northrend/zone_borean_tundra.cpp index 0ec9f7ad1..b98336de3 100644 --- a/src/server/scripts/Northrend/zone_borean_tundra.cpp +++ b/src/server/scripts/Northrend/zone_borean_tundra.cpp @@ -85,7 +85,6 @@ public: } }; - // Theirs /*###### ## npc_sinkhole_kill_credit diff --git a/src/server/scripts/Northrend/zone_dalaran.cpp b/src/server/scripts/Northrend/zone_dalaran.cpp index 45e1484e3..f982224e2 100644 --- a/src/server/scripts/Northrend/zone_dalaran.cpp +++ b/src/server/scripts/Northrend/zone_dalaran.cpp @@ -711,7 +711,6 @@ public: }; }; - class npc_dalaran_warrior : public CreatureScript { public: diff --git a/src/server/scripts/Northrend/zone_dragonblight.cpp b/src/server/scripts/Northrend/zone_dragonblight.cpp index 7fca48594..94320c065 100644 --- a/src/server/scripts/Northrend/zone_dragonblight.cpp +++ b/src/server/scripts/Northrend/zone_dragonblight.cpp @@ -261,7 +261,6 @@ public: } }; - enum hourglass { NPC_FUTURE_HOURGLASS = 27840, @@ -338,7 +337,6 @@ public: Player* getSummoner() { return ObjectAccessor::GetPlayer(*me, summonerGUID); } Creature* getFuture() { return ObjectAccessor::GetCreature(*me, futureGUID); } - uint32 randEntry() { return NPC_INFINITE_ASSAILANT + urand(0, 2); @@ -1384,8 +1382,6 @@ public: }; }; - - // Theirs /*##### diff --git a/src/server/scripts/Northrend/zone_grizzly_hills.cpp b/src/server/scripts/Northrend/zone_grizzly_hills.cpp index 48e5b9a76..2257f011c 100644 --- a/src/server/scripts/Northrend/zone_grizzly_hills.cpp +++ b/src/server/scripts/Northrend/zone_grizzly_hills.cpp @@ -72,7 +72,6 @@ public: } }; - // Theirs /*###### @@ -305,7 +304,6 @@ public: void MoveInLineOfSight(Unit* /*who*/) override { } - void UpdateAI(uint32 /*diff*/) override { if (!UpdateVictim()) diff --git a/src/server/scripts/Northrend/zone_howling_fjord.cpp b/src/server/scripts/Northrend/zone_howling_fjord.cpp index d262158aa..2d93dc1ba 100644 --- a/src/server/scripts/Northrend/zone_howling_fjord.cpp +++ b/src/server/scripts/Northrend/zone_howling_fjord.cpp @@ -136,7 +136,6 @@ public: } }; - // Theirs /*###### ## npc_apothecary_hanes diff --git a/src/server/scripts/Northrend/zone_icecrown.cpp b/src/server/scripts/Northrend/zone_icecrown.cpp index b843f67bf..113f6d1aa 100644 --- a/src/server/scripts/Northrend/zone_icecrown.cpp +++ b/src/server/scripts/Northrend/zone_icecrown.cpp @@ -1033,7 +1033,6 @@ enum infraGreenBomberQuests SPELL_WAITING_FOR_A_BOMBER = 59563, SPELL_FLIGHT_ORDERS = 61281, - EVENT_TAKE_PASSENGER = 1, EVENT_START_FLIGHT = 2, EVENT_CHECK_PATH_REGEN_HEALTH_BURN_DAMAGE = 3, @@ -1416,7 +1415,6 @@ public: } }; - // Theirs /*###### ## npc_guardian_pavilion @@ -1755,7 +1753,6 @@ public: void MoveInLineOfSight(Unit* /*who*/) override { } - void JustSummoned(Creature* Summoned) override { Summons.Summon(Summoned); diff --git a/src/server/scripts/Northrend/zone_sholazar_basin.cpp b/src/server/scripts/Northrend/zone_sholazar_basin.cpp index fefe1d237..614266717 100644 --- a/src/server/scripts/Northrend/zone_sholazar_basin.cpp +++ b/src/server/scripts/Northrend/zone_sholazar_basin.cpp @@ -260,7 +260,6 @@ public: } }; - /****** quest Still At It (12644) ******/ @@ -540,7 +539,6 @@ public: } }; - // Theirs /*###### ## npc_vekjik diff --git a/src/server/scripts/Northrend/zone_storm_peaks.cpp b/src/server/scripts/Northrend/zone_storm_peaks.cpp index 6ba99c44c..35d92736d 100644 --- a/src/server/scripts/Northrend/zone_storm_peaks.cpp +++ b/src/server/scripts/Northrend/zone_storm_peaks.cpp @@ -684,7 +684,6 @@ public: }; }; - // Theirs /*###### ## npc_roxi_ramrocket diff --git a/src/server/scripts/Northrend/zone_wintergrasp.cpp b/src/server/scripts/Northrend/zone_wintergrasp.cpp index a08cf5cde..b182f4035 100644 --- a/src/server/scripts/Northrend/zone_wintergrasp.cpp +++ b/src/server/scripts/Northrend/zone_wintergrasp.cpp @@ -759,7 +759,6 @@ public: (go->GetUInt32Value(GAMEOBJECT_FACTION) == WintergraspFaction[TEAM_ALLIANCE] && passenger->getRaceMask() & RACEMASK_ALLIANCE)); } - Creature* IsValidVehicle(Creature* cVeh) { if (!cVeh->HasAura(SPELL_VEHICLE_TELEPORT)) @@ -1036,7 +1035,6 @@ public: } }; - //////////////////////////////////////////////// /////// ACHIEVEMENTs //////////////////////////////////////////////// diff --git a/src/server/scripts/Northrend/zone_zuldrak.cpp b/src/server/scripts/Northrend/zone_zuldrak.cpp index 5a309e014..87f6b744f 100644 --- a/src/server/scripts/Northrend/zone_zuldrak.cpp +++ b/src/server/scripts/Northrend/zone_zuldrak.cpp @@ -31,7 +31,6 @@ const char* AA_ITEM_NAME[24] = {"Crystallized Hogsnot", "Ghoul Drool", "Trollb "Frozen Spider Ichor", "Prismatic Mojo", "Raptor Claw" }; - class npc_finklestein : public CreatureScript { public: @@ -744,7 +743,6 @@ public: } }; - // Theirs /*#### ## npc_released_offspring_harkoa @@ -894,8 +892,6 @@ public: } }; - - enum StormCloud { STORM_COULD = 29939, diff --git a/src/server/scripts/OutdoorPvP/CMakeLists.txt b/src/server/scripts/OutdoorPvP/CMakeLists.txt index ed8aabe46..d3939086d 100644 --- a/src/server/scripts/OutdoorPvP/CMakeLists.txt +++ b/src/server/scripts/OutdoorPvP/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) +# Copyright (C) # # This file is free software; as a special exception the author gives # unlimited permission to copy and/or distribute it, with or without 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 bb1cf5264..a63c4bbca 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 @@ -128,7 +128,6 @@ public: if (!UpdateVictim()) return; - switch (eventId) { case EVENT_SPELL_ATTRACT_MAGIC: diff --git a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp index 8d781e46c..1a254a4c8 100644 --- a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp +++ b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp @@ -2,7 +2,6 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ - #include "ScriptMgr.h" #include "ScriptedCreature.h" #include "Player.h" diff --git a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp index 932d8cbf0..d42fecada 100644 --- a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp +++ b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp @@ -28,7 +28,6 @@ enum Events EVENT_DARK_SHELL }; - class boss_pandemonius : public CreatureScript { public: diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.h b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.h index 92ccec6ff..cb693505e 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.h +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.h @@ -29,4 +29,3 @@ enum slNPCandGO }; #endif - diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp index b56389bda..bf0000dc3 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp @@ -449,7 +449,6 @@ public: break; } - EnterEvadeIfOutOfCombatArea(); if (!UpdateVictim()) 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 da6a4f353..6a3b70941 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp @@ -193,7 +193,6 @@ public: void AttackStart(Unit*) override { } - void JustDied(Unit* killer) override { summons.clear(); diff --git a/src/server/scripts/Outland/CMakeLists.txt b/src/server/scripts/Outland/CMakeLists.txt index a5e37c027..5692fe729 100644 --- a/src/server/scripts/Outland/CMakeLists.txt +++ b/src/server/scripts/Outland/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) +# Copyright (C) # # This file is free software; as a special exception the author gives # unlimited permission to copy and/or distribute it, with or without diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp index 35c8a8189..73d2bb72f 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp @@ -361,7 +361,6 @@ public: amplitude = 8 * IN_MILLISECONDS; } - void HandlePeriodic(AuraEffect const* /*aurEff*/) { PreventDefaultAction(); diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/serpent_shrine.h b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/serpent_shrine.h index 3a7e103ce..d05e0fc94 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/serpent_shrine.h +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/serpent_shrine.h @@ -28,7 +28,6 @@ enum DataTypes DATA_BRIDGE_ACTIVATED = 23, DATA_ACTIVATE_SHIELD = 24, - }; enum SSNPCs @@ -68,4 +67,3 @@ enum SSSpells }; #endif - diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/steam_vault.h b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/steam_vault.h index cb21c3639..6b964cf7b 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/steam_vault.h +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/steam_vault.h @@ -26,4 +26,3 @@ enum steamVaultNPCGO }; #endif - diff --git a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp index 48052cbad..3f46d5ba4 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp @@ -73,7 +73,6 @@ public: events.ScheduleEvent(EVENT_SPELL_SPORES, urand(10000, 15000)); } - void JustSummoned(Creature* summon) override { summons.Summon(summon); diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/blood_furnace.h b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/blood_furnace.h index 247932f32..4ddfa389b 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/blood_furnace.h +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/blood_furnace.h @@ -40,4 +40,3 @@ enum bloodFurnaceNPC }; #endif - 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 a4d09fd68..d6c11b0b6 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 @@ -347,4 +347,3 @@ void AddSC_boss_kelidan_the_breaker() new boss_kelidan_the_breaker(); new npc_shadowmoon_channeler(); } - 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 270696f71..0c6d1e273 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp @@ -130,4 +130,3 @@ void AddSC_boss_the_maker() { new boss_the_maker(); } - diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp index 53e06ec3d..d20d9cd4d 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp @@ -326,4 +326,3 @@ void AddSC_instance_blood_furnace() { new instance_blood_furnace(); } - diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp index 3132dd970..01dd5bb26 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp @@ -173,4 +173,3 @@ void AddSC_boss_omor_the_unscarred() { new boss_omor_the_unscarred(); } - diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp index 13a077bd9..126da8aa9 100644 --- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp @@ -95,7 +95,6 @@ public: EventMap events2; - void Reset() override { events2.Reset(); @@ -154,7 +153,6 @@ public: break; } - if (!UpdateVictim() || !CheckInRoom()) return; @@ -325,4 +323,3 @@ void AddSC_boss_magtheridon() new spell_magtheridon_blaze(); new spell_magtheridon_shadow_grasp(); } - 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 16226e2b7..1ec74b2ef 100644 --- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp @@ -7,7 +7,6 @@ #include "InstanceScript.h" #include "magtheridons_lair.h" - DoorData const doorData[] = { { GO_MAGTHERIDON_DOORS, TYPE_MAGTHERIDON, DOOR_TYPE_ROOM, BOUNDARY_S }, @@ -224,4 +223,3 @@ void AddSC_instance_magtheridons_lair() { new instance_magtheridons_lair(); } - diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h index bbe9e7720..404094236 100644 --- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h +++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h @@ -39,4 +39,3 @@ enum GoIds }; #endif - diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp index a1bbeaac0..2cb96bfda 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp @@ -45,7 +45,6 @@ enum Misc EVENT_SPELL_VOID_BOLT = 9 }; - #define INNER_PORTAL_RADIUS 14.0f #define OUTER_PORTAL_RADIUS 28.0f #define CENTER_X 432.909f @@ -54,7 +53,6 @@ enum Misc #define CENTER_O 1.06421f #define PORTAL_Z 17.005f - class boss_high_astromancer_solarian : public CreatureScript { public: @@ -301,4 +299,3 @@ void AddSC_boss_high_astromancer_solarian() new spell_astromancer_wrath_of_the_astromancer(); new spell_astromancer_solarian_transform(); } - diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp index 69bd53442..4cf2e8ba4 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp @@ -89,7 +89,6 @@ enum Spells SPELL_NETHER_BEAM = 35869, SPELL_NETHER_BEAM_DAMAGE = 35873, - SPELL_REMOTE_TOY_STUN = 37029 }; 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 972d8fadc..46aa62fe1 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp @@ -122,4 +122,3 @@ void AddSC_boss_void_reaver() { new boss_void_reaver(); } - diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp index 9150d65e0..10cc4fccd 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp @@ -102,4 +102,3 @@ void AddSC_boss_gatewatcher_iron_hand() { new boss_gatewatcher_iron_hand(); } - diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp index 796859c94..fc6713086 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp @@ -154,4 +154,3 @@ void AddSC_boss_pathaleon_the_calculator() { new boss_pathaleon_the_calculator(); } - diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp index a22d52c28..077840fec 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp @@ -6,7 +6,6 @@ #include "ScriptedCreature.h" #include "arcatraz.h" - enum MillhouseSays { SAY_INTRO_1 = 0, diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp index ecec6d1b7..ba84f5f27 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp @@ -171,4 +171,3 @@ void AddSC_boss_harbinger_skyriss() { new boss_harbinger_skyriss(); } - diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_zereketh_the_unbound.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_zereketh_the_unbound.cpp index 174628a24..10701e3a6 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_zereketh_the_unbound.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_zereketh_the_unbound.cpp @@ -37,7 +37,6 @@ public: { boss_zereketh_the_unboundAI(Creature* creature) : BossAI(creature, DATA_ZEREKETH) { } - void JustDied(Unit* /*killer*/) override { _JustDied(); diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp index 0067b6a5f..51d29f2db 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp @@ -208,4 +208,3 @@ void AddSC_instance_arcatraz() { new instance_arcatraz(); } - 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 523ae2c1f..7d6c267c1 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 @@ -146,4 +146,3 @@ void AddSC_boss_high_botanist_freywinn() { new 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 190f3ac73..be5528fe7 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp @@ -142,4 +142,3 @@ void AddSC_boss_laj() { new boss_laj(); } - diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp index f4a560fe0..e87e355f0 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp @@ -63,7 +63,6 @@ public: BossAI::MoveInLineOfSight(who); } - void EnterCombat(Unit* /*who*/) override { _EnterCombat(); 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 f9bd4015a..be97c29d5 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp @@ -109,4 +109,3 @@ void AddSC_boss_warp_splinter() { new boss_warp_splinter(); } - diff --git a/src/server/scripts/Outland/zone_blades_edge_mountains.cpp b/src/server/scripts/Outland/zone_blades_edge_mountains.cpp index 4dbf29892..eef1fbea3 100644 --- a/src/server/scripts/Outland/zone_blades_edge_mountains.cpp +++ b/src/server/scripts/Outland/zone_blades_edge_mountains.cpp @@ -811,7 +811,6 @@ public: playableSequence.push_back(*i); } - // Remove any existant glowing auras over clusters and set clusters ready for interating with them. void PrepareClusters(bool clustersOnly = false) { diff --git a/src/server/scripts/Outland/zone_hellfire_peninsula.cpp b/src/server/scripts/Outland/zone_hellfire_peninsula.cpp index 0585842c9..7ec160804 100644 --- a/src/server/scripts/Outland/zone_hellfire_peninsula.cpp +++ b/src/server/scripts/Outland/zone_hellfire_peninsula.cpp @@ -62,7 +62,6 @@ public: } }; - // Theirs /*###### ## npc_aeranas diff --git a/src/server/scripts/Outland/zone_netherstorm.cpp b/src/server/scripts/Outland/zone_netherstorm.cpp index 91778ccaa..3a48ac8b0 100644 --- a/src/server/scripts/Outland/zone_netherstorm.cpp +++ b/src/server/scripts/Outland/zone_netherstorm.cpp @@ -1315,7 +1315,6 @@ public: } }; - // Theirs /*###### ## npc_commander_dawnforge diff --git a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp index c692d7a1e..cdc8c6c59 100644 --- a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp +++ b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp @@ -126,7 +126,6 @@ public: } }; - // Theirs /*##### # npc_invis_infernal_caster @@ -1829,4 +1828,3 @@ void AddSC_shadowmoon_valley() new npc_enraged_spirit(); new npc_shadowmoon_tuber_node(); } - diff --git a/src/server/scripts/Outland/zone_terokkar_forest.cpp b/src/server/scripts/Outland/zone_terokkar_forest.cpp index ab3f7bbb4..699740833 100644 --- a/src/server/scripts/Outland/zone_terokkar_forest.cpp +++ b/src/server/scripts/Outland/zone_terokkar_forest.cpp @@ -314,7 +314,6 @@ public: } }; - // Theirs /*###### ## npc_unkor_the_ruthless diff --git a/src/server/scripts/Outland/zone_zangarmarsh.cpp b/src/server/scripts/Outland/zone_zangarmarsh.cpp index 8d28c25ed..be08823bf 100644 --- a/src/server/scripts/Outland/zone_zangarmarsh.cpp +++ b/src/server/scripts/Outland/zone_zangarmarsh.cpp @@ -112,7 +112,6 @@ public: } }; - // Theirs /*###### ## npcs_ashyen_and_keleth diff --git a/src/server/scripts/Pet/CMakeLists.txt b/src/server/scripts/Pet/CMakeLists.txt index 617106b75..f63f1a586 100644 --- a/src/server/scripts/Pet/CMakeLists.txt +++ b/src/server/scripts/Pet/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) +# Copyright (C) # # This file is free software; as a special exception the author gives # unlimited permission to copy and/or distribute it, with or without diff --git a/src/server/scripts/Pet/pet_generic.cpp b/src/server/scripts/Pet/pet_generic.cpp index 9496f5a39..401c6262c 100644 --- a/src/server/scripts/Pet/pet_generic.cpp +++ b/src/server/scripts/Pet/pet_generic.cpp @@ -149,7 +149,6 @@ public: } }; - enum eArgentPony { ARGENT_PONY_STATE_NONE = 0, diff --git a/src/server/scripts/Pet/pet_shaman.cpp b/src/server/scripts/Pet/pet_shaman.cpp index 8829b8b48..be3bfe92f 100644 --- a/src/server/scripts/Pet/pet_shaman.cpp +++ b/src/server/scripts/Pet/pet_shaman.cpp @@ -40,7 +40,6 @@ public: { npc_pet_shaman_earth_elementalAI(Creature* creature) : ScriptedAI(creature), _initAttack(true) { } - void EnterCombat(Unit*) override { _events.Reset(); diff --git a/src/server/scripts/PrecompiledHeaders/ScriptPCH.h b/src/server/scripts/PrecompiledHeaders/ScriptPCH.h index 0d03b3700..110ed7a23 100644 --- a/src/server/scripts/PrecompiledHeaders/ScriptPCH.h +++ b/src/server/scripts/PrecompiledHeaders/ScriptPCH.h @@ -31,4 +31,3 @@ #endif #endif - diff --git a/src/server/scripts/ScriptLoader.cpp b/src/server/scripts/ScriptLoader.cpp index 947ce949d..eee33fe14 100644 --- a/src/server/scripts/ScriptLoader.cpp +++ b/src/server/scripts/ScriptLoader.cpp @@ -1187,10 +1187,8 @@ void AddOutdoorPvPScripts() #endif } - //~ ********************** Put your custom scripts below, like the commented examples, uncomment and edit ************************************* - //~ void AddSC_MySuperScript(); void AddCustomScripts() diff --git a/src/server/scripts/Spells/CMakeLists.txt b/src/server/scripts/Spells/CMakeLists.txt index e0ecd2cc3..f602295fd 100644 --- a/src/server/scripts/Spells/CMakeLists.txt +++ b/src/server/scripts/Spells/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) +# Copyright (C) # # This file is free software; as a special exception the author gives # unlimited permission to copy and/or distribute it, with or without diff --git a/src/server/scripts/Spells/spell_dk.cpp b/src/server/scripts/Spells/spell_dk.cpp index 2ac5caf0b..4734b7c82 100644 --- a/src/server/scripts/Spells/spell_dk.cpp +++ b/src/server/scripts/Spells/spell_dk.cpp @@ -1033,7 +1033,6 @@ public: } }; - // Theirs // 50462 - Anti-Magic Shell (on raid member) class spell_dk_anti_magic_shell_raid : public SpellScriptLoader diff --git a/src/server/scripts/Spells/spell_druid.cpp b/src/server/scripts/Spells/spell_druid.cpp index 567a77a14..7403d25f2 100644 --- a/src/server/scripts/Spells/spell_druid.cpp +++ b/src/server/scripts/Spells/spell_druid.cpp @@ -31,7 +31,6 @@ enum DruidSpells SPELL_DRUID_GLYPH_OF_BARKSKIN = 63057, SPELL_DRUID_GLYPH_OF_BARKSKIN_TRIGGER = 63058, - // Theirs SPELL_DRUID_ENRAGE_MOD_DAMAGE = 51185, SPELL_DRUID_GLYPH_OF_TYPHOON = 62135, @@ -365,7 +364,6 @@ public: } }; - // Theirs // -1850 - Dash class spell_dru_dash : public SpellScriptLoader diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp index 8eea89ea9..a4883ea3e 100644 --- a/src/server/scripts/Spells/spell_generic.cpp +++ b/src/server/scripts/Spells/spell_generic.cpp @@ -32,7 +32,6 @@ #include "Chat.h" #include "Vehicle.h" - // Ours class spell_gen_model_visible : public SpellScriptLoader { @@ -448,7 +447,6 @@ public: public: spell_gen_disabled_above_level_SpellScript(uint8 level) : SpellScript(), _level(level) { } - SpellCastResult CheckRequirement() { if (Unit* target = GetExplTargetUnit()) @@ -1498,7 +1496,6 @@ public: } }; - // Theirs class spell_gen_absorb0_hitlimit1 : public SpellScriptLoader { diff --git a/src/server/scripts/Spells/spell_hunter.cpp b/src/server/scripts/Spells/spell_hunter.cpp index 9d920ef7d..8479385c2 100644 --- a/src/server/scripts/Spells/spell_hunter.cpp +++ b/src/server/scripts/Spells/spell_hunter.cpp @@ -336,8 +336,6 @@ public: } }; - - // Theirs // 13161 Aspect of the Beast class spell_hun_aspect_of_the_beast : public SpellScriptLoader @@ -405,7 +403,6 @@ public: } }; - // Theirs // 34074 - Aspect of the Viper class spell_hun_ascpect_of_the_viper : public SpellScriptLoader @@ -575,7 +572,6 @@ public: } }; - // -19572 - Improved Mend Pet class spell_hun_improved_mend_pet : public SpellScriptLoader { diff --git a/src/server/scripts/Spells/spell_mage.cpp b/src/server/scripts/Spells/spell_mage.cpp index 7e5181ea3..d0ea97140 100644 --- a/src/server/scripts/Spells/spell_mage.cpp +++ b/src/server/scripts/Spells/spell_mage.cpp @@ -496,7 +496,6 @@ public: } }; - // Theirs // Incanter's Absorbtion class spell_mage_incanters_absorbtion_base_AuraScript : public AuraScript @@ -1086,7 +1085,6 @@ public: else caster->CastSpell(caster, SPELL_MAGE_SUMMON_WATER_ELEMENTAL_TEMPORARY, true); - if (Creature* pet = ObjectAccessor::GetCreature(*caster, caster->GetPetGUID())) if (pet->GetCharmInfo() && caster->ToPlayer()) { diff --git a/src/server/scripts/Spells/spell_paladin.cpp b/src/server/scripts/Spells/spell_paladin.cpp index 54b38ea85..fa4579d86 100644 --- a/src/server/scripts/Spells/spell_paladin.cpp +++ b/src/server/scripts/Spells/spell_paladin.cpp @@ -286,7 +286,6 @@ public: } }; - // Theirs // 31850 - Ardent Defender class spell_pal_ardent_defender : public SpellScriptLoader diff --git a/src/server/scripts/Spells/spell_priest.cpp b/src/server/scripts/Spells/spell_priest.cpp index dd8540bb9..a7efd1f47 100644 --- a/src/server/scripts/Spells/spell_priest.cpp +++ b/src/server/scripts/Spells/spell_priest.cpp @@ -134,7 +134,6 @@ public: } }; - // Theirs // -34861 - Circle of Healing class spell_pri_circle_of_healing : public SpellScriptLoader diff --git a/src/server/scripts/Spells/spell_quest.cpp b/src/server/scripts/Spells/spell_quest.cpp index acc7432a3..42d27bc25 100644 --- a/src/server/scripts/Spells/spell_quest.cpp +++ b/src/server/scripts/Spells/spell_quest.cpp @@ -1017,7 +1017,6 @@ public: } }; - // Theirs class spell_generic_quest_update_entry_SpellScript : public SpellScript { @@ -2839,7 +2838,6 @@ public: } }; - enum DeathComesFromOnHigh { SPELL_FORGE_CREDIT = 51974, @@ -3077,7 +3075,6 @@ public: } }; - void AddSC_quest_spell_scripts() { // Ours diff --git a/src/server/scripts/Spells/spell_rogue.cpp b/src/server/scripts/Spells/spell_rogue.cpp index 0768ebbdb..74a0d59dc 100644 --- a/src/server/scripts/Spells/spell_rogue.cpp +++ b/src/server/scripts/Spells/spell_rogue.cpp @@ -98,7 +98,6 @@ public: } }; - // Theirs // 13877, 33735, (check 51211, 65956) - Blade Flurry class spell_rog_blade_flurry : public SpellScriptLoader diff --git a/src/server/scripts/Spells/spell_shaman.cpp b/src/server/scripts/Spells/spell_shaman.cpp index 689a0c8f2..d268b70e4 100644 --- a/src/server/scripts/Spells/spell_shaman.cpp +++ b/src/server/scripts/Spells/spell_shaman.cpp @@ -403,7 +403,6 @@ public: } }; - // Theirs // 52759 - Ancestral Awakening (Proc) class spell_sha_ancestral_awakening_proc : public SpellScriptLoader diff --git a/src/server/scripts/Spells/spell_warrior.cpp b/src/server/scripts/Spells/spell_warrior.cpp index 0268aa0a1..c908d16d2 100644 --- a/src/server/scripts/Spells/spell_warrior.cpp +++ b/src/server/scripts/Spells/spell_warrior.cpp @@ -188,7 +188,6 @@ public: { PrepareAuraScript(spell_warr_improved_spell_reflection_trigger_AuraScript); - void HandleRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { if (!IsExpired()) @@ -220,7 +219,6 @@ public: } }; - // Theirs // 12975 - Last Stand class spell_warr_last_stand : public SpellScriptLoader @@ -454,7 +452,6 @@ public: if (AuraEffect* aurEff = caster->GetAuraEffect(SPELL_WARRIOR_GLYPH_OF_EXECUTION, EFFECT_0)) rageUsed += aurEff->GetAmount() * 10; - int32 bp = GetEffectValue() + int32(rageUsed * spellInfo->Effects[effIndex].DamageMultiplier + caster->GetTotalAttackPowerValue(BASE_ATTACK) * 0.2f); caster->CastCustomSpell(target, SPELL_WARRIOR_EXECUTE, &bp, nullptr, nullptr, true, nullptr, nullptr, GetOriginalCaster()->GetGUID()); } diff --git a/src/server/scripts/World/CMakeLists.txt b/src/server/scripts/World/CMakeLists.txt index 54de11e73..a3e703745 100644 --- a/src/server/scripts/World/CMakeLists.txt +++ b/src/server/scripts/World/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) +# Copyright (C) # # This file is free software; as a special exception the author gives # unlimited permission to copy and/or distribute it, with or without diff --git a/src/server/scripts/World/action_ip_logger.cpp b/src/server/scripts/World/action_ip_logger.cpp index ba5b90ed4..6510668c8 100644 --- a/src/server/scripts/World/action_ip_logger.cpp +++ b/src/server/scripts/World/action_ip_logger.cpp @@ -303,7 +303,6 @@ public: } }; - void AddSC_action_ip_logger() { new AccountActionIpLogger(); diff --git a/src/server/scripts/World/areatrigger_scripts.cpp b/src/server/scripts/World/areatrigger_scripts.cpp index 9942c0f65..024d0adaf 100644 --- a/src/server/scripts/World/areatrigger_scripts.cpp +++ b/src/server/scripts/World/areatrigger_scripts.cpp @@ -51,7 +51,6 @@ public: } }; - // Theirs /*###### ## at_coilfang_waterfall @@ -351,7 +350,6 @@ public: } }; - /*###### ## at_brewfest ######*/ diff --git a/src/server/scripts/World/go_scripts.cpp b/src/server/scripts/World/go_scripts.cpp index 2cd6b7f43..4cb03b770 100644 --- a/src/server/scripts/World/go_scripts.cpp +++ b/src/server/scripts/World/go_scripts.cpp @@ -420,7 +420,6 @@ public: } }; - // Theirs /*#### ## go_brewfest_music diff --git a/src/server/scripts/World/npc_innkeeper.cpp b/src/server/scripts/World/npc_innkeeper.cpp index 9270df2b7..1e1aa8c17 100644 --- a/src/server/scripts/World/npc_innkeeper.cpp +++ b/src/server/scripts/World/npc_innkeeper.cpp @@ -69,4 +69,3 @@ void AddSC_npc_innkeeper() { new npc_innkeeper; } - diff --git a/src/server/scripts/World/npc_professions.cpp b/src/server/scripts/World/npc_professions.cpp index 8fbf01498..456ebd539 100644 --- a/src/server/scripts/World/npc_professions.cpp +++ b/src/server/scripts/World/npc_professions.cpp @@ -220,8 +220,6 @@ enum SpecializationQuests Q_MASTER_POTION = 10897, }; - - /*### # formulas to calculate unlearning cost ###*/ @@ -1277,7 +1275,6 @@ public: } }; - void AddSC_npc_professions() { new npc_prof_alchemy(); diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp index bd3b35922..6ddffd882 100644 --- a/src/server/scripts/World/npcs_special.cpp +++ b/src/server/scripts/World/npcs_special.cpp @@ -304,8 +304,6 @@ public: } }; - - enum eTrainingDummy { SPELL_STUN_PERMANENT = 61204 @@ -425,7 +423,6 @@ public: } }; - // Theirs /*######## # npc_air_force_bots @@ -1845,7 +1842,6 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const override { return new npc_pet_trainerAI(creature); diff --git a/src/server/shared/CMakeLists.txt b/src/server/shared/CMakeLists.txt index 225d8266c..33742f343 100644 --- a/src/server/shared/CMakeLists.txt +++ b/src/server/shared/CMakeLists.txt @@ -9,7 +9,7 @@ CollectSourceFiles( # Group sources GroupSources(${CMAKE_CURRENT_SOURCE_DIR}) -add_library(shared +add_library(shared ${PRIVATE_SOURCES}) CollectIncludeDirectories( diff --git a/src/server/shared/Network/RealmSocket.cpp b/src/server/shared/Network/RealmSocket.cpp index ab190a81e..7583c9757 100644 --- a/src/server/shared/Network/RealmSocket.cpp +++ b/src/server/shared/Network/RealmSocket.cpp @@ -11,14 +11,13 @@ #include "RealmSocket.h" #include "Log.h" - RealmSocket::Session::Session() = default; RealmSocket::Session::~Session() = default; RealmSocket::RealmSocket() : - input_buffer_(4096), - _remoteAddress() + input_buffer_(4096), + _remoteAddress() { reference_counting_policy().value(ACE_Event_Handler::Reference_Counting_Policy::ENABLED); diff --git a/src/server/worldserver/CMakeLists.txt b/src/server/worldserver/CMakeLists.txt index d1945e32c..d4e20b90c 100644 --- a/src/server/worldserver/CMakeLists.txt +++ b/src/server/worldserver/CMakeLists.txt @@ -21,7 +21,7 @@ if( WIN32 ) list(APPEND PRIVATE_SOURCES worldserver.rc) endif() endif() - + if (USE_COREPCH) set(PRIVATE_PCH_HEADER PrecompiledHeaders/worldPCH.h) endif() diff --git a/src/server/worldserver/Master.cpp b/src/server/worldserver/Master.cpp index d0ca5440c..4d35dbea9 100644 --- a/src/server/worldserver/Master.cpp +++ b/src/server/worldserver/Master.cpp @@ -134,7 +134,7 @@ int Master::Run() sLog->outString(" ╚██████╗╚██████╔╝██║ ██║███████╗"); sLog->outString(" ╚═════╝ ╚═════╝ ╚═╝ ╚═╝╚══════╝\n"); - sLog->outString(" AzerothCore 3.3.5a - www.azerothcore.org\n"); + sLog->outString(" AzerothCore 3.3.5a - www.azerothcore.org\n"); /// worldserver PID file creation std::string pidFile = sConfigMgr->GetStringDefault("PidFile", ""); @@ -203,7 +203,6 @@ int Master::Run() #if defined(_WIN32) || defined(__linux__) - ///- Handle affinity for multiple processors and process priority uint32 affinity = sConfigMgr->GetIntDefault("UseProcessors", 0); bool highPriority = sConfigMgr->GetBoolDefault("ProcessPriority", false); diff --git a/src/server/worldserver/RemoteAccess/RASocket.cpp b/src/server/worldserver/RemoteAccess/RASocket.cpp index 502c7f2b8..1918885fa 100644 --- a/src/server/worldserver/RemoteAccess/RASocket.cpp +++ b/src/server/worldserver/RemoteAccess/RASocket.cpp @@ -259,7 +259,6 @@ int RASocket::authenticate() return 0; } - int RASocket::subnegotiate() { char buf[1024]; diff --git a/src/server/worldserver/worldserver.conf.dist b/src/server/worldserver/worldserver.conf.dist index bc35190ce..4d0c797e7 100644 --- a/src/server/worldserver/worldserver.conf.dist +++ b/src/server/worldserver/worldserver.conf.dist @@ -289,7 +289,6 @@ PlayerSave.Stats.SaveOnlyOnLogout = 1 vmap.enableLOS = 1 vmap.enableHeight = 1 - # # vmap.petLOS # Description: Check line of sight for pets, to avoid them attacking through walls. @@ -748,7 +747,6 @@ LogDB.World = 0 LogDB.Chat = 0 - # ChatLogFile # Description: Log file for chat logs. # Default: "Chat.log" - (Enabled) @@ -794,7 +792,6 @@ ChatLogs.SysChan = 0 # Default: 0 - (Disabled) # 1 - (Enabled) - ChatLogs.Party = 0 # @@ -803,7 +800,6 @@ ChatLogs.Party = 0 # Default: 0 - (Disabled) # 1 - (Enabled) - ChatLogs.Raid = 0 # @@ -2398,7 +2394,7 @@ Rate.Drop.Item.ReferencedAmount = 1 # Default: 1 - (Rate.XP.Kill) # 1 - (Rate.XP.Quest) # 1 - (Rate.XP.Explore) -# 1 - (Rate.XP.Pet) +# 1 - (Rate.XP.Pet) Rate.XP.Kill = 1 Rate.XP.Quest = 1 @@ -2523,9 +2519,9 @@ Rate.InstanceResetTime = 1 # # Rate.Pet.LevelXP # Description: Modifies the amount of experience required to level up a pet. -# The lower the rate the less experience is required. +# The lower the rate the less experience is required. # Default: 0.05 -# +# Rate.Pet.LevelXP = 0.05 # @@ -2716,7 +2712,6 @@ Battleground.QueueAnnouncer.Enable = 0 Battleground.QueueAnnouncer.PlayerOnly = 0 - # # Battleground.PrematureFinishTimer # Description: Time (in milliseconds) before battleground will end prematurely if there are @@ -3005,7 +3000,6 @@ Arena.ArenaWinRatingModifier1 = 48 Arena.ArenaWinRatingModifier2 = 24 - # # Arena.ArenaLoseRatingModifier # Description: Modifier of rating subtraction for loser team @@ -3425,10 +3419,10 @@ MonsterSight = 50.000000 StrictChannelNames = 0 # -# Instance.SharedNormalHeroicId -# Description: No description -# Default: 0 - Disable -# 1 - Enable +# Instance.SharedNormalHeroicId +# Description: No description +# Default: 0 - Disable +# 1 - Enable # Instance.SharedNormalHeroicId = 0 @@ -3444,17 +3438,17 @@ Instance.SharedNormalHeroicId = 0 Instance.ResetTimeRelativeTimestamp = 1135814400 # -# TeleportTimeoutNear -# Description: No description -# Default: 25 +# TeleportTimeoutNear +# Description: No description +# Default: 25 # TeleportTimeoutNear = 25 # -# TeleportTimeoutFar -# Description: No description -# Default: 45 +# TeleportTimeoutFar +# Description: No description +# Default: 45 # TeleportTimeoutFar = 45 diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt index 14845d92f..baea60c97 100644 --- a/src/tools/CMakeLists.txt +++ b/src/tools/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) +# Copyright (C) # # This file is free software; as a special exception the author gives # unlimited permission to copy and/or distribute it, with or without diff --git a/src/tools/map_extractor/System.cpp b/src/tools/map_extractor/System.cpp index 744ef3a78..ae257a747 100644 --- a/src/tools/map_extractor/System.cpp +++ b/src/tools/map_extractor/System.cpp @@ -329,7 +329,6 @@ struct map_heightHeader #define MAP_LIQUID_TYPE_DARK_WATER 0x10 #define MAP_LIQUID_TYPE_WMO_WATER 0x20 - #define MAP_LIQUID_NO_TYPE 0x0001 #define MAP_LIQUID_NO_HEIGHT 0x0002 diff --git a/src/tools/map_extractor/dbcfile.cpp b/src/tools/map_extractor/dbcfile.cpp index 2106c5af2..a90fcee02 100644 --- a/src/tools/map_extractor/dbcfile.cpp +++ b/src/tools/map_extractor/dbcfile.cpp @@ -88,4 +88,3 @@ DBCFile::Iterator DBCFile::end() assert(data); return Iterator(*this, stringTable); } - diff --git a/src/tools/map_extractor/dbcfile.h b/src/tools/map_extractor/dbcfile.h index ffef3f488..166a93188 100644 --- a/src/tools/map_extractor/dbcfile.h +++ b/src/tools/map_extractor/dbcfile.h @@ -124,4 +124,3 @@ private: }; #endif - diff --git a/src/tools/mesh_extractor/DoodadHandler.h b/src/tools/mesh_extractor/DoodadHandler.h index 54c0c087b..7663ca285 100644 --- a/src/tools/mesh_extractor/DoodadHandler.h +++ b/src/tools/mesh_extractor/DoodadHandler.h @@ -53,7 +53,6 @@ public: std::vector> Triangles; bool IsSane() { return _definitions && _paths; } - protected: void ProcessInternal(MapChunk* chunk); diff --git a/src/tools/mesh_extractor/Geometry.cpp b/src/tools/mesh_extractor/Geometry.cpp index 1898f561c..c17d522e8 100644 --- a/src/tools/mesh_extractor/Geometry.cpp +++ b/src/tools/mesh_extractor/Geometry.cpp @@ -132,4 +132,3 @@ void Geometry::AddAdt( ADT* adt ) if (!adt->_WorldModelHandler->Triangles.empty()) AddData(adt->_WorldModelHandler->Vertices, adt->_WorldModelHandler->Triangles); } - diff --git a/src/tools/mesh_extractor/MeshExtractor.cpp b/src/tools/mesh_extractor/MeshExtractor.cpp index 6a04d4dfb..2cafcae5c 100644 --- a/src/tools/mesh_extractor/MeshExtractor.cpp +++ b/src/tools/mesh_extractor/MeshExtractor.cpp @@ -166,7 +166,6 @@ void ExtractGameobjectModels() fwrite(indices, sizeof(uint16), numTris, output); } - fwrite("VERT", 4, 1, output); wsize = sizeof(int) + sizeof(float) * 3 * numVerts; fwrite(&wsize, sizeof(int), 1, output); diff --git a/src/tools/mesh_extractor/Model.cpp b/src/tools/mesh_extractor/Model.cpp index 2c66e09db..45ec05983 100644 --- a/src/tools/mesh_extractor/Model.cpp +++ b/src/tools/mesh_extractor/Model.cpp @@ -70,4 +70,3 @@ void Model::ReadBoundingNormals() for (uint32 i = 0; i < Header.CountBoundingNormals; i++) Normals.push_back(Vector3::Read(Stream)); } - diff --git a/src/tools/mesh_extractor/WorldModelHandler.cpp b/src/tools/mesh_extractor/WorldModelHandler.cpp index 0119f1bba..a3459c08f 100644 --- a/src/tools/mesh_extractor/WorldModelHandler.cpp +++ b/src/tools/mesh_extractor/WorldModelHandler.cpp @@ -34,7 +34,6 @@ WorldModelDefinition WorldModelDefinition::Read( FILE* file ) return ret; } - WorldModelHandler::WorldModelHandler( ADT* adt ) : ObjectDataHandler(adt), _definitions(nullptr), _paths(nullptr) { ReadModelPaths(); diff --git a/src/tools/mmaps_generator/Info/readme.txt b/src/tools/mmaps_generator/Info/readme.txt index 8059add00..7e1a1ece6 100644 --- a/src/tools/mmaps_generator/Info/readme.txt +++ b/src/tools/mmaps_generator/Info/readme.txt @@ -53,7 +53,6 @@ Generator command line args this command will build the map regardless of --skip* option settings if you do not specify a map number, builds all maps that pass the filters specified by --skip* options - examples: movement_extractor diff --git a/src/tools/mmaps_generator/IntermediateValues.cpp b/src/tools/mmaps_generator/IntermediateValues.cpp index ecc069c34..108d4f109 100644 --- a/src/tools/mmaps_generator/IntermediateValues.cpp +++ b/src/tools/mmaps_generator/IntermediateValues.cpp @@ -222,7 +222,6 @@ namespace MMAP fclose(objFile); - char tileString[25]; sprintf(tileString, "[%02u,%02u]: ", tileY, tileX); printf("%sWriting debug output... \r", tileString); diff --git a/src/tools/mmaps_generator/MapBuilder.cpp b/src/tools/mmaps_generator/MapBuilder.cpp index d7530c5d1..5f205851c 100644 --- a/src/tools/mmaps_generator/MapBuilder.cpp +++ b/src/tools/mmaps_generator/MapBuilder.cpp @@ -49,7 +49,7 @@ namespace MMAP MapBuilder::MapBuilder(float maxWalkableAngle, bool skipLiquid, bool skipContinents, bool skipJunkMaps, bool skipBattlegrounds, bool debugOutput, bool bigBaseUnit, const char* offMeshFilePath) : - + m_debugOutput (debugOutput), m_offMeshFilePath (offMeshFilePath), m_skipContinents (skipContinents), @@ -57,7 +57,7 @@ namespace MMAP m_skipBattlegrounds (skipBattlegrounds), m_maxWalkableAngle (maxWalkableAngle), m_bigBaseUnit (bigBaseUnit), - + _cancelationToken (false) { m_terrainBuilder = new TerrainBuilder(skipLiquid); diff --git a/src/tools/mmaps_generator/TerrainBuilder.cpp b/src/tools/mmaps_generator/TerrainBuilder.cpp index eb5cf2c37..97c17561a 100644 --- a/src/tools/mmaps_generator/TerrainBuilder.cpp +++ b/src/tools/mmaps_generator/TerrainBuilder.cpp @@ -269,7 +269,6 @@ namespace MMAP if (fread(&lheader, sizeof(map_liquidHeader), 1, mapFile) != 1) printf("TerrainBuilder::loadMap: Failed to read some data expected 1, read 0\n"); - float* liquid_map = nullptr; if (!(lheader.flags & MAP_LIQUID_NO_TYPE)) diff --git a/src/tools/mmaps_generator/TerrainBuilder.h b/src/tools/mmaps_generator/TerrainBuilder.h index 745f69dcb..a864f06fe 100644 --- a/src/tools/mmaps_generator/TerrainBuilder.h +++ b/src/tools/mmaps_generator/TerrainBuilder.h @@ -115,4 +115,3 @@ namespace MMAP } #endif - diff --git a/src/tools/vmap4_extractor/adtfile.h b/src/tools/vmap4_extractor/adtfile.h index f01029694..ebb171159 100644 --- a/src/tools/vmap4_extractor/adtfile.h +++ b/src/tools/vmap4_extractor/adtfile.h @@ -94,7 +94,6 @@ struct MapChunkHeader uint32 effectId; }; - class ADTFile { private: diff --git a/src/tools/vmap4_extractor/model.cpp b/src/tools/vmap4_extractor/model.cpp index 57f853ca4..43a13dca2 100644 --- a/src/tools/vmap4_extractor/model.cpp +++ b/src/tools/vmap4_extractor/model.cpp @@ -118,7 +118,6 @@ bool Model::ConvertToVMAPModel(const char* outfilename) return true; } - Vec3D fixCoordSystem(Vec3D v) { return Vec3D(v.x, v.z, -v.y); diff --git a/src/tools/vmap4_extractor/vec3d.h b/src/tools/vmap4_extractor/vec3d.h index 7b92df092..d882e1855 100644 --- a/src/tools/vmap4_extractor/vec3d.h +++ b/src/tools/vmap4_extractor/vec3d.h @@ -126,7 +126,6 @@ public: } }; - class Vec2D { public: @@ -215,7 +214,6 @@ public: return r; } - friend std::istream& operator>>(std::istream& in, Vec2D& v) { in >> v.x >> v.y; diff --git a/src/tools/vmap4_extractor/vmapexport.cpp b/src/tools/vmap4_extractor/vmapexport.cpp index efa4b6c42..309257937 100644 --- a/src/tools/vmap4_extractor/vmapexport.cpp +++ b/src/tools/vmap4_extractor/vmapexport.cpp @@ -433,7 +433,6 @@ bool processArgv(int argc, char** argv, const char* versionString) return result; } - //xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx // Main // @@ -518,7 +517,6 @@ int main(int argc, char** argv) printf("Map - %s\n", map_ids[x].name); } - delete dbc; ParsMapFiles(); delete [] map_ids;