From 2ce2c8cf3a8af9f6213d8247dc215161f431319a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francesco=20Borz=C3=AC?= Date: Sun, 27 Oct 2024 13:10:28 +0100 Subject: [PATCH] refactor(src/server/game/*): remove unused imports (big part 3) (#20315) --- src/server/game/AI/CoreAI/GuardAI.cpp | 1 - src/server/game/Entities/Creature/Creature.cpp | 1 - src/server/game/Entities/Creature/Creature.h | 1 - src/server/game/Entities/Item/Item.cpp | 1 - src/server/game/Entities/Player/PlayerStorage.cpp | 2 -- src/server/game/Globals/ObjectMgr.h | 1 - src/server/game/Handlers/MiscHandler.cpp | 2 ++ src/server/game/Mails/Mail.cpp | 1 - src/server/game/Scripting/ScriptMgr.h | 2 -- src/server/game/Scripting/ScriptObject.h | 1 - src/server/game/Server/WorldPacket.h | 1 - src/server/game/Server/WorldSession.cpp | 1 - src/server/game/Server/WorldSocket.cpp | 2 ++ src/server/game/Server/WorldSocket.h | 1 - src/server/game/Spells/SpellInfo.cpp | 1 + src/server/game/Texts/CreatureTextMgr.h | 1 - src/server/game/Tools/PlayerDump.h | 1 - src/server/game/Weather/Weather.h | 1 - 18 files changed, 5 insertions(+), 17 deletions(-) diff --git a/src/server/game/AI/CoreAI/GuardAI.cpp b/src/server/game/AI/CoreAI/GuardAI.cpp index 4ba087cf8..8bf17be73 100644 --- a/src/server/game/AI/CoreAI/GuardAI.cpp +++ b/src/server/game/AI/CoreAI/GuardAI.cpp @@ -16,7 +16,6 @@ */ #include "GuardAI.h" -#include "CreatureAIImpl.h" #include "Player.h" int32 GuardAI::Permissible(Creature const* creature) diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index f52e4569b..1cfc267fc 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -33,7 +33,6 @@ #include "LootMgr.h" #include "ObjectMgr.h" #include "Opcodes.h" -#include "OutdoorPvPMgr.h" #include "Pet.h" #include "Player.h" #include "PoolMgr.h" diff --git a/src/server/game/Entities/Creature/Creature.h b/src/server/game/Entities/Creature/Creature.h index 7a91b3243..89612d576 100644 --- a/src/server/game/Entities/Creature/Creature.h +++ b/src/server/game/Entities/Creature/Creature.h @@ -23,7 +23,6 @@ #include "Common.h" #include "CreatureData.h" #include "DatabaseEnv.h" -#include "ItemTemplate.h" #include "LootMgr.h" #include "Unit.h" #include "World.h" diff --git a/src/server/game/Entities/Item/Item.cpp b/src/server/game/Entities/Item/Item.cpp index c75e0e32c..370ff04a4 100644 --- a/src/server/game/Entities/Item/Item.cpp +++ b/src/server/game/Entities/Item/Item.cpp @@ -17,7 +17,6 @@ #include "Item.h" #include "Common.h" -#include "ConditionMgr.h" #include "DatabaseEnv.h" #include "GameTime.h" #include "ItemEnchantmentMgr.h" diff --git a/src/server/game/Entities/Player/PlayerStorage.cpp b/src/server/game/Entities/Player/PlayerStorage.cpp index 50be736f1..66b6c142d 100644 --- a/src/server/game/Entities/Player/PlayerStorage.cpp +++ b/src/server/game/Entities/Player/PlayerStorage.cpp @@ -22,7 +22,6 @@ #include "Battlefield.h" #include "Battleground.h" #include "BattlegroundMgr.h" -#include "Channel.h" #include "CharacterDatabaseCleaner.h" #include "Chat.h" #include "Common.h" @@ -46,7 +45,6 @@ #include "ObjectMgr.h" #include "Opcodes.h" #include "OutdoorPvP.h" -#include "OutdoorPvPMgr.h" #include "Pet.h" #include "Player.h" #include "QueryHolder.h" diff --git a/src/server/game/Globals/ObjectMgr.h b/src/server/game/Globals/ObjectMgr.h index 994bddcbc..16be17fcf 100644 --- a/src/server/game/Globals/ObjectMgr.h +++ b/src/server/game/Globals/ObjectMgr.h @@ -20,7 +20,6 @@ #include "Bag.h" #include "ConditionMgr.h" -#include "Corpse.h" #include "Creature.h" #include "DatabaseEnv.h" #include "GameObject.h" diff --git a/src/server/game/Handlers/MiscHandler.cpp b/src/server/game/Handlers/MiscHandler.cpp index e95d8a026..9d0cfbe65 100644 --- a/src/server/game/Handlers/MiscHandler.cpp +++ b/src/server/game/Handlers/MiscHandler.cpp @@ -52,6 +52,8 @@ #include "WorldSession.h" #include +#include "Corpse.h" + void WorldSession::HandleRepopRequestOpcode(WorldPacket& recv_data) { LOG_DEBUG("network", "WORLD: Recvd CMSG_REPOP_REQUEST Message"); diff --git a/src/server/game/Mails/Mail.cpp b/src/server/game/Mails/Mail.cpp index e33755a53..eddd70228 100644 --- a/src/server/game/Mails/Mail.cpp +++ b/src/server/game/Mails/Mail.cpp @@ -27,7 +27,6 @@ #include "ObjectMgr.h" #include "Player.h" #include "ScriptMgr.h" -#include "Unit.h" #include "World.h" MailSender::MailSender(Object* sender, MailStationery stationery) : m_stationery(stationery) diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h index 4dcb3bdfb..85d29a2bb 100644 --- a/src/server/game/Scripting/ScriptMgr.h +++ b/src/server/game/Scripting/ScriptMgr.h @@ -31,10 +31,8 @@ #include "LFGMgr.h" #include "ObjectMgr.h" #include "PetDefines.h" -#include "QuestDef.h" #include "SharedDefines.h" #include "Tuples.h" -#include "Types.h" #include "Weather.h" #include "World.h" #include diff --git a/src/server/game/Scripting/ScriptObject.h b/src/server/game/Scripting/ScriptObject.h index ea8e0b90b..51c534bcb 100644 --- a/src/server/game/Scripting/ScriptObject.h +++ b/src/server/game/Scripting/ScriptObject.h @@ -20,7 +20,6 @@ #include "DatabaseEnvFwd.h" #include "ScriptObjectFwd.h" -#include //#include "Duration.h" //#include "LFG.h" diff --git a/src/server/game/Server/WorldPacket.h b/src/server/game/Server/WorldPacket.h index 370446b2d..4b18d6bb1 100644 --- a/src/server/game/Server/WorldPacket.h +++ b/src/server/game/Server/WorldPacket.h @@ -19,7 +19,6 @@ #define _WORLDPACKET_H_ #include "ByteBuffer.h" -#include "Common.h" #include "Duration.h" #include "Opcodes.h" diff --git a/src/server/game/Server/WorldSession.cpp b/src/server/game/Server/WorldSession.cpp index 5e0c2667f..14182c9ec 100644 --- a/src/server/game/Server/WorldSession.cpp +++ b/src/server/game/Server/WorldSession.cpp @@ -43,7 +43,6 @@ #include "QueryHolder.h" #include "ScriptMgr.h" #include "SocialMgr.h" -#include "Tokenize.h" #include "Transport.h" #include "Vehicle.h" #include "WardenWin.h" diff --git a/src/server/game/Server/WorldSocket.cpp b/src/server/game/Server/WorldSocket.cpp index 523c36913..4bba0868c 100644 --- a/src/server/game/Server/WorldSocket.cpp +++ b/src/server/game/Server/WorldSocket.cpp @@ -33,6 +33,8 @@ #include "zlib.h" #include +#include "ServerPktHeader.h" + using boost::asio::ip::tcp; void compressBuff(void* dst, uint32* dst_size, void* src, int src_size) diff --git a/src/server/game/Server/WorldSocket.h b/src/server/game/Server/WorldSocket.h index e1bb554d6..aa65dfa09 100644 --- a/src/server/game/Server/WorldSocket.h +++ b/src/server/game/Server/WorldSocket.h @@ -21,7 +21,6 @@ #include "AuthCrypt.h" #include "Common.h" #include "MPSCQueue.h" -#include "ServerPktHeader.h" #include "Socket.h" #include "Util.h" #include "WorldPacket.h" diff --git a/src/server/game/Spells/SpellInfo.cpp b/src/server/game/Spells/SpellInfo.cpp index 9069edb00..e0b2e9b04 100644 --- a/src/server/game/Spells/SpellInfo.cpp +++ b/src/server/game/Spells/SpellInfo.cpp @@ -18,6 +18,7 @@ #include "SpellInfo.h" #include "Chat.h" #include "ConditionMgr.h" +#include "Corpse.h" #include "DBCStores.h" #include "LootMgr.h" #include "Player.h" diff --git a/src/server/game/Texts/CreatureTextMgr.h b/src/server/game/Texts/CreatureTextMgr.h index 91ad59fe1..11b7c1569 100644 --- a/src/server/game/Texts/CreatureTextMgr.h +++ b/src/server/game/Texts/CreatureTextMgr.h @@ -21,7 +21,6 @@ #include "Creature.h" #include "GridNotifiers.h" #include "ObjectAccessor.h" -#include "Opcodes.h" #include "SharedDefines.h" #include "WorldSession.h" diff --git a/src/server/game/Tools/PlayerDump.h b/src/server/game/Tools/PlayerDump.h index 209ac5742..9806b2aff 100644 --- a/src/server/game/Tools/PlayerDump.h +++ b/src/server/game/Tools/PlayerDump.h @@ -19,7 +19,6 @@ #define _PLAYER_DUMP_H #include "ObjectGuid.h" -#include #include #include #include diff --git a/src/server/game/Weather/Weather.h b/src/server/game/Weather/Weather.h index 917167695..9bba94527 100644 --- a/src/server/game/Weather/Weather.h +++ b/src/server/game/Weather/Weather.h @@ -22,7 +22,6 @@ #ifndef __WEATHER_H #define __WEATHER_H -#include "Common.h" #include "SharedDefines.h" #include "Timer.h"