From 8eb009fdfc0445722296eecf8aee38fa3a9d8a24 Mon Sep 17 00:00:00 2001 From: Kitzunu <24550914+Kitzunu@users.noreply.github.com> Date: Tue, 21 Jul 2026 06:13:51 +0200 Subject: [PATCH] refactor(Core/Misc): enforce east-const style and add codestyle check (#26492) Co-authored-by: Ludwig --- apps/codestyle/codestyle-cpp.py | 54 +++++++++++++++---- .../Collision/BoundingIntervalHierarchy.h | 6 +-- .../BoundingIntervalHierarchyWrapper.h | 28 +++++----- src/common/Collision/DynamicTree.cpp | 26 ++++----- src/common/Collision/DynamicTree.h | 12 ++--- src/common/Collision/Management/IVMapMgr.h | 2 +- src/common/Collision/Management/VMapMgr2.cpp | 2 +- src/common/Collision/Management/VMapMgr2.h | 2 +- src/common/Collision/Maps/MapDefines.h | 2 +- src/common/Collision/Maps/MapTree.cpp | 20 +++---- src/common/Collision/Maps/MapTree.h | 22 ++++---- src/common/Collision/Maps/TileAssembler.cpp | 16 +++--- src/common/Collision/Maps/TileAssembler.h | 10 ++-- .../Collision/Models/GameObjectModel.cpp | 2 +- src/common/Collision/Models/GameObjectModel.h | 6 +-- src/common/Collision/Models/ModelInstance.cpp | 10 ++-- src/common/Collision/Models/ModelInstance.h | 14 ++--- src/common/Collision/Models/WorldModel.cpp | 38 ++++++------- src/common/Collision/Models/WorldModel.h | 24 ++++----- src/common/Collision/RegularGrid.h | 18 +++---- src/common/Collision/VMapDefinitions.h | 2 +- src/common/Collision/VMapTools.h | 12 ++--- src/common/Common.cpp | 2 +- src/common/Common.h | 2 +- src/common/Configuration/Config.cpp | 4 +- src/common/DataStores/DBCFileLoader.cpp | 2 +- src/common/DataStores/DBCFileLoader.h | 6 +-- .../Debugging/WheatyExceptionReport.cpp | 6 +-- src/common/Debugging/WheatyExceptionReport.h | 6 +-- src/common/Dynamic/TypeContainer.h | 4 +- src/common/Dynamic/TypeContainerFunctions.h | 20 +++---- .../Dynamic/TypeContainerFunctionsPtr.h | 8 +-- src/common/Dynamic/TypeContainerVisitor.h | 2 +- src/common/Metric/Metric.cpp | 2 +- src/common/Navigation/DetourExtended.cpp | 8 +-- src/common/Navigation/DetourExtended.h | 8 +-- src/common/Threading/LockedQueue.h | 2 +- src/common/Threading/PCQueue.h | 2 +- src/common/Threading/Threading.h | 4 +- src/common/Threading/ThreadingModel.h | 16 +++--- src/common/Utilities/SmartEnum.h | 12 ++--- src/common/Utilities/StringFormat.cpp | 4 +- src/common/Utilities/StringFormat.h | 2 +- src/common/Utilities/Util.cpp | 10 ++-- src/common/Utilities/Util.h | 12 ++--- src/server/apps/worldserver/ACSoap/ACSoap.cpp | 2 +- src/server/apps/worldserver/ACSoap/ACSoap.h | 2 +- .../worldserver/RemoteAccess/RASession.cpp | 4 +- .../apps/worldserver/RemoteAccess/RASession.h | 4 +- .../database/Database/MySQLConnection.cpp | 6 +-- .../database/Database/MySQLConnection.h | 2 +- src/server/database/Database/QueryResult.h | 2 +- src/server/database/Database/Transaction.cpp | 4 +- src/server/database/Updater/DBUpdater.cpp | 6 +-- src/server/game/AI/CoreAI/PetAI.cpp | 2 +- src/server/game/AI/CreatureAI.cpp | 2 +- .../game/AI/ScriptedAI/ScriptedCreature.h | 8 +-- .../game/AI/ScriptedAI/ScriptedFollowerAI.cpp | 2 +- .../game/AI/ScriptedAI/ScriptedFollowerAI.h | 4 +- src/server/game/AI/SmartScripts/SmartAI.cpp | 4 +- src/server/game/AI/SmartScripts/SmartAI.h | 4 +- .../game/Achievements/AchievementMgr.cpp | 6 +-- src/server/game/Addons/AddonMgr.cpp | 2 +- src/server/game/Addons/AddonMgr.h | 2 +- .../game/ArenaSpectator/ArenaSpectator.cpp | 4 +- .../game/ArenaSpectator/ArenaSpectator.h | 14 ++--- .../ArenaSeason/ArenaSeasonMgr.h | 4 +- .../ArenaSeasonRewardsDistributor.cpp | 2 +- src/server/game/Battlegrounds/ArenaTeam.cpp | 8 +-- src/server/game/Battlegrounds/ArenaTeam.h | 8 +-- .../game/Battlegrounds/ArenaTeamMgr.cpp | 2 +- src/server/game/Battlegrounds/Battleground.h | 26 ++++----- .../game/Battlegrounds/BattlegroundMgr.cpp | 2 +- .../Battlegrounds/Zones/BattlegroundEY.cpp | 2 +- src/server/game/Calendar/CalendarMgr.h | 6 +-- src/server/game/Chat/Channels/Channel.cpp | 6 +-- src/server/game/Chat/Channels/Channel.h | 2 +- src/server/game/Chat/Channels/ChannelMgr.cpp | 4 +- src/server/game/Chat/Channels/ChannelMgr.h | 4 +- src/server/game/Chat/Chat.cpp | 6 +-- src/server/game/Chat/Chat.h | 6 +-- src/server/game/Conditions/ConditionMgr.cpp | 8 +-- src/server/game/Conditions/ConditionMgr.h | 2 +- src/server/game/DataStores/DBCStores.cpp | 6 +-- src/server/game/DataStores/DBCStores.h | 4 +- src/server/game/DungeonFinding/LFG.h | 14 ++--- src/server/game/DungeonFinding/LFGMgr.cpp | 26 ++++----- src/server/game/DungeonFinding/LFGMgr.h | 6 +-- .../game/DungeonFinding/LFGPlayerData.cpp | 2 +- .../game/DungeonFinding/LFGPlayerData.h | 2 +- src/server/game/DungeonFinding/LFGQueue.cpp | 8 +-- src/server/game/DungeonFinding/LFGQueue.h | 4 +- .../game/Entities/Creature/Creature.cpp | 8 +-- src/server/game/Entities/Creature/Creature.h | 14 ++--- .../game/Entities/Creature/CreatureGroups.h | 2 +- .../game/Entities/Creature/TemporarySummon.h | 2 +- .../game/Entities/GameObject/GameObject.cpp | 8 +-- .../game/Entities/GameObject/GameObject.h | 2 +- src/server/game/Entities/Item/Item.h | 2 +- src/server/game/Entities/Object/Object.cpp | 12 ++--- src/server/game/Entities/Object/Object.h | 14 ++--- src/server/game/Entities/Object/Position.cpp | 10 ++-- src/server/game/Entities/Object/Position.h | 24 ++++----- .../Entities/Object/Updates/UpdateData.cpp | 4 +- .../game/Entities/Object/Updates/UpdateData.h | 4 +- .../game/Entities/Player/KillRewarder.cpp | 2 +- src/server/game/Entities/Player/Player.cpp | 14 ++--- src/server/game/Entities/Player/Player.h | 18 +++---- .../game/Entities/Player/PlayerQuest.cpp | 6 +-- .../game/Entities/Player/PlayerStorage.cpp | 40 +++++++------- .../game/Entities/Player/PlayerTaxi.cpp | 2 +- .../game/Entities/Player/PlayerUpdates.cpp | 4 +- src/server/game/Entities/Unit/CharmInfo.cpp | 2 +- src/server/game/Entities/Unit/CharmInfo.h | 2 +- src/server/game/Entities/Unit/Unit.cpp | 8 +-- src/server/game/Entities/Unit/Unit.h | 10 ++-- src/server/game/Entities/Unit/UnitUtils.h | 10 ++-- .../game/Events/HolidayDateCalculator.cpp | 8 +-- .../game/Events/HolidayDateCalculator.h | 8 +-- src/server/game/Globals/ObjectMgr.cpp | 26 ++++----- src/server/game/Globals/ObjectMgr.h | 4 +- src/server/game/Grids/Cells/Cell.h | 4 +- src/server/game/Grids/GridDefines.h | 8 +-- src/server/game/Groups/Group.cpp | 12 ++--- src/server/game/Groups/Group.h | 14 ++--- src/server/game/Guilds/Guild.cpp | 18 +++---- src/server/game/Guilds/Guild.h | 10 ++-- src/server/game/Handlers/ArenaTeamHandler.cpp | 2 +- .../game/Handlers/AuctionHouseHandler.cpp | 2 +- src/server/game/Handlers/GroupHandler.cpp | 2 +- src/server/game/Handlers/LFGHandler.cpp | 2 +- src/server/game/Handlers/PetHandler.cpp | 2 +- src/server/game/Handlers/QueryHandler.cpp | 2 +- src/server/game/Handlers/QuestHandler.cpp | 2 +- src/server/game/Handlers/SpellHandler.cpp | 2 +- src/server/game/Instances/InstanceScript.cpp | 8 +-- src/server/game/Loot/LootMgr.cpp | 10 ++-- src/server/game/Loot/LootMgr.h | 6 +-- src/server/game/Maps/Map.cpp | 2 +- src/server/game/Maps/Map.h | 28 +++++----- src/server/game/Maps/MapMgr.h | 4 +- src/server/game/Misc/GameGraveyard.cpp | 4 +- src/server/game/Misc/GameGraveyard.h | 2 +- src/server/game/Movement/MotionMaster.cpp | 2 +- src/server/game/Movement/MotionMaster.h | 4 +- .../MovementGenerators/PathGenerator.cpp | 4 +- .../PointMovementGenerator.h | 2 +- .../game/Movement/Spline/MoveSpline.cpp | 2 +- src/server/game/Movement/Spline/MoveSpline.h | 10 ++-- .../game/Movement/Spline/MoveSplineFlag.h | 6 +-- .../game/Movement/Spline/MoveSplineInit.cpp | 2 +- .../game/Movement/Spline/MoveSplineInit.h | 6 +-- .../Movement/Spline/MovementPacketBuilder.cpp | 18 +++---- .../Movement/Spline/MovementPacketBuilder.h | 6 +-- src/server/game/Movement/Spline/Spline.cpp | 20 +++---- src/server/game/Movement/Spline/Spline.h | 20 +++---- src/server/game/OutdoorPvP/OutdoorPvP.cpp | 4 +- src/server/game/Quests/QuestDef.cpp | 2 +- src/server/game/Reputation/ReputationMgr.cpp | 2 +- src/server/game/Scripting/MapScripts.cpp | 14 ++--- .../Scripting/ScriptDefines/ALEScript.cpp | 2 +- .../game/Scripting/ScriptDefines/ALEScript.h | 2 +- .../Scripting/ScriptDefines/AccountScript.h | 2 +- .../ScriptDefines/AchievementCriteriaScript.h | 2 +- .../ScriptDefines/AchievementScript.cpp | 2 +- .../ScriptDefines/AchievementScript.h | 2 +- .../ScriptDefines/AllBattlegroundScript.h | 2 +- .../ScriptDefines/AllCommandScript.cpp | 2 +- .../ScriptDefines/AllCommandScript.h | 2 +- .../ScriptDefines/AllCreatureScript.cpp | 6 +-- .../ScriptDefines/AllCreatureScript.h | 8 +-- .../ScriptDefines/AllGameObjectScript.cpp | 2 +- .../ScriptDefines/AllGameObjectScript.h | 4 +- .../Scripting/ScriptDefines/AllItemScript.cpp | 6 +-- .../Scripting/ScriptDefines/AllItemScript.h | 4 +- .../Scripting/ScriptDefines/AllMapScript.cpp | 2 +- .../Scripting/ScriptDefines/AllMapScript.h | 2 +- .../Scripting/ScriptDefines/AllSpellScript.h | 2 +- .../ScriptDefines/AreaTriggerScript.cpp | 2 +- .../ScriptDefines/AreaTriggerScript.h | 2 +- .../Scripting/ScriptDefines/ArenaScript.cpp | 2 +- .../Scripting/ScriptDefines/ArenaScript.h | 2 +- .../ScriptDefines/ArenaTeamScript.cpp | 2 +- .../Scripting/ScriptDefines/ArenaTeamScript.h | 2 +- .../ScriptDefines/AuctionHouseScript.cpp | 2 +- .../ScriptDefines/AuctionHouseScript.h | 2 +- .../ScriptDefines/BattlefieldScript.h | 2 +- .../ScriptDefines/BattlegroundMapScript.cpp | 2 +- .../ScriptDefines/BattlegroundMapScript.h | 2 +- .../ScriptDefines/BattlegroundScript.cpp | 2 +- .../ScriptDefines/BattlegroundScript.h | 2 +- .../Scripting/ScriptDefines/CommandScript.cpp | 2 +- .../Scripting/ScriptDefines/CommandScript.h | 2 +- .../ScriptDefines/ConditionScript.cpp | 2 +- .../Scripting/ScriptDefines/ConditionScript.h | 2 +- .../ScriptDefines/CreatureScript.cpp | 4 +- .../Scripting/ScriptDefines/CreatureScript.h | 4 +- .../ScriptDefines/DatabaseScript.cpp | 2 +- .../Scripting/ScriptDefines/DatabaseScript.h | 2 +- .../ScriptDefines/DynamicObjectScript.cpp | 2 +- .../ScriptDefines/DynamicObjectScript.h | 2 +- .../Scripting/ScriptDefines/FormulaScript.cpp | 2 +- .../Scripting/ScriptDefines/FormulaScript.h | 2 +- .../ScriptDefines/GameEventScript.cpp | 2 +- .../Scripting/ScriptDefines/GameEventScript.h | 2 +- .../ScriptDefines/GameObjectScript.cpp | 4 +- .../ScriptDefines/GameObjectScript.h | 4 +- .../Scripting/ScriptDefines/GlobalScript.cpp | 2 +- .../Scripting/ScriptDefines/GlobalScript.h | 2 +- .../Scripting/ScriptDefines/GroupScript.cpp | 4 +- .../Scripting/ScriptDefines/GroupScript.h | 4 +- .../Scripting/ScriptDefines/GuildScript.cpp | 8 +-- .../Scripting/ScriptDefines/GuildScript.h | 8 +-- .../ScriptDefines/InstanceMapScript.cpp | 2 +- .../ScriptDefines/InstanceMapScript.h | 2 +- .../game/Scripting/ScriptDefines/ItemScript.h | 4 +- .../Scripting/ScriptDefines/LootScript.cpp | 2 +- .../game/Scripting/ScriptDefines/LootScript.h | 2 +- .../Scripting/ScriptDefines/MailScript.cpp | 2 +- .../game/Scripting/ScriptDefines/MailScript.h | 2 +- .../Scripting/ScriptDefines/MiscScript.cpp | 4 +- .../game/Scripting/ScriptDefines/MiscScript.h | 4 +- .../Scripting/ScriptDefines/ModuleScript.cpp | 2 +- .../Scripting/ScriptDefines/ModuleScript.h | 2 +- .../ScriptDefines/MovementHandlerScript.cpp | 2 +- .../ScriptDefines/MovementHandlerScript.h | 2 +- .../ScriptDefines/OutdoorPvPScript.cpp | 2 +- .../ScriptDefines/OutdoorPvPScript.h | 2 +- .../Scripting/ScriptDefines/PetScript.cpp | 2 +- .../game/Scripting/ScriptDefines/PetScript.h | 2 +- .../Scripting/ScriptDefines/PlayerScript.cpp | 6 +-- .../Scripting/ScriptDefines/PlayerScript.h | 6 +-- .../Scripting/ScriptDefines/ServerScript.cpp | 2 +- .../Scripting/ScriptDefines/ServerScript.h | 2 +- .../ScriptDefines/SpellScriptLoader.cpp | 2 +- .../ScriptDefines/SpellScriptLoader.h | 2 +- .../ScriptDefines/TransportScript.cpp | 2 +- .../Scripting/ScriptDefines/TransportScript.h | 2 +- .../Scripting/ScriptDefines/UnitScript.cpp | 2 +- .../game/Scripting/ScriptDefines/UnitScript.h | 2 +- .../Scripting/ScriptDefines/VehicleScript.cpp | 2 +- .../Scripting/ScriptDefines/VehicleScript.h | 2 +- .../Scripting/ScriptDefines/WeatherScript.cpp | 2 +- .../Scripting/ScriptDefines/WeatherScript.h | 2 +- .../ScriptDefines/WorldMapScript.cpp | 2 +- .../Scripting/ScriptDefines/WorldMapScript.h | 2 +- .../ScriptDefines/WorldObjectScript.cpp | 2 +- .../ScriptDefines/WorldObjectScript.h | 2 +- .../Scripting/ScriptDefines/WorldScript.cpp | 2 +- .../Scripting/ScriptDefines/WorldScript.h | 2 +- src/server/game/Scripting/ScriptMgr.h | 24 ++++----- src/server/game/Scripting/ScriptObject.h | 4 +- src/server/game/Server/WorldSession.cpp | 2 +- src/server/game/Server/WorldSession.h | 2 +- .../game/Spells/Auras/SpellAuraEffects.cpp | 6 +-- src/server/game/Spells/Auras/SpellAuras.h | 2 +- src/server/game/Spells/Spell.h | 2 +- src/server/game/Spells/SpellEffects.cpp | 2 +- src/server/game/Spells/SpellInfo.cpp | 2 +- src/server/game/Spells/SpellInfo.h | 2 +- src/server/game/Spells/SpellMgr.cpp | 2 +- src/server/game/Spells/SpellMgr.h | 2 +- src/server/game/Tickets/TicketMgr.cpp | 2 +- src/server/game/Tickets/TicketMgr.h | 2 +- .../game/Tools/CharacterDatabaseCleaner.cpp | 2 +- .../game/Tools/CharacterDatabaseCleaner.h | 2 +- src/server/game/Warden/Warden.cpp | 4 +- src/server/game/Warden/WardenPayloadMgr.cpp | 2 +- src/server/game/Warden/WardenPayloadMgr.h | 2 +- src/server/game/World/IWorld.h | 4 +- src/server/game/World/World.cpp | 2 +- src/server/game/World/WorldState.cpp | 2 +- src/server/game/World/WorldState.h | 2 +- src/server/scripts/Commands/cs_inventory.cpp | 2 +- src/server/scripts/Commands/cs_misc.cpp | 2 +- src/server/scripts/Commands/cs_wp.cpp | 16 +++--- .../BlackrockDepths/blackrock_depths.cpp | 2 +- .../instance_blackrock_depths.cpp | 4 +- .../instance_blackrock_spire.cpp | 8 +-- .../Deadmines/instance_deadmines.cpp | 2 +- .../Gnomeregan/instance_gnomeregan.cpp | 2 +- .../ShadowfangKeep/boss_apothecary_hummel.cpp | 2 +- .../SunkenTemple/instance_sunken_temple.cpp | 2 +- .../SunwellPlateau/boss_felmyst.cpp | 2 +- .../EasternKingdoms/ZulGurub/boss_hakkar.cpp | 10 ++-- .../scripts/EasternKingdoms/zone_duskwood.cpp | 2 +- .../EasternKingdoms/zone_undercity.cpp | 2 +- .../scripts/EasternKingdoms/zone_westfall.cpp | 2 +- .../scripts/EasternKingdoms/zone_wetlands.cpp | 2 +- src/server/scripts/Events/midsummer.cpp | 4 +- .../culling_of_stratholme.cpp | 4 +- .../instance_culling_of_stratholme.cpp | 2 +- .../TempleOfAhnQiraj/boss_twinemperors.cpp | 2 +- .../TempleOfAhnQiraj/temple_of_ahnqiraj.cpp | 2 +- .../scripts/Kalimdor/zone_darkshore.cpp | 6 +-- src/server/scripts/Kalimdor/zone_tanaris.cpp | 2 +- .../scripts/Kalimdor/zone_the_barrens.cpp | 2 +- .../Kalimdor/zone_thousand_needles.cpp | 4 +- .../scripts/Kalimdor/zone_ungoro_crater.cpp | 2 +- .../instance_trial_of_the_champion.cpp | 6 +-- .../HallsOfReflection/halls_of_reflection.cpp | 2 +- .../PitOfSaron/boss_forgemaster_garfrost.cpp | 2 +- .../FrozenHalls/PitOfSaron/pit_of_saron.cpp | 2 +- .../Gundrak/boss_drakkari_colossus.cpp | 2 +- .../boss_blood_queen_lana_thel.cpp | 12 ++--- .../boss_lady_deathwhisper.cpp | 2 +- .../Northrend/Naxxramas/boss_maexxna.cpp | 2 +- .../Northrend/Naxxramas/boss_thaddius.cpp | 2 +- .../instance_halls_of_lightning.cpp | 2 +- .../Ulduar/HallsOfStone/brann_bronzebeard.cpp | 2 +- .../scripts/Northrend/zone_icecrown.cpp | 2 +- .../scripts/Northrend/zone_sholazar_basin.cpp | 2 +- .../scripts/Northrend/zone_wintergrasp.cpp | 2 +- src/server/scripts/Northrend/zone_zuldrak.cpp | 6 +-- .../scripts/OutdoorPvP/OutdoorPvPEP.cpp | 2 +- .../scripts/OutdoorPvP/OutdoorPvPNA.cpp | 6 +-- .../underbog/boss_ghazan.cpp | 2 +- src/server/scripts/Outland/zone_nagrand.cpp | 4 +- .../scripts/Outland/zone_netherstorm.cpp | 4 +- src/server/scripts/Pet/pet_generic.cpp | 2 +- src/server/scripts/Spells/spell_generic.cpp | 2 +- src/server/scripts/Spells/spell_mage.cpp | 4 +- src/server/scripts/Spells/spell_priest.cpp | 2 +- src/server/scripts/Spells/spell_warrior.cpp | 2 +- src/server/scripts/World/item_scripts.cpp | 2 +- src/server/scripts/World/scourge_invasion.cpp | 4 +- .../scripts/World/suns_reach_reclamation.cpp | 4 +- src/server/shared/Packets/ByteBuffer.h | 2 +- src/test/common/Configuration/Config.cpp | 2 +- src/test/mocks/WorldMock.h | 4 +- .../game/Events/HolidayDateCalculatorTest.cpp | 6 +-- .../Spells/CascadeProcSuppressionTest.cpp | 2 +- .../Spells/SpellProcDBCValidationTest.cpp | 2 +- .../game/Spells/SpellProcDataDrivenTest.cpp | 4 +- .../game/Spells/SpellProcFullCoverageTest.cpp | 2 +- .../server/game/Spells/SpellProcPPMTest.cpp | 2 +- src/tools/map_extractor/System.cpp | 10 ++-- src/tools/map_extractor/dbcfile.h | 10 ++-- src/tools/map_extractor/mpq_libmpq.cpp | 4 +- src/tools/map_extractor/mpq_libmpq04.h | 8 +-- src/tools/mmaps_generator/Config.cpp | 40 +++++++------- src/tools/mmaps_generator/Config.h | 2 +- .../mmaps_generator/IntermediateValues.cpp | 14 ++--- .../mmaps_generator/IntermediateValues.h | 14 ++--- src/tools/mmaps_generator/MapBuilder.cpp | 2 +- src/tools/mmaps_generator/MapBuilder.h | 4 +- src/tools/mmaps_generator/PathCommon.h | 4 +- src/tools/mmaps_generator/PathGenerator.cpp | 4 +- src/tools/mmaps_generator/TerrainBuilder.cpp | 6 +-- src/tools/mmaps_generator/TerrainBuilder.h | 6 +-- src/tools/vmap4_extractor/adtfile.cpp | 2 +- src/tools/vmap4_extractor/adtfile.h | 2 +- src/tools/vmap4_extractor/dbcfile.h | 12 ++--- .../vmap4_extractor/gameobject_extract.cpp | 2 +- src/tools/vmap4_extractor/model.cpp | 2 +- src/tools/vmap4_extractor/mpq_libmpq.cpp | 4 +- src/tools/vmap4_extractor/mpq_libmpq04.h | 8 +-- src/tools/vmap4_extractor/vec3d.h | 36 ++++++------- src/tools/vmap4_extractor/vmapexport.cpp | 6 +-- src/tools/vmap4_extractor/vmapexport.h | 4 +- src/tools/vmap4_extractor/wmo.h | 2 +- 361 files changed, 1016 insertions(+), 980 deletions(-) diff --git a/apps/codestyle/codestyle-cpp.py b/apps/codestyle/codestyle-cpp.py index 7b0dea93f..6a73a6b87 100644 --- a/apps/codestyle/codestyle-cpp.py +++ b/apps/codestyle/codestyle-cpp.py @@ -6,6 +6,30 @@ import re # Get the src directory of the project src_directory = os.path.join(os.getcwd(), 'src') +# Matches west-const declarations: "const &" / "const *". +# may be a (qualified) identifier, an optional unsigned/signed/long/short +# prefix and an optional (single level of nested) template argument list. +qualifier_align_regex = re.compile( + r'\bconst\s+(' + r'(?:(?:unsigned|signed|long|short)\s+)*' + r'(?:::)?[A-Za-z_]\w*(?:::[A-Za-z_]\w*)*' + r'(?:\s*<[^<>;{}]*(?:<[^<>;{}]*>[^<>;{}]*)*>)?' + r')\s*([&*])') + +# Matches a raw string, line comment, block comment, string literal or char literal +# (whichever starts first at any position, so // inside a string or " inside a comment +# is handled). The raw string alternative comes first so R"delim(...)delim" - which may +# contain unescaped quotes - is consumed whole rather than as a plain "..." string. +literal_or_comment_regex = re.compile( + r'R"([^()\\ \t\r\n]{0,16})\(.*?\)\1"' + r'|//[^\n]*|/\*.*?\*/|"(?:\\.|[^"\\])*"|\'(?:\\.|[^\'\\])*\'', re.DOTALL) + +# Replaces the contents of string/char literals and comments with spaces so the +# qualifier-alignment check never matches text inside them. Whitespace (including +# newlines) is preserved so line numbers stay accurate. +def blank_non_code(text: str) -> str: + return literal_or_comment_regex.sub(lambda m: re.sub(r'\S', ' ', m.group()), text) + # Global variables error_handler = False results = { @@ -16,7 +40,8 @@ results = { "GetTypeId() check": "Passed", "NpcFlagHelpers check": "Passed", "ItemFlagHelpers check": "Passed", - "ItemTemplateFlagHelpers check": "Passed" + "ItemTemplateFlagHelpers check": "Passed", + "Qualifier alignment check": "Passed" } # Main function to parse all the files of the project @@ -46,6 +71,7 @@ def parsing_file(directory: str) -> None: itemflag_helpers_check(file, file_path) if file_name != 'ItemTemplate.h': itemtemplateflag_helpers_check(file, file_path) + qualifier_alignment_check(file, file_path) except UnicodeDecodeError: print(f"\nCould not decode file {file_path}") sys.exit(1) @@ -214,6 +240,24 @@ def itemtemplateflag_helpers_check(file: io, file_path: str) -> None: error_handler = True results["ItemTemplateFlagHelpers check"] = "Failed" +# Codestyle patterns enforcing east-const: "const T&" -> "T const&", "const T*" -> "T const*" +def qualifier_alignment_check(file: io, file_path: str) -> None: + global error_handler, results + file.seek(0) # Reset file pointer to the beginning + check_failed = False + # Blank out strings/comments so we never match inside them, then check line by line + masked_lines = blank_non_code(file.read()).split('\n') + for line_number, line in enumerate(masked_lines, start = 1): + for match in qualifier_align_regex.finditer(line): + type_name, symbol = match.group(1).strip(), match.group(2) + print( + f"Please use the '{type_name} const{symbol}' syntax instead of 'const {type_name}{symbol}': {file_path} at line {line_number}") + check_failed = True + # Handle the script error and update the result output + if check_failed: + error_handler = True + results["Qualifier alignment check"] = "Failed" + # Codestyle patterns checking for various codestyle issues def misc_codestyle_check(file: io, file_path: str) -> None: global error_handler, results @@ -229,14 +273,6 @@ def misc_codestyle_check(file: io, file_path: str) -> None: # Parse all the file for line_number, line in enumerate(file, start = 1): - if 'const auto&' in line: - print( - f"Please use the 'auto const&' syntax instead of 'const auto&': {file_path} at line {line_number}") - check_failed = True - if re.search(r'\bconst\s+\w+\s*\*\b', line): - print( - f"Please use the 'Class/ObjectType const*' syntax instead of 'const Class/ObjectType*': {file_path} at line {line_number}") - check_failed = True if [match for match in [' if(', ' if ( '] if match in line]: print( f"Please use the 'if (XXXX)' syntax instead of 'if(XXXX)': {file_path} at line {line_number}") diff --git a/src/common/Collision/BoundingIntervalHierarchy.h b/src/common/Collision/BoundingIntervalHierarchy.h index 84aa01139..7d9eb0227 100644 --- a/src/common/Collision/BoundingIntervalHierarchy.h +++ b/src/common/Collision/BoundingIntervalHierarchy.h @@ -78,7 +78,7 @@ private: public: BIH() { init_empty(); } template< class BoundsFunc, class PrimArray > - void build(const PrimArray& primitives, BoundsFunc& GetBounds, uint32 leafSize = 3, bool printStats = false) + void build(PrimArray const& primitives, BoundsFunc& GetBounds, uint32 leafSize = 3, bool printStats = false) { if (primitives.size() == 0) { @@ -120,7 +120,7 @@ public: G3D::AABox const& bound() const { return bounds; } template - void intersectRay(const G3D::Ray& r, RayCallback& intersectCallback, float& maxDist, bool stopAtFirstHit) const + void intersectRay(G3D::Ray const& r, RayCallback& intersectCallback, float& maxDist, bool stopAtFirstHit) const { float intervalMin = -1.f; float intervalMax = -1.f; @@ -283,7 +283,7 @@ public: } template - void intersectPoint(const G3D::Vector3& p, IsectCallback& intersectCallback) const + void intersectPoint(G3D::Vector3 const& p, IsectCallback& intersectCallback) const { if (!bounds.contains(p)) { diff --git a/src/common/Collision/BoundingIntervalHierarchyWrapper.h b/src/common/Collision/BoundingIntervalHierarchyWrapper.h index 69aee4802..66fb4673f 100644 --- a/src/common/Collision/BoundingIntervalHierarchyWrapper.h +++ b/src/common/Collision/BoundingIntervalHierarchyWrapper.h @@ -29,20 +29,20 @@ class BIHWrap template struct MDLCallback { - const T* const* objects; + T const* const* objects; RayCallback& _callback; uint32 objects_size; - MDLCallback(RayCallback& callback, const T* const* objects_array, uint32 objects_size ) : objects(objects_array), _callback(callback), objects_size(objects_size) { } + MDLCallback(RayCallback& callback, T const* const* objects_array, uint32 objects_size ) : objects(objects_array), _callback(callback), objects_size(objects_size) { } /// Intersect ray - bool operator() (const G3D::Ray& ray, uint32 idx, float& maxDist, bool stopAtFirstHit) + bool operator() (G3D::Ray const& ray, uint32 idx, float& maxDist, bool stopAtFirstHit) { if (idx >= objects_size) { return false; } - if (const T* obj = objects[idx]) + if (T const* obj = objects[idx]) { return _callback(ray, *obj, maxDist, stopAtFirstHit); } @@ -50,41 +50,41 @@ class BIHWrap } /// Intersect point - void operator() (const G3D::Vector3& p, uint32 idx) + void operator() (G3D::Vector3 const& p, uint32 idx) { if (idx >= objects_size) { return; } - if (const T* obj = objects[idx]) + if (T const* obj = objects[idx]) { _callback(p, *obj); } } }; - typedef G3D::Array ObjArray; + typedef G3D::Array ObjArray; BIH m_tree; ObjArray m_objects; - G3D::Table m_obj2Idx; - G3D::Set m_objects_to_push; + G3D::Table m_obj2Idx; + G3D::Set m_objects_to_push; int unbalanced_times; public: BIHWrap() : unbalanced_times(0) { } - void insert(const T& obj) + void insert(T const& obj) { ++unbalanced_times; m_objects_to_push.insert(&obj); } - void remove(const T& obj) + void remove(T const& obj) { ++unbalanced_times; uint32 Idx = 0; - const T* temp; + T const* temp; if (m_obj2Idx.getRemove(&obj, temp, Idx)) { m_objects[Idx] = nullptr; @@ -112,7 +112,7 @@ public: } template - void intersectRay(const G3D::Ray& ray, RayCallback& intersectCallback, float& maxDist, bool stopAtFirstHit) + void intersectRay(G3D::Ray const& ray, RayCallback& intersectCallback, float& maxDist, bool stopAtFirstHit) { balance(); MDLCallback temp_cb(intersectCallback, m_objects.getCArray(), m_objects.size()); @@ -120,7 +120,7 @@ public: } template - void intersectPoint(const G3D::Vector3& point, IsectCallback& intersectCallback) + void intersectPoint(G3D::Vector3 const& point, IsectCallback& intersectCallback) { balance(); MDLCallback callback(intersectCallback, m_objects.getCArray(), m_objects.size()); diff --git a/src/common/Collision/DynamicTree.cpp b/src/common/Collision/DynamicTree.cpp index 0025bf998..509448c14 100644 --- a/src/common/Collision/DynamicTree.cpp +++ b/src/common/Collision/DynamicTree.cpp @@ -40,18 +40,18 @@ namespace template<> struct HashTrait< GameObjectModel> { - static std::size_t hashCode(const GameObjectModel& g) { return (size_t)(void*)&g; } + static std::size_t hashCode(GameObjectModel const& g) { return (size_t)(void*)&g; } }; template<> struct PositionTrait< GameObjectModel> { - static void GetPosition(const GameObjectModel& g, G3D::Vector3& p) { p = g.GetPosition(); } + static void GetPosition(GameObjectModel const& g, G3D::Vector3& p) { p = g.GetPosition(); } }; template<> struct BoundsTrait< GameObjectModel> { - static void GetBounds(const GameObjectModel& g, G3D::AABox& out) { out = g.GetBounds();} - static void GetBounds2(const GameObjectModel* g, G3D::AABox& out) { out = g->GetBounds();} + static void GetBounds(GameObjectModel const& g, G3D::AABox& out) { out = g.GetBounds();} + static void GetBounds2(GameObjectModel const* g, G3D::AABox& out) { out = g->GetBounds();} }; typedef RegularGrid2D> ParentTree; @@ -67,13 +67,13 @@ struct DynTreeImpl : public ParentTree { } - void insert(const Model& mdl) + void insert(Model const& mdl) { base::insert(mdl); ++unbalanced_times; } - void remove(const Model& mdl) + void remove(Model const& mdl) { base::remove(mdl); ++unbalanced_times; @@ -114,17 +114,17 @@ DynamicMapTree::~DynamicMapTree() delete impl; } -void DynamicMapTree::insert(const GameObjectModel& mdl) +void DynamicMapTree::insert(GameObjectModel const& mdl) { impl->insert(mdl); } -void DynamicMapTree::remove(const GameObjectModel& mdl) +void DynamicMapTree::remove(GameObjectModel const& mdl) { impl->remove(mdl); } -bool DynamicMapTree::contains(const GameObjectModel& mdl) const +bool DynamicMapTree::contains(GameObjectModel const& mdl) const { return impl->contains(mdl); } @@ -149,7 +149,7 @@ struct DynamicTreeIntersectionCallback DynamicTreeIntersectionCallback(uint32 phasemask, VMAP::ModelIgnoreFlags ignoreFlags) : _didHit(false), _phaseMask(phasemask), _ignoreFlags(ignoreFlags) { } - bool operator()(const G3D::Ray& r, const GameObjectModel& obj, float& distance, bool stopAtFirstHit) + bool operator()(G3D::Ray const& r, GameObjectModel const& obj, float& distance, bool stopAtFirstHit) { bool result = obj.intersectRay(r, distance, stopAtFirstHit, _phaseMask, _ignoreFlags); if (result) @@ -196,7 +196,7 @@ private: GameObjectModel const* _hitModel; }; -bool DynamicMapTree::GetIntersectionTime(const uint32 phasemask, const G3D::Ray& ray, const G3D::Vector3& endPos, float& maxDist) const +bool DynamicMapTree::GetIntersectionTime(const uint32 phasemask, G3D::Ray const& ray, G3D::Vector3 const& endPos, float& maxDist) const { float distance = maxDist; DynamicTreeIntersectionCallback callback(phasemask, VMAP::ModelIgnoreFlags::Nothing); @@ -208,8 +208,8 @@ bool DynamicMapTree::GetIntersectionTime(const uint32 phasemask, const G3D::Ray& return callback.didHit(); } -bool DynamicMapTree::GetObjectHitPos(const uint32 phasemask, const G3D::Vector3& startPos, - const G3D::Vector3& endPos, G3D::Vector3& resultHit, +bool DynamicMapTree::GetObjectHitPos(const uint32 phasemask, G3D::Vector3 const& startPos, + G3D::Vector3 const& endPos, G3D::Vector3& resultHit, float modifyDist) const { bool result = false; diff --git a/src/common/Collision/DynamicTree.h b/src/common/Collision/DynamicTree.h index e2ddca550..4575af691 100644 --- a/src/common/Collision/DynamicTree.h +++ b/src/common/Collision/DynamicTree.h @@ -46,19 +46,19 @@ public: [[nodiscard]] bool isInLineOfSight(float x1, float y1, float z1, float x2, float y2, float z2, uint32 phasemask, VMAP::ModelIgnoreFlags ignoreFlags) const; - bool GetIntersectionTime(uint32 phasemask, const G3D::Ray& ray, const G3D::Vector3& endPos, float& maxDist) const; + bool GetIntersectionTime(uint32 phasemask, G3D::Ray const& ray, G3D::Vector3 const& endPos, float& maxDist) const; bool GetAreaAndLiquidData(float x, float y, float z, uint32 phasemask, Optional reqLiquidType, VMAP::AreaAndLiquidData& data) const; - bool GetObjectHitPos(uint32 phasemask, const G3D::Vector3& pPos1, - const G3D::Vector3& pPos2, G3D::Vector3& pResultHitPos, + bool GetObjectHitPos(uint32 phasemask, G3D::Vector3 const& pPos1, + G3D::Vector3 const& pPos2, G3D::Vector3& pResultHitPos, float pModifyDist) const; [[nodiscard]] float getHeight(float x, float y, float z, float maxSearchDist, uint32 phasemask) const; - void insert(const GameObjectModel&); - void remove(const GameObjectModel&); - [[nodiscard]] bool contains(const GameObjectModel&) const; + void insert(GameObjectModel const&); + void remove(GameObjectModel const&); + [[nodiscard]] bool contains(GameObjectModel const&) const; [[nodiscard]] int size() const; void balance(); diff --git a/src/common/Collision/Management/IVMapMgr.h b/src/common/Collision/Management/IVMapMgr.h index 4af323372..e43541106 100644 --- a/src/common/Collision/Management/IVMapMgr.h +++ b/src/common/Collision/Management/IVMapMgr.h @@ -90,7 +90,7 @@ namespace VMAP virtual ~IVMapMgr() = default; - virtual LoadResult existsMap(const char* pBasePath, unsigned int pMapId, int x, int y) = 0; + virtual LoadResult existsMap(char const* pBasePath, unsigned int pMapId, int x, int y) = 0; /** send debug commands diff --git a/src/common/Collision/Management/VMapMgr2.cpp b/src/common/Collision/Management/VMapMgr2.cpp index 24e4745d7..73226f91a 100644 --- a/src/common/Collision/Management/VMapMgr2.cpp +++ b/src/common/Collision/Management/VMapMgr2.cpp @@ -59,7 +59,7 @@ namespace VMAP return fname.str(); } - LoadResult VMapMgr2::existsMap(const char* basePath, unsigned int mapId, int x, int y) + LoadResult VMapMgr2::existsMap(char const* basePath, unsigned int mapId, int x, int y) { return StaticMapTree::CanLoadMap(std::string(basePath), mapId, x, y); } diff --git a/src/common/Collision/Management/VMapMgr2.h b/src/common/Collision/Management/VMapMgr2.h index 3c221b170..2442b6de8 100644 --- a/src/common/Collision/Management/VMapMgr2.h +++ b/src/common/Collision/Management/VMapMgr2.h @@ -72,7 +72,7 @@ namespace VMAP { return getMapFileName(mapId); } - LoadResult existsMap(const char* basePath, unsigned int mapId, int x, int y) override; + LoadResult existsMap(char const* basePath, unsigned int mapId, int x, int y) override; typedef uint32(*GetLiquidFlagsFn)(uint32 liquidType); GetLiquidFlagsFn GetLiquidFlagsPtr; diff --git a/src/common/Collision/Maps/MapDefines.h b/src/common/Collision/Maps/MapDefines.h index 8f61275f2..6cdb313e2 100644 --- a/src/common/Collision/Maps/MapDefines.h +++ b/src/common/Collision/Maps/MapDefines.h @@ -45,7 +45,7 @@ struct MmapTileRecastConfig float cellSizeVertical; float maxSimplificationError; - bool operator==(const MmapTileRecastConfig& b) const { + bool operator==(MmapTileRecastConfig const& b) const { return walkableSlopeAngle == b.walkableSlopeAngle && walkableRadius == b.walkableRadius && walkableHeight == b.walkableHeight && diff --git a/src/common/Collision/Maps/MapTree.cpp b/src/common/Collision/Maps/MapTree.cpp index 877b17085..b7baee96d 100644 --- a/src/common/Collision/Maps/MapTree.cpp +++ b/src/common/Collision/Maps/MapTree.cpp @@ -36,7 +36,7 @@ namespace VMAP { public: MapRayCallback(ModelInstance* val, ModelIgnoreFlags ignoreFlags): prims(val), flags(ignoreFlags), hit(false) { } - bool operator()(const G3D::Ray& ray, uint32 entry, float& distance, bool StopAtFirstHit) + bool operator()(G3D::Ray const& ray, uint32 entry, float& distance, bool StopAtFirstHit) { bool result = prims[entry].intersectRay(ray, distance, StopAtFirstHit, flags); if (result) @@ -56,7 +56,7 @@ namespace VMAP { public: LocationInfoCallback(ModelInstance* val, LocationInfo& info): prims(val), locInfo(info), result(false) {} - void operator()(const Vector3& point, uint32 entry) + void operator()(Vector3 const& point, uint32 entry) { #if defined(VMAP_DEBUG) LOG_DEBUG("maps", "LocationInfoCallback: trying to intersect '{}'", prims[entry].name); @@ -84,14 +84,14 @@ namespace VMAP return tilefilename.str(); } - bool StaticMapTree::GetLocationInfo(const Vector3& pos, LocationInfo& info) const + bool StaticMapTree::GetLocationInfo(Vector3 const& pos, LocationInfo& info) const { LocationInfoCallback intersectionCallBack(iTreeValues, info); iTree.intersectPoint(pos, intersectionCallBack); return intersectionCallBack.result; } - StaticMapTree::StaticMapTree(uint32 mapID, const std::string& basePath) + StaticMapTree::StaticMapTree(uint32 mapID, std::string const& basePath) : iMapID(mapID), iIsTiled(false), iTreeValues(0), iBasePath(basePath) { if (iBasePath.length() > 0 && iBasePath[iBasePath.length() - 1] != '/' && iBasePath[iBasePath.length() - 1] != '\\') @@ -113,7 +113,7 @@ namespace VMAP Else, pMaxDist is not modified and returns false; */ - bool StaticMapTree::GetIntersectionTime(const G3D::Ray& pRay, float& pMaxDist, bool StopAtFirstHit, ModelIgnoreFlags ignoreFlags) const + bool StaticMapTree::GetIntersectionTime(G3D::Ray const& pRay, float& pMaxDist, bool StopAtFirstHit, ModelIgnoreFlags ignoreFlags) const { float distance = pMaxDist; MapRayCallback intersectionCallBack(iTreeValues, ignoreFlags); @@ -126,7 +126,7 @@ namespace VMAP } //========================================================= - bool StaticMapTree::isInLineOfSight(const Vector3& pos1, const Vector3& pos2, ModelIgnoreFlags ignoreFlags) const + bool StaticMapTree::isInLineOfSight(Vector3 const& pos1, Vector3 const& pos2, ModelIgnoreFlags ignoreFlags) const { float maxDist = (pos2 - pos1).magnitude(); // return false if distance is over max float, in case of cheater teleporting to the end of the universe @@ -153,7 +153,7 @@ namespace VMAP Return the hit pos or the original dest pos */ - bool StaticMapTree::GetObjectHitPos(const Vector3& pPos1, const Vector3& pPos2, Vector3& pResultHitPos, float pModifyDist) const + bool StaticMapTree::GetObjectHitPos(Vector3 const& pPos1, Vector3 const& pPos2, Vector3& pResultHitPos, float pModifyDist) const { bool result = false; float maxDist = (pPos2 - pPos1).magnitude(); @@ -198,7 +198,7 @@ namespace VMAP //========================================================= - float StaticMapTree::getHeight(const Vector3& pPos, float maxSearchDist) const + float StaticMapTree::getHeight(Vector3 const& pPos, float maxSearchDist) const { float height = G3D::finf(); Vector3 dir = Vector3(0, 0, -1); @@ -213,7 +213,7 @@ namespace VMAP //========================================================= - LoadResult StaticMapTree::CanLoadMap(const std::string& vmapPath, uint32 mapID, uint32 tileX, uint32 tileY) + LoadResult StaticMapTree::CanLoadMap(std::string const& vmapPath, uint32 mapID, uint32 tileX, uint32 tileY) { std::string basePath = vmapPath; if (basePath.length() > 0 && basePath[basePath.length() - 1] != '/' && basePath[basePath.length() - 1] != '\\') @@ -260,7 +260,7 @@ namespace VMAP //========================================================= - bool StaticMapTree::InitMap(const std::string& fname) + bool StaticMapTree::InitMap(std::string const& fname) { //VMAP_DEBUG_LOG(LOG_FILTER_MAPS, "StaticMapTree::InitMap() : initializing StaticMapTree '{}'", fname); bool success = false; diff --git a/src/common/Collision/Maps/MapTree.h b/src/common/Collision/Maps/MapTree.h index 88f0b8302..56a1675c2 100644 --- a/src/common/Collision/Maps/MapTree.h +++ b/src/common/Collision/Maps/MapTree.h @@ -32,15 +32,15 @@ namespace VMAP struct GroupLocationInfo { - const GroupModel* hitModel = nullptr; + GroupModel const* hitModel = nullptr; int32 rootId = -1; }; struct LocationInfo { LocationInfo(): ground_Z(-G3D::inf()) { } - const ModelInstance* hitInstance{nullptr}; - const GroupModel* hitModel{nullptr}; + ModelInstance const* hitInstance{nullptr}; + GroupModel const* hitModel{nullptr}; float ground_Z; int32 rootId = -1; }; @@ -63,23 +63,23 @@ namespace VMAP std::string iBasePath; private: - bool GetIntersectionTime(const G3D::Ray& pRay, float& pMaxDist, bool StopAtFirstHit, ModelIgnoreFlags ignoreFlags) const; + bool GetIntersectionTime(G3D::Ray const& pRay, float& pMaxDist, bool StopAtFirstHit, ModelIgnoreFlags ignoreFlags) const; //bool containsLoadedMapTile(unsigned int pTileIdent) const { return(iLoadedMapTiles.containsKey(pTileIdent)); } public: static std::string getTileFileName(uint32 mapID, uint32 tileX, uint32 tileY); static uint32 packTileID(uint32 tileX, uint32 tileY) { return tileX << 16 | tileY; } static void unpackTileID(uint32 ID, uint32& tileX, uint32& tileY) { tileX = ID >> 16; tileY = ID & 0xFF; } - static LoadResult CanLoadMap(const std::string& basePath, uint32 mapID, uint32 tileX, uint32 tileY); + static LoadResult CanLoadMap(std::string const& basePath, uint32 mapID, uint32 tileX, uint32 tileY); - StaticMapTree(uint32 mapID, const std::string& basePath); + StaticMapTree(uint32 mapID, std::string const& basePath); ~StaticMapTree(); - [[nodiscard]] bool isInLineOfSight(const G3D::Vector3& pos1, const G3D::Vector3& pos2, ModelIgnoreFlags ignoreFlags) const; - bool GetObjectHitPos(const G3D::Vector3& pos1, const G3D::Vector3& pos2, G3D::Vector3& pResultHitPos, float pModifyDist) const; - [[nodiscard]] float getHeight(const G3D::Vector3& pPos, float maxSearchDist) const; - bool GetLocationInfo(const G3D::Vector3& pos, LocationInfo& info) const; + [[nodiscard]] bool isInLineOfSight(G3D::Vector3 const& pos1, G3D::Vector3 const& pos2, ModelIgnoreFlags ignoreFlags) const; + bool GetObjectHitPos(G3D::Vector3 const& pos1, G3D::Vector3 const& pos2, G3D::Vector3& pResultHitPos, float pModifyDist) const; + [[nodiscard]] float getHeight(G3D::Vector3 const& pPos, float maxSearchDist) const; + bool GetLocationInfo(G3D::Vector3 const& pos, LocationInfo& info) const; - bool InitMap(const std::string& fname); + bool InitMap(std::string const& fname); void UnloadMap(); bool LoadMapTile(uint32 tileX, uint32 tileY); void UnloadMapTile(uint32 tileX, uint32 tileY); diff --git a/src/common/Collision/Maps/TileAssembler.cpp b/src/common/Collision/Maps/TileAssembler.cpp index 368d7e6d7..25bfea52d 100644 --- a/src/common/Collision/Maps/TileAssembler.cpp +++ b/src/common/Collision/Maps/TileAssembler.cpp @@ -32,18 +32,18 @@ using std::pair; template<> struct BoundsTrait { - static void GetBounds(const VMAP::ModelSpawn* const& obj, G3D::AABox& out) { out = obj->GetBounds(); } + static void GetBounds(VMAP::ModelSpawn const* const& obj, G3D::AABox& out) { out = obj->GetBounds(); } }; namespace VMAP { - bool readChunk(FILE* rf, char* dest, const char* compare, uint32 len) + bool readChunk(FILE* rf, char* dest, char const* compare, uint32 len) { if (fread(dest, sizeof(char), len, rf) != len) { return false; } return memcmp(dest, compare, len) == 0; } - Vector3 ModelPosition::transform(const Vector3& pIn) const + Vector3 ModelPosition::transform(Vector3 const& pIn) const { Vector3 out = pIn * iScale; out = iRotation * out; @@ -52,7 +52,7 @@ namespace VMAP //================================================================= - TileAssembler::TileAssembler(const std::string& pSrcDirName, const std::string& pDestDirName) + TileAssembler::TileAssembler(std::string const& pSrcDirName, std::string const& pDestDirName) : iDestDir(pDestDirName), iSrcDir(pSrcDirName) { boost::filesystem::create_directory(iDestDir); @@ -156,7 +156,7 @@ namespace VMAP TileMap::iterator tile; for (tile = tileEntries.begin(); tile != tileEntries.end(); ++tile) { - const ModelSpawn& spawn = map_iter->second->UniqueEntries[tile->second]; + ModelSpawn const& spawn = map_iter->second->UniqueEntries[tile->second]; if (spawn.flags & MOD_WORLDSPAWN) // WDT spawn, saved as tile 65/65 currently... { continue; @@ -181,7 +181,7 @@ namespace VMAP { ++tile; } - const ModelSpawn& spawn2 = map_iter->second->UniqueEntries[tile->second]; + ModelSpawn const& spawn2 = map_iter->second->UniqueEntries[tile->second]; success = success && ModelSpawn::writeToFile(tilefile, spawn2); // MapTree nodes to update when loading tile: std::map::iterator nIdx = modelNodeIdx.find(spawn2.ID); @@ -331,7 +331,7 @@ namespace VMAP }; #pragma pack(pop) //================================================================= - bool TileAssembler::convertRawFile(const std::string& pModelFilename) + bool TileAssembler::convertRawFile(std::string const& pModelFilename) { bool success = true; std::string filename = iSrcDir; @@ -566,7 +566,7 @@ namespace VMAP delete liquid; } - bool WorldModel_Raw::Read(const char* path) + bool WorldModel_Raw::Read(char const* path) { FILE* rf = fopen(path, "rb"); if (!rf) diff --git a/src/common/Collision/Maps/TileAssembler.h b/src/common/Collision/Maps/TileAssembler.h index b51f98307..ad6ac3e6b 100644 --- a/src/common/Collision/Maps/TileAssembler.h +++ b/src/common/Collision/Maps/TileAssembler.h @@ -47,8 +47,8 @@ namespace VMAP { iRotation = G3D::Matrix3::fromEulerAnglesZYX(G3D::pif() * iDir.y / 180.f, G3D::pif() * iDir.x / 180.f, G3D::pif() * iDir.z / 180.f); } - [[nodiscard]] G3D::Vector3 transform(const G3D::Vector3& pIn) const; - void moveToBasePos(const G3D::Vector3& pBasePos) { iPos -= pBasePos; } + [[nodiscard]] G3D::Vector3 transform(G3D::Vector3 const& pIn) const; + void moveToBasePos(G3D::Vector3 const& pBasePos) { iPos -= pBasePos; } }; typedef std::map UniqueEntryMap; @@ -86,7 +86,7 @@ namespace VMAP uint32 RootWMOID; std::vector groupsArray; - bool Read(const char* path); + bool Read(char const* path); }; class TileAssembler @@ -99,7 +99,7 @@ namespace VMAP std::set spawnedModelFiles; public: - TileAssembler(const std::string& pSrcDirName, const std::string& pDestDirName); + TileAssembler(std::string const& pSrcDirName, std::string const& pDestDirName); virtual ~TileAssembler(); bool convertWorld2(); @@ -107,7 +107,7 @@ namespace VMAP bool calculateTransformedBound(ModelSpawn& spawn); void exportGameobjectModels(); - bool convertRawFile(const std::string& pModelFilename); + bool convertRawFile(std::string const& pModelFilename); }; } // VMAP diff --git a/src/common/Collision/Models/GameObjectModel.cpp b/src/common/Collision/Models/GameObjectModel.cpp index 6a28164a2..5077439cd 100644 --- a/src/common/Collision/Models/GameObjectModel.cpp +++ b/src/common/Collision/Models/GameObjectModel.cpp @@ -170,7 +170,7 @@ GameObjectModel* GameObjectModel::Create(std::unique_ptrIsSpawned()) { diff --git a/src/common/Collision/Models/GameObjectModel.h b/src/common/Collision/Models/GameObjectModel.h index 695a5ee43..650978c19 100644 --- a/src/common/Collision/Models/GameObjectModel.h +++ b/src/common/Collision/Models/GameObjectModel.h @@ -57,11 +57,11 @@ class GameObjectModel public: std::string name; - [[nodiscard]] const G3D::AABox& GetBounds() const { return iBound; } + [[nodiscard]] G3D::AABox const& GetBounds() const { return iBound; } ~GameObjectModel() = default; - [[nodiscard]] const G3D::Vector3& GetPosition() const { return iPos; } + [[nodiscard]] G3D::Vector3 const& GetPosition() const { return iPos; } /** Enables\disables collision. */ void disable() { phasemask = 0; } @@ -70,7 +70,7 @@ public: [[nodiscard]] bool isEnabled() const { return phasemask != 0; } [[nodiscard]] bool IsMapObject() const { return isWmo; } - bool intersectRay(const G3D::Ray& Ray, float& MaxDist, bool StopAtFirstHit, uint32 ph_mask, VMAP::ModelIgnoreFlags ignoreFlags) const; + bool intersectRay(G3D::Ray const& Ray, float& MaxDist, bool StopAtFirstHit, uint32 ph_mask, VMAP::ModelIgnoreFlags ignoreFlags) const; bool GetLocationInfo(G3D::Vector3 const& point, VMAP::LocationInfo& info, uint32 ph_mask) const; bool GetLiquidLevel(G3D::Vector3 const& point, VMAP::LocationInfo& info, float& liqHeight) const; diff --git a/src/common/Collision/Models/ModelInstance.cpp b/src/common/Collision/Models/ModelInstance.cpp index ecc97e85f..ebc11316d 100644 --- a/src/common/Collision/Models/ModelInstance.cpp +++ b/src/common/Collision/Models/ModelInstance.cpp @@ -24,13 +24,13 @@ using G3D::Ray; namespace VMAP { - ModelInstance::ModelInstance(const ModelSpawn& spawn, std::shared_ptr model): ModelSpawn(spawn), iModel(model) + ModelInstance::ModelInstance(ModelSpawn const& spawn, std::shared_ptr model): ModelSpawn(spawn), iModel(model) { iInvRot = G3D::Matrix3::fromEulerAnglesZYX(G3D::pi() * iRot.y / 180.f, G3D::pi() * iRot.x / 180.f, G3D::pi() * iRot.z / 180.f).inverse(); iInvScale = 1.f / iScale; } - bool ModelInstance::intersectRay(const G3D::Ray& pRay, float& pMaxDist, bool StopAtFirstHit, ModelIgnoreFlags ignoreFlags) const + bool ModelInstance::intersectRay(G3D::Ray const& pRay, float& pMaxDist, bool StopAtFirstHit, ModelIgnoreFlags ignoreFlags) const { if (!iModel) { @@ -63,7 +63,7 @@ namespace VMAP return hit; } - bool ModelInstance::GetLocationInfo(const G3D::Vector3& p, LocationInfo& info) const + bool ModelInstance::GetLocationInfo(G3D::Vector3 const& p, LocationInfo& info) const { if (!iModel) { @@ -107,7 +107,7 @@ namespace VMAP return false; } - bool ModelInstance::GetLiquidLevel(const G3D::Vector3& p, LocationInfo& info, float& liqHeight) const + bool ModelInstance::GetLiquidLevel(G3D::Vector3 const& p, LocationInfo& info, float& liqHeight) const { // child bounds are defined in object space: Vector3 pModel = iInvRot * (p - iPos) * iInvScale; @@ -170,7 +170,7 @@ namespace VMAP return true; } - bool ModelSpawn::writeToFile(FILE* wf, const ModelSpawn& spawn) + bool ModelSpawn::writeToFile(FILE* wf, ModelSpawn const& spawn) { uint32 check = 0; check += fwrite(&spawn.flags, sizeof(uint32), 1, wf); diff --git a/src/common/Collision/Models/ModelInstance.h b/src/common/Collision/Models/ModelInstance.h index f8c0ecbb1..420d0c697 100644 --- a/src/common/Collision/Models/ModelInstance.h +++ b/src/common/Collision/Models/ModelInstance.h @@ -51,23 +51,23 @@ namespace VMAP float iScale; G3D::AABox iBound; std::string name; - bool operator==(const ModelSpawn& other) const { return ID == other.ID; } + bool operator==(ModelSpawn const& other) const { return ID == other.ID; } //uint32 hashCode() const { return ID; } // temp? - [[nodiscard]] const G3D::AABox& GetBounds() const { return iBound; } + [[nodiscard]] G3D::AABox const& GetBounds() const { return iBound; } static bool readFromFile(FILE* rf, ModelSpawn& spawn); - static bool writeToFile(FILE* rw, const ModelSpawn& spawn); + static bool writeToFile(FILE* rw, ModelSpawn const& spawn); }; class ModelInstance: public ModelSpawn { public: ModelInstance() { } - ModelInstance(const ModelSpawn& spawn, std::shared_ptr model); - bool intersectRay(const G3D::Ray& pRay, float& pMaxDist, bool StopAtFirstHit, ModelIgnoreFlags ignoreFlags) const; - bool GetLocationInfo(const G3D::Vector3& p, LocationInfo& info) const; - bool GetLiquidLevel(const G3D::Vector3& p, LocationInfo& info, float& liqHeight) const; + ModelInstance(ModelSpawn const& spawn, std::shared_ptr model); + bool intersectRay(G3D::Ray const& pRay, float& pMaxDist, bool StopAtFirstHit, ModelIgnoreFlags ignoreFlags) const; + bool GetLocationInfo(G3D::Vector3 const& p, LocationInfo& info) const; + bool GetLiquidLevel(G3D::Vector3 const& p, LocationInfo& info, float& liqHeight) const; WorldModel* getWorldModel() { return iModel.get(); } protected: G3D::Matrix3 iInvRot; diff --git a/src/common/Collision/Models/WorldModel.cpp b/src/common/Collision/Models/WorldModel.cpp index 53bd55a2d..fc2079e11 100644 --- a/src/common/Collision/Models/WorldModel.cpp +++ b/src/common/Collision/Models/WorldModel.cpp @@ -26,12 +26,12 @@ using G3D::Vector3; template<> struct BoundsTrait { - static void GetBounds(const VMAP::GroupModel& obj, G3D::AABox& out) { out = obj.GetBound(); } + static void GetBounds(VMAP::GroupModel const& obj, G3D::AABox& out) { out = obj.GetBound(); } }; namespace VMAP { - bool IntersectTriangle(const MeshTriangle& tri, std::vector::const_iterator points, const G3D::Ray& ray, float& distance) + bool IntersectTriangle(MeshTriangle const& tri, std::vector::const_iterator points, G3D::Ray const& ray, float& distance) { static const float EPS = 1e-5f; @@ -88,7 +88,7 @@ namespace VMAP { public: TriBoundFunc(std::vector& vert): vertices(vert.begin()) { } - void operator()(const MeshTriangle& tri, G3D::AABox& out) const + void operator()(MeshTriangle const& tri, G3D::AABox& out) const { G3D::Vector3 lo = vertices[tri.idx0]; G3D::Vector3 hi = lo; @@ -104,7 +104,7 @@ namespace VMAP // ===================== WmoLiquid ================================== - WmoLiquid::WmoLiquid(uint32 width, uint32 height, const Vector3& corner, uint32 type): + WmoLiquid::WmoLiquid(uint32 width, uint32 height, Vector3 const& corner, uint32 type): iTilesX(width), iTilesY(height), iCorner(corner), iType(type) { if (width && height) @@ -119,7 +119,7 @@ namespace VMAP } } - WmoLiquid::WmoLiquid(const WmoLiquid& other): iHeight(0), iFlags(0) + WmoLiquid::WmoLiquid(WmoLiquid const& other): iHeight(0), iFlags(0) { *this = other; // use assignment operator... } @@ -130,7 +130,7 @@ namespace VMAP delete[] iFlags; } - WmoLiquid& WmoLiquid::operator=(const WmoLiquid& other) + WmoLiquid& WmoLiquid::operator=(WmoLiquid const& other) { if (this == &other) { @@ -163,7 +163,7 @@ namespace VMAP return *this; } - bool WmoLiquid::GetLiquidHeight(const Vector3& pos, float& liqHeight) const + bool WmoLiquid::GetLiquidHeight(Vector3 const& pos, float& liqHeight) const { // simple case if (!iFlags) @@ -311,7 +311,7 @@ namespace VMAP // ===================== GroupModel ================================== - GroupModel::GroupModel(const GroupModel& other): + GroupModel::GroupModel(GroupModel const& other): iBound(other.iBound), iMogpFlags(other.iMogpFlags), iGroupWMOID(other.iGroupWMOID), vertices(other.vertices), triangles(other.triangles), meshTree(other.meshTree), iLiquid(0) { @@ -426,9 +426,9 @@ namespace VMAP struct GModelRayCallback { - GModelRayCallback(const std::vector& tris, const std::vector& vert): + GModelRayCallback(std::vector const& tris, std::vector const& vert): vertices(vert.begin()), triangles(tris.begin()), hit(false) { } - bool operator()(const G3D::Ray& ray, uint32 entry, float& distance, bool /*StopAtFirstHit*/) + bool operator()(G3D::Ray const& ray, uint32 entry, float& distance, bool /*StopAtFirstHit*/) { bool result = IntersectTriangle(triangles[entry], vertices, ray, distance); if (result) { hit = true; } @@ -439,7 +439,7 @@ namespace VMAP bool hit; }; - bool GroupModel::IntersectRay(const G3D::Ray& ray, float& distance, bool stopAtFirstHit) const + bool GroupModel::IntersectRay(G3D::Ray const& ray, float& distance, bool stopAtFirstHit) const { if (triangles.empty()) { @@ -451,7 +451,7 @@ namespace VMAP return callback.hit; } - inline bool IsInsideOrAboveBound(G3D::AABox const& bounds, const G3D::Point3& point) + inline bool IsInsideOrAboveBound(G3D::AABox const& bounds, G3D::Point3 const& point) { return point.x >= bounds.low().x && point.y >= bounds.low().y @@ -493,7 +493,7 @@ namespace VMAP return OUT_OF_BOUNDS; } - bool GroupModel::GetLiquidLevel(const Vector3& pos, float& liqHeight) const + bool GroupModel::GetLiquidLevel(Vector3 const& pos, float& liqHeight) const { if (iLiquid) { @@ -528,8 +528,8 @@ namespace VMAP struct WModelRayCallBack { - WModelRayCallBack(const std::vector& mod): models(mod.begin()), hit(false) { } - bool operator()(const G3D::Ray& ray, uint32 entry, float& distance, bool StopAtFirstHit) + WModelRayCallBack(std::vector const& mod): models(mod.begin()), hit(false) { } + bool operator()(G3D::Ray const& ray, uint32 entry, float& distance, bool StopAtFirstHit) { bool result = models[entry].IntersectRay(ray, distance, StopAtFirstHit); if (result) { hit = true; } @@ -539,7 +539,7 @@ namespace VMAP bool hit; }; - bool WorldModel::IntersectRay(const G3D::Ray& ray, float& distance, bool stopAtFirstHit, ModelIgnoreFlags ignoreFlags) const + bool WorldModel::IntersectRay(G3D::Ray const& ray, float& distance, bool stopAtFirstHit, ModelIgnoreFlags ignoreFlags) const { // If the caller asked us to ignore certain objects we should check flags if ((ignoreFlags & ModelIgnoreFlags::M2) != ModelIgnoreFlags::Nothing) @@ -591,7 +591,7 @@ namespace VMAP } }; - bool WorldModel::GetLocationInfo(const G3D::Vector3& p, const G3D::Vector3& down, float& dist, GroupLocationInfo& info) const + bool WorldModel::GetLocationInfo(G3D::Vector3 const& p, G3D::Vector3 const& down, float& dist, GroupLocationInfo& info) const { if (groupModels.empty()) { @@ -623,7 +623,7 @@ namespace VMAP return false; } - bool WorldModel::writeFile(const std::string& filename) + bool WorldModel::writeFile(std::string const& filename) { FILE* wf = fopen(filename.c_str(), "wb"); if (!wf) @@ -660,7 +660,7 @@ namespace VMAP return result; } - bool WorldModel::readFile(const std::string& filename) + bool WorldModel::readFile(std::string const& filename) { FILE* rf = fopen(filename.c_str(), "rb"); if (!rf) diff --git a/src/common/Collision/Models/WorldModel.h b/src/common/Collision/Models/WorldModel.h index 2d5d8126b..8f532ec8f 100644 --- a/src/common/Collision/Models/WorldModel.h +++ b/src/common/Collision/Models/WorldModel.h @@ -46,11 +46,11 @@ namespace VMAP class WmoLiquid { public: - WmoLiquid(uint32 width, uint32 height, const G3D::Vector3& corner, uint32 type); - WmoLiquid(const WmoLiquid& other); + WmoLiquid(uint32 width, uint32 height, G3D::Vector3 const& corner, uint32 type); + WmoLiquid(WmoLiquid const& other); ~WmoLiquid(); - WmoLiquid& operator=(const WmoLiquid& other); - bool GetLiquidHeight(const G3D::Vector3& pos, float& liqHeight) const; + WmoLiquid& operator=(WmoLiquid const& other); + bool GetLiquidHeight(G3D::Vector3 const& pos, float& liqHeight) const; [[nodiscard]] uint32 GetType() const { return iType; } float* GetHeightStorage() { return iHeight; } uint8* GetFlagsStorage() { return iFlags; } @@ -73,18 +73,18 @@ namespace VMAP { public: GroupModel() { } - GroupModel(const GroupModel& other); - GroupModel(uint32 mogpFlags, uint32 groupWMOID, const G3D::AABox& bound): + GroupModel(GroupModel const& other); + GroupModel(uint32 mogpFlags, uint32 groupWMOID, G3D::AABox const& bound): iBound(bound), iMogpFlags(mogpFlags), iGroupWMOID(groupWMOID), iLiquid(nullptr) { } ~GroupModel() { delete iLiquid; } //! pass mesh data to object and create BIH. Passed vectors get get swapped with old geometry! void setMeshData(std::vector& vert, std::vector& tri); void setLiquidData(WmoLiquid*& liquid) { iLiquid = liquid; liquid = nullptr; } - bool IntersectRay(const G3D::Ray& ray, float& distance, bool stopAtFirstHit) const; + bool IntersectRay(G3D::Ray const& ray, float& distance, bool stopAtFirstHit) const; enum InsideResult { INSIDE = 0, MAYBE_INSIDE = 1, ABOVE = 2, OUT_OF_BOUNDS = -1 }; InsideResult IsInsideObject(G3D::Ray const& ray, float& z_dist) const; - bool GetLiquidLevel(const G3D::Vector3& pos, float& liqHeight) const; + bool GetLiquidLevel(G3D::Vector3 const& pos, float& liqHeight) const; [[nodiscard]] uint32 GetLiquidType() const; bool writeToFile(FILE* wf); bool readFromFile(FILE* rf); @@ -111,10 +111,10 @@ namespace VMAP //! pass group models to WorldModel and create BIH. Passed vector is swapped with old geometry! void setGroupModels(std::vector& models); void setRootWmoID(uint32 id) { RootWMOID = id; } - bool IntersectRay(const G3D::Ray& ray, float& distance, bool stopAtFirstHit, ModelIgnoreFlags ignoreFlags) const; - bool GetLocationInfo(const G3D::Vector3& p, const G3D::Vector3& down, float& dist, GroupLocationInfo& info) const; - bool writeFile(const std::string& filename); - bool readFile(const std::string& filename); + bool IntersectRay(G3D::Ray const& ray, float& distance, bool stopAtFirstHit, ModelIgnoreFlags ignoreFlags) const; + bool GetLocationInfo(G3D::Vector3 const& p, G3D::Vector3 const& down, float& dist, GroupLocationInfo& info) const; + bool writeFile(std::string const& filename); + bool readFile(std::string const& filename); void GetGroupModels(std::vector& outGroupModels); uint32 Flags; protected: diff --git a/src/common/Collision/RegularGrid.h b/src/common/Collision/RegularGrid.h index 1a24c4258..19f770ddb 100644 --- a/src/common/Collision/RegularGrid.h +++ b/src/common/Collision/RegularGrid.h @@ -51,7 +51,7 @@ public: #define HGRID_MAP_SIZE (533.33333f * 64.f) // shouldn't be changed #define CELL_SIZE float(HGRID_MAP_SIZE/(float)CELL_NUMBER) - typedef G3D::Table> MemberTable; + typedef G3D::Table> MemberTable; MemberTable memberTable; Node* nodes[CELL_NUMBER][CELL_NUMBER]; @@ -70,7 +70,7 @@ public: } } - void insert(const T& value) + void insert(T const& value) { G3D::Vector3 pos[9]; pos[0] = value.GetBounds().corner(0); @@ -110,7 +110,7 @@ public: memberTable.set(&value, na); } - void remove(const T& value) + void remove(T const& value) { NodeArray& na = memberTable[&value]; for (uint8 i = 0; i < 9; ++i) @@ -139,13 +139,13 @@ public: } } - bool contains(const T& value) const { return memberTable.containsKey(&value); } + bool contains(T const& value) const { return memberTable.containsKey(&value); } int size() const { return memberTable.size(); } struct Cell { int x, y; - bool operator == (const Cell& c2) const { return x == c2.x && y == c2.y;} + bool operator == (Cell const& c2) const { return x == c2.x && y == c2.y;} static Cell ComputeCell(float fx, float fy) { @@ -173,13 +173,13 @@ public: } template - void intersectRay(const G3D::Ray& ray, RayCallback& intersectCallback, float max_dist, bool stopAtFirstHit) + void intersectRay(G3D::Ray const& ray, RayCallback& intersectCallback, float max_dist, bool stopAtFirstHit) { intersectRay(ray, intersectCallback, max_dist, ray.origin() + ray.direction() * max_dist, stopAtFirstHit); } template - void intersectRay(const G3D::Ray& ray, RayCallback& intersectCallback, float& max_dist, const G3D::Vector3& end, bool stopAtFirstHit) + void intersectRay(G3D::Ray const& ray, RayCallback& intersectCallback, float& max_dist, G3D::Vector3 const& end, bool stopAtFirstHit) { Cell cell = Cell::ComputeCell(ray.origin().x, ray.origin().y); if (!cell.isValid()) @@ -261,7 +261,7 @@ public: } template - void intersectPoint(const G3D::Vector3& point, IsectCallback& intersectCallback) + void intersectPoint(G3D::Vector3 const& point, IsectCallback& intersectCallback) { Cell cell = Cell::ComputeCell(point.x, point.y); if (!cell.isValid()) @@ -276,7 +276,7 @@ public: // Optimized verson of intersectRay function for rays with vertical directions template - void intersectZAllignedRay(const G3D::Ray& ray, RayCallback& intersectCallback, float& max_dist) + void intersectZAllignedRay(G3D::Ray const& ray, RayCallback& intersectCallback, float& max_dist) { Cell cell = Cell::ComputeCell(ray.origin().x, ray.origin().y); if (!cell.isValid()) diff --git a/src/common/Collision/VMapDefinitions.h b/src/common/Collision/VMapDefinitions.h index b8026d949..971913a0e 100644 --- a/src/common/Collision/VMapDefinitions.h +++ b/src/common/Collision/VMapDefinitions.h @@ -27,6 +27,6 @@ namespace VMAP const char GAMEOBJECT_MODELS[] = "GameObjectModels.dtree"; // defined in TileAssembler.cpp currently... - bool readChunk(FILE* rf, char* dest, const char* compare, uint32 len); + bool readChunk(FILE* rf, char* dest, char const* compare, uint32 len); } #endif diff --git a/src/common/Collision/VMapTools.h b/src/common/Collision/VMapTools.h index ba47cdf62..23ac971d7 100644 --- a/src/common/Collision/VMapTools.h +++ b/src/common/Collision/VMapTools.h @@ -37,7 +37,7 @@ namespace VMAP G3D::Vector3 hitLocation; G3D::Vector3 hitNormal; - void operator()(const G3D::Ray& ray, const TValue* entity, bool StopAtFirstHit, float& distance) + void operator()(G3D::Ray const& ray, TValue const* entity, bool StopAtFirstHit, float& distance) { entity->intersect(ray, distance, StopAtFirstHit, hitLocation, hitNormal); } @@ -51,9 +51,9 @@ namespace VMAP { public: static bool collisionLocationForMovingPointFixedAABox( - const G3D::Vector3& origin, - const G3D::Vector3& dir, - const G3D::AABox& box, + G3D::Vector3 const& origin, + G3D::Vector3 const& dir, + G3D::AABox const& box, G3D::Vector3& location, bool& Inside) { @@ -61,8 +61,8 @@ namespace VMAP #define IR(x) (reinterpret_cast(x)) Inside = true; - const G3D::Vector3& MinB = box.low(); - const G3D::Vector3& MaxB = box.high(); + G3D::Vector3 const& MinB = box.low(); + G3D::Vector3 const& MaxB = box.high(); G3D::Vector3 MaxT(-1.0f, -1.0f, -1.0f); // Find candidate planes. diff --git a/src/common/Common.cpp b/src/common/Common.cpp index e58668d7e..70371ae47 100644 --- a/src/common/Common.cpp +++ b/src/common/Common.cpp @@ -75,7 +75,7 @@ bool IsLocaleValid(std::string const& locale) return false; } -LocaleConstant GetLocaleByName(const std::string& name) +LocaleConstant GetLocaleByName(std::string const& name) { for (uint32 i = 0; i < TOTAL_LOCALES; ++i) if (name == localeNames[i]) diff --git a/src/common/Common.h b/src/common/Common.h index 908e5aca6..264b06ca9 100644 --- a/src/common/Common.h +++ b/src/common/Common.h @@ -144,7 +144,7 @@ enum LocaleConstant AC_COMMON_API extern char const* localeNames[TOTAL_LOCALES]; AC_COMMON_API bool IsLocaleValid(std::string const& locale); -AC_COMMON_API LocaleConstant GetLocaleByName(const std::string& name); +AC_COMMON_API LocaleConstant GetLocaleByName(std::string const& name); AC_COMMON_API const std::string GetNameByLocaleConstant(LocaleConstant localeConstant); AC_COMMON_API void CleanStringForMysqlQuery(std::string& str); diff --git a/src/common/Configuration/Config.cpp b/src/common/Configuration/Config.cpp index 7548fd490..79c58af7d 100644 --- a/src/common/Configuration/Config.cpp +++ b/src/common/Configuration/Config.cpp @@ -359,7 +359,7 @@ namespace { return ParseFile(file, isOptional, isReload); } - catch (const std::exception& e) + catch (std::exception const& e) { PrintError(file, "> {}", e.what()); } @@ -376,7 +376,7 @@ namespace { std::string result; - const char* str = key.c_str(); + char const* str = key.c_str(); std::size_t n = key.length(); char curr; diff --git a/src/common/DataStores/DBCFileLoader.cpp b/src/common/DataStores/DBCFileLoader.cpp index 91bc24eb0..973bc238c 100644 --- a/src/common/DataStores/DBCFileLoader.cpp +++ b/src/common/DataStores/DBCFileLoader.cpp @@ -307,7 +307,7 @@ char* DBCFileLoader::AutoProduceStrings(char const* format, char* dataTable) char** slot = (char**)(&dataTable[offset]); if (!*slot || !** slot) { - const char* st = getRecord(y).getString(x); + char const* st = getRecord(y).getString(x); *slot = stringPool + (st - (char const*)stringTable); } offset += sizeof(char*); diff --git a/src/common/DataStores/DBCFileLoader.h b/src/common/DataStores/DBCFileLoader.h index 3d7608e58..6838c3261 100644 --- a/src/common/DataStores/DBCFileLoader.h +++ b/src/common/DataStores/DBCFileLoader.h @@ -41,7 +41,7 @@ public: DBCFileLoader(); ~DBCFileLoader(); - bool Load(const char* filename, const char* fmt); + bool Load(char const* filename, char const* fmt); class Record { @@ -68,7 +68,7 @@ public: return *reinterpret_cast(offset + file.GetOffset(field)); } - [[nodiscard]] const char* getString(std::size_t field) const + [[nodiscard]] char const* getString(std::size_t field) const { ASSERT(field < file.fieldCount); std::size_t stringOffset = getUInt(field); @@ -94,7 +94,7 @@ public: [[nodiscard]] bool IsLoaded() const { return data != nullptr; } char* AutoProduceData(char const* fmt, uint32& count, char**& indexTable); char* AutoProduceStrings(char const* fmt, char* dataTable); - static uint32 GetFormatRecordSize(const char* format, int32* index_pos = nullptr); + static uint32 GetFormatRecordSize(char const* format, int32* index_pos = nullptr); private: uint32 recordSize; diff --git a/src/common/Debugging/WheatyExceptionReport.cpp b/src/common/Debugging/WheatyExceptionReport.cpp index 57ba80cae..251d47199 100644 --- a/src/common/Debugging/WheatyExceptionReport.cpp +++ b/src/common/Debugging/WheatyExceptionReport.cpp @@ -1589,7 +1589,7 @@ DWORD_PTR WheatyExceptionReport::DereferenceUnsafePointer(DWORD_PTR address) // Helper function that writes to the report file, and allows the user to use // printf style formating //============================================================================ -int __cdecl WheatyExceptionReport::Log(const TCHAR* format, ...) +int __cdecl WheatyExceptionReport::Log(TCHAR const* format, ...) { int retValue; va_list argptr; @@ -1609,7 +1609,7 @@ int __cdecl WheatyExceptionReport::Log(const TCHAR* format, ...) return retValue; } -int __cdecl WheatyExceptionReport::StackLog(const TCHAR* format, va_list argptr) +int __cdecl WheatyExceptionReport::StackLog(TCHAR const* format, va_list argptr) { int retValue; DWORD cbWritten; @@ -1621,7 +1621,7 @@ int __cdecl WheatyExceptionReport::StackLog(const TCHAR* format, va_list argptr) return retValue; } -int __cdecl WheatyExceptionReport::HeapLog(const TCHAR* format, va_list argptr) +int __cdecl WheatyExceptionReport::HeapLog(TCHAR const* format, va_list argptr) { int retValue = 0; DWORD cbWritten; diff --git a/src/common/Debugging/WheatyExceptionReport.h b/src/common/Debugging/WheatyExceptionReport.h index 94e91e869..cfda3118b 100644 --- a/src/common/Debugging/WheatyExceptionReport.h +++ b/src/common/Debugging/WheatyExceptionReport.h @@ -169,9 +169,9 @@ private: static BasicType GetBasicType(DWORD typeIndex, DWORD64 modBase); static DWORD_PTR DereferenceUnsafePointer(DWORD_PTR address); - static int __cdecl Log(const TCHAR* format, ...); - static int __cdecl StackLog(const TCHAR* format, va_list argptr); - static int __cdecl HeapLog(const TCHAR* format, va_list argptr); + static int __cdecl Log(TCHAR const* format, ...); + static int __cdecl StackLog(TCHAR const* format, va_list argptr); + static int __cdecl HeapLog(TCHAR const* format, va_list argptr); static bool StoreSymbol(DWORD type, DWORD_PTR offset); static void ClearSymbols(); diff --git a/src/common/Dynamic/TypeContainer.h b/src/common/Dynamic/TypeContainer.h index a43ddfd6e..1f9f49fd1 100644 --- a/src/common/Dynamic/TypeContainer.h +++ b/src/common/Dynamic/TypeContainer.h @@ -136,7 +136,7 @@ public: //} ContainerMapList& GetElements() { return i_elements; } - [[nodiscard]] const ContainerMapList& GetElements() const { return i_elements;} + [[nodiscard]] ContainerMapList const& GetElements() const { return i_elements;} private: ContainerMapList i_elements; @@ -163,7 +163,7 @@ public: } ContainerVector& GetElements() { return i_elements; } - [[nodiscard]] const ContainerVector& GetElements() const { return i_elements; } + [[nodiscard]] ContainerVector const& GetElements() const { return i_elements; } private: ContainerVector i_elements; diff --git a/src/common/Dynamic/TypeContainerFunctions.h b/src/common/Dynamic/TypeContainerFunctions.h index f2f606e23..eba2f8378 100644 --- a/src/common/Dynamic/TypeContainerFunctions.h +++ b/src/common/Dynamic/TypeContainerFunctions.h @@ -156,31 +156,31 @@ namespace Acore /* ContainerMapList Helpers */ // count functions template - std::size_t Count(const ContainerMapList& elements, SPECIFIC_TYPE* /*fake*/) + std::size_t Count(ContainerMapList const& elements, SPECIFIC_TYPE* /*fake*/) { return elements._element.getSize(); } template - std::size_t Count(const ContainerMapList& /*elements*/, SPECIFIC_TYPE* /*fake*/) + std::size_t Count(ContainerMapList const& /*elements*/, SPECIFIC_TYPE* /*fake*/) { return 0; } template - std::size_t Count(const ContainerMapList& /*elements*/, SPECIFIC_TYPE* /*fake*/) + std::size_t Count(ContainerMapList const& /*elements*/, SPECIFIC_TYPE* /*fake*/) { return 0; } template - std::size_t Count(const ContainerMapList>& elements, SPECIFIC_TYPE* fake) + std::size_t Count(ContainerMapList> const& elements, SPECIFIC_TYPE* fake) { return Count(elements._elements, fake); } template - std::size_t Count(const ContainerMapList>& elements, SPECIFIC_TYPE* fake) + std::size_t Count(ContainerMapList> const& elements, SPECIFIC_TYPE* fake) { return Count(elements._TailElements, fake); } @@ -243,31 +243,31 @@ namespace Acore /* ContainerVector Helpers */ // count functions template - std::size_t Count(const ContainerVector& elements, SPECIFIC_TYPE* /*fake*/) + std::size_t Count(ContainerVector const& elements, SPECIFIC_TYPE* /*fake*/) { return elements._element.getSize(); } template - std::size_t Count(const ContainerVector& /*elements*/, SPECIFIC_TYPE* /*fake*/) + std::size_t Count(ContainerVector const& /*elements*/, SPECIFIC_TYPE* /*fake*/) { return 0; } template - std::size_t Count(const ContainerVector& /*elements*/, SPECIFIC_TYPE* /*fake*/) + std::size_t Count(ContainerVector const& /*elements*/, SPECIFIC_TYPE* /*fake*/) { return 0; } template - std::size_t Count(const ContainerVector>& elements, SPECIFIC_TYPE* fake) + std::size_t Count(ContainerVector> const& elements, SPECIFIC_TYPE* fake) { return Count(elements._elements, fake); } template - std::size_t Count(const ContainerVector>& elements, SPECIFIC_TYPE* fake) + std::size_t Count(ContainerVector> const& elements, SPECIFIC_TYPE* fake) { return Count(elements._TailElements, fake); } diff --git a/src/common/Dynamic/TypeContainerFunctionsPtr.h b/src/common/Dynamic/TypeContainerFunctionsPtr.h index 7855089c6..b328bfcd2 100644 --- a/src/common/Dynamic/TypeContainerFunctionsPtr.h +++ b/src/common/Dynamic/TypeContainerFunctionsPtr.h @@ -81,23 +81,23 @@ namespace Acore } // const find functions - template const CountedPtr& Find(const ContainerMapList& elements, OBJECT_HANDLE hdl, CountedPtr* /*fake*/) + template CountedPtr const& Find(ContainerMapList const& elements, OBJECT_HANDLE hdl, CountedPtr* /*fake*/) { typename CountedPtr::iterator iter = elements._element.find(hdl); return (iter == elements._element.end() ? NullPtr((SPECIFIC_TYPE*)nullptr) : iter->second); }; - template const CountedPtr& Find(const ContainerMapList& elements, OBJECT_HANDLE hdl, CountedPtr* /*fake*/) + template CountedPtr const& Find(ContainerMapList const& elements, OBJECT_HANDLE hdl, CountedPtr* /*fake*/) { return NullPtr((SPECIFIC_TYPE*)nullptr); } - template const CountedPtr& Find(const ContainerMapList& elements, OBJECT_HANDLE hdl, CountedPtr* /*fake*/) + template CountedPtr const& Find(ContainerMapList const& elements, OBJECT_HANDLE hdl, CountedPtr* /*fake*/) { return NullPtr((SPECIFIC_TYPE*)nullptr); } - template CountedPtr& Find(const ContainerMapList>& elements, OBJECT_HANDLE hdl, CountedPtr* fake) + template CountedPtr& Find(ContainerMapList> const& elements, OBJECT_HANDLE hdl, CountedPtr* fake) { CountedPtr& t = Find(elements._elements, hdl, fake); if (!t) diff --git a/src/common/Dynamic/TypeContainerVisitor.h b/src/common/Dynamic/TypeContainerVisitor.h index a85ad9a9f..001515494 100644 --- a/src/common/Dynamic/TypeContainerVisitor.h +++ b/src/common/Dynamic/TypeContainerVisitor.h @@ -111,7 +111,7 @@ public: VisitorHelper(i_visitor, c); } - void Visit(const TYPE_CONTAINER& c) const + void Visit(TYPE_CONTAINER const& c) const { VisitorHelper(i_visitor, c); } diff --git a/src/common/Metric/Metric.cpp b/src/common/Metric/Metric.cpp index 75cc58dc6..6c86d2b84 100644 --- a/src/common/Metric/Metric.cpp +++ b/src/common/Metric/Metric.cpp @@ -315,7 +315,7 @@ void Metric::ScheduleOverallStatusLog() if (_enabled) { _overallStatusTimer->expires_at(Acore::Asio::SteadyTimer::GetExpirationTime(_overallStatusTimerInterval)); - _overallStatusTimer->async_wait([this](const boost::system::error_code&) + _overallStatusTimer->async_wait([this](boost::system::error_code const&) { _overallStatusTimerTriggered = true; ScheduleOverallStatusLog(); diff --git a/src/common/Navigation/DetourExtended.cpp b/src/common/Navigation/DetourExtended.cpp index 2b208eb99..c99b02142 100644 --- a/src/common/Navigation/DetourExtended.cpp +++ b/src/common/Navigation/DetourExtended.cpp @@ -6,10 +6,10 @@ #include "DetourCommon.h" #include "Geometry.h" -float dtQueryFilterExt::getCost(const float* pa, const float* pb, - const dtPolyRef /*prevRef*/, const dtMeshTile* /*prevTile*/, const dtPoly* /*prevPoly*/, - const dtPolyRef /*curRef*/, const dtMeshTile* /*curTile*/, const dtPoly* curPoly, - const dtPolyRef /*nextRef*/, const dtMeshTile* /*nextTile*/, const dtPoly* /*nextPoly*/) const +float dtQueryFilterExt::getCost(float const* pa, float const* pb, + const dtPolyRef /*prevRef*/, dtMeshTile const* /*prevTile*/, dtPoly const* /*prevPoly*/, + const dtPolyRef /*curRef*/, dtMeshTile const* /*curTile*/, dtPoly const* curPoly, + const dtPolyRef /*nextRef*/, dtMeshTile const* /*nextTile*/, dtPoly const* /*nextPoly*/) const { float startX = pa[2], startY = pa[0], startZ = pa[1]; float destX = pb[2], destY = pb[0], destZ = pb[1]; diff --git a/src/common/Navigation/DetourExtended.h b/src/common/Navigation/DetourExtended.h index ea718c128..e2bb710ad 100644 --- a/src/common/Navigation/DetourExtended.h +++ b/src/common/Navigation/DetourExtended.h @@ -10,10 +10,10 @@ class dtQueryFilterExt: public dtQueryFilter { public: - float getCost(const float* pa, const float* pb, - const dtPolyRef prevRef, const dtMeshTile* prevTile, const dtPoly* prevPoly, - const dtPolyRef curRef, const dtMeshTile* curTile, const dtPoly* curPoly, - const dtPolyRef nextRef, const dtMeshTile* nextTile, const dtPoly* nextPoly) const override; + float getCost(float const* pa, float const* pb, + const dtPolyRef prevRef, dtMeshTile const* prevTile, dtPoly const* prevPoly, + const dtPolyRef curRef, dtMeshTile const* curTile, dtPoly const* curPoly, + const dtPolyRef nextRef, dtMeshTile const* nextTile, dtPoly const* nextPoly) const override; }; #endif // _ACORE_DETOUR_EXTENDED_H diff --git a/src/common/Threading/LockedQueue.h b/src/common/Threading/LockedQueue.h index 1c8bbb199..7844b656d 100644 --- a/src/common/Threading/LockedQueue.h +++ b/src/common/Threading/LockedQueue.h @@ -49,7 +49,7 @@ public: * * @param item The item to be added to the queue. */ - void add(const T& item) + void add(T const& item) { std::lock_guard lock(_lock); _queue.push_back(std::move(item)); diff --git a/src/common/Threading/PCQueue.h b/src/common/Threading/PCQueue.h index 94e69a402..f66adb235 100644 --- a/src/common/Threading/PCQueue.h +++ b/src/common/Threading/PCQueue.h @@ -36,7 +36,7 @@ private: public: ProducerConsumerQueue() = default; - void Push(const T& value) + void Push(T const& value) { { std::lock_guard lock(_queueLock); diff --git a/src/common/Threading/Threading.h b/src/common/Threading/Threading.h index fdac117ff..786587b34 100644 --- a/src/common/Threading/Threading.h +++ b/src/common/Threading/Threading.h @@ -68,8 +68,8 @@ namespace Acore static std::thread::id currentId(); private: - Thread(const Thread&); - Thread& operator=(const Thread&); + Thread(Thread const&); + Thread& operator=(Thread const&); static void ThreadTask(void* param); diff --git a/src/common/Threading/ThreadingModel.h b/src/common/Threading/ThreadingModel.h index cf013ec76..f0a5fc50f 100644 --- a/src/common/Threading/ThreadingModel.h +++ b/src/common/Threading/ThreadingModel.h @@ -41,8 +41,8 @@ namespace Acore } private: - GeneralLock(const GeneralLock&); - GeneralLock& operator=(const GeneralLock&); + GeneralLock(GeneralLock const&); + GeneralLock& operator=(GeneralLock const&); MUTEX& i_mutex; }; @@ -55,11 +55,11 @@ namespace Acore Lock() { } - Lock(const T&) + Lock(T const&) { } - Lock(const SingleThreaded&) // for single threaded we ignore this + Lock(SingleThreaded const&) // for single threaded we ignore this { } }; @@ -90,8 +90,8 @@ namespace Acore private: // prevent the compiler creating a copy construct - ObjectLevelLockable(const ObjectLevelLockable&); - ObjectLevelLockable& operator=(const ObjectLevelLockable&); + ObjectLevelLockable(ObjectLevelLockable const&); + ObjectLevelLockable& operator=(ObjectLevelLockable const&); MUTEX i_mtx; }; @@ -109,12 +109,12 @@ namespace Acore class Lock { public: - Lock(const T& /*host*/) + Lock(T const& /*host*/) { ClassLevelLockable::si_mtx.lock(); } - Lock(const ClassLevelLockable&) + Lock(ClassLevelLockable const&) { ClassLevelLockable::si_mtx.lock(); } diff --git a/src/common/Utilities/SmartEnum.h b/src/common/Utilities/SmartEnum.h index a3ce5608a..62e647c79 100644 --- a/src/common/Utilities/SmartEnum.h +++ b/src/common/Utilities/SmartEnum.h @@ -85,13 +85,13 @@ public: Iterator() : _index(EnumUtils::Count()) {} explicit Iterator(std::size_t index) : _index(index) { } - bool operator==(const Iterator& other) const { return other._index == _index; } - bool operator!=(const Iterator& other) const { return !operator==(other); } + bool operator==(Iterator const& other) const { return other._index == _index; } + bool operator!=(Iterator const& other) const { return !operator==(other); } difference_type operator-(Iterator const& other) const { return _index - other._index; } - bool operator<(const Iterator& other) const { return _index < other._index; } - bool operator<=(const Iterator& other) const { return _index <= other._index; } - bool operator>(const Iterator& other) const { return _index > other._index; } - bool operator>=(const Iterator& other) const { return _index >= other._index; } + bool operator<(Iterator const& other) const { return _index < other._index; } + bool operator<=(Iterator const& other) const { return _index <= other._index; } + bool operator>(Iterator const& other) const { return _index > other._index; } + bool operator>=(Iterator const& other) const { return _index >= other._index; } value_type operator[](difference_type d) const { return FromIndex(_index + d); } value_type operator*() const { return operator[](0); } diff --git a/src/common/Utilities/StringFormat.cpp b/src/common/Utilities/StringFormat.cpp index 55edca815..43b3cb4b5 100644 --- a/src/common/Utilities/StringFormat.cpp +++ b/src/common/Utilities/StringFormat.cpp @@ -19,7 +19,7 @@ #include "Define.h" template -AC_COMMON_API Str Acore::String::Trim(const Str& s, const std::locale& loc /*= std::locale()*/) +AC_COMMON_API Str Acore::String::Trim(Str const& s, std::locale const& loc /*= std::locale()*/) { typename Str::const_iterator first = s.begin(); typename Str::const_iterator end = s.end(); @@ -78,4 +78,4 @@ std::string Acore::String::AddSuffixIfNotExists(std::string str, const char suff } // Template Trim -template AC_COMMON_API std::string Acore::String::Trim(const std::string& s, const std::locale& loc /*= std::locale()*/); +template AC_COMMON_API std::string Acore::String::Trim(std::string const& s, std::locale const& loc /*= std::locale()*/); diff --git a/src/common/Utilities/StringFormat.h b/src/common/Utilities/StringFormat.h index 2aecd8e45..5129a6965 100644 --- a/src/common/Utilities/StringFormat.h +++ b/src/common/Utilities/StringFormat.h @@ -110,7 +110,7 @@ namespace Acore namespace Acore::String { template - AC_COMMON_API Str Trim(const Str& s, const std::locale& loc = std::locale()); + AC_COMMON_API Str Trim(Str const& s, std::locale const& loc = std::locale()); AC_COMMON_API std::string TrimRightInPlace(std::string& str); diff --git a/src/common/Utilities/Util.cpp b/src/common/Utilities/Util.cpp index 6e5757f1e..719467004 100644 --- a/src/common/Utilities/Util.cpp +++ b/src/common/Utilities/Util.cpp @@ -160,7 +160,7 @@ Optional MoneyStringToMoney(std::string_view moneyString) return money; } -uint32 TimeStringToSecs(const std::string& timestring) +uint32 TimeStringToSecs(std::string const& timestring) { uint32 secs = 0; uint32 buffer = 0; @@ -291,7 +291,7 @@ bool Utf8toWStr(char const* utf8str, std::size_t csize, wchar_t* wstr, std::size { // Replace the converted string with an error message if there is enough space // Otherwise just return an empty string - const wchar_t* errorMessage = L"An error occurred converting string from UTF-8 to WStr"; + wchar_t const* errorMessage = L"An error occurred converting string from UTF-8 to WStr"; std::size_t errorMessageLength = std::char_traits::length(errorMessage); if (wsize >= errorMessageLength) { @@ -421,7 +421,7 @@ std::wstring GetMainPartOfName(std::wstring const& wname, uint32_t declension) std::size_t const thisLen = wname.length(); std::array const& endings = dropEnds[declension]; - for (const std::wstring* endingPtr : endings) + for (std::wstring const* endingPtr : endings) { if (endingPtr == nullptr) { @@ -498,7 +498,7 @@ bool Utf8FitTo(std::string_view str, std::wstring_view search) return true; } -void utf8printf(FILE* out, const char* str, ...) +void utf8printf(FILE* out, char const* str, ...) { va_list ap; va_start(ap, str); @@ -506,7 +506,7 @@ void utf8printf(FILE* out, const char* str, ...) va_end(ap); } -void vutf8printf(FILE* out, const char* str, va_list* ap) +void vutf8printf(FILE* out, char const* str, va_list* ap) { #if AC_PLATFORM == AC_PLATFORM_WINDOWS char temp_buf[32 * 1024]; diff --git a/src/common/Utilities/Util.h b/src/common/Utilities/Util.h index 3976d4e76..b0bbe0a78 100644 --- a/src/common/Utilities/Util.h +++ b/src/common/Utilities/Util.h @@ -37,7 +37,7 @@ template struct Finder T S::* idMember_; Finder(T val, T S::* idMember) : val_(val), idMember_(idMember) {} - bool operator()(const std::pair& obj) { return obj.second.*idMember_ == val_; } + bool operator()(std::pair const& obj) { return obj.second.*idMember_ == val_; } }; void stripLineInvisibleChars(std::string& src); @@ -45,7 +45,7 @@ void stripLineInvisibleChars(std::string& src); AC_COMMON_API Optional MoneyStringToMoney(std::string_view moneyString); std::string secsToTimeString(uint64 timeInSecs, bool shortText = false); -uint32 TimeStringToSecs(const std::string& timestring); +uint32 TimeStringToSecs(std::string const& timestring); // Percentage calculation template @@ -353,13 +353,13 @@ std::wstring GetMainPartOfName(std::wstring const& wname, uint32 declension); AC_COMMON_API bool utf8ToConsole(std::string_view utf8str, std::string& conStr); AC_COMMON_API bool consoleToUtf8(std::string_view conStr, std::string& utf8str); AC_COMMON_API bool Utf8FitTo(std::string_view str, std::wstring_view search); -AC_COMMON_API void utf8printf(FILE* out, const char* str, ...); -AC_COMMON_API void vutf8printf(FILE* out, const char* str, va_list* ap); +AC_COMMON_API void utf8printf(FILE* out, char const* str, ...); +AC_COMMON_API void vutf8printf(FILE* out, char const* str, va_list* ap); AC_COMMON_API bool Utf8ToUpperOnlyLatin(std::string& utf8String); bool IsIPAddress(char const* ipaddress); -uint32 CreatePIDFile(const std::string& filename); +uint32 CreatePIDFile(std::string const& filename); uint32 GetPID(); namespace Acore::Impl @@ -506,7 +506,7 @@ public: part[2] = right.part[2]; return *this; } - flag96(const flag96&) = default; + flag96(flag96 const&) = default; flag96(flag96&&) = default; inline flag96 operator&(flag96 const& right) const diff --git a/src/server/apps/worldserver/ACSoap/ACSoap.cpp b/src/server/apps/worldserver/ACSoap/ACSoap.cpp index 4b76d2b58..5e595392e 100644 --- a/src/server/apps/worldserver/ACSoap/ACSoap.cpp +++ b/src/server/apps/worldserver/ACSoap/ACSoap.cpp @@ -23,7 +23,7 @@ #include #include -void ACSoapThread(const std::string& host, uint16 port) +void ACSoapThread(std::string const& host, uint16 port) { struct soap soap; soap_init(&soap); diff --git a/src/server/apps/worldserver/ACSoap/ACSoap.h b/src/server/apps/worldserver/ACSoap/ACSoap.h index 36162a33c..73e2bc296 100644 --- a/src/server/apps/worldserver/ACSoap/ACSoap.h +++ b/src/server/apps/worldserver/ACSoap/ACSoap.h @@ -23,7 +23,7 @@ #include void process_message(struct soap* soap_message); -void ACSoapThread(const std::string& host, uint16 port); +void ACSoapThread(std::string const& host, uint16 port); class SOAPCommand { diff --git a/src/server/apps/worldserver/RemoteAccess/RASession.cpp b/src/server/apps/worldserver/RemoteAccess/RASession.cpp index 03645044e..219169d6d 100644 --- a/src/server/apps/worldserver/RemoteAccess/RASession.cpp +++ b/src/server/apps/worldserver/RemoteAccess/RASession.cpp @@ -120,7 +120,7 @@ std::string RASession::ReadString() return line; } -bool RASession::CheckAccessLevel(const std::string& user) +bool RASession::CheckAccessLevel(std::string const& user) { std::string safeUser = user; @@ -152,7 +152,7 @@ bool RASession::CheckAccessLevel(const std::string& user) return true; } -bool RASession::CheckPassword(const std::string& user, const std::string& pass) +bool RASession::CheckPassword(std::string const& user, std::string const& pass) { std::string safe_user = user; std::transform(safe_user.begin(), safe_user.end(), safe_user.begin(), ::toupper); diff --git a/src/server/apps/worldserver/RemoteAccess/RASession.h b/src/server/apps/worldserver/RemoteAccess/RASession.h index 1f06b32ae..a2d016378 100644 --- a/src/server/apps/worldserver/RemoteAccess/RASession.h +++ b/src/server/apps/worldserver/RemoteAccess/RASession.h @@ -38,8 +38,8 @@ public: private: int Send(std::string_view data); std::string ReadString(); - bool CheckAccessLevel(const std::string& user); - bool CheckPassword(const std::string& user, const std::string& pass); + bool CheckAccessLevel(std::string const& user); + bool CheckPassword(std::string const& user, std::string const& pass); bool ProcessCommand(std::string& command); static void CommandPrint(void* callbackArg, std::string_view text); diff --git a/src/server/database/Database/MySQLConnection.cpp b/src/server/database/Database/MySQLConnection.cpp index 48c9c4a62..b62d0ed82 100644 --- a/src/server/database/Database/MySQLConnection.cpp +++ b/src/server/database/Database/MySQLConnection.cpp @@ -399,7 +399,7 @@ int MySQLConnection::ExecuteTransaction(std::shared_ptr transac { stmt = std::get(data.element); } - catch (const std::bad_variant_access& ex) + catch (std::bad_variant_access const& ex) { LOG_FATAL("sql.sql", "> PreparedStatementBase not found in SQLElementData. {}", ex.what()); ABORT(); @@ -424,7 +424,7 @@ int MySQLConnection::ExecuteTransaction(std::shared_ptr transac { sql = std::get(data.element); } - catch (const std::bad_variant_access& ex) + catch (std::bad_variant_access const& ex) { LOG_FATAL("sql.sql", "> std::string not found in SQLElementData. {}", ex.what()); ABORT(); @@ -453,7 +453,7 @@ int MySQLConnection::ExecuteTransaction(std::shared_ptr transac return 0; } -std::size_t MySQLConnection::EscapeString(char* to, const char* from, std::size_t length) +std::size_t MySQLConnection::EscapeString(char* to, char const* from, std::size_t length) { return mysql_real_escape_string(m_Mysql, to, from, length); } diff --git a/src/server/database/Database/MySQLConnection.h b/src/server/database/Database/MySQLConnection.h index d19fdc59b..e1b51836a 100644 --- a/src/server/database/Database/MySQLConnection.h +++ b/src/server/database/Database/MySQLConnection.h @@ -79,7 +79,7 @@ public: void RollbackTransaction(); void CommitTransaction(); int ExecuteTransaction(std::shared_ptr transaction); - std::size_t EscapeString(char* to, const char* from, std::size_t length); + std::size_t EscapeString(char* to, char const* from, std::size_t length); void Ping(); uint32 GetLastError(); diff --git a/src/server/database/Database/QueryResult.h b/src/server/database/Database/QueryResult.h index 2aad4cffa..d7aafc5b3 100644 --- a/src/server/database/Database/QueryResult.h +++ b/src/server/database/Database/QueryResult.h @@ -39,7 +39,7 @@ struct ResultIterator pointer operator->() { return _ptr; } ResultIterator& operator++() { if (!_ptr->NextRow()) _ptr = nullptr; return *this; } - bool operator!=(const ResultIterator& right) { return _ptr != right._ptr; } + bool operator!=(ResultIterator const& right) { return _ptr != right._ptr; } private: pointer _ptr; diff --git a/src/server/database/Database/Transaction.cpp b/src/server/database/Database/Transaction.cpp index 6f76dfbf4..dba55aefe 100644 --- a/src/server/database/Database/Transaction.cpp +++ b/src/server/database/Database/Transaction.cpp @@ -66,7 +66,7 @@ void TransactionBase::Cleanup() delete stmt; } - catch (const std::bad_variant_access& ex) + catch (std::bad_variant_access const& ex) { LOG_FATAL("sql.sql", "> PreparedStatementBase not found in SQLElementData. {}", ex.what()); ABORT(); @@ -79,7 +79,7 @@ void TransactionBase::Cleanup() { std::get(data.element).clear(); } - catch (const std::bad_variant_access& ex) + catch (std::bad_variant_access const& ex) { LOG_FATAL("sql.sql", "> std::string not found in SQLElementData. {}", ex.what()); ABORT(); diff --git a/src/server/database/Updater/DBUpdater.cpp b/src/server/database/Updater/DBUpdater.cpp index 2d023faed..a98cae3ff 100644 --- a/src/server/database/Updater/DBUpdater.cpp +++ b/src/server/database/Updater/DBUpdater.cpp @@ -175,7 +175,7 @@ bool DBUpdater::Create(DatabaseWorkerPool& pool) { LOG_WARN("sql.updates", "Database \"{}\" does not exist", pool.GetConnectionInfo()->database); - const char* disableInteractive = std::getenv("AC_DISABLE_INTERACTIVE"); + char const* disableInteractive = std::getenv("AC_DISABLE_INTERACTIVE"); if (!sConfigMgr->isDryRun() && (disableInteractive == nullptr || std::strcmp(disableInteractive, "1") != 0)) { @@ -402,7 +402,7 @@ bool DBUpdater::Populate(DatabaseWorkerPool& pool) std::vector sqlFiles; - for (const auto &entry : std::filesystem::directory_iterator(DirPath)) + for (auto const& entry : std::filesystem::directory_iterator(DirPath)) { if (entry.path().extension() == ".sql") sqlFiles.push_back(entry.path()); @@ -410,7 +410,7 @@ bool DBUpdater::Populate(DatabaseWorkerPool& pool) std::sort(sqlFiles.begin(), sqlFiles.end()); - for (const auto &file : sqlFiles) + for (auto const& file : sqlFiles) { LOG_INFO("sql.updates", ">> Applying \'{}\'...", file.filename().generic_string()); diff --git a/src/server/game/AI/CoreAI/PetAI.cpp b/src/server/game/AI/CoreAI/PetAI.cpp index 14bd1d530..019f55fb3 100644 --- a/src/server/game/AI/CoreAI/PetAI.cpp +++ b/src/server/game/AI/CoreAI/PetAI.cpp @@ -494,7 +494,7 @@ Unit* PetAI::SelectNextTarget(bool allowAutoSelect) const // Check pet's attackers first to prevent dragging mobs back to owner if (me->HasTauntAura()) { - const Unit::AuraEffectList& tauntAuras = me->GetAuraEffectsByType(SPELL_AURA_MOD_TAUNT); + Unit::AuraEffectList const& tauntAuras = me->GetAuraEffectsByType(SPELL_AURA_MOD_TAUNT); if (!tauntAuras.empty()) for (Unit::AuraEffectList::const_reverse_iterator itr = tauntAuras.rbegin(); itr != tauntAuras.rend(); ++itr) if (Unit* caster = (*itr)->GetCaster()) diff --git a/src/server/game/AI/CreatureAI.cpp b/src/server/game/AI/CreatureAI.cpp index 4dfeb897c..f16f2a3d8 100644 --- a/src/server/game/AI/CreatureAI.cpp +++ b/src/server/game/AI/CreatureAI.cpp @@ -625,7 +625,7 @@ void CreatureAI::SetBoundary(CreatureBoundary const* boundary, bool negateBounda me->DoImmediateBoundaryCheck(); } -Creature* CreatureAI::DoSummon(uint32 entry, const Position& pos, uint32 despawnTime, TempSummonType summonType) +Creature* CreatureAI::DoSummon(uint32 entry, Position const& pos, uint32 despawnTime, TempSummonType summonType) { return me->SummonCreature(entry, pos, summonType, despawnTime); } diff --git a/src/server/game/AI/ScriptedAI/ScriptedCreature.h b/src/server/game/AI/ScriptedAI/ScriptedCreature.h index deb7bba10..a39f1a417 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedCreature.h +++ b/src/server/game/AI/ScriptedAI/ScriptedCreature.h @@ -244,7 +244,7 @@ struct ScriptedAI : public CreatureAI * Hodir is in room until his Y position is below the Door position: * IsInRoom(doorPosition, AXIS_Y, false); */ - bool IsInRoom(const Position* pos, Axis axis, bool above) + bool IsInRoom(Position const* pos, Axis axis, bool above) { if (!pos) { @@ -389,7 +389,7 @@ struct ScriptedAI : public CreatureAI bool Is25ManRaid() const { return _difficulty & RAID_DIFFICULTY_MASK_25MAN; } template inline - const T& DUNGEON_MODE(const T& normal5, const T& heroic10) const + T const& DUNGEON_MODE(T const& normal5, T const& heroic10) const { switch (_difficulty) { @@ -405,7 +405,7 @@ struct ScriptedAI : public CreatureAI } template inline - const T& RAID_MODE(const T& normal10, const T& normal25) const + T const& RAID_MODE(T const& normal10, T const& normal25) const { switch (_difficulty) { @@ -421,7 +421,7 @@ struct ScriptedAI : public CreatureAI } template inline - const T& RAID_MODE(const T& normal10, const T& normal25, const T& heroic10, const T& heroic25) const + T const& RAID_MODE(T const& normal10, T const& normal25, T const& heroic10, T const& heroic25) const { switch (_difficulty) { diff --git a/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp b/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp index ab059e8bb..fb972f2a9 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp +++ b/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp @@ -257,7 +257,7 @@ void FollowerAI::MovementInform(uint32 motionType, uint32 pointId) } } -void FollowerAI::StartFollow(Player* player, uint32 factionForFollower, const Quest* quest, bool inheritWalkState, bool inheritSpeed) +void FollowerAI::StartFollow(Player* player, uint32 factionForFollower, Quest const* quest, bool inheritWalkState, bool inheritSpeed) { if (me->GetVictim()) { diff --git a/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.h b/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.h index beec7c23a..cbac6d799 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.h +++ b/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.h @@ -55,7 +55,7 @@ public: void UpdateAI(uint32) override; //the "internal" update, calls UpdateFollowerAI() virtual void UpdateFollowerAI(uint32); //used when it's needed to add code in update (abilities, scripted events, etc) - void StartFollow(Player* player, uint32 factionForFollower = 0, const Quest* quest = nullptr, bool inheritWalkState = true, bool inheritSpeed = true); + void StartFollow(Player* player, uint32 factionForFollower = 0, Quest const* quest = nullptr, bool inheritWalkState = true, bool inheritSpeed = true); void SetFollowPaused(bool bPaused); //if special event require follow mode to hold/resume during the follow void SetFollowComplete(bool bWithEndEvent = false); @@ -75,7 +75,7 @@ private: uint32 m_uiUpdateFollowTimer; uint32 m_uiFollowState; - const Quest* m_pQuestForFollow; //normally we have a quest + Quest const* m_pQuestForFollow; //normally we have a quest }; #endif diff --git a/src/server/game/AI/SmartScripts/SmartAI.cpp b/src/server/game/AI/SmartScripts/SmartAI.cpp index 23d7466f5..b1dafb95c 100644 --- a/src/server/game/AI/SmartScripts/SmartAI.cpp +++ b/src/server/game/AI/SmartScripts/SmartAI.cpp @@ -1151,7 +1151,7 @@ void SmartAI::sGossipSelect(Player* player, uint32 sender, uint32 action) GetScript()->ProcessEventsFor(SMART_EVENT_GOSSIP_SELECT, player, sender, action); } -void SmartAI::sGossipSelectCode(Player* /*player*/, uint32 /*sender*/, uint32 /*action*/, const char* /*code*/) +void SmartAI::sGossipSelectCode(Player* /*player*/, uint32 /*sender*/, uint32 /*action*/, char const* /*code*/) { } @@ -1404,7 +1404,7 @@ bool SmartGameObjectAI::GossipSelect(Player* player, uint32 sender, uint32 actio } // Called when a player selects a gossip with a code in the gameobject's gossip menu. -bool SmartGameObjectAI::GossipSelectCode(Player* /*player*/, uint32 /*sender*/, uint32 /*action*/, const char* /*code*/) +bool SmartGameObjectAI::GossipSelectCode(Player* /*player*/, uint32 /*sender*/, uint32 /*action*/, char const* /*code*/) { return false; } diff --git a/src/server/game/AI/SmartScripts/SmartAI.h b/src/server/game/AI/SmartScripts/SmartAI.h index 5a8ec52bc..d84c72929 100644 --- a/src/server/game/AI/SmartScripts/SmartAI.h +++ b/src/server/game/AI/SmartScripts/SmartAI.h @@ -190,7 +190,7 @@ public: void sGossipHello(Player* player) override; void sGossipSelect(Player* player, uint32 sender, uint32 action) override; - void sGossipSelectCode(Player* player, uint32 sender, uint32 action, const char* code) override; + void sGossipSelectCode(Player* player, uint32 sender, uint32 action, char const* code) override; void sQuestAccept(Player* player, Quest const* quest) override; //void sQuestSelect(Player* player, Quest const* quest); //void sQuestComplete(Player* player, Quest const* quest); @@ -298,7 +298,7 @@ public: bool GossipHello(Player* player, bool reportUse) override; bool GossipSelect(Player* player, uint32 sender, uint32 action) override; - bool GossipSelectCode(Player* /*player*/, uint32 /*sender*/, uint32 /*action*/, const char* /*code*/) override; + bool GossipSelectCode(Player* /*player*/, uint32 /*sender*/, uint32 /*action*/, char const* /*code*/) override; bool QuestAccept(Player* player, Quest const* quest) override; bool QuestReward(Player* player, Quest const* quest, uint32 opt) override; void Destroyed(Player* player, uint32 eventId) override; diff --git a/src/server/game/Achievements/AchievementMgr.cpp b/src/server/game/Achievements/AchievementMgr.cpp index e27ec45f2..d538a3863 100644 --- a/src/server/game/Achievements/AchievementMgr.cpp +++ b/src/server/game/Achievements/AchievementMgr.cpp @@ -1085,7 +1085,7 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui uint32 counter = 0; - const RewardedQuestSet& rewQuests = GetPlayer()->getRewardedQuests(); + RewardedQuestSet const& rewQuests = GetPlayer()->getRewardedQuests(); for (RewardedQuestSet::const_iterator itr = rewQuests.begin(); itr != rewQuests.end(); ++itr) { Quest const* quest = sObjectMgr->GetQuestTemplate(*itr); @@ -2186,7 +2186,7 @@ void AchievementMgr::SetCriteriaProgress(AchievementCriteriaEntry const* entry, sScriptMgr->OnPlayerCriteriaProgress(GetPlayer(), entry); } -void AchievementMgr::RemoveCriteriaProgress(const AchievementCriteriaEntry* entry) +void AchievementMgr::RemoveCriteriaProgress(AchievementCriteriaEntry const* entry) { CriteriaProgressMap::iterator criteriaProgress = _criteriaProgress.find(entry->ID); if (criteriaProgress == _criteriaProgress.end()) @@ -2974,7 +2974,7 @@ void AchievementGlobalMgr::LoadCompletedAchievements() Field* fields = result->Fetch(); uint16 achievementId = fields[0].Get(); - const AchievementEntry* achievement = sAchievementStore.LookupEntry(achievementId); + AchievementEntry const* achievement = sAchievementStore.LookupEntry(achievementId); if (!achievement) { // Remove non existent achievements from all characters diff --git a/src/server/game/Addons/AddonMgr.cpp b/src/server/game/Addons/AddonMgr.cpp index 4e139b748..e127951d8 100644 --- a/src/server/game/Addons/AddonMgr.cpp +++ b/src/server/game/Addons/AddonMgr.cpp @@ -104,7 +104,7 @@ namespace AddonMgr m_knownAddons.emplace_back(addon.Name, addon.CRC); } - SavedAddon const* GetAddonInfo(const std::string& name) + SavedAddon const* GetAddonInfo(std::string const& name) { for (auto const& addon : m_knownAddons) { diff --git a/src/server/game/Addons/AddonMgr.h b/src/server/game/Addons/AddonMgr.h index 1c9037f89..effc55cc5 100644 --- a/src/server/game/Addons/AddonMgr.h +++ b/src/server/game/Addons/AddonMgr.h @@ -60,7 +60,7 @@ namespace AddonMgr { void LoadFromDB(); void SaveAddon(AddonInfo const& addon); - SavedAddon const* GetAddonInfo(const std::string& name); + SavedAddon const* GetAddonInfo(std::string const& name); typedef std::list BannedAddonList; BannedAddonList const* GetBannedAddons(); diff --git a/src/server/game/ArenaSpectator/ArenaSpectator.cpp b/src/server/game/ArenaSpectator/ArenaSpectator.cpp index fe0e49c12..b7b63dc8b 100644 --- a/src/server/game/ArenaSpectator/ArenaSpectator.cpp +++ b/src/server/game/ArenaSpectator/ArenaSpectator.cpp @@ -113,7 +113,7 @@ bool ArenaSpectator::HandleSpectatorSpectateCommand(ChatHandler* handler, std::s if (!player->m_Controlled.empty()) errors.push_back("Can't be controlling creatures."); - const Unit::VisibleAuraMap* va = player->GetVisibleAuras(); + Unit::VisibleAuraMap const* va = player->GetVisibleAuras(); for (auto itr = va->begin(); itr != va->end(); ++itr) if (Aura* aura = itr->second->GetBase()) if (!itr->second->IsPositive() && !aura->IsPermanent() && aura->GetDuration() < HOUR * IN_MILLISECONDS) @@ -310,7 +310,7 @@ AC_GAME_API void ArenaSpectator::SendPacketTo(Player const* player, std::string& } template<> -AC_GAME_API void ArenaSpectator::SendPacketTo(const Map* map, std::string&& message) +AC_GAME_API void ArenaSpectator::SendPacketTo(Map const* map, std::string&& message) { if (!map->IsBattleArena()) return; diff --git a/src/server/game/ArenaSpectator/ArenaSpectator.h b/src/server/game/ArenaSpectator/ArenaSpectator.h index 9bb2f20b2..2abc9da77 100644 --- a/src/server/game/ArenaSpectator/ArenaSpectator.h +++ b/src/server/game/ArenaSpectator/ArenaSpectator.h @@ -41,7 +41,7 @@ class WorldPacket; namespace ArenaSpectator { template - AC_GAME_API void SendPacketTo(const T* object, std::string&& message); + AC_GAME_API void SendPacketTo(T const* object, std::string&& message); template inline void SendCommand(T* o, Format&& fmt, Args&& ... args) @@ -50,7 +50,7 @@ namespace ArenaSpectator } template - inline void SendCommand_String(T* o, ObjectGuid targetGUID, const char* prefix, const char* c) + inline void SendCommand_String(T* o, ObjectGuid targetGUID, char const* prefix, char const* c) { if (!targetGUID.IsPlayer()) return; @@ -59,7 +59,7 @@ namespace ArenaSpectator } template - inline void SendCommand_UInt32Value(T* o, ObjectGuid targetGUID, const char* prefix, uint32 t) + inline void SendCommand_UInt32Value(T* o, ObjectGuid targetGUID, char const* prefix, uint32 t) { if (!targetGUID.IsPlayer()) return; @@ -68,7 +68,7 @@ namespace ArenaSpectator } template - inline void SendCommand_GUID(T* o, ObjectGuid targetGUID, const char* prefix, ObjectGuid t) + inline void SendCommand_GUID(T* o, ObjectGuid targetGUID, char const* prefix, ObjectGuid t) { if (!targetGUID.IsPlayer()) return; @@ -77,7 +77,7 @@ namespace ArenaSpectator } template - inline void SendCommand_Spell(T* o, ObjectGuid targetGUID, const char* prefix, uint32 id, int32 casttime) + inline void SendCommand_Spell(T* o, ObjectGuid targetGUID, char const* prefix, uint32 id, int32 casttime) { if (!targetGUID.IsPlayer()) return; @@ -86,7 +86,7 @@ namespace ArenaSpectator } template - inline void SendCommand_Cooldown(T* o, ObjectGuid targetGUID, const char* prefix, uint32 id, uint32 dur, uint32 maxdur) + inline void SendCommand_Cooldown(T* o, ObjectGuid targetGUID, char const* prefix, uint32 id, uint32 dur, uint32 maxdur) { if (!targetGUID.IsPlayer()) return; @@ -99,7 +99,7 @@ namespace ArenaSpectator } template - inline void SendCommand_Aura(T* o, ObjectGuid targetGUID, const char* prefix, ObjectGuid caster, uint32 id, bool isDebuff, uint32 dispel, int32 dur, int32 maxdur, uint32 stack, bool remove) + inline void SendCommand_Aura(T* o, ObjectGuid targetGUID, char const* prefix, ObjectGuid caster, uint32 id, bool isDebuff, uint32 dispel, int32 dur, int32 maxdur, uint32 stack, bool remove) { if (!targetGUID.IsPlayer()) return; diff --git a/src/server/game/Battlegrounds/ArenaSeason/ArenaSeasonMgr.h b/src/server/game/Battlegrounds/ArenaSeason/ArenaSeasonMgr.h index f238b2a90..4ee086af2 100644 --- a/src/server/game/Battlegrounds/ArenaSeason/ArenaSeasonMgr.h +++ b/src/server/game/Battlegrounds/ArenaSeason/ArenaSeasonMgr.h @@ -52,7 +52,7 @@ struct ArenaSeasonReward ArenaSeasonRewardType type{ARENA_SEASON_REWARD_TYPE_ITEM}; // Used in unit tests. - bool operator==(const ArenaSeasonReward& other) const + bool operator==(ArenaSeasonReward const& other) const { return entry == other.entry && type == other.type; } @@ -78,7 +78,7 @@ struct ArenaSeasonRewardGroup std::vector achievementRewards; // Used in unit tests. - bool operator==(const ArenaSeasonRewardGroup& other) const + bool operator==(ArenaSeasonRewardGroup const& other) const { return minCriteria == other.minCriteria && maxCriteria == other.maxCriteria && diff --git a/src/server/game/Battlegrounds/ArenaSeason/ArenaSeasonRewardsDistributor.cpp b/src/server/game/Battlegrounds/ArenaSeason/ArenaSeasonRewardsDistributor.cpp index a575e61ff..59c8afe81 100644 --- a/src/server/game/Battlegrounds/ArenaSeason/ArenaSeasonRewardsDistributor.cpp +++ b/src/server/game/Battlegrounds/ArenaSeason/ArenaSeasonRewardsDistributor.cpp @@ -24,7 +24,7 @@ constexpr float minPctTeamGamesForMemberToGetReward = 30; -void ArenaSeasonTeamRewarderImpl::RewardTeamWithRewardGroup(ArenaTeam *arenaTeam, const ArenaSeasonRewardGroup &rewardGroup) +void ArenaSeasonTeamRewarderImpl::RewardTeamWithRewardGroup(ArenaTeam *arenaTeam, ArenaSeasonRewardGroup const& rewardGroup) { RewardWithMail(arenaTeam, rewardGroup); RewardWithAchievements(arenaTeam, rewardGroup); diff --git a/src/server/game/Battlegrounds/ArenaTeam.cpp b/src/server/game/Battlegrounds/ArenaTeam.cpp index 8e32b3c99..8a168ed63 100644 --- a/src/server/game/Battlegrounds/ArenaTeam.cpp +++ b/src/server/game/Battlegrounds/ArenaTeam.cpp @@ -778,7 +778,7 @@ int32 ArenaTeam::GetRatingMod(uint32 ownRating, uint32 opponentRating, bool won return (int32)ceil(mod); } -void ArenaTeam::FinishGame(int32 mod, const Map* bgMap) +void ArenaTeam::FinishGame(int32 mod, Map const* bgMap) { // Rating can only drop to 0 if (int32(Stats.Rating) + mod < 0) @@ -808,7 +808,7 @@ void ArenaTeam::FinishGame(int32 mod, const Map* bgMap) } } -int32 ArenaTeam::WonAgainst(uint32 Own_MMRating, uint32 Opponent_MMRating, int32& rating_change, const Map* bgMap) +int32 ArenaTeam::WonAgainst(uint32 Own_MMRating, uint32 Opponent_MMRating, int32& rating_change, Map const* bgMap) { // Called when the team has won // Change in Matchmaker rating @@ -828,7 +828,7 @@ int32 ArenaTeam::WonAgainst(uint32 Own_MMRating, uint32 Opponent_MMRating, int32 return mod; } -int32 ArenaTeam::LostAgainst(uint32 Own_MMRating, uint32 Opponent_MMRating, int32& rating_change, const Map* bgMap) +int32 ArenaTeam::LostAgainst(uint32 Own_MMRating, uint32 Opponent_MMRating, int32& rating_change, Map const* bgMap) { // Called when the team has lost // Change in Matchmaker Rating @@ -1013,7 +1013,7 @@ bool ArenaTeam::IsFighting() const return false; } -ArenaTeamMember* ArenaTeam::GetMember(const std::string& name) +ArenaTeamMember* ArenaTeam::GetMember(std::string const& name) { return GetMember(sCharacterCache->GetCharacterGuidByName(name)); } diff --git a/src/server/game/Battlegrounds/ArenaTeam.h b/src/server/game/Battlegrounds/ArenaTeam.h index 33c47920e..f1d02683e 100644 --- a/src/server/game/Battlegrounds/ArenaTeam.h +++ b/src/server/game/Battlegrounds/ArenaTeam.h @@ -152,7 +152,7 @@ public: static uint8 GetReqPlayersForType(uint32 type); [[nodiscard]] ObjectGuid GetCaptain() const { return CaptainGuid; } [[nodiscard]] std::string const& GetName() const { return TeamName; } - [[nodiscard]] const ArenaTeamStats& GetStats() const { return Stats; } + [[nodiscard]] ArenaTeamStats const& GetStats() const { return Stats; } void SetArenaTeamStats(ArenaTeamStats& stats) { Stats = stats; } [[nodiscard]] uint32 GetRating() const { return Stats.Rating; } @@ -198,15 +198,15 @@ public: int32 GetMatchmakerRatingMod(uint32 ownRating, uint32 opponentRating, bool won); int32 GetRatingMod(uint32 ownRating, uint32 opponentRating, bool won); float GetChanceAgainst(uint32 ownRating, uint32 opponentRating); - int32 WonAgainst(uint32 Own_MMRating, uint32 Opponent_MMRating, int32& rating_change, const Map* bgMap); + int32 WonAgainst(uint32 Own_MMRating, uint32 Opponent_MMRating, int32& rating_change, Map const* bgMap); void MemberWon(Player* player, uint32 againstMatchmakerRating, int32 MatchmakerRatingChange); - int32 LostAgainst(uint32 Own_MMRating, uint32 Opponent_MMRating, int32& rating_change, const Map* bgMap); + int32 LostAgainst(uint32 Own_MMRating, uint32 Opponent_MMRating, int32& rating_change, Map const* bgMap); void MemberLost(Player* player, uint32 againstMatchmakerRating, int32 MatchmakerRatingChange = -12); void UpdateArenaPointsHelper(std::map& PlayerPoints); bool FinishWeek(); // returns true if arena team played this week - void FinishGame(int32 mod, const Map* bgMap); + void FinishGame(int32 mod, Map const* bgMap); void SetPreviousOpponents(uint32 arenaTeamId) { PreviousOpponents = arenaTeamId; } uint32 GetPreviousOpponents() { return PreviousOpponents; } diff --git a/src/server/game/Battlegrounds/ArenaTeamMgr.cpp b/src/server/game/Battlegrounds/ArenaTeamMgr.cpp index 4eb240b3c..b3fb4d71a 100644 --- a/src/server/game/Battlegrounds/ArenaTeamMgr.cpp +++ b/src/server/game/Battlegrounds/ArenaTeamMgr.cpp @@ -55,7 +55,7 @@ ArenaTeam* ArenaTeamMgr::GetArenaTeamById(uint32 arenaTeamId) const return nullptr; } -ArenaTeam* ArenaTeamMgr::GetArenaTeamByName(const std::string& arenaTeamName) const +ArenaTeam* ArenaTeamMgr::GetArenaTeamByName(std::string const& arenaTeamName) const { std::string search = arenaTeamName; std::transform(search.begin(), search.end(), search.begin(), ::toupper); diff --git a/src/server/game/Battlegrounds/Battleground.h b/src/server/game/Battlegrounds/Battleground.h index 3c42603c6..84b2f1f53 100644 --- a/src/server/game/Battlegrounds/Battleground.h +++ b/src/server/game/Battlegrounds/Battleground.h @@ -404,7 +404,7 @@ public: void AddSpectator(Player* p) { m_Spectators.insert(p); } void RemoveSpectator(Player* p) { m_Spectators.erase(p); } bool HaveSpectators() { return !m_Spectators.empty(); } - [[nodiscard]] const SpectatorList& GetSpectators() const { return m_Spectators; } + [[nodiscard]] SpectatorList const& GetSpectators() const { return m_Spectators; } void AddToBeTeleported(ObjectGuid spectator, ObjectGuid participant) { m_ToBeTeleported[spectator] = participant; } void RemoveToBeTeleported(ObjectGuid spectator) { ToBeTeleportedMap::iterator itr = m_ToBeTeleported.find(spectator); if (itr != m_ToBeTeleported.end()) m_ToBeTeleported.erase(itr); } void SpectatorsSendPacket(WorldPacket& data); @@ -456,7 +456,7 @@ public: virtual void FillInitialWorldStates(WorldPackets::WorldState::InitWorldStates& /*packet*/) { } void SendPacketToTeam(TeamId teamId, WorldPacket const* packet, Player* sender = nullptr, bool self = true); void SendPacketToAll(WorldPacket const* packet); - void YellToAll(Creature* creature, const char* text, uint32 language); + void YellToAll(Creature* creature, char const* text, uint32 language); void SendChatMessage(Creature* source, uint8 textId, WorldObject* target = nullptr); void SendBroadcastText(uint32 id, ChatMsg msgType, WorldObject const* target = nullptr); @@ -576,37 +576,37 @@ public: [[nodiscard]] uint8 GetUniqueBracketId() const; BattlegroundAV* ToBattlegroundAV() { if (GetBgTypeID(true) == BATTLEGROUND_AV) return reinterpret_cast(this); else return nullptr; } - [[nodiscard]] BattlegroundAV const* ToBattlegroundAV() const { if (GetBgTypeID(true) == BATTLEGROUND_AV) return reinterpret_cast(this); else return nullptr; } + [[nodiscard]] BattlegroundAV const* ToBattlegroundAV() const { if (GetBgTypeID(true) == BATTLEGROUND_AV) return reinterpret_cast(this); else return nullptr; } BattlegroundWS* ToBattlegroundWS() { if (GetBgTypeID(true) == BATTLEGROUND_WS) return reinterpret_cast(this); else return nullptr; } - [[nodiscard]] BattlegroundWS const* ToBattlegroundWS() const { if (GetBgTypeID(true) == BATTLEGROUND_WS) return reinterpret_cast(this); else return nullptr; } + [[nodiscard]] BattlegroundWS const* ToBattlegroundWS() const { if (GetBgTypeID(true) == BATTLEGROUND_WS) return reinterpret_cast(this); else return nullptr; } BattlegroundAB* ToBattlegroundAB() { if (GetBgTypeID(true) == BATTLEGROUND_AB) return reinterpret_cast(this); else return nullptr; } - [[nodiscard]] BattlegroundAB const* ToBattlegroundAB() const { if (GetBgTypeID(true) == BATTLEGROUND_AB) return reinterpret_cast(this); else return nullptr; } + [[nodiscard]] BattlegroundAB const* ToBattlegroundAB() const { if (GetBgTypeID(true) == BATTLEGROUND_AB) return reinterpret_cast(this); else return nullptr; } BattlegroundNA* ToBattlegroundNA() { if (GetBgTypeID(true) == BATTLEGROUND_NA) return reinterpret_cast(this); else return nullptr; } - [[nodiscard]] BattlegroundNA const* ToBattlegroundNA() const { if (GetBgTypeID(true) == BATTLEGROUND_NA) return reinterpret_cast(this); else return nullptr; } + [[nodiscard]] BattlegroundNA const* ToBattlegroundNA() const { if (GetBgTypeID(true) == BATTLEGROUND_NA) return reinterpret_cast(this); else return nullptr; } BattlegroundBE* ToBattlegroundBE() { if (GetBgTypeID(true) == BATTLEGROUND_BE) return reinterpret_cast(this); else return nullptr; } - [[nodiscard]] BattlegroundBE const* ToBattlegroundBE() const { if (GetBgTypeID(true) == BATTLEGROUND_BE) return reinterpret_cast(this); else return nullptr; } + [[nodiscard]] BattlegroundBE const* ToBattlegroundBE() const { if (GetBgTypeID(true) == BATTLEGROUND_BE) return reinterpret_cast(this); else return nullptr; } BattlegroundEY* ToBattlegroundEY() { if (GetBgTypeID(true) == BATTLEGROUND_EY) return reinterpret_cast(this); else return nullptr; } - [[nodiscard]] BattlegroundEY const* ToBattlegroundEY() const { if (GetBgTypeID(true) == BATTLEGROUND_EY) return reinterpret_cast(this); else return nullptr; } + [[nodiscard]] BattlegroundEY const* ToBattlegroundEY() const { if (GetBgTypeID(true) == BATTLEGROUND_EY) return reinterpret_cast(this); else return nullptr; } BattlegroundRL* ToBattlegroundRL() { if (GetBgTypeID(true) == BATTLEGROUND_RL) return reinterpret_cast(this); else return nullptr; } - [[nodiscard]] BattlegroundRL const* ToBattlegroundRL() const { if (GetBgTypeID(true) == BATTLEGROUND_RL) return reinterpret_cast(this); else return nullptr; } + [[nodiscard]] BattlegroundRL const* ToBattlegroundRL() const { if (GetBgTypeID(true) == BATTLEGROUND_RL) return reinterpret_cast(this); else return nullptr; } BattlegroundSA* ToBattlegroundSA() { if (GetBgTypeID(true) == BATTLEGROUND_SA) return reinterpret_cast(this); else return nullptr; } - [[nodiscard]] BattlegroundSA const* ToBattlegroundSA() const { if (GetBgTypeID(true) == BATTLEGROUND_SA) return reinterpret_cast(this); else return nullptr; } + [[nodiscard]] BattlegroundSA const* ToBattlegroundSA() const { if (GetBgTypeID(true) == BATTLEGROUND_SA) return reinterpret_cast(this); else return nullptr; } BattlegroundDS* ToBattlegroundDS() { if (GetBgTypeID(true) == BATTLEGROUND_DS) return reinterpret_cast(this); else return nullptr; } - [[nodiscard]] BattlegroundDS const* ToBattlegroundDS() const { if (GetBgTypeID(true) == BATTLEGROUND_DS) return reinterpret_cast(this); else return nullptr; } + [[nodiscard]] BattlegroundDS const* ToBattlegroundDS() const { if (GetBgTypeID(true) == BATTLEGROUND_DS) return reinterpret_cast(this); else return nullptr; } BattlegroundRV* ToBattlegroundRV() { if (GetBgTypeID(true) == BATTLEGROUND_RV) return reinterpret_cast(this); else return nullptr; } - [[nodiscard]] BattlegroundRV const* ToBattlegroundRV() const { if (GetBgTypeID(true) == BATTLEGROUND_RV) return reinterpret_cast(this); else return nullptr; } + [[nodiscard]] BattlegroundRV const* ToBattlegroundRV() const { if (GetBgTypeID(true) == BATTLEGROUND_RV) return reinterpret_cast(this); else return nullptr; } BattlegroundIC* ToBattlegroundIC() { if (GetBgTypeID(true) == BATTLEGROUND_IC) return reinterpret_cast(this); else return nullptr; } - [[nodiscard]] BattlegroundIC const* ToBattlegroundIC() const { if (GetBgTypeID(true) == BATTLEGROUND_IC) return reinterpret_cast(this); else return nullptr; } + [[nodiscard]] BattlegroundIC const* ToBattlegroundIC() const { if (GetBgTypeID(true) == BATTLEGROUND_IC) return reinterpret_cast(this); else return nullptr; } protected: // this method is called, when BG cannot spawn its own spirit guide, or something is wrong, It correctly ends Battleground diff --git a/src/server/game/Battlegrounds/BattlegroundMgr.cpp b/src/server/game/Battlegrounds/BattlegroundMgr.cpp index 5c2328e43..6824d4602 100644 --- a/src/server/game/Battlegrounds/BattlegroundMgr.cpp +++ b/src/server/game/Battlegrounds/BattlegroundMgr.cpp @@ -343,7 +343,7 @@ std::vector BattlegroundMgr::GetActiveBattlegrounds() for (auto const& [bgType, bgData] : bgDataStore) for (auto const& [id, bg] : bgData._Battlegrounds) if (bg->GetStatus() == STATUS_WAIT_JOIN || bg->GetStatus() == STATUS_IN_PROGRESS) - result.push_back(static_cast(bg)); + result.push_back(static_cast(bg)); return result; } diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundEY.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundEY.cpp index da6bfb289..268c28688 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundEY.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundEY.cpp @@ -135,7 +135,7 @@ void BattlegroundEY::UpdatePointsState() _capturePointInfo[point]._playersCount[TEAM_HORDE] = 0; } - const BattlegroundPlayerMap& bgPlayerMap = GetPlayers(); + BattlegroundPlayerMap const& bgPlayerMap = GetPlayers(); for (BattlegroundPlayerMap::const_iterator itr = bgPlayerMap.begin(); itr != bgPlayerMap.end(); ++itr) { itr->second->SendUpdateWorldState(WORLD_STATE_BATTLEGROUND_EY_PROGRESS_BAR_SHOW, BG_EY_PROGRESS_BAR_DONT_SHOW); diff --git a/src/server/game/Calendar/CalendarMgr.h b/src/server/game/Calendar/CalendarMgr.h index b33d74c32..2731613ac 100644 --- a/src/server/game/Calendar/CalendarMgr.h +++ b/src/server/game/Calendar/CalendarMgr.h @@ -171,7 +171,7 @@ public: void SetStatusTime(time_t statusTime) { _statusTime = statusTime; } time_t GetStatusTime() const { return _statusTime; } - void SetText(const std::string& text) { _text = text; } + void SetText(std::string const& text) { _text = text; } std::string GetText() const { return _text; } void SetStatus(CalendarInviteStatus status) { _status = status; } @@ -228,10 +228,10 @@ public: void SetGuildId(uint32 guildId) { _guildId = guildId; } uint32 GetGuildId() const { return _guildId; } - void SetTitle(const std::string& title) { _title = title; } + void SetTitle(std::string const& title) { _title = title; } std::string GetTitle() const { return _title; } - void SetDescription(const std::string& description) { _description = description; } + void SetDescription(std::string const& description) { _description = description; } std::string GetDescription() const { return _description; } void SetType(CalendarEventType type) { _type = type; } diff --git a/src/server/game/Chat/Channels/Channel.cpp b/src/server/game/Chat/Channels/Channel.cpp index ad7b9dfc9..723fa3458 100644 --- a/src/server/game/Chat/Channels/Channel.cpp +++ b/src/server/game/Chat/Channels/Channel.cpp @@ -1083,7 +1083,7 @@ void Channel::MakePlayerUnbanned(WorldPacket* data, ObjectGuid bad, ObjectGuid g *data << good; } -void Channel::MakePlayerNotBanned(WorldPacket* data, const std::string& name) +void Channel::MakePlayerNotBanned(WorldPacket* data, std::string const& name) { MakeNotifyPacket(data, CHAT_PLAYER_NOT_BANNED_NOTICE); *data << name; @@ -1121,13 +1121,13 @@ void Channel::MakeNotModerated(WorldPacket* data) MakeNotifyPacket(data, CHAT_NOT_MODERATED_NOTICE); } -void Channel::MakePlayerInvited(WorldPacket* data, const std::string& name) +void Channel::MakePlayerInvited(WorldPacket* data, std::string const& name) { MakeNotifyPacket(data, CHAT_PLAYER_INVITED_NOTICE); *data << name; } -void Channel::MakePlayerInviteBanned(WorldPacket* data, const std::string& name) +void Channel::MakePlayerInviteBanned(WorldPacket* data, std::string const& name) { MakeNotifyPacket(data, CHAT_PLAYER_INVITE_BANNED_NOTICE); *data << name; diff --git a/src/server/game/Chat/Channels/Channel.h b/src/server/game/Chat/Channels/Channel.h index 32e9bec91..1c4956679 100644 --- a/src/server/game/Chat/Channels/Channel.h +++ b/src/server/game/Chat/Channels/Channel.h @@ -119,7 +119,7 @@ class ChannelRights { public: ChannelRights() = default; - ChannelRights(const uint32& f, const uint32& d, std::string jm, std::string sm, std::set ml) : flags(f), speakDelay(d), joinMessage(std::move(jm)), speakMessage(std::move(sm)), moderators(std::move(ml)) {} + ChannelRights(uint32 const& f, uint32 const& d, std::string jm, std::string sm, std::set ml) : flags(f), speakDelay(d), joinMessage(std::move(jm)), speakMessage(std::move(sm)), moderators(std::move(ml)) {} uint32 flags{0}; uint32 speakDelay{0}; std::string joinMessage; diff --git a/src/server/game/Chat/Channels/ChannelMgr.cpp b/src/server/game/Chat/Channels/ChannelMgr.cpp index 8c651125a..38a81da1f 100644 --- a/src/server/game/Chat/Channels/ChannelMgr.cpp +++ b/src/server/game/Chat/Channels/ChannelMgr.cpp @@ -205,7 +205,7 @@ void ChannelMgr::LoadChannelRights() LOG_INFO("server.loading", " "); } -const ChannelRights& ChannelMgr::GetChannelRightsFor(const std::string& name) +ChannelRights const& ChannelMgr::GetChannelRightsFor(std::string const& name) { std::string nameStr = name; std::transform(nameStr.begin(), nameStr.end(), nameStr.begin(), ::tolower); @@ -215,7 +215,7 @@ const ChannelRights& ChannelMgr::GetChannelRightsFor(const std::string& name) return channelRightsEmpty; } -void ChannelMgr::SetChannelRightsFor(const std::string& name, const uint32& flags, const uint32& speakDelay, const std::string& joinmessage, const std::string& speakmessage, const std::set& moderators) +void ChannelMgr::SetChannelRightsFor(std::string const& name, uint32 const& flags, uint32 const& speakDelay, std::string const& joinmessage, std::string const& speakmessage, std::set const& moderators) { std::string nameStr = name; std::transform(nameStr.begin(), nameStr.end(), nameStr.begin(), ::tolower); diff --git a/src/server/game/Chat/Channels/ChannelMgr.h b/src/server/game/Chat/Channels/ChannelMgr.h index daf595d2f..1255e7ea8 100644 --- a/src/server/game/Chat/Channels/ChannelMgr.h +++ b/src/server/game/Chat/Channels/ChannelMgr.h @@ -43,8 +43,8 @@ public: static void LoadChannels(); static void LoadChannelRights(); - static const ChannelRights& GetChannelRightsFor(const std::string& name); - static void SetChannelRightsFor(const std::string& name, const uint32& flags, const uint32& speakDelay, const std::string& joinmessage, const std::string& speakmessage, const std::set& moderators); + static ChannelRights const& GetChannelRightsFor(std::string const& name); + static void SetChannelRightsFor(std::string const& name, uint32 const& flags, uint32 const& speakDelay, std::string const& joinmessage, std::string const& speakmessage, std::set const& moderators); static uint32 _channelIdMax; private: diff --git a/src/server/game/Chat/Chat.cpp b/src/server/game/Chat/Chat.cpp index 8781540e3..09108d84f 100644 --- a/src/server/game/Chat/Chat.cpp +++ b/src/server/game/Chat/Chat.cpp @@ -191,7 +191,7 @@ void ChatHandler::SendSysMessage(std::string_view str, bool escapeCharacters) } } -void ChatHandler::SendGlobalSysMessage(const char* str) +void ChatHandler::SendGlobalSysMessage(char const* str) { WorldPacket data; for (std::string_view line : Acore::Tokenize(str, '\n', true)) @@ -201,7 +201,7 @@ void ChatHandler::SendGlobalSysMessage(const char* str) } } -void ChatHandler::SendGlobalGMSysMessage(const char* str) +void ChatHandler::SendGlobalGMSysMessage(char const* str) { WorldPacket data; for (std::string_view line : Acore::Tokenize(str, '\n', true)) @@ -928,7 +928,7 @@ bool CliHandler::needReportToTarget(Player* /*chr*/) const return true; } -bool ChatHandler::GetPlayerGroupAndGUIDByName(const char* cname, Player*& player, Group*& group, ObjectGuid& guid, bool offline) +bool ChatHandler::GetPlayerGroupAndGUIDByName(char const* cname, Player*& player, Group*& group, ObjectGuid& guid, bool offline) { player = nullptr; guid = ObjectGuid::Empty; diff --git a/src/server/game/Chat/Chat.h b/src/server/game/Chat/Chat.h index 0992c2091..0cc1de91b 100644 --- a/src/server/game/Chat/Chat.h +++ b/src/server/game/Chat/Chat.h @@ -191,7 +191,7 @@ public: bool _ParseCommands(std::string_view text); virtual bool ParseCommands(std::string_view text); - void SendGlobalSysMessage(const char* str); + void SendGlobalSysMessage(char const* str); // function with different implementation for chat/console virtual bool IsHumanReadable() const { return true; } @@ -203,7 +203,7 @@ public: bool HasLowerSecurity(Player* target, ObjectGuid guid = ObjectGuid::Empty, bool strong = false); bool HasLowerSecurityAccount(WorldSession* target, uint32 account, bool strong = false); - void SendGlobalGMSysMessage(const char* str); + void SendGlobalGMSysMessage(char const* str); Player* getSelectedPlayer() const; Creature* getSelectedCreature() const; Unit* getSelectedUnit() const; @@ -223,7 +223,7 @@ public: uint32 extractSpellIdFromLink(char* text); ObjectGuid::LowType extractLowGuidFromLink(char* text, HighGuid& guidHigh); - bool GetPlayerGroupAndGUIDByName(const char* cname, Player*& player, Group*& group, ObjectGuid& guid, bool offline = false); + bool GetPlayerGroupAndGUIDByName(char const* cname, Player*& player, Group*& group, ObjectGuid& guid, bool offline = false); std::string extractPlayerNameFromLink(char* text); // select by arg (name/link) or in-game selection online/offline player bool extractPlayerTarget(char* args, Player** player, ObjectGuid* player_guid = nullptr, std::string* player_name = nullptr); diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp index 32695a2e8..fdd00e8e2 100644 --- a/src/server/game/Conditions/ConditionMgr.cpp +++ b/src/server/game/Conditions/ConditionMgr.cpp @@ -217,7 +217,7 @@ bool Condition::Meets(ConditionSourceInfo& sourceInfo) if (Player* player = unit->GetCharmerOrOwnerPlayerOrPlayerItself()) { // Xinef: cannot be null, checked at loading - const Quest* quest = sObjectMgr->GetQuestTemplate(ConditionValue1); + Quest const* quest = sObjectMgr->GetQuestTemplate(ConditionValue1); condMeets = !player->IsQuestRewarded(ConditionValue1) && player->SatisfyQuestExclusiveGroup(quest, false); } } @@ -1083,7 +1083,7 @@ ConditionList ConditionMgr::GetConditionsForNpcVendorEvent(uint32 creatureId, ui return cond; } -ConditionList ConditionMgr::GetConditionsForObjectVisibility(const WorldObject* object) const +ConditionList ConditionMgr::GetConditionsForObjectVisibility(WorldObject const* object) const { ConditionList cond; @@ -1199,7 +1199,7 @@ void ConditionMgr::LoadConditions(bool isReload) } cond->ReferenceId = uint32(std::abs(iConditionTypeOrReference)); - const char* rowType = "reference template"; + char const* rowType = "reference template"; if (iSourceTypeOrReferenceId >= 0) rowType = "reference"; // check for useless data @@ -2546,7 +2546,7 @@ bool ConditionMgr::isConditionTypeValid(Condition* cond) } case CONDITION_QUEST_OBJECTIVE_PROGRESS: { - const Quest* quest = sObjectMgr->GetQuestTemplate(cond->ConditionValue1); + Quest const* quest = sObjectMgr->GetQuestTemplate(cond->ConditionValue1); if (!quest) { LOG_ERROR("sql.sql", "CONDITION_QUEST_OBJECTIVE_PROGRESS points to non-existing quest ({}), skipped.", cond->ConditionValue1); diff --git a/src/server/game/Conditions/ConditionMgr.h b/src/server/game/Conditions/ConditionMgr.h index 5cfd108fe..ad65af59b 100644 --- a/src/server/game/Conditions/ConditionMgr.h +++ b/src/server/game/Conditions/ConditionMgr.h @@ -271,7 +271,7 @@ public: ConditionList GetConditionsForSmartEvent(int32 entryOrGuid, uint32 eventId, uint32 sourceType); ConditionList GetConditionsForVehicleSpell(uint32 creatureId, uint32 spellId); ConditionList GetConditionsForNpcVendorEvent(uint32 creatureId, uint32 itemId); - ConditionList GetConditionsForObjectVisibility(const WorldObject* object) const; + ConditionList GetConditionsForObjectVisibility(WorldObject const* object) const; private: bool isSourceTypeValid(Condition* cond); diff --git a/src/server/game/DataStores/DBCStores.cpp b/src/server/game/DataStores/DBCStores.cpp index 7aa741332..a2e58a005 100644 --- a/src/server/game/DataStores/DBCStores.cpp +++ b/src/server/game/DataStores/DBCStores.cpp @@ -201,7 +201,7 @@ typedef std::list StoreProblemList; uint32 DBCFileCount = 0; -static bool LoadDBC_assert_print(uint32 fsize, uint32 rsize, const std::string& filename) +static bool LoadDBC_assert_print(uint32 fsize, uint32 rsize, std::string const& filename) { LOG_ERROR("dbc", "Size of '{}' set by format string ({}) not equal size of C++ structure ({}).", filename, fsize, rsize); @@ -258,7 +258,7 @@ inline void LoadDBC(uint32& availableDbcLocales, StoreProblemList& errors, DBCSt } } -void LoadDBCStores(const std::string& dataPath) +void LoadDBCStores(std::string const& dataPath) { uint32 oldMSTime = getMSTime(); @@ -913,7 +913,7 @@ SkillRaceClassInfoEntry const* GetSkillRaceClassInfo(uint32 skill, uint8 race, u return nullptr; } -const std::vector& GetSkillLineAbilitiesBySkillLine(uint32 skillLine) +std::vector const& GetSkillLineAbilitiesBySkillLine(uint32 skillLine) { auto it = sSkillLineAbilityIndexBySkillLine.find(skillLine); if (it == sSkillLineAbilityIndexBySkillLine.end()) diff --git a/src/server/game/DataStores/DBCStores.h b/src/server/game/DataStores/DBCStores.h index ec8cb68bb..92b378e04 100644 --- a/src/server/game/DataStores/DBCStores.h +++ b/src/server/game/DataStores/DBCStores.h @@ -73,7 +73,7 @@ typedef std::pair > SkillLineAbilityIndexBySkillLine; -const std::vector& GetSkillLineAbilitiesBySkillLine(uint32 skillLine); +std::vector const& GetSkillLineAbilitiesBySkillLine(uint32 skillLine); extern DBCStorage sAchievementStore; extern DBCStorage sAchievementCriteriaStore; @@ -194,6 +194,6 @@ extern DBCStorage sWMOAreaTableStore; //extern DBCStorage sWorldMapAreaStore; -- use Zone2MapCoordinates and Map2ZoneCoordinates extern DBCStorage sWorldMapOverlayStore; -void LoadDBCStores(const std::string& dataPath); +void LoadDBCStores(std::string const& dataPath); #endif diff --git a/src/server/game/DungeonFinding/LFG.h b/src/server/game/DungeonFinding/LFG.h index 260f29f08..7941d7988 100644 --- a/src/server/game/DungeonFinding/LFG.h +++ b/src/server/game/DungeonFinding/LFG.h @@ -182,7 +182,7 @@ namespace lfg return 0; } - void insert(const ObjectGuid& g) + void insert(ObjectGuid const& g) { // avoid loops for performance if (!guids[0]) @@ -273,7 +273,7 @@ namespace lfg guids[4] = g; } - void force_insert_front(const ObjectGuid& g) + void force_insert_front(ObjectGuid const& g) { if (guids[3]) { @@ -294,7 +294,7 @@ namespace lfg guids[0] = g; } - void remove(const ObjectGuid& g) + void remove(ObjectGuid const& g) { // avoid loops for performance if (guids[0] == g) @@ -427,12 +427,12 @@ namespace lfg } } - [[nodiscard]] bool hasGuid(const ObjectGuid& g) const + [[nodiscard]] bool hasGuid(ObjectGuid const& g) const { return g && (guids[0] == g || guids[1] == g || guids[2] == g || guids[3] == g || guids[4] == g); } - bool operator<(const Lfg5Guids& x) const + bool operator<(Lfg5Guids const& x) const { if (guids[0] <= x.guids[0]) { @@ -474,12 +474,12 @@ namespace lfg return false; } - bool operator==(const Lfg5Guids& x) const + bool operator==(Lfg5Guids const& x) const { return guids[0] == x.guids[0] && guids[1] == x.guids[1] && guids[2] == x.guids[2] && guids[3] == x.guids[3] && guids[4] == x.guids[4]; } - void operator=(const Lfg5Guids& x) + void operator=(Lfg5Guids const& x) { guids = x.guids; delete roles; diff --git a/src/server/game/DungeonFinding/LFGMgr.cpp b/src/server/game/DungeonFinding/LFGMgr.cpp index 6651c7a01..b823c7bcb 100644 --- a/src/server/game/DungeonFinding/LFGMgr.cpp +++ b/src/server/game/DungeonFinding/LFGMgr.cpp @@ -513,7 +513,7 @@ namespace lfg else if (ar) { // Check required items - for (const ProgressionRequirement* itemRequirement : ar->items) + for (ProgressionRequirement const* itemRequirement : ar->items) { if (!itemRequirement->checkLeaderOnly || !group || group->GetLeaderGUID() == player->GetGUID()) { @@ -529,7 +529,7 @@ namespace lfg } //Check for quests - for (const ProgressionRequirement* questRequirement : ar->quests) + for (ProgressionRequirement const* questRequirement : ar->quests) { if (!questRequirement->checkLeaderOnly || !group || group->GetLeaderGUID() == player->GetGUID()) { @@ -551,7 +551,7 @@ namespace lfg } //Check if player has the required achievements - for (const ProgressionRequirement* achievementRequirement : ar->achievements) + for (ProgressionRequirement const* achievementRequirement : ar->achievements) { if (!achievementRequirement->checkLeaderOnly || !group || group->GetLeaderGUID() == player->GetGUID()) { @@ -595,7 +595,7 @@ namespace lfg @param[in] dungeons Dungeons the player/group is applying for @param[in] comment Player selected comment */ - void LFGMgr::JoinLfg(Player* player, uint8 roles, LfgDungeonSet& dungeons, const std::string& comment) + void LFGMgr::JoinLfg(Player* player, uint8 roles, LfgDungeonSet& dungeons, std::string const& comment) { if (!player || dungeons.empty()) return; @@ -919,7 +919,7 @@ namespace lfg queue.RemoveFromQueue(gguid); uint32 dungeonId = GetDungeon(gguid); SetState(gguid, LFG_STATE_NONE); - const LfgGuidSet& players = GetPlayers(gguid); + LfgGuidSet const& players = GetPlayers(gguid); for (LfgGuidSet::const_iterator it = players.begin(); it != players.end(); ++it) { SetState(*it, LFG_STATE_NONE); @@ -1318,7 +1318,7 @@ namespace lfg } } - void LFGMgr::RBPacketAppendGroup(const RBInternalInfo& info, ByteBuffer& buffer) + void LFGMgr::RBPacketAppendGroup(RBInternalInfo const& info, ByteBuffer& buffer) { buffer << info.groupGuid; uint32 flags = LFG_UPDATE_FLAG_COMMENT | LFG_UPDATE_FLAG_ROLES | LFG_UPDATE_FLAG_BINDED; @@ -1334,7 +1334,7 @@ namespace lfg buffer << (uint32)info.encounterMask; } - void LFGMgr::RBPacketAppendPlayer(const RBInternalInfo& info, ByteBuffer& buffer) + void LFGMgr::RBPacketAppendPlayer(RBInternalInfo const& info, ByteBuffer& buffer) { buffer << info.guid; uint32 flags = LFG_UPDATE_FLAG_CHARACTERINFO | LFG_UPDATE_FLAG_ROLES | LFG_UPDATE_FLAG_COMMENT | (info.groupGuid ? LFG_UPDATE_FLAG_GROUPGUID : LFG_UPDATE_FLAG_BINDED) | (info.isGroupLeader ? LFG_UPDATE_FLAG_GROUPLEADER : 0) | (!info.groupGuid || info.isGroupLeader ? LFG_UPDATE_FLAG_AREA : 0); @@ -1467,7 +1467,7 @@ namespace lfg if (GetState(gguid) == LFG_STATE_QUEUED) { SetState(gguid, LFG_STATE_NONE); - const LfgGuidSet& players = GetPlayers(gguid); + LfgGuidSet const& players = GetPlayers(gguid); for (LfgGuidSet::const_iterator it = players.begin(); it != players.end(); ++it) { SetState(*it, LFG_STATE_NONE); @@ -2315,7 +2315,7 @@ namespace lfg @param[in] guid Group guid @param[in] dungeonId Dungeonid */ - void LFGMgr::FinishDungeon(ObjectGuid gguid, const uint32 dungeonId, const Map* currMap) + void LFGMgr::FinishDungeon(ObjectGuid gguid, const uint32 dungeonId, Map const* currMap) { uint32 gDungeonId = GetDungeon(gguid); if (gDungeonId != dungeonId) @@ -2333,7 +2333,7 @@ namespace lfg SetState(gguid, LFG_STATE_FINISHED_DUNGEON); _SaveToDB(gguid); // pussywizard - const LfgGuidSet& players = GetPlayers(gguid); + LfgGuidSet const& players = GetPlayers(gguid); for (LfgGuidSet::const_iterator it = players.begin(); it != players.end(); ++it) { ObjectGuid guid = (*it); @@ -2344,7 +2344,7 @@ namespace lfg } uint32 rDungeonId = 0; - const LfgDungeonSet& dungeons = GetSelectedDungeons(guid); + LfgDungeonSet const& dungeons = GetSelectedDungeons(guid); if (!dungeons.empty()) rDungeonId = (*dungeons.begin()); @@ -2522,7 +2522,7 @@ namespace lfg return roles; } - const std::string& LFGMgr::GetComment(ObjectGuid guid) + std::string const& LFGMgr::GetComment(ObjectGuid guid) { LOG_DEBUG("lfg", "LFGMgr::GetComment: [{}] = {}", guid.ToString(), PlayersStore[guid].GetComment()); return PlayersStore[guid].GetComment(); @@ -2692,7 +2692,7 @@ namespace lfg void LFGMgr::AddPlayerQueuedForRandomDungeonToGroup(ObjectGuid gguid, ObjectGuid guid) { - const LfgDungeonSet& dungeons = GetSelectedDungeons(guid); + LfgDungeonSet const& dungeons = GetSelectedDungeons(guid); if (dungeons.empty()) return; diff --git a/src/server/game/DungeonFinding/LFGMgr.h b/src/server/game/DungeonFinding/LFGMgr.h index 358c5802a..034e92b94 100644 --- a/src/server/game/DungeonFinding/LFGMgr.h +++ b/src/server/game/DungeonFinding/LFGMgr.h @@ -446,7 +446,7 @@ namespace lfg // World.cpp /// Finish the dungeon for the given group. All check are performed using internal lfg data - void FinishDungeon(ObjectGuid gguid, uint32 dungeonId, const Map* currMap); + void FinishDungeon(ObjectGuid gguid, uint32 dungeonId, Map const* currMap); /// Loads rewards for random dungeons void LoadRewards(); /// Loads dungeons from dbc and adds teleport coords @@ -561,8 +561,8 @@ namespace lfg void UpdateRaidBrowser(uint32 diff); void LfrSetComment(Player* p, std::string comment); void SendRaidBrowserJoinedPacket(Player* p, LfgDungeonSet& dungeons, std::string comment); - void RBPacketAppendGroup(const RBInternalInfo& info, ByteBuffer& buffer); - void RBPacketAppendPlayer(const RBInternalInfo& info, ByteBuffer& buffer); + void RBPacketAppendGroup(RBInternalInfo const& info, ByteBuffer& buffer); + void RBPacketAppendPlayer(RBInternalInfo const& info, ByteBuffer& buffer); void RBPacketBuildDifference(WorldPacket& differencePacket, uint32 dungeonId, uint32 deletedCounter, ByteBuffer const& bufferDeleted, uint32 groupCounter, ByteBuffer const& bufferGroups, uint32 playerCounter, ByteBuffer const& bufferPlayers); void RBPacketBuildFull(WorldPacket& fullPacket, uint32 dungeonId, RBInternalInfoMap const& infoMap); diff --git a/src/server/game/DungeonFinding/LFGPlayerData.cpp b/src/server/game/DungeonFinding/LFGPlayerData.cpp index 8328c22c8..e617c0abf 100644 --- a/src/server/game/DungeonFinding/LFGPlayerData.cpp +++ b/src/server/game/DungeonFinding/LFGPlayerData.cpp @@ -112,7 +112,7 @@ namespace lfg return m_OldState; } - const LfgLockMap& LfgPlayerData::GetLockedDungeons() const + LfgLockMap const& LfgPlayerData::GetLockedDungeons() const { return m_LockedDungeons; } diff --git a/src/server/game/DungeonFinding/LFGPlayerData.h b/src/server/game/DungeonFinding/LFGPlayerData.h index 94d2b0801..eb8f84855 100644 --- a/src/server/game/DungeonFinding/LFGPlayerData.h +++ b/src/server/game/DungeonFinding/LFGPlayerData.h @@ -45,7 +45,7 @@ namespace lfg // Queue void SetRoles(uint8 roles); void SetComment(std::string const& comment); - void SetSelectedDungeons(const LfgDungeonSet& dungeons); + void SetSelectedDungeons(LfgDungeonSet const& dungeons); // General [[nodiscard]] LfgState GetState() const; diff --git a/src/server/game/DungeonFinding/LFGQueue.cpp b/src/server/game/DungeonFinding/LFGQueue.cpp index b45d7a0c5..8f2ced139 100644 --- a/src/server/game/DungeonFinding/LFGQueue.cpp +++ b/src/server/game/DungeonFinding/LFGQueue.cpp @@ -194,7 +194,7 @@ namespace lfg return newGroupsProcessed; } - LfgCompatibility LFGQueue::FindNewGroups(const ObjectGuid& newGuid) + LfgCompatibility LFGQueue::FindNewGroups(ObjectGuid const& newGuid) { // each combination of dps+heal+tank (tank*8 + heal+4 + dps) has a value assigned 0..15 // first 16 bits of the mask are for marking if such combination was found once, second 16 bits for marking second occurence of that combination, etc @@ -243,7 +243,7 @@ namespace lfg return selfCompatibility; } - LfgCompatibility LFGQueue::CheckCompatibility(Lfg5Guids const& checkWith, const ObjectGuid& newGuid, uint64& foundMask, uint32& foundCount, const std::set& currentCompatibles) + LfgCompatibility LFGQueue::CheckCompatibility(Lfg5Guids const& checkWith, ObjectGuid const& newGuid, uint64& foundMask, uint32& foundCount, std::set const& currentCompatibles) { LOG_DEBUG("lfg", "CHECK CheckCompatibility: {}, new guid: {}", checkWith.toString(), newGuid.ToString()); Lfg5Guids check(checkWith, false); // here newGuid is at front @@ -315,7 +315,7 @@ namespace lfg { for (uint8 i = 0; i < 5 && check.guids[i]; ++i) { - const LfgRolesMap& roles = QueueDataStore[check.guids[i]].roles; + LfgRolesMap const& roles = QueueDataStore[check.guids[i]].roles; for (LfgRolesMap::const_iterator itRoles = roles.begin(); itRoles != roles.end(); ++itRoles) { LfgRolesMap::const_iterator itPlayer; @@ -383,7 +383,7 @@ namespace lfg else { ObjectGuid gguid = check.front(); - const LfgQueueData& queue = QueueDataStore[gguid]; + LfgQueueData const& queue = QueueDataStore[gguid]; proposalDungeons = queue.dungeons; proposalRoles = queue.roles; LFGMgr::CheckGroupRoles(proposalRoles); // assing new roles diff --git a/src/server/game/DungeonFinding/LFGQueue.h b/src/server/game/DungeonFinding/LFGQueue.h index 1ce753730..7c6183582 100644 --- a/src/server/game/DungeonFinding/LFGQueue.h +++ b/src/server/game/DungeonFinding/LFGQueue.h @@ -103,8 +103,8 @@ namespace lfg uint32 FindBestCompatibleInQueue(LfgQueueDataContainer::iterator itrQueue); void UpdateBestCompatibleInQueue(LfgQueueDataContainer::iterator itrQueue, Lfg5Guids const& key); - LfgCompatibility FindNewGroups(const ObjectGuid& newGuid); - LfgCompatibility CheckCompatibility(Lfg5Guids const& checkWith, const ObjectGuid& newGuid, uint64& foundMask, uint32& foundCount, const std::set& currentCompatibles); + LfgCompatibility FindNewGroups(ObjectGuid const& newGuid); + LfgCompatibility CheckCompatibility(Lfg5Guids const& checkWith, ObjectGuid const& newGuid, uint64& foundMask, uint32& foundCount, std::set const& currentCompatibles); // Queue uint32 m_QueueStatusTimer; // used to check interval of sending queue status diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index 58c4336e8..c2fd3c40b 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -474,7 +474,7 @@ void Creature::RemoveCorpse(bool setSpawnTime, bool skipVisibility) /** * change the entry of creature until respawn */ -bool Creature::InitEntry(uint32 Entry, const CreatureData* data) +bool Creature::InitEntry(uint32 Entry, CreatureData const* data) { CreatureTemplate const* normalInfo = sObjectMgr->GetCreatureTemplate(Entry); if (!normalInfo) @@ -578,7 +578,7 @@ bool Creature::InitEntry(uint32 Entry, const CreatureData* data) return true; } -bool Creature::UpdateEntry(uint32 Entry, const CreatureData* data, bool changelevel, bool updateAI) +bool Creature::UpdateEntry(uint32 Entry, CreatureData const* data, bool changelevel, bool updateAI) { if (!InitEntry(Entry, data)) return false; @@ -1148,7 +1148,7 @@ void Creature::Motion_Initialize() GetMotionMaster()->Initialize(); } -bool Creature::Create(ObjectGuid::LowType guidlow, Map* map, uint32 phaseMask, uint32 Entry, uint32 vehId, float x, float y, float z, float ang, const CreatureData* data) +bool Creature::Create(ObjectGuid::LowType guidlow, Map* map, uint32 phaseMask, uint32 Entry, uint32 vehId, float x, float y, float z, float ang, CreatureData const* data) { ASSERT(map); SetMap(map); @@ -1612,7 +1612,7 @@ float Creature::GetSpellDamageMod(int32 Rank) } } -bool Creature::CreateFromProto(ObjectGuid::LowType guidlow, uint32 Entry, uint32 vehId, const CreatureData* data) +bool Creature::CreateFromProto(ObjectGuid::LowType guidlow, uint32 Entry, uint32 vehId, CreatureData const* data) { SetZoneScript(); if (GetZoneScript() && data) diff --git a/src/server/game/Entities/Creature/Creature.h b/src/server/game/Entities/Creature/Creature.h index 6b14d82f2..a26e257a8 100644 --- a/src/server/game/Entities/Creature/Creature.h +++ b/src/server/game/Entities/Creature/Creature.h @@ -61,7 +61,7 @@ public: [[nodiscard]] bool isVendorWithIconSpeak() const; - bool Create(ObjectGuid::LowType guidlow, Map* map, uint32 phaseMask, uint32 Entry, uint32 vehId, float x, float y, float z, float ang, const CreatureData* data = nullptr); + bool Create(ObjectGuid::LowType guidlow, Map* map, uint32 phaseMask, uint32 Entry, uint32 vehId, float x, float y, float z, float ang, CreatureData const* data = nullptr); bool LoadCreaturesAddon(bool reload = false); void SelectLevel(bool changelevel = true); void LoadEquipment(int8 id = 1, bool force = false); @@ -175,7 +175,7 @@ public: void UpdateMovementFlags(); uint32 GetRandomId(uint32 id1, uint32 id2, uint32 id3); - bool UpdateEntry(uint32 entry, const CreatureData* data = nullptr, bool changelevel = true, bool updateAI = false); + bool UpdateEntry(uint32 entry, CreatureData const* data = nullptr, bool changelevel = true, bool updateAI = false); bool UpdateEntry(uint32 entry, bool updateAI) { return UpdateEntry(entry, nullptr, true, updateAI); } bool UpdateStats(Stats stat) override; bool UpdateAllStats() override; @@ -342,15 +342,15 @@ public: [[nodiscard]] bool IsNotReachableAndNeedRegen() const; void SetPosition(float x, float y, float z, float o); - void SetPosition(const Position& pos) { SetPosition(pos.GetPositionX(), pos.GetPositionY(), pos.GetPositionZ(), pos.GetOrientation()); } + void SetPosition(Position const& pos) { SetPosition(pos.GetPositionX(), pos.GetPositionY(), pos.GetPositionZ(), pos.GetOrientation()); } void SetHomePosition(float x, float y, float z, float o) { m_homePosition.Relocate(x, y, z, o); } - void SetHomePosition(const Position& pos) { m_homePosition.Relocate(pos); } + void SetHomePosition(Position const& pos) { m_homePosition.Relocate(pos); } void GetHomePosition(float& x, float& y, float& z, float& ori) const { m_homePosition.GetPosition(x, y, z, ori); } [[nodiscard]] Position const& GetHomePosition() const { return m_homePosition; } void SetTransportHomePosition(float x, float y, float z, float o) { m_transportHomePosition.Relocate(x, y, z, o); } - void SetTransportHomePosition(const Position& pos) { m_transportHomePosition.Relocate(pos); } + void SetTransportHomePosition(Position const& pos) { m_transportHomePosition.Relocate(pos); } void GetTransportHomePosition(float& x, float& y, float& z, float& ori) const { m_transportHomePosition.GetPosition(x, y, z, ori); } [[nodiscard]] Position const& GetTransportHomePosition() const { return m_transportHomePosition; } @@ -460,8 +460,8 @@ public: bool IsUpdateNeeded() override; protected: - bool CreateFromProto(ObjectGuid::LowType guidlow, uint32 Entry, uint32 vehId, const CreatureData* data = nullptr); - bool InitEntry(uint32 entry, const CreatureData* data = nullptr); + bool CreateFromProto(ObjectGuid::LowType guidlow, uint32 Entry, uint32 vehId, CreatureData const* data = nullptr); + bool InitEntry(uint32 entry, CreatureData const* data = nullptr); // vendor items VendorItemCounts m_vendorItemCounts; diff --git a/src/server/game/Entities/Creature/CreatureGroups.h b/src/server/game/Entities/Creature/CreatureGroups.h index a397a5b3c..5ce935319 100644 --- a/src/server/game/Entities/Creature/CreatureGroups.h +++ b/src/server/game/Entities/Creature/CreatureGroups.h @@ -102,7 +102,7 @@ public: bool IsEmpty() const { return m_members.empty(); } bool IsFormed() const { return m_Formed; } - const CreatureGroupMemberType& GetMembers() const { return m_members; } + CreatureGroupMemberType const& GetMembers() const { return m_members; } void AddMember(Creature* member); void RemoveMember(Creature* member); diff --git a/src/server/game/Entities/Creature/TemporarySummon.h b/src/server/game/Entities/Creature/TemporarySummon.h index 740779162..ed5947140 100644 --- a/src/server/game/Entities/Creature/TemporarySummon.h +++ b/src/server/game/Entities/Creature/TemporarySummon.h @@ -71,7 +71,7 @@ public: void SetVisibleBySummonerOnly(bool visibleBySummonerOnly) { _visibleBySummonerOnly = visibleBySummonerOnly; } [[nodiscard]] bool IsVisibleBySummonerOnly() const { return _visibleBySummonerOnly; } - const SummonPropertiesEntry* const m_Properties; + SummonPropertiesEntry const* const m_Properties; std::string GetDebugInfo() const override; diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp index 955bd32cb..ff5984b1f 100644 --- a/src/server/game/Entities/GameObject/GameObject.cpp +++ b/src/server/game/Entities/GameObject/GameObject.cpp @@ -1031,7 +1031,7 @@ void GameObject::SaveToDB(bool saveAddon /*= false*/) void GameObject::SaveToDB(uint32 mapid, uint8 spawnMask, uint32 phaseMask, bool saveAddon /*= false*/) { - const GameObjectTemplate* goI = GetGOInfo(); + GameObjectTemplate const* goI = GetGOInfo(); if (!goI) return; @@ -1431,7 +1431,7 @@ void GameObject::SetGoArtKit(uint8 kit) void GameObject::SetGoArtKit(uint8 artkit, GameObject* go, ObjectGuid::LowType lowguid) { - const GameObjectData* data = nullptr; + GameObjectData const* data = nullptr; if (go) { go->SetGoArtKit(artkit); @@ -2815,7 +2815,7 @@ void GameObject::BuildValuesUpdate(uint8 updateType, ByteBuffer* data, Player* t dynFlags |= GO_DYNFLAG_LO_SPARKLE; break; case GAMEOBJECT_TYPE_TRANSPORT: - if (const StaticTransport* t = ToStaticTransport()) + if (StaticTransport const* t = ToStaticTransport()) if (t->GetPauseTime()) { if (GetGoState() == GO_STATE_READY) @@ -2832,7 +2832,7 @@ void GameObject::BuildValuesUpdate(uint8 updateType, ByteBuffer* data, Player* t // else it's ignored break; case GAMEOBJECT_TYPE_MO_TRANSPORT: - if (const MotionTransport* t = ToMotionTransport()) + if (MotionTransport const* t = ToMotionTransport()) pathProgress = int16(float(t->GetPathProgress()) / float(t->GetPeriod()) * 65535.0f); break; default: diff --git a/src/server/game/Entities/GameObject/GameObject.h b/src/server/game/Entities/GameObject/GameObject.h index 3cae54de9..98bde1ac6 100644 --- a/src/server/game/Entities/GameObject/GameObject.h +++ b/src/server/game/Entities/GameObject/GameObject.h @@ -314,7 +314,7 @@ public: void GetRespawnPosition(float& x, float& y, float& z, float* ori = nullptr) const; void SetPosition(float x, float y, float z, float o); - void SetPosition(const Position& pos) { SetPosition(pos.GetPositionX(), pos.GetPositionY(), pos.GetPositionZ(), pos.GetOrientation()); } + void SetPosition(Position const& pos) { SetPosition(pos.GetPositionX(), pos.GetPositionY(), pos.GetPositionZ(), pos.GetOrientation()); } [[nodiscard]] bool IsStaticTransport() const { return GetGOInfo()->type == GAMEOBJECT_TYPE_TRANSPORT; } [[nodiscard]] bool IsMotionTransport() const { return GetGOInfo()->type == GAMEOBJECT_TYPE_MO_TRANSPORT; } diff --git a/src/server/game/Entities/Item/Item.h b/src/server/game/Entities/Item/Item.h index 51289594b..572467aa2 100644 --- a/src/server/game/Entities/Item/Item.h +++ b/src/server/game/Entities/Item/Item.h @@ -248,7 +248,7 @@ public: void DeleteRefundDataFromDB(CharacterDatabaseTransaction* trans); Bag* ToBag() { if (IsBag()) return reinterpret_cast(this); else return nullptr; } - [[nodiscard]] const Bag* ToBag() const { if (IsBag()) return reinterpret_cast(this); else return nullptr; } + [[nodiscard]] Bag const* ToBag() const { if (IsBag()) return reinterpret_cast(this); else return nullptr; } [[nodiscard]] bool IsLocked() const { return !HasFlag(ITEM_FIELD_FLAGS, ITEM_FIELD_FLAG_UNLOCKED); } [[nodiscard]] bool IsBag() const { return GetTemplate()->InventoryType == INVTYPE_BAG; } diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp index 7ff045e0b..abbae3d26 100644 --- a/src/server/game/Entities/Object/Object.cpp +++ b/src/server/game/Entities/Object/Object.cpp @@ -1298,7 +1298,7 @@ float WorldObject::GetDistance(WorldObject const* obj) const return d > 0.0f ? d : 0.0f; } -[[nodiscard]] float WorldObject::GetDistance(const Position& pos) const +[[nodiscard]] float WorldObject::GetDistance(Position const& pos) const { float d = GetExactDist(&pos) - GetObjectSize(); return d > 0.0f ? d : 0.0f; @@ -1347,7 +1347,7 @@ bool WorldObject::IsInMap(WorldObject const* obj) const return IsInDist(x, y, z, dist + GetObjectSize()); } -bool WorldObject::IsWithinDist3d(const Position* pos, float dist) const +bool WorldObject::IsWithinDist3d(Position const* pos, float dist) const { return IsInDist(pos, dist + GetObjectSize()); } @@ -1357,7 +1357,7 @@ bool WorldObject::IsWithinDist3d(const Position* pos, float dist) const return IsInDist2d(x, y, dist + GetObjectSize()); } -bool WorldObject::IsWithinDist2d(const Position* pos, float dist) const +bool WorldObject::IsWithinDist2d(Position const* pos, float dist) const { return IsInDist2d(pos, dist + GetObjectSize()); } @@ -1555,7 +1555,7 @@ bool WorldObject::isInBack(WorldObject const* target, float arc) const return !HasInArc(2 * M_PI - arc, target); } -void WorldObject::GetRandomPoint(const Position& pos, float distance, float& rand_x, float& rand_y, float& rand_z) const +void WorldObject::GetRandomPoint(Position const& pos, float distance, float& rand_x, float& rand_y, float& rand_z) const { if (!distance) { @@ -1576,7 +1576,7 @@ void WorldObject::GetRandomPoint(const Position& pos, float distance, float& ran UpdateGroundPositionZ(rand_x, rand_y, rand_z); // update to LOS height if available } -Position WorldObject::GetRandomPoint(const Position& srcPos, float distance) const +Position WorldObject::GetRandomPoint(Position const& srcPos, float distance) const { float x, y, z; GetRandomPoint(srcPos, distance, x, y, z); @@ -2441,7 +2441,7 @@ void WorldObject::ClearZoneScript() m_zoneScript = nullptr; } -TempSummon* WorldObject::SummonCreature(uint32 entry, const Position& pos, TempSummonType spwtype, uint32 duration, uint32 /*vehId*/, SummonPropertiesEntry const* properties, bool visibleBySummonerOnly /*= false*/) const +TempSummon* WorldObject::SummonCreature(uint32 entry, Position const& pos, TempSummonType spwtype, uint32 duration, uint32 /*vehId*/, SummonPropertiesEntry const* properties, bool visibleBySummonerOnly /*= false*/) const { if (Map* map = FindMap()) { diff --git a/src/server/game/Entities/Object/Object.h b/src/server/game/Entities/Object/Object.h index 454537353..8d57e1d0d 100644 --- a/src/server/game/Entities/Object/Object.h +++ b/src/server/game/Entities/Object/Object.h @@ -280,7 +280,7 @@ private: // for output helpfull error messages from asserts [[nodiscard]] bool PrintIndexError(uint32 index, bool set) const; - Object(const Object&); // prevent generation copy constructor + Object(Object const&); // prevent generation copy constructor Object& operator=(Object const&); // prevent generation assigment operator }; @@ -507,8 +507,8 @@ public: void UpdateGroundPositionZ(float x, float y, float& z) const; void UpdateAllowedPositionZ(float x, float y, float& z, float* groundZ = nullptr) const; - void GetRandomPoint(const Position& srcPos, float distance, float& rand_x, float& rand_y, float& rand_z) const; - [[nodiscard]] Position GetRandomPoint(const Position& srcPos, float distance) const; + void GetRandomPoint(Position const& srcPos, float distance, float& rand_x, float& rand_y, float& rand_z) const; + [[nodiscard]] Position GetRandomPoint(Position const& srcPos, float distance) const; [[nodiscard]] uint32 GetInstanceId() const { return m_InstanceId; } @@ -531,7 +531,7 @@ public: [[nodiscard]] virtual std::string const& GetNameForLocaleIdx(LocaleConstant /*locale_idx*/) const { return m_name; } float GetDistance(WorldObject const* obj) const; - [[nodiscard]] float GetDistance(const Position& pos) const; + [[nodiscard]] float GetDistance(Position const& pos) const; [[nodiscard]] float GetDistance(float x, float y, float z) const; float GetDistance2d(WorldObject const* obj) const; [[nodiscard]] float GetDistance2d(float x, float y) const; @@ -540,9 +540,9 @@ public: bool IsSelfOrInSameMap(WorldObject const* obj) const; bool IsInMap(WorldObject const* obj) const; [[nodiscard]] bool IsWithinDist3d(float x, float y, float z, float dist) const; - bool IsWithinDist3d(const Position* pos, float dist) const; + bool IsWithinDist3d(Position const* pos, float dist) const; [[nodiscard]] bool IsWithinDist2d(float x, float y, float dist) const; - bool IsWithinDist2d(const Position* pos, float dist) const; + bool IsWithinDist2d(Position const* pos, float dist) const; virtual bool IsWithinSightRange(Position const& pos, float dist) const; // use only if you will sure about placing both object at same map bool IsWithinDist(WorldObject const* obj, float dist2compare, bool is3D = true, bool incOwnRadius = true, bool incTargetRadius = true) const; @@ -635,7 +635,7 @@ public: void ClearZoneScript(); [[nodiscard]] ZoneScript* GetZoneScript() const { return m_zoneScript; } - TempSummon* SummonCreature(uint32 id, const Position& pos, TempSummonType spwtype = TEMPSUMMON_MANUAL_DESPAWN, uint32 despwtime = 0, uint32 vehId = 0, SummonPropertiesEntry const* properties = nullptr, bool visibleBySummonerOnly = false) const; + TempSummon* SummonCreature(uint32 id, Position const& pos, TempSummonType spwtype = TEMPSUMMON_MANUAL_DESPAWN, uint32 despwtime = 0, uint32 vehId = 0, SummonPropertiesEntry const* properties = nullptr, bool visibleBySummonerOnly = false) const; TempSummon* SummonCreature(uint32 id, float x, float y, float z, float ang = 0, TempSummonType spwtype = TEMPSUMMON_MANUAL_DESPAWN, uint32 despwtime = 0, SummonPropertiesEntry const* properties = nullptr, bool visibleBySummonerOnly = false); GameObject* SummonGameObject(uint32 entry, float x, float y, float z, float ang, float rotation0, float rotation1, float rotation2, float rotation3, uint32 respawnTime, bool checkTransport = true, GOSummonType summonType = GO_SUMMON_TIMED_OR_CORPSE_DESPAWN); Creature* SummonTrigger(float x, float y, float z, float ang, uint32 dur, bool setLevel = false, CreatureAI * (*GetAI)(Creature*) = nullptr); diff --git a/src/server/game/Entities/Object/Position.cpp b/src/server/game/Entities/Object/Position.cpp index 77f17ea54..5bf65e5e7 100644 --- a/src/server/game/Entities/Object/Position.cpp +++ b/src/server/game/Entities/Object/Position.cpp @@ -63,7 +63,7 @@ std::string Position::ToString() const return sstr.str(); } -void Position::RelocateOffset(const Position& offset) +void Position::RelocateOffset(Position const& offset) { m_positionX = GetPositionX() + (offset.GetPositionX() * std::cos(GetOrientation()) + offset.GetPositionY() * std::sin(GetOrientation() + M_PI)); m_positionY = GetPositionY() + (offset.GetPositionY() * std::cos(GetOrientation()) + offset.GetPositionX() * std::sin(GetOrientation())); @@ -71,7 +71,7 @@ void Position::RelocateOffset(const Position& offset) m_orientation = GetOrientation() + offset.GetOrientation(); } -void Position::GetPositionOffsetTo(const Position& endPos, Position& retOffset) const +void Position::GetPositionOffsetTo(Position const& endPos, Position& retOffset) const { float dx = endPos.GetPositionX() - GetPositionX(); float dy = endPos.GetPositionY() - GetPositionY(); @@ -82,7 +82,7 @@ void Position::GetPositionOffsetTo(const Position& endPos, Position& retOffset) retOffset.m_orientation = endPos.GetOrientation() - GetOrientation(); } -float Position::GetAngle(const Position* obj) const +float Position::GetAngle(Position const* obj) const { if (!obj) return 0; @@ -115,7 +115,7 @@ void Position::GetSinCos(const float x, const float y, float& vsin, float& vcos) } } -bool Position::IsWithinBox(const Position& center, float xradius, float yradius, float zradius) const +bool Position::IsWithinBox(Position const& center, float xradius, float yradius, float zradius) const { // rotate the WorldObject position instead of rotating the whole cube, that way we can make a simplified // is-in-cube check and we have to calculate only one point instead of 4 @@ -145,7 +145,7 @@ bool Position::IsWithinBox(const Position& center, float xradius, float yradius, return true; } -bool Position::HasInArc(float arc, const Position* obj, float targetRadius) const +bool Position::HasInArc(float arc, Position const* obj, float targetRadius) const { // always have self in arc if (obj == this) diff --git a/src/server/game/Entities/Object/Position.h b/src/server/game/Entities/Object/Position.h index 8ffb41928..f1e0cfab6 100644 --- a/src/server/game/Entities/Object/Position.h +++ b/src/server/game/Entities/Object/Position.h @@ -31,7 +31,7 @@ struct Position Position(Position const& loc) { Relocate(loc); } /* requried as of C++ 11 */ Position(Position&&) = default; - Position& operator=(const Position&) = default; + Position& operator=(Position const&) = default; Position& operator=(Position&&) = default; struct PositionXYStreamer @@ -95,7 +95,7 @@ struct Position m_orientation = orientation; } - void Relocate(const Position& pos) + void Relocate(Position const& pos) { m_positionX = pos.m_positionX; m_positionY = pos.m_positionY; @@ -103,7 +103,7 @@ struct Position m_orientation = pos.m_orientation; } - void Relocate(const Position* pos) + void Relocate(Position const* pos) { m_positionX = pos->m_positionX; m_positionY = pos->m_positionY; @@ -112,7 +112,7 @@ struct Position } void RelocatePolarOffset(float angle, float dist, float z = 0.0f); - void RelocateOffset(const Position& offset); + void RelocateOffset(Position const& offset); void SetOrientation(float orientation) { m_orientation = orientation; @@ -183,10 +183,10 @@ struct Position [[nodiscard]] float GetExactDist(Position const& pos) const { return GetExactDist(pos.m_positionX, pos.m_positionY, pos.m_positionZ); } float GetExactDist(Position const* pos) const { return GetExactDist(*pos); } - void GetPositionOffsetTo(const Position& endPos, Position& retOffset) const; + void GetPositionOffsetTo(Position const& endPos, Position& retOffset) const; [[nodiscard]] Position GetPositionWithOffset(Position const& offset) const; - float GetAngle(const Position* pos) const; + float GetAngle(Position const* pos) const; [[nodiscard]] float GetAngle(float x, float y) const; [[nodiscard]] float GetAbsoluteAngle(float x, float y) const { @@ -198,7 +198,7 @@ struct Position [[nodiscard]] float GetAbsoluteAngle(Position const& pos) const { return GetAbsoluteAngle(pos.m_positionX, pos.m_positionY); } [[nodiscard]] float GetAbsoluteAngle(Position const* pos) const { return GetAbsoluteAngle(*pos); } - float GetRelativeAngle(const Position* pos) const + float GetRelativeAngle(Position const* pos) const { return NormalizeOrientation(GetAngle(pos) - m_orientation); } @@ -213,7 +213,7 @@ struct Position return GetExactDist2dSq(x, y) < dist * dist; } - bool IsInDist2d(const Position* pos, float dist) const + bool IsInDist2d(Position const* pos, float dist) const { return GetExactDist2dSq(pos) < dist * dist; } @@ -223,13 +223,13 @@ struct Position return GetExactDistSq(x, y, z) < dist * dist; } - bool IsInDist(const Position* pos, float dist) const + bool IsInDist(Position const* pos, float dist) const { return GetExactDistSq(pos) < dist * dist; } - [[nodiscard]] bool IsWithinBox(const Position& center, float xradius, float yradius, float zradius) const; - bool HasInArc(float arcangle, const Position* pos, float targetRadius = 0.0f) const; + [[nodiscard]] bool IsWithinBox(Position const& center, float xradius, float yradius, float zradius) const; + bool HasInArc(float arcangle, Position const* pos, float targetRadius = 0.0f) const; bool HasInLine(Position const* pos, float width) const; bool HasInLine(Position const* pos, float objSize, float width) const; [[nodiscard]] std::string ToString() const; @@ -261,7 +261,7 @@ public: WorldLocation(uint32 mapId, Position const& position) : Position(position), m_mapId(mapId) { } - void WorldRelocate(const WorldLocation& loc) + void WorldRelocate(WorldLocation const& loc) { m_mapId = loc.GetMapId(); Relocate(loc); diff --git a/src/server/game/Entities/Object/Updates/UpdateData.cpp b/src/server/game/Entities/Object/Updates/UpdateData.cpp index 361d50d4a..55ccb7c55 100644 --- a/src/server/game/Entities/Object/Updates/UpdateData.cpp +++ b/src/server/game/Entities/Object/Updates/UpdateData.cpp @@ -33,13 +33,13 @@ void UpdateData::AddOutOfRangeGUID(ObjectGuid guid) m_outOfRangeGUIDs.push_back(guid); } -void UpdateData::AddUpdateBlock(const ByteBuffer& block) +void UpdateData::AddUpdateBlock(ByteBuffer const& block) { m_data.append(block); ++m_blockCount; } -void UpdateData::AddUpdateBlock(const UpdateData& block) +void UpdateData::AddUpdateBlock(UpdateData const& block) { m_data.append(block.m_data); m_blockCount += block.m_blockCount; diff --git a/src/server/game/Entities/Object/Updates/UpdateData.h b/src/server/game/Entities/Object/Updates/UpdateData.h index dbf54b720..7d4471eab 100644 --- a/src/server/game/Entities/Object/Updates/UpdateData.h +++ b/src/server/game/Entities/Object/Updates/UpdateData.h @@ -54,8 +54,8 @@ public: UpdateData(); void AddOutOfRangeGUID(ObjectGuid guid); - void AddUpdateBlock(const ByteBuffer& block); - void AddUpdateBlock(const UpdateData& block); + void AddUpdateBlock(ByteBuffer const& block); + void AddUpdateBlock(UpdateData const& block); bool BuildPacket(WorldPacket& packet); [[nodiscard]] bool HasData() const { return m_blockCount > 0 || !m_outOfRangeGUIDs.empty(); } void Clear(); diff --git a/src/server/game/Entities/Player/KillRewarder.cpp b/src/server/game/Entities/Player/KillRewarder.cpp index 5a32ec4b0..c84037953 100644 --- a/src/server/game/Entities/Player/KillRewarder.cpp +++ b/src/server/game/Entities/Player/KillRewarder.cpp @@ -134,7 +134,7 @@ void KillRewarder::_InitXP(Player* player) if (_xp && !_isBattleGround && _victim) // pussywizard: npcs with relatively low hp give lower exp if (_victim->IsCreature()) - if (const CreatureTemplate* ct = _victim->ToCreature()->GetCreatureTemplate()) + if (CreatureTemplate const* ct = _victim->ToCreature()->GetCreatureTemplate()) if (ct->ModHealth <= 0.75f && ct->ModHealth >= 0.0f) _xp = uint32(_xp * ct->ModHealth); } diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 47d095b17..49ab2e722 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -2325,7 +2325,7 @@ void Player::UninviteFromGroup() } } -void Player::RemoveFromGroup(Group* group, ObjectGuid guid, RemoveMethod method /* = GROUP_REMOVEMETHOD_DEFAULT*/, ObjectGuid kicker /* = ObjectGuid::Empty */, const char* reason /* = nullptr */) +void Player::RemoveFromGroup(Group* group, ObjectGuid guid, RemoveMethod method /* = GROUP_REMOVEMETHOD_DEFAULT*/, ObjectGuid kicker /* = ObjectGuid::Empty */, char const* reason /* = nullptr */) { if (group) { @@ -11397,7 +11397,7 @@ void Player::SetEntryPoint() if (GetMap()->IsDungeon()) { - if (const GraveyardStruct* entry = sGraveyard->GetClosestGraveyard(this, GetTeamId())) + if (GraveyardStruct const* entry = sGraveyard->GetClosestGraveyard(this, GetTeamId())) m_entryPointData.joinPos = WorldLocation(entry->Map, entry->x, entry->y, entry->z, 0.0f); } else if (!GetMap()->IsBattlegroundOrArena()) @@ -14259,7 +14259,7 @@ void Player::LearnTalent(uint32 talentId, uint32 talentRank, bool command /*= fa uint32 spentPoints = 0; if (talentInfo->Row > 0) { - const PlayerTalentMap& talentMap = GetTalentMap(); + PlayerTalentMap const& talentMap = GetTalentMap(); for (PlayerTalentMap::const_iterator itr = talentMap.begin(); itr != talentMap.end(); ++itr) if (TalentSpellPos const* talentPos = GetTalentSpellPos(itr->first)) if (TalentEntry const* itrTalentInfo = sTalentStore.LookupEntry(talentPos->talent_id)) @@ -14401,7 +14401,7 @@ void Player::LearnPetTalent(ObjectGuid petGuid, uint32 talentId, uint32 talentRa for (uint32 i = 0; i < numRows; ++i) // Loop through all talents. { // Someday, someone needs to revamp - const TalentEntry* tmpTalent = sTalentStore.LookupEntry(i); + TalentEntry const* tmpTalent = sTalentStore.LookupEntry(i); if (tmpTalent) // the way talents are tracked { if (tmpTalent->TalentTab == tTab) @@ -14655,7 +14655,7 @@ void Player::BuildPlayerTalentsInfoData(WorldPacket* data) std::size_t pos = data->wpos(); *data << uint8(talentIdCount); // [PH], talentIdCount - const PlayerTalentMap& talentMap = GetTalentMap(); + PlayerTalentMap const& talentMap = GetTalentMap(); for (PlayerTalentMap::const_iterator itr = talentMap.begin(); itr != talentMap.end(); ++itr) if (TalentSpellPos const* talentPos = GetTalentSpellPos(itr->first)) if (itr->second->State != PLAYERSPELL_REMOVED && itr->second->IsInSpec(specIdx)) // pussywizard @@ -15616,7 +15616,7 @@ void Player::LoadActions(PreparedQueryResult result) void Player::GetTalentTreePoints(uint8 (&specPoints)[3]) const { - const PlayerTalentMap& talentMap = GetTalentMap(); + PlayerTalentMap const& talentMap = GetTalentMap(); for (PlayerTalentMap::const_iterator itr = talentMap.begin(); itr != talentMap.end(); ++itr) if (itr->second->State != PLAYERSPELL_REMOVED && itr->second->IsInSpec(GetActiveSpec())) if (TalentEntry const* talentInfo = sTalentStore.LookupEntry(itr->second->talentID)) @@ -15638,7 +15638,7 @@ void Player::GetTalentTreePoints(uint8 (&specPoints)[3]) const uint8 Player::GetMostPointsTalentTree() const { uint32 specPoints[3] = {0, 0, 0}; - const PlayerTalentMap& talentMap = GetTalentMap(); + PlayerTalentMap const& talentMap = GetTalentMap(); for (PlayerTalentMap::const_iterator itr = talentMap.begin(); itr != talentMap.end(); ++itr) if (itr->second->State != PLAYERSPELL_REMOVED && itr->second->IsInSpec(GetActiveSpec())) if (TalentEntry const* talentInfo = sTalentStore.LookupEntry(itr->second->talentID)) diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h index 140fee652..c4da190fb 100644 --- a/src/server/game/Entities/Player/Player.h +++ b/src/server/game/Entities/Player/Player.h @@ -1453,7 +1453,7 @@ public: bool CanSeeStartQuest(Quest const* quest); bool CanTakeQuest(Quest const* quest, bool msg); bool CanAddQuest(Quest const* quest, bool msg); - bool CanCompleteQuest(uint32 quest_id, const QuestStatusData* q_savedStatus = nullptr); + bool CanCompleteQuest(uint32 quest_id, QuestStatusData const* q_savedStatus = nullptr); bool CanCompleteRepeatableQuest(Quest const* quest); bool CanRewardQuest(Quest const* quest, bool msg); bool CanRewardQuest(Quest const* quest, uint32 reward, bool msg); @@ -1911,7 +1911,7 @@ public: bool IsInSameGroupWith(Player const* p) const; bool IsInSameRaidWith(Player const* p) const { return p == this || (GetGroup() != nullptr && GetGroup() == p->GetGroup()); } void UninviteFromGroup(); - static void RemoveFromGroup(Group* group, ObjectGuid guid, RemoveMethod method = GROUP_REMOVEMETHOD_DEFAULT, ObjectGuid kicker = ObjectGuid::Empty, const char* reason = nullptr); + static void RemoveFromGroup(Group* group, ObjectGuid guid, RemoveMethod method = GROUP_REMOVEMETHOD_DEFAULT, ObjectGuid kicker = ObjectGuid::Empty, char const* reason = nullptr); void RemoveFromGroup(RemoveMethod method = GROUP_REMOVEMETHOD_DEFAULT) { RemoveFromGroup(GetGroup(), GetGUID(), method); } void SendUpdateToOutOfRangeGroupMembers(); @@ -2050,7 +2050,7 @@ public: void SendResetFailedNotify(uint32 mapid); bool UpdatePosition(float x, float y, float z, float orientation, bool teleport = false) override; - bool UpdatePosition(const Position& pos, bool teleport = false) { return UpdatePosition(pos.GetPositionX(), pos.GetPositionY(), pos.GetPositionZ(), pos.GetOrientation(), teleport); } + bool UpdatePosition(Position const& pos, bool teleport = false) { return UpdatePosition(pos.GetPositionX(), pos.GetPositionY(), pos.GetPositionZ(), pos.GetOrientation(), teleport); } void ProcessTerrainStatusUpdate() override; @@ -2487,9 +2487,9 @@ public: [[nodiscard]] uint32 GetPendingBind() const { return _pendingBindId; } void SendRaidInfo(); void SendSavedInstances(); - void PrettyPrintRequirementsQuestList(const std::vector& missingQuests) const; - void PrettyPrintRequirementsAchievementsList(const std::vector& missingAchievements) const; - void PrettyPrintRequirementsItemsList(const std::vector& missingItems) const; + void PrettyPrintRequirementsQuestList(std::vector const& missingQuests) const; + void PrettyPrintRequirementsAchievementsList(std::vector const& missingAchievements) const; + void PrettyPrintRequirementsItemsList(std::vector const& missingItems) const; bool Satisfy(DungeonProgressionRequirements const* ar, uint32 target_map, bool report = false); bool CheckInstanceLoginValid(); [[nodiscard]] bool CheckInstanceCount(uint32 instanceId) const; @@ -2513,7 +2513,7 @@ public: Group* GetGroupInvite() { return m_groupInvite; } void SetGroupInvite(Group* group) { m_groupInvite = group; } Group* GetGroup() { return m_group.getTarget(); } - [[nodiscard]] const Group* GetGroup() const { return (const Group*)m_group.getTarget(); } + [[nodiscard]] Group const* GetGroup() const { return (Group const*)m_group.getTarget(); } GroupReference& GetGroupRef() { return m_group; } void SetGroup(Group* group, int8 subgroup = -1); [[nodiscard]] uint8 GetSubGroup() const { return m_group.getSubGroup(); } @@ -2654,7 +2654,7 @@ public: [[nodiscard]] float GetRealParry() const { return m_realParry; } [[nodiscard]] float GetRealDodge() const { return m_realDodge; } // mt maps - [[nodiscard]] const PlayerTalentMap& GetTalentMap() const { return m_talents; } + [[nodiscard]] PlayerTalentMap const& GetTalentMap() const { return m_talents; } [[nodiscard]] uint32 GetNextSave() const { return m_nextSave; } [[nodiscard]] SpellModContainer const& GetSpellModList(uint32 type) const { return m_spellMods[type]; } @@ -2698,7 +2698,7 @@ protected: public: std::deque SpellQueue; - const PendingSpellCastRequest* GetCastRequest(uint32 category) const; + PendingSpellCastRequest const* GetCastRequest(uint32 category) const; bool CanExecutePendingSpellCastRequest(SpellInfo const* spellInfo); void ExecuteOrCancelSpellCastRequest(PendingSpellCastRequest* castRequest, bool isCancel = false); bool CanRequestSpellCast(SpellInfo const* spellInfo); diff --git a/src/server/game/Entities/Player/PlayerQuest.cpp b/src/server/game/Entities/Player/PlayerQuest.cpp index 57735685e..58476621b 100644 --- a/src/server/game/Entities/Player/PlayerQuest.cpp +++ b/src/server/game/Entities/Player/PlayerQuest.cpp @@ -288,7 +288,7 @@ bool Player::CanAddQuest(Quest const* quest, bool msg) return true; } -bool Player::CanCompleteQuest(uint32 quest_id, const QuestStatusData* q_savedStatus) +bool Player::CanCompleteQuest(uint32 quest_id, QuestStatusData const* q_savedStatus) { if (quest_id) { @@ -2442,7 +2442,7 @@ void Player::SendCanTakeQuestResponse(QuestFailedReason msg) const LOG_DEBUG("network", "WORLD: Sent SMSG_QUESTGIVER_QUEST_INVALID"); } -void Player::SendQuestConfirmAccept(const Quest* quest, Player* pReceiver) +void Player::SendQuestConfirmAccept(Quest const* quest, Player* pReceiver) { if (pReceiver) { @@ -2451,7 +2451,7 @@ void Player::SendQuestConfirmAccept(const Quest* quest, Player* pReceiver) int loc_idx = pReceiver->GetSession()->GetSessionDbLocaleIndex(); if (loc_idx >= 0) - if (const QuestLocale* pLocale = sObjectMgr->GetQuestLocale(quest->GetQuestId())) + if (QuestLocale const* pLocale = sObjectMgr->GetQuestLocale(quest->GetQuestId())) ObjectMgr::GetLocaleString(pLocale->Title, loc_idx, strTitle); WorldPackets::Quest::QuestConfirmAccept questConfirmAccept; diff --git a/src/server/game/Entities/Player/PlayerStorage.cpp b/src/server/game/Entities/Player/PlayerStorage.cpp index 308f502a7..2c4ddf10c 100644 --- a/src/server/game/Entities/Player/PlayerStorage.cpp +++ b/src/server/game/Entities/Player/PlayerStorage.cpp @@ -5211,7 +5211,7 @@ bool Player::LoadFromDB(ObjectGuid playerGuid, CharacterDatabaseQueryHolder cons ResurrectPlayer(1.0f); } - const WorldLocation& _loc = GetEntryPoint(); + WorldLocation const& _loc = GetEntryPoint(); mapId = _loc.GetMapId(); instanceId = 0; @@ -5703,7 +5703,7 @@ bool Player::isAllowedToLoot(Creature const* creature) if (HasPendingBind()) return false; - const Loot* loot = &creature->loot; + Loot const* loot = &creature->loot; if (loot->isLooted()) // nothing to loot or everything looted. return false; @@ -6706,10 +6706,10 @@ void Player::SendSavedInstances() } } -void Player::PrettyPrintRequirementsQuestList(const std::vector& missingQuests) const +void Player::PrettyPrintRequirementsQuestList(std::vector const& missingQuests) const { LocaleConstant loc_idx = GetSession()->GetSessionDbLocaleIndex(); - for (const ProgressionRequirement* missingReq : missingQuests) + for (ProgressionRequirement const* missingReq : missingQuests) { Quest const* questTemplate = sObjectMgr->GetQuestTemplate(missingReq->id); if (!questTemplate) @@ -6743,10 +6743,10 @@ void Player::PrettyPrintRequirementsQuestList(const std::vector& missingAchievements) const +void Player::PrettyPrintRequirementsAchievementsList(std::vector const& missingAchievements) const { LocaleConstant loc_idx = GetSession()->GetSessionDbLocaleIndex(); - for (const ProgressionRequirement* missingReq : missingAchievements) + for (ProgressionRequirement const* missingReq : missingAchievements) { AchievementEntry const* achievementEntry = sAchievementStore.LookupEntry(missingReq->id); if (!achievementEntry) @@ -6776,10 +6776,10 @@ void Player::PrettyPrintRequirementsAchievementsList(const std::vector& missingItems) const +void Player::PrettyPrintRequirementsItemsList(std::vector const& missingItems) const { LocaleConstant loc_idx = GetSession()->GetSessionDbLocaleIndex(); - for (const ProgressionRequirement* missingReq : missingItems) + for (ProgressionRequirement const* missingReq : missingItems) { ItemTemplate const* itemTemplate = sObjectMgr->GetItemTemplate(missingReq->id); if (!itemTemplate) @@ -6855,12 +6855,12 @@ bool Player::Satisfy(DungeonProgressionRequirements const* ar, uint32 target_map } //Check all items - std::vector missingPlayerItems; - std::vector missingLeaderItems; - for (const ProgressionRequirement* itemRequirement : ar->items) + std::vector missingPlayerItems; + std::vector missingLeaderItems; + for (ProgressionRequirement const* itemRequirement : ar->items) { Player* checkPlayer = this; - std::vector* missingItems = &missingPlayerItems; + std::vector* missingItems = &missingPlayerItems; if (itemRequirement->checkLeaderOnly) { checkPlayer = partyLeader; @@ -6877,12 +6877,12 @@ bool Player::Satisfy(DungeonProgressionRequirements const* ar, uint32 target_map } //Check all achievements - std::vector missingPlayerAchievements; - std::vector missingLeaderAchievements; - for (const ProgressionRequirement* achievementRequirement : ar->achievements) + std::vector missingPlayerAchievements; + std::vector missingLeaderAchievements; + for (ProgressionRequirement const* achievementRequirement : ar->achievements) { Player* checkPlayer = this; - std::vector* missingAchievements = &missingPlayerAchievements; + std::vector* missingAchievements = &missingPlayerAchievements; if (achievementRequirement->checkLeaderOnly) { checkPlayer = partyLeader; @@ -6899,12 +6899,12 @@ bool Player::Satisfy(DungeonProgressionRequirements const* ar, uint32 target_map } //Check all quests - std::vector missingPlayerQuests; - std::vector missingLeaderQuests; - for (const ProgressionRequirement* questRequirement : ar->quests) + std::vector missingPlayerQuests; + std::vector missingLeaderQuests; + for (ProgressionRequirement const* questRequirement : ar->quests) { Player* checkPlayer = this; - std::vector* missingQuests = &missingPlayerQuests; + std::vector* missingQuests = &missingPlayerQuests; if (questRequirement->checkLeaderOnly) { checkPlayer = partyLeader; diff --git a/src/server/game/Entities/Player/PlayerTaxi.cpp b/src/server/game/Entities/Player/PlayerTaxi.cpp index 29afc666e..6cf62c95d 100644 --- a/src/server/game/Entities/Player/PlayerTaxi.cpp +++ b/src/server/game/Entities/Player/PlayerTaxi.cpp @@ -127,7 +127,7 @@ void PlayerTaxi::AppendTaximaskTo(ByteBuffer& data, bool all) } } -bool PlayerTaxi::LoadTaxiDestinationsFromString(const std::string& values, TeamId teamId) +bool PlayerTaxi::LoadTaxiDestinationsFromString(std::string const& values, TeamId teamId) { ClearTaxiDestinations(); diff --git a/src/server/game/Entities/Player/PlayerUpdates.cpp b/src/server/game/Entities/Player/PlayerUpdates.cpp index c9265d3a4..1ba0916f2 100644 --- a/src/server/game/Entities/Player/PlayerUpdates.cpp +++ b/src/server/game/Entities/Player/PlayerUpdates.cpp @@ -2323,9 +2323,9 @@ bool Player::CanExecutePendingSpellCastRequest(SpellInfo const* spellInfo) return true; } -const PendingSpellCastRequest* Player::GetCastRequest(uint32 category) const +PendingSpellCastRequest const* Player::GetCastRequest(uint32 category) const { - for (const PendingSpellCastRequest& request : SpellQueue) + for (PendingSpellCastRequest const& request : SpellQueue) if (request.category == category) return &request; return nullptr; diff --git a/src/server/game/Entities/Unit/CharmInfo.cpp b/src/server/game/Entities/Unit/CharmInfo.cpp index da08245c4..63b9b97fe 100644 --- a/src/server/game/Entities/Unit/CharmInfo.cpp +++ b/src/server/game/Entities/Unit/CharmInfo.cpp @@ -246,7 +246,7 @@ void CharmInfo::SetPetNumber(uint32 petnumber, bool statwindow) _unit->SetUInt32Value(UNIT_FIELD_PETNUMBER, 0); } -void CharmInfo::LoadPetActionBar(const std::string& data) +void CharmInfo::LoadPetActionBar(std::string const& data) { std::vector tokens = Acore::Tokenize(data, ' ', false); diff --git a/src/server/game/Entities/Unit/CharmInfo.h b/src/server/game/Entities/Unit/CharmInfo.h index 10b86eb26..e6cbce754 100644 --- a/src/server/game/Entities/Unit/CharmInfo.h +++ b/src/server/game/Entities/Unit/CharmInfo.h @@ -144,7 +144,7 @@ public: //return true if successful bool AddSpellToActionBar(SpellInfo const* spellInfo, ActiveStates newstate = ACT_DECIDE, uint32 index = MAX_UNIT_ACTION_BAR_INDEX + 1); bool RemoveSpellFromActionBar(uint32 spell_id); - void LoadPetActionBar(const std::string& data); + void LoadPetActionBar(std::string const& data); void BuildActionBar(WorldPacket* data); void SetSpellAutocast(SpellInfo const* spellInfo, bool state); void SetActionBar(uint8 index, uint32 spellOrAction, ActiveStates type) diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 0b04c04aa..614632961 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -816,7 +816,7 @@ bool Unit::IsWithinRange(Unit const* obj, float dist) const return distsq <= dist * dist; } -bool Unit::IsWithinBoundaryRadius(const Unit* obj) const +bool Unit::IsWithinBoundaryRadius(Unit const* obj) const { if (!obj || !IsInMap(obj) || !InSamePhase(obj)) return false; @@ -5231,7 +5231,7 @@ void Unit::RemoveAurasDueToSpellByDispel(uint32 spellId, uint32 dispellerSpellId { noxious->SetDuration(aura->GetDuration() * aureff->GetAmount() / 100); if (aura->GetUnitOwner()) - if (const std::vector* spell_triggered = sSpellMgr->GetSpellLinked(-int32(aura->GetId()))) + if (std::vector const* spell_triggered = sSpellMgr->GetSpellLinked(-int32(aura->GetId()))) for (std::vector::const_iterator itr = spell_triggered->begin(); itr != spell_triggered->end(); ++itr) aura->GetUnitOwner()->RemoveAurasDueToSpell(*itr); } @@ -14442,7 +14442,7 @@ void Unit::SetRooted(bool apply, bool stun, bool logout) void Unit::SendMoveRoot(bool apply) { - const Player* client = GetClientControlling(); + Player const* client = GetClientControlling(); // Apply flags in-place when unit currently is not controlled by a player if (!client) @@ -14461,7 +14461,7 @@ void Unit::SendMoveRoot(bool apply) if (!IsInWorld()) return; - const PackedGuid& guid = GetPackGUID(); + PackedGuid const& guid = GetPackGUID(); // Wrath+ spline root: when unit is currently not controlled by a player if (!client) { diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h index b589fdd13..fd01e4909 100644 --- a/src/server/game/Entities/Unit/Unit.h +++ b/src/server/game/Entities/Unit/Unit.h @@ -730,7 +730,7 @@ public: Pet* ToPet() { if (IsPet()) return reinterpret_cast(this); else return nullptr; } Totem* ToTotem() { if (IsTotem()) return reinterpret_cast(this); else return nullptr; } TempSummon* ToTempSummon() { if (IsSummon()) return reinterpret_cast(this); else return nullptr; } - [[nodiscard]] const TempSummon* ToTempSummon() const { if (IsSummon()) return reinterpret_cast(this); else return nullptr; } + [[nodiscard]] TempSummon const* ToTempSummon() const { if (IsSummon()) return reinterpret_cast(this); else return nullptr; } // Unit state void AddUnitState(uint32 f) { m_state |= f; } @@ -878,7 +878,7 @@ public: [[nodiscard]] float GetCombatReach() const override { return m_floatValues[UNIT_FIELD_COMBATREACH]; } [[nodiscard]] float GetMeleeReach() const { float reach = m_floatValues[UNIT_FIELD_COMBATREACH]; return reach > MIN_MELEE_REACH ? reach : MIN_MELEE_REACH; } [[nodiscard]] bool IsWithinRange(Unit const* obj, float dist) const; - bool IsWithinBoundaryRadius(const Unit* obj) const; + bool IsWithinBoundaryRadius(Unit const* obj) const; bool IsWithinCombatRange(Unit const* obj, float dist2compare) const; bool IsWithinMeleeRange(Unit const* obj, float dist = 0.f) const; float GetMeleeRange(Unit const* target) const; @@ -1524,7 +1524,7 @@ public: [[nodiscard]] int32 GetTotalAuraModifierByMiscMask(AuraType auratype, uint32 misc_mask) const; [[nodiscard]] float GetTotalAuraMultiplierByMiscMask(AuraType auratype, uint32 misc_mask) const; - [[nodiscard]] int32 GetMaxPositiveAuraModifierByMiscMask(AuraType auratype, uint32 misc_mask, const AuraEffect* except = nullptr) const; + [[nodiscard]] int32 GetMaxPositiveAuraModifierByMiscMask(AuraType auratype, uint32 misc_mask, AuraEffect const* except = nullptr) const; [[nodiscard]] int32 GetMaxNegativeAuraModifierByMiscMask(AuraType auratype, uint32 misc_mask) const; [[nodiscard]] int32 GetTotalAuraModifierByMiscValue(AuraType auratype, int32 misc_value) const; @@ -1754,7 +1754,7 @@ public: void SetHover(bool enable); MotionMaster* GetMotionMaster() { return i_motionMaster; } - [[nodiscard]] const MotionMaster* GetMotionMaster() const { return i_motionMaster; } + [[nodiscard]] MotionMaster const* GetMotionMaster() const { return i_motionMaster; } [[nodiscard]] virtual MovementGeneratorType GetDefaultMovementType() const; [[nodiscard]] bool IsStopped() const { return !(HasUnitState(UNIT_STATE_MOVING)); } @@ -2002,7 +2002,7 @@ public: void UpdateHeight(float newZ); virtual bool UpdatePosition(float x, float y, float z, float ang, bool teleport = false); - bool UpdatePosition(const Position& pos, bool teleport = false) { return UpdatePosition(pos.GetPositionX(), pos.GetPositionY(), pos.GetPositionZ(), pos.GetOrientation(), teleport); } + bool UpdatePosition(Position const& pos, bool teleport = false) { return UpdatePosition(pos.GetPositionX(), pos.GetPositionY(), pos.GetPositionZ(), pos.GetOrientation(), teleport); } void ProcessPositionDataChanged(PositionFullTerrainStatus const& data) override; virtual void ProcessTerrainStatusUpdate(); diff --git a/src/server/game/Entities/Unit/UnitUtils.h b/src/server/game/Entities/Unit/UnitUtils.h index e86342660..3d9184bc2 100644 --- a/src/server/game/Entities/Unit/UnitUtils.h +++ b/src/server/game/Entities/Unit/UnitUtils.h @@ -19,22 +19,22 @@ class MMapTargetData { public: MMapTargetData() = default; - MMapTargetData(uint32 endTime, const Position* o, const Position* t) + MMapTargetData(uint32 endTime, Position const* o, Position const* t) { _endTime = endTime; _posOwner.Relocate(o); _posTarget.Relocate(t); } - MMapTargetData(const MMapTargetData& c) + MMapTargetData(MMapTargetData const& c) { _endTime = c._endTime; _posOwner.Relocate(c._posOwner); _posTarget.Relocate(c._posTarget); } MMapTargetData(MMapTargetData&&) = default; - MMapTargetData& operator=(const MMapTargetData&) = default; + MMapTargetData& operator=(MMapTargetData const&) = default; MMapTargetData& operator=(MMapTargetData&&) = default; - [[nodiscard]] bool PosChanged(const Position& o, const Position& t) const + [[nodiscard]] bool PosChanged(Position const& o, Position const& t) const { return _posOwner.GetExactDistSq(&o) > 0.5f * 0.5f || _posTarget.GetExactDistSq(&t) > 0.5f * 0.5f; } @@ -47,7 +47,7 @@ class SafeUnitPointer { public: explicit SafeUnitPointer(Unit* defVal) : ptr(defVal), defaultValue(defVal) {} - SafeUnitPointer(const SafeUnitPointer& /*p*/) { ABORT(); } + SafeUnitPointer(SafeUnitPointer const& /*p*/) { ABORT(); } void Initialize(Unit* defVal) { defaultValue = defVal; ptr = defVal; } ~SafeUnitPointer(); void SetPointedTo(Unit* u); diff --git a/src/server/game/Events/HolidayDateCalculator.cpp b/src/server/game/Events/HolidayDateCalculator.cpp index 367fd7056..ae29d5804 100644 --- a/src/server/game/Events/HolidayDateCalculator.cpp +++ b/src/server/game/Events/HolidayDateCalculator.cpp @@ -143,7 +143,7 @@ static const std::vector HolidayRules = { { HOLIDAY_DARKMOON_FAIRE_SHATTRATH, HolidayCalculationType::DARKMOON_FAIRE, 2, 0, 0, -2 } // Feb, May, Aug, Nov }; -const std::vector& HolidayDateCalculator::GetHolidayRules() +std::vector const& HolidayDateCalculator::GetHolidayRules() { return HolidayRules; } @@ -479,7 +479,7 @@ std::tm HolidayDateCalculator::CalculateWinterSolstice(int year) return result; } -std::tm HolidayDateCalculator::CalculateHolidayDate(const HolidayRule& rule, int year) +std::tm HolidayDateCalculator::CalculateHolidayDate(HolidayRule const& rule, int year) { std::tm result = {}; @@ -572,7 +572,7 @@ std::tm HolidayDateCalculator::CalculateHolidayDate(const HolidayRule& rule, int return result; } -uint32_t HolidayDateCalculator::PackDate(const std::tm& date) +uint32_t HolidayDateCalculator::PackDate(std::tm const& date) { // WoW packed date format (same as ByteBuffer::AppendPackedTime): // bits 24-28: year offset from 2000 (5 bits = 0-31, valid years 2000-2031) @@ -648,7 +648,7 @@ std::vector HolidayDateCalculator::GetDarkmoonFaireDates(int locationO return dates; } -time_t HolidayDateCalculator::FindStartTimeForStage(const uint32_t* packedDates, uint8_t numDates, +time_t HolidayDateCalculator::FindStartTimeForStage(uint32_t const* packedDates, uint8_t numDates, time_t stageOffset, uint32_t stageLengthMinutes, time_t curTime) { for (uint8_t i = 0; i < numDates && packedDates[i]; ++i) diff --git a/src/server/game/Events/HolidayDateCalculator.h b/src/server/game/Events/HolidayDateCalculator.h index 50b9eb909..62017f1f9 100644 --- a/src/server/game/Events/HolidayDateCalculator.h +++ b/src/server/game/Events/HolidayDateCalculator.h @@ -80,16 +80,16 @@ public: static std::tm CalculateWinterSolstice(int year); // Calculate holiday start date for a given year - static std::tm CalculateHolidayDate(const HolidayRule& rule, int year); + static std::tm CalculateHolidayDate(HolidayRule const& rule, int year); // Convert std::tm to WoW's packed date format - static uint32_t PackDate(const std::tm& date); + static uint32_t PackDate(std::tm const& date); // Convert WoW's packed date format to std::tm static std::tm UnpackDate(uint32_t packed); // Get all holiday rules - static const std::vector& GetHolidayRules(); + static std::vector const& GetHolidayRules(); // Calculate date for a specific holiday ID and year static uint32_t GetPackedHolidayDate(uint32_t holidayId, int year); @@ -104,7 +104,7 @@ public: // For multi-stage holidays, stageOffset is the cumulative duration (in seconds) of all prior stages. // stageLengthMinutes is the duration of the current stage in minutes. // Returns the computed stage start time (startTime + stageOffset), or 0 if no valid date found. - static time_t FindStartTimeForStage(const uint32_t* packedDates, uint8_t numDates, + static time_t FindStartTimeForStage(uint32_t const* packedDates, uint8_t numDates, time_t stageOffset, uint32_t stageLengthMinutes, time_t curTime); // Start time for a looping holiday event (Battleground Call to Arms): rolls the packed anchor diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index 849ee2627..f9c76d214 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -1381,7 +1381,7 @@ void ObjectMgr::LoadGameObjectAddons() ObjectGuid::LowType guid = fields[0].Get(); - const GameObjectData* goData = GetGameObjectData(guid); + GameObjectData const* goData = GetGameObjectData(guid); if (!goData) { LOG_ERROR("sql.sql", "GameObject (GUID: {}) does not exist but has a record in `gameobject_addon`", guid); @@ -1656,7 +1656,7 @@ CreatureModel const* ObjectMgr::ChooseDisplayId(CreatureTemplate const* cinfo, C return cinfo->GetFirstInvisibleModel(); } -void ObjectMgr::ChooseCreatureFlags(const CreatureTemplate* cinfo, uint32& npcflag, uint32& unit_flags, uint32& dynamicflags, const CreatureData* data /*= nullptr*/) +void ObjectMgr::ChooseCreatureFlags(CreatureTemplate const* cinfo, uint32& npcflag, uint32& unit_flags, uint32& dynamicflags, CreatureData const* data /*= nullptr*/) { npcflag = cinfo->npcflag; unit_flags = cinfo->unit_flags; @@ -1947,7 +1947,7 @@ void ObjectMgr::LoadLinkedRespawn() { case CREATURE_TO_CREATURE: { - const CreatureData* slave = GetCreatureData(guidLow); + CreatureData const* slave = GetCreatureData(guidLow); if (!slave) { LOG_ERROR("sql.sql", "LinkedRespawn: Creature (guid) {} not found in creature table", guidLow); @@ -1955,7 +1955,7 @@ void ObjectMgr::LoadLinkedRespawn() break; } - const CreatureData* master = GetCreatureData(linkedGuidLow); + CreatureData const* master = GetCreatureData(linkedGuidLow); if (!master) { LOG_ERROR("sql.sql", "LinkedRespawn: Creature (linkedGuid) {} not found in creature table", linkedGuidLow); @@ -1984,7 +1984,7 @@ void ObjectMgr::LoadLinkedRespawn() } case CREATURE_TO_GO: { - const CreatureData* slave = GetCreatureData(guidLow); + CreatureData const* slave = GetCreatureData(guidLow); if (!slave) { LOG_ERROR("sql.sql", "LinkedRespawn: Creature (guid) {} not found in creature table", guidLow); @@ -1992,7 +1992,7 @@ void ObjectMgr::LoadLinkedRespawn() break; } - const GameObjectData* master = GetGameObjectData(linkedGuidLow); + GameObjectData const* master = GetGameObjectData(linkedGuidLow); if (!master) { LOG_ERROR("sql.sql", "LinkedRespawn: Gameobject (linkedGuid) {} not found in gameobject table", linkedGuidLow); @@ -2021,7 +2021,7 @@ void ObjectMgr::LoadLinkedRespawn() } case GO_TO_GO: { - const GameObjectData* slave = GetGameObjectData(guidLow); + GameObjectData const* slave = GetGameObjectData(guidLow); if (!slave) { LOG_ERROR("sql.sql", "LinkedRespawn: Gameobject (guid) {} not found in gameobject table", guidLow); @@ -2029,7 +2029,7 @@ void ObjectMgr::LoadLinkedRespawn() break; } - const GameObjectData* master = GetGameObjectData(linkedGuidLow); + GameObjectData const* master = GetGameObjectData(linkedGuidLow); if (!master) { LOG_ERROR("sql.sql", "LinkedRespawn: Gameobject (linkedGuid) {} not found in gameobject table", linkedGuidLow); @@ -2058,7 +2058,7 @@ void ObjectMgr::LoadLinkedRespawn() } case GO_TO_CREATURE: { - const GameObjectData* slave = GetGameObjectData(guidLow); + GameObjectData const* slave = GetGameObjectData(guidLow); if (!slave) { LOG_ERROR("sql.sql", "LinkedRespawn: Gameobject (guid) {} not found in gameobject table", guidLow); @@ -2066,7 +2066,7 @@ void ObjectMgr::LoadLinkedRespawn() break; } - const CreatureData* master = GetCreatureData(linkedGuidLow); + CreatureData const* master = GetCreatureData(linkedGuidLow); if (!master) { LOG_ERROR("sql.sql", "LinkedRespawn: Creature (linkedGuid) {} not found in creature table", linkedGuidLow); @@ -7623,7 +7623,7 @@ void ObjectMgr::LoadAccessRequirements() } //Sort all arrays for priority - auto sortFunction = [](const ProgressionRequirement* const a, const ProgressionRequirement* const b) {return a->priority > b->priority; }; + auto sortFunction = [](ProgressionRequirement const* const a, ProgressionRequirement const* const b) {return a->priority > b->priority; }; std::sort(ar->achievements.begin(), ar->achievements.end(), sortFunction); std::sort(ar->quests.begin(), ar->quests.end(), sortFunction); std::sort(ar->items.begin(), ar->items.end(), sortFunction); @@ -9464,7 +9464,7 @@ bool ObjectMgr::IsValidCharterName(std::string_view name) return isValidString(wname, strictMask, true); } -bool ObjectMgr::IsValidChannelName(const std::string& name) +bool ObjectMgr::IsValidChannelName(std::string const& name) { std::wstring wname; if (!Utf8toWStr(name, wname)) @@ -9927,7 +9927,7 @@ GameTele const* ObjectMgr::GetGameTele(std::string_view name, bool exactSearch) wstrToLower(wname); // Alternative first GameTele what contains wnameLow as substring in case no GameTele location found - const GameTele* alt = nullptr; + GameTele const* alt = nullptr; for (GameTeleContainer::const_iterator itr = _gameTeleStore.begin(); itr != _gameTeleStore.end(); ++itr) { if (itr->second.wnameLow == wname) diff --git a/src/server/game/Globals/ObjectMgr.h b/src/server/game/Globals/ObjectMgr.h index 8a89fc3fc..c384ae2f3 100644 --- a/src/server/game/Globals/ObjectMgr.h +++ b/src/server/game/Globals/ObjectMgr.h @@ -1172,7 +1172,7 @@ public: if (map_itr == _mailLevelRewardStore.end()) return nullptr; - for (const auto & set_itr : map_itr->second) + for (auto const& set_itr : map_itr->second) if (set_itr.raceMask & raceMask) return &set_itr; @@ -1496,7 +1496,7 @@ public: else return {}; } - static inline void GetLocaleString(const std::vector& data, int loc_idx, std::string& value) + static inline void GetLocaleString(std::vector const& data, int loc_idx, std::string& value) { if (data.size() > std::size_t(loc_idx) && !data[loc_idx].empty()) value = data[loc_idx]; diff --git a/src/server/game/Grids/Cells/Cell.h b/src/server/game/Grids/Cells/Cell.h index d077a19c6..fe000f2de 100644 --- a/src/server/game/Grids/Cells/Cell.h +++ b/src/server/game/Grids/Cells/Cell.h @@ -54,13 +54,13 @@ struct Cell y = data.Part.grid_y * MAX_NUMBER_OF_CELLS + data.Part.cell_y; } - [[nodiscard]] bool DiffCell(const Cell& cell) const + [[nodiscard]] bool DiffCell(Cell const& cell) const { return(data.Part.cell_x != cell.data.Part.cell_x || data.Part.cell_y != cell.data.Part.cell_y); } - [[nodiscard]] bool DiffGrid(const Cell& cell) const + [[nodiscard]] bool DiffGrid(Cell const& cell) const { return(data.Part.grid_x != cell.data.Part.grid_x || data.Part.grid_y != cell.data.Part.grid_y); diff --git a/src/server/game/Grids/GridDefines.h b/src/server/game/Grids/GridDefines.h index 8904ff41d..9abb47e39 100644 --- a/src/server/game/Grids/GridDefines.h +++ b/src/server/game/Grids/GridDefines.h @@ -91,12 +91,12 @@ struct CoordPair , y_coord(y) {} - CoordPair(const CoordPair& obj) + CoordPair(CoordPair const& obj) : x_coord(obj.x_coord) , y_coord(obj.y_coord) {} - CoordPair& operator=(const CoordPair& obj) + CoordPair& operator=(CoordPair const& obj) { x_coord = obj.x_coord; y_coord = obj.y_coord; @@ -157,13 +157,13 @@ struct CoordPair }; template -bool operator==(const CoordPair& p1, const CoordPair& p2) +bool operator==(CoordPair const& p1, CoordPair const& p2) { return (p1.x_coord == p2.x_coord && p1.y_coord == p2.y_coord); } template -bool operator!=(const CoordPair& p1, const CoordPair& p2) +bool operator!=(CoordPair const& p1, CoordPair const& p2) { return !(p1 == p2); } diff --git a/src/server/game/Groups/Group.cpp b/src/server/game/Groups/Group.cpp index 30167c3db..8d960a56f 100644 --- a/src/server/game/Groups/Group.cpp +++ b/src/server/game/Groups/Group.cpp @@ -411,7 +411,7 @@ Player* Group::GetInvited(ObjectGuid guid) const return nullptr; } -Player* Group::GetInvited(const std::string& name) const +Player* Group::GetInvited(std::string const& name) const { for (InvitesList::const_iterator itr = m_invitees.begin(); itr != m_invitees.end(); ++itr) { @@ -577,7 +577,7 @@ bool Group::AddMember(Player* player, uint8 roles /* = 0 */) return true; } -bool Group::RemoveMember(ObjectGuid guid, const RemoveMethod& method /*= GROUP_REMOVEMETHOD_DEFAULT*/, ObjectGuid kicker /*= ObjectGuid::Empty*/, const char* reason /*= nullptr*/) +bool Group::RemoveMember(ObjectGuid guid, RemoveMethod const& method /*= GROUP_REMOVEMETHOD_DEFAULT*/, ObjectGuid kicker /*= ObjectGuid::Empty*/, char const* reason /*= nullptr*/) { BroadcastGroupUpdate(); @@ -856,7 +856,7 @@ void Group::Disband(bool hideDestroy /* = false */) /*** LOOT SYSTEM ***/ /*********************************************************/ -void Group::SendLootStartRoll(uint32 CountDown, uint32 mapid, const Roll& r) +void Group::SendLootStartRoll(uint32 CountDown, uint32 mapid, Roll const& r) { WorldPacket data(SMSG_LOOT_START_ROLL, (8 + 4 + 4 + 4 + 4 + 4 + 4 + 1)); data << r.itemGUID; // guid of rolled item @@ -1736,7 +1736,7 @@ void Group::CountTheRoll(Rolls::iterator rollI) if (Loot* loot = roll->getLoot(); loot && loot->isLooted() && loot->sourceGameObject) { - const GameObjectTemplate* goInfo = loot->sourceGameObject->GetGOInfo(); + GameObjectTemplate const* goInfo = loot->sourceGameObject->GetGOInfo(); if (goInfo && goInfo->type == GAMEOBJECT_TYPE_CHEST) { // Deactivate chest if the last item was rolled in group @@ -2445,7 +2445,7 @@ ObjectGuid Group::GetGUID() const return m_guid; } -const char* Group::GetLeaderName() const +char const* Group::GetLeaderName() const { return m_leaderName.c_str(); } @@ -2480,7 +2480,7 @@ bool Group::IsLeader(ObjectGuid guid) const return (GetLeaderGUID() == guid); } -ObjectGuid Group::GetMemberGUID(const std::string& name) +ObjectGuid Group::GetMemberGUID(std::string const& name) { for (member_citerator itr = m_memberSlots.begin(); itr != m_memberSlots.end(); ++itr) if (itr->name == name) diff --git a/src/server/game/Groups/Group.h b/src/server/game/Groups/Group.h index 8b020cb60..50c51c451 100644 --- a/src/server/game/Groups/Group.h +++ b/src/server/game/Groups/Group.h @@ -205,7 +205,7 @@ public: void RemoveAllInvites(); bool AddLeaderInvite(Player* player); bool AddMember(Player* player, uint8 roles = 0); - bool RemoveMember(ObjectGuid guid, const RemoveMethod& method = GROUP_REMOVEMETHOD_DEFAULT, ObjectGuid kicker = ObjectGuid::Empty, const char* reason = nullptr); + bool RemoveMember(ObjectGuid guid, RemoveMethod const& method = GROUP_REMOVEMETHOD_DEFAULT, ObjectGuid kicker = ObjectGuid::Empty, char const* reason = nullptr); void ChangeLeader(ObjectGuid guid); void SetLootMethod(LootMethod method); void SetLooterGuid(ObjectGuid guid); @@ -226,7 +226,7 @@ public: ObjectGuid GetLeaderGUID() const; Player* GetLeader(); ObjectGuid GetGUID() const; - const char* GetLeaderName() const; + char const* GetLeaderName() const; LootMethod GetLootMethod() const; ObjectGuid GetLooterGuid() const; ObjectGuid GetMasterLooterGuid() const; @@ -235,11 +235,11 @@ public: // member manipulation methods bool IsMember(ObjectGuid guid) const; bool IsLeader(ObjectGuid guid) const; - ObjectGuid GetMemberGUID(const std::string& name); + ObjectGuid GetMemberGUID(std::string const& name); bool IsAssistant(ObjectGuid guid) const; Player* GetInvited(ObjectGuid guid) const; - Player* GetInvited(const std::string& name) const; + Player* GetInvited(std::string const& name) const; bool SameSubGroup(ObjectGuid guid1, ObjectGuid guid2) const; bool SameSubGroup(ObjectGuid guid1, MemberSlot const* slot2) const; @@ -293,11 +293,11 @@ public: /*********************************************************/ bool isRollLootActive() const; - void SendLootStartRoll(uint32 CountDown, uint32 mapid, const Roll& r); + void SendLootStartRoll(uint32 CountDown, uint32 mapid, Roll const& r); void SendLootStartRollToPlayer(uint32 countDown, uint32 mapId, Player* p, bool canNeed, Roll const& r); void SendPendingRollsToPlayer(Player* player, Map* map); - void SendLootRoll(ObjectGuid SourceGuid, ObjectGuid TargetGuid, uint8 RollNumber, uint8 RollType, const Roll& r, bool autoPass = false); - void SendLootRollWon(ObjectGuid SourceGuid, ObjectGuid TargetGuid, uint8 RollNumber, uint8 RollType, const Roll& r); + void SendLootRoll(ObjectGuid SourceGuid, ObjectGuid TargetGuid, uint8 RollNumber, uint8 RollType, Roll const& r, bool autoPass = false); + void SendLootRollWon(ObjectGuid SourceGuid, ObjectGuid TargetGuid, uint8 RollNumber, uint8 RollType, Roll const& r); void SendLootAllPassed(Roll const& roll); void SendLooter(Creature* creature, Player* pLooter); void GroupLoot(Loot* loot, WorldObject* pLootedObject); diff --git a/src/server/game/Guilds/Guild.cpp b/src/server/game/Guilds/Guild.cpp index abd12702d..b1f8b7654 100644 --- a/src/server/game/Guilds/Guild.cpp +++ b/src/server/game/Guilds/Guild.cpp @@ -1319,7 +1319,7 @@ void Guild::HandleSetInfo(WorldSession* session, std::string_view info) } } -void Guild::HandleSetEmblem(WorldSession* session, const EmblemInfo& emblemInfo) +void Guild::HandleSetEmblem(WorldSession* session, EmblemInfo const& emblemInfo) { Player* player = session->GetPlayer(); if (!_IsLeader(player)) @@ -2483,7 +2483,7 @@ bool Guild::_IsLeader(Player* player) const { if (player->GetGUID() == m_leaderGuid) return true; - if (const Member* member = GetMember(player->GetGUID())) + if (Member const* member = GetMember(player->GetGUID())) return member->IsRank(GR_GUILDMASTER); return false; } @@ -2544,21 +2544,21 @@ void Guild::_SetRankBankTabRightsAndSlots(uint8 rankId, GuildBankRightsAndSlots inline std::string Guild::_GetRankName(uint8 rankId) const { - if (const RankInfo* rankInfo = GetRankInfo(rankId)) + if (RankInfo const* rankInfo = GetRankInfo(rankId)) return rankInfo->GetName(); return ""; } inline uint32 Guild::_GetRankRights(uint8 rankId) const { - if (const RankInfo* rankInfo = GetRankInfo(rankId)) + if (RankInfo const* rankInfo = GetRankInfo(rankId)) return rankInfo->GetRights(); return 0; } inline int32 Guild::_GetRankBankMoneyPerDay(uint8 rankId) const { - if (const RankInfo* rankInfo = GetRankInfo(rankId)) + if (RankInfo const* rankInfo = GetRankInfo(rankId)) return rankInfo->GetBankMoneyPerDay(); return 0; } @@ -2566,14 +2566,14 @@ inline int32 Guild::_GetRankBankMoneyPerDay(uint8 rankId) const inline int32 Guild::_GetRankBankTabSlotsPerDay(uint8 rankId, uint8 tabId) const { if (tabId < _GetPurchasedTabsSize()) - if (const RankInfo* rankInfo = GetRankInfo(rankId)) + if (RankInfo const* rankInfo = GetRankInfo(rankId)) return rankInfo->GetBankTabSlotsPerDay(tabId); return 0; } inline int8 Guild::_GetRankBankTabRights(uint8 rankId, uint8 tabId) const { - if (const RankInfo* rankInfo = GetRankInfo(rankId)) + if (RankInfo const* rankInfo = GetRankInfo(rankId)) return rankInfo->GetBankTabRights(tabId); return 0; } @@ -2620,7 +2620,7 @@ inline void Guild::_UpdateMemberWithdrawSlots(CharacterDatabaseTransaction trans inline bool Guild::_MemberHasTabRights(ObjectGuid guid, uint8 tabId, uint32 rights) const { - if (const Member* member = GetMember(guid)) + if (Member const* member = GetMember(guid)) { // Leader always has full rights if (member->IsRank(GR_GUILDMASTER) || m_leaderGuid == guid) @@ -2664,7 +2664,7 @@ void Guild::_LogBankEvent(CharacterDatabaseTransaction trans, GuildBankEventLogT inline Item* Guild::_GetItem(uint8 tabId, uint8 slotId) const { - if (const BankTab* tab = GetBankTab(tabId)) + if (BankTab const* tab = GetBankTab(tabId)) return tab->GetItem(slotId); return nullptr; } diff --git a/src/server/game/Guilds/Guild.h b/src/server/game/Guilds/Guild.h index ab5d47295..c2cd4bb42 100644 --- a/src/server/game/Guilds/Guild.h +++ b/src/server/game/Guilds/Guild.h @@ -378,7 +378,7 @@ public: // pussywizard: public class Member }; // pussywizard: public GetMember - inline const Member* GetMember(ObjectGuid guid) const + inline Member const* GetMember(ObjectGuid guid) const { auto itr = m_members.find(guid.GetCounter()); return (itr != m_members.end()) ? &itr->second : nullptr; @@ -566,7 +566,7 @@ private: void SetInfo(std::string_view name, std::string_view icon); void SetText(std::string_view text); - void SendText(const Guild* guild, WorldSession* session) const; + void SendText(Guild const* guild, WorldSession* session) const; std::string const& GetName() const { return m_name; } std::string const& GetIcon() const { return m_icon; } @@ -696,7 +696,7 @@ public: void HandleQuery(WorldSession* session); void HandleSetMOTD(WorldSession* session, std::string_view motd); void HandleSetInfo(WorldSession* session, std::string_view info); - void HandleSetEmblem(WorldSession* session, const EmblemInfo& emblemInfo); + void HandleSetEmblem(WorldSession* session, EmblemInfo const& emblemInfo); void HandleSetLeader(WorldSession* session, std::string_view name); void HandleSetBankTabInfo(WorldSession* session, uint8 tabId, std::string_view name, std::string_view icon); void HandleSetMemberNote(WorldSession* session, std::string_view name, std::string_view note, bool isPublic); @@ -776,7 +776,7 @@ public: void ResetTimes(); - [[nodiscard]] bool ModifyBankMoney(CharacterDatabaseTransaction trans, const uint64& amount, bool add) { return _ModifyBankMoney(trans, amount, add); } + [[nodiscard]] bool ModifyBankMoney(CharacterDatabaseTransaction trans, uint64 const& amount, bool add) { return _ModifyBankMoney(trans, amount, add); } [[nodiscard]] uint32 GetMemberSize() const { return m_members.size(); } protected: @@ -801,7 +801,7 @@ protected: private: inline uint8 _GetRanksSize() const { return uint8(m_ranks.size()); } - inline const RankInfo* GetRankInfo(uint8 rankId) const { return rankId < _GetRanksSize() ? &m_ranks[rankId] : nullptr; } + inline RankInfo const* GetRankInfo(uint8 rankId) const { return rankId < _GetRanksSize() ? &m_ranks[rankId] : nullptr; } inline RankInfo* GetRankInfo(uint8 rankId) { return rankId < _GetRanksSize() ? &m_ranks[rankId] : nullptr; } inline bool _HasRankRight(Player* player, uint32 right) const { diff --git a/src/server/game/Handlers/ArenaTeamHandler.cpp b/src/server/game/Handlers/ArenaTeamHandler.cpp index 65ad0e0c7..58fb2541c 100644 --- a/src/server/game/Handlers/ArenaTeamHandler.cpp +++ b/src/server/game/Handlers/ArenaTeamHandler.cpp @@ -403,7 +403,7 @@ void WorldSession::HandleArenaTeamLeaderOpcode(WorldPacket& recvData) arenaTeam->BroadcastEvent(ERR_ARENA_TEAM_LEADER_CHANGED_SSS, ObjectGuid::Empty, 3, _player->GetName().c_str(), name, arenaTeam->GetName()); } -void WorldSession::SendArenaTeamCommandResult(uint32 teamAction, const std::string& team, const std::string& player, uint32 errorId) +void WorldSession::SendArenaTeamCommandResult(uint32 teamAction, std::string const& team, std::string const& player, uint32 errorId) { WorldPacket data(SMSG_ARENA_TEAM_COMMAND_RESULT, 4 + team.length() + 1 + player.length() + 1 + 4); data << uint32(teamAction); diff --git a/src/server/game/Handlers/AuctionHouseHandler.cpp b/src/server/game/Handlers/AuctionHouseHandler.cpp index 19d878289..bba72f7ff 100644 --- a/src/server/game/Handlers/AuctionHouseHandler.cpp +++ b/src/server/game/Handlers/AuctionHouseHandler.cpp @@ -294,7 +294,7 @@ void WorldSession::HandleAuctionSellItem(WorldPacket& recvData) return; } - const AuctionHouseEntry* AHEntry = sAuctionMgr->GetAuctionHouseEntryFromFactionTemplate(auctioneerInfo->faction); + AuctionHouseEntry const* AHEntry = sAuctionMgr->GetAuctionHouseEntryFromFactionTemplate(auctioneerInfo->faction); AH->houseId = AuctionHouseId(AHEntry->houseId); } diff --git a/src/server/game/Handlers/GroupHandler.cpp b/src/server/game/Handlers/GroupHandler.cpp index d0bd34262..ad09e714e 100644 --- a/src/server/game/Handlers/GroupHandler.cpp +++ b/src/server/game/Handlers/GroupHandler.cpp @@ -50,7 +50,7 @@ class Aura; -FIX sending PartyMemberStats */ -void WorldSession::SendPartyResult(PartyOperation operation, const std::string& member, PartyResult res, uint32 val /* = 0 */) +void WorldSession::SendPartyResult(PartyOperation operation, std::string const& member, PartyResult res, uint32 val /* = 0 */) { WorldPacket data(SMSG_PARTY_COMMAND_RESULT, 4 + member.size() + 1 + 4 + 4); data << uint32(operation); diff --git a/src/server/game/Handlers/LFGHandler.cpp b/src/server/game/Handlers/LFGHandler.cpp index 867a3c939..98aff9882 100644 --- a/src/server/game/Handlers/LFGHandler.cpp +++ b/src/server/game/Handlers/LFGHandler.cpp @@ -37,7 +37,7 @@ void BuildPlayerLockDungeonBlock(WorldPacket& data, lfg::LfgLockMap const& lock) } } -void BuildPartyLockDungeonBlock(WorldPacket& data, const lfg::LfgLockPartyMap& lockMap) +void BuildPartyLockDungeonBlock(WorldPacket& data, lfg::LfgLockPartyMap const& lockMap) { data << uint8(lockMap.size()); for (lfg::LfgLockPartyMap::const_iterator it = lockMap.begin(); it != lockMap.end(); ++it) diff --git a/src/server/game/Handlers/PetHandler.cpp b/src/server/game/Handlers/PetHandler.cpp index 6433450a4..bc3caab8c 100644 --- a/src/server/game/Handlers/PetHandler.cpp +++ b/src/server/game/Handlers/PetHandler.cpp @@ -1088,7 +1088,7 @@ void WorldSession::HandlePetCastSpellOpcode(WorldPacket& recvPacket) caster->AddUnitState(UNIT_STATE_FOLLOW); } -void WorldSession::SendPetNameInvalid(uint32 error, const std::string& name, DeclinedName* declinedName) +void WorldSession::SendPetNameInvalid(uint32 error, std::string const& name, DeclinedName* declinedName) { WorldPacket data(SMSG_PET_NAME_INVALID, 4 + name.size() + 1 + 1); data << uint32(error); diff --git a/src/server/game/Handlers/QueryHandler.cpp b/src/server/game/Handlers/QueryHandler.cpp index 478dbe5ab..eb0142aa4 100644 --- a/src/server/game/Handlers/QueryHandler.cpp +++ b/src/server/game/Handlers/QueryHandler.cpp @@ -170,7 +170,7 @@ void WorldSession::HandleGameObjectQueryOpcode(WorldPacket& recvData) ObjectGuid guid; recvData >> guid; - const GameObjectTemplate* info = sObjectMgr->GetGameObjectTemplate(entry); + GameObjectTemplate const* info = sObjectMgr->GetGameObjectTemplate(entry); if (info) { std::string Name; diff --git a/src/server/game/Handlers/QuestHandler.cpp b/src/server/game/Handlers/QuestHandler.cpp index 89a0a84af..ed9699a93 100644 --- a/src/server/game/Handlers/QuestHandler.cpp +++ b/src/server/game/Handlers/QuestHandler.cpp @@ -629,7 +629,7 @@ void WorldSession::HandleQueryQuestsCompleted(WorldPacket& /*recvData*/) WorldPacket data(SMSG_QUERY_QUESTS_COMPLETED_RESPONSE, 4 + 4 * rew_count); data << uint32(rew_count); - const RewardedQuestSet& rewQuests = _player->getRewardedQuests(); + RewardedQuestSet const& rewQuests = _player->getRewardedQuests(); for (RewardedQuestSet::const_iterator itr = rewQuests.begin(); itr != rewQuests.end(); ++itr) data << uint32(*itr); diff --git a/src/server/game/Handlers/SpellHandler.cpp b/src/server/game/Handlers/SpellHandler.cpp index bbb3a1f55..a69c15045 100644 --- a/src/server/game/Handlers/SpellHandler.cpp +++ b/src/server/game/Handlers/SpellHandler.cpp @@ -477,7 +477,7 @@ void WorldSession::HandleCastSpellOpcode(WorldPacket& recvPacket) // pussywizard: casting player's spells from vehicle when seat allows it // if ANYTHING CHANGES in this function, INFORM ME BEFORE applying!!! if (Vehicle* veh = mover->GetVehicleKit()) - if (const VehicleSeatEntry* seat = veh->GetSeatForPassenger(_player)) + if (VehicleSeatEntry const* seat = veh->GetSeatForPassenger(_player)) if (seat->m_flags & VEHICLE_SEAT_FLAG_CAN_ATTACK || spellInfo->Effects[EFFECT_0].Effect == SPELL_EFFECT_OPEN_LOCK /*allow looting from vehicle, but only if player has required spell (all necessary opening spells are in playercreateinfo_spell)*/) if ((mover->IsCreature() && !mover->ToCreature()->HasSpell(spellId)) || spellInfo->IsPassive()) // the creature can't cast that spell, check player instead { diff --git a/src/server/game/Instances/InstanceScript.cpp b/src/server/game/Instances/InstanceScript.cpp index ab0813234..14a5fac34 100644 --- a/src/server/game/Instances/InstanceScript.cpp +++ b/src/server/game/Instances/InstanceScript.cpp @@ -149,7 +149,7 @@ bool InstanceScript::IsEncounterInProgress() const return false; } -void InstanceScript::LoadBossBoundaries(const BossBoundaryData& data) +void InstanceScript::LoadBossBoundaries(BossBoundaryData const& data) { for (BossBoundaryEntry const& entry : data) if (entry.bossId < bosses.size()) @@ -167,7 +167,7 @@ void InstanceScript::SetHeaders(std::string const& dataHeaders) } } -void InstanceScript::LoadMinionData(const MinionData* data) +void InstanceScript::LoadMinionData(MinionData const* data) { while (data->entry) { @@ -179,7 +179,7 @@ void InstanceScript::LoadMinionData(const MinionData* data) LOG_DEBUG("scripts.ai", "InstanceScript::LoadMinionData: {} minions loaded.", uint64(minions.size())); } -void InstanceScript::LoadDoorData(const DoorData* data) +void InstanceScript::LoadDoorData(DoorData const* data) { while (data->entry) { @@ -462,7 +462,7 @@ void InstanceScript::DoForAllMinions(uint32 id, std::function e } } -void InstanceScript::Load(const char* data) +void InstanceScript::Load(char const* data) { if (!data) { diff --git a/src/server/game/Loot/LootMgr.cpp b/src/server/game/Loot/LootMgr.cpp index d65883255..a103aab09 100644 --- a/src/server/game/Loot/LootMgr.cpp +++ b/src/server/game/Loot/LootMgr.cpp @@ -292,12 +292,12 @@ void LootStore::ReportNonExistingId(uint32 lootId) const LOG_ERROR("sql.sql", "Table '{}' Entry {} does not exist", GetName(), lootId); } -void LootStore::ReportNonExistingId(uint32 lootId, const char* ownerType, uint32 ownerId) const +void LootStore::ReportNonExistingId(uint32 lootId, char const* ownerType, uint32 ownerId) const { LOG_ERROR("sql.sql", "Table '{}' Entry {} does not exist but it is used by {} {}", GetName(), lootId, ownerType, ownerId); } -void LootStore::ReportInvalidCount(uint32 lootId, const char* ownerType, uint32 ownerId, uint32 itemId, uint8 minCount, uint8 maxCount) const +void LootStore::ReportInvalidCount(uint32 lootId, char const* ownerType, uint32 ownerId, uint32 itemId, uint8 minCount, uint8 maxCount) const { LOG_ERROR("sql.sql", "Table '{}' Entry {} used by {} entry {} item {} has minCount ( {} ) != maxCount ( {} ) which is not supported for this loot type.", GetName(), lootId, ownerType, ownerId, itemId, minCount, maxCount); } @@ -913,7 +913,7 @@ bool Loot::hasItemFor(Player* player) const QuestItemList* q_list = q_itr->second; for (QuestItemList::const_iterator qi = q_list->begin(); qi != q_list->end(); ++qi) { - const LootItem& item = quest_items[qi->index]; + LootItem const& item = quest_items[qi->index]; if (!qi->is_looted && !item.is_looted) return true; } @@ -926,7 +926,7 @@ bool Loot::hasItemFor(Player* player) const QuestItemList* ffa_list = ffa_itr->second; for (QuestItemList::const_iterator fi = ffa_list->begin(); fi != ffa_list->end(); ++fi) { - const LootItem& item = items[fi->index]; + LootItem const& item = items[fi->index]; if (!fi->is_looted && !item.is_looted) return true; } @@ -939,7 +939,7 @@ bool Loot::hasItemFor(Player* player) const QuestItemList* conditional_list = nn_itr->second; for (QuestItemList::const_iterator ci = conditional_list->begin(); ci != conditional_list->end(); ++ci) { - const LootItem& item = items[ci->index]; + LootItem const& item = items[ci->index]; if (!ci->is_looted && !item.is_looted) return true; } diff --git a/src/server/game/Loot/LootMgr.h b/src/server/game/Loot/LootMgr.h index fd2b0e8b5..9f92a1f75 100644 --- a/src/server/game/Loot/LootMgr.h +++ b/src/server/game/Loot/LootMgr.h @@ -178,7 +178,7 @@ struct LootItem // Basic checks for player/item compatibility - if false no chance to see the item in the loot bool AllowedForPlayer(Player const* player, ObjectGuid source) const; void AddAllowedLooter(Player const* player); - [[nodiscard]] const AllowedLooterSet& GetAllowedLooters() const { return allowedGUIDs; } + [[nodiscard]] AllowedLooterSet const& GetAllowedLooters() const { return allowedGUIDs; } }; struct QuestItem @@ -218,8 +218,8 @@ public: void CheckLootRefs(LootIdSet* ref_set = nullptr) const; // check existence reference and remove it from ref_set void ReportUnusedIds(LootIdSet const& ids_set) const; void ReportNonExistingId(uint32 lootId) const; - void ReportNonExistingId(uint32 lootId, const char* ownerType, uint32 ownerId) const; - void ReportInvalidCount(uint32 lootId, const char* ownerType, uint32 ownerId, uint32 itemId, uint8 minCount, uint8 maxCount) const; + void ReportNonExistingId(uint32 lootId, char const* ownerType, uint32 ownerId) const; + void ReportInvalidCount(uint32 lootId, char const* ownerType, uint32 ownerId, uint32 itemId, uint8 minCount, uint8 maxCount) const; [[nodiscard]] bool HaveLootFor(uint32 loot_id) const { return m_LootTemplates.find(loot_id) != m_LootTemplates.end(); } [[nodiscard]] bool HaveQuestLootFor(uint32 loot_id) const; diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp index b47e4c5fc..cb9056d0a 100644 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -2951,7 +2951,7 @@ void Map::LogEncounterFinished(EncounterCreditType type, uint32 creditEntry) if (Player* p = itr->GetSource()) { std::string auraStr; - const Unit::AuraApplicationMap& a = p->GetAppliedAuras(); + Unit::AuraApplicationMap const& a = p->GetAppliedAuras(); for (auto iterator = a.begin(); iterator != a.end(); ++iterator) { snprintf(buffer2, 255, "%u(%u) ", iterator->first, iterator->second->GetEffectMask()); diff --git a/src/server/game/Maps/Map.h b/src/server/game/Maps/Map.h index e91378040..3575b91ff 100644 --- a/src/server/game/Maps/Map.h +++ b/src/server/game/Maps/Map.h @@ -206,7 +206,7 @@ public: void GameObjectRelocation(GameObject* go, float x, float y, float z, float o); void DynamicObjectRelocation(DynamicObject* go, float x, float y, float z, float o); - template void Visit(const Cell& cell, TypeContainerVisitor& visitor); + template void Visit(Cell const& cell, TypeContainerVisitor& visitor); bool IsGridLoaded(GridCoord const& gridCoord) const; bool IsGridLoaded(float x, float y) const @@ -286,7 +286,7 @@ public: virtual EnterState CannotEnter(Player* /*player*/, bool /*loginCheck = false*/) { return CAN_ENTER; } - [[nodiscard]] const char* GetMapName() const; + [[nodiscard]] char const* GetMapName() const; // have meaning only for instanced map (that have set real difficulty) [[nodiscard]] Difficulty GetDifficulty() const { return Difficulty(GetSpawnMode()); } @@ -376,10 +376,10 @@ public: } MapInstanced* ToMapInstanced() { if (Instanceable()) return reinterpret_cast(this); else return nullptr; } - [[nodiscard]] MapInstanced const* ToMapInstanced() const { if (Instanceable()) return (const MapInstanced*)((MapInstanced*)this); else return nullptr; } + [[nodiscard]] MapInstanced const* ToMapInstanced() const { if (Instanceable()) return (MapInstanced const*)((MapInstanced*)this); else return nullptr; } InstanceMap* ToInstanceMap() { if (IsDungeon()) return reinterpret_cast(this); else return nullptr; } - [[nodiscard]] InstanceMap const* ToInstanceMap() const { if (IsDungeon()) return (const InstanceMap*)((InstanceMap*)this); else return nullptr; } + [[nodiscard]] InstanceMap const* ToInstanceMap() const { if (IsDungeon()) return (InstanceMap const*)((InstanceMap*)this); else return nullptr; } BattlegroundMap* ToBattlegroundMap() { if (IsBattlegroundOrArena()) return reinterpret_cast(this); else return nullptr; } [[nodiscard]] BattlegroundMap const* ToBattlegroundMap() const { if (IsBattlegroundOrArena()) return reinterpret_cast(this); return nullptr; } @@ -392,9 +392,9 @@ public: bool CanReachPositionAndGetValidCoords(WorldObject const* source, float startX, float startY, float startZ, float &destX, float &destY, float &destZ, bool failOnCollision = true, bool failOnSlopes = true) const; bool CheckCollisionAndGetValidCoords(WorldObject const* source, float startX, float startY, float startZ, float &destX, float &destY, float &destZ, bool failOnCollision = true) const; void Balance() { _mapCollisionData.GetDynamicTree().balance(); } - void RemoveGameObjectModel(const GameObjectModel& model) { _mapCollisionData.GetDynamicTree().remove(model); } - void InsertGameObjectModel(const GameObjectModel& model) { _mapCollisionData.GetDynamicTree().insert(model); } - [[nodiscard]] bool ContainsGameObjectModel(const GameObjectModel& model) const { return _mapCollisionData.GetDynamicTree().contains(model);} + void RemoveGameObjectModel(GameObjectModel const& model) { _mapCollisionData.GetDynamicTree().remove(model); } + void InsertGameObjectModel(GameObjectModel const& model) { _mapCollisionData.GetDynamicTree().insert(model); } + [[nodiscard]] bool ContainsGameObjectModel(GameObjectModel const& model) const { return _mapCollisionData.GetDynamicTree().contains(model);} [[nodiscard]] DynamicMapTree const& GetDynamicMapTree() const { return _mapCollisionData.GetDynamicTree(); } [[nodiscard]] float GetGameObjectFloor(uint32 phasemask, float x, float y, float z, float maxSearchDist = DEFAULT_HEIGHT_SEARCH) const { @@ -608,13 +608,13 @@ protected: TransportsContainer::iterator _transportsUpdateIter; private: - Player* _GetScriptPlayerSourceOrTarget(Object* source, Object* target, const ScriptInfo* scriptInfo) const; - Creature* _GetScriptCreatureSourceOrTarget(Object* source, Object* target, const ScriptInfo* scriptInfo, bool bReverse = false) const; - Unit* _GetScriptUnit(Object* obj, bool isSource, const ScriptInfo* scriptInfo) const; - Player* _GetScriptPlayer(Object* obj, bool isSource, const ScriptInfo* scriptInfo) const; - Creature* _GetScriptCreature(Object* obj, bool isSource, const ScriptInfo* scriptInfo) const; - WorldObject* _GetScriptWorldObject(Object* obj, bool isSource, const ScriptInfo* scriptInfo) const; - void _ScriptProcessDoor(Object* source, Object* target, const ScriptInfo* scriptInfo) const; + Player* _GetScriptPlayerSourceOrTarget(Object* source, Object* target, ScriptInfo const* scriptInfo) const; + Creature* _GetScriptCreatureSourceOrTarget(Object* source, Object* target, ScriptInfo const* scriptInfo, bool bReverse = false) const; + Unit* _GetScriptUnit(Object* obj, bool isSource, ScriptInfo const* scriptInfo) const; + Player* _GetScriptPlayer(Object* obj, bool isSource, ScriptInfo const* scriptInfo) const; + Creature* _GetScriptCreature(Object* obj, bool isSource, ScriptInfo const* scriptInfo) const; + WorldObject* _GetScriptWorldObject(Object* obj, bool isSource, ScriptInfo const* scriptInfo) const; + void _ScriptProcessDoor(Object* source, Object* target, ScriptInfo const* scriptInfo) const; GameObject* _FindGameObject(WorldObject* pWorldObject, ObjectGuid::LowType guid) const; //used for fast base_map (e.g. MapInstanced class object) search for diff --git a/src/server/game/Maps/MapMgr.h b/src/server/game/Maps/MapMgr.h index c2336707e..8524382c1 100644 --- a/src/server/game/Maps/MapMgr.h +++ b/src/server/game/Maps/MapMgr.h @@ -165,8 +165,8 @@ private: MapMgr(); ~MapMgr(); - MapMgr(const MapMgr&); - MapMgr& operator=(const MapMgr&); + MapMgr(MapMgr const&); + MapMgr& operator=(MapMgr const&); std::mutex Lock; MapMapType i_maps; diff --git a/src/server/game/Misc/GameGraveyard.cpp b/src/server/game/Misc/GameGraveyard.cpp index e497a9245..d5d19d477 100644 --- a/src/server/game/Misc/GameGraveyard.cpp +++ b/src/server/game/Misc/GameGraveyard.cpp @@ -416,7 +416,7 @@ void Graveyard::LoadGraveyardZones() LOG_INFO("server.loading", " "); } -GraveyardStruct const* Graveyard::GetGraveyard(const std::string& name) const +GraveyardStruct const* Graveyard::GetGraveyard(std::string const& name) const { // explicit name case std::wstring wname; @@ -427,7 +427,7 @@ GraveyardStruct const* Graveyard::GetGraveyard(const std::string& name) const wstrToLower(wname); // Alternative first GameTele what contains wnameLow as substring in case no GameTele location found - const GraveyardStruct* alt = nullptr; + GraveyardStruct const* alt = nullptr; for (GraveyardContainer::const_iterator itr = _graveyardStore.begin(); itr != _graveyardStore.end(); ++itr) { if (itr->second.wnameLow == wname) diff --git a/src/server/game/Misc/GameGraveyard.h b/src/server/game/Misc/GameGraveyard.h index 1ba22d1f7..1ea59c204 100644 --- a/src/server/game/Misc/GameGraveyard.h +++ b/src/server/game/Misc/GameGraveyard.h @@ -54,7 +54,7 @@ public: typedef std::unordered_map GraveyardContainer; GraveyardStruct const* GetGraveyard(uint32 ID) const; - GraveyardStruct const* GetGraveyard(const std::string& name) const; + GraveyardStruct const* GetGraveyard(std::string const& name) const; GraveyardStruct const* GetDefaultGraveyard(TeamId teamId); GraveyardStruct const* GetClosestGraveyard(Player* player, TeamId teamId, bool nearCorpse = false); GraveyardData const* FindGraveyardData(uint32 id, uint32 zone); diff --git a/src/server/game/Movement/MotionMaster.cpp b/src/server/game/Movement/MotionMaster.cpp index 96b7f470f..1b5812272 100644 --- a/src/server/game/Movement/MotionMaster.cpp +++ b/src/server/game/Movement/MotionMaster.cpp @@ -738,7 +738,7 @@ void MotionMaster::MoveFall(uint32 id /*=0*/, bool addFlagForNPC) /** * @brief The unit will charge the target. Doesn't work with UNIT_FLAG_DISABLE_MOVE */ -void MotionMaster::MoveCharge(float x, float y, float z, float speed, uint32 id, const Movement::PointsArray* path, bool generatePath, float orientation /* = 0.0f*/, ObjectGuid targetGUID /*= ObjectGuid::Empty*/) +void MotionMaster::MoveCharge(float x, float y, float z, float speed, uint32 id, Movement::PointsArray const* path, bool generatePath, float orientation /* = 0.0f*/, ObjectGuid targetGUID /*= ObjectGuid::Empty*/) { if (_owner->HasUnitFlag(UNIT_FLAG_DISABLE_MOVE)) return; diff --git a/src/server/game/Movement/MotionMaster.h b/src/server/game/Movement/MotionMaster.h index c33c29473..2d83a86c9 100644 --- a/src/server/game/Movement/MotionMaster.h +++ b/src/server/game/Movement/MotionMaster.h @@ -237,7 +237,7 @@ public: void MoveForwards(Unit* target, float dist); void MoveConfused(); void MoveFleeing(Unit* enemy, uint32 time = 0); - void MovePoint(uint32 id, const Position& pos, ForcedMovement forcedMovement = FORCED_MOVEMENT_NONE, float speed = 0.f, bool generatePath = true, bool forceDestination = true, std::optional animTier = std::nullopt) + void MovePoint(uint32 id, Position const& pos, ForcedMovement forcedMovement = FORCED_MOVEMENT_NONE, float speed = 0.f, bool generatePath = true, bool forceDestination = true, std::optional animTier = std::nullopt) { MovePoint(id, pos.m_positionX, pos.m_positionY, pos.m_positionZ, forcedMovement, speed, pos.GetOrientation(), generatePath, forceDestination, MOTION_SLOT_ACTIVE, animTier); } void MovePoint(uint32 id, float x, float y, float z, ForcedMovement forcedMovement = FORCED_MOVEMENT_NONE, float speed = 0.f, float orientation = 0.0f, bool generatePath = true, bool forceDestination = true, MovementSlot slot = MOTION_SLOT_ACTIVE, std::optional animTier = std::nullopt); void MoveSplinePath(Movement::PointsArray* path, ForcedMovement forcedMovement = FORCED_MOVEMENT_NONE); @@ -249,7 +249,7 @@ public: void MoveTakeoff(uint32 id, Position const& pos, float speed = 0.0f, bool skipAnimation = false); void MoveTakeoff(uint32 id, float x, float y, float z, float speed = 0.0f, bool skipAnimation = false); // pussywizard: added for easy calling by passing 3 floats x, y, z - void MoveCharge(float x, float y, float z, float speed = SPEED_CHARGE, uint32 id = EVENT_CHARGE, const Movement::PointsArray* path = nullptr, bool generatePath = false, float orientation = 0.0f, ObjectGuid targetGUID = ObjectGuid::Empty); + void MoveCharge(float x, float y, float z, float speed = SPEED_CHARGE, uint32 id = EVENT_CHARGE, Movement::PointsArray const* path = nullptr, bool generatePath = false, float orientation = 0.0f, ObjectGuid targetGUID = ObjectGuid::Empty); void MoveCharge(PathGenerator const& path, float speed = SPEED_CHARGE, ObjectGuid targetGUID = ObjectGuid::Empty); void MoveKnockbackFrom(float srcX, float srcY, float speedXY, float speedZ); void MoveJumpTo(float angle, float speedXY, float speedZ); diff --git a/src/server/game/Movement/MovementGenerators/PathGenerator.cpp b/src/server/game/Movement/MovementGenerators/PathGenerator.cpp index 9f92d18f4..fddbb29d7 100644 --- a/src/server/game/Movement/MovementGenerators/PathGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/PathGenerator.cpp @@ -612,7 +612,7 @@ void PathGenerator::BuildPolyPath(G3D::Vector3 const& startPos, G3D::Vector3 con BuildPointPath(startPoint, endPoint); } -void PathGenerator::BuildPointPath(const float* startPoint, const float* endPoint) +void PathGenerator::BuildPointPath(float const* startPoint, float const* endPoint) { float pathPoints[MAX_POINT_PATH_LENGTH * VERTEX_SIZE]; uint32 pointCount = 0; @@ -814,7 +814,7 @@ NavTerrain PathGenerator::GetNavTerrain(float x, float y, float z) const } } -bool PathGenerator::HaveTile(const G3D::Vector3& p) const +bool PathGenerator::HaveTile(G3D::Vector3 const& p) const { int tx = -1, ty = -1; float point[VERTEX_SIZE] = { p.y, p.z, p.x }; diff --git a/src/server/game/Movement/MovementGenerators/PointMovementGenerator.h b/src/server/game/Movement/MovementGenerators/PointMovementGenerator.h index b30db5ed2..5099c1b36 100644 --- a/src/server/game/Movement/MovementGenerators/PointMovementGenerator.h +++ b/src/server/game/Movement/MovementGenerators/PointMovementGenerator.h @@ -27,7 +27,7 @@ template class PointMovementGenerator : public MovementGeneratorMedium< T, PointMovementGenerator > { public: - PointMovementGenerator(uint32 _id, float _x, float _y, float _z, ForcedMovement forcedMovement, float _speed = 0.0f, float orientation = 0.0f, const Movement::PointsArray* _path = nullptr, + PointMovementGenerator(uint32 _id, float _x, float _y, float _z, ForcedMovement forcedMovement, float _speed = 0.0f, float orientation = 0.0f, Movement::PointsArray const* _path = nullptr, bool generatePath = false, bool forceDestination = false, std::optional animTier = std::nullopt, ObjectGuid chargeTargetGUID = ObjectGuid::Empty, bool reverseOrientation = false, ObjectGuid facingTargetGuid = ObjectGuid()) : id(_id), i_x(_x), i_y(_y), i_z(_z), speed(_speed), i_orientation(orientation), _generatePath(generatePath), _forceDestination(forceDestination), _reverseOrientation(reverseOrientation), _chargeTargetGUID(chargeTargetGUID), _forcedMovement(forcedMovement), _facingTargetGuid(facingTargetGuid), _animTier(animTier) diff --git a/src/server/game/Movement/Spline/MoveSpline.cpp b/src/server/game/Movement/Spline/MoveSpline.cpp index f10f055be..1ef4ea3d8 100644 --- a/src/server/game/Movement/Spline/MoveSpline.cpp +++ b/src/server/game/Movement/Spline/MoveSpline.cpp @@ -119,7 +119,7 @@ namespace Movement int32 _time; }; - void MoveSpline::init_spline(const MoveSplineInitArgs& args) + void MoveSpline::init_spline(MoveSplineInitArgs const& args) { const SplineBase::EvaluationMode modes[2] = {SplineBase::ModeLinear, SplineBase::ModeCatmullrom}; if (args.flags.cyclic) diff --git a/src/server/game/Movement/Spline/MoveSpline.h b/src/server/game/Movement/Spline/MoveSpline.h index 07cfcb41f..2261f47f7 100644 --- a/src/server/game/Movement/Spline/MoveSpline.h +++ b/src/server/game/Movement/Spline/MoveSpline.h @@ -27,8 +27,8 @@ namespace Movement { Location() = default; Location(float x, float y, float z, float o) : Vector3(x, y, z), orientation(o) {} - Location(const Vector3& v) : Vector3(v) {} - Location(const Vector3& v, float o) : Vector3(v), orientation(o) {} + Location(Vector3 const& v) : Vector3(v) {} + Location(Vector3 const& v, float o) : Vector3(v), orientation(o) {} float orientation{0}; }; @@ -69,10 +69,10 @@ namespace Movement int32 point_Idx; int32 point_Idx_offset; - void init_spline(const MoveSplineInitArgs& args); + void init_spline(MoveSplineInitArgs const& args); protected: - [[nodiscard]] const MySpline::ControlArray& getPath() const { return spline.getPoints(); } + [[nodiscard]] MySpline::ControlArray const& getPath() const { return spline.getPoints(); } void computeParabolicElevation(float& el) const; void computeFallElevation(float& el) const; @@ -91,7 +91,7 @@ namespace Movement void _Interrupt() { splineflags.done = true; } public: - void Initialize(const MoveSplineInitArgs&); + void Initialize(MoveSplineInitArgs const&); [[nodiscard]] bool Initialized() const { return !spline.empty(); } MoveSpline(); diff --git a/src/server/game/Movement/Spline/MoveSplineFlag.h b/src/server/game/Movement/Spline/MoveSplineFlag.h index 08c9c3d6a..d8bbeef52 100644 --- a/src/server/game/Movement/Spline/MoveSplineFlag.h +++ b/src/server/game/Movement/Spline/MoveSplineFlag.h @@ -74,13 +74,13 @@ namespace Movement }; inline uint32& raw() { return (uint32&) * this; } - [[nodiscard]] inline const uint32& raw() const { return (const uint32&) * this; } + [[nodiscard]] inline uint32 const& raw() const { return (uint32 const&) * this; } MoveSplineFlag() { raw() = 0; } MoveSplineFlag(uint32 f) { raw() = f; } - MoveSplineFlag(const MoveSplineFlag& f) { raw() = f.raw(); } + MoveSplineFlag(MoveSplineFlag const& f) { raw() = f.raw(); } MoveSplineFlag(MoveSplineFlag&&) = default; - MoveSplineFlag& operator=(const MoveSplineFlag&) = default; + MoveSplineFlag& operator=(MoveSplineFlag const&) = default; MoveSplineFlag& operator=(MoveSplineFlag&&) = default; // Constant interface diff --git a/src/server/game/Movement/Spline/MoveSplineInit.cpp b/src/server/game/Movement/Spline/MoveSplineInit.cpp index 16b58a45d..d28b07425 100644 --- a/src/server/game/Movement/Spline/MoveSplineInit.cpp +++ b/src/server/game/Movement/Spline/MoveSplineInit.cpp @@ -218,7 +218,7 @@ namespace Movement args.path[1] = transform(dest); } - void MoveSplineInit::MoveTo(const Vector3& dest, bool generatePath, bool forceDestination) + void MoveSplineInit::MoveTo(Vector3 const& dest, bool generatePath, bool forceDestination) { if (generatePath) { diff --git a/src/server/game/Movement/Spline/MoveSplineInit.h b/src/server/game/Movement/Spline/MoveSplineInit.h index 16120d9bb..01c4dfef7 100644 --- a/src/server/game/Movement/Spline/MoveSplineInit.h +++ b/src/server/game/Movement/Spline/MoveSplineInit.h @@ -95,12 +95,12 @@ namespace Movement * @param path - array of points, shouldn't be empty * @param pointId - Id of fisrt point of the path. Example: when third path point will be done it will notify that pointId + 3 done */ - void MovebyPath(const PointsArray& path, int32 pointId = 0); + void MovebyPath(PointsArray const& path, int32 pointId = 0); /* Initializes simple A to B motion, A is current unit's position, B is destination */ void MoveTo(Vector3 const& start, Vector3 const& destination, bool generatePath = true, bool forceDestination = false); - void MoveTo(const Vector3& destination, bool generatePath = false, bool forceDestination = false); + void MoveTo(Vector3 const& destination, bool generatePath = false, bool forceDestination = false); void MoveTo(float x, float y, float z, bool generatePath = false, bool forceDestination = false); /* Sets Id of fisrt point of the path. When N-th path point will be done ILisener will notify that pointId + N done @@ -165,7 +165,7 @@ namespace Movement inline void MoveSplineInit::SetTransportExit() { args.flags.EnableTransportExit(); } inline void MoveSplineInit::SetOrientationFixed(bool enable) { args.flags.orientationFixed = enable; } - inline void MoveSplineInit::MovebyPath(const PointsArray& controls, int32 path_offset) + inline void MoveSplineInit::MovebyPath(PointsArray const& controls, int32 path_offset) { args.path_Idx_offset = path_offset; args.path.resize(controls.size()); diff --git a/src/server/game/Movement/Spline/MovementPacketBuilder.cpp b/src/server/game/Movement/Spline/MovementPacketBuilder.cpp index 7aa6838d8..593dd6973 100644 --- a/src/server/game/Movement/Spline/MovementPacketBuilder.cpp +++ b/src/server/game/Movement/Spline/MovementPacketBuilder.cpp @@ -21,7 +21,7 @@ namespace Movement { - inline void operator << (ByteBuffer& b, const Vector3& v) + inline void operator << (ByteBuffer& b, Vector3 const& v) { b << v.x << v.y << v.z; } @@ -40,7 +40,7 @@ namespace Movement MonsterMoveFacingAngle = 4 }; - void PacketBuilder::WriteCommonMonsterMovePart(const MoveSpline& move_spline, ByteBuffer& data) + void PacketBuilder::WriteCommonMonsterMovePart(MoveSpline const& move_spline, ByteBuffer& data) { MoveSplineFlag splineflags = move_spline.splineflags; @@ -96,10 +96,10 @@ namespace Movement data << uint8(MonsterMoveStop); } - void WriteLinearPath(const Spline& spline, ByteBuffer& data) + void WriteLinearPath(Spline const& spline, ByteBuffer& data) { uint32 last_idx = spline.getPointCount() - 3; - const Vector3* real_path = &spline.getPoint(1); + Vector3 const* real_path = &spline.getPoint(1); data << last_idx; data << real_path[last_idx]; // destination @@ -116,14 +116,14 @@ namespace Movement } } - void WriteCatmullRomPath(const Spline& spline, ByteBuffer& data) + void WriteCatmullRomPath(Spline const& spline, ByteBuffer& data) { uint32 count = spline.getPointCount() - 3; data << count; data.append(&spline.getPoint(2), count); } - void WriteCatmullRomCyclicPath(const Spline& spline, ByteBuffer& data, bool flying) + void WriteCatmullRomCyclicPath(Spline const& spline, ByteBuffer& data, bool flying) { uint32 count = spline.getPointCount() - 3; data << uint32(count + 1); @@ -139,11 +139,11 @@ namespace Movement } } - void PacketBuilder::WriteMonsterMove(const MoveSpline& move_spline, ByteBuffer& data) + void PacketBuilder::WriteMonsterMove(MoveSpline const& move_spline, ByteBuffer& data) { WriteCommonMonsterMovePart(move_spline, data); - const Spline& spline = move_spline.spline; + Spline const& spline = move_spline.spline; MoveSplineFlag splineflags = move_spline.splineflags; if (splineflags & MoveSplineFlag::Mask_CatmullRom) { @@ -156,7 +156,7 @@ namespace Movement WriteLinearPath(spline, data); } - void PacketBuilder::WriteCreate(const MoveSpline& move_spline, ByteBuffer& data) + void PacketBuilder::WriteCreate(MoveSpline const& move_spline, ByteBuffer& data) { //WriteClientStatus(mov, data); //data.append(&mov.m_float_values[SpeedWalk], SpeedMaxCount); diff --git a/src/server/game/Movement/Spline/MovementPacketBuilder.h b/src/server/game/Movement/Spline/MovementPacketBuilder.h index 7177f7274..7160f0b00 100644 --- a/src/server/game/Movement/Spline/MovementPacketBuilder.h +++ b/src/server/game/Movement/Spline/MovementPacketBuilder.h @@ -33,11 +33,11 @@ namespace Movement class MoveSpline; class PacketBuilder { - static void WriteCommonMonsterMovePart(const MoveSpline& mov, ByteBuffer& data); + static void WriteCommonMonsterMovePart(MoveSpline const& mov, ByteBuffer& data); public: - static void WriteMonsterMove(const MoveSpline& mov, ByteBuffer& data); + static void WriteMonsterMove(MoveSpline const& mov, ByteBuffer& data); static void WriteStopMovement(Vector3 const& loc, uint32 splineId, ByteBuffer& data); - static void WriteCreate(const MoveSpline& mov, ByteBuffer& data); + static void WriteCreate(MoveSpline const& mov, ByteBuffer& data); }; } #endif // AC_PACKET_BUILDER_H diff --git a/src/server/game/Movement/Spline/Spline.cpp b/src/server/game/Movement/Spline/Spline.cpp index 5baf32027..c33b5abb6 100644 --- a/src/server/game/Movement/Spline/Spline.cpp +++ b/src/server/game/Movement/Spline/Spline.cpp @@ -94,7 +94,7 @@ namespace Movement position.z = z; }*/ - inline void C_Evaluate(const Vector3* vertice, float t, const Matrix4& matr, Vector3& result) + inline void C_Evaluate(Vector3 const* vertice, float t, Matrix4 const& matr, Vector3& result) { Vector4 tvec(t * t * t, t * t, t, 1.f); Vector4 weights(tvec * matr); @@ -103,7 +103,7 @@ namespace Movement + vertice[2] * weights[2] + vertice[3] * weights[3]; } - inline void C_Evaluate_Derivative(const Vector3* vertice, float t, const Matrix4& matr, Vector3& result) + inline void C_Evaluate_Derivative(Vector3 const* vertice, float t, Matrix4 const& matr, Vector3& result) { Vector4 tvec(3.f * t * t, 2.f * t, 1.f, 0.f); Vector4 weights(tvec * matr); @@ -161,7 +161,7 @@ namespace Movement ASSERT(index >= index_lo && index < index_hi); Vector3 curPos, nextPos; - const Vector3* p = &points[index - 1]; + Vector3 const* p = &points[index - 1]; curPos = nextPos = p[1]; index_type i = 1; @@ -182,7 +182,7 @@ namespace Movement ASSERT(index >= index_lo && index < index_hi); Vector3 curPos, nextPos; - const Vector3* p = &points[index]; + Vector3 const* p = &points[index]; C_Evaluate(p, 0.f, s_Bezier3Coeffs, nextPos); curPos = nextPos; @@ -199,7 +199,7 @@ namespace Movement return length; } - void SplineBase::init_spline(const Vector3* controls, index_type count, EvaluationMode m, float orientation) + void SplineBase::init_spline(Vector3 const* controls, index_type count, EvaluationMode m, float orientation) { m_mode = m; cyclic = false; @@ -208,7 +208,7 @@ namespace Movement (this->*initializers[m_mode])(controls, count, cyclic, 0); } - void SplineBase::init_cyclic_spline(const Vector3* controls, index_type count, EvaluationMode m, index_type cyclic_point, float orientation) + void SplineBase::init_cyclic_spline(Vector3 const* controls, index_type count, EvaluationMode m, index_type cyclic_point, float orientation) { m_mode = m; cyclic = true; @@ -217,7 +217,7 @@ namespace Movement (this->*initializers[m_mode])(controls, count, cyclic, cyclic_point); } - void SplineBase::InitLinear(const Vector3* controls, index_type count, bool cyclic, index_type cyclic_point) + void SplineBase::InitLinear(Vector3 const* controls, index_type count, bool cyclic, index_type cyclic_point) { ASSERT(count >= 2); const int real_size = count + 1; @@ -237,7 +237,7 @@ namespace Movement index_hi = cyclic ? count : (count - 1); } - void SplineBase::InitCatmullRom(const Vector3* controls, index_type count, bool cyclic, index_type cyclic_point) + void SplineBase::InitCatmullRom(Vector3 const* controls, index_type count, bool cyclic, index_type cyclic_point) { const int real_size = count + (cyclic ? (1 + 2) : (1 + 1)); @@ -274,7 +274,7 @@ namespace Movement index_hi = high_index + (cyclic ? 1 : 0); } - void SplineBase::InitBezier3(const Vector3* controls, index_type count, bool /*cyclic*/, index_type /*cyclic_point*/) + void SplineBase::InitBezier3(Vector3 const* controls, index_type count, bool /*cyclic*/, index_type /*cyclic_point*/) { index_type c = count / 3u * 3u; index_type t = c / 3u; @@ -297,7 +297,7 @@ namespace Movement std::string SplineBase::ToString() const { std::stringstream str; - const char* mode_str[ModesEnd] = {"Linear", "CatmullRom", "Bezier3", "Uninitialized"}; + char const* mode_str[ModesEnd] = {"Linear", "CatmullRom", "Bezier3", "Uninitialized"}; index_type count = this->points.size(); str << "mode: " << mode_str[mode()] << std::endl; diff --git a/src/server/game/Movement/Spline/Spline.h b/src/server/game/Movement/Spline/Spline.h index ef0b6aee5..e5c5e2c27 100644 --- a/src/server/game/Movement/Spline/Spline.h +++ b/src/server/game/Movement/Spline/Spline.h @@ -78,10 +78,10 @@ namespace Movement typedef float (SplineBase::*SegLenghtMethtod)(index_type) const; static SegLenghtMethtod seglengths[ModesEnd]; - void InitLinear(const Vector3*, index_type, bool, index_type); - void InitCatmullRom(const Vector3*, index_type, bool, index_type); - void InitBezier3(const Vector3*, index_type, bool, index_type); - typedef void (SplineBase::*InitMethtod)(const Vector3*, index_type, bool, index_type); + void InitLinear(Vector3 const*, index_type, bool, index_type); + void InitCatmullRom(Vector3 const*, index_type, bool, index_type); + void InitBezier3(Vector3 const*, index_type, bool, index_type); + typedef void (SplineBase::*InitMethtod)(Vector3 const*, index_type, bool, index_type); static InitMethtod initializers[ModesEnd]; void UninitializedSplineEvaluationMethod(index_type, float, Vector3&) const { ABORT(); } @@ -112,13 +112,13 @@ namespace Movement [[nodiscard]] bool isCyclic() const { return cyclic;} // Xinef: DO NOT USE EXCEPT FOR SPLINE INITIALIZATION!!!!!! - [[nodiscard]] const ControlArray& getPoints() const { return points;} + [[nodiscard]] ControlArray const& getPoints() const { return points;} [[nodiscard]] index_type getPointCount() const { return points.size();} - [[nodiscard]] const Vector3& getPoint(index_type i) const { return points[i];} + [[nodiscard]] Vector3 const& getPoint(index_type i) const { return points[i];} /** Initializes spline. Don't call other methods while spline not initialized. */ - void init_spline(const Vector3* controls, index_type count, EvaluationMode m, float orientation); - void init_cyclic_spline(const Vector3* controls, index_type count, EvaluationMode m, index_type cyclic_point, float orientation); + void init_spline(Vector3 const* controls, index_type count, EvaluationMode m, float orientation); + void init_cyclic_spline(Vector3 const* controls, index_type count, EvaluationMode m, index_type cyclic_point, float orientation); /** As i can see there are a lot of ways how spline can be initialized would be no harm to have some custom initializers. */ @@ -171,8 +171,8 @@ namespace Movement void computeIndex(float t, index_type& out_idx, float& out_u) const; /** Initializes spline. Don't call other methods while spline not initialized. */ - void init_spline(const Vector3* controls, index_type count, EvaluationMode m, float orientation = 0) { SplineBase::init_spline(controls, count, m, orientation);} - void init_cyclic_spline(const Vector3* controls, index_type count, EvaluationMode m, index_type cyclic_point, float orientation = 0) { SplineBase::init_cyclic_spline(controls, count, m, cyclic_point, orientation);} + void init_spline(Vector3 const* controls, index_type count, EvaluationMode m, float orientation = 0) { SplineBase::init_spline(controls, count, m, orientation);} + void init_cyclic_spline(Vector3 const* controls, index_type count, EvaluationMode m, index_type cyclic_point, float orientation = 0) { SplineBase::init_cyclic_spline(controls, count, m, cyclic_point, orientation);} /** Initializes lengths with SplineBase::SegLength method. */ void initLengths(); diff --git a/src/server/game/OutdoorPvP/OutdoorPvP.cpp b/src/server/game/OutdoorPvP/OutdoorPvP.cpp index fcc5de454..6ea63c3ab 100644 --- a/src/server/game/OutdoorPvP/OutdoorPvP.cpp +++ b/src/server/game/OutdoorPvP/OutdoorPvP.cpp @@ -73,7 +73,7 @@ void OPvPCapturePoint::AddGO(uint32 type, ObjectGuid::LowType guid, uint32 entry { if (!entry) { - const GameObjectData* data = sObjectMgr->GetGameObjectData(guid); + GameObjectData const* data = sObjectMgr->GetGameObjectData(guid); if (!data) { return; @@ -90,7 +90,7 @@ void OPvPCapturePoint::AddCre(uint32 type, ObjectGuid::LowType guid, uint32 entr { if (!entry) { - const CreatureData* data = sObjectMgr->GetCreatureData(guid); + CreatureData const* data = sObjectMgr->GetCreatureData(guid); if (!data) { return; diff --git a/src/server/game/Quests/QuestDef.cpp b/src/server/game/Quests/QuestDef.cpp index 867471737..80149f93e 100644 --- a/src/server/game/Quests/QuestDef.cpp +++ b/src/server/game/Quests/QuestDef.cpp @@ -199,7 +199,7 @@ void Quest::LoadQuestTemplateAddon(Field* fields) uint32 Quest::XPValue(uint8 playerLevel) const { int32 quest_level = (Level == -1 ? playerLevel : Level); - const QuestXPEntry* xpentry = sQuestXPStore.LookupEntry(quest_level); + QuestXPEntry const* xpentry = sQuestXPStore.LookupEntry(quest_level); if (!xpentry) { return 0; diff --git a/src/server/game/Reputation/ReputationMgr.cpp b/src/server/game/Reputation/ReputationMgr.cpp index a02c3b604..4c1c9eb65 100644 --- a/src/server/game/Reputation/ReputationMgr.cpp +++ b/src/server/game/Reputation/ReputationMgr.cpp @@ -301,7 +301,7 @@ bool ReputationMgr::SetReputation(FactionEntry const* factionEntry, float standi if (!noSpillOver) { // if spillover definition exists in DB, override DBC - if (const RepSpilloverTemplate* repTemplate = sObjectMgr->GetRepSpilloverTemplate(factionEntry->ID)) + if (RepSpilloverTemplate const* repTemplate = sObjectMgr->GetRepSpilloverTemplate(factionEntry->ID)) { for (uint32 i = 0; i < MAX_SPILLOVER_FACTIONS; ++i) { diff --git a/src/server/game/Scripting/MapScripts.cpp b/src/server/game/Scripting/MapScripts.cpp index 321b02c92..579bf471d 100644 --- a/src/server/game/Scripting/MapScripts.cpp +++ b/src/server/game/Scripting/MapScripts.cpp @@ -95,7 +95,7 @@ void Map::ScriptCommandStart(ScriptInfo const& script, uint32 delay, Object* sou } // Helpers for ScriptProcess method. -inline Player* Map::_GetScriptPlayerSourceOrTarget(Object* source, Object* target, const ScriptInfo* scriptInfo) const +inline Player* Map::_GetScriptPlayerSourceOrTarget(Object* source, Object* target, ScriptInfo const* scriptInfo) const { Player* player = nullptr; if (!source && !target) @@ -117,7 +117,7 @@ inline Player* Map::_GetScriptPlayerSourceOrTarget(Object* source, Object* targe return player; } -inline Creature* Map::_GetScriptCreatureSourceOrTarget(Object* source, Object* target, const ScriptInfo* scriptInfo, bool bReverse) const +inline Creature* Map::_GetScriptCreatureSourceOrTarget(Object* source, Object* target, ScriptInfo const* scriptInfo, bool bReverse) const { Creature* creature = nullptr; if (!source && !target) @@ -150,7 +150,7 @@ inline Creature* Map::_GetScriptCreatureSourceOrTarget(Object* source, Object* t return creature; } -inline Unit* Map::_GetScriptUnit(Object* obj, bool isSource, const ScriptInfo* scriptInfo) const +inline Unit* Map::_GetScriptUnit(Object* obj, bool isSource, ScriptInfo const* scriptInfo) const { Unit* unit = nullptr; if (!obj) @@ -168,7 +168,7 @@ inline Unit* Map::_GetScriptUnit(Object* obj, bool isSource, const ScriptInfo* s return unit; } -inline Player* Map::_GetScriptPlayer(Object* obj, bool isSource, const ScriptInfo* scriptInfo) const +inline Player* Map::_GetScriptPlayer(Object* obj, bool isSource, ScriptInfo const* scriptInfo) const { Player* player = nullptr; if (!obj) @@ -183,7 +183,7 @@ inline Player* Map::_GetScriptPlayer(Object* obj, bool isSource, const ScriptInf return player; } -inline Creature* Map::_GetScriptCreature(Object* obj, bool isSource, const ScriptInfo* scriptInfo) const +inline Creature* Map::_GetScriptCreature(Object* obj, bool isSource, ScriptInfo const* scriptInfo) const { Creature* creature = nullptr; if (!obj) @@ -198,7 +198,7 @@ inline Creature* Map::_GetScriptCreature(Object* obj, bool isSource, const Scrip return creature; } -inline WorldObject* Map::_GetScriptWorldObject(Object* obj, bool isSource, const ScriptInfo* scriptInfo) const +inline WorldObject* Map::_GetScriptWorldObject(Object* obj, bool isSource, ScriptInfo const* scriptInfo) const { WorldObject* pWorldObject = nullptr; if (!obj) @@ -214,7 +214,7 @@ inline WorldObject* Map::_GetScriptWorldObject(Object* obj, bool isSource, const return pWorldObject; } -inline void Map::_ScriptProcessDoor(Object* source, Object* target, const ScriptInfo* scriptInfo) const +inline void Map::_ScriptProcessDoor(Object* source, Object* target, ScriptInfo const* scriptInfo) const { bool bOpen = false; ObjectGuid::LowType guid = scriptInfo->ToggleDoor.GOGuid; diff --git a/src/server/game/Scripting/ScriptDefines/ALEScript.cpp b/src/server/game/Scripting/ScriptDefines/ALEScript.cpp index 480ddaa51..9a0fb6728 100644 --- a/src/server/game/Scripting/ScriptDefines/ALEScript.cpp +++ b/src/server/game/Scripting/ScriptDefines/ALEScript.cpp @@ -18,7 +18,7 @@ #include "ALEScript.h" #include "ScriptMgr.h" -ALEScript::ALEScript(const char* name) : ScriptObject(name) +ALEScript::ALEScript(char const* name) : ScriptObject(name) { ScriptRegistry::AddScript(this); } diff --git a/src/server/game/Scripting/ScriptDefines/ALEScript.h b/src/server/game/Scripting/ScriptDefines/ALEScript.h index a95c05d48..eb765b011 100644 --- a/src/server/game/Scripting/ScriptDefines/ALEScript.h +++ b/src/server/game/Scripting/ScriptDefines/ALEScript.h @@ -23,7 +23,7 @@ class ALEScript : public ScriptObject { protected: - ALEScript(const char* name); + ALEScript(char const* name); public: /** diff --git a/src/server/game/Scripting/ScriptDefines/AccountScript.h b/src/server/game/Scripting/ScriptDefines/AccountScript.h index 038663ee3..049ca6bfa 100644 --- a/src/server/game/Scripting/ScriptDefines/AccountScript.h +++ b/src/server/game/Scripting/ScriptDefines/AccountScript.h @@ -38,7 +38,7 @@ enum AccountHook class AccountScript : public ScriptObject { protected: - AccountScript(const char* name, std::vector enabledHooks = std::vector()); + AccountScript(char const* name, std::vector enabledHooks = std::vector()); public: // Called when an account logged in successfully diff --git a/src/server/game/Scripting/ScriptDefines/AchievementCriteriaScript.h b/src/server/game/Scripting/ScriptDefines/AchievementCriteriaScript.h index 9de6ad446..7d248fd86 100644 --- a/src/server/game/Scripting/ScriptDefines/AchievementCriteriaScript.h +++ b/src/server/game/Scripting/ScriptDefines/AchievementCriteriaScript.h @@ -23,7 +23,7 @@ class AchievementCriteriaScript : public ScriptObject { protected: - AchievementCriteriaScript(const char* name); + AchievementCriteriaScript(char const* name); public: [[nodiscard]] bool IsDatabaseBound() const override { return true; } diff --git a/src/server/game/Scripting/ScriptDefines/AchievementScript.cpp b/src/server/game/Scripting/ScriptDefines/AchievementScript.cpp index af8490737..84cebfe1f 100644 --- a/src/server/game/Scripting/ScriptDefines/AchievementScript.cpp +++ b/src/server/game/Scripting/ScriptDefines/AchievementScript.cpp @@ -44,7 +44,7 @@ bool ScriptMgr::CanCheckCriteria(AchievementMgr* mgr, AchievementCriteriaEntry c CALL_ENABLED_BOOLEAN_HOOKS(AchievementScript, ACHIEVEMENTHOOK_CAN_CHECK_CRITERIA, !script->CanCheckCriteria(mgr, achievementCriteria)); } -AchievementScript::AchievementScript(const char* name, std::vector enabledHooks) +AchievementScript::AchievementScript(char const* name, std::vector enabledHooks) : ScriptObject(name, ACHIEVEMENTHOOK_END) { // If empty - enable all available hooks. diff --git a/src/server/game/Scripting/ScriptDefines/AchievementScript.h b/src/server/game/Scripting/ScriptDefines/AchievementScript.h index 04c7e6204..8280a0935 100644 --- a/src/server/game/Scripting/ScriptDefines/AchievementScript.h +++ b/src/server/game/Scripting/ScriptDefines/AchievementScript.h @@ -36,7 +36,7 @@ enum AchievementHook class AchievementScript : public ScriptObject { protected: - AchievementScript(const char* name, std::vector enabledHooks = std::vector()); + AchievementScript(char const* name, std::vector enabledHooks = std::vector()); public: [[nodiscard]] bool IsDatabaseBound() const override { return false; } diff --git a/src/server/game/Scripting/ScriptDefines/AllBattlegroundScript.h b/src/server/game/Scripting/ScriptDefines/AllBattlegroundScript.h index f1aaca7b3..2c164b49d 100644 --- a/src/server/game/Scripting/ScriptDefines/AllBattlegroundScript.h +++ b/src/server/game/Scripting/ScriptDefines/AllBattlegroundScript.h @@ -57,7 +57,7 @@ struct GroupQueueInfo; class AllBattlegroundScript : public ScriptObject { protected: - AllBattlegroundScript(const char* name, std::vector enabledHooks = std::vector()); + AllBattlegroundScript(char const* name, std::vector enabledHooks = std::vector()); public: [[nodiscard]] bool IsDatabaseBound() const override { return false; } diff --git a/src/server/game/Scripting/ScriptDefines/AllCommandScript.cpp b/src/server/game/Scripting/ScriptDefines/AllCommandScript.cpp index 0a5e795bb..e535f6276 100644 --- a/src/server/game/Scripting/ScriptDefines/AllCommandScript.cpp +++ b/src/server/game/Scripting/ScriptDefines/AllCommandScript.cpp @@ -35,7 +35,7 @@ bool ScriptMgr::OnBeforeIsInvokerVisible(std::string name, Acore::Impl::ChatComm CALL_ENABLED_BOOLEAN_HOOKS(AllCommandScript, ALLCOMMANDHOOK_ON_BEFORE_IS_INVOKER_VISIBLE, !script->OnBeforeIsInvokerVisible(name, permissions, who)); } -AllCommandScript::AllCommandScript(const char* name, std::vector enabledHooks) +AllCommandScript::AllCommandScript(char const* name, std::vector enabledHooks) : ScriptObject(name, ALLCOMMANDHOOK_END) { // If empty - enable all available hooks. diff --git a/src/server/game/Scripting/ScriptDefines/AllCommandScript.h b/src/server/game/Scripting/ScriptDefines/AllCommandScript.h index 87d124739..9420f3078 100644 --- a/src/server/game/Scripting/ScriptDefines/AllCommandScript.h +++ b/src/server/game/Scripting/ScriptDefines/AllCommandScript.h @@ -33,7 +33,7 @@ enum AllCommandHook class AllCommandScript : public ScriptObject { protected: - AllCommandScript(const char* name, std::vector enabledHooks = std::vector()); + AllCommandScript(char const* name, std::vector enabledHooks = std::vector()); public: [[nodiscard]] bool IsDatabaseBound() const override { return false; } diff --git a/src/server/game/Scripting/ScriptDefines/AllCreatureScript.cpp b/src/server/game/Scripting/ScriptDefines/AllCreatureScript.cpp index 1093a4479..119809d48 100644 --- a/src/server/game/Scripting/ScriptDefines/AllCreatureScript.cpp +++ b/src/server/game/Scripting/ScriptDefines/AllCreatureScript.cpp @@ -49,7 +49,7 @@ void ScriptMgr::OnCreatureSaveToDB(Creature* creature) }); } -void ScriptMgr::OnBeforeCreatureSelectLevel(const CreatureTemplate* cinfo, Creature* creature, uint8& level) +void ScriptMgr::OnBeforeCreatureSelectLevel(CreatureTemplate const* cinfo, Creature* creature, uint8& level) { ExecuteScript([&](AllCreatureScript* script) { @@ -57,7 +57,7 @@ void ScriptMgr::OnBeforeCreatureSelectLevel(const CreatureTemplate* cinfo, Creat }); } -void ScriptMgr::OnCreatureSelectLevel(const CreatureTemplate* cinfo, Creature* creature) +void ScriptMgr::OnCreatureSelectLevel(CreatureTemplate const* cinfo, Creature* creature) { ExecuteScript([&](AllCreatureScript* script) { @@ -78,7 +78,7 @@ void ScriptMgr::OnCreatureSelectLevel(const CreatureTemplate* cinfo, Creature* c // return true; //} -AllCreatureScript::AllCreatureScript(const char* name) : +AllCreatureScript::AllCreatureScript(char const* name) : ScriptObject(name) { ScriptRegistry::AddScript(this); diff --git a/src/server/game/Scripting/ScriptDefines/AllCreatureScript.h b/src/server/game/Scripting/ScriptDefines/AllCreatureScript.h index d734f06c3..30d1e187a 100644 --- a/src/server/game/Scripting/ScriptDefines/AllCreatureScript.h +++ b/src/server/game/Scripting/ScriptDefines/AllCreatureScript.h @@ -23,17 +23,17 @@ class AllCreatureScript : public ScriptObject { protected: - AllCreatureScript(const char* name); + AllCreatureScript(char const* name); public: // Called from End of Creature Update. virtual void OnAllCreatureUpdate(Creature* /*creature*/, uint32 /*diff*/) { } // Called just before the level of the creature is set. - virtual void OnBeforeCreatureSelectLevel(const CreatureTemplate* /*cinfo*/, Creature* /*creature*/, uint8& /*level*/) { } + virtual void OnBeforeCreatureSelectLevel(CreatureTemplate const* /*cinfo*/, Creature* /*creature*/, uint8& /*level*/) { } // Called from End of Creature SelectLevel. - virtual void OnCreatureSelectLevel(const CreatureTemplate* /*cinfo*/, Creature* /*creature*/) { } + virtual void OnCreatureSelectLevel(CreatureTemplate const* /*cinfo*/, Creature* /*creature*/) { } /** * @brief This hook runs after add creature in world @@ -89,7 +89,7 @@ public: * * @return True if you want to continue, false if you want to disable */ - [[nodiscard]] virtual bool CanCreatureGossipSelectCode(Player* /*player*/, Creature* /*creature*/, uint32 /*sender*/, uint32 /*action*/, const char* /*code*/) { return false; } + [[nodiscard]] virtual bool CanCreatureGossipSelectCode(Player* /*player*/, Creature* /*creature*/, uint32 /*sender*/, uint32 /*action*/, char const* /*code*/) { return false; } // Called when a player accepts a quest from the creature. [[nodiscard]] virtual bool CanCreatureQuestAccept(Player* /*player*/, Creature* /*creature*/, Quest const* /*quest*/) { return false; } diff --git a/src/server/game/Scripting/ScriptDefines/AllGameObjectScript.cpp b/src/server/game/Scripting/ScriptDefines/AllGameObjectScript.cpp index 2a1f09d67..5052712a9 100644 --- a/src/server/game/Scripting/ScriptDefines/AllGameObjectScript.cpp +++ b/src/server/game/Scripting/ScriptDefines/AllGameObjectScript.cpp @@ -49,7 +49,7 @@ void ScriptMgr::OnGameObjectSaveToDB(GameObject* go) }); } -AllGameObjectScript::AllGameObjectScript(const char* name) : +AllGameObjectScript::AllGameObjectScript(char const* name) : ScriptObject(name) { ScriptRegistry::AddScript(this); diff --git a/src/server/game/Scripting/ScriptDefines/AllGameObjectScript.h b/src/server/game/Scripting/ScriptDefines/AllGameObjectScript.h index 496bc5300..3595f0e0b 100644 --- a/src/server/game/Scripting/ScriptDefines/AllGameObjectScript.h +++ b/src/server/game/Scripting/ScriptDefines/AllGameObjectScript.h @@ -23,7 +23,7 @@ class AllGameObjectScript : public ScriptObject { protected: - AllGameObjectScript(const char* name); + AllGameObjectScript(char const* name); public: /** @@ -59,7 +59,7 @@ public: [[nodiscard]] virtual bool CanGameObjectGossipSelect(Player* /*player*/, GameObject* /*go*/, uint32 /*sender*/, uint32 /*action*/) { return false; } // Called when a player selects a gossip with a code in the gameobject's gossip menu. - [[nodiscard]] virtual bool CanGameObjectGossipSelectCode(Player* /*player*/, GameObject* /*go*/, uint32 /*sender*/, uint32 /*action*/, const char* /*code*/) { return false; } + [[nodiscard]] virtual bool CanGameObjectGossipSelectCode(Player* /*player*/, GameObject* /*go*/, uint32 /*sender*/, uint32 /*action*/, char const* /*code*/) { return false; } // Called when a player accepts a quest from the gameobject. [[nodiscard]] virtual bool CanGameObjectQuestAccept(Player* /*player*/, GameObject* /*go*/, Quest const* /*quest*/) { return false; } diff --git a/src/server/game/Scripting/ScriptDefines/AllItemScript.cpp b/src/server/game/Scripting/ScriptDefines/AllItemScript.cpp index ecc51c5cd..a34081ab3 100644 --- a/src/server/game/Scripting/ScriptDefines/AllItemScript.cpp +++ b/src/server/game/Scripting/ScriptDefines/AllItemScript.cpp @@ -126,7 +126,7 @@ void ScriptMgr::OnGossipSelect(Player* player, Item* item, uint32 sender, uint32 } } -void ScriptMgr::OnGossipSelectCode(Player* player, Item* item, uint32 sender, uint32 action, const char* code) +void ScriptMgr::OnGossipSelectCode(Player* player, Item* item, uint32 sender, uint32 action, char const* code) { ASSERT(player); ASSERT(item); @@ -142,13 +142,13 @@ void ScriptMgr::OnGossipSelectCode(Player* player, Item* item, uint32 sender, ui } } -AllItemScript::AllItemScript(const char* name) : +AllItemScript::AllItemScript(char const* name) : ScriptObject(name) { ScriptRegistry::AddScript(this); } -ItemScript::ItemScript(const char* name) : +ItemScript::ItemScript(char const* name) : ScriptObject(name) { ScriptRegistry::AddScript(this); diff --git a/src/server/game/Scripting/ScriptDefines/AllItemScript.h b/src/server/game/Scripting/ScriptDefines/AllItemScript.h index c28cf6acb..775c30445 100644 --- a/src/server/game/Scripting/ScriptDefines/AllItemScript.h +++ b/src/server/game/Scripting/ScriptDefines/AllItemScript.h @@ -23,7 +23,7 @@ class AllItemScript : public ScriptObject { protected: - AllItemScript(const char* name); + AllItemScript(char const* name); public: // Called when a player accepts a quest from the item. @@ -42,7 +42,7 @@ public: virtual void OnItemGossipSelect(Player* /*player*/, Item* /*item*/, uint32 /*sender*/, uint32 /*action*/) { } // Called when a player selects an option in an item gossip window - virtual void OnItemGossipSelectCode(Player* /*player*/, Item* /*item*/, uint32 /*sender*/, uint32 /*action*/, const char* /*code*/) { } + virtual void OnItemGossipSelectCode(Player* /*player*/, Item* /*item*/, uint32 /*sender*/, uint32 /*action*/, char const* /*code*/) { } }; #endif diff --git a/src/server/game/Scripting/ScriptDefines/AllMapScript.cpp b/src/server/game/Scripting/ScriptDefines/AllMapScript.cpp index 5f14b352d..f30b91680 100644 --- a/src/server/game/Scripting/ScriptDefines/AllMapScript.cpp +++ b/src/server/game/Scripting/ScriptDefines/AllMapScript.cpp @@ -273,7 +273,7 @@ void ScriptMgr::OnDestroyInstance(MapInstanced* mapInstanced, Map* map) CALL_ENABLED_HOOKS(AllMapScript, ALLMAPHOOK_ON_DESTROY_INSTANCE, script->OnDestroyInstance(mapInstanced, map)); } -AllMapScript::AllMapScript(const char* name, std::vector enabledHooks) : ScriptObject(name, ALLMAPHOOK_END) +AllMapScript::AllMapScript(char const* name, std::vector enabledHooks) : ScriptObject(name, ALLMAPHOOK_END) { // If empty - enable all available hooks. if (enabledHooks.empty()) diff --git a/src/server/game/Scripting/ScriptDefines/AllMapScript.h b/src/server/game/Scripting/ScriptDefines/AllMapScript.h index 31b97c7d6..69474dc0d 100644 --- a/src/server/game/Scripting/ScriptDefines/AllMapScript.h +++ b/src/server/game/Scripting/ScriptDefines/AllMapScript.h @@ -36,7 +36,7 @@ enum AllMapHook class AllMapScript : public ScriptObject { protected: - AllMapScript(const char* name, std::vector enabledHooks = std::vector()); + AllMapScript(char const* name, std::vector enabledHooks = std::vector()); public: /** diff --git a/src/server/game/Scripting/ScriptDefines/AllSpellScript.h b/src/server/game/Scripting/ScriptDefines/AllSpellScript.h index df069bcb1..1354502e9 100644 --- a/src/server/game/Scripting/ScriptDefines/AllSpellScript.h +++ b/src/server/game/Scripting/ScriptDefines/AllSpellScript.h @@ -46,7 +46,7 @@ enum SpellEffIndex : uint8; class AllSpellScript : public ScriptObject { protected: - AllSpellScript(const char* name, std::vector enabledHooks = std::vector()); + AllSpellScript(char const* name, std::vector enabledHooks = std::vector()); public: [[nodiscard]] bool IsDatabaseBound() const override { return false; } diff --git a/src/server/game/Scripting/ScriptDefines/AreaTriggerScript.cpp b/src/server/game/Scripting/ScriptDefines/AreaTriggerScript.cpp index bb809d7cd..bb9ba84ff 100644 --- a/src/server/game/Scripting/ScriptDefines/AreaTriggerScript.cpp +++ b/src/server/game/Scripting/ScriptDefines/AreaTriggerScript.cpp @@ -40,7 +40,7 @@ bool ScriptMgr::OnAreaTrigger(Player* player, AreaTrigger const* trigger) return tempScript ? tempScript->OnTrigger(player, trigger) : false; } -AreaTriggerScript::AreaTriggerScript(const char* name) +AreaTriggerScript::AreaTriggerScript(char const* name) : ScriptObject(name) { ScriptRegistry::AddScript(this); diff --git a/src/server/game/Scripting/ScriptDefines/AreaTriggerScript.h b/src/server/game/Scripting/ScriptDefines/AreaTriggerScript.h index 186a87bc7..2f9064718 100644 --- a/src/server/game/Scripting/ScriptDefines/AreaTriggerScript.h +++ b/src/server/game/Scripting/ScriptDefines/AreaTriggerScript.h @@ -23,7 +23,7 @@ class AreaTriggerScript : public ScriptObject { protected: - AreaTriggerScript(const char* name); + AreaTriggerScript(char const* name); public: [[nodiscard]] bool IsDatabaseBound() const override { return true; } diff --git a/src/server/game/Scripting/ScriptDefines/ArenaScript.cpp b/src/server/game/Scripting/ScriptDefines/ArenaScript.cpp index 5521e7cbc..8223bd690 100644 --- a/src/server/game/Scripting/ScriptDefines/ArenaScript.cpp +++ b/src/server/game/Scripting/ScriptDefines/ArenaScript.cpp @@ -54,7 +54,7 @@ bool ScriptMgr::CanSaveArenaStatsForMember(ArenaTeam* team, ObjectGuid playerGui CALL_ENABLED_BOOLEAN_HOOKS(ArenaScript, ARENAHOOK_CAN_SAVE_ARENA_STATS_FOR_MEMBER, !script->CanSaveArenaStatsForMember(team, playerGuid)); } -ArenaScript::ArenaScript(const char* name, std::vector enabledHooks) +ArenaScript::ArenaScript(char const* name, std::vector enabledHooks) : ScriptObject(name, ARENAHOOK_END) { // If empty - enable all available hooks. diff --git a/src/server/game/Scripting/ScriptDefines/ArenaScript.h b/src/server/game/Scripting/ScriptDefines/ArenaScript.h index 0529d23ac..92ed08af2 100644 --- a/src/server/game/Scripting/ScriptDefines/ArenaScript.h +++ b/src/server/game/Scripting/ScriptDefines/ArenaScript.h @@ -38,7 +38,7 @@ class ArenaScript : public ScriptObject { protected: - ArenaScript(const char* name, std::vector enabledHooks = std::vector()); + ArenaScript(char const* name, std::vector enabledHooks = std::vector()); public: diff --git a/src/server/game/Scripting/ScriptDefines/ArenaTeamScript.cpp b/src/server/game/Scripting/ScriptDefines/ArenaTeamScript.cpp index a5cc123c1..df0d8ddb1 100644 --- a/src/server/game/Scripting/ScriptDefines/ArenaTeamScript.cpp +++ b/src/server/game/Scripting/ScriptDefines/ArenaTeamScript.cpp @@ -44,7 +44,7 @@ void ScriptMgr::OnSetArenaMaxPlayersPerTeam(const uint8 arenaType, uint32& maxPl CALL_ENABLED_HOOKS(ArenaTeamScript, ARENATEAMHOOK_ON_SET_ARENA_MAX_PLAYERS_PER_TEAM, script->OnSetArenaMaxPlayersPerTeam(arenaType, maxPlayerPerTeam)); } -ArenaTeamScript::ArenaTeamScript(const char* name, std::vector enabledHooks) +ArenaTeamScript::ArenaTeamScript(char const* name, std::vector enabledHooks) : ScriptObject(name, ARENATEAMHOOK_END) { // If empty - enable all available hooks. diff --git a/src/server/game/Scripting/ScriptDefines/ArenaTeamScript.h b/src/server/game/Scripting/ScriptDefines/ArenaTeamScript.h index 1a6c99704..64aa74f30 100644 --- a/src/server/game/Scripting/ScriptDefines/ArenaTeamScript.h +++ b/src/server/game/Scripting/ScriptDefines/ArenaTeamScript.h @@ -35,7 +35,7 @@ enum ArenaTeamHook class ArenaTeamScript : public ScriptObject { protected: - ArenaTeamScript(const char* name, std::vector enabledHooks = std::vector()); + ArenaTeamScript(char const* name, std::vector enabledHooks = std::vector()); public: [[nodiscard]] bool IsDatabaseBound() const override { return false; }; diff --git a/src/server/game/Scripting/ScriptDefines/AuctionHouseScript.cpp b/src/server/game/Scripting/ScriptDefines/AuctionHouseScript.cpp index bb978bc81..ee36f13fd 100644 --- a/src/server/game/Scripting/ScriptDefines/AuctionHouseScript.cpp +++ b/src/server/game/Scripting/ScriptDefines/AuctionHouseScript.cpp @@ -86,7 +86,7 @@ void ScriptMgr::OnBeforeAuctionHouseMgrUpdate() CALL_ENABLED_HOOKS(AuctionHouseScript, AUCTIONHOUSEHOOK_ON_BEFORE_AUCTIONHOUSEMGR_UPDATE, script->OnBeforeAuctionHouseMgrUpdate()); } -AuctionHouseScript::AuctionHouseScript(const char* name, std::vector enabledHooks) +AuctionHouseScript::AuctionHouseScript(char const* name, std::vector enabledHooks) : ScriptObject(name, AUCTIONHOUSEHOOK_END) { // If empty - enable all available hooks. diff --git a/src/server/game/Scripting/ScriptDefines/AuctionHouseScript.h b/src/server/game/Scripting/ScriptDefines/AuctionHouseScript.h index c821da64a..3430661c8 100644 --- a/src/server/game/Scripting/ScriptDefines/AuctionHouseScript.h +++ b/src/server/game/Scripting/ScriptDefines/AuctionHouseScript.h @@ -40,7 +40,7 @@ enum AuctionHouseHook class AuctionHouseScript : public ScriptObject { protected: - AuctionHouseScript(const char* name, std::vector enabledHooks = std::vector()); + AuctionHouseScript(char const* name, std::vector enabledHooks = std::vector()); public: // Called when an auction is added to an auction house. diff --git a/src/server/game/Scripting/ScriptDefines/BattlefieldScript.h b/src/server/game/Scripting/ScriptDefines/BattlefieldScript.h index f61d10ded..66d0fb72b 100644 --- a/src/server/game/Scripting/ScriptDefines/BattlefieldScript.h +++ b/src/server/game/Scripting/ScriptDefines/BattlefieldScript.h @@ -39,7 +39,7 @@ class Player; class BattlefieldScript : public ScriptObject { protected: - BattlefieldScript(const char* name, std::vector enabledHooks = std::vector()); + BattlefieldScript(char const* name, std::vector enabledHooks = std::vector()); public: [[nodiscard]] bool IsDatabaseBound() const override { return false; } diff --git a/src/server/game/Scripting/ScriptDefines/BattlegroundMapScript.cpp b/src/server/game/Scripting/ScriptDefines/BattlegroundMapScript.cpp index 6f084bd5e..97bd569fd 100644 --- a/src/server/game/Scripting/ScriptDefines/BattlegroundMapScript.cpp +++ b/src/server/game/Scripting/ScriptDefines/BattlegroundMapScript.cpp @@ -19,7 +19,7 @@ #include "Log.h" #include "ScriptMgr.h" -BattlegroundMapScript::BattlegroundMapScript(const char* name, uint32 mapId) : +BattlegroundMapScript::BattlegroundMapScript(char const* name, uint32 mapId) : ScriptObject(name), MapScript(mapId) { ScriptRegistry::AddScript(this); diff --git a/src/server/game/Scripting/ScriptDefines/BattlegroundMapScript.h b/src/server/game/Scripting/ScriptDefines/BattlegroundMapScript.h index 090206c0d..21bf0f70c 100644 --- a/src/server/game/Scripting/ScriptDefines/BattlegroundMapScript.h +++ b/src/server/game/Scripting/ScriptDefines/BattlegroundMapScript.h @@ -23,7 +23,7 @@ class BattlegroundMapScript : public ScriptObject, public MapScript { protected: - BattlegroundMapScript(const char* name, uint32 mapId); + BattlegroundMapScript(char const* name, uint32 mapId); public: [[nodiscard]] bool isAfterLoadScript() const override { return true; } diff --git a/src/server/game/Scripting/ScriptDefines/BattlegroundScript.cpp b/src/server/game/Scripting/ScriptDefines/BattlegroundScript.cpp index b91d15939..2a644f852 100644 --- a/src/server/game/Scripting/ScriptDefines/BattlegroundScript.cpp +++ b/src/server/game/Scripting/ScriptDefines/BattlegroundScript.cpp @@ -25,7 +25,7 @@ Battleground* ScriptMgr::CreateBattleground(BattlegroundTypeId /*typeId*/) return nullptr; } -BattlegroundScript::BattlegroundScript(const char* name) +BattlegroundScript::BattlegroundScript(char const* name) : ScriptObject(name) { ScriptRegistry::AddScript(this); diff --git a/src/server/game/Scripting/ScriptDefines/BattlegroundScript.h b/src/server/game/Scripting/ScriptDefines/BattlegroundScript.h index b91502e86..71402f9e5 100644 --- a/src/server/game/Scripting/ScriptDefines/BattlegroundScript.h +++ b/src/server/game/Scripting/ScriptDefines/BattlegroundScript.h @@ -23,7 +23,7 @@ class BattlegroundScript : public ScriptObject { protected: - BattlegroundScript(const char* name); + BattlegroundScript(char const* name); public: [[nodiscard]] bool IsDatabaseBound() const override { return true; } diff --git a/src/server/game/Scripting/ScriptDefines/CommandScript.cpp b/src/server/game/Scripting/ScriptDefines/CommandScript.cpp index e9e672d88..10273deb0 100644 --- a/src/server/game/Scripting/ScriptDefines/CommandScript.cpp +++ b/src/server/game/Scripting/ScriptDefines/CommandScript.cpp @@ -32,7 +32,7 @@ Acore::ChatCommands::ChatCommandTable ScriptMgr::GetChatCommands() return table; } -CommandScript::CommandScript(const char* name) +CommandScript::CommandScript(char const* name) : ScriptObject(name) { ScriptRegistry::AddScript(this); diff --git a/src/server/game/Scripting/ScriptDefines/CommandScript.h b/src/server/game/Scripting/ScriptDefines/CommandScript.h index 7c89cdf5e..a524f32f4 100644 --- a/src/server/game/Scripting/ScriptDefines/CommandScript.h +++ b/src/server/game/Scripting/ScriptDefines/CommandScript.h @@ -24,7 +24,7 @@ class CommandScript : public ScriptObject { protected: - CommandScript(const char* name); + CommandScript(char const* name); public: // Should return a pointer to a valid command table (ChatCommand array) to be used by ChatHandler. diff --git a/src/server/game/Scripting/ScriptDefines/ConditionScript.cpp b/src/server/game/Scripting/ScriptDefines/ConditionScript.cpp index 64a73c3fd..b79c6e893 100644 --- a/src/server/game/Scripting/ScriptDefines/ConditionScript.cpp +++ b/src/server/game/Scripting/ScriptDefines/ConditionScript.cpp @@ -26,7 +26,7 @@ bool ScriptMgr::OnConditionCheck(Condition* condition, ConditionSourceInfo& sour return tempScript ? tempScript->OnConditionCheck(condition, sourceInfo) : true; } -ConditionScript::ConditionScript(const char* name) +ConditionScript::ConditionScript(char const* name) : ScriptObject(name) { ScriptRegistry::AddScript(this); diff --git a/src/server/game/Scripting/ScriptDefines/ConditionScript.h b/src/server/game/Scripting/ScriptDefines/ConditionScript.h index c53045869..d4f3d80fe 100644 --- a/src/server/game/Scripting/ScriptDefines/ConditionScript.h +++ b/src/server/game/Scripting/ScriptDefines/ConditionScript.h @@ -23,7 +23,7 @@ class ConditionScript : public ScriptObject { protected: - ConditionScript(const char* name); + ConditionScript(char const* name); public: [[nodiscard]] bool IsDatabaseBound() const override { return true; } diff --git a/src/server/game/Scripting/ScriptDefines/CreatureScript.cpp b/src/server/game/Scripting/ScriptDefines/CreatureScript.cpp index 6e4f36927..3f5f3dfb1 100644 --- a/src/server/game/Scripting/ScriptDefines/CreatureScript.cpp +++ b/src/server/game/Scripting/ScriptDefines/CreatureScript.cpp @@ -60,7 +60,7 @@ bool ScriptMgr::OnGossipSelect(Player* player, Creature* creature, uint32 sender return tempScript ? tempScript->OnGossipSelect(player, creature, sender, action) : false; } -bool ScriptMgr::OnGossipSelectCode(Player* player, Creature* creature, uint32 sender, uint32 action, const char* code) +bool ScriptMgr::OnGossipSelectCode(Player* player, Creature* creature, uint32 sender, uint32 action, char const* code) { ASSERT(player); ASSERT(creature); @@ -195,7 +195,7 @@ void ScriptMgr::OnCreatureUpdate(Creature* creature, uint32 diff) } } -CreatureScript::CreatureScript(const char* name) +CreatureScript::CreatureScript(char const* name) : ScriptObject(name) { ScriptRegistry::AddScript(this); diff --git a/src/server/game/Scripting/ScriptDefines/CreatureScript.h b/src/server/game/Scripting/ScriptDefines/CreatureScript.h index 508ba2b49..56286dc0d 100644 --- a/src/server/game/Scripting/ScriptDefines/CreatureScript.h +++ b/src/server/game/Scripting/ScriptDefines/CreatureScript.h @@ -24,7 +24,7 @@ class CreatureScript : public ScriptObject, public UpdatableScript { protected: - CreatureScript(const char* name); + CreatureScript(char const* name); public: [[nodiscard]] bool IsDatabaseBound() const override { return true; } @@ -36,7 +36,7 @@ public: [[nodiscard]] virtual bool OnGossipSelect(Player* /*player*/, Creature* /*creature*/, uint32 /*sender*/, uint32 /*action*/) { return false; } // Called when a player selects a gossip with a code in the creature's gossip menu. - [[nodiscard]] virtual bool OnGossipSelectCode(Player* /*player*/, Creature* /*creature*/, uint32 /*sender*/, uint32 /*action*/, const char* /*code*/) { return false; } + [[nodiscard]] virtual bool OnGossipSelectCode(Player* /*player*/, Creature* /*creature*/, uint32 /*sender*/, uint32 /*action*/, char const* /*code*/) { return false; } // Called when a player accepts a quest from the creature. [[nodiscard]] virtual bool OnQuestAccept(Player* /*player*/, Creature* /*creature*/, Quest const* /*quest*/) { return false; } diff --git a/src/server/game/Scripting/ScriptDefines/DatabaseScript.cpp b/src/server/game/Scripting/ScriptDefines/DatabaseScript.cpp index df84d2156..ebe4432a6 100644 --- a/src/server/game/Scripting/ScriptDefines/DatabaseScript.cpp +++ b/src/server/game/Scripting/ScriptDefines/DatabaseScript.cpp @@ -29,7 +29,7 @@ void ScriptMgr::OnAfterDatabaseLoadCreatureTemplates(std::vectorOnAfterDatabaseLoadCreatureTemplates(creatureTemplates)); } -DatabaseScript::DatabaseScript(const char* name, std::vector enabledHooks) +DatabaseScript::DatabaseScript(char const* name, std::vector enabledHooks) : ScriptObject(name, DATABASEHOOK_END) { // If empty - enable all available hooks. diff --git a/src/server/game/Scripting/ScriptDefines/DatabaseScript.h b/src/server/game/Scripting/ScriptDefines/DatabaseScript.h index 708f0a986..c4d3408a2 100644 --- a/src/server/game/Scripting/ScriptDefines/DatabaseScript.h +++ b/src/server/game/Scripting/ScriptDefines/DatabaseScript.h @@ -32,7 +32,7 @@ class DatabaseScript : public ScriptObject { protected: - DatabaseScript(const char* name, std::vector enabledHooks = std::vector()); + DatabaseScript(char const* name, std::vector enabledHooks = std::vector()); public: diff --git a/src/server/game/Scripting/ScriptDefines/DynamicObjectScript.cpp b/src/server/game/Scripting/ScriptDefines/DynamicObjectScript.cpp index d2826b1c4..c4c505bef 100644 --- a/src/server/game/Scripting/ScriptDefines/DynamicObjectScript.cpp +++ b/src/server/game/Scripting/ScriptDefines/DynamicObjectScript.cpp @@ -28,7 +28,7 @@ void ScriptMgr::OnDynamicObjectUpdate(DynamicObject* dynobj, uint32 diff) } } -DynamicObjectScript::DynamicObjectScript(const char* name) +DynamicObjectScript::DynamicObjectScript(char const* name) : ScriptObject(name) { ScriptRegistry::AddScript(this); diff --git a/src/server/game/Scripting/ScriptDefines/DynamicObjectScript.h b/src/server/game/Scripting/ScriptDefines/DynamicObjectScript.h index da51a86d5..e03cb500b 100644 --- a/src/server/game/Scripting/ScriptDefines/DynamicObjectScript.h +++ b/src/server/game/Scripting/ScriptDefines/DynamicObjectScript.h @@ -23,7 +23,7 @@ class DynamicObjectScript : public ScriptObject, public UpdatableScript { protected: - DynamicObjectScript(const char* name); + DynamicObjectScript(char const* name); }; #endif diff --git a/src/server/game/Scripting/ScriptDefines/FormulaScript.cpp b/src/server/game/Scripting/ScriptDefines/FormulaScript.cpp index da9fe26a0..6192ac59b 100644 --- a/src/server/game/Scripting/ScriptDefines/FormulaScript.cpp +++ b/src/server/game/Scripting/ScriptDefines/FormulaScript.cpp @@ -67,7 +67,7 @@ void ScriptMgr::OnBeforeUpdatingPersonalRating(int32& mod, uint32 type) CALL_ENABLED_HOOKS(FormulaScript, FORMULAHOOK_ON_BEFORE_UPDATING_PERSONAL_RATING, script->OnBeforeUpdatingPersonalRating(mod, type)); } -FormulaScript::FormulaScript(const char* name, std::vector enabledHooks) +FormulaScript::FormulaScript(char const* name, std::vector enabledHooks) : ScriptObject(name, FORMULAHOOK_END) { // If empty - enable all available hooks. diff --git a/src/server/game/Scripting/ScriptDefines/FormulaScript.h b/src/server/game/Scripting/ScriptDefines/FormulaScript.h index a95a67603..561f2078f 100644 --- a/src/server/game/Scripting/ScriptDefines/FormulaScript.h +++ b/src/server/game/Scripting/ScriptDefines/FormulaScript.h @@ -40,7 +40,7 @@ enum XPColorChar : uint8; class FormulaScript : public ScriptObject { protected: - FormulaScript(const char* name, std::vector enabledHooks = std::vector()); + FormulaScript(char const* name, std::vector enabledHooks = std::vector()); public: // Called after calculating honor. diff --git a/src/server/game/Scripting/ScriptDefines/GameEventScript.cpp b/src/server/game/Scripting/ScriptDefines/GameEventScript.cpp index 75d713311..d19f24a9c 100644 --- a/src/server/game/Scripting/ScriptDefines/GameEventScript.cpp +++ b/src/server/game/Scripting/ScriptDefines/GameEventScript.cpp @@ -34,7 +34,7 @@ void ScriptMgr::OnGameEventCheck(uint16 EventID) CALL_ENABLED_HOOKS(GameEventScript, GAMEEVENTHOOK_ON_EVENT_CHECK, script->OnEventCheck(EventID)); } -GameEventScript::GameEventScript(const char* name, std::vector enabledHooks) +GameEventScript::GameEventScript(char const* name, std::vector enabledHooks) : ScriptObject(name, GAMEEVENTHOOK_END) { // If empty - enable all available hooks. diff --git a/src/server/game/Scripting/ScriptDefines/GameEventScript.h b/src/server/game/Scripting/ScriptDefines/GameEventScript.h index 6829cd651..f717a7a95 100644 --- a/src/server/game/Scripting/ScriptDefines/GameEventScript.h +++ b/src/server/game/Scripting/ScriptDefines/GameEventScript.h @@ -32,7 +32,7 @@ enum GameEventHook class GameEventScript : public ScriptObject { protected: - GameEventScript(const char* name, std::vector enabledHooks = std::vector()); + GameEventScript(char const* name, std::vector enabledHooks = std::vector()); public: // Runs on start event diff --git a/src/server/game/Scripting/ScriptDefines/GameObjectScript.cpp b/src/server/game/Scripting/ScriptDefines/GameObjectScript.cpp index ddc5fdbaf..84f297389 100644 --- a/src/server/game/Scripting/ScriptDefines/GameObjectScript.cpp +++ b/src/server/game/Scripting/ScriptDefines/GameObjectScript.cpp @@ -60,7 +60,7 @@ bool ScriptMgr::OnGossipSelect(Player* player, GameObject* go, uint32 sender, ui return tempScript ? tempScript->OnGossipSelect(player, go, sender, action) : false; } -bool ScriptMgr::OnGossipSelectCode(Player* player, GameObject* go, uint32 sender, uint32 action, const char* code) +bool ScriptMgr::OnGossipSelectCode(Player* player, GameObject* go, uint32 sender, uint32 action, char const* code) { ASSERT(player); ASSERT(go); @@ -239,7 +239,7 @@ GameObjectAI* ScriptMgr::GetGameObjectAI(GameObject* go) return tempScript ? tempScript->GetAI(go) : nullptr; } -GameObjectScript::GameObjectScript(const char* name) +GameObjectScript::GameObjectScript(char const* name) : ScriptObject(name) { ScriptRegistry::AddScript(this); diff --git a/src/server/game/Scripting/ScriptDefines/GameObjectScript.h b/src/server/game/Scripting/ScriptDefines/GameObjectScript.h index 174ca61ba..0a6507856 100644 --- a/src/server/game/Scripting/ScriptDefines/GameObjectScript.h +++ b/src/server/game/Scripting/ScriptDefines/GameObjectScript.h @@ -24,7 +24,7 @@ class GameObjectScript : public ScriptObject, public UpdatableScript { protected: - GameObjectScript(const char* name); + GameObjectScript(char const* name); public: [[nodiscard]] bool IsDatabaseBound() const override { return true; } @@ -36,7 +36,7 @@ public: [[nodiscard]] virtual bool OnGossipSelect(Player* /*player*/, GameObject* /*go*/, uint32 /*sender*/, uint32 /*action*/) { return false; } // Called when a player selects a gossip with a code in the gameobject's gossip menu. - [[nodiscard]] virtual bool OnGossipSelectCode(Player* /*player*/, GameObject* /*go*/, uint32 /*sender*/, uint32 /*action*/, const char* /*code*/) { return false; } + [[nodiscard]] virtual bool OnGossipSelectCode(Player* /*player*/, GameObject* /*go*/, uint32 /*sender*/, uint32 /*action*/, char const* /*code*/) { return false; } // Called when a player accepts a quest from the gameobject. [[nodiscard]] virtual bool OnQuestAccept(Player* /*player*/, GameObject* /*go*/, Quest const* /*quest*/) { return false; } diff --git a/src/server/game/Scripting/ScriptDefines/GlobalScript.cpp b/src/server/game/Scripting/ScriptDefines/GlobalScript.cpp index 28285e9c2..b995cb573 100644 --- a/src/server/game/Scripting/ScriptDefines/GlobalScript.cpp +++ b/src/server/game/Scripting/ScriptDefines/GlobalScript.cpp @@ -144,7 +144,7 @@ void ScriptMgr::AfterInstanceGameObjectCreate(Map* instance, GameObject* go) CALL_ENABLED_HOOKS(GlobalScript, GLOBALHOOK_AFTER_INSTANCE_GAME_OBJECT_CREATE, script->AfterInstanceGameObjectCreate(instance, go)); } -GlobalScript::GlobalScript(const char* name, std::vector enabledHooks) +GlobalScript::GlobalScript(char const* name, std::vector enabledHooks) : ScriptObject(name, GLOBALHOOK_END) { // If empty - enable all available hooks. diff --git a/src/server/game/Scripting/ScriptDefines/GlobalScript.h b/src/server/game/Scripting/ScriptDefines/GlobalScript.h index b22a22fb9..cd3dc1406 100644 --- a/src/server/game/Scripting/ScriptDefines/GlobalScript.h +++ b/src/server/game/Scripting/ScriptDefines/GlobalScript.h @@ -54,7 +54,7 @@ enum GlobalHook class GlobalScript : public ScriptObject { protected: - GlobalScript(const char* name, std::vector enabledHooks = std::vector()); + GlobalScript(char const* name, std::vector enabledHooks = std::vector()); public: // items diff --git a/src/server/game/Scripting/ScriptDefines/GroupScript.cpp b/src/server/game/Scripting/ScriptDefines/GroupScript.cpp index 5e808a3b1..1ef1be0ea 100644 --- a/src/server/game/Scripting/ScriptDefines/GroupScript.cpp +++ b/src/server/game/Scripting/ScriptDefines/GroupScript.cpp @@ -33,7 +33,7 @@ void ScriptMgr::OnGroupInviteMember(Group* group, ObjectGuid guid) CALL_ENABLED_HOOKS(GroupScript, GROUPHOOK_ON_INVITE_MEMBER, script->OnInviteMember(group, guid)); } -void ScriptMgr::OnGroupRemoveMember(Group* group, ObjectGuid guid, RemoveMethod method, ObjectGuid kicker, const char* reason) +void ScriptMgr::OnGroupRemoveMember(Group* group, ObjectGuid guid, RemoveMethod method, ObjectGuid kicker, char const* reason) { ASSERT(group); @@ -64,7 +64,7 @@ void ScriptMgr::OnCreate(Group* group, Player* leader) CALL_ENABLED_HOOKS(GroupScript, GROUPHOOK_ON_CREATE, script->OnCreate(group, leader)); } -GroupScript::GroupScript(const char* name, std::vector enabledHooks) +GroupScript::GroupScript(char const* name, std::vector enabledHooks) : ScriptObject(name, GROUPHOOK_END) { // If empty - enable all available hooks. diff --git a/src/server/game/Scripting/ScriptDefines/GroupScript.h b/src/server/game/Scripting/ScriptDefines/GroupScript.h index 0995e3e91..eb5909c12 100644 --- a/src/server/game/Scripting/ScriptDefines/GroupScript.h +++ b/src/server/game/Scripting/ScriptDefines/GroupScript.h @@ -39,7 +39,7 @@ enum RemoveMethod : uint8; class GroupScript : public ScriptObject { protected: - GroupScript(const char* name, std::vector enabledHooks = std::vector()); + GroupScript(char const* name, std::vector enabledHooks = std::vector()); public: [[nodiscard]] bool IsDatabaseBound() const override { return false; } @@ -51,7 +51,7 @@ public: virtual void OnInviteMember(Group* /*group*/, ObjectGuid /*guid*/) { } // Called when a member is removed from a group. - virtual void OnRemoveMember(Group* /*group*/, ObjectGuid /*guid*/, RemoveMethod /*method*/, ObjectGuid /*kicker*/, const char* /*reason*/) { } + virtual void OnRemoveMember(Group* /*group*/, ObjectGuid /*guid*/, RemoveMethod /*method*/, ObjectGuid /*kicker*/, char const* /*reason*/) { } // Called when the leader of a group is changed. virtual void OnChangeLeader(Group* /*group*/, ObjectGuid /*newLeaderGuid*/, ObjectGuid /*oldLeaderGuid*/) { } diff --git a/src/server/game/Scripting/ScriptDefines/GuildScript.cpp b/src/server/game/Scripting/ScriptDefines/GuildScript.cpp index ee141e598..94e337b3e 100644 --- a/src/server/game/Scripting/ScriptDefines/GuildScript.cpp +++ b/src/server/game/Scripting/ScriptDefines/GuildScript.cpp @@ -29,17 +29,17 @@ void ScriptMgr::OnGuildRemoveMember(Guild* guild, Player* player, bool isDisband CALL_ENABLED_HOOKS(GuildScript, GUILDHOOK_ON_REMOVE_MEMBER, script->OnRemoveMember(guild, player, isDisbanding, isKicked)); } -void ScriptMgr::OnGuildMOTDChanged(Guild* guild, const std::string& newMotd) +void ScriptMgr::OnGuildMOTDChanged(Guild* guild, std::string const& newMotd) { CALL_ENABLED_HOOKS(GuildScript, GUILDHOOK_ON_MOTD_CHANGED, script->OnMOTDChanged(guild, newMotd)); } -void ScriptMgr::OnGuildInfoChanged(Guild* guild, const std::string& newInfo) +void ScriptMgr::OnGuildInfoChanged(Guild* guild, std::string const& newInfo) { CALL_ENABLED_HOOKS(GuildScript, GUILDHOOK_ON_INFO_CHANGED, script->OnInfoChanged(guild, newInfo)); } -void ScriptMgr::OnGuildCreate(Guild* guild, Player* leader, const std::string& name) +void ScriptMgr::OnGuildCreate(Guild* guild, Player* leader, std::string const& name) { CALL_ENABLED_HOOKS(GuildScript, GUILDHOOK_ON_CREATE, script->OnCreate(guild, leader, name)); } @@ -79,7 +79,7 @@ bool ScriptMgr::CanGuildSendBankList(Guild const* guild, WorldSession* session, CALL_ENABLED_BOOLEAN_HOOKS(GuildScript, GUILDHOOK_CAN_GUILD_SEND_BANK_LIST, !script->CanGuildSendBankList(guild, session, tabId, sendAllSlots)); } -GuildScript::GuildScript(const char* name, std::vector enabledHooks) +GuildScript::GuildScript(char const* name, std::vector enabledHooks) : ScriptObject(name, GUILDHOOK_END) { // If empty - enable all available hooks. diff --git a/src/server/game/Scripting/ScriptDefines/GuildScript.h b/src/server/game/Scripting/ScriptDefines/GuildScript.h index 206b3a882..614665b17 100644 --- a/src/server/game/Scripting/ScriptDefines/GuildScript.h +++ b/src/server/game/Scripting/ScriptDefines/GuildScript.h @@ -42,7 +42,7 @@ enum GuildHook class GuildScript : public ScriptObject { protected: - GuildScript(const char* name, std::vector enabledHooks = std::vector()); + GuildScript(char const* name, std::vector enabledHooks = std::vector()); public: [[nodiscard]] bool IsDatabaseBound() const override { return false; } @@ -54,13 +54,13 @@ public: virtual void OnRemoveMember(Guild* /*guild*/, Player* /*player*/, bool /*isDisbanding*/, bool /*isKicked*/) { } // Called when the guild MOTD (message of the day) changes. - virtual void OnMOTDChanged(Guild* /*guild*/, const std::string& /*newMotd*/) { } + virtual void OnMOTDChanged(Guild* /*guild*/, std::string const& /*newMotd*/) { } // Called when the guild info is altered. - virtual void OnInfoChanged(Guild* /*guild*/, const std::string& /*newInfo*/) { } + virtual void OnInfoChanged(Guild* /*guild*/, std::string const& /*newInfo*/) { } // Called when a guild is created. - virtual void OnCreate(Guild* /*guild*/, Player* /*leader*/, const std::string& /*name*/) { } + virtual void OnCreate(Guild* /*guild*/, Player* /*leader*/, std::string const& /*name*/) { } // Called when a guild is disbanded. virtual void OnDisband(Guild* /*guild*/) { } diff --git a/src/server/game/Scripting/ScriptDefines/InstanceMapScript.cpp b/src/server/game/Scripting/ScriptDefines/InstanceMapScript.cpp index ada552c0a..ab70df48e 100644 --- a/src/server/game/Scripting/ScriptDefines/InstanceMapScript.cpp +++ b/src/server/game/Scripting/ScriptDefines/InstanceMapScript.cpp @@ -26,7 +26,7 @@ InstanceScript* ScriptMgr::CreateInstanceScript(InstanceMap* map) return tempScript ? tempScript->GetInstanceScript(map) : nullptr; } -InstanceMapScript::InstanceMapScript(const char* name, uint32 mapId) : +InstanceMapScript::InstanceMapScript(char const* name, uint32 mapId) : ScriptObject(name), MapScript(mapId) { ScriptRegistry::AddScript(this); diff --git a/src/server/game/Scripting/ScriptDefines/InstanceMapScript.h b/src/server/game/Scripting/ScriptDefines/InstanceMapScript.h index b4632e5d5..23151f94d 100644 --- a/src/server/game/Scripting/ScriptDefines/InstanceMapScript.h +++ b/src/server/game/Scripting/ScriptDefines/InstanceMapScript.h @@ -23,7 +23,7 @@ class InstanceMapScript : public ScriptObject, public MapScript { protected: - InstanceMapScript(const char* name, uint32 mapId); + InstanceMapScript(char const* name, uint32 mapId); public: [[nodiscard]] bool IsDatabaseBound() const override { return true; } diff --git a/src/server/game/Scripting/ScriptDefines/ItemScript.h b/src/server/game/Scripting/ScriptDefines/ItemScript.h index e29af4640..1d7ef269e 100644 --- a/src/server/game/Scripting/ScriptDefines/ItemScript.h +++ b/src/server/game/Scripting/ScriptDefines/ItemScript.h @@ -23,7 +23,7 @@ class ItemScript : public ScriptObject { protected: - ItemScript(const char* name); + ItemScript(char const* name); public: [[nodiscard]] bool IsDatabaseBound() const override { return true; } @@ -47,7 +47,7 @@ public: virtual void OnGossipSelect(Player* /*player*/, Item* /*item*/, uint32 /*sender*/, uint32 /*action*/) { } // Called when a player selects an option in an item gossip window - virtual void OnGossipSelectCode(Player* /*player*/, Item* /*item*/, uint32 /*sender*/, uint32 /*action*/, const char* /*code*/) { } + virtual void OnGossipSelectCode(Player* /*player*/, Item* /*item*/, uint32 /*sender*/, uint32 /*action*/, char const* /*code*/) { } }; #endif diff --git a/src/server/game/Scripting/ScriptDefines/LootScript.cpp b/src/server/game/Scripting/ScriptDefines/LootScript.cpp index c17ca9d2b..ab38c4c88 100644 --- a/src/server/game/Scripting/ScriptDefines/LootScript.cpp +++ b/src/server/game/Scripting/ScriptDefines/LootScript.cpp @@ -26,7 +26,7 @@ void ScriptMgr::OnLootMoney(Player* player, uint32 gold) CALL_ENABLED_HOOKS(LootScript, LOOTHOOK_ON_LOOT_MONEY, script->OnLootMoney(player, gold)); } -LootScript::LootScript(const char* name, std::vector enabledHooks) +LootScript::LootScript(char const* name, std::vector enabledHooks) : ScriptObject(name, LOOTHOOK_END) { // If empty - enable all available hooks. diff --git a/src/server/game/Scripting/ScriptDefines/LootScript.h b/src/server/game/Scripting/ScriptDefines/LootScript.h index c501bedf0..6275401c5 100644 --- a/src/server/game/Scripting/ScriptDefines/LootScript.h +++ b/src/server/game/Scripting/ScriptDefines/LootScript.h @@ -30,7 +30,7 @@ enum LootHook class LootScript : public ScriptObject { protected: - LootScript(const char* name, std::vector enabledHooks = std::vector()); + LootScript(char const* name, std::vector enabledHooks = std::vector()); public: [[nodiscard]] bool IsDatabaseBound() const override { return false; } diff --git a/src/server/game/Scripting/ScriptDefines/MailScript.cpp b/src/server/game/Scripting/ScriptDefines/MailScript.cpp index 3191ad356..274dc7151 100644 --- a/src/server/game/Scripting/ScriptDefines/MailScript.cpp +++ b/src/server/game/Scripting/ScriptDefines/MailScript.cpp @@ -24,7 +24,7 @@ void ScriptMgr::OnBeforeMailDraftSendMailTo(MailDraft* mailDraft, MailReceiver c CALL_ENABLED_HOOKS(MailScript, MAILHOOK_ON_BEFORE_MAIL_DRAFT_SEND_MAIL_TO, script->OnBeforeMailDraftSendMailTo(mailDraft, receiver, sender, checked, deliver_delay, custom_expiration, deleteMailItemsFromDB, sendMail)); } -MailScript::MailScript(const char* name, std::vector enabledHooks) +MailScript::MailScript(char const* name, std::vector enabledHooks) : ScriptObject(name, MAILHOOK_END) { // If empty - enable all available hooks. diff --git a/src/server/game/Scripting/ScriptDefines/MailScript.h b/src/server/game/Scripting/ScriptDefines/MailScript.h index 479ca8d3b..b9672df1b 100644 --- a/src/server/game/Scripting/ScriptDefines/MailScript.h +++ b/src/server/game/Scripting/ScriptDefines/MailScript.h @@ -30,7 +30,7 @@ enum MailHook class MailScript : public ScriptObject { protected: - MailScript(const char* name, std::vector enabledHooks = std::vector()); + MailScript(char const* name, std::vector enabledHooks = std::vector()); public: // Called before mail is sent diff --git a/src/server/game/Scripting/ScriptDefines/MiscScript.cpp b/src/server/game/Scripting/ScriptDefines/MiscScript.cpp index 1bc6d6faa..a41a3f0d9 100644 --- a/src/server/game/Scripting/ScriptDefines/MiscScript.cpp +++ b/src/server/game/Scripting/ScriptDefines/MiscScript.cpp @@ -94,7 +94,7 @@ void ScriptMgr::OnAfterLootTemplateProcess(Loot* loot, LootTemplate const* tab, CALL_ENABLED_HOOKS(MiscScript, MISCHOOK_ON_AFTER_LOOT_TEMPLATE_PROCESS, script->OnAfterLootTemplateProcess(loot, tab, store, lootOwner, personal, noEmptyError, lootMode)); } -void ScriptMgr::OnPlayerSetPhase(const AuraEffect* auraEff, AuraApplication const* aurApp, uint8 mode, bool apply, uint32& newPhase) +void ScriptMgr::OnPlayerSetPhase(AuraEffect const* auraEff, AuraApplication const* aurApp, uint8 mode, bool apply, uint32& newPhase) { CALL_ENABLED_HOOKS(MiscScript, MISCHOOK_ON_PLAYER_SET_PHASE, script->OnPlayerSetPhase(auraEff, aurApp, mode, apply, newPhase)); } @@ -109,7 +109,7 @@ void ScriptMgr::GetDialogStatus(Player* player, Object* questgiver) CALL_ENABLED_HOOKS(MiscScript, MISCHOOK_GET_DIALOG_STATUS, script->GetDialogStatus(player, questgiver)); } -MiscScript::MiscScript(const char* name, std::vector enabledHooks) +MiscScript::MiscScript(char const* name, std::vector enabledHooks) : ScriptObject(name, MISCHOOK_END) { // If empty - enable all available hooks. diff --git a/src/server/game/Scripting/ScriptDefines/MiscScript.h b/src/server/game/Scripting/ScriptDefines/MiscScript.h index 17fe66d24..9ed20ab23 100644 --- a/src/server/game/Scripting/ScriptDefines/MiscScript.h +++ b/src/server/game/Scripting/ScriptDefines/MiscScript.h @@ -48,7 +48,7 @@ enum MiscHook class MiscScript : public ScriptObject { protected: - MiscScript(const char* name, std::vector enabledHooks = std::vector()); + MiscScript(char const* name, std::vector enabledHooks = std::vector()); public: [[nodiscard]] bool IsDatabaseBound() const override { return false; } @@ -83,7 +83,7 @@ public: virtual void OnAfterLootTemplateProcess(Loot* /*loot*/, LootTemplate const* /*tab*/, LootStore const& /*store*/, Player* /*lootOwner*/, bool /*personal*/, bool /*noEmptyError*/, uint16 /*lootMode*/) { } - virtual void OnPlayerSetPhase(const AuraEffect* /*auraEff*/, AuraApplication const* /*aurApp*/, uint8 /*mode*/, bool /*apply*/, uint32& /*newPhase*/) { } + virtual void OnPlayerSetPhase(AuraEffect const* /*auraEff*/, AuraApplication const* /*aurApp*/, uint8 /*mode*/, bool /*apply*/, uint32& /*newPhase*/) { } virtual void OnInstanceSave(InstanceSave* /*instanceSave*/) { } diff --git a/src/server/game/Scripting/ScriptDefines/ModuleScript.cpp b/src/server/game/Scripting/ScriptDefines/ModuleScript.cpp index 95256bfce..b9079a153 100644 --- a/src/server/game/Scripting/ScriptDefines/ModuleScript.cpp +++ b/src/server/game/Scripting/ScriptDefines/ModuleScript.cpp @@ -18,7 +18,7 @@ #include "ModuleScript.h" #include "ScriptMgr.h" -ModuleScript::ModuleScript(const char* name) +ModuleScript::ModuleScript(char const* name) : ScriptObject(name) { ScriptRegistry::AddScript(this); diff --git a/src/server/game/Scripting/ScriptDefines/ModuleScript.h b/src/server/game/Scripting/ScriptDefines/ModuleScript.h index 2d0201e04..d450e4d60 100644 --- a/src/server/game/Scripting/ScriptDefines/ModuleScript.h +++ b/src/server/game/Scripting/ScriptDefines/ModuleScript.h @@ -25,7 +25,7 @@ class ModuleScript : public ScriptObject { protected: - ModuleScript(const char* name); + ModuleScript(char const* name); }; #endif diff --git a/src/server/game/Scripting/ScriptDefines/MovementHandlerScript.cpp b/src/server/game/Scripting/ScriptDefines/MovementHandlerScript.cpp index e55fdfb00..eb4f967f0 100644 --- a/src/server/game/Scripting/ScriptDefines/MovementHandlerScript.cpp +++ b/src/server/game/Scripting/ScriptDefines/MovementHandlerScript.cpp @@ -24,7 +24,7 @@ void ScriptMgr::OnPlayerMove(Player* player, MovementInfo movementInfo, uint32 o CALL_ENABLED_HOOKS(MovementHandlerScript, MOVEMENTHOOK_ON_PLAYER_MOVE, script->OnPlayerMove(player, movementInfo, opcode)); } -MovementHandlerScript::MovementHandlerScript(const char* name, std::vector enabledHooks) : +MovementHandlerScript::MovementHandlerScript(char const* name, std::vector enabledHooks) : ScriptObject(name, MOVEMENTHOOK_END) { // If empty - enable all available hooks. diff --git a/src/server/game/Scripting/ScriptDefines/MovementHandlerScript.h b/src/server/game/Scripting/ScriptDefines/MovementHandlerScript.h index df45266ed..f31b4a41d 100644 --- a/src/server/game/Scripting/ScriptDefines/MovementHandlerScript.h +++ b/src/server/game/Scripting/ScriptDefines/MovementHandlerScript.h @@ -31,7 +31,7 @@ enum MovementHook class MovementHandlerScript : public ScriptObject { protected: - MovementHandlerScript(const char* name, std::vector enabledHooks = std::vector()); + MovementHandlerScript(char const* name, std::vector enabledHooks = std::vector()); public: //Called whenever a player moves diff --git a/src/server/game/Scripting/ScriptDefines/OutdoorPvPScript.cpp b/src/server/game/Scripting/ScriptDefines/OutdoorPvPScript.cpp index 49fadf77b..51e6f74df 100644 --- a/src/server/game/Scripting/ScriptDefines/OutdoorPvPScript.cpp +++ b/src/server/game/Scripting/ScriptDefines/OutdoorPvPScript.cpp @@ -27,7 +27,7 @@ OutdoorPvP* ScriptMgr::CreateOutdoorPvP(OutdoorPvPData const* data) return tempScript ? tempScript->GetOutdoorPvP() : nullptr; } -OutdoorPvPScript::OutdoorPvPScript(const char* name) +OutdoorPvPScript::OutdoorPvPScript(char const* name) : ScriptObject(name) { ScriptRegistry::AddScript(this); diff --git a/src/server/game/Scripting/ScriptDefines/OutdoorPvPScript.h b/src/server/game/Scripting/ScriptDefines/OutdoorPvPScript.h index fc8d2dea4..7ad28ac9b 100644 --- a/src/server/game/Scripting/ScriptDefines/OutdoorPvPScript.h +++ b/src/server/game/Scripting/ScriptDefines/OutdoorPvPScript.h @@ -23,7 +23,7 @@ class OutdoorPvPScript : public ScriptObject { protected: - OutdoorPvPScript(const char* name); + OutdoorPvPScript(char const* name); public: [[nodiscard]] bool IsDatabaseBound() const override { return true; } diff --git a/src/server/game/Scripting/ScriptDefines/PetScript.cpp b/src/server/game/Scripting/ScriptDefines/PetScript.cpp index 7778c809b..b18073414 100644 --- a/src/server/game/Scripting/ScriptDefines/PetScript.cpp +++ b/src/server/game/Scripting/ScriptDefines/PetScript.cpp @@ -51,7 +51,7 @@ void ScriptMgr::OnPetAddToWorld(Pet* pet) CALL_ENABLED_HOOKS(PetScript, PETHOOK_ON_PET_ADD_TO_WORLD, script->OnPetAddToWorld(pet)); } -PetScript::PetScript(const char* name, std::vector enabledHooks) +PetScript::PetScript(char const* name, std::vector enabledHooks) : ScriptObject(name, PETHOOK_END) { // If empty - enable all available hooks. diff --git a/src/server/game/Scripting/ScriptDefines/PetScript.h b/src/server/game/Scripting/ScriptDefines/PetScript.h index 12090149b..f1455f20c 100644 --- a/src/server/game/Scripting/ScriptDefines/PetScript.h +++ b/src/server/game/Scripting/ScriptDefines/PetScript.h @@ -35,7 +35,7 @@ enum PetHook class PetScript : public ScriptObject { protected: - PetScript(const char* name, std::vector enabledHooks = std::vector()); + PetScript(char const* name, std::vector enabledHooks = std::vector()); public: [[nodiscard]] bool IsDatabaseBound() const override { return false; } diff --git a/src/server/game/Scripting/ScriptDefines/PlayerScript.cpp b/src/server/game/Scripting/ScriptDefines/PlayerScript.cpp index d8bab4751..db26afea2 100644 --- a/src/server/game/Scripting/ScriptDefines/PlayerScript.cpp +++ b/src/server/game/Scripting/ScriptDefines/PlayerScript.cpp @@ -32,7 +32,7 @@ void ScriptMgr::OnPlayerGossipSelect(Player* player, uint32 menu_id, uint32 send CALL_ENABLED_HOOKS(PlayerScript, PLAYERHOOK_ON_GOSSIP_SELECT, script->OnPlayerGossipSelect(player, menu_id, sender, action)); } -void ScriptMgr::OnPlayerGossipSelectCode(Player* player, uint32 menu_id, uint32 sender, uint32 action, const char* code) +void ScriptMgr::OnPlayerGossipSelectCode(Player* player, uint32 menu_id, uint32 sender, uint32 action, char const* code) { CALL_ENABLED_HOOKS(PlayerScript, PLAYERHOOK_ON_GOSSIP_SELECT_CODE, script->OnPlayerGossipSelectCode(player, menu_id, sender, action, code)); } @@ -772,7 +772,7 @@ bool ScriptMgr::OnPlayerNotSetArenaTeamInfoField(Player* player, uint8 slot, Are CALL_ENABLED_BOOLEAN_HOOKS(PlayerScript, PLAYERHOOK_NOT_SET_ARENA_TEAM_INFO_FIELD, !script->OnPlayerNotSetArenaTeamInfoField(player, slot, type, value)); } -bool ScriptMgr::OnPlayerCanJoinLfg(Player* player, uint8 roles, lfg::LfgDungeonSet& dungeons, const std::string& comment) +bool ScriptMgr::OnPlayerCanJoinLfg(Player* player, uint8 roles, lfg::LfgDungeonSet& dungeons, std::string const& comment) { CALL_ENABLED_BOOLEAN_HOOKS(PlayerScript, PLAYERHOOK_CAN_JOIN_LFG, !script->OnPlayerCanJoinLfg(player, roles, dungeons, comment)); } @@ -954,7 +954,7 @@ void ScriptMgr::OnPlayerBeforeGetLevelForXPGain(Player const* player, uint8& lev level = std::clamp(level, uint8(1), uint8(sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL))); } -PlayerScript::PlayerScript(const char* name, std::vector enabledHooks) +PlayerScript::PlayerScript(char const* name, std::vector enabledHooks) : ScriptObject(name, PLAYERHOOK_END) { // If empty - enable all available hooks. diff --git a/src/server/game/Scripting/ScriptDefines/PlayerScript.h b/src/server/game/Scripting/ScriptDefines/PlayerScript.h index 87337a83c..113af5c73 100644 --- a/src/server/game/Scripting/ScriptDefines/PlayerScript.h +++ b/src/server/game/Scripting/ScriptDefines/PlayerScript.h @@ -221,7 +221,7 @@ enum PlayerHook class PlayerScript : public ScriptObject { protected: - PlayerScript(const char* name, std::vector enabledHooks = std::vector()); + PlayerScript(char const* name, std::vector enabledHooks = std::vector()); public: // Called when a player dies @@ -396,7 +396,7 @@ public: virtual void OnPlayerGossipSelect(Player* /*player*/, uint32 /*menu_id*/, uint32 /*sender*/, uint32 /*action*/) { } // Called when a player selects an option in a player gossip window - virtual void OnPlayerGossipSelectCode(Player* /*player*/, uint32 /*menu_id*/, uint32 /*sender*/, uint32 /*action*/, const char* /*code*/) { } + virtual void OnPlayerGossipSelectCode(Player* /*player*/, uint32 /*menu_id*/, uint32 /*sender*/, uint32 /*action*/, char const* /*code*/) { } // On player getting charmed virtual void OnPlayerBeingCharmed(Player* /*player*/, Unit* /*charmer*/, uint32 /*oldFactionId*/, uint32 /*newFactionId*/) { } @@ -614,7 +614,7 @@ public: [[nodiscard]] virtual bool OnPlayerNotSetArenaTeamInfoField(Player* /*player*/, uint8 /*slot*/, ArenaTeamInfoType /*type*/, uint32 /*value*/) { return true; } // Whats that? - [[nodiscard]] virtual bool OnPlayerCanJoinLfg(Player* /*player*/, uint8 /*roles*/, std::set& /*dungeons*/, const std::string& /*comment*/) { return true; } + [[nodiscard]] virtual bool OnPlayerCanJoinLfg(Player* /*player*/, uint8 /*roles*/, std::set& /*dungeons*/, std::string const& /*comment*/) { return true; } [[nodiscard]] virtual bool OnPlayerCanEnterMap(Player* /*player*/, MapEntry const* /*entry*/, InstanceTemplate const* /*instance*/, MapDifficulty const* /*mapDiff*/, bool /*loginCheck*/) { return true; } diff --git a/src/server/game/Scripting/ScriptDefines/ServerScript.cpp b/src/server/game/Scripting/ScriptDefines/ServerScript.cpp index faab0ca53..d2d01f6ff 100644 --- a/src/server/game/Scripting/ScriptDefines/ServerScript.cpp +++ b/src/server/game/Scripting/ScriptDefines/ServerScript.cpp @@ -62,7 +62,7 @@ bool ScriptMgr::CanPacketReceive(WorldSession* session, WorldPacket const& packe CALL_ENABLED_BOOLEAN_HOOKS(ServerScript, SERVERHOOK_CAN_PACKET_RECEIVE, !script->CanPacketReceive(session, packet)); } -ServerScript::ServerScript(const char* name, std::vector enabledHooks) +ServerScript::ServerScript(char const* name, std::vector enabledHooks) : ScriptObject(name, SERVERHOOK_END) { // If empty - enable all available hooks. diff --git a/src/server/game/Scripting/ScriptDefines/ServerScript.h b/src/server/game/Scripting/ScriptDefines/ServerScript.h index c583856e2..8c98ab447 100644 --- a/src/server/game/Scripting/ScriptDefines/ServerScript.h +++ b/src/server/game/Scripting/ScriptDefines/ServerScript.h @@ -37,7 +37,7 @@ enum ServerHook class ServerScript : public ScriptObject { protected: - ServerScript(const char* name, std::vector enabledHooks = std::vector()); + ServerScript(char const* name, std::vector enabledHooks = std::vector()); public: // Called when reactive socket I/O is started (WorldSocketMgr). diff --git a/src/server/game/Scripting/ScriptDefines/SpellScriptLoader.cpp b/src/server/game/Scripting/ScriptDefines/SpellScriptLoader.cpp index b95c35700..e3fec2927 100644 --- a/src/server/game/Scripting/ScriptDefines/SpellScriptLoader.cpp +++ b/src/server/game/Scripting/ScriptDefines/SpellScriptLoader.cpp @@ -76,7 +76,7 @@ void ScriptMgr::CreateSpellScriptLoaders(uint32 spellId, std::vector::AddScript(this); diff --git a/src/server/game/Scripting/ScriptDefines/SpellScriptLoader.h b/src/server/game/Scripting/ScriptDefines/SpellScriptLoader.h index 841ccb5f2..2f62362ae 100644 --- a/src/server/game/Scripting/ScriptDefines/SpellScriptLoader.h +++ b/src/server/game/Scripting/ScriptDefines/SpellScriptLoader.h @@ -25,7 +25,7 @@ class SpellScriptLoader : public ScriptObject { protected: - SpellScriptLoader(const char* name); + SpellScriptLoader(char const* name); public: [[nodiscard]] bool IsDatabaseBound() const override { return true; } diff --git a/src/server/game/Scripting/ScriptDefines/TransportScript.cpp b/src/server/game/Scripting/ScriptDefines/TransportScript.cpp index d9a463957..a40d9a33b 100644 --- a/src/server/game/Scripting/ScriptDefines/TransportScript.cpp +++ b/src/server/game/Scripting/ScriptDefines/TransportScript.cpp @@ -70,7 +70,7 @@ void ScriptMgr::OnRelocate(Transport* transport, uint32 waypointId, uint32 mapId } } -TransportScript::TransportScript(const char* name) +TransportScript::TransportScript(char const* name) : ScriptObject(name) { ScriptRegistry::AddScript(this); diff --git a/src/server/game/Scripting/ScriptDefines/TransportScript.h b/src/server/game/Scripting/ScriptDefines/TransportScript.h index 3a6fa6018..112101613 100644 --- a/src/server/game/Scripting/ScriptDefines/TransportScript.h +++ b/src/server/game/Scripting/ScriptDefines/TransportScript.h @@ -23,7 +23,7 @@ class TransportScript : public ScriptObject, public UpdatableScript { protected: - TransportScript(const char* name); + TransportScript(char const* name); public: [[nodiscard]] bool IsDatabaseBound() const override { return true; } diff --git a/src/server/game/Scripting/ScriptDefines/UnitScript.cpp b/src/server/game/Scripting/ScriptDefines/UnitScript.cpp index 71d5a2474..eb365fdcb 100644 --- a/src/server/game/Scripting/ScriptDefines/UnitScript.cpp +++ b/src/server/game/Scripting/ScriptDefines/UnitScript.cpp @@ -139,7 +139,7 @@ void ScriptMgr::OnUnitSetShapeshiftForm(Unit* unit, uint8 form) CALL_ENABLED_HOOKS(UnitScript, UNITHOOK_ON_UNIT_SET_SHAPESHIFT_FORM, script->OnUnitSetShapeshiftForm(unit, form)); } -UnitScript::UnitScript(const char* name, bool addToScripts, std::vector enabledHooks) +UnitScript::UnitScript(char const* name, bool addToScripts, std::vector enabledHooks) : ScriptObject(name, UNITHOOK_END) { if (addToScripts) diff --git a/src/server/game/Scripting/ScriptDefines/UnitScript.h b/src/server/game/Scripting/ScriptDefines/UnitScript.h index b0cba45a3..8df6eea40 100644 --- a/src/server/game/Scripting/ScriptDefines/UnitScript.h +++ b/src/server/game/Scripting/ScriptDefines/UnitScript.h @@ -54,7 +54,7 @@ struct BuildValuesCachePosPointers; class UnitScript : public ScriptObject { protected: - UnitScript(const char* name, bool addToScripts = true, std::vector enabledHooks = std::vector()); + UnitScript(char const* name, bool addToScripts = true, std::vector enabledHooks = std::vector()); public: // Called when a unit deals healing to another unit diff --git a/src/server/game/Scripting/ScriptDefines/VehicleScript.cpp b/src/server/game/Scripting/ScriptDefines/VehicleScript.cpp index 35cc6fbeb..007bfcf33 100644 --- a/src/server/game/Scripting/ScriptDefines/VehicleScript.cpp +++ b/src/server/game/Scripting/ScriptDefines/VehicleScript.cpp @@ -88,7 +88,7 @@ void ScriptMgr::OnRemovePassenger(Vehicle* veh, Unit* passenger) } } -VehicleScript::VehicleScript(const char* name) +VehicleScript::VehicleScript(char const* name) : ScriptObject(name) { ScriptRegistry::AddScript(this); diff --git a/src/server/game/Scripting/ScriptDefines/VehicleScript.h b/src/server/game/Scripting/ScriptDefines/VehicleScript.h index c1f6b7b87..8e13c7f0d 100644 --- a/src/server/game/Scripting/ScriptDefines/VehicleScript.h +++ b/src/server/game/Scripting/ScriptDefines/VehicleScript.h @@ -23,7 +23,7 @@ class VehicleScript : public ScriptObject { protected: - VehicleScript(const char* name); + VehicleScript(char const* name); public: // Called after a vehicle is installed. diff --git a/src/server/game/Scripting/ScriptDefines/WeatherScript.cpp b/src/server/game/Scripting/ScriptDefines/WeatherScript.cpp index 863b57622..b021d422f 100644 --- a/src/server/game/Scripting/ScriptDefines/WeatherScript.cpp +++ b/src/server/game/Scripting/ScriptDefines/WeatherScript.cpp @@ -45,7 +45,7 @@ void ScriptMgr::OnWeatherUpdate(Weather* weather, uint32 diff) } } -WeatherScript::WeatherScript(const char* name) +WeatherScript::WeatherScript(char const* name) : ScriptObject(name) { ScriptRegistry::AddScript(this); diff --git a/src/server/game/Scripting/ScriptDefines/WeatherScript.h b/src/server/game/Scripting/ScriptDefines/WeatherScript.h index b85d15876..dd9233827 100644 --- a/src/server/game/Scripting/ScriptDefines/WeatherScript.h +++ b/src/server/game/Scripting/ScriptDefines/WeatherScript.h @@ -23,7 +23,7 @@ class WeatherScript : public ScriptObject, public UpdatableScript { protected: - WeatherScript(const char* name); + WeatherScript(char const* name); public: [[nodiscard]] bool IsDatabaseBound() const override { return true; } diff --git a/src/server/game/Scripting/ScriptDefines/WorldMapScript.cpp b/src/server/game/Scripting/ScriptDefines/WorldMapScript.cpp index da35cebc3..daffa9c9a 100644 --- a/src/server/game/Scripting/ScriptDefines/WorldMapScript.cpp +++ b/src/server/game/Scripting/ScriptDefines/WorldMapScript.cpp @@ -19,7 +19,7 @@ #include "Log.h" #include "ScriptMgr.h" -WorldMapScript::WorldMapScript(const char* name, uint32 mapId) : +WorldMapScript::WorldMapScript(char const* name, uint32 mapId) : ScriptObject(name), MapScript(mapId) { ScriptRegistry::AddScript(this); diff --git a/src/server/game/Scripting/ScriptDefines/WorldMapScript.h b/src/server/game/Scripting/ScriptDefines/WorldMapScript.h index 40ff656c7..0df32246d 100644 --- a/src/server/game/Scripting/ScriptDefines/WorldMapScript.h +++ b/src/server/game/Scripting/ScriptDefines/WorldMapScript.h @@ -23,7 +23,7 @@ class WorldMapScript : public ScriptObject, public MapScript { protected: - WorldMapScript(const char* name, uint32 mapId); + WorldMapScript(char const* name, uint32 mapId); public: [[nodiscard]] bool isAfterLoadScript() const override { return true; } diff --git a/src/server/game/Scripting/ScriptDefines/WorldObjectScript.cpp b/src/server/game/Scripting/ScriptDefines/WorldObjectScript.cpp index 040465e65..a3ec17f35 100644 --- a/src/server/game/Scripting/ScriptDefines/WorldObjectScript.cpp +++ b/src/server/game/Scripting/ScriptDefines/WorldObjectScript.cpp @@ -54,7 +54,7 @@ void ScriptMgr::OnWorldObjectUpdate(WorldObject* object, uint32 diff) CALL_ENABLED_HOOKS(WorldObjectScript, WORLDOBJECTHOOK_ON_WORLD_OBJECT_UPDATE, script->OnWorldObjectUpdate(object, diff)); } -WorldObjectScript::WorldObjectScript(const char* name, std::vector enabledHooks) +WorldObjectScript::WorldObjectScript(char const* name, std::vector enabledHooks) : ScriptObject(name, WORLDOBJECTHOOK_END) { // If empty - enable all available hooks. diff --git a/src/server/game/Scripting/ScriptDefines/WorldObjectScript.h b/src/server/game/Scripting/ScriptDefines/WorldObjectScript.h index e83bea37b..30c497114 100644 --- a/src/server/game/Scripting/ScriptDefines/WorldObjectScript.h +++ b/src/server/game/Scripting/ScriptDefines/WorldObjectScript.h @@ -34,7 +34,7 @@ enum WorldObjectHook class WorldObjectScript : public ScriptObject { protected: - WorldObjectScript(const char* name, std::vector enabledHooks = std::vector()); + WorldObjectScript(char const* name, std::vector enabledHooks = std::vector()); public: [[nodiscard]] bool IsDatabaseBound() const override { return false; } diff --git a/src/server/game/Scripting/ScriptDefines/WorldScript.cpp b/src/server/game/Scripting/ScriptDefines/WorldScript.cpp index e5eef4675..94c93ede4 100644 --- a/src/server/game/Scripting/ScriptDefines/WorldScript.cpp +++ b/src/server/game/Scripting/ScriptDefines/WorldScript.cpp @@ -84,7 +84,7 @@ void ScriptMgr::OnBeforeWorldInitialized() CALL_ENABLED_HOOKS(WorldScript, WORLDHOOK_ON_BEFORE_WORLD_INITIALIZED, script->OnBeforeWorldInitialized()); } -WorldScript::WorldScript(const char* name, std::vector enabledHooks) +WorldScript::WorldScript(char const* name, std::vector enabledHooks) : ScriptObject(name, WORLDHOOK_END) { // If empty - enable all available hooks. diff --git a/src/server/game/Scripting/ScriptDefines/WorldScript.h b/src/server/game/Scripting/ScriptDefines/WorldScript.h index 75589426e..f5a51b82f 100644 --- a/src/server/game/Scripting/ScriptDefines/WorldScript.h +++ b/src/server/game/Scripting/ScriptDefines/WorldScript.h @@ -43,7 +43,7 @@ enum WorldHook class WorldScript : public ScriptObject { protected: - WorldScript(const char* name, std::vector enabledHooks = std::vector()); + WorldScript(char const* name, std::vector enabledHooks = std::vector()); public: // Called when the open/closed state of the world changes. diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h index cbc540866..411ca5a77 100644 --- a/src/server/game/Scripting/ScriptMgr.h +++ b/src/server/game/Scripting/ScriptMgr.h @@ -206,12 +206,12 @@ public: /* ItemScript */ bool OnItemRemove(Player* player, Item* item); bool OnCastItemCombatSpell(Player* player, Unit* victim, SpellInfo const* spellInfo, Item* item); void OnGossipSelect(Player* player, Item* item, uint32 sender, uint32 action); - void OnGossipSelectCode(Player* player, Item* item, uint32 sender, uint32 action, const char* code); + void OnGossipSelectCode(Player* player, Item* item, uint32 sender, uint32 action, char const* code); public: /* CreatureScript */ bool OnGossipHello(Player* player, Creature* creature); bool OnGossipSelect(Player* player, Creature* creature, uint32 sender, uint32 action); - bool OnGossipSelectCode(Player* player, Creature* creature, uint32 sender, uint32 action, const char* code); + bool OnGossipSelectCode(Player* player, Creature* creature, uint32 sender, uint32 action, char const* code); bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest); bool OnQuestSelect(Player* player, Creature* creature, Quest const* quest); bool OnQuestComplete(Player* player, Creature* creature, Quest const* quest); @@ -226,7 +226,7 @@ public: /* CreatureScript */ public: /* GameObjectScript */ bool OnGossipHello(Player* player, GameObject* go); bool OnGossipSelect(Player* player, GameObject* go, uint32 sender, uint32 action); - bool OnGossipSelectCode(Player* player, GameObject* go, uint32 sender, uint32 action, const char* code); + bool OnGossipSelectCode(Player* player, GameObject* go, uint32 sender, uint32 action, char const* code); bool OnQuestAccept(Player* player, GameObject* go, Quest const* quest); bool OnQuestReward(Player* player, GameObject* go, Quest const* quest, uint32 opt); uint32 GetDialogStatus(Player* player, GameObject* go); @@ -349,7 +349,7 @@ public: /* PlayerScript */ void OnPlayerAchievementSave(CharacterDatabaseTransaction trans, Player* player, uint16 achiId, CompletedAchievementData achiData); void OnPlayerCriteriaSave(CharacterDatabaseTransaction trans, Player* player, uint16 critId, CriteriaProgress criteriaData); void OnPlayerGossipSelect(Player* player, uint32 menu_id, uint32 sender, uint32 action); - void OnPlayerGossipSelectCode(Player* player, uint32 menu_id, uint32 sender, uint32 action, const char* code); + void OnPlayerGossipSelectCode(Player* player, uint32 menu_id, uint32 sender, uint32 action, char const* code); void OnPlayerBeingCharmed(Player* player, Unit* charmer, uint32 oldFactionId, uint32 newFactionId); void OnPlayerAfterSetVisibleItemSlot(Player* player, uint8 slot, Item* item); void OnPlayerAfterMoveItemFromInventory(Player* player, Item* it, uint8 bag, uint8 slot, bool update); @@ -438,7 +438,7 @@ public: /* PlayerScript */ void OnPlayerIsPvP(Player* player, bool& result); void OnPlayerGetMaxSkillValueForLevel(Player* player, uint16& result); bool OnPlayerNotSetArenaTeamInfoField(Player* player, uint8 slot, ArenaTeamInfoType type, uint32 value); - bool OnPlayerCanJoinLfg(Player* player, uint8 roles, lfg::LfgDungeonSet& dungeons, const std::string& comment); + bool OnPlayerCanJoinLfg(Player* player, uint8 roles, lfg::LfgDungeonSet& dungeons, std::string const& comment); bool OnPlayerCanEnterMap(Player* player, MapEntry const* entry, InstanceTemplate const* instance, MapDifficulty const* mapDiff, bool loginCheck); bool OnPlayerCanInitTrade(Player* player, Player* target); bool OnPlayerCanSetTradeItem(Player* player, Item* tradedItem, uint8 tradeSlot); @@ -495,9 +495,9 @@ public: /* AccountScript */ public: /* GuildScript */ void OnGuildAddMember(Guild* guild, Player* player, uint8& plRank); void OnGuildRemoveMember(Guild* guild, Player* player, bool isDisbanding, bool isKicked); - void OnGuildMOTDChanged(Guild* guild, const std::string& newMotd); - void OnGuildInfoChanged(Guild* guild, const std::string& newInfo); - void OnGuildCreate(Guild* guild, Player* leader, const std::string& name); + void OnGuildMOTDChanged(Guild* guild, std::string const& newMotd); + void OnGuildInfoChanged(Guild* guild, std::string const& newInfo); + void OnGuildCreate(Guild* guild, Player* leader, std::string const& name); void OnGuildDisband(Guild* guild); void OnGuildMemberWitdrawMoney(Guild* guild, Player* player, uint32& amount, bool isRepair); void OnGuildMemberDepositMoney(Guild* guild, Player* player, uint32& amount); @@ -510,7 +510,7 @@ public: /* GuildScript */ public: /* GroupScript */ void OnGroupAddMember(Group* group, ObjectGuid guid); void OnGroupInviteMember(Group* group, ObjectGuid guid); - void OnGroupRemoveMember(Group* group, ObjectGuid guid, RemoveMethod method, ObjectGuid kicker, const char* reason); + void OnGroupRemoveMember(Group* group, ObjectGuid guid, RemoveMethod method, ObjectGuid kicker, char const* reason); void OnGroupChangeLeader(Group* group, ObjectGuid newLeaderGuid, ObjectGuid oldLeaderGuid); void OnGroupDisband(Group* group); bool CanGroupJoinBattlegroundQueue(Group const* group, Player* member, Battleground const* bgTemplate, uint32 MinPlayerCount, bool isRated, uint32 arenaSlot); @@ -574,8 +574,8 @@ public: /* MovementHandlerScript */ public: /* AllCreatureScript */ //listener function (OnAllCreatureUpdate) is called by OnCreatureUpdate //void OnAllCreatureUpdate(Creature* creature, uint32 diff); - void OnBeforeCreatureSelectLevel(const CreatureTemplate* cinfo, Creature* creature, uint8& level); - void OnCreatureSelectLevel(const CreatureTemplate* cinfo, Creature* creature); + void OnBeforeCreatureSelectLevel(CreatureTemplate const* cinfo, Creature* creature, uint8& level); + void OnCreatureSelectLevel(CreatureTemplate const* cinfo, Creature* creature); void OnCreatureSaveToDB(Creature* creature); public: /* AllGameobjectScript */ @@ -689,7 +689,7 @@ public: /* MiscScript */ bool CanItemApplyEquipSpell(Player* player, Item* item); bool CanSendAuctionHello(WorldSession const* session, ObjectGuid guid, Creature* creature); void ValidateSpellAtCastSpell(Player* player, uint32& oldSpellId, uint32& spellId, uint8& castCount, uint8& castFlags); - void OnPlayerSetPhase(const AuraEffect* auraEff, AuraApplication const* aurApp, uint8 mode, bool apply, uint32& newPhase); + void OnPlayerSetPhase(AuraEffect const* auraEff, AuraApplication const* aurApp, uint8 mode, bool apply, uint32& newPhase); void ValidateSpellAtCastSpellResult(Player* player, Unit* mover, Spell* spell, uint32 oldSpellId, uint32 spellId); void OnAfterLootTemplateProcess(Loot* loot, LootTemplate const* tab, LootStore const& store, Player* lootOwner, bool personal, bool noEmptyError, uint16 lootMode); void OnInstanceSave(InstanceSave* instanceSave); diff --git a/src/server/game/Scripting/ScriptObject.h b/src/server/game/Scripting/ScriptObject.h index bd2021417..9f0b61b80 100644 --- a/src/server/game/Scripting/ScriptObject.h +++ b/src/server/game/Scripting/ScriptObject.h @@ -50,12 +50,12 @@ public: [[nodiscard]] virtual bool isAfterLoadScript() const { return IsDatabaseBound(); } virtual void checkValidity() { } - [[nodiscard]] const std::string& GetName() const { return _name; } + [[nodiscard]] std::string const& GetName() const { return _name; } [[nodiscard]] uint16 GetTotalAvailableHooks() { return _totalAvailableHooks; } protected: - ScriptObject(const char* name, uint16 totalAvailableHooks = 0) : _name(std::string(name)), _totalAvailableHooks(totalAvailableHooks) + ScriptObject(char const* name, uint16 totalAvailableHooks = 0) : _name(std::string(name)), _totalAvailableHooks(totalAvailableHooks) { } diff --git a/src/server/game/Server/WorldSession.cpp b/src/server/game/Server/WorldSession.cpp index ccdf9228a..dae5140f8 100644 --- a/src/server/game/Server/WorldSession.cpp +++ b/src/server/game/Server/WorldSession.cpp @@ -340,7 +340,7 @@ void WorldSession::QueuePacket(WorldPacket* new_packet) } /// Logging helper for unexpected opcodes -void WorldSession::LogUnexpectedOpcode(WorldPacket* packet, char const* status, const char* reason) +void WorldSession::LogUnexpectedOpcode(WorldPacket* packet, char const* status, char const* reason) { LOG_ERROR("network.opcode", "Received unexpected opcode {} Status: {} Reason: {} from {}", GetOpcodeNameForLogging(static_cast(packet->GetOpcode())), status, reason, GetPlayerInfo()); diff --git a/src/server/game/Server/WorldSession.h b/src/server/game/Server/WorldSession.h index b588ad8f1..fa2bfd561 100644 --- a/src/server/game/Server/WorldSession.h +++ b/src/server/game/Server/WorldSession.h @@ -1223,7 +1223,7 @@ private: bool recoveryItem(Item* pItem); // logging helper - void LogUnexpectedOpcode(WorldPacket* packet, char const* status, const char* reason); + void LogUnexpectedOpcode(WorldPacket* packet, char const* status, char const* reason); void LogUnprocessedTail(WorldPacket* packet); // EnumData helpers diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp index 2ea95ae4b..8a4b34da5 100644 --- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp +++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp @@ -1440,7 +1440,7 @@ void AuraEffect::HandleShapeshiftBoosts(Unit* target, bool apply) const if (player) { - const PlayerSpellMap& sp_list = player->GetSpellMap(); + PlayerSpellMap const& sp_list = player->GetSpellMap(); for (PlayerSpellMap::const_iterator itr = sp_list.begin(); itr != sp_list.end(); ++itr) { if (itr->second->State == PLAYERSPELL_REMOVED || !itr->second->IsInSpec(player->GetActiveSpec())) @@ -1458,7 +1458,7 @@ void AuraEffect::HandleShapeshiftBoosts(Unit* target, bool apply) const } // xinef: talent stance auras are not on m_spells map, so iterate talents - const PlayerTalentMap& tl_list = player->GetTalentMap(); + PlayerTalentMap const& tl_list = player->GetTalentMap(); for (PlayerTalentMap::const_iterator itr = tl_list.begin(); itr != tl_list.end(); ++itr) { if (itr->second->State == PLAYERSPELL_REMOVED || !itr->second->IsInSpec(player->GetActiveSpec())) @@ -1604,7 +1604,7 @@ void AuraEffect::HandleShapeshiftBoosts(Unit* target, bool apply) const } } - const Unit::AuraEffectList& shapeshifts = target->GetAuraEffectsByType(SPELL_AURA_MOD_SHAPESHIFT); + Unit::AuraEffectList const& shapeshifts = target->GetAuraEffectsByType(SPELL_AURA_MOD_SHAPESHIFT); AuraEffect* newAura = nullptr; // Iterate through all the shapeshift auras that the target has, if there is another aura with SPELL_AURA_MOD_SHAPESHIFT, then this aura is being removed due to that one being applied for (Unit::AuraEffectList::const_iterator itr = shapeshifts.begin(); itr != shapeshifts.end(); ++itr) diff --git a/src/server/game/Spells/Auras/SpellAuras.h b/src/server/game/Spells/Auras/SpellAuras.h index 0c6639584..d4dd5e0ec 100644 --- a/src/server/game/Spells/Auras/SpellAuras.h +++ b/src/server/game/Spells/Auras/SpellAuras.h @@ -181,7 +181,7 @@ public: // Helpers for targets ApplicationMap const& GetApplicationMap() {return m_applications;} void GetApplicationList(std::list& applicationList) const; - const AuraApplication* GetApplicationOfTarget (ObjectGuid guid) const { ApplicationMap::const_iterator itr = m_applications.find(guid); if (itr != m_applications.end()) return itr->second; return nullptr; } + AuraApplication const* GetApplicationOfTarget (ObjectGuid guid) const { ApplicationMap::const_iterator itr = m_applications.find(guid); if (itr != m_applications.end()) return itr->second; return nullptr; } AuraApplication* GetApplicationOfTarget (ObjectGuid guid) { ApplicationMap::iterator itr = m_applications.find(guid); if (itr != m_applications.end()) return itr->second; return nullptr; } bool IsAppliedOnTarget(ObjectGuid guid) const { return m_applications.find(guid) != m_applications.end(); } diff --git a/src/server/game/Spells/Spell.h b/src/server/game/Spells/Spell.h index 40ebfaa6f..a956597a0 100644 --- a/src/server/game/Spells/Spell.h +++ b/src/server/game/Spells/Spell.h @@ -252,7 +252,7 @@ enum SpellEffectHandleMode // Xinef: special structure containing data for channel target spells struct ChannelTargetData { - ChannelTargetData(ObjectGuid cguid, const SpellDestination* dst) : channelGUID(cguid) + ChannelTargetData(ObjectGuid cguid, SpellDestination const* dst) : channelGUID(cguid) { if (dst) spellDst = *dst; diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index 928e33659..0a441a881 100644 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -3936,7 +3936,7 @@ void Spell::EffectScriptEffect(SpellEffIndex effIndex) case 47770: { char buf[128]; - const char* gender = "his"; + char const* gender = "his"; if (m_caster->getGender() > 0) gender = "her"; snprintf(buf, sizeof(buf), "%s rubs %s [Decahedral Dwarven Dice] between %s hands and rolls. One %u and one %u.", m_caster->GetName().c_str(), gender, gender, urand(1, 10), urand(1, 10)); diff --git a/src/server/game/Spells/SpellInfo.cpp b/src/server/game/Spells/SpellInfo.cpp index f2e5d803c..3494dc9c0 100644 --- a/src/server/game/Spells/SpellInfo.cpp +++ b/src/server/game/Spells/SpellInfo.cpp @@ -1628,7 +1628,7 @@ bool SpellInfo::IsAuraEffectEqual(SpellInfo const* otherSpellInfo) const return matchCount * 2 == auraCount; } -bool SpellInfo::ValidateAttribute6SpellDamageMods(Unit const* caster, const AuraEffect* auraEffect, bool isDot) const +bool SpellInfo::ValidateAttribute6SpellDamageMods(Unit const* caster, AuraEffect const* auraEffect, bool isDot) const { // Xinef: no attribute if (!(AttributesEx6 & SPELL_ATTR6_IGNORE_CASTER_DAMAGE_MODIFIERS)) diff --git a/src/server/game/Spells/SpellInfo.h b/src/server/game/Spells/SpellInfo.h index b87b5e37d..022a6d028 100644 --- a/src/server/game/Spells/SpellInfo.h +++ b/src/server/game/Spells/SpellInfo.h @@ -516,7 +516,7 @@ public: bool CheckTargetCreatureType(Unit const* target) const; bool IsAuraEffectEqual(SpellInfo const* otherSpellInfo) const; - bool ValidateAttribute6SpellDamageMods(Unit const* caster, const AuraEffect* auraEffect, bool isDot) const; + bool ValidateAttribute6SpellDamageMods(Unit const* caster, AuraEffect const* auraEffect, bool isDot) const; SpellSchoolMask GetSchoolMask() const; uint64 GetAllEffectsMechanicMask() const; diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp index 987ffd1d0..1f23766ea 100644 --- a/src/server/game/Spells/SpellMgr.cpp +++ b/src/server/game/Spells/SpellMgr.cpp @@ -1011,7 +1011,7 @@ bool SpellMgr::IsArenaAllowedEnchancment(uint32 ench_id) const return mEnchantCustomAttr[ench_id]; } -const std::vector* SpellMgr::GetSpellLinked(int32 spell_id) const +std::vector const* SpellMgr::GetSpellLinked(int32 spell_id) const { SpellLinkedMap::const_iterator itr = mSpellLinkedMap.find(spell_id); return itr != mSpellLinkedMap.end() ? &(itr->second) : nullptr; diff --git a/src/server/game/Spells/SpellMgr.h b/src/server/game/Spells/SpellMgr.h index 27c049497..2d67f29b1 100644 --- a/src/server/game/Spells/SpellMgr.h +++ b/src/server/game/Spells/SpellMgr.h @@ -726,7 +726,7 @@ public: [[nodiscard]] SpellEnchantProcEntry const* GetSpellEnchantProcEvent(uint32 enchId) const; [[nodiscard]] bool IsArenaAllowedEnchancment(uint32 ench_id) const; - [[nodiscard]] const std::vector* GetSpellLinked(int32 spell_id) const; + [[nodiscard]] std::vector const* GetSpellLinked(int32 spell_id) const; [[nodiscard]] PetLevelupSpellSet const* GetPetLevelupSpellList(uint32 petFamily) const; [[nodiscard]] PetDefaultSpellsEntry const* GetPetDefaultSpellsEntry(int32 id) const; diff --git a/src/server/game/Tickets/TicketMgr.cpp b/src/server/game/Tickets/TicketMgr.cpp index 7c6337b30..e4bead52c 100644 --- a/src/server/game/Tickets/TicketMgr.cpp +++ b/src/server/game/Tickets/TicketMgr.cpp @@ -186,7 +186,7 @@ std::string GmTicket::FormatMessageString(ChatHandler& handler, bool detailed) c return ss.str(); } -std::string GmTicket::FormatMessageString(ChatHandler& handler, const char* szClosedName, const char* szAssignedToName, const char* szUnassignedName, const char* szDeletedName) const +std::string GmTicket::FormatMessageString(ChatHandler& handler, char const* szClosedName, char const* szAssignedToName, char const* szUnassignedName, char const* szDeletedName) const { std::stringstream ss; ss << handler.PGetParseString(LANG_COMMAND_TICKETLISTGUID, _id); diff --git a/src/server/game/Tickets/TicketMgr.h b/src/server/game/Tickets/TicketMgr.h index 7293f23c3..ff31f940b 100644 --- a/src/server/game/Tickets/TicketMgr.h +++ b/src/server/game/Tickets/TicketMgr.h @@ -150,7 +150,7 @@ public: void TeleportTo(Player* player) const; std::string FormatMessageString(ChatHandler& handler, bool detailed = false) const; - std::string FormatMessageString(ChatHandler& handler, const char* szClosedName, const char* szAssignedToName, const char* szUnassignedName, const char* szDeletedName) const; + std::string FormatMessageString(ChatHandler& handler, char const* szClosedName, char const* szAssignedToName, char const* szUnassignedName, char const* szDeletedName) const; void SetChatLog(std::list time, std::string const& log); std::string const& GetChatLog() const { return _chatLog; } diff --git a/src/server/game/Tools/CharacterDatabaseCleaner.cpp b/src/server/game/Tools/CharacterDatabaseCleaner.cpp index 329a6283c..fc0ee330d 100644 --- a/src/server/game/Tools/CharacterDatabaseCleaner.cpp +++ b/src/server/game/Tools/CharacterDatabaseCleaner.cpp @@ -68,7 +68,7 @@ void CharacterDatabaseCleaner::CleanDatabase() LOG_INFO("server.loading", " "); } -void CharacterDatabaseCleaner::CheckUnique(const char* column, const char* table, bool (*check)(uint32)) +void CharacterDatabaseCleaner::CheckUnique(char const* column, char const* table, bool (*check)(uint32)) { QueryResult result = CharacterDatabase.Query("SELECT DISTINCT {} FROM {}", column, table); if (!result) diff --git a/src/server/game/Tools/CharacterDatabaseCleaner.h b/src/server/game/Tools/CharacterDatabaseCleaner.h index 382d5ccfb..acb95a5e1 100644 --- a/src/server/game/Tools/CharacterDatabaseCleaner.h +++ b/src/server/game/Tools/CharacterDatabaseCleaner.h @@ -33,7 +33,7 @@ namespace CharacterDatabaseCleaner void CleanDatabase(); - void CheckUnique(const char* column, const char* table, bool (*check)(uint32)); + void CheckUnique(char const* column, char const* table, bool (*check)(uint32)); bool AchievementProgressCheck(uint32 criteria); bool SkillCheck(uint32 skill); diff --git a/src/server/game/Warden/Warden.cpp b/src/server/game/Warden/Warden.cpp index ba9e6b3df..688bedc02 100644 --- a/src/server/game/Warden/Warden.cpp +++ b/src/server/game/Warden/Warden.cpp @@ -140,7 +140,7 @@ void Warden::EncryptData(uint8* buffer, uint32 length) _outputCrypto.UpdateData(buffer, length); } -bool Warden::IsValidCheckSum(uint32 checksum, const uint8* data, const uint16 length) +bool Warden::IsValidCheckSum(uint32 checksum, uint8 const* data, const uint16 length) { uint32 newChecksum = BuildChecksum(data, length); @@ -167,7 +167,7 @@ union keyData std::array ints; }; -uint32 Warden::BuildChecksum(const uint8* data, uint32 length) +uint32 Warden::BuildChecksum(uint8 const* data, uint32 length) { keyData hash{}; hash.bytes = Acore::Crypto::SHA1::GetDigestOf(data, std::size_t(length)); diff --git a/src/server/game/Warden/WardenPayloadMgr.cpp b/src/server/game/Warden/WardenPayloadMgr.cpp index e6ef106b1..5d03c1117 100644 --- a/src/server/game/Warden/WardenPayloadMgr.cpp +++ b/src/server/game/Warden/WardenPayloadMgr.cpp @@ -40,7 +40,7 @@ uint16 WardenPayloadMgr::GetFreePayloadId() return payloadId; } -uint16 WardenPayloadMgr::RegisterPayload(const std::string& payload) +uint16 WardenPayloadMgr::RegisterPayload(std::string const& payload) { uint16 payloadId = GetFreePayloadId(); diff --git a/src/server/game/Warden/WardenPayloadMgr.h b/src/server/game/Warden/WardenPayloadMgr.h index 8cc5bd4d8..a65a8f9d5 100644 --- a/src/server/game/Warden/WardenPayloadMgr.h +++ b/src/server/game/Warden/WardenPayloadMgr.h @@ -50,7 +50,7 @@ public: * @note * - Payloads are truncated to 512 bytes on the client, you may have to register your payloads in chunks if they are larger than this. */ - uint16 RegisterPayload(const std::string& payload); + uint16 RegisterPayload(std::string const& payload); /** * @brief Register a payload into cache with a custom id and returns the result. diff --git a/src/server/game/World/IWorld.h b/src/server/game/World/IWorld.h index b0c808785..81edb7675 100644 --- a/src/server/game/World/IWorld.h +++ b/src/server/game/World/IWorld.h @@ -80,9 +80,9 @@ public: virtual void LoadConfigSettings(bool reload = false) = 0; [[nodiscard]] virtual bool IsShuttingDown() const = 0; [[nodiscard]] virtual uint32 GetShutDownTimeLeft() const = 0; - virtual void ShutdownServ(uint32 time, uint32 options, uint8 exitcode, const std::string& reason = std::string()) = 0; + virtual void ShutdownServ(uint32 time, uint32 options, uint8 exitcode, std::string const& reason = std::string()) = 0; virtual void ShutdownCancel() = 0; - virtual void ShutdownMsg(bool show = false, Player* player = nullptr, const std::string& reason = std::string()) = 0; + virtual void ShutdownMsg(bool show = false, Player* player = nullptr, std::string const& reason = std::string()) = 0; virtual void Update(uint32 diff) = 0; virtual void setRate(ServerConfigs index, float value) = 0; [[nodiscard]] virtual float getRate(ServerConfigs index) const = 0; diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp index 2c302ba05..f2deafa83 100644 --- a/src/server/game/World/World.cpp +++ b/src/server/game/World/World.cpp @@ -265,7 +265,7 @@ void World::LoadConfigSettings(bool reload) #if AC_PLATFORM == AC_PLATFORM_UNIX || AC_PLATFORM == AC_PLATFORM_APPLE if (dataPath[0] == '~') { - const char* home = getenv("HOME"); + char const* home = getenv("HOME"); if (home) dataPath.replace(0, 1, home); } diff --git a/src/server/game/World/WorldState.cpp b/src/server/game/World/WorldState.cpp index 9613f8938..269e53cc7 100644 --- a/src/server/game/World/WorldState.cpp +++ b/src/server/game/World/WorldState.cpp @@ -1761,7 +1761,7 @@ enum PallidHorrorPaths PATH_UNDERCITY_ROYAL_QUARTER = 163944, }; -bool WorldState::SummonPallid(Map* map, ScourgeInvasionData::CityAttack& zone, const Position& position, uint32 spawnLoc) +bool WorldState::SummonPallid(Map* map, ScourgeInvasionData::CityAttack& zone, Position const& position, uint32 spawnLoc) { AddPendingPallid(zone.zoneId); // Remove old pallid if required. diff --git a/src/server/game/World/WorldState.h b/src/server/game/World/WorldState.h index 8a9142a0b..7f463e378 100644 --- a/src/server/game/World/WorldState.h +++ b/src/server/game/World/WorldState.h @@ -351,7 +351,7 @@ class WorldState void StartNewCityAttack(uint32 zoneId); bool ResumeInvasion(ScourgeInvasionData::InvasionZone& zone); bool SummonMouth(Map* map, ScourgeInvasionData::InvasionZone& zone, Position position, bool newInvasion); - bool SummonPallid(Map* map, ScourgeInvasionData::CityAttack& zone, const Position& position, uint32 spawnLoc); + bool SummonPallid(Map* map, ScourgeInvasionData::CityAttack& zone, Position const& position, uint32 spawnLoc); void HandleActiveZone(uint32 attackTimeVar, uint32 zoneId, uint32 remainingVar, TimePoint now); Map* GetMap(uint32 mapId, Position const& invZone); diff --git a/src/server/scripts/Commands/cs_inventory.cpp b/src/server/scripts/Commands/cs_inventory.cpp index 80ece0d0d..a861b2e9b 100644 --- a/src/server/scripts/Commands/cs_inventory.cpp +++ b/src/server/scripts/Commands/cs_inventory.cpp @@ -22,7 +22,7 @@ #include "RBAC.h" #include "WorldSession.h" -constexpr std::array bagSpecsToString = +constexpr std::array bagSpecsToString = { "normal", "soul", diff --git a/src/server/scripts/Commands/cs_misc.cpp b/src/server/scripts/Commands/cs_misc.cpp index b795ebf19..6d8f75176 100644 --- a/src/server/scripts/Commands/cs_misc.cpp +++ b/src/server/scripts/Commands/cs_misc.cpp @@ -316,7 +316,7 @@ public: break; } - const Group* g = plr->GetGroup(); + Group const* g = plr->GetGroup(); if (hcnt > 1) { diff --git a/src/server/scripts/Commands/cs_wp.cpp b/src/server/scripts/Commands/cs_wp.cpp index 0c17fd633..395b63553 100644 --- a/src/server/scripts/Commands/cs_wp.cpp +++ b/src/server/scripts/Commands/cs_wp.cpp @@ -71,7 +71,7 @@ public: * * @return true - command did succeed, false - something went wrong */ - static bool HandleWpAddCommand(ChatHandler* handler, const char* args) + static bool HandleWpAddCommand(ChatHandler* handler, char const* args) { // optional char* path_number = nullptr; @@ -134,7 +134,7 @@ public: return true; } // HandleWpAddCommand - static bool HandleWpLoadCommand(ChatHandler* handler, const char* args) + static bool HandleWpLoadCommand(ChatHandler* handler, char const* args) { if (!*args) return false; @@ -213,7 +213,7 @@ public: return true; } - static bool HandleWpReloadCommand(ChatHandler* handler, const char* args) + static bool HandleWpReloadCommand(ChatHandler* handler, char const* args) { if (!*args) return false; @@ -228,7 +228,7 @@ public: return true; } - static bool HandleWpUnLoadCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleWpUnLoadCommand(ChatHandler* handler, char const* /*args*/) { Creature* target = handler->getSelectedCreature(); @@ -269,7 +269,7 @@ public: return true; } - static bool HandleWpEventCommand(ChatHandler* handler, const char* args) + static bool HandleWpEventCommand(ChatHandler* handler, char const* args) { if (!*args) return false; @@ -541,7 +541,7 @@ public: return true; } - static bool HandleWpModifyCommand(ChatHandler* handler, const char* args) + static bool HandleWpModifyCommand(ChatHandler* handler, char const* args) { if (!*args) return false; @@ -718,7 +718,7 @@ public: return true; } // move - const char* text = arg_str; + char const* text = arg_str; if (text == 0) { @@ -737,7 +737,7 @@ public: return true; } - static bool HandleWpShowCommand(ChatHandler* handler, const char* args) + static bool HandleWpShowCommand(ChatHandler* handler, char const* args) { if (!*args) return false; diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.cpp index c61388188..da015b8c4 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.cpp @@ -140,7 +140,7 @@ class at_ring_of_law : public AreaTriggerScript public: at_ring_of_law() : AreaTriggerScript("at_ring_of_law") { } - bool OnTrigger(Player* player, const AreaTrigger* /*at*/) override + bool OnTrigger(Player* player, AreaTrigger const* /*at*/) override { if (InstanceScript* instance = player->GetInstanceScript()) { diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/instance_blackrock_depths.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/instance_blackrock_depths.cpp index 678885ce2..72c56ece5 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/instance_blackrock_depths.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/instance_blackrock_depths.cpp @@ -397,7 +397,7 @@ struct instance_blackrock_depths : public InstanceScript break; case NPC_SHADOWFORGE_SENATOR: deadSenators = 1; //hacky, but we cannot count the unit that just died through its state because OnUnitDeath() is called before the state is set. - for (const auto &senatorGUID: EmperorSenatorsVector) + for (auto const& senatorGUID: EmperorSenatorsVector) if (Creature* senator = instance->GetCreature(senatorGUID)) if (!senator->IsAlive() || senator->isDying()) deadSenators++; @@ -684,7 +684,7 @@ struct instance_blackrock_depths : public InstanceScript return str_data; } - void Load(const char* in) override + void Load(char const* in) override { if (!in) { diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp index 62beba867..b4d19fc29 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp @@ -661,7 +661,7 @@ class at_dragonspire_hall : public AreaTriggerScript public: at_dragonspire_hall() : AreaTriggerScript("at_dragonspire_hall") { } - bool OnTrigger(Player* player, const AreaTrigger* /*at*/) override + bool OnTrigger(Player* player, AreaTrigger const* /*at*/) override { if (player && player->IsAlive()) { @@ -685,7 +685,7 @@ class at_blackrock_stadium : public AreaTriggerScript public: at_blackrock_stadium() : AreaTriggerScript("at_blackrock_stadium") { } - bool OnTrigger(Player* player, const AreaTrigger* /*at*/) override + bool OnTrigger(Player* player, AreaTrigger const* /*at*/) override { if (player && player->IsAlive()) { @@ -733,7 +733,7 @@ class near_scarshield_infiltrator : public AreaTriggerScript public: near_scarshield_infiltrator() : AreaTriggerScript("near_scarshield_infiltrator") { } - bool OnTrigger(Player* player, const AreaTrigger* /*at*/) override + bool OnTrigger(Player* player, AreaTrigger const* /*at*/) override { if (player && player->IsAlive()) { @@ -764,7 +764,7 @@ class at_scarshield_infiltrator : public AreaTriggerScript public: at_scarshield_infiltrator() : AreaTriggerScript("at_scarshield_infiltrator") { } - bool OnTrigger(Player* player, const AreaTrigger* /*at*/) override + bool OnTrigger(Player* player, AreaTrigger const* /*at*/) override { if (player && player->IsAlive()) { diff --git a/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp b/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp index 39d2077b9..2cd8195ac 100644 --- a/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp +++ b/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp @@ -86,7 +86,7 @@ public: return saveStream.str(); } - void Load(const char* in) override + void Load(char const* in) override { if (!in) return; diff --git a/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp b/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp index a6289049a..c597aa0fd 100644 --- a/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp +++ b/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp @@ -110,7 +110,7 @@ public: return GetGnomereganAI(creature); } - bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) override + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) override { if (quest->GetQuestId() == QUEST_A_FINE_MESS) { diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_apothecary_hummel.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_apothecary_hummel.cpp index 0efd989f1..456956e31 100644 --- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_apothecary_hummel.cpp +++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_apothecary_hummel.cpp @@ -256,7 +256,7 @@ public: uint8 _phase; }; - bool OnQuestReward(Player* /*player*/, Creature* creature, const Quest* quest, uint32 /*slot*/) override + bool OnQuestReward(Player* /*player*/, Creature* creature, Quest const* quest, uint32 /*slot*/) override { if (quest->GetQuestId() == QUEST_YOUVE_BEEN_SERVED) { diff --git a/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp b/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp index 8ac630307..13a64692c 100644 --- a/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp +++ b/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp @@ -219,7 +219,7 @@ class at_malfurion_stormrage : public AreaTriggerScript public: at_malfurion_stormrage() : AreaTriggerScript("at_malfurion_stormrage") { } - bool OnTrigger(Player* player, const AreaTrigger* /*at*/) override + bool OnTrigger(Player* player, AreaTrigger const* /*at*/) override { if (player->GetInstanceScript() && !player->FindNearestCreature(NPC_MALFURION_STORMRAGE, 15.0f) && player->GetQuestStatus(QUEST_THE_CHARGE_OF_DRAGONFLIGHTS) == QUEST_STATUS_REWARDED && player->GetQuestStatus(QUEST_ERANIKUS_TYRANT_OF_DREAMS) != QUEST_STATUS_REWARDED) diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp index d3ce0fa71..0fabde290 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp @@ -189,7 +189,7 @@ struct boss_felmyst : public BossAI Talk(YELL_KILL, victim); } - void SpellHitTarget(Unit* target, const SpellInfo* spell) override + void SpellHitTarget(Unit* target, SpellInfo const* spell) override { if (spell->Id == SPELL_STRAFE_TOP || spell->Id == SPELL_STRAFE_MIDDLE || spell->Id == SPELL_STRAFE_BOTTOM) target->CastSpell(target, SPELL_FOG_OF_CORRUPTION, true); diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp index 6bbefa315..753d56790 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp @@ -223,7 +223,7 @@ class at_zulgurub_entrance_speech : public OnlyOnceAreaTriggerScript public: at_zulgurub_entrance_speech() : OnlyOnceAreaTriggerScript("at_zulgurub_entrance_speech") {} - bool _OnTrigger(Player* player, const AreaTrigger* /*at*/) override + bool _OnTrigger(Player* player, AreaTrigger const* /*at*/) override { if (InstanceScript* instance = player->GetInstanceScript()) { @@ -246,7 +246,7 @@ class at_zulgurub_bridge_speech : public OnlyOnceAreaTriggerScript public: at_zulgurub_bridge_speech() : OnlyOnceAreaTriggerScript("at_zulgurub_bridge_speech") {} - bool _OnTrigger(Player* player, const AreaTrigger* /*at*/) override + bool _OnTrigger(Player* player, AreaTrigger const* /*at*/) override { if (InstanceScript* instance = player->GetInstanceScript()) { @@ -268,7 +268,7 @@ class at_zulgurub_temple_speech : public OnlyOnceAreaTriggerScript public: at_zulgurub_temple_speech() : OnlyOnceAreaTriggerScript("at_zulgurub_temple_speech") {} - bool _OnTrigger(Player* player, const AreaTrigger* /*at*/) override + bool _OnTrigger(Player* player, AreaTrigger const* /*at*/) override { if (InstanceScript* instance = player->GetInstanceScript()) { @@ -290,7 +290,7 @@ class at_zulgurub_bloodfire_pit_speech : public OnlyOnceAreaTriggerScript public: at_zulgurub_bloodfire_pit_speech() : OnlyOnceAreaTriggerScript("at_zulgurub_bloodfire_pit_speech") {} - bool _OnTrigger(Player* player, const AreaTrigger* /*at*/) override + bool _OnTrigger(Player* player, AreaTrigger const* /*at*/) override { if (InstanceScript* instance = player->GetInstanceScript()) { @@ -312,7 +312,7 @@ class at_zulgurub_edge_of_madness_speech : public OnlyOnceAreaTriggerScript public: at_zulgurub_edge_of_madness_speech() : OnlyOnceAreaTriggerScript("at_zulgurub_edge_of_madness_speech") {} - bool _OnTrigger(Player* player, const AreaTrigger* /*at*/) override + bool _OnTrigger(Player* player, AreaTrigger const* /*at*/) override { if (InstanceScript* instance = player->GetInstanceScript()) { diff --git a/src/server/scripts/EasternKingdoms/zone_duskwood.cpp b/src/server/scripts/EasternKingdoms/zone_duskwood.cpp index 37e9ab224..87de14c03 100644 --- a/src/server/scripts/EasternKingdoms/zone_duskwood.cpp +++ b/src/server/scripts/EasternKingdoms/zone_duskwood.cpp @@ -134,7 +134,7 @@ class at_twilight_grove : public AreaTriggerScript public: at_twilight_grove() : AreaTriggerScript("at_twilight_grove") { } - bool OnTrigger(Player* player, const AreaTrigger* /*at*/) override + bool OnTrigger(Player* player, AreaTrigger const* /*at*/) override { if (player->HasQuestForItem(ITEM_FRAGMENT) && !player->HasItemCount(ITEM_FRAGMENT)) player->SummonCreature(NPC_TWILIGHT_CORRUPTER, -10328.16f, -489.57f, 49.95f, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 240000); diff --git a/src/server/scripts/EasternKingdoms/zone_undercity.cpp b/src/server/scripts/EasternKingdoms/zone_undercity.cpp index cbc19b7c0..d972bc008 100644 --- a/src/server/scripts/EasternKingdoms/zone_undercity.cpp +++ b/src/server/scripts/EasternKingdoms/zone_undercity.cpp @@ -88,7 +88,7 @@ class npc_lady_sylvanas_windrunner : public CreatureScript public: npc_lady_sylvanas_windrunner() : CreatureScript("npc_lady_sylvanas_windrunner") { } - bool OnQuestReward(Player* player, Creature* creature, const Quest* _Quest, uint32 /*slot*/) override + bool OnQuestReward(Player* player, Creature* creature, Quest const* _Quest, uint32 /*slot*/) override { if (_Quest->GetQuestId() == QUEST_JOURNEY_TO_UNDERCITY) creature->AI()->SetGUID(player->GetGUID(), GUID_EVENT_INVOKER); diff --git a/src/server/scripts/EasternKingdoms/zone_westfall.cpp b/src/server/scripts/EasternKingdoms/zone_westfall.cpp index ab89105c8..40e602d04 100644 --- a/src/server/scripts/EasternKingdoms/zone_westfall.cpp +++ b/src/server/scripts/EasternKingdoms/zone_westfall.cpp @@ -51,7 +51,7 @@ class npc_daphne_stilwell : public CreatureScript public: npc_daphne_stilwell() : CreatureScript("npc_daphne_stilwell") { } - bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) override + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) override { if (quest->GetQuestId() == QUEST_TOME_VALOR) { diff --git a/src/server/scripts/EasternKingdoms/zone_wetlands.cpp b/src/server/scripts/EasternKingdoms/zone_wetlands.cpp index 85749ea1c..03b71033a 100644 --- a/src/server/scripts/EasternKingdoms/zone_wetlands.cpp +++ b/src/server/scripts/EasternKingdoms/zone_wetlands.cpp @@ -126,7 +126,7 @@ class npc_mikhail : public CreatureScript public: npc_mikhail() : CreatureScript("npc_mikhail") { } - bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) override + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) override { if (quest->GetQuestId() == QUEST_MISSING_DIPLO_PT11) { diff --git a/src/server/scripts/Events/midsummer.cpp b/src/server/scripts/Events/midsummer.cpp index cff91c99a..5f8c6f5c9 100644 --- a/src/server/scripts/Events/midsummer.cpp +++ b/src/server/scripts/Events/midsummer.cpp @@ -1018,7 +1018,7 @@ class spell_midsummer_fling_torch : public SpellScript if (GetSpellInfo()->Id != SPELL_FLING_TORCH_DUMMY) { if (!handled) - if (const WorldLocation* loc = GetExplTargetDest()) + if (WorldLocation const* loc = GetExplTargetDest()) { caster->CastSpell(loc->GetPositionX(), loc->GetPositionY(), loc->GetPositionZ(), SPELL_MISSED_TORCH, true); caster->RemoveAurasDueToSpell(SPELL_TORCH_COUNTER); @@ -1113,7 +1113,7 @@ class spell_midsummer_juggling_torch : public SpellScript if (!caster || !caster->IsPlayer()) return; - if (const WorldLocation* loc = GetExplTargetDest()) + if (WorldLocation const* loc = GetExplTargetDest()) { if (loc->GetExactDist(caster) < 3.0f) { 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 26721ebf3..844028f34 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp @@ -1430,7 +1430,7 @@ class npc_cos_chromie_start : public CreatureScript public: npc_cos_chromie_start() : CreatureScript("npc_cos_chromie_start") { } - bool OnQuestAccept(Player* /*player*/, Creature* creature, const Quest* quest) override + bool OnQuestAccept(Player* /*player*/, Creature* creature, Quest const* quest) override { if (quest->GetQuestId() == QUEST_DISPELLING_ILLUSIONS) if (InstanceScript* instance = creature->GetInstanceScript()) @@ -1488,7 +1488,7 @@ class npc_cos_chromie_middle : public CreatureScript public: npc_cos_chromie_middle() : CreatureScript("npc_cos_chromie_middle") { } - bool OnQuestAccept(Player*, Creature* creature, const Quest* pQuest) override + bool OnQuestAccept(Player*, Creature* creature, Quest const* pQuest) override { if (pQuest->GetQuestId() == QUEST_A_ROYAL_ESCORT) if (InstanceScript* pInstance = creature->GetInstanceScript()) diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp index bd1c7ba2e..0bddcbdca 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp @@ -365,7 +365,7 @@ public: return saveStream.str(); } - void Load(const char* in) override + void Load(char const* in) override { if (!in) { diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp index 6b6fe638b..9aaff7fd9 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp @@ -409,7 +409,7 @@ class at_twin_emperors : public OnlyOnceAreaTriggerScript public: at_twin_emperors() : OnlyOnceAreaTriggerScript("at_twin_emperors") { } - bool _OnTrigger(Player* player, const AreaTrigger* /*at*/) override + bool _OnTrigger(Player* player, AreaTrigger const* /*at*/) override { if (InstanceScript* instance = player->GetInstanceScript()) { diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.cpp index 866c89a81..a81850520 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.cpp @@ -547,7 +547,7 @@ class at_battleguard_sartura : public AreaTriggerScript public: at_battleguard_sartura() : AreaTriggerScript("at_battleguard_sartura") { } - bool OnTrigger(Player* player, const AreaTrigger* /*at*/) override + bool OnTrigger(Player* player, AreaTrigger const* /*at*/) override { if (InstanceScript* instance = player->GetInstanceScript()) { diff --git a/src/server/scripts/Kalimdor/zone_darkshore.cpp b/src/server/scripts/Kalimdor/zone_darkshore.cpp index 7b40eac34..f21987954 100644 --- a/src/server/scripts/Kalimdor/zone_darkshore.cpp +++ b/src/server/scripts/Kalimdor/zone_darkshore.cpp @@ -260,7 +260,7 @@ public: } }; - bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) override + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) override { if (quest->GetQuestId() == QUEST_SLEEPER_AWAKENED) { @@ -393,7 +393,7 @@ public: } }; - bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) override + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) override { if (quest->GetQuestId() == QUEST_ABSENT_MINDED_PT2) { @@ -616,7 +616,7 @@ public: float _facing; }; - bool OnQuestReward(Player* player, Creature* creature, const Quest* _Quest, uint32 /*slot*/) override + bool OnQuestReward(Player* player, Creature* creature, Quest const* _Quest, uint32 /*slot*/) override { if (_Quest->GetQuestId() == QUEST_PLAGUED_LANDS) { diff --git a/src/server/scripts/Kalimdor/zone_tanaris.cpp b/src/server/scripts/Kalimdor/zone_tanaris.cpp index cd5d007b3..188db122f 100644 --- a/src/server/scripts/Kalimdor/zone_tanaris.cpp +++ b/src/server/scripts/Kalimdor/zone_tanaris.cpp @@ -323,7 +323,7 @@ class npc_tooga : public CreatureScript public: npc_tooga() : CreatureScript("npc_tooga") { } - bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) override + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) override { if (quest->GetQuestId() == QUEST_TOOGA) { diff --git a/src/server/scripts/Kalimdor/zone_the_barrens.cpp b/src/server/scripts/Kalimdor/zone_the_barrens.cpp index 8fe236fe5..ead7a0dce 100644 --- a/src/server/scripts/Kalimdor/zone_the_barrens.cpp +++ b/src/server/scripts/Kalimdor/zone_the_barrens.cpp @@ -45,7 +45,7 @@ class npc_gilthares : public CreatureScript public: npc_gilthares() : CreatureScript("npc_gilthares") { } - bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) override + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) override { if (quest->GetQuestId() == QUEST_FREE_FROM_HOLD) { diff --git a/src/server/scripts/Kalimdor/zone_thousand_needles.cpp b/src/server/scripts/Kalimdor/zone_thousand_needles.cpp index c76108dac..3ec5cfead 100644 --- a/src/server/scripts/Kalimdor/zone_thousand_needles.cpp +++ b/src/server/scripts/Kalimdor/zone_thousand_needles.cpp @@ -58,7 +58,7 @@ class npc_lakota_windsong : public CreatureScript public: npc_lakota_windsong() : CreatureScript("npc_lakota_windsong") { } - bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) override + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) override { if (quest->GetQuestId() == QUEST_FREE_AT_LAST) { @@ -144,7 +144,7 @@ class npc_paoka_swiftmountain : public CreatureScript public: npc_paoka_swiftmountain() : CreatureScript("npc_paoka_swiftmountain") { } - bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) override + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) override { if (quest->GetQuestId() == QUEST_HOMEWARD) { diff --git a/src/server/scripts/Kalimdor/zone_ungoro_crater.cpp b/src/server/scripts/Kalimdor/zone_ungoro_crater.cpp index ff4845c7e..cc7d3d628 100644 --- a/src/server/scripts/Kalimdor/zone_ungoro_crater.cpp +++ b/src/server/scripts/Kalimdor/zone_ungoro_crater.cpp @@ -168,7 +168,7 @@ class npc_ringo : public CreatureScript public: npc_ringo() : CreatureScript("npc_ringo") { } - bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) override + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) override { if (quest->GetQuestId() == QUEST_A_LITTLE_HELP) { 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 02851fcfe..ff06b5956 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 @@ -182,7 +182,7 @@ public: break; } if (creature->GetUInt32Value(UNIT_FIELD_MOUNTDISPLAYID)) - if (const CreatureAddon* ca = creature->GetCreatureAddon()) + if (CreatureAddon const* ca = creature->GetCreatureAddon()) if (ca->mount != creature->GetUInt32Value(UNIT_FIELD_MOUNTDISPLAYID)) creature->SetUInt32Value(UNIT_FIELD_MOUNTDISPLAYID, ca->mount); } @@ -216,7 +216,7 @@ public: return str_data; } - void Load(const char* in) override + void Load(char const* in) override { CLEANED = false; events.Reset(); @@ -269,7 +269,7 @@ public: bool DoNeedCleanup(Player* ignoredPlayer = nullptr) { uint8 aliveCount = 0; - for (const auto &itr: instance->GetPlayers()) + for (auto const& itr: instance->GetPlayers()) { if (Player* plr = itr.GetSource()) { diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp index e99b6cbc7..2e9b013e2 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp @@ -1458,7 +1458,7 @@ class at_hor_shadow_throne : public AreaTriggerScript public: at_hor_shadow_throne() : AreaTriggerScript("at_hor_shadow_throne") { } - bool OnTrigger(Player* player, const AreaTrigger* /*at*/) override + bool OnTrigger(Player* player, AreaTrigger const* /*at*/) override { InstanceScript* inst = player->GetInstanceScript(); if (!inst) 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 7dc0906a1..e1f4191b7 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp @@ -219,7 +219,7 @@ public: EnterEvadeMode(EVADE_REASON_OTHER); if (CreatureGroup* f = me->GetFormation()) { - const CreatureGroup::CreatureGroupMemberType& m = f->GetMembers(); + CreatureGroup::CreatureGroupMemberType const& m = f->GetMembers(); for (CreatureGroup::CreatureGroupMemberType::const_iterator itr = m.begin(); itr != m.end(); ++itr) if (itr->first->IsAlive() && itr->first->IsInCombat() && !itr->first->IsInEvadeMode() && itr->first->IsAIEnabled) itr->first->AI()->EnterEvadeMode(); 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 837460b79..b582177a8 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp @@ -1464,7 +1464,7 @@ class at_tyrannus_event_starter : public AreaTriggerScript public: at_tyrannus_event_starter() : AreaTriggerScript("at_tyrannus_event_starter") { } - bool OnTrigger(Player* player, const AreaTrigger* /*at*/) override + bool OnTrigger(Player* player, AreaTrigger const* /*at*/) override { InstanceScript* inst = player->GetInstanceScript(); if (!inst) diff --git a/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp b/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp index 70cea6381..4d906b138 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp @@ -129,7 +129,7 @@ public: { me->CastSpell(me, SPELL_FREEZE_ANIM, true); me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE); - for (const auto & i : mojoPosition) + for (auto const& i : mojoPosition) me->SummonCreature(NPC_LIVING_MOJO, i.GetPositionX(), i.GetPositionY(), i.GetPositionZ(), 0, TEMPSUMMON_MANUAL_DESPAWN, 0); } else diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp index c392f324f..3456652ca 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp @@ -359,7 +359,7 @@ public: if (me->GetVictim()) { std::list myList; - const Map::PlayerList& pl = me->GetMap()->GetPlayers(); + Map::PlayerList const& pl = me->GetMap()->GetPlayers(); for (Map::PlayerList::const_iterator itr = pl.begin(); itr != pl.end(); ++itr) if (Player* p = itr->GetSource()) if (p->IsAlive() && p != me->GetVictim() && !p->IsGameMaster() && !p->HasAura(SPELL_UNCONTROLLABLE_FRENZY)) @@ -429,7 +429,7 @@ public: if (!me->HasReactState(REACT_PASSIVE)) { std::list myList; - const Map::PlayerList& pl = me->GetMap()->GetPlayers(); + Map::PlayerList const& pl = me->GetMap()->GetPlayers(); for (Map::PlayerList::const_iterator itr = pl.begin(); itr != pl.end(); ++itr) if (Player* p = itr->GetSource()) if (p->IsAlive() && p != me->GetVictim() && p->GetGUID() != _offtankGUID && !p->IsGameMaster() && p->GetDistance(me) < 100.0f && !p->HasAura(SPELL_UNCONTROLLABLE_FRENZY)) @@ -452,7 +452,7 @@ public: if (!me->HasReactState(REACT_PASSIVE)) { std::list myList; - const Map::PlayerList& pl = me->GetMap()->GetPlayers(); + Map::PlayerList const& pl = me->GetMap()->GetPlayers(); for (Map::PlayerList::const_iterator itr = pl.begin(); itr != pl.end(); ++itr) if (Player* p = itr->GetSource()) if (p->IsAlive() && p != me->GetVictim() && p->GetGUID() != _offtankGUID && !p->IsGameMaster() && !p->HasAura(SPELL_PACT_OF_THE_DARKFALLEN) && !p->HasAura(SPELL_UNCONTROLLABLE_FRENZY)) @@ -476,7 +476,7 @@ public: if (!me->HasReactState(REACT_PASSIVE)) { std::list myList; - const Map::PlayerList& pl = me->GetMap()->GetPlayers(); + Map::PlayerList const& pl = me->GetMap()->GetPlayers(); for (Map::PlayerList::const_iterator itr = pl.begin(); itr != pl.end(); ++itr) if (Player* p = itr->GetSource()) if (p->IsAlive() && p != me->GetVictim() && p->GetGUID() != _offtankGUID && !p->IsGameMaster() && !p->HasAura(SPELL_PACT_OF_THE_DARKFALLEN) && !p->HasAura(SPELL_UNCONTROLLABLE_FRENZY)) @@ -555,7 +555,7 @@ public: void EnterEvadeMode(EvadeReason why) override { - const Map::PlayerList& pl = me->GetMap()->GetPlayers(); + Map::PlayerList const& pl = me->GetMap()->GetPlayers(); for (Map::PlayerList::const_iterator itr = pl.begin(); itr != pl.end(); ++itr) if (Player* p = itr->GetSource()) if (p->IsAlive() && p->HasAura(SPELL_UNCONTROLLABLE_FRENZY)) @@ -903,7 +903,7 @@ class spell_blood_queen_presence_of_the_darkfallen : public SpellScript class achievement_once_bitten_twice_shy : public AchievementCriteriaScript { public: - achievement_once_bitten_twice_shy(const char* name, uint8 spawnMode, bool wasVampire) : AchievementCriteriaScript(name), _spawnMode(spawnMode), _wasVampire(wasVampire) { } + achievement_once_bitten_twice_shy(char const* name, uint8 spawnMode, bool wasVampire) : AchievementCriteriaScript(name), _spawnMode(spawnMode), _wasVampire(wasVampire) { } bool OnCheck(Player* source, Unit* target, uint32 /*criteria_id*/) override { diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp index 9b6926c96..03bb42e21 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp @@ -607,7 +607,7 @@ public: } // helper for summoning wave mobs - void Summon(uint32 entry, const Position& pos) + void Summon(uint32 entry, Position const& pos) { if (me->SummonCreature(entry, pos, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000)) if (TempSummon* trigger = me->SummonCreature(WORLD_TRIGGER, pos, TEMPSUMMON_TIMED_DESPAWN, 2000)) diff --git a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp index ce6c18f11..6d3361b38 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp @@ -177,7 +177,7 @@ public: { if (candidates.empty()) break; - const Position &randomPos = PosWrap[positions[i]]; + Position const& randomPos = PosWrap[positions[i]]; auto itr = candidates.begin(); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp index c1dd286dc..c2b7542c3 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp @@ -700,7 +700,7 @@ class at_thaddius_entrance : public OnlyOnceAreaTriggerScript public: at_thaddius_entrance() : OnlyOnceAreaTriggerScript("at_thaddius_entrance") { } - bool _OnTrigger(Player* player, const AreaTrigger* /*trigger*/) override + bool _OnTrigger(Player* player, AreaTrigger const* /*trigger*/) override { if (InstanceScript* instance = player->GetInstanceScript()) if (instance->GetBossState(BOSS_THADDIUS) != DONE) 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 6f733bd1c..e9305585b 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 @@ -95,7 +95,7 @@ class at_hol_hall_of_watchers : public OnlyOnceAreaTriggerScript public: at_hol_hall_of_watchers() : OnlyOnceAreaTriggerScript("at_hol_hall_of_watchers") {} - bool _OnTrigger(Player* player, const AreaTrigger* /*at*/) override + bool _OnTrigger(Player* player, AreaTrigger const* /*at*/) override { std::list creatures; player->GetCreatureListWithEntryInGrid(creatures, { NPC_TITANIUM_SIEGEBREAKER, NPC_TITANIUM_THUNDERER }, 50.0f); diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/brann_bronzebeard.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/brann_bronzebeard.cpp index 41f9cf1f0..b48037354 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/brann_bronzebeard.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/brann_bronzebeard.cpp @@ -92,7 +92,7 @@ enum events struct Yells { uint32 sound; - const char* text; + char const* text; uint32 creature, timer; }; diff --git a/src/server/scripts/Northrend/zone_icecrown.cpp b/src/server/scripts/Northrend/zone_icecrown.cpp index 00987f8eb..7137573ee 100644 --- a/src/server/scripts/Northrend/zone_icecrown.cpp +++ b/src/server/scripts/Northrend/zone_icecrown.cpp @@ -1211,7 +1211,7 @@ class spell_anti_air_rocket_bomber : public SpellScript void HandleDummy(SpellEffIndex effIndex) { PreventHitDefaultEffect(effIndex); - const WorldLocation* loc = GetExplTargetDest(); + WorldLocation const* loc = GetExplTargetDest(); GetCaster()->CastSpell(loc->GetPositionX(), loc->GetPositionY(), loc->GetPositionZ(), GetSpellInfo()->Effects[effIndex].CalcValue(), true); } diff --git a/src/server/scripts/Northrend/zone_sholazar_basin.cpp b/src/server/scripts/Northrend/zone_sholazar_basin.cpp index 9a289c098..e661cb068 100644 --- a/src/server/scripts/Northrend/zone_sholazar_basin.cpp +++ b/src/server/scripts/Northrend/zone_sholazar_basin.cpp @@ -538,7 +538,7 @@ public: return new npc_engineer_heliceAI(creature); } - bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) override + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) override { if (quest->GetQuestId() == QUEST_DISASTER) { diff --git a/src/server/scripts/Northrend/zone_wintergrasp.cpp b/src/server/scripts/Northrend/zone_wintergrasp.cpp index 6c2317fb5..7b5c672d3 100644 --- a/src/server/scripts/Northrend/zone_wintergrasp.cpp +++ b/src/server/scripts/Northrend/zone_wintergrasp.cpp @@ -829,7 +829,7 @@ public: checkTimer = 0; if (me->GetVehicleKit()) for (SeatMap::iterator itr = me->GetVehicleKit()->Seats.begin(); itr != me->GetVehicleKit()->Seats.end(); ++itr) - if (const VehicleSeatEntry* seatInfo = itr->second.SeatInfo) + if (VehicleSeatEntry const* seatInfo = itr->second.SeatInfo) if (seatInfo->m_flags & VEHICLE_SEAT_FLAG_CAN_CONTROL) if (Unit* passenger = ObjectAccessor::GetUnit(*me, itr->second.Passenger.Guid)) if (!CanControlVehicle(passenger)) diff --git a/src/server/scripts/Northrend/zone_zuldrak.cpp b/src/server/scripts/Northrend/zone_zuldrak.cpp index 71c7fb42b..bc84d3938 100644 --- a/src/server/scripts/Northrend/zone_zuldrak.cpp +++ b/src/server/scripts/Northrend/zone_zuldrak.cpp @@ -37,7 +37,7 @@ enum AlchemistItemRequirements const uint32 AA_ITEM_ENTRY[24] = {38336, 39669, 38342, 38340, 38344, 38369, 38396, 38398, 38338, 38386, 38341, 38384, 38397, 38381, 38337, 38393, 38339, 39668, 39670, 38346, 38379, 38345, 38343, 38370}; const uint32 AA_AURA_ID[24] = {51095, 53153, 51100, 51087, 51091, 51081, 51072, 51079, 51018, 51067, 51055, 51064, 51077, 51062, 51057, 51069, 51059, 53150, 53158, 51093, 51097, 51102, 51083, 51085}; -const char* AA_ITEM_NAME[24] = {"Crystallized Hogsnot", "Ghoul Drool", "Trollbane", "Amberseed", "Shrunken Dragon's Claw", +char const* AA_ITEM_NAME[24] = {"Crystallized Hogsnot", "Ghoul Drool", "Trollbane", "Amberseed", "Shrunken Dragon's Claw", "Wasp's Wings", "Hairy Herring Head", "Icecrown Bottled Water", "Knotroot", "Muddy Mire Maggot", "Pickled Eagle Egg", "Pulverized Gargoyle Teeth", "Putrid Pirate Perspiration", "Seasoned Slider Cider", "Speckled Guano", "Spiky Spider Egg", "Withered Batwing", "Abomination Guts", "Blight Crystal", "Chilled Serpent Mucus", "Crushed Basilisk Crystals", @@ -129,7 +129,7 @@ public: // Decode Item Entry, Get Item Name, Generate Emotes //uint32 itemEntry = GetTaskItemEntry(itemCode); uint32 auraId = GetTaskAura(itemCode); - const char* itemName = GetTaskItemName(itemCode); + char const* itemName = GetTaskItemName(itemCode); switch (counter) { @@ -171,7 +171,7 @@ public: uint32 GetTaskCounter(uint32 itemcode) { return itemcode / 100; } uint32 GetTaskAura(uint32 itemcode) { return AA_AURA_ID[itemcode % 100]; } uint32 GetTaskItemEntry(uint32 itemcode) { return AA_ITEM_ENTRY[itemcode % 100]; } - const char* GetTaskItemName(uint32 itemcode) { return AA_ITEM_NAME[itemcode % 100]; } + char const* GetTaskItemName(uint32 itemcode) { return AA_ITEM_NAME[itemcode % 100]; } }; bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) override diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp index ff4fe37dd..7db78a86a 100644 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp @@ -155,7 +155,7 @@ void OPvPCapturePointEP_EWT::SummonSupportUnitAtNorthpassTower(TeamId teamId) if (m_UnitsSummonedSideId != teamId) { m_UnitsSummonedSideId = teamId; - const creature_type* ct = teamId == TEAM_ALLIANCE ? EP_EWT_Summons_A : EP_EWT_Summons_H; + creature_type const* ct = teamId == TEAM_ALLIANCE ? EP_EWT_Summons_A : EP_EWT_Summons_H; for (uint8 i = 0; i < EP_EWT_NUM_CREATURES; ++i) { diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp index 1fe133ef0..94f8bf44f 100644 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp @@ -150,7 +150,7 @@ void OPvPCapturePointNA::SpawnNPCsForTeam(HalaaNPCS teamNPC) for (int i = 0; i < NA_HALAA_CREATURE_TEAM_SPAWN; i++) { ObjectGuid::LowType spawnId = teamNPC[i]; - const CreatureData* data = sObjectMgr->GetCreatureData(spawnId); + CreatureData const* data = sObjectMgr->GetCreatureData(spawnId); if (data) { UpdateCreatureHalaa(spawnId, _pvp->GetMap(), data->posX, data->posY); @@ -162,7 +162,7 @@ void OPvPCapturePointNA::SpawnNPCsForTeam(HalaaNPCS teamNPC) void OPvPCapturePointNA::SpawnGOsForTeam(TeamId teamId) { - const go_type* gos = nullptr; + go_type const* gos = nullptr; if (teamId == TEAM_ALLIANCE) gos = AllianceControlGOs; else if (teamId == TEAM_HORDE) @@ -470,7 +470,7 @@ int32 OPvPCapturePointNA::HandleOpenGo(Player* player, GameObject* go) int32 retval = OPvPCapturePoint::HandleOpenGo(player, go); if (retval >= 0) { - const go_type* gos = nullptr; + go_type const* gos = nullptr; if (m_ControllingFaction == TEAM_ALLIANCE) gos = AllianceControlGOs; else if (m_ControllingFaction == TEAM_HORDE) diff --git a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_ghazan.cpp b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_ghazan.cpp index 5b660a1d1..0e239e448 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_ghazan.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_ghazan.cpp @@ -134,7 +134,7 @@ class at_underbog_ghazan : public OnlyOnceAreaTriggerScript public: at_underbog_ghazan() : OnlyOnceAreaTriggerScript("at_underbog_ghazan") {} - bool _OnTrigger(Player* player, const AreaTrigger* /*at*/) override + bool _OnTrigger(Player* player, AreaTrigger const* /*at*/) override { if (InstanceScript* instance = player->GetInstanceScript()) { diff --git a/src/server/scripts/Outland/zone_nagrand.cpp b/src/server/scripts/Outland/zone_nagrand.cpp index fbef4231c..16cc8ac8e 100644 --- a/src/server/scripts/Outland/zone_nagrand.cpp +++ b/src/server/scripts/Outland/zone_nagrand.cpp @@ -57,7 +57,7 @@ class npc_maghar_captive : public CreatureScript public: npc_maghar_captive() : CreatureScript("npc_maghar_captive") { } - bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) override + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) override { if (quest->GetQuestId() == QUEST_TOTEM_KARDASH_H) { @@ -284,7 +284,7 @@ class npc_kurenai_captive : public CreatureScript public: npc_kurenai_captive() : CreatureScript("npc_kurenai_captive") { } - bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) override + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) override { if (quest->GetQuestId() == QUEST_TOTEM_KARDASH_A) creature->AI()->SetGUID(player->GetGUID(), quest->GetQuestId()); diff --git a/src/server/scripts/Outland/zone_netherstorm.cpp b/src/server/scripts/Outland/zone_netherstorm.cpp index 9c3cf495e..465b5f083 100644 --- a/src/server/scripts/Outland/zone_netherstorm.cpp +++ b/src/server/scripts/Outland/zone_netherstorm.cpp @@ -560,7 +560,7 @@ class at_commander_dawnforge : public AreaTriggerScript public: at_commander_dawnforge() : AreaTriggerScript("at_commander_dawnforge") { } - bool OnTrigger(Player* player, const AreaTrigger* /*at*/) override + bool OnTrigger(Player* player, AreaTrigger const* /*at*/) override { //if player lost aura or not have at all, we should not try start event. if (!player->HasAura(SPELL_SUNFURY_DISGUISE)) @@ -768,7 +768,7 @@ public: } }; - bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) override + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) override { if (quest->GetQuestId() == QUEST_MARK_V_IS_ALIVE) { diff --git a/src/server/scripts/Pet/pet_generic.cpp b/src/server/scripts/Pet/pet_generic.cpp index cafc40f25..e7ca2c8bb 100644 --- a/src/server/scripts/Pet/pet_generic.cpp +++ b/src/server/scripts/Pet/pet_generic.cpp @@ -128,7 +128,7 @@ struct argentPonyBanner { uint32 achievement; uint32 spell; - const char* text; + char const* text; }; static std::unordered_map argentBanners = { diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp index 969ab4b24..a9038eeba 100644 --- a/src/server/scripts/Spells/spell_generic.cpp +++ b/src/server/scripts/Spells/spell_generic.cpp @@ -2539,7 +2539,7 @@ class spell_gen_vehicle_scaling : public SpellScript SpellCastResult CheckSeat() { if (Vehicle* veh = GetCaster()->GetVehicle()) - if (const VehicleSeatEntry* seatEntry = veh->GetSeatForPassenger(GetCaster())) + if (VehicleSeatEntry const* seatEntry = veh->GetSeatForPassenger(GetCaster())) if (seatEntry->m_flags & VEHICLE_SEAT_FLAG_CAN_CONTROL) return SPELL_CAST_OK; diff --git a/src/server/scripts/Spells/spell_mage.cpp b/src/server/scripts/Spells/spell_mage.cpp index ef3b49e36..b5f1a6ac7 100644 --- a/src/server/scripts/Spells/spell_mage.cpp +++ b/src/server/scripts/Spells/spell_mage.cpp @@ -621,7 +621,7 @@ class spell_mage_ice_barrier_aura : public spell_mage_incanters_absorbtion_base_ PrepareAuraScript(spell_mage_ice_barrier_aura); /// @todo: Rework - static int32 CalculateSpellAmount(Unit* caster, int32 amount, SpellInfo const* spellInfo, const AuraEffect* aurEff) + static int32 CalculateSpellAmount(Unit* caster, int32 amount, SpellInfo const* spellInfo, AuraEffect const* aurEff) { // +80.68% from sp bonus float bonus = 0.8068f; @@ -657,7 +657,7 @@ class spell_mage_ice_barrier : public SpellScript PrepareSpellScript(spell_mage_ice_barrier); /// @todo: Rework - static int32 CalculateSpellAmount(Unit* caster, int32 amount, SpellInfo const* spellInfo, const AuraEffect* aurEff) + static int32 CalculateSpellAmount(Unit* caster, int32 amount, SpellInfo const* spellInfo, AuraEffect const* aurEff) { // +80.68% from sp bonus float bonus = 0.8068f; diff --git a/src/server/scripts/Spells/spell_priest.cpp b/src/server/scripts/Spells/spell_priest.cpp index 93b6f807f..7e99622f1 100644 --- a/src/server/scripts/Spells/spell_priest.cpp +++ b/src/server/scripts/Spells/spell_priest.cpp @@ -631,7 +631,7 @@ class spell_pri_penance : public SpellScript }; // -17 - Power Word: Shield -static int32 CalculateSpellAmount(Unit* caster, int32 amount, SpellInfo const* spellInfo, const AuraEffect* aurEff) +static int32 CalculateSpellAmount(Unit* caster, int32 amount, SpellInfo const* spellInfo, AuraEffect const* aurEff) { // +80.68% from sp bonus float bonus = 0.8068f; diff --git a/src/server/scripts/Spells/spell_warrior.cpp b/src/server/scripts/Spells/spell_warrior.cpp index 5462102d4..bd34567d8 100644 --- a/src/server/scripts/Spells/spell_warrior.cpp +++ b/src/server/scripts/Spells/spell_warrior.cpp @@ -927,7 +927,7 @@ class spell_warr_heroic_strike : public SpellScript bool bonusDamage = false; for (AuraEffect* eff : AuraEffectList) { - const SpellInfo* spellInfo = eff->GetSpellInfo(); + SpellInfo const* spellInfo = eff->GetSpellInfo(); if (!spellInfo) continue; diff --git a/src/server/scripts/World/item_scripts.cpp b/src/server/scripts/World/item_scripts.cpp index 6a0be8f5d..61df215af 100644 --- a/src/server/scripts/World/item_scripts.cpp +++ b/src/server/scripts/World/item_scripts.cpp @@ -150,7 +150,7 @@ class item_petrov_cluster_bombs : public ItemScript public: item_petrov_cluster_bombs() : ItemScript("item_petrov_cluster_bombs") { } - bool OnUse(Player* player, Item* item, const SpellCastTargets& /*targets*/) override + bool OnUse(Player* player, Item* item, SpellCastTargets const& /*targets*/) override { if (player->GetZoneId() != AREA_HOWLING_FJORD) return false; diff --git a/src/server/scripts/World/scourge_invasion.cpp b/src/server/scripts/World/scourge_invasion.cpp index eb7565780..1428688e6 100644 --- a/src/server/scripts/World/scourge_invasion.cpp +++ b/src/server/scripts/World/scourge_invasion.cpp @@ -378,7 +378,7 @@ struct npc_necrotic_shard : public ScriptedAI if (shard != me) shard->DespawnOnEvade(); - scheduler.Schedule(10s, [this](const TaskContext& /*context*/) // Check if Doodads are spawned 5 seconds after spawn. If not: spawn them + scheduler.Schedule(10s, [this](TaskContext const& /*context*/) // Check if Doodads are spawned 5 seconds after spawn. If not: spawn them { std::list objectList; me->GetGameObjectListWithEntryInGrid( @@ -842,7 +842,7 @@ struct npc_pallid_horror : public ScriptedAI void ScheduleTasks() { - scheduler.Schedule(0s, [this](const TaskContext& /*context*/) + scheduler.Schedule(0s, [this](TaskContext const& /*context*/) { SummonFlameshockers(); }).Schedule(1s, [this](TaskContext context) diff --git a/src/server/scripts/World/suns_reach_reclamation.cpp b/src/server/scripts/World/suns_reach_reclamation.cpp index 1a4cf4b14..055d90a35 100644 --- a/src/server/scripts/World/suns_reach_reclamation.cpp +++ b/src/server/scripts/World/suns_reach_reclamation.cpp @@ -23,7 +23,7 @@ class npc_suns_reach_reclamation : public CreatureScript public: npc_suns_reach_reclamation() : CreatureScript("npc_suns_reach_reclamation") { } - bool OnQuestReward(Player* /*player*/, Creature* /*creature*/, const Quest* quest, uint32 /*slot*/) override + bool OnQuestReward(Player* /*player*/, Creature* /*creature*/, Quest const* quest, uint32 /*slot*/) override { sWorldState->AddSunsReachProgress(quest->GetQuestId()); return true; @@ -35,7 +35,7 @@ class npc_sunwell_gate : public CreatureScript public: npc_sunwell_gate() : CreatureScript("npc_sunwell_gate") { } - bool OnQuestReward(Player* /*player*/, Creature* /*creature*/, const Quest* quest, uint32 /*slot*/) override + bool OnQuestReward(Player* /*player*/, Creature* /*creature*/, Quest const* quest, uint32 /*slot*/) override { sWorldState->AddSunwellGateProgress(quest->GetQuestId()); return true; diff --git a/src/server/shared/Packets/ByteBuffer.h b/src/server/shared/Packets/ByteBuffer.h index 56966e815..56b4da5de 100644 --- a/src/server/shared/Packets/ByteBuffer.h +++ b/src/server/shared/Packets/ByteBuffer.h @@ -469,7 +469,7 @@ public: return append((uint8 const*)src, cnt); } - template void append(const T* src, std::size_t cnt) + template void append(T const* src, std::size_t cnt) { return append((uint8 const*)src, cnt * sizeof(T)); } diff --git a/src/test/common/Configuration/Config.cpp b/src/test/common/Configuration/Config.cpp index ab6654060..9136701b2 100644 --- a/src/test/common/Configuration/Config.cpp +++ b/src/test/common/Configuration/Config.cpp @@ -25,7 +25,7 @@ #include #if WIN32 - void inline setenv(const char* name, const char* value, int overwrite) + void inline setenv(char const* name, char const* value, int overwrite) { _putenv_s(name, value); } diff --git a/src/test/mocks/WorldMock.h b/src/test/mocks/WorldMock.h index e96e38b47..23cc89982 100644 --- a/src/test/mocks/WorldMock.h +++ b/src/test/mocks/WorldMock.h @@ -49,9 +49,9 @@ public: MOCK_METHOD(void, LoadConfigSettings, (bool reload), ()); MOCK_METHOD(bool, IsShuttingDown, (), (const)); MOCK_METHOD(uint32, GetShutDownTimeLeft, (), (const)); - MOCK_METHOD(void, ShutdownServ, (uint32 time, uint32 options, uint8 exitcode, const std::string& reason), ()); + MOCK_METHOD(void, ShutdownServ, (uint32 time, uint32 options, uint8 exitcode, std::string const& reason), ()); MOCK_METHOD(void, ShutdownCancel, ()); - MOCK_METHOD(void, ShutdownMsg, (bool show, Player* player, const std::string& reason), ()); + MOCK_METHOD(void, ShutdownMsg, (bool show, Player* player, std::string const& reason), ()); MOCK_METHOD(void, Update, (uint32 diff), ()); MOCK_METHOD(void, setRate, (ServerConfigs index, float value), ()); MOCK_METHOD(float, getRate, (ServerConfigs index), (const)); diff --git a/src/test/server/game/Events/HolidayDateCalculatorTest.cpp b/src/test/server/game/Events/HolidayDateCalculatorTest.cpp index fb16fce9f..e05fc1dc0 100644 --- a/src/test/server/game/Events/HolidayDateCalculatorTest.cpp +++ b/src/test/server/game/Events/HolidayDateCalculatorTest.cpp @@ -21,7 +21,7 @@ class HolidayDateCalculatorTest : public ::testing::Test { protected: - void ExpectDate(const std::tm& date, int year, int month, int day) + void ExpectDate(std::tm const& date, int year, int month, int day) { EXPECT_EQ(date.tm_year + 1900, year); EXPECT_EQ(date.tm_mon + 1, month); @@ -409,7 +409,7 @@ TEST_F(HolidayDateCalculatorTest, FixedDateHolidays_ConsistentAcrossYears_1900_2 { // Fixed date holidays should have same month/day every year // Note: Brewfest, Harvest Festival, and Winter Veil are now dynamic (not fixed date) - struct FixedHolidayTestCase { uint32_t holidayId; int month; int day; const char* name; }; + struct FixedHolidayTestCase { uint32_t holidayId; int month; int day; char const* name; }; std::vector testCases = { { 341, 6, 21, "Midsummer Fire Festival" }, { 62, 7, 4, "Fireworks Spectacular" }, @@ -687,7 +687,7 @@ TEST_F(HolidayDateCalculatorTest, WeekdayOnOrAfter_MonthBoundary_RollsIntoNextMo TEST_F(HolidayDateCalculatorTest, StressTest_AllCalculations_1900_2200) { // Run all holiday calculations for entire range to ensure no crashes - const std::vector& rules = HolidayDateCalculator::GetHolidayRules(); + std::vector const& rules = HolidayDateCalculator::GetHolidayRules(); int totalCalculations = 0; diff --git a/src/test/server/game/Spells/CascadeProcSuppressionTest.cpp b/src/test/server/game/Spells/CascadeProcSuppressionTest.cpp index a04edbf2e..26c43b7b3 100644 --- a/src/test/server/game/Spells/CascadeProcSuppressionTest.cpp +++ b/src/test/server/game/Spells/CascadeProcSuppressionTest.cpp @@ -134,7 +134,7 @@ TEST_F(CascadeProcSuppressionTest, SpellInfo_WithMixedBits_HasAttributeReturnsTr struct RealSpellTestCase { - const char* name; + char const* name; uint32 spellId; bool hasAttr; // Whether the spell has SPELL_ATTR3_INSTANT_TARGET_PROCS }; diff --git a/src/test/server/game/Spells/SpellProcDBCValidationTest.cpp b/src/test/server/game/Spells/SpellProcDBCValidationTest.cpp index 99eae3673..0a3f0faef 100644 --- a/src/test/server/game/Spells/SpellProcDBCValidationTest.cpp +++ b/src/test/server/game/Spells/SpellProcDBCValidationTest.cpp @@ -91,7 +91,7 @@ INSTANTIATE_TEST_SUITE_P( AllSpellProcEntries, SpellProcDBCValidationParamTest, ::testing::ValuesIn(GetAllSpellProcTestEntries()), - [](const testing::TestParamInfo& info) { + [](testing::TestParamInfo const& info) { // Create unique test name from SpellId (handle negative IDs) int32_t id = info.param.SpellId; if (id < 0) diff --git a/src/test/server/game/Spells/SpellProcDataDrivenTest.cpp b/src/test/server/game/Spells/SpellProcDataDrivenTest.cpp index 56a9e4437..dce53a3f4 100644 --- a/src/test/server/game/Spells/SpellProcDataDrivenTest.cpp +++ b/src/test/server/game/Spells/SpellProcDataDrivenTest.cpp @@ -42,7 +42,7 @@ using namespace testing; struct ProcFlagScenario { uint32 procFlag; - const char* name; + char const* name; uint32 defaultHitMask; uint32 defaultSpellTypeMask; uint32 defaultSpellPhaseMask; @@ -77,7 +77,7 @@ static const std::vector PROC_FLAG_SCENARIOS = { { PROC_FLAG_DONE_TRAP_ACTIVATION, "TrapActivation", PROC_HIT_NORMAL, 0, PROC_SPELL_PHASE_HIT, true }, }; -static const std::vector> HIT_MASK_SCENARIOS = { +static const std::vector> HIT_MASK_SCENARIOS = { { PROC_HIT_NORMAL, "Normal" }, { PROC_HIT_CRITICAL, "Critical" }, { PROC_HIT_MISS, "Miss" }, diff --git a/src/test/server/game/Spells/SpellProcFullCoverageTest.cpp b/src/test/server/game/Spells/SpellProcFullCoverageTest.cpp index f4a46d59f..2d10fbe32 100644 --- a/src/test/server/game/Spells/SpellProcFullCoverageTest.cpp +++ b/src/test/server/game/Spells/SpellProcFullCoverageTest.cpp @@ -353,7 +353,7 @@ INSTANTIATE_TEST_SUITE_P( AllSpellProcEntries, SpellProcFullCoverageTest, ::testing::ValuesIn(GetAllSpellProcTestEntries()), - [](const ::testing::TestParamInfo& info) { + [](::testing::TestParamInfo const& info) { // Generate unique test name from spell ID int32_t id = info.param.SpellId; if (id < 0) diff --git a/src/test/server/game/Spells/SpellProcPPMTest.cpp b/src/test/server/game/Spells/SpellProcPPMTest.cpp index b58df9a0e..28ce42989 100644 --- a/src/test/server/game/Spells/SpellProcPPMTest.cpp +++ b/src/test/server/game/Spells/SpellProcPPMTest.cpp @@ -352,7 +352,7 @@ TEST_F(SpellProcPPMTest, ShapeshiftBug_ItemSpellPath_AlreadyCorrect) struct FormScenario { - const char* name; + char const* name; uint32 formSpeed; }; diff --git a/src/tools/map_extractor/System.cpp b/src/tools/map_extractor/System.cpp index 4fef9164e..635f55b0d 100644 --- a/src/tools/map_extractor/System.cpp +++ b/src/tools/map_extractor/System.cpp @@ -100,7 +100,7 @@ float CONF_flat_height_delta_limit = 0.005f; // If max - min less this value - s float CONF_flat_liquid_delta_limit = 0.001f; // If max - min less this value - liquid surface is flat // List MPQ for extract from -const char* CONF_mpq_list[] = +char const* CONF_mpq_list[] = { "common.MPQ", "common-2.MPQ", @@ -113,10 +113,10 @@ const char* CONF_mpq_list[] = "patch-5.MPQ", }; -static const char* const langs[] = {"enGB", "enUS", "deDE", "esES", "frFR", "koKR", "zhCN", "zhTW", "enCN", "enTW", "esMX", "ruRU" }; +static char const* const langs[] = {"enGB", "enUS", "deDE", "esES", "frFR", "koKR", "zhCN", "zhTW", "enCN", "enTW", "esMX", "ruRU" }; #define LANG_COUNT 12 -void CreateDir( const std::string& Path ) +void CreateDir( std::string const& Path ) { if (chdir(Path.c_str()) == 0) { @@ -141,7 +141,7 @@ void CreateDir( const std::string& Path ) } } -bool FileExists( const char* FileName ) +bool FileExists( char const* FileName ) { int fp = _open(FileName, OPEN_FLAGS); if (fp != -1) @@ -1071,7 +1071,7 @@ void ExtractDBCFiles(int locale, bool basicLocale) // extract DBCs uint32 count = 0; - for (const auto & dbcfile : dbcfiles) + for (auto const& dbcfile : dbcfiles) { string filename = path; filename += (dbcfile.c_str() + strlen("DBFilesClient\\")); diff --git a/src/tools/map_extractor/dbcfile.h b/src/tools/map_extractor/dbcfile.h index 0fb6298fc..160b8afc5 100644 --- a/src/tools/map_extractor/dbcfile.h +++ b/src/tools/map_extractor/dbcfile.h @@ -37,7 +37,7 @@ public: Exception(std::string message): message(std::move(message)) { } virtual ~Exception() = default; - const std::string& getMessage() {return message;} + std::string const& getMessage() {return message;} private: std::string message; }; @@ -67,7 +67,7 @@ public: assert(field < file.fieldCount); return *reinterpret_cast(offset + field * 4); } - [[nodiscard]] const char* getString(std::size_t field) const + [[nodiscard]] char const* getString(std::size_t field) const { assert(field < file.fieldCount); std::size_t stringOffset = getUInt(field); @@ -97,16 +97,16 @@ public: } /// Return address of current instance Record const& operator*() const { return record; } - const Record* operator->() const + Record const* operator->() const { return &record; } /// Comparison - bool operator==(const Iterator& b) const + bool operator==(Iterator const& b) const { return record.offset == b.record.offset; } - bool operator!=(const Iterator& b) const + bool operator!=(Iterator const& b) const { return record.offset != b.record.offset; } diff --git a/src/tools/map_extractor/mpq_libmpq.cpp b/src/tools/map_extractor/mpq_libmpq.cpp index f9101027e..1b2fd6efa 100644 --- a/src/tools/map_extractor/mpq_libmpq.cpp +++ b/src/tools/map_extractor/mpq_libmpq.cpp @@ -21,7 +21,7 @@ ArchiveSet gOpenArchives; -MPQArchive::MPQArchive(const char* filename) +MPQArchive::MPQArchive(char const* filename) { int result = libmpq__archive_open(&mpq_a, filename, -1); printf("Opening %s\n", filename); @@ -59,7 +59,7 @@ void MPQArchive::close() libmpq__archive_close(mpq_a); } -MPQFile::MPQFile(const char* filename): +MPQFile::MPQFile(char const* filename): eof(false), buffer(nullptr), pointer(0), diff --git a/src/tools/map_extractor/mpq_libmpq04.h b/src/tools/map_extractor/mpq_libmpq04.h index 657611139..25f15855c 100644 --- a/src/tools/map_extractor/mpq_libmpq04.h +++ b/src/tools/map_extractor/mpq_libmpq04.h @@ -33,7 +33,7 @@ class MPQArchive public: mpq_archive_s* mpq_a; - MPQArchive(const char* filename); + MPQArchive(char const* filename); ~MPQArchive() { close(); } void close(); @@ -78,11 +78,11 @@ class MPQFile libmpq__off_t pointer, size; // disable copying - MPQFile(const MPQFile& /*f*/) {} - void operator=(const MPQFile& /*f*/) {} + MPQFile(MPQFile const& /*f*/) {} + void operator=(MPQFile const& /*f*/) {} public: - MPQFile(const char* filename); // filenames are not case sensitive + MPQFile(char const* filename); // filenames are not case sensitive ~MPQFile() { close(); } std::size_t read(void* dest, std::size_t bytes); std::size_t getSize() { return size; } diff --git a/src/tools/mmaps_generator/Config.cpp b/src/tools/mmaps_generator/Config.cpp index 6dacd579f..6411758ff 100644 --- a/src/tools/mmaps_generator/Config.cpp +++ b/src/tools/mmaps_generator/Config.cpp @@ -33,12 +33,12 @@ namespace MMAP return {x, y}; } - bool isCurrentDirectory(const std::string& pathStr) { + bool isCurrentDirectory(std::string const& pathStr) { try { const std::filesystem::path givenPath = std::filesystem::canonical(std::filesystem::absolute(pathStr)); const std::filesystem::path currentPath = std::filesystem::canonical(std::filesystem::current_path()); return givenPath == currentPath; - } catch (const std::filesystem::filesystem_error& e) { + } catch (std::filesystem::filesystem_error const& e) { std::cerr << "Filesystem error: " << e.what() << "\n"; return false; } @@ -74,8 +74,8 @@ namespace MMAP ResolvedMeshConfig Config::GetConfigForTile(uint32 mapID, uint32 tileX, uint32 tileY) const { - const MapOverride* mapOverride = nullptr; - const TileOverride* tileOverride = nullptr; + MapOverride const* mapOverride = nullptr; + TileOverride const* tileOverride = nullptr; // Lookup map and tile overrides if (auto mapIt = _maps.find(mapID); mapIt != _maps.end()) @@ -102,39 +102,39 @@ namespace MMAP // Resolve vertex settings int vertexPerMap = resolveInt( - [](const TileOverride*) { return std::optional{}; }, - [](const MapOverride* m) { return m->vertexPerMapEdge; }, + [](TileOverride const*) { return std::optional{}; }, + [](MapOverride const* m) { return m->vertexPerMapEdge; }, _global.vertexPerMapEdge ); int vertexPerTile = resolveInt( - [](const TileOverride*) { return std::optional{}; }, - [](const MapOverride* m) { return m->vertexPerTileEdge; }, + [](TileOverride const*) { return std::optional{}; }, + [](MapOverride const* m) { return m->vertexPerTileEdge; }, _global.vertexPerTileEdge ); ResolvedMeshConfig config; config.walkableSlopeAngle = resolveFloat( - [](const TileOverride* t) { return t->walkableSlopeAngle; }, - [](const MapOverride* m) { return m->walkableSlopeAngle; }, + [](TileOverride const* t) { return t->walkableSlopeAngle; }, + [](MapOverride const* m) { return m->walkableSlopeAngle; }, _global.walkableSlopeAngle ); config.walkableRadius = resolveInt( - [](const TileOverride* t) { return t->walkableRadius; }, - [](const MapOverride* m) { return m->walkableRadius; }, + [](TileOverride const* t) { return t->walkableRadius; }, + [](MapOverride const* m) { return m->walkableRadius; }, _global.walkableRadius ); config.walkableHeight = resolveInt( - [](const TileOverride* t) { return t->walkableHeight; }, - [](const MapOverride* m) { return m->walkableHeight; }, + [](TileOverride const* t) { return t->walkableHeight; }, + [](MapOverride const* m) { return m->walkableHeight; }, _global.walkableHeight ); config.walkableClimb = resolveInt( - [](const TileOverride* t) { return t->walkableClimb; }, - [](const MapOverride* m) { return m->walkableClimb; }, + [](TileOverride const* t) { return t->walkableClimb; }, + [](MapOverride const* m) { return m->walkableClimb; }, _global.walkableClimb ); @@ -168,19 +168,19 @@ namespace MMAP fkyaml::node mmapsNode = root["mmapsConfig"]; - auto tryFloat = [](const fkyaml::node& n, const char* key, float& out) + auto tryFloat = [](fkyaml::node const& n, char const* key, float& out) { if (n.contains(key)) out = n[key].get_value(); }; - auto tryInt = [](const fkyaml::node& n, const char* key, int& out) + auto tryInt = [](fkyaml::node const& n, char const* key, int& out) { if (n.contains(key)) out = n[key].get_value(); }; - auto tryBoolean = [](const fkyaml::node& n, const char* key, bool& out) + auto tryBoolean = [](fkyaml::node const& n, char const* key, bool& out) { if (n.contains(key)) out = n[key].get_value(); }; - auto tryString = [](const fkyaml::node& n, const char* key, std::string& out) + auto tryString = [](fkyaml::node const& n, char const* key, std::string& out) { if (n.contains(key)) out = n[key].get_value(); }; diff --git a/src/tools/mmaps_generator/Config.h b/src/tools/mmaps_generator/Config.h index d214450cc..a6e7f9db3 100644 --- a/src/tools/mmaps_generator/Config.h +++ b/src/tools/mmaps_generator/Config.h @@ -32,7 +32,7 @@ namespace std template <> struct hash> { - std::size_t operator()(const std::pair& p) const noexcept + std::size_t operator()(std::pair const& p) const noexcept { return std::hash()((static_cast(p.first) << 32) | p.second); } diff --git a/src/tools/mmaps_generator/IntermediateValues.cpp b/src/tools/mmaps_generator/IntermediateValues.cpp index 584d14c02..417bfe536 100644 --- a/src/tools/mmaps_generator/IntermediateValues.cpp +++ b/src/tools/mmaps_generator/IntermediateValues.cpp @@ -30,7 +30,7 @@ namespace MMAP rcFreePolyMeshDetail(polyMeshDetail); } - void IntermediateValues::writeIV(const std::string& dataPath, uint32 mapID, uint32 tileX, uint32 tileY) + void IntermediateValues::writeIV(std::string const& dataPath, uint32 mapID, uint32 tileX, uint32 tileY) { char fileName[512]; char tileString[25]; @@ -70,7 +70,7 @@ namespace MMAP #undef DEBUG_WRITE } - void IntermediateValues::debugWrite(FILE* file, const rcHeightfield* mesh) + void IntermediateValues::debugWrite(FILE* file, rcHeightfield const* mesh) { if (!file || !mesh) return; @@ -108,7 +108,7 @@ namespace MMAP } } - void IntermediateValues::debugWrite(FILE* file, const rcCompactHeightfield* chf) + void IntermediateValues::debugWrite(FILE* file, rcCompactHeightfield const* chf) { if (!file | !chf) return; @@ -147,7 +147,7 @@ namespace MMAP fwrite(chf->areas, sizeof(unsigned char), chf->spanCount, file); } - void IntermediateValues::debugWrite(FILE* file, const rcContourSet* cs) + void IntermediateValues::debugWrite(FILE* file, rcContourSet const* cs) { if (!file || !cs) return; @@ -168,7 +168,7 @@ namespace MMAP } } - void IntermediateValues::debugWrite(FILE* file, const rcPolyMesh* mesh) + void IntermediateValues::debugWrite(FILE* file, rcPolyMesh const* mesh) { if (!file || !mesh) return; @@ -187,7 +187,7 @@ namespace MMAP fwrite(mesh->regs, sizeof(unsigned short), mesh->npolys, file); } - void IntermediateValues::debugWrite(FILE* file, const rcPolyMeshDetail* mesh) + void IntermediateValues::debugWrite(FILE* file, rcPolyMeshDetail const* mesh) { if (!file || !mesh) return; @@ -200,7 +200,7 @@ namespace MMAP fwrite(mesh->meshes, sizeof(int), mesh->nmeshes * 4, file); } - void IntermediateValues::generateObjFile(const std::string& dataPath, uint32 mapID, uint32 tileX, uint32 tileY, MeshData& meshData) + void IntermediateValues::generateObjFile(std::string const& dataPath, uint32 mapID, uint32 tileX, uint32 tileY, MeshData& meshData) { std::string objFileName = Acore::StringFormat( "{}/meshes/map{:03}{:02}{:02}.obj", diff --git a/src/tools/mmaps_generator/IntermediateValues.h b/src/tools/mmaps_generator/IntermediateValues.h index 2894e5b58..0bebf32da 100644 --- a/src/tools/mmaps_generator/IntermediateValues.h +++ b/src/tools/mmaps_generator/IntermediateValues.h @@ -35,15 +35,15 @@ namespace MMAP IntermediateValues() {} ~IntermediateValues(); - void writeIV(const std::string& dataPath, uint32 mapID, uint32 tileX, uint32 tileY); + void writeIV(std::string const& dataPath, uint32 mapID, uint32 tileX, uint32 tileY); - void debugWrite(FILE* file, const rcHeightfield* mesh); - void debugWrite(FILE* file, const rcCompactHeightfield* chf); - void debugWrite(FILE* file, const rcContourSet* cs); - void debugWrite(FILE* file, const rcPolyMesh* mesh); - void debugWrite(FILE* file, const rcPolyMeshDetail* mesh); + void debugWrite(FILE* file, rcHeightfield const* mesh); + void debugWrite(FILE* file, rcCompactHeightfield const* chf); + void debugWrite(FILE* file, rcContourSet const* cs); + void debugWrite(FILE* file, rcPolyMesh const* mesh); + void debugWrite(FILE* file, rcPolyMeshDetail const* mesh); - void generateObjFile(const std::string& dataPath, uint32 mapID, uint32 tileX, uint32 tileY, MeshData& meshData); + void generateObjFile(std::string const& dataPath, uint32 mapID, uint32 tileX, uint32 tileY, MeshData& meshData); }; } #endif diff --git a/src/tools/mmaps_generator/MapBuilder.cpp b/src/tools/mmaps_generator/MapBuilder.cpp index bd02d235c..2c1a0aed6 100644 --- a/src/tools/mmaps_generator/MapBuilder.cpp +++ b/src/tools/mmaps_generator/MapBuilder.cpp @@ -1058,7 +1058,7 @@ namespace MMAP return header.recastConfig == desiredRecastConfig; } - rcConfig MapBuilder::getRecastConfig(const ResolvedMeshConfig &cfg, float bmin[3], float bmax[3]) const + rcConfig MapBuilder::getRecastConfig(ResolvedMeshConfig const& cfg, float bmin[3], float bmax[3]) const { rcConfig config; memset(&config, 0, sizeof(rcConfig)); diff --git a/src/tools/mmaps_generator/MapBuilder.h b/src/tools/mmaps_generator/MapBuilder.h index 12ffab06b..319125326 100644 --- a/src/tools/mmaps_generator/MapBuilder.h +++ b/src/tools/mmaps_generator/MapBuilder.h @@ -137,7 +137,7 @@ namespace MMAP // builds list of maps, then builds all of mmap tiles (based on the skip settings) void buildMaps(Optional mapID); - const Config& getConfig() const { return *m_config; } + Config const& getConfig() const { return *m_config; } private: // builds all mmap tiles for the specified map id (ignores skip settings) void buildMap(uint32 mapID); @@ -156,7 +156,7 @@ namespace MMAP bool isTransportMap(uint32 mapID) const; bool isContinentMap(uint32 mapID) const; - rcConfig getRecastConfig(const ResolvedMeshConfig &cfg, float bmin[3], float bmax[3]) const; + rcConfig getRecastConfig(ResolvedMeshConfig const& cfg, float bmin[3], float bmax[3]) const; uint32 percentageDone(uint32 totalTiles, uint32 totalTilesDone) const; uint32 currentPercentageDone() const; diff --git a/src/tools/mmaps_generator/PathCommon.h b/src/tools/mmaps_generator/PathCommon.h index 6dc6dd608..dfb008998 100644 --- a/src/tools/mmaps_generator/PathCommon.h +++ b/src/tools/mmaps_generator/PathCommon.h @@ -41,7 +41,7 @@ namespace MMAP return boost::dll::program_location().parent_path().string(); } - inline bool matchWildcardFilter(const char* filter, const char* str) + inline bool matchWildcardFilter(char const* filter, char const* str) { if (!filter || !str) return false; @@ -101,7 +101,7 @@ namespace MMAP FindClose(hFind); #else - const char* p = dirpath.c_str(); + char const* p = dirpath.c_str(); DIR* dirp = opendir(p); struct dirent* dp; diff --git a/src/tools/mmaps_generator/PathGenerator.cpp b/src/tools/mmaps_generator/PathGenerator.cpp index 581bb153b..2ecb50c47 100644 --- a/src/tools/mmaps_generator/PathGenerator.cpp +++ b/src/tools/mmaps_generator/PathGenerator.cpp @@ -24,7 +24,7 @@ using namespace MMAP; -bool checkDirectories(const std::string &dataDirPath, bool debugOutput) +bool checkDirectories(std::string const& dataDirPath, bool debugOutput) { std::vector dirFiles; @@ -152,7 +152,7 @@ bool handleArgs(int argc, char** argv, return true; } -int finish(const char* message, int returnValue) +int finish(char const* message, int returnValue) { printf("%s", message); getchar(); // Wait for user input diff --git a/src/tools/mmaps_generator/TerrainBuilder.cpp b/src/tools/mmaps_generator/TerrainBuilder.cpp index 5b27f40ce..d05d3cdc1 100644 --- a/src/tools/mmaps_generator/TerrainBuilder.cpp +++ b/src/tools/mmaps_generator/TerrainBuilder.cpp @@ -86,7 +86,7 @@ namespace MMAP uint32 const MAP_VERSION_MAGIC = 9; - TerrainBuilder::TerrainBuilder(const std::string &dataDirPath, bool skipLiquid) : + TerrainBuilder::TerrainBuilder(std::string const& dataDirPath, bool skipLiquid) : m_skipLiquid (skipLiquid), m_mapsPath((std::filesystem::path(dataDirPath) / "maps").string()), m_vmapsPath((std::filesystem::path(dataDirPath) / "vmaps").string()) @@ -929,12 +929,12 @@ namespace MMAP /**************************************************************************/ void TerrainBuilder::loadOffMeshConnections(uint32 mapID, uint32 tileX, uint32 tileY, MeshData& meshData, - const std::vector& offMeshLines) + std::vector const& offMeshLines) { if (offMeshLines.empty()) return; - for (const std::string& line : offMeshLines) + for (std::string const& line : offMeshLines) { float p0[3], p1[3]; uint32 mid, tx, ty; diff --git a/src/tools/mmaps_generator/TerrainBuilder.h b/src/tools/mmaps_generator/TerrainBuilder.h index 04d0e78a5..86dc4823b 100644 --- a/src/tools/mmaps_generator/TerrainBuilder.h +++ b/src/tools/mmaps_generator/TerrainBuilder.h @@ -76,14 +76,14 @@ namespace MMAP class TerrainBuilder { public: - TerrainBuilder(const std::string &mapsPath, bool skipLiquid); + TerrainBuilder(std::string const& mapsPath, bool skipLiquid); ~TerrainBuilder(); - TerrainBuilder(const TerrainBuilder& tb) = delete; + TerrainBuilder(TerrainBuilder const& tb) = delete; void loadMap(uint32 mapID, uint32 tileX, uint32 tileY, MeshData& meshData); bool loadVMap(uint32 mapID, uint32 tileX, uint32 tileY, MeshData& meshData); - void loadOffMeshConnections(uint32 mapID, uint32 tileX, uint32 tileY, MeshData& meshData, const std::vector& offMeshLines); + void loadOffMeshConnections(uint32 mapID, uint32 tileX, uint32 tileY, MeshData& meshData, std::vector const& offMeshLines); [[nodiscard]] bool usesLiquids() const { return !m_skipLiquid; } diff --git a/src/tools/vmap4_extractor/adtfile.cpp b/src/tools/vmap4_extractor/adtfile.cpp index 98513c93d..2d4d31458 100644 --- a/src/tools/vmap4_extractor/adtfile.cpp +++ b/src/tools/vmap4_extractor/adtfile.cpp @@ -25,7 +25,7 @@ char const* GetPlainName(char const* FileName) { - const char* szTemp; + char const* szTemp; if ((szTemp = strrchr(FileName, '\\')) != nullptr) FileName = szTemp + 1; diff --git a/src/tools/vmap4_extractor/adtfile.h b/src/tools/vmap4_extractor/adtfile.h index 7ddd412d7..11c81d4b1 100644 --- a/src/tools/vmap4_extractor/adtfile.h +++ b/src/tools/vmap4_extractor/adtfile.h @@ -72,7 +72,7 @@ public: */ }; -const char* GetPlainName(const char* FileName); +char const* GetPlainName(char const* FileName); char* GetPlainName(char* FileName); char* GetExtension(char* FileName); void fixnamen(char* name, std::size_t len); diff --git a/src/tools/vmap4_extractor/dbcfile.h b/src/tools/vmap4_extractor/dbcfile.h index 49535cff9..c73b488bb 100644 --- a/src/tools/vmap4_extractor/dbcfile.h +++ b/src/tools/vmap4_extractor/dbcfile.h @@ -39,7 +39,7 @@ public: Exception(std::string message): message(std::move(message)) { } virtual ~Exception() = default; - const std::string& getMessage() {return message;} + std::string const& getMessage() {return message;} private: std::string message; }; @@ -57,7 +57,7 @@ public: class Record { public: - Record& operator= (const Record& r) + Record& operator= (Record const& r) { file = r.file; offset = r.offset; @@ -83,7 +83,7 @@ public: assert(ofs < file.recordSize); return *reinterpret_cast(offset + ofs); } - [[nodiscard]] const char* getString(std::size_t field) const + [[nodiscard]] char const* getString(std::size_t field) const { assert(field < file.fieldCount); std::size_t stringOffset = getUInt(field); @@ -115,16 +115,16 @@ public: } /// Return address of current instance Record const& operator*() const { return record; } - const Record* operator->() const + Record const* operator->() const { return &record; } /// Comparison - bool operator==(const Iterator& b) const + bool operator==(Iterator const& b) const { return record.offset == b.record.offset; } - bool operator!=(const Iterator& b) const + bool operator!=(Iterator const& b) const { return record.offset != b.record.offset; } diff --git a/src/tools/vmap4_extractor/gameobject_extract.cpp b/src/tools/vmap4_extractor/gameobject_extract.cpp index b1470497e..28a0ba593 100644 --- a/src/tools/vmap4_extractor/gameobject_extract.cpp +++ b/src/tools/vmap4_extractor/gameobject_extract.cpp @@ -80,7 +80,7 @@ void ExtractGameobjectModels() fwrite(VMAP::RAW_VMAP_MAGIC, 1, 8, model_list); - for (const auto & it : dbc) + for (auto const& it : dbc) { path = it.getString(1); diff --git a/src/tools/vmap4_extractor/model.cpp b/src/tools/vmap4_extractor/model.cpp index ed006fbad..f75453a17 100644 --- a/src/tools/vmap4_extractor/model.cpp +++ b/src/tools/vmap4_extractor/model.cpp @@ -67,7 +67,7 @@ bool Model::open() return true; } -bool Model::ConvertToVMAPModel(const char* outfilename) +bool Model::ConvertToVMAPModel(char const* outfilename) { int N[12] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; FILE* output = fopen(outfilename, "wb"); diff --git a/src/tools/vmap4_extractor/mpq_libmpq.cpp b/src/tools/vmap4_extractor/mpq_libmpq.cpp index d699c7829..ccbdfd4bc 100644 --- a/src/tools/vmap4_extractor/mpq_libmpq.cpp +++ b/src/tools/vmap4_extractor/mpq_libmpq.cpp @@ -22,7 +22,7 @@ ArchiveSet gOpenArchives; -MPQArchive::MPQArchive(const char* filename) +MPQArchive::MPQArchive(char const* filename) { int result = libmpq__archive_open(&mpq_a, filename, -1); printf("Opening %s\n", filename); @@ -65,7 +65,7 @@ void MPQArchive::close() libmpq__archive_close(mpq_a); } -MPQFile::MPQFile(const char* filename): +MPQFile::MPQFile(char const* filename): eof(false), buffer(nullptr), pointer(0), diff --git a/src/tools/vmap4_extractor/mpq_libmpq04.h b/src/tools/vmap4_extractor/mpq_libmpq04.h index 605ca54a8..e417d44e5 100644 --- a/src/tools/vmap4_extractor/mpq_libmpq04.h +++ b/src/tools/vmap4_extractor/mpq_libmpq04.h @@ -32,7 +32,7 @@ class MPQArchive public: mpq_archive_s* mpq_a; - MPQArchive(const char* filename); + MPQArchive(char const* filename); ~MPQArchive() { if (isOpened()) close(); } void GetFileListTo(vector& filelist) @@ -79,11 +79,11 @@ class MPQFile libmpq__off_t pointer, size; // disable copying - MPQFile(const MPQFile& /*f*/) {} - void operator=(const MPQFile& /*f*/) {} + MPQFile(MPQFile const& /*f*/) {} + void operator=(MPQFile const& /*f*/) {} public: - MPQFile(const char* filename); // filenames are not case sensitive + MPQFile(char const* filename); // filenames are not case sensitive ~MPQFile() { close(); } std::size_t read(void* dest, std::size_t bytes); std::size_t getSize() { return size; } diff --git a/src/tools/vmap4_extractor/vec3d.h b/src/tools/vmap4_extractor/vec3d.h index fb07d0d47..bb9063059 100644 --- a/src/tools/vmap4_extractor/vec3d.h +++ b/src/tools/vmap4_extractor/vec3d.h @@ -28,9 +28,9 @@ public: Vec3D(float x0 = 0.0f, float y0 = 0.0f, float z0 = 0.0f) : x(x0), y(y0), z(z0) {} - Vec3D(const Vec3D& v) : x(v.x), y(v.y), z(v.z) {} + Vec3D(Vec3D const& v) : x(v.x), y(v.y), z(v.z) {} - Vec3D& operator= (const Vec3D& v) + Vec3D& operator= (Vec3D const& v) { x = v.x; y = v.y; @@ -38,19 +38,19 @@ public: return *this; } - Vec3D operator+ (const Vec3D& v) const + Vec3D operator+ (Vec3D const& v) const { Vec3D r(x + v.x, y + v.y, z + v.z); return r; } - Vec3D operator- (const Vec3D& v) const + Vec3D operator- (Vec3D const& v) const { Vec3D r(x - v.x, y - v.y, z - v.z); return r; } - float operator* (const Vec3D& v) const + float operator* (Vec3D const& v) const { return x * v.x + y * v.y + z * v.z; } @@ -61,18 +61,18 @@ public: return r; } - friend Vec3D operator* (float d, const Vec3D& v) + friend Vec3D operator* (float d, Vec3D const& v) { return v * d; } - Vec3D operator% (const Vec3D& v) const + Vec3D operator% (Vec3D const& v) const { Vec3D r(y * v.z - z * v.y, z * v.x - x * v.z, x * v.y - y * v.x); return r; } - Vec3D& operator+= (const Vec3D& v) + Vec3D& operator+= (Vec3D const& v) { x += v.x; y += v.y; @@ -80,7 +80,7 @@ public: return *this; } - Vec3D& operator-= (const Vec3D& v) + Vec3D& operator-= (Vec3D const& v) { x -= v.x; y -= v.y; @@ -125,7 +125,7 @@ public: return in; } - friend std::ostream& operator<<(std::ostream& out, const Vec3D& v) + friend std::ostream& operator<<(std::ostream& out, Vec3D const& v) { out << v.x << " " << v.y << " " << v.z; return out; @@ -151,28 +151,28 @@ public: Vec2D(float x0 = 0.0f, float y0 = 0.0f) : x(x0), y(y0) {} - Vec2D(const Vec2D& v) : x(v.x), y(v.y) {} + Vec2D(Vec2D const& v) : x(v.x), y(v.y) {} - Vec2D& operator= (const Vec2D& v) + Vec2D& operator= (Vec2D const& v) { x = v.x; y = v.y; return *this; } - Vec2D operator+ (const Vec2D& v) const + Vec2D operator+ (Vec2D const& v) const { Vec2D r(x + v.x, y + v.y); return r; } - Vec2D operator- (const Vec2D& v) const + Vec2D operator- (Vec2D const& v) const { Vec2D r(x - v.x, y - v.y); return r; } - float operator* (const Vec2D& v) const + float operator* (Vec2D const& v) const { return x * v.x + y * v.y; } @@ -183,19 +183,19 @@ public: return r; } - friend Vec2D operator* (float d, const Vec2D& v) + friend Vec2D operator* (float d, Vec2D const& v) { return v * d; } - Vec2D& operator+= (const Vec2D& v) + Vec2D& operator+= (Vec2D const& v) { x += v.x; y += v.y; return *this; } - Vec2D& operator-= (const Vec2D& v) + Vec2D& operator-= (Vec2D const& v) { x -= v.x; y -= v.y; diff --git a/src/tools/vmap4_extractor/vmapexport.cpp b/src/tools/vmap4_extractor/vmapexport.cpp index 2b00673a3..3bd12de96 100644 --- a/src/tools/vmap4_extractor/vmapexport.cpp +++ b/src/tools/vmap4_extractor/vmapexport.cpp @@ -76,7 +76,7 @@ uint32 GenerateUniqueObjectId(uint32 clientId, uint16 clientDoodadId) // Local testing functions -bool FileExists(const char* file) +bool FileExists(char const* file) { if (FILE* n = fopen(file, "rb")) { @@ -362,7 +362,7 @@ bool fillArchiveNameVector(std::vector& pArchiveNames) return true; } -bool processArgv(int argc, char** argv, const char* versionString) +bool processArgv(int argc, char** argv, char const* versionString) { bool result = true; hasInputPathParam = false; @@ -427,7 +427,7 @@ bool processArgv(int argc, char** argv, const char* versionString) int main(int argc, char** argv) { bool success = true; - const char* versionString = "V4.00 2012_02"; + char const* versionString = "V4.00 2012_02"; // Use command line arguments, when some if (!processArgv(argc, argv, versionString)) diff --git a/src/tools/vmap4_extractor/vmapexport.h b/src/tools/vmap4_extractor/vmapexport.h index fc8433996..0a35c295d 100644 --- a/src/tools/vmap4_extractor/vmapexport.h +++ b/src/tools/vmap4_extractor/vmapexport.h @@ -37,12 +37,12 @@ enum ModelFlags struct WMODoodadData; -extern const char * szWorkDirWmo; +extern char const* szWorkDirWmo; extern std::unordered_map WmoDoodads; uint32 GenerateUniqueObjectId(uint32 clientId, uint16 clientDoodadId); -bool FileExists(const char* file); +bool FileExists(char const* file); void strToLower(char* str); bool ExtractSingleWmo(std::string& fname); diff --git a/src/tools/vmap4_extractor/wmo.h b/src/tools/vmap4_extractor/wmo.h index 4d00b11ce..1017d33eb 100644 --- a/src/tools/vmap4_extractor/wmo.h +++ b/src/tools/vmap4_extractor/wmo.h @@ -65,7 +65,7 @@ namespace WMO } /* for whatever reason a certain company just can't stick to one coordinate system... */ -static inline Vec3D fixCoords(const Vec3D& v) { return Vec3D(v.z, v.x, v.y); } +static inline Vec3D fixCoords(Vec3D const& v) { return Vec3D(v.z, v.x, v.y); } struct WMODoodadData {