From bfbd72e9b97bffbcf4a53d6886fc07ea06c79011 Mon Sep 17 00:00:00 2001 From: Niam5 Date: Wed, 6 Mar 2024 22:52:43 -0800 Subject: [PATCH] Move Log to its own folder to avoid possible issues with g3dlite log.h --- src/game/AI/BaseAI/AggressorAI.cpp | 2 +- src/game/AI/BaseAI/ReactorAI.cpp | 2 +- src/game/AI/CreatureAISelector.cpp | 2 +- src/game/Arena/ArenaTeamHandler.cpp | 2 +- src/game/AuctionHouse/AuctionHouseHandler.cpp | 2 +- src/game/AuctionHouse/AuctionHouseMgr.cpp | 2 +- src/game/AuctionHouseBot/AuctionHouseBot.cpp | 2 +- src/game/BattleGround/BattleGroundHandler.cpp | 2 +- src/game/Calendar/CalendarHandler.cpp | 2 +- src/game/Chat/Chat.cpp | 2 +- src/game/Chat/ChatHandler.cpp | 2 +- src/game/Chat/Level1.cpp | 2 +- src/game/Chat/Level3.cpp | 2 +- src/game/Chat/debugcmds.cpp | 2 +- src/game/Cinematics/M2Stores.cpp | 2 +- src/game/Combat/CombatHandler.cpp | 2 +- src/game/Combat/DuelHandler.cpp | 2 +- src/game/DBScripts/ScriptMgr.cpp | 2 +- src/game/Entities/Camera.cpp | 2 +- src/game/Entities/CharacterHandler.cpp | 2 +- src/game/Entities/Creature.cpp | 2 +- src/game/Entities/ItemEnchantmentMgr.cpp | 2 +- src/game/Entities/ItemHandler.cpp | 2 +- src/game/Entities/MiscHandler.cpp | 2 +- src/game/Entities/NPCHandler.cpp | 2 +- src/game/Entities/Object.cpp | 2 +- src/game/Entities/Pet.cpp | 2 +- src/game/Entities/PetHandler.cpp | 2 +- src/game/Entities/PetitionsHandler.cpp | 2 +- src/game/Entities/Player.cpp | 2 +- src/game/Entities/QueryHandler.cpp | 2 +- src/game/Entities/SkillHandler.cpp | 2 +- src/game/Entities/TemporarySpawn.cpp | 2 +- src/game/Entities/Totem.cpp | 2 +- src/game/Entities/Unit.cpp | 2 +- src/game/Entities/UpdateData.cpp | 2 +- src/game/Entities/Vehicle.cpp | 2 +- src/game/Entities/VehicleHandler.cpp | 2 +- src/game/GMTickets/GMTicketHandler.cpp | 2 +- src/game/GameEvents/GameEventMgr.cpp | 2 +- src/game/Globals/ObjectMgr.cpp | 2 +- src/game/Grids/GridStates.cpp | 2 +- src/game/Groups/GroupHandler.cpp | 2 +- src/game/Guilds/GuildHandler.cpp | 2 +- src/game/Guilds/GuildMgr.cpp | 2 +- src/game/LFG/LFGHandler.cpp | 2 +- src/game/Loot/LootHandler.cpp | 2 +- src/game/Loot/LootMgr.cpp | 2 +- src/game/LuaEngine | 2 +- src/game/Mails/Mail.cpp | 2 +- src/game/Mails/MailHandler.cpp | 2 +- src/game/Maps/GridMap.cpp | 2 +- src/game/Maps/InstanceData.cpp | 2 +- src/game/Maps/Map.cpp | 2 +- src/game/Maps/MapManager.cpp | 2 +- src/game/Maps/MapPersistentStateMgr.cpp | 2 +- src/game/Maps/TaxiHandler.cpp | 2 +- src/game/MotionGenerators/MotionMaster.cpp | 2 +- src/game/MotionGenerators/MoveMap.cpp | 2 +- src/game/MotionGenerators/MovementHandler.cpp | 2 +- src/game/MotionGenerators/PathFinder.cpp | 2 +- src/game/Movement/MoveSpline.cpp | 2 +- src/game/OutdoorPvP/OutdoorPvPMgr.cpp | 2 +- src/game/PlayerBot/Base/PlayerbotAI.cpp | 2 +- src/game/Pools/PoolManager.cpp | 2 +- src/game/Quests/QuestHandler.cpp | 2 +- src/game/Server/AuthCrypt.cpp | 2 +- src/game/Server/DB2Stores.cpp | 2 +- src/game/Server/DBCStores.cpp | 2 +- src/game/Server/WorldSession.cpp | 2 +- src/game/Server/WorldSocket.cpp | 2 +- src/game/Skills/SkillDiscovery.cpp | 2 +- src/game/Skills/SkillExtraItems.cpp | 2 +- src/game/Spells/Spell.cpp | 2 +- src/game/Spells/SpellAuras.cpp | 2 +- src/game/Spells/SpellEffects.cpp | 2 +- src/game/Spells/SpellHandler.cpp | 2 +- src/game/Spells/UnitAuraProcHandler.cpp | 2 +- src/game/Trade/TradeHandler.cpp | 2 +- src/game/Vmap/DynamicTree.cpp | 2 +- src/game/Vmap/VMapDefinitions.h | 2 +- src/game/VoiceChat/VoiceChatHandler.cpp | 2 +- src/game/Weather/Weather.cpp | 2 +- src/game/World/World.cpp | 2 +- src/game/pchdef.h | 2 +- src/mangosd/CliRunnable.cpp | 2 +- src/mangosd/MaNGOSsoap.h | 2 +- src/mangosd/Main.cpp | 2 +- src/mangosd/Master.cpp | 2 +- src/mangosd/RASocket.cpp | 2 +- src/realmd/AuthSocket.cpp | 2 +- src/realmd/Main.cpp | 2 +- src/shared/CMakeLists.txt | 4 ++-- src/shared/Database/DatabaseEnv.h | 2 +- src/shared/Database/SQLStorageImpl.h | 2 +- src/shared/{ => Log}/Log.cpp | 2 +- src/shared/{ => Log}/Log.h | 0 src/shared/Network/Socket.cpp | 2 +- src/shared/Platform/PosixDaemon.h | 2 +- src/shared/Platform/ServiceWin32.cpp | 2 +- src/shared/Util/ByteBuffer.h | 2 +- src/shared/pchdef.h | 2 +- 102 files changed, 102 insertions(+), 102 deletions(-) rename src/shared/{ => Log}/Log.cpp (99%) rename src/shared/{ => Log}/Log.h (100%) diff --git a/src/game/AI/BaseAI/AggressorAI.cpp b/src/game/AI/BaseAI/AggressorAI.cpp index 38bd3ebe64..4e912169e7 100644 --- a/src/game/AI/BaseAI/AggressorAI.cpp +++ b/src/game/AI/BaseAI/AggressorAI.cpp @@ -22,7 +22,7 @@ #include "World/World.h" #include "Server/DBCStores.h" #include "Maps/Map.h" -#include "Log.h" +#include "Log/Log.h" int AggressorAI::Permissible(const Creature* creature) { diff --git a/src/game/AI/BaseAI/ReactorAI.cpp b/src/game/AI/BaseAI/ReactorAI.cpp index 8bc542b39e..271ae2f44f 100644 --- a/src/game/AI/BaseAI/ReactorAI.cpp +++ b/src/game/AI/BaseAI/ReactorAI.cpp @@ -19,7 +19,7 @@ #include "AI/BaseAI/ReactorAI.h" #include "Entities/Creature.h" #include "Maps/Map.h" -#include "Log.h" +#include "Log/Log.h" #define REACTOR_VISIBLE_RANGE (26.46f) diff --git a/src/game/AI/CreatureAISelector.cpp b/src/game/AI/CreatureAISelector.cpp index f86cbc1598..22fda35026 100644 --- a/src/game/AI/CreatureAISelector.cpp +++ b/src/game/AI/CreatureAISelector.cpp @@ -24,7 +24,7 @@ #include "MotionGenerators/MovementGenerator.h" #include "AI/ScriptDevAI/ScriptDevAIMgr.h" #include "Entities/Pet.h" -#include "Log.h" +#include "Log/Log.h" #include "AI/BaseAI/PetAI.h" INSTANTIATE_SINGLETON_1(CreatureAIRegistry); diff --git a/src/game/Arena/ArenaTeamHandler.cpp b/src/game/Arena/ArenaTeamHandler.cpp index 775d62abb5..6205e412a9 100644 --- a/src/game/Arena/ArenaTeamHandler.cpp +++ b/src/game/Arena/ArenaTeamHandler.cpp @@ -18,7 +18,7 @@ #include "Server/WorldSession.h" #include "Server/WorldPacket.h" -#include "Log.h" +#include "Log/Log.h" #include "Entities/Player.h" #include "Globals/ObjectMgr.h" #include "Arena/ArenaTeam.h" diff --git a/src/game/AuctionHouse/AuctionHouseHandler.cpp b/src/game/AuctionHouse/AuctionHouseHandler.cpp index 07b65d9ec1..22fb1fef12 100644 --- a/src/game/AuctionHouse/AuctionHouseHandler.cpp +++ b/src/game/AuctionHouse/AuctionHouseHandler.cpp @@ -19,7 +19,7 @@ #include "Server/WorldPacket.h" #include "Server/WorldSession.h" #include "Server/Opcodes.h" -#include "Log.h" +#include "Log/Log.h" #include "World/World.h" #include "Globals/ObjectMgr.h" #include "Entities/ObjectGuid.h" diff --git a/src/game/AuctionHouse/AuctionHouseMgr.cpp b/src/game/AuctionHouse/AuctionHouseMgr.cpp index abf25c0450..ad3e69acc5 100644 --- a/src/game/AuctionHouse/AuctionHouseMgr.cpp +++ b/src/game/AuctionHouse/AuctionHouseMgr.cpp @@ -25,7 +25,7 @@ #include "Accounts/AccountMgr.h" #include "Entities/Item.h" #include "Tools/Language.h" -#include "Log.h" +#include "Log/Log.h" #include "Globals/ObjectMgr.h" #include "Entities/ObjectGuid.h" #include "Entities/Player.h" diff --git a/src/game/AuctionHouseBot/AuctionHouseBot.cpp b/src/game/AuctionHouseBot/AuctionHouseBot.cpp index f627b5d03f..bf425ca618 100644 --- a/src/game/AuctionHouseBot/AuctionHouseBot.cpp +++ b/src/game/AuctionHouseBot/AuctionHouseBot.cpp @@ -18,7 +18,7 @@ #include "AuctionHouseBot.h" #include "Util/ProgressBar.h" -#include "Log.h" +#include "Log/Log.h" #include "Globals/ObjectMgr.h" #include "AuctionHouse/AuctionHouseMgr.h" #include "SystemConfig.h" diff --git a/src/game/BattleGround/BattleGroundHandler.cpp b/src/game/BattleGround/BattleGroundHandler.cpp index 83f5edf3eb..b0fb542dd4 100644 --- a/src/game/BattleGround/BattleGroundHandler.cpp +++ b/src/game/BattleGround/BattleGroundHandler.cpp @@ -20,7 +20,7 @@ #include "Globals/SharedDefines.h" #include "Server/WorldPacket.h" #include "Server/Opcodes.h" -#include "Log.h" +#include "Log/Log.h" #include "Entities/Player.h" #include "Globals/ObjectMgr.h" #include "Server/WorldSession.h" diff --git a/src/game/Calendar/CalendarHandler.cpp b/src/game/Calendar/CalendarHandler.cpp index 807e19708a..5e48316e2f 100644 --- a/src/game/Calendar/CalendarHandler.cpp +++ b/src/game/Calendar/CalendarHandler.cpp @@ -17,7 +17,7 @@ */ #include "Common.h" -#include "Log.h" +#include "Log/Log.h" #include "Entities/Player.h" #include "Server/WorldPacket.h" #include "Server/WorldSession.h" diff --git a/src/game/Chat/Chat.cpp b/src/game/Chat/Chat.cpp index f0a92a5b4b..de882ce3a9 100644 --- a/src/game/Chat/Chat.cpp +++ b/src/game/Chat/Chat.cpp @@ -22,7 +22,7 @@ #include "Server/WorldPacket.h" #include "Server/WorldSession.h" #include "Server/Opcodes.h" -#include "Log.h" +#include "Log/Log.h" #include "World/World.h" #include "Globals/ObjectMgr.h" #include "Entities/ObjectGuid.h" diff --git a/src/game/Chat/ChatHandler.cpp b/src/game/Chat/ChatHandler.cpp index 9842cfc55e..51c04c4497 100644 --- a/src/game/Chat/ChatHandler.cpp +++ b/src/game/Chat/ChatHandler.cpp @@ -17,7 +17,7 @@ */ #include "Common.h" -#include "Log.h" +#include "Log/Log.h" #include "Server/WorldPacket.h" #include "Server/WorldSession.h" #include "World/World.h" diff --git a/src/game/Chat/Level1.cpp b/src/game/Chat/Level1.cpp index a84890608e..b55cad4aba 100644 --- a/src/game/Chat/Level1.cpp +++ b/src/game/Chat/Level1.cpp @@ -25,7 +25,7 @@ #include "Entities/Player.h" #include "Server/Opcodes.h" #include "Chat/Chat.h" -#include "Log.h" +#include "Log/Log.h" #include "Maps/MapManager.h" #include "Globals/ObjectAccessor.h" #include "Tools/Language.h" diff --git a/src/game/Chat/Level3.cpp b/src/game/Chat/Level3.cpp index 7f1021dc16..de39ef7373 100644 --- a/src/game/Chat/Level3.cpp +++ b/src/game/Chat/Level3.cpp @@ -27,7 +27,7 @@ #include "Entities/Player.h" #include "Entities/GameObject.h" #include "Chat/Chat.h" -#include "Log.h" +#include "Log/Log.h" #include "Guilds/Guild.h" #include "Guilds/GuildMgr.h" #include "Globals/ObjectAccessor.h" diff --git a/src/game/Chat/debugcmds.cpp b/src/game/Chat/debugcmds.cpp index aaac76e8df..3064a70267 100644 --- a/src/game/Chat/debugcmds.cpp +++ b/src/game/Chat/debugcmds.cpp @@ -21,7 +21,7 @@ #include "Entities/Player.h" #include "Server/Opcodes.h" #include "Chat/Chat.h" -#include "Log.h" +#include "Log/Log.h" #include "Entities/Unit.h" #include "Entities/GossipDef.h" #include "Tools/Language.h" diff --git a/src/game/Cinematics/M2Stores.cpp b/src/game/Cinematics/M2Stores.cpp index 688fc26615..f78a929561 100644 --- a/src/game/Cinematics/M2Stores.cpp +++ b/src/game/Cinematics/M2Stores.cpp @@ -20,7 +20,7 @@ #include "M2Structure.h" #include "M2Stores.h" #include "Common.h" -#include "Log.h" +#include "Log/Log.h" #include "World/World.h" #include #include diff --git a/src/game/Combat/CombatHandler.cpp b/src/game/Combat/CombatHandler.cpp index 8f21139de8..5a05bb0b4f 100644 --- a/src/game/Combat/CombatHandler.cpp +++ b/src/game/Combat/CombatHandler.cpp @@ -17,7 +17,7 @@ */ #include "Common.h" -#include "Log.h" +#include "Log/Log.h" #include "Server/WorldPacket.h" #include "Server/WorldSession.h" #include "Entities/ObjectGuid.h" diff --git a/src/game/Combat/DuelHandler.cpp b/src/game/Combat/DuelHandler.cpp index 695011756b..24cc939a71 100644 --- a/src/game/Combat/DuelHandler.cpp +++ b/src/game/Combat/DuelHandler.cpp @@ -19,7 +19,7 @@ #include "Common.h" #include "Server/WorldPacket.h" #include "Server/WorldSession.h" -#include "Log.h" +#include "Log/Log.h" #include "Entities/Player.h" void WorldSession::HandleDuelAcceptedOpcode(WorldPacket& recvPacket) diff --git a/src/game/DBScripts/ScriptMgr.cpp b/src/game/DBScripts/ScriptMgr.cpp index 1c7003df68..f31c86d665 100644 --- a/src/game/DBScripts/ScriptMgr.cpp +++ b/src/game/DBScripts/ScriptMgr.cpp @@ -18,7 +18,7 @@ #include "DBScripts/ScriptMgr.h" #include "Policies/Singleton.h" -#include "Log.h" +#include "Log/Log.h" #include "Util/ProgressBar.h" #include "Globals/ObjectMgr.h" #include "MotionGenerators/WaypointManager.h" diff --git a/src/game/Entities/Camera.cpp b/src/game/Entities/Camera.cpp index 8ce50dfc98..72f2079005 100644 --- a/src/game/Entities/Camera.cpp +++ b/src/game/Entities/Camera.cpp @@ -19,7 +19,7 @@ #include "Camera.h" #include "Grids/GridNotifiersImpl.h" #include "Grids/CellImpl.h" -#include "Log.h" +#include "Log/Log.h" #include "Util/Errors.h" #include "Entities/Player.h" diff --git a/src/game/Entities/CharacterHandler.cpp b/src/game/Entities/CharacterHandler.cpp index ff75bb7441..83f920b503 100644 --- a/src/game/Entities/CharacterHandler.cpp +++ b/src/game/Entities/CharacterHandler.cpp @@ -22,7 +22,7 @@ #include "Globals/SharedDefines.h" #include "Server/WorldSession.h" #include "Server/Opcodes.h" -#include "Log.h" +#include "Log/Log.h" #include "World/World.h" #include "Globals/ObjectMgr.h" #include "Entities/Player.h" diff --git a/src/game/Entities/Creature.cpp b/src/game/Entities/Creature.cpp index e0dc33e1b3..4a9108e06e 100644 --- a/src/game/Entities/Creature.cpp +++ b/src/game/Entities/Creature.cpp @@ -30,7 +30,7 @@ #include "GameEvents/GameEventMgr.h" #include "Pools/PoolManager.h" #include "Server/Opcodes.h" -#include "Log.h" +#include "Log/Log.h" #include "Loot/LootMgr.h" #include "Maps/MapManager.h" #include "AI/BaseAI/CreatureAI.h" diff --git a/src/game/Entities/ItemEnchantmentMgr.cpp b/src/game/Entities/ItemEnchantmentMgr.cpp index 49c95f0a1d..bb614985d2 100644 --- a/src/game/Entities/ItemEnchantmentMgr.cpp +++ b/src/game/Entities/ItemEnchantmentMgr.cpp @@ -18,7 +18,7 @@ #include "Entities/ItemEnchantmentMgr.h" #include "Database/DatabaseEnv.h" -#include "Log.h" +#include "Log/Log.h" #include "Globals/ObjectMgr.h" #include "Util/ProgressBar.h" #include "Util/Util.h" diff --git a/src/game/Entities/ItemHandler.cpp b/src/game/Entities/ItemHandler.cpp index 732c27aacc..225f6ceac8 100644 --- a/src/game/Entities/ItemHandler.cpp +++ b/src/game/Entities/ItemHandler.cpp @@ -20,7 +20,7 @@ #include "Server/WorldPacket.h" #include "Server/WorldSession.h" #include "Server/Opcodes.h" -#include "Log.h" +#include "Log/Log.h" #include "Globals/ObjectMgr.h" #include "Entities/Player.h" #include "Entities/Item.h" diff --git a/src/game/Entities/MiscHandler.cpp b/src/game/Entities/MiscHandler.cpp index ebae82df14..be9ed591bb 100644 --- a/src/game/Entities/MiscHandler.cpp +++ b/src/game/Entities/MiscHandler.cpp @@ -24,7 +24,7 @@ #include "Database/DatabaseImpl.h" #include "Server/WorldPacket.h" #include "Server/Opcodes.h" -#include "Log.h" +#include "Log/Log.h" #include "Entities/Player.h" #include "World/World.h" #include "Guilds/GuildMgr.h" diff --git a/src/game/Entities/NPCHandler.cpp b/src/game/Entities/NPCHandler.cpp index 038cc36ae4..38da1c21c9 100644 --- a/src/game/Entities/NPCHandler.cpp +++ b/src/game/Entities/NPCHandler.cpp @@ -22,7 +22,7 @@ #include "Server/WorldPacket.h" #include "Server/WorldSession.h" #include "Server/Opcodes.h" -#include "Log.h" +#include "Log/Log.h" #include "Globals/ObjectMgr.h" #include "Spells/SpellMgr.h" #include "Entities/Player.h" diff --git a/src/game/Entities/Object.cpp b/src/game/Entities/Object.cpp index 9d738122fa..8fb04b5180 100644 --- a/src/game/Entities/Object.cpp +++ b/src/game/Entities/Object.cpp @@ -20,7 +20,7 @@ #include "Globals/SharedDefines.h" #include "Server/WorldPacket.h" #include "Server/Opcodes.h" -#include "Log.h" +#include "Log/Log.h" #include "World/World.h" #include "Entities/Creature.h" #include "Entities/Player.h" diff --git a/src/game/Entities/Pet.cpp b/src/game/Entities/Pet.cpp index 752c531e5a..4c44ce253b 100644 --- a/src/game/Entities/Pet.cpp +++ b/src/game/Entities/Pet.cpp @@ -18,7 +18,7 @@ #include "Entities/Pet.h" #include "Database/DatabaseEnv.h" -#include "Log.h" +#include "Log/Log.h" #include "Server/WorldPacket.h" #include "Globals/ObjectMgr.h" #include "Spells/SpellMgr.h" diff --git a/src/game/Entities/PetHandler.cpp b/src/game/Entities/PetHandler.cpp index 8be09630a7..6d2d2d5585 100644 --- a/src/game/Entities/PetHandler.cpp +++ b/src/game/Entities/PetHandler.cpp @@ -21,7 +21,7 @@ #include "Server/WorldSession.h" #include "Globals/ObjectMgr.h" #include "Spells/SpellMgr.h" -#include "Log.h" +#include "Log/Log.h" #include "Server/Opcodes.h" #include "Spells/Spell.h" #include "AI/BaseAI/CreatureAI.h" diff --git a/src/game/Entities/PetitionsHandler.cpp b/src/game/Entities/PetitionsHandler.cpp index 84d69c5e41..5397d0b659 100644 --- a/src/game/Entities/PetitionsHandler.cpp +++ b/src/game/Entities/PetitionsHandler.cpp @@ -22,7 +22,7 @@ #include "Server/WorldSession.h" #include "World/World.h" #include "Globals/ObjectMgr.h" -#include "Log.h" +#include "Log/Log.h" #include "Server/Opcodes.h" #include "Guilds/Guild.h" #include "Guilds/GuildMgr.h" diff --git a/src/game/Entities/Player.cpp b/src/game/Entities/Player.cpp index 41f2643adb..cf229f4b43 100644 --- a/src/game/Entities/Player.cpp +++ b/src/game/Entities/Player.cpp @@ -19,7 +19,7 @@ #include "Entities/Player.h" #include "Tools/Language.h" #include "Database/DatabaseEnv.h" -#include "Log.h" +#include "Log/Log.h" #include "Server/Opcodes.h" #include "Spells/SpellMgr.h" #include "World/World.h" diff --git a/src/game/Entities/QueryHandler.cpp b/src/game/Entities/QueryHandler.cpp index 0cb20dd9a8..2d2882ced1 100644 --- a/src/game/Entities/QueryHandler.cpp +++ b/src/game/Entities/QueryHandler.cpp @@ -23,7 +23,7 @@ #include "Server/WorldPacket.h" #include "Server/WorldSession.h" #include "Server/Opcodes.h" -#include "Log.h" +#include "Log/Log.h" #include "World/World.h" #include "Globals/ObjectMgr.h" #include "Entities/ObjectGuid.h" diff --git a/src/game/Entities/SkillHandler.cpp b/src/game/Entities/SkillHandler.cpp index 1567f7e06f..862f230d46 100644 --- a/src/game/Entities/SkillHandler.cpp +++ b/src/game/Entities/SkillHandler.cpp @@ -20,7 +20,7 @@ #include "Database/DatabaseEnv.h" #include "Server/DBCStores.h" #include "Server/Opcodes.h" -#include "Log.h" +#include "Log/Log.h" #include "Entities/Player.h" #include "Server/WorldPacket.h" #include "Server/WorldSession.h" diff --git a/src/game/Entities/TemporarySpawn.cpp b/src/game/Entities/TemporarySpawn.cpp index 38897704ef..e8f4bfdbf2 100644 --- a/src/game/Entities/TemporarySpawn.cpp +++ b/src/game/Entities/TemporarySpawn.cpp @@ -17,7 +17,7 @@ */ #include "Entities/TemporarySpawn.h" -#include "Log.h" +#include "Log/Log.h" #include "AI/BaseAI/CreatureAI.h" TemporarySpawn::TemporarySpawn(ObjectGuid summoner) : diff --git a/src/game/Entities/Totem.cpp b/src/game/Entities/Totem.cpp index eaa943dd64..8bc5fd7d06 100644 --- a/src/game/Entities/Totem.cpp +++ b/src/game/Entities/Totem.cpp @@ -17,7 +17,7 @@ */ #include "Entities/Totem.h" -#include "Log.h" +#include "Log/Log.h" #include "Groups/Group.h" #include "Entities/Player.h" #include "Globals/ObjectMgr.h" diff --git a/src/game/Entities/Unit.cpp b/src/game/Entities/Unit.cpp index 6e34cce318..4779d13cb8 100644 --- a/src/game/Entities/Unit.cpp +++ b/src/game/Entities/Unit.cpp @@ -17,7 +17,7 @@ */ #include "Entities/Unit.h" -#include "Log.h" +#include "Log/Log.h" #include "Server/Opcodes.h" #include "Server/WorldPacket.h" #include "Server/WorldSession.h" diff --git a/src/game/Entities/UpdateData.cpp b/src/game/Entities/UpdateData.cpp index a97a7d1644..950019a608 100644 --- a/src/game/Entities/UpdateData.cpp +++ b/src/game/Entities/UpdateData.cpp @@ -22,7 +22,7 @@ #include "Entities/UpdateData.h" #include "Util/ByteBuffer.h" #include "Server/WorldPacket.h" -#include "Log.h" +#include "Log/Log.h" #include "Server/Opcodes.h" #include "World/World.h" #include "Entities/ObjectGuid.h" diff --git a/src/game/Entities/Vehicle.cpp b/src/game/Entities/Vehicle.cpp index 94f6e74517..6322576787 100644 --- a/src/game/Entities/Vehicle.cpp +++ b/src/game/Entities/Vehicle.cpp @@ -35,7 +35,7 @@ #include "Common.h" #include "Globals/SharedDefines.h" #include "Entities/ObjectGuid.h" -#include "Log.h" +#include "Log/Log.h" #include "Entities/Unit.h" #include "Entities/Creature.h" #include "AI/BaseAI/CreatureAI.h" diff --git a/src/game/Entities/VehicleHandler.cpp b/src/game/Entities/VehicleHandler.cpp index b4f61082b0..5f6b4b589c 100644 --- a/src/game/Entities/VehicleHandler.cpp +++ b/src/game/Entities/VehicleHandler.cpp @@ -20,7 +20,7 @@ #include "Server/WorldPacket.h" #include "Server/WorldSession.h" #include "Entities/ObjectGuid.h" -#include "Log.h" +#include "Log/Log.h" #include "Entities/Player.h" #include "Entities/Vehicle.h" #include "Globals/ObjectMgr.h" diff --git a/src/game/GMTickets/GMTicketHandler.cpp b/src/game/GMTickets/GMTicketHandler.cpp index 0815ad89cf..663ed5437b 100644 --- a/src/game/GMTickets/GMTicketHandler.cpp +++ b/src/game/GMTickets/GMTicketHandler.cpp @@ -19,7 +19,7 @@ #include "Common.h" #include "Tools/Language.h" #include "Server/WorldPacket.h" -#include "Log.h" +#include "Log/Log.h" #include "GMTickets/GMTicketMgr.h" #include "Globals/ObjectAccessor.h" #include "Entities/Player.h" diff --git a/src/game/GameEvents/GameEventMgr.cpp b/src/game/GameEvents/GameEventMgr.cpp index 82d8747267..43124cbcee 100644 --- a/src/game/GameEvents/GameEventMgr.cpp +++ b/src/game/GameEvents/GameEventMgr.cpp @@ -23,7 +23,7 @@ #include "Pools/PoolManager.h" #include "Util/ProgressBar.h" #include "Tools/Language.h" -#include "Log.h" +#include "Log/Log.h" #include "Maps/MapManager.h" #include "BattleGround/BattleGroundMgr.h" #include "Mails/MassMailMgr.h" diff --git a/src/game/Globals/ObjectMgr.cpp b/src/game/Globals/ObjectMgr.cpp index d79a66c7fe..0612e62812 100644 --- a/src/game/Globals/ObjectMgr.cpp +++ b/src/game/Globals/ObjectMgr.cpp @@ -21,7 +21,7 @@ #include "Policies/Singleton.h" #include "Server/SQLStorages.h" -#include "Log.h" +#include "Log/Log.h" #include "Maps/MapManager.h" #include "Entities/ObjectGuid.h" #include "AI/ScriptDevAI/ScriptDevAIMgr.h" diff --git a/src/game/Grids/GridStates.cpp b/src/game/Grids/GridStates.cpp index fab2e1c8aa..8e6cb8eb6e 100644 --- a/src/game/Grids/GridStates.cpp +++ b/src/game/Grids/GridStates.cpp @@ -18,7 +18,7 @@ #include "Grids/GridStates.h" #include "Grids/ObjectGridLoader.h" -#include "Log.h" +#include "Log/Log.h" void InvalidState::Update(Map&, NGridType&, GridInfo&, const uint32& /*x*/, const uint32& /*y*/, const uint32&) const diff --git a/src/game/Groups/GroupHandler.cpp b/src/game/Groups/GroupHandler.cpp index 9882ef3106..bd7a97153c 100644 --- a/src/game/Groups/GroupHandler.cpp +++ b/src/game/Groups/GroupHandler.cpp @@ -19,7 +19,7 @@ #include "Common.h" #include "Database/DatabaseEnv.h" #include "Server/Opcodes.h" -#include "Log.h" +#include "Log/Log.h" #include "Server/WorldPacket.h" #include "Server/WorldSession.h" #include "World/World.h" diff --git a/src/game/Guilds/GuildHandler.cpp b/src/game/Guilds/GuildHandler.cpp index 7617eb9688..e7d83bb84c 100644 --- a/src/game/Guilds/GuildHandler.cpp +++ b/src/game/Guilds/GuildHandler.cpp @@ -21,7 +21,7 @@ #include "Server/WorldSession.h" #include "World/World.h" #include "Globals/ObjectMgr.h" -#include "Log.h" +#include "Log/Log.h" #include "Server/Opcodes.h" #include "Guilds/Guild.h" #include "Guilds/GuildMgr.h" diff --git a/src/game/Guilds/GuildMgr.cpp b/src/game/Guilds/GuildMgr.cpp index 5c0f821d9d..57696d1cf3 100644 --- a/src/game/Guilds/GuildMgr.cpp +++ b/src/game/Guilds/GuildMgr.cpp @@ -18,7 +18,7 @@ #include "Guilds/GuildMgr.h" #include "Guilds/Guild.h" -#include "Log.h" +#include "Log/Log.h" #include "Entities/ObjectGuid.h" #include "Database/DatabaseEnv.h" #include "Policies/Singleton.h" diff --git a/src/game/LFG/LFGHandler.cpp b/src/game/LFG/LFGHandler.cpp index d890491202..b0685595ae 100644 --- a/src/game/LFG/LFGHandler.cpp +++ b/src/game/LFG/LFGHandler.cpp @@ -17,7 +17,7 @@ */ #include "Server/WorldSession.h" -#include "Log.h" +#include "Log/Log.h" #include "Entities/Player.h" #include "Server/WorldPacket.h" #include "Globals/ObjectAccessor.h" diff --git a/src/game/Loot/LootHandler.cpp b/src/game/Loot/LootHandler.cpp index aa0f4baeb7..52a9f5aacb 100644 --- a/src/game/Loot/LootHandler.cpp +++ b/src/game/Loot/LootHandler.cpp @@ -19,7 +19,7 @@ #include "Common.h" #include "Server/DBCStores.h" #include "Server/WorldPacket.h" -#include "Log.h" +#include "Log/Log.h" #include "Entities/Player.h" #include "Globals/ObjectAccessor.h" #include "Entities/ObjectGuid.h" diff --git a/src/game/Loot/LootMgr.cpp b/src/game/Loot/LootMgr.cpp index e2e91c3822..3e022d4513 100644 --- a/src/game/Loot/LootMgr.cpp +++ b/src/game/Loot/LootMgr.cpp @@ -17,7 +17,7 @@ */ #include "Loot/LootMgr.h" -#include "Log.h" +#include "Log/Log.h" #include "Globals/ObjectMgr.h" #include "Util/ProgressBar.h" #include "World/World.h" diff --git a/src/game/LuaEngine b/src/game/LuaEngine index 890332a776..86c5fad808 160000 --- a/src/game/LuaEngine +++ b/src/game/LuaEngine @@ -1 +1 @@ -Subproject commit 890332a7764acd562b3fc66876fa8a42c7455f51 +Subproject commit 86c5fad8088604d4dcee8f1a4cc06c82f118a5bd diff --git a/src/game/Mails/Mail.cpp b/src/game/Mails/Mail.cpp index 775eaf6b8f..84293c01dc 100644 --- a/src/game/Mails/Mail.cpp +++ b/src/game/Mails/Mail.cpp @@ -26,7 +26,7 @@ */ #include "Mails/Mail.h" -#include "Log.h" +#include "Log/Log.h" #include "Entities/ObjectGuid.h" #include "Globals/ObjectMgr.h" #include "Entities/Item.h" diff --git a/src/game/Mails/MailHandler.cpp b/src/game/Mails/MailHandler.cpp index fc5ae5bbef..9140046b31 100644 --- a/src/game/Mails/MailHandler.cpp +++ b/src/game/Mails/MailHandler.cpp @@ -27,7 +27,7 @@ #include "Mails/Mail.h" #include "Tools/Language.h" -#include "Log.h" +#include "Log/Log.h" #include "Entities/ObjectGuid.h" #include "Globals/ObjectMgr.h" #include "Entities/Item.h" diff --git a/src/game/Maps/GridMap.cpp b/src/game/Maps/GridMap.cpp index 2eb4a527a2..02de7abca0 100644 --- a/src/game/Maps/GridMap.cpp +++ b/src/game/Maps/GridMap.cpp @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "Log.h" +#include "Log/Log.h" #include "Grids/CellImpl.h" #include "Maps/Map.h" #include "Server/DBCEnums.h" diff --git a/src/game/Maps/InstanceData.cpp b/src/game/Maps/InstanceData.cpp index 8cabb31fa0..d29684e140 100644 --- a/src/game/Maps/InstanceData.cpp +++ b/src/game/Maps/InstanceData.cpp @@ -19,7 +19,7 @@ #include "Maps/InstanceData.h" #include "Database/DatabaseEnv.h" #include "Maps/Map.h" -#include "Log.h" +#include "Log/Log.h" void InstanceData::SaveToDB() const { diff --git a/src/game/Maps/Map.cpp b/src/game/Maps/Map.cpp index 042c286b68..deb21bbb8c 100644 --- a/src/game/Maps/Map.cpp +++ b/src/game/Maps/Map.cpp @@ -20,7 +20,7 @@ #include "Maps/MapManager.h" #include "Entities/Player.h" #include "Grids/GridNotifiers.h" -#include "Log.h" +#include "Log/Log.h" #include "Grids/CellImpl.h" #include "Maps/InstanceData.h" #include "Grids/GridNotifiersImpl.h" diff --git a/src/game/Maps/MapManager.cpp b/src/game/Maps/MapManager.cpp index 2691948124..af30fe3f02 100644 --- a/src/game/Maps/MapManager.cpp +++ b/src/game/Maps/MapManager.cpp @@ -20,7 +20,7 @@ #include "Maps/MapPersistentStateMgr.h" #include "Policies/Singleton.h" #include "Database/DatabaseEnv.h" -#include "Log.h" +#include "Log/Log.h" #include "Entities/Transports.h" #include "Maps/GridDefines.h" #include "World/World.h" diff --git a/src/game/Maps/MapPersistentStateMgr.cpp b/src/game/Maps/MapPersistentStateMgr.cpp index 07ae8e6923..42f330fdfc 100644 --- a/src/game/Maps/MapPersistentStateMgr.cpp +++ b/src/game/Maps/MapPersistentStateMgr.cpp @@ -21,7 +21,7 @@ #include "Maps/MapPersistentStateMgr.h" #include "Entities/Player.h" -#include "Log.h" +#include "Log/Log.h" #include "Grids/CellImpl.h" #include "Maps/Map.h" #include "Maps/MapManager.h" diff --git a/src/game/Maps/TaxiHandler.cpp b/src/game/Maps/TaxiHandler.cpp index 5c3ecf0603..654c2f2db5 100644 --- a/src/game/Maps/TaxiHandler.cpp +++ b/src/game/Maps/TaxiHandler.cpp @@ -21,7 +21,7 @@ #include "Server/WorldPacket.h" #include "Server/WorldSession.h" #include "Server/Opcodes.h" -#include "Log.h" +#include "Log/Log.h" #include "Globals/ObjectMgr.h" #include "Entities/Player.h" #include "MotionGenerators/Path.h" diff --git a/src/game/MotionGenerators/MotionMaster.cpp b/src/game/MotionGenerators/MotionMaster.cpp index 78ab0b28e9..0a0e3a36d3 100644 --- a/src/game/MotionGenerators/MotionMaster.cpp +++ b/src/game/MotionGenerators/MotionMaster.cpp @@ -33,7 +33,7 @@ #include "Entities/CreatureLinkingMgr.h" #include "Entities/Pet.h" #include "Server/DBCStores.h" -#include "Log.h" +#include "Log/Log.h" #include diff --git a/src/game/MotionGenerators/MoveMap.cpp b/src/game/MotionGenerators/MoveMap.cpp index 3d28f74692..6c6085cd02 100644 --- a/src/game/MotionGenerators/MoveMap.cpp +++ b/src/game/MotionGenerators/MoveMap.cpp @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "Log.h" +#include "Log/Log.h" #include "World/World.h" #include "Entities/Creature.h" #include "MotionGenerators/MoveMap.h" diff --git a/src/game/MotionGenerators/MovementHandler.cpp b/src/game/MotionGenerators/MovementHandler.cpp index 470ba0948d..46cc02b028 100644 --- a/src/game/MotionGenerators/MovementHandler.cpp +++ b/src/game/MotionGenerators/MovementHandler.cpp @@ -20,7 +20,7 @@ #include "Server/WorldPacket.h" #include "Server/WorldSession.h" #include "Server/Opcodes.h" -#include "Log.h" +#include "Log/Log.h" #include "Entities/Player.h" #include "Spells/SpellAuras.h" #include "Maps/MapManager.h" diff --git a/src/game/MotionGenerators/PathFinder.cpp b/src/game/MotionGenerators/PathFinder.cpp index d990f0f8f1..ff8affdcd9 100644 --- a/src/game/MotionGenerators/PathFinder.cpp +++ b/src/game/MotionGenerators/PathFinder.cpp @@ -20,7 +20,7 @@ #include "Maps/GridMap.h" #include "Entities/Creature.h" #include "MotionGenerators/PathFinder.h" -#include "Log.h" +#include "Log/Log.h" #include "World/World.h" #include diff --git a/src/game/Movement/MoveSpline.cpp b/src/game/Movement/MoveSpline.cpp index d454e1f711..bef04b5c64 100644 --- a/src/game/Movement/MoveSpline.cpp +++ b/src/game/Movement/MoveSpline.cpp @@ -18,7 +18,7 @@ #include "MoveSpline.h" #include -#include "Log.h" +#include "Log/Log.h" #include "Entities/Unit.h" namespace Movement diff --git a/src/game/OutdoorPvP/OutdoorPvPMgr.cpp b/src/game/OutdoorPvP/OutdoorPvPMgr.cpp index 72cb5ed9f8..aed7c54258 100644 --- a/src/game/OutdoorPvP/OutdoorPvPMgr.cpp +++ b/src/game/OutdoorPvP/OutdoorPvPMgr.cpp @@ -20,7 +20,7 @@ #include "Policies/Singleton.h" #include "OutdoorPvP.h" #include "World/World.h" -#include "Log.h" +#include "Log/Log.h" #include "OutdoorPvPEP.h" #include "OutdoorPvPGH.h" #include "OutdoorPvPHP.h" diff --git a/src/game/PlayerBot/Base/PlayerbotAI.cpp b/src/game/PlayerBot/Base/PlayerbotAI.cpp index 4550501362..e785e05543 100644 --- a/src/game/PlayerBot/Base/PlayerbotAI.cpp +++ b/src/game/PlayerBot/Base/PlayerbotAI.cpp @@ -18,7 +18,7 @@ #include #include "Common.h" -#include "Log.h" +#include "Log/Log.h" #include "Server/WorldPacket.h" #include "Database/DatabaseEnv.h" #include "PlayerbotAI.h" diff --git a/src/game/Pools/PoolManager.cpp b/src/game/Pools/PoolManager.cpp index e041a28304..2b32d55565 100644 --- a/src/game/Pools/PoolManager.cpp +++ b/src/game/Pools/PoolManager.cpp @@ -20,7 +20,7 @@ #include "Globals/ObjectMgr.h" #include "Entities/ObjectGuid.h" #include "Util/ProgressBar.h" -#include "Log.h" +#include "Log/Log.h" #include "Maps/MapPersistentStateMgr.h" #include "World/World.h" #include "Policies/Singleton.h" diff --git a/src/game/Quests/QuestHandler.cpp b/src/game/Quests/QuestHandler.cpp index 3b1ff2bbf0..37a07e037a 100644 --- a/src/game/Quests/QuestHandler.cpp +++ b/src/game/Quests/QuestHandler.cpp @@ -17,7 +17,7 @@ */ #include "Common.h" -#include "Log.h" +#include "Log/Log.h" #include "Server/WorldPacket.h" #include "Server/WorldSession.h" #include "Server/Opcodes.h" diff --git a/src/game/Server/AuthCrypt.cpp b/src/game/Server/AuthCrypt.cpp index 574ee91140..ec7d2c970e 100644 --- a/src/game/Server/AuthCrypt.cpp +++ b/src/game/Server/AuthCrypt.cpp @@ -19,7 +19,7 @@ #include "AuthCrypt.h" #include "Auth/CryptoHash.h" #include "Auth/HMACSHA1.h" -#include "Log.h" +#include "Log/Log.h" #include "Auth/BigNumber.h" AuthCrypt::AuthCrypt() : _clientDecrypt(Sha1Hash::GetLength()), _serverEncrypt(Sha1Hash::GetLength()), _initialized(false) {} diff --git a/src/game/Server/DB2Stores.cpp b/src/game/Server/DB2Stores.cpp index 876b6dc3fa..c5e30fd4ab 100644 --- a/src/game/Server/DB2Stores.cpp +++ b/src/game/Server/DB2Stores.cpp @@ -19,7 +19,7 @@ #include "DB2Stores.h" #include "DBCStores.h" #include "Policies/Singleton.h" -#include "Log.h" +#include "Log/Log.h" #include "Util/ProgressBar.h" #include "Globals/SharedDefines.h" #include "Entities/ObjectGuid.h" diff --git a/src/game/Server/DBCStores.cpp b/src/game/Server/DBCStores.cpp index 4be35b6559..f6992475f6 100644 --- a/src/game/Server/DBCStores.cpp +++ b/src/game/Server/DBCStores.cpp @@ -18,7 +18,7 @@ #include "Server/DBCStores.h" #include "Policies/Singleton.h" -#include "Log.h" +#include "Log/Log.h" #include "Util/ProgressBar.h" #include "Globals/SharedDefines.h" #include "Server/SQLStorages.h" diff --git a/src/game/Server/WorldSession.cpp b/src/game/Server/WorldSession.cpp index 6ecbaa77a4..acea1b0d4a 100644 --- a/src/game/Server/WorldSession.cpp +++ b/src/game/Server/WorldSession.cpp @@ -25,7 +25,7 @@ #include "Server/WorldSocket.h" // must be first to make ACE happy with ACE includes in it #include "Common.h" #include "Database/DatabaseEnv.h" -#include "Log.h" +#include "Log/Log.h" #include "Server/Opcodes.h" #include "Server/WorldPacket.h" #include "Server/WorldSession.h" diff --git a/src/game/Server/WorldSocket.cpp b/src/game/Server/WorldSocket.cpp index ae0fcd0345..45174f12f0 100644 --- a/src/game/Server/WorldSocket.cpp +++ b/src/game/Server/WorldSocket.cpp @@ -29,7 +29,7 @@ #include "Auth/CryptoHash.h" #include "Server/WorldSession.h" #include "Util/CommonDefines.h" -#include "Log.h" +#include "Log/Log.h" #include "Server/DBCStores.h" #ifdef BUILD_ELUNA #include "LuaEngine/LuaEngine.h" diff --git a/src/game/Skills/SkillDiscovery.cpp b/src/game/Skills/SkillDiscovery.cpp index 3a6b95e336..439ede58bd 100644 --- a/src/game/Skills/SkillDiscovery.cpp +++ b/src/game/Skills/SkillDiscovery.cpp @@ -17,7 +17,7 @@ */ #include "Database/DatabaseEnv.h" -#include "Log.h" +#include "Log/Log.h" #include "Util/ProgressBar.h" #include "Policies/Singleton.h" #include "World/World.h" diff --git a/src/game/Skills/SkillExtraItems.cpp b/src/game/Skills/SkillExtraItems.cpp index c654544042..ec0f9010c6 100644 --- a/src/game/Skills/SkillExtraItems.cpp +++ b/src/game/Skills/SkillExtraItems.cpp @@ -18,7 +18,7 @@ #include "Skills/SkillExtraItems.h" #include "Database/DatabaseEnv.h" -#include "Log.h" +#include "Log/Log.h" #include "Util/ProgressBar.h" #include "Entities/Player.h" #include "Server/DBCStores.h" diff --git a/src/game/Spells/Spell.cpp b/src/game/Spells/Spell.cpp index f2867515da..deef09a4bd 100644 --- a/src/game/Spells/Spell.cpp +++ b/src/game/Spells/Spell.cpp @@ -23,7 +23,7 @@ #include "Grids/GridNotifiers.h" #include "Grids/GridNotifiersImpl.h" #include "Server/Opcodes.h" -#include "Log.h" +#include "Log/Log.h" #include "Maps/MapManager.h" #include "World/World.h" #include "Globals/ObjectMgr.h" diff --git a/src/game/Spells/SpellAuras.cpp b/src/game/Spells/SpellAuras.cpp index ce4da1430b..c1abdc6c42 100644 --- a/src/game/Spells/SpellAuras.cpp +++ b/src/game/Spells/SpellAuras.cpp @@ -21,7 +21,7 @@ #include "Server/WorldPacket.h" #include "Server/WorldSession.h" #include "Server/Opcodes.h" -#include "Log.h" +#include "Log/Log.h" #include "World/World.h" #include "Globals/ObjectMgr.h" #include "Spells/SpellMgr.h" diff --git a/src/game/Spells/SpellEffects.cpp b/src/game/Spells/SpellEffects.cpp index 86947e61dc..b1a31cfd6d 100644 --- a/src/game/Spells/SpellEffects.cpp +++ b/src/game/Spells/SpellEffects.cpp @@ -20,7 +20,7 @@ #include "Database/DatabaseEnv.h" #include "Server/WorldPacket.h" #include "Server/Opcodes.h" -#include "Log.h" +#include "Log/Log.h" #include "World/World.h" #include "Globals/ObjectMgr.h" #include "Spells/SpellMgr.h" diff --git a/src/game/Spells/SpellHandler.cpp b/src/game/Spells/SpellHandler.cpp index 5fe2620c13..e596f4dad7 100644 --- a/src/game/Spells/SpellHandler.cpp +++ b/src/game/Spells/SpellHandler.cpp @@ -22,7 +22,7 @@ #include "Server/WorldSession.h" #include "Globals/ObjectMgr.h" #include "Spells/SpellMgr.h" -#include "Log.h" +#include "Log/Log.h" #include "Server/Opcodes.h" #include "Spells/Spell.h" #include "AI/ScriptDevAI/ScriptDevAIMgr.h" diff --git a/src/game/Spells/UnitAuraProcHandler.cpp b/src/game/Spells/UnitAuraProcHandler.cpp index afda2be437..cf0f8d017f 100644 --- a/src/game/Spells/UnitAuraProcHandler.cpp +++ b/src/game/Spells/UnitAuraProcHandler.cpp @@ -17,7 +17,7 @@ */ #include "Common.h" -#include "Log.h" +#include "Log/Log.h" #include "Globals/ObjectMgr.h" #include "Spells/SpellMgr.h" #include "Entities/Player.h" diff --git a/src/game/Trade/TradeHandler.cpp b/src/game/Trade/TradeHandler.cpp index d4b626cce1..be0c05345e 100644 --- a/src/game/Trade/TradeHandler.cpp +++ b/src/game/Trade/TradeHandler.cpp @@ -21,7 +21,7 @@ #include "Server/WorldSession.h" #include "World/World.h" #include "Globals/ObjectAccessor.h" -#include "Log.h" +#include "Log/Log.h" #include "Server/Opcodes.h" #include "Entities/Player.h" #include "Entities/Item.h" diff --git a/src/game/Vmap/DynamicTree.cpp b/src/game/Vmap/DynamicTree.cpp index 08a82f352f..f82152e027 100644 --- a/src/game/Vmap/DynamicTree.cpp +++ b/src/game/Vmap/DynamicTree.cpp @@ -17,7 +17,7 @@ */ #include "DynamicTree.h" -#include "Log.h" +#include "Log/Log.h" #include "Util/Timer.h" #include "BIHWrap.h" #include "RegularGrid.h" diff --git a/src/game/Vmap/VMapDefinitions.h b/src/game/Vmap/VMapDefinitions.h index 57e5249a4e..e1bc0785c2 100644 --- a/src/game/Vmap/VMapDefinitions.h +++ b/src/game/Vmap/VMapDefinitions.h @@ -33,7 +33,7 @@ namespace VMAP #ifndef NO_CORE_FUNCS #include "Util/Errors.h" -#include "Log.h" +#include "Log/Log.h" #define ERROR_LOG(...) sLog.outError(__VA_ARGS__); #elif defined MMAP_GENERATOR #include diff --git a/src/game/VoiceChat/VoiceChatHandler.cpp b/src/game/VoiceChat/VoiceChatHandler.cpp index bd213010d8..9a91bed780 100644 --- a/src/game/VoiceChat/VoiceChatHandler.cpp +++ b/src/game/VoiceChat/VoiceChatHandler.cpp @@ -19,7 +19,7 @@ #include "Common.h" #include "Server/WorldPacket.h" #include "Server/WorldSession.h" -#include "Log.h" +#include "Log/Log.h" void WorldSession::HandleVoiceSessionEnableOpcode(WorldPacket& recv_data) { diff --git a/src/game/Weather/Weather.cpp b/src/game/Weather/Weather.cpp index 33b39f6f3e..112f990592 100644 --- a/src/game/Weather/Weather.cpp +++ b/src/game/Weather/Weather.cpp @@ -25,7 +25,7 @@ #include "Maps/Map.h" #include "World/World.h" #include "Server/WorldPacket.h" -#include "Log.h" +#include "Log/Log.h" #include "Util/Util.h" #include "Util/ProgressBar.h" #ifdef BUILD_ELUNA diff --git a/src/game/World/World.cpp b/src/game/World/World.cpp index 71aa3a18df..1718769432 100644 --- a/src/game/World/World.cpp +++ b/src/game/World/World.cpp @@ -25,7 +25,7 @@ #include "Config/Config.h" #include "Platform/Define.h" #include "SystemConfig.h" -#include "Log.h" +#include "Log/Log.h" #include "Server/Opcodes.h" #include "Server/WorldSession.h" #include "Server/WorldPacket.h" diff --git a/src/game/pchdef.h b/src/game/pchdef.h index bce495d624..cad07c7e1c 100644 --- a/src/game/pchdef.h +++ b/src/game/pchdef.h @@ -26,7 +26,7 @@ #include #include #include "Common.h" -#include "Log.h" +#include "Log/Log.h" #include "Server/SQLStorages.h" #include "Server/DBCStructure.h" #include "Server/DBCStores.h" diff --git a/src/mangosd/CliRunnable.cpp b/src/mangosd/CliRunnable.cpp index 65202998e3..dec663728b 100644 --- a/src/mangosd/CliRunnable.cpp +++ b/src/mangosd/CliRunnable.cpp @@ -22,7 +22,7 @@ #include "Common.h" #include "Tools/Language.h" -#include "Log.h" +#include "Log/Log.h" #include "World/World.h" #include "Globals/ObjectMgr.h" #include "Server/WorldSession.h" diff --git a/src/mangosd/MaNGOSsoap.h b/src/mangosd/MaNGOSsoap.h index 9c20df215a..5774e862bb 100644 --- a/src/mangosd/MaNGOSsoap.h +++ b/src/mangosd/MaNGOSsoap.h @@ -22,7 +22,7 @@ #include "Common.h" #include "World/World.h" #include "Accounts/AccountMgr.h" -#include "Log.h" +#include "Log/Log.h" #include "soapH.h" #include "soapStub.h" diff --git a/src/mangosd/Main.cpp b/src/mangosd/Main.cpp index e26546b9ee..a063a36bc9 100644 --- a/src/mangosd/Main.cpp +++ b/src/mangosd/Main.cpp @@ -24,7 +24,7 @@ #include "Database/DatabaseEnv.h" #include "Config/Config.h" #include "Util/ProgressBar.h" -#include "Log.h" +#include "Log/Log.h" #include "Master.h" #include "SystemConfig.h" #include "AuctionHouseBot/AuctionHouseBot.h" diff --git a/src/mangosd/Master.cpp b/src/mangosd/Master.cpp index df0e42785d..d00832a6f1 100644 --- a/src/mangosd/Master.cpp +++ b/src/mangosd/Master.cpp @@ -25,7 +25,7 @@ #include "Server/WorldSocket.h" #include "WorldRunnable.h" #include "World/World.h" -#include "Log.h" +#include "Log/Log.h" #include "Util/Timer.h" #include "SystemConfig.h" #include "CliRunnable.h" diff --git a/src/mangosd/RASocket.cpp b/src/mangosd/RASocket.cpp index 463a51d6b0..20b7fd328f 100644 --- a/src/mangosd/RASocket.cpp +++ b/src/mangosd/RASocket.cpp @@ -22,7 +22,7 @@ #include "Common.h" #include "Database/DatabaseEnv.h" -#include "Log.h" +#include "Log/Log.h" #include "RASocket.h" #include "World/World.h" #include "Config/Config.h" diff --git a/src/realmd/AuthSocket.cpp b/src/realmd/AuthSocket.cpp index aea6a5cf21..38a2e71fd0 100644 --- a/src/realmd/AuthSocket.cpp +++ b/src/realmd/AuthSocket.cpp @@ -25,7 +25,7 @@ #include "Auth/base32.h" #include "Database/DatabaseEnv.h" #include "Config/Config.h" -#include "Log.h" +#include "Log/Log.h" #include "RealmList.h" #include "AuthSocket.h" #include "AuthCodes.h" diff --git a/src/realmd/Main.cpp b/src/realmd/Main.cpp index 70895d5d52..1bf1423439 100644 --- a/src/realmd/Main.cpp +++ b/src/realmd/Main.cpp @@ -25,7 +25,7 @@ #include "RealmList.h" #include "Config/Config.h" -#include "Log.h" +#include "Log/Log.h" #include "AuthSocket.h" #include "SystemConfig.h" #include "revision.h" diff --git a/src/shared/CMakeLists.txt b/src/shared/CMakeLists.txt index 89b1c9a237..f3f5a70b74 100644 --- a/src/shared/CMakeLists.txt +++ b/src/shared/CMakeLists.txt @@ -75,8 +75,8 @@ set(SRC_GRP_DATABASE_DBC ) set(SRC_GRP_LOG - Log.cpp - Log.h + Log/Log.cpp + Log/Log.h ) set(SRC_GRP_MT diff --git a/src/shared/Database/DatabaseEnv.h b/src/shared/Database/DatabaseEnv.h index ea7b4658ef..c38ac8e981 100644 --- a/src/shared/Database/DatabaseEnv.h +++ b/src/shared/Database/DatabaseEnv.h @@ -20,7 +20,7 @@ #define DATABASEENV_H #include "Common.h" -#include "Log.h" +#include "Log/Log.h" #include "Util/Errors.h" #include "Database/Field.h" diff --git a/src/shared/Database/SQLStorageImpl.h b/src/shared/Database/SQLStorageImpl.h index 1a2ad24a97..90456509ec 100644 --- a/src/shared/Database/SQLStorageImpl.h +++ b/src/shared/Database/SQLStorageImpl.h @@ -20,7 +20,7 @@ #define SQLSTORAGE_IMPL_H #include "Util/ProgressBar.h" -#include "Log.h" +#include "Log/Log.h" #include "DBCFileLoader.h" template diff --git a/src/shared/Log.cpp b/src/shared/Log/Log.cpp similarity index 99% rename from src/shared/Log.cpp rename to src/shared/Log/Log.cpp index 6f13622110..73e3e1f447 100644 --- a/src/shared/Log.cpp +++ b/src/shared/Log/Log.cpp @@ -17,7 +17,7 @@ */ #include "Common.h" -#include "Log.h" +#include "Log/Log.h" #include "Policies/Singleton.h" #include "Config/Config.h" #include "Util/Util.h" diff --git a/src/shared/Log.h b/src/shared/Log/Log.h similarity index 100% rename from src/shared/Log.h rename to src/shared/Log/Log.h diff --git a/src/shared/Network/Socket.cpp b/src/shared/Network/Socket.cpp index 1b49ba7f1e..1a2667c5fe 100644 --- a/src/shared/Network/Socket.cpp +++ b/src/shared/Network/Socket.cpp @@ -17,7 +17,7 @@ */ #include "Socket.hpp" -#include "Log.h" +#include "Log/Log.h" #include #include diff --git a/src/shared/Platform/PosixDaemon.h b/src/shared/Platform/PosixDaemon.h index 779e0f2524..9e79064fde 100644 --- a/src/shared/Platform/PosixDaemon.h +++ b/src/shared/Platform/PosixDaemon.h @@ -17,7 +17,7 @@ */ #include "Common.h" -#include "Log.h" +#include "Log/Log.h" void startDaemon(uint32_t timeout = 10); void stopDaemon(); diff --git a/src/shared/Platform/ServiceWin32.cpp b/src/shared/Platform/ServiceWin32.cpp index ed56b4c87f..020556225a 100644 --- a/src/shared/Platform/ServiceWin32.cpp +++ b/src/shared/Platform/ServiceWin32.cpp @@ -19,7 +19,7 @@ #ifdef _WIN32 #include "Common.h" -#include "Log.h" +#include "Log/Log.h" #include #include #include diff --git a/src/shared/Util/ByteBuffer.h b/src/shared/Util/ByteBuffer.h index 076f13e311..55fdf231d5 100644 --- a/src/shared/Util/ByteBuffer.h +++ b/src/shared/Util/ByteBuffer.h @@ -20,7 +20,7 @@ #define _BYTEBUFFER_H #include "Common.h" -#include "Log.h" +#include "Log/Log.h" #include "Util/ByteConverter.h" #define BITS_1 uint8 _1 diff --git a/src/shared/pchdef.h b/src/shared/pchdef.h index 504f193fe2..586ee3ae31 100644 --- a/src/shared/pchdef.h +++ b/src/shared/pchdef.h @@ -26,7 +26,7 @@ #include #include #include "Common.h" -#include "Log.h" +#include "Log/Log.h" #include "Util/ByteBuffer.h" #include "Util/ProgressBar.h" #include "Server/WorldPacket.h"