From d057e057d36f6052972b90eb1f4bd03263f4dab5 Mon Sep 17 00:00:00 2001 From: Shauren Date: Fri, 11 Feb 2022 21:57:45 +0100 Subject: [PATCH] Core/Misc: Optimize ChatCommand includes (include only where neccessary) --- src/server/game/Chat/Chat.cpp | 8 ++++++++ src/server/game/Chat/Chat.h | 5 ++--- src/server/game/Scripting/ScriptMgr.cpp | 1 + src/server/scripts/Commands/cs_account.cpp | 1 + src/server/scripts/Commands/cs_achievement.cpp | 2 +- src/server/scripts/Commands/cs_ahbot.cpp | 1 + src/server/scripts/Commands/cs_arena.cpp | 3 +-- src/server/scripts/Commands/cs_ban.cpp | 1 + .../scripts/Commands/cs_battlenet_account.cpp | 1 + src/server/scripts/Commands/cs_bf.cpp | 1 + src/server/scripts/Commands/cs_cast.cpp | 1 + src/server/scripts/Commands/cs_character.cpp | 2 +- src/server/scripts/Commands/cs_cheat.cpp | 1 + src/server/scripts/Commands/cs_debug.cpp | 2 +- src/server/scripts/Commands/cs_deserter.cpp | 1 + src/server/scripts/Commands/cs_disable.cpp | 1 + src/server/scripts/Commands/cs_event.cpp | 1 + src/server/scripts/Commands/cs_gm.cpp | 1 + src/server/scripts/Commands/cs_go.cpp | 1 + src/server/scripts/Commands/cs_gobject.cpp | 2 +- src/server/scripts/Commands/cs_group.cpp | 1 + src/server/scripts/Commands/cs_guild.cpp | 2 +- src/server/scripts/Commands/cs_honor.cpp | 1 + src/server/scripts/Commands/cs_instance.cpp | 1 + src/server/scripts/Commands/cs_learn.cpp | 2 +- src/server/scripts/Commands/cs_lfg.cpp | 1 + src/server/scripts/Commands/cs_list.cpp | 1 + src/server/scripts/Commands/cs_lookup.cpp | 2 +- src/server/scripts/Commands/cs_message.cpp | 1 + src/server/scripts/Commands/cs_misc.cpp | 6 +----- src/server/scripts/Commands/cs_mmaps.cpp | 1 + src/server/scripts/Commands/cs_modify.cpp | 3 ++- src/server/scripts/Commands/cs_npc.cpp | 1 + src/server/scripts/Commands/cs_pet.cpp | 1 + src/server/scripts/Commands/cs_quest.cpp | 1 + src/server/scripts/Commands/cs_rbac.cpp | 1 + src/server/scripts/Commands/cs_reload.cpp | 2 +- src/server/scripts/Commands/cs_reset.cpp | 1 + src/server/scripts/Commands/cs_scene.cpp | 1 + src/server/scripts/Commands/cs_send.cpp | 2 +- src/server/scripts/Commands/cs_server.cpp | 7 ++----- src/server/scripts/Commands/cs_tele.cpp | 1 + src/server/scripts/Commands/cs_ticket.cpp | 1 + src/server/scripts/Commands/cs_titles.cpp | 1 + src/server/scripts/Commands/cs_wp.cpp | 2 +- .../worldserver/CommandLine/CliRunnable.cpp | 16 ++++------------ 46 files changed, 59 insertions(+), 38 deletions(-) diff --git a/src/server/game/Chat/Chat.cpp b/src/server/game/Chat/Chat.cpp index dc26c3cf0c..1a219ba908 100644 --- a/src/server/game/Chat/Chat.cpp +++ b/src/server/game/Chat/Chat.cpp @@ -19,6 +19,7 @@ #include "AccountMgr.h" #include "CellImpl.h" #include "CharacterCache.h" +#include "ChatCommand.h" #include "ChatPackets.h" #include "Common.h" #include "DatabaseEnv.h" @@ -40,6 +41,13 @@ Player* ChatHandler::GetPlayer() { return m_session ? m_session->GetPlayer() : nullptr; } +char* ChatHandler::LineFromMessage(char*& pos) +{ + char* start = strtok(pos, "\n"); + pos = nullptr; + return start; +} + // Lazy loading of the command table cache from commands and the // ScriptMgr should be thread safe since the player commands, // cli commands and ScriptMgr updates are all dispatched one after diff --git a/src/server/game/Chat/Chat.h b/src/server/game/Chat/Chat.h index 9aa32019ae..46db7e5624 100644 --- a/src/server/game/Chat/Chat.h +++ b/src/server/game/Chat/Chat.h @@ -18,12 +18,11 @@ #ifndef TRINITYCORE_CHAT_H #define TRINITYCORE_CHAT_H -#include "ChatCommand.h" #include "ObjectGuid.h" -#include "SharedDefines.h" #include "StringFormat.h" #include +class ChatCommand; class ChatHandler; class Creature; class GameObject; @@ -45,7 +44,7 @@ class TC_GAME_API ChatHandler explicit ChatHandler(WorldSession* session) : m_session(session), sentErrorMessage(false) { } virtual ~ChatHandler() { } - static char* LineFromMessage(char*& pos) { char* start = strtok(pos, "\n"); pos = nullptr; return start; } + static char* LineFromMessage(char*& pos); // function with different implementation for chat/console virtual char const* GetTrinityString(uint32 entry) const; diff --git a/src/server/game/Scripting/ScriptMgr.cpp b/src/server/game/Scripting/ScriptMgr.cpp index a439949cd2..1ca7264aa2 100644 --- a/src/server/game/Scripting/ScriptMgr.cpp +++ b/src/server/game/Scripting/ScriptMgr.cpp @@ -20,6 +20,7 @@ #include "AreaTrigger.h" #include "AreaTriggerAI.h" #include "Chat.h" +#include "ChatCommand.h" #include "Conversation.h" #include "Creature.h" #include "CreatureAI.h" diff --git a/src/server/scripts/Commands/cs_account.cpp b/src/server/scripts/Commands/cs_account.cpp index bca622225d..d20cabcad2 100644 --- a/src/server/scripts/Commands/cs_account.cpp +++ b/src/server/scripts/Commands/cs_account.cpp @@ -26,6 +26,7 @@ EndScriptData */ #include "AES.h" #include "Base32.h" #include "Chat.h" +#include "ChatCommand.h" #include "CryptoGenerics.h" #include "CryptoRandom.h" #include "DatabaseEnv.h" diff --git a/src/server/scripts/Commands/cs_achievement.cpp b/src/server/scripts/Commands/cs_achievement.cpp index ba2c764e4e..51ed80da28 100644 --- a/src/server/scripts/Commands/cs_achievement.cpp +++ b/src/server/scripts/Commands/cs_achievement.cpp @@ -23,8 +23,8 @@ Category: commandscripts EndScriptData */ #include "ScriptMgr.h" -#include "AchievementMgr.h" #include "Chat.h" +#include "ChatCommand.h" #include "DB2Stores.h" #include "Language.h" #include "Player.h" diff --git a/src/server/scripts/Commands/cs_ahbot.cpp b/src/server/scripts/Commands/cs_ahbot.cpp index 8ce3331d1f..d3c9256bc1 100644 --- a/src/server/scripts/Commands/cs_ahbot.cpp +++ b/src/server/scripts/Commands/cs_ahbot.cpp @@ -18,6 +18,7 @@ #include "ScriptMgr.h" #include "AuctionHouseBot.h" #include "Chat.h" +#include "ChatCommand.h" #include "Language.h" #include "RBAC.h" diff --git a/src/server/scripts/Commands/cs_arena.cpp b/src/server/scripts/Commands/cs_arena.cpp index e8aefb5b84..7a80eca486 100644 --- a/src/server/scripts/Commands/cs_arena.cpp +++ b/src/server/scripts/Commands/cs_arena.cpp @@ -26,14 +26,13 @@ EndScriptData */ #include "ArenaTeamMgr.h" #include "CharacterCache.h" #include "Chat.h" +#include "ChatCommand.h" #include "Language.h" #include "Log.h" #include "ObjectMgr.h" -#include "Player.h" #include "RBAC.h" #include "WorldSession.h" - using namespace Trinity::ChatCommands; class arena_commandscript : public CommandScript { diff --git a/src/server/scripts/Commands/cs_ban.cpp b/src/server/scripts/Commands/cs_ban.cpp index 48718cf16b..a960f0b79b 100644 --- a/src/server/scripts/Commands/cs_ban.cpp +++ b/src/server/scripts/Commands/cs_ban.cpp @@ -26,6 +26,7 @@ EndScriptData */ #include "AccountMgr.h" #include "CharacterCache.h" #include "Chat.h" +#include "ChatCommand.h" #include "DatabaseEnv.h" #include "GameTime.h" #include "Language.h" diff --git a/src/server/scripts/Commands/cs_battlenet_account.cpp b/src/server/scripts/Commands/cs_battlenet_account.cpp index 03ff81c0a2..8eae5a7b41 100644 --- a/src/server/scripts/Commands/cs_battlenet_account.cpp +++ b/src/server/scripts/Commands/cs_battlenet_account.cpp @@ -18,6 +18,7 @@ #include "AccountMgr.h" #include "BattlenetAccountMgr.h" #include "Chat.h" +#include "ChatCommand.h" #include "CryptoRandom.h" #include "DatabaseEnv.h" #include "IpAddress.h" diff --git a/src/server/scripts/Commands/cs_bf.cpp b/src/server/scripts/Commands/cs_bf.cpp index f01aa611f7..2219c912d4 100644 --- a/src/server/scripts/Commands/cs_bf.cpp +++ b/src/server/scripts/Commands/cs_bf.cpp @@ -25,6 +25,7 @@ EndScriptData */ #include "ScriptMgr.h" #include "BattlefieldMgr.h" #include "Chat.h" +#include "ChatCommand.h" #include "RBAC.h" class bf_commandscript : public CommandScript diff --git a/src/server/scripts/Commands/cs_cast.cpp b/src/server/scripts/Commands/cs_cast.cpp index be22fe8eb0..633099077e 100644 --- a/src/server/scripts/Commands/cs_cast.cpp +++ b/src/server/scripts/Commands/cs_cast.cpp @@ -24,6 +24,7 @@ EndScriptData */ #include "ScriptMgr.h" #include "Chat.h" +#include "ChatCommand.h" #include "Creature.h" #include "Language.h" #include "Player.h" diff --git a/src/server/scripts/Commands/cs_character.cpp b/src/server/scripts/Commands/cs_character.cpp index 3821c5185a..a604764c66 100644 --- a/src/server/scripts/Commands/cs_character.cpp +++ b/src/server/scripts/Commands/cs_character.cpp @@ -26,10 +26,10 @@ EndScriptData */ #include "AccountMgr.h" #include "CharacterCache.h" #include "Chat.h" +#include "ChatCommand.h" #include "DatabaseEnv.h" #include "DB2Stores.h" #include "Log.h" -#include "ObjectAccessor.h" #include "ObjectMgr.h" #include "Player.h" #include "PlayerDump.h" diff --git a/src/server/scripts/Commands/cs_cheat.cpp b/src/server/scripts/Commands/cs_cheat.cpp index 500cf29f47..279821bb6d 100644 --- a/src/server/scripts/Commands/cs_cheat.cpp +++ b/src/server/scripts/Commands/cs_cheat.cpp @@ -24,6 +24,7 @@ EndScriptData */ #include "ScriptMgr.h" #include "Chat.h" +#include "ChatCommand.h" #include "Language.h" #include "Player.h" #include "RBAC.h" diff --git a/src/server/scripts/Commands/cs_debug.cpp b/src/server/scripts/Commands/cs_debug.cpp index 1475ad8e18..1121be6105 100644 --- a/src/server/scripts/Commands/cs_debug.cpp +++ b/src/server/scripts/Commands/cs_debug.cpp @@ -30,6 +30,7 @@ EndScriptData */ #include "Channel.h" #include "ChannelPackets.h" #include "Chat.h" +#include "ChatCommand.h" #include "ChatPackets.h" #include "Conversation.h" #include "DB2Stores.h" @@ -46,7 +47,6 @@ EndScriptData */ #include "ObjectMgr.h" #include "PhasingHandler.h" #include "PoolMgr.h" -#include "QuestPools.h" #include "RBAC.h" #include "SpellMgr.h" #include "SpellPackets.h" diff --git a/src/server/scripts/Commands/cs_deserter.cpp b/src/server/scripts/Commands/cs_deserter.cpp index 32e2a296ed..b72d723d14 100644 --- a/src/server/scripts/Commands/cs_deserter.cpp +++ b/src/server/scripts/Commands/cs_deserter.cpp @@ -24,6 +24,7 @@ #include "ScriptMgr.h" #include "Chat.h" +#include "ChatCommand.h" #include "Language.h" #include "Player.h" #include "RBAC.h" diff --git a/src/server/scripts/Commands/cs_disable.cpp b/src/server/scripts/Commands/cs_disable.cpp index 0738aa518c..b3bffc4049 100644 --- a/src/server/scripts/Commands/cs_disable.cpp +++ b/src/server/scripts/Commands/cs_disable.cpp @@ -24,6 +24,7 @@ EndScriptData */ #include "ScriptMgr.h" #include "Chat.h" +#include "ChatCommand.h" #include "CriteriaHandler.h" #include "DatabaseEnv.h" #include "DB2Stores.h" diff --git a/src/server/scripts/Commands/cs_event.cpp b/src/server/scripts/Commands/cs_event.cpp index 17bfa0df4c..7e1473e53a 100644 --- a/src/server/scripts/Commands/cs_event.cpp +++ b/src/server/scripts/Commands/cs_event.cpp @@ -24,6 +24,7 @@ EndScriptData */ #include "ScriptMgr.h" #include "Chat.h" +#include "ChatCommand.h" #include "GameEventMgr.h" #include "GameTime.h" #include "Language.h" diff --git a/src/server/scripts/Commands/cs_gm.cpp b/src/server/scripts/Commands/cs_gm.cpp index a7b863aafd..f8b1497e9e 100644 --- a/src/server/scripts/Commands/cs_gm.cpp +++ b/src/server/scripts/Commands/cs_gm.cpp @@ -25,6 +25,7 @@ EndScriptData */ #include "ScriptMgr.h" #include "AccountMgr.h" #include "Chat.h" +#include "ChatCommand.h" #include "DatabaseEnv.h" #include "Language.h" #include "ObjectAccessor.h" diff --git a/src/server/scripts/Commands/cs_go.cpp b/src/server/scripts/Commands/cs_go.cpp index 47f402d812..e5caaadecb 100644 --- a/src/server/scripts/Commands/cs_go.cpp +++ b/src/server/scripts/Commands/cs_go.cpp @@ -24,6 +24,7 @@ EndScriptData */ #include "ScriptMgr.h" #include "Chat.h" +#include "ChatCommand.h" #include "Containers.h" #include "DatabaseEnv.h" #include "DB2Stores.h" diff --git a/src/server/scripts/Commands/cs_gobject.cpp b/src/server/scripts/Commands/cs_gobject.cpp index dddbd0ed0c..d22e53739f 100644 --- a/src/server/scripts/Commands/cs_gobject.cpp +++ b/src/server/scripts/Commands/cs_gobject.cpp @@ -24,6 +24,7 @@ EndScriptData */ #include "ScriptMgr.h" #include "Chat.h" +#include "ChatCommand.h" #include "DatabaseEnv.h" #include "DB2Stores.h" #include "GameEventMgr.h" @@ -35,7 +36,6 @@ EndScriptData */ #include "MapManager.h" #include "ObjectAccessor.h" #include "ObjectMgr.h" -#include "Opcodes.h" #include "PhasingHandler.h" #include "Player.h" #include "PoolMgr.h" diff --git a/src/server/scripts/Commands/cs_group.cpp b/src/server/scripts/Commands/cs_group.cpp index 078d1c319e..b18233d5a6 100644 --- a/src/server/scripts/Commands/cs_group.cpp +++ b/src/server/scripts/Commands/cs_group.cpp @@ -18,6 +18,7 @@ #include "ScriptMgr.h" #include "CharacterCache.h" #include "Chat.h" +#include "ChatCommand.h" #include "DatabaseEnv.h" #include "DB2Stores.h" #include "GroupMgr.h" diff --git a/src/server/scripts/Commands/cs_guild.cpp b/src/server/scripts/Commands/cs_guild.cpp index d7245f22fb..17efbbac01 100644 --- a/src/server/scripts/Commands/cs_guild.cpp +++ b/src/server/scripts/Commands/cs_guild.cpp @@ -26,10 +26,10 @@ EndScriptData */ #include "AchievementMgr.h" #include "CharacterCache.h" #include "Chat.h" +#include "ChatCommand.h" #include "Guild.h" #include "GuildMgr.h" #include "Language.h" -#include "ObjectAccessor.h" #include "ObjectMgr.h" #include "Player.h" #include "RBAC.h" diff --git a/src/server/scripts/Commands/cs_honor.cpp b/src/server/scripts/Commands/cs_honor.cpp index cf3ad51ba3..0b435e2cba 100644 --- a/src/server/scripts/Commands/cs_honor.cpp +++ b/src/server/scripts/Commands/cs_honor.cpp @@ -24,6 +24,7 @@ EndScriptData */ #include "ScriptMgr.h" #include "Chat.h" +#include "ChatCommand.h" #include "Language.h" #include "Player.h" #include "RBAC.h" diff --git a/src/server/scripts/Commands/cs_instance.cpp b/src/server/scripts/Commands/cs_instance.cpp index 72dc11eb7c..4c275943b4 100644 --- a/src/server/scripts/Commands/cs_instance.cpp +++ b/src/server/scripts/Commands/cs_instance.cpp @@ -24,6 +24,7 @@ EndScriptData */ #include "ScriptMgr.h" #include "Chat.h" +#include "ChatCommand.h" #include "DB2Stores.h" #include "GameTime.h" #include "Group.h" diff --git a/src/server/scripts/Commands/cs_learn.cpp b/src/server/scripts/Commands/cs_learn.cpp index b23f38bc2e..18bec6401c 100644 --- a/src/server/scripts/Commands/cs_learn.cpp +++ b/src/server/scripts/Commands/cs_learn.cpp @@ -24,11 +24,11 @@ EndScriptData */ #include "ScriptMgr.h" #include "Chat.h" +#include "ChatCommand.h" #include "DB2Stores.h" #include "Language.h" #include "LanguageMgr.h" #include "ObjectMgr.h" -#include "Pet.h" #include "Player.h" #include "RBAC.h" #include "SpellInfo.h" diff --git a/src/server/scripts/Commands/cs_lfg.cpp b/src/server/scripts/Commands/cs_lfg.cpp index 8b9a73cc8d..3cb094ba2e 100644 --- a/src/server/scripts/Commands/cs_lfg.cpp +++ b/src/server/scripts/Commands/cs_lfg.cpp @@ -18,6 +18,7 @@ #include "ScriptMgr.h" #include "CharacterCache.h" #include "Chat.h" +#include "ChatCommand.h" #include "DatabaseEnv.h" #include "Group.h" #include "GroupMgr.h" diff --git a/src/server/scripts/Commands/cs_list.cpp b/src/server/scripts/Commands/cs_list.cpp index 3a1060bc0d..568a0bf993 100644 --- a/src/server/scripts/Commands/cs_list.cpp +++ b/src/server/scripts/Commands/cs_list.cpp @@ -25,6 +25,7 @@ EndScriptData */ #include "ScriptMgr.h" #include "CharacterCache.h" #include "Chat.h" +#include "ChatCommand.h" #include "Creature.h" #include "DatabaseEnv.h" #include "DB2Stores.h" diff --git a/src/server/scripts/Commands/cs_lookup.cpp b/src/server/scripts/Commands/cs_lookup.cpp index 6eb2ef1d6c..e3c0ab6661 100644 --- a/src/server/scripts/Commands/cs_lookup.cpp +++ b/src/server/scripts/Commands/cs_lookup.cpp @@ -25,10 +25,10 @@ EndScriptData */ #include "ScriptMgr.h" #include "AccountMgr.h" #include "Chat.h" +#include "ChatCommand.h" #include "DatabaseEnv.h" #include "DB2Stores.h" #include "GameEventMgr.h" -#include "ObjectAccessor.h" #include "ObjectMgr.h" #include "Player.h" #include "ReputationMgr.h" diff --git a/src/server/scripts/Commands/cs_message.cpp b/src/server/scripts/Commands/cs_message.cpp index 503912ef56..2f2fa9f4f5 100644 --- a/src/server/scripts/Commands/cs_message.cpp +++ b/src/server/scripts/Commands/cs_message.cpp @@ -24,6 +24,7 @@ EndScriptData */ #include "ScriptMgr.h" #include "Chat.h" +#include "ChatCommand.h" #include "ChatPackets.h" #include "Channel.h" #include "ChannelMgr.h" diff --git a/src/server/scripts/Commands/cs_misc.cpp b/src/server/scripts/Commands/cs_misc.cpp index d97fafaa23..088233742a 100644 --- a/src/server/scripts/Commands/cs_misc.cpp +++ b/src/server/scripts/Commands/cs_misc.cpp @@ -21,18 +21,17 @@ #include "CellImpl.h" #include "CharacterCache.h" #include "Chat.h" +#include "ChatCommand.h" #include "DatabaseEnv.h" #include "DB2Stores.h" #include "DisableMgr.h" #include "GridNotifiers.h" #include "Group.h" -#include "GroupMgr.h" #include "InstanceSaveMgr.h" #include "IpAddress.h" #include "IPLocation.h" #include "Item.h" #include "Language.h" -#include "LFG.h" #include "Log.h" #include "MapManager.h" #include "MiscPackets.h" @@ -41,8 +40,6 @@ #include "MovementDefines.h" #include "ObjectAccessor.h" #include "ObjectMgr.h" -#include "Opcodes.h" -#include "Pet.h" #include "PhasingHandler.h" #include "Player.h" #include "Realm.h" @@ -51,7 +48,6 @@ #include "SpellMgr.h" #include "Transport.h" #include "Weather.h" -#include "WeatherMgr.h" #include "World.h" #include "WorldSession.h" diff --git a/src/server/scripts/Commands/cs_mmaps.cpp b/src/server/scripts/Commands/cs_mmaps.cpp index aeb05492f6..15cd88eee8 100644 --- a/src/server/scripts/Commands/cs_mmaps.cpp +++ b/src/server/scripts/Commands/cs_mmaps.cpp @@ -26,6 +26,7 @@ #include "ScriptMgr.h" #include "CellImpl.h" #include "Chat.h" +#include "ChatCommand.h" #include "DisableMgr.h" #include "GridNotifiersImpl.h" #include "Map.h" diff --git a/src/server/scripts/Commands/cs_modify.cpp b/src/server/scripts/Commands/cs_modify.cpp index 972c376116..fd1748bab3 100644 --- a/src/server/scripts/Commands/cs_modify.cpp +++ b/src/server/scripts/Commands/cs_modify.cpp @@ -25,10 +25,11 @@ EndScriptData */ #include "ScriptMgr.h" #include "CharacterCache.h" #include "Chat.h" +#include "ChatCommand.h" +#include "Creature.h" #include "DB2Stores.h" #include "Log.h" #include "ObjectMgr.h" -#include "Pet.h" #include "PhasingHandler.h" #include "Player.h" #include "RBAC.h" diff --git a/src/server/scripts/Commands/cs_npc.cpp b/src/server/scripts/Commands/cs_npc.cpp index 547574d0d9..4e0ce23949 100644 --- a/src/server/scripts/Commands/cs_npc.cpp +++ b/src/server/scripts/Commands/cs_npc.cpp @@ -24,6 +24,7 @@ EndScriptData */ #include "ScriptMgr.h" #include "Chat.h" +#include "ChatCommand.h" #include "CreatureAI.h" #include "CreatureGroups.h" #include "DatabaseEnv.h" diff --git a/src/server/scripts/Commands/cs_pet.cpp b/src/server/scripts/Commands/cs_pet.cpp index b23a71780a..144527bc7b 100644 --- a/src/server/scripts/Commands/cs_pet.cpp +++ b/src/server/scripts/Commands/cs_pet.cpp @@ -17,6 +17,7 @@ #include "ScriptMgr.h" #include "Chat.h" +#include "ChatCommand.h" #include "Language.h" #include "Log.h" #include "Map.h" diff --git a/src/server/scripts/Commands/cs_quest.cpp b/src/server/scripts/Commands/cs_quest.cpp index 825e94beb5..751848c35b 100644 --- a/src/server/scripts/Commands/cs_quest.cpp +++ b/src/server/scripts/Commands/cs_quest.cpp @@ -24,6 +24,7 @@ EndScriptData */ #include "ScriptMgr.h" #include "Chat.h" +#include "ChatCommand.h" #include "DatabaseEnv.h" #include "DB2Stores.h" #include "DisableMgr.h" diff --git a/src/server/scripts/Commands/cs_rbac.cpp b/src/server/scripts/Commands/cs_rbac.cpp index 93bf814600..851a1e2842 100644 --- a/src/server/scripts/Commands/cs_rbac.cpp +++ b/src/server/scripts/Commands/cs_rbac.cpp @@ -25,6 +25,7 @@ EndScriptData */ #include "ScriptMgr.h" #include "AccountMgr.h" #include "Chat.h" +#include "ChatCommand.h" #include "Config.h" #include "Language.h" #include "Player.h" diff --git a/src/server/scripts/Commands/cs_reload.cpp b/src/server/scripts/Commands/cs_reload.cpp index c25403bd88..75e7f8c645 100644 --- a/src/server/scripts/Commands/cs_reload.cpp +++ b/src/server/scripts/Commands/cs_reload.cpp @@ -30,6 +30,7 @@ EndScriptData */ #include "BattlegroundMgr.h" #include "CharacterTemplateDataStore.h" #include "Chat.h" +#include "ChatCommand.h" #include "ConversationDataStore.h" #include "CreatureTextMgr.h" #include "DatabaseEnv.h" @@ -41,7 +42,6 @@ EndScriptData */ #include "LootMgr.h" #include "MapManager.h" #include "ObjectMgr.h" -#include "ScriptMgr.h" #include "SkillDiscovery.h" #include "SkillExtraItems.h" #include "SmartAI.h" diff --git a/src/server/scripts/Commands/cs_reset.cpp b/src/server/scripts/Commands/cs_reset.cpp index dc5260c434..e95d0cd37b 100644 --- a/src/server/scripts/Commands/cs_reset.cpp +++ b/src/server/scripts/Commands/cs_reset.cpp @@ -25,6 +25,7 @@ EndScriptData */ #include "ScriptMgr.h" #include "AchievementMgr.h" #include "Chat.h" +#include "ChatCommand.h" #include "DatabaseEnv.h" #include "DB2Stores.h" #include "Language.h" diff --git a/src/server/scripts/Commands/cs_scene.cpp b/src/server/scripts/Commands/cs_scene.cpp index 9d1bd83e6a..cad61904f7 100644 --- a/src/server/scripts/Commands/cs_scene.cpp +++ b/src/server/scripts/Commands/cs_scene.cpp @@ -17,6 +17,7 @@ #include "ScriptMgr.h" #include "Chat.h" +#include "ChatCommand.h" #include "DB2Stores.h" #include "Language.h" #include "ObjectMgr.h" diff --git a/src/server/scripts/Commands/cs_send.cpp b/src/server/scripts/Commands/cs_send.cpp index bcb7141e63..aedd128072 100644 --- a/src/server/scripts/Commands/cs_send.cpp +++ b/src/server/scripts/Commands/cs_send.cpp @@ -17,12 +17,12 @@ #include "ScriptMgr.h" #include "Chat.h" +#include "ChatCommand.h" #include "DatabaseEnv.h" #include "Item.h" #include "Language.h" #include "Mail.h" #include "ObjectMgr.h" -#include "Pet.h" #include "Player.h" #include "RBAC.h" #include "WorldSession.h" diff --git a/src/server/scripts/Commands/cs_server.cpp b/src/server/scripts/Commands/cs_server.cpp index 1add2091a9..ea2ea7f5fb 100644 --- a/src/server/scripts/Commands/cs_server.cpp +++ b/src/server/scripts/Commands/cs_server.cpp @@ -24,6 +24,7 @@ EndScriptData */ #include "ScriptMgr.h" #include "Chat.h" +#include "ChatCommand.h" #include "Config.h" #include "DatabaseEnv.h" #include "DatabaseLoader.h" @@ -32,8 +33,6 @@ EndScriptData */ #include "Language.h" #include "Log.h" #include "MySQLThreading.h" -#include "ObjectAccessor.h" -#include "Player.h" #include "RBAC.h" #include "Realm.h" #include "UpdateTime.h" @@ -42,12 +41,10 @@ EndScriptData */ #include "VMapManager2.h" #include "World.h" #include "WorldSession.h" - -#include - #include #include #include +#include class server_commandscript : public CommandScript { diff --git a/src/server/scripts/Commands/cs_tele.cpp b/src/server/scripts/Commands/cs_tele.cpp index 4d454465df..9af0fe00e8 100644 --- a/src/server/scripts/Commands/cs_tele.cpp +++ b/src/server/scripts/Commands/cs_tele.cpp @@ -24,6 +24,7 @@ EndScriptData */ #include "ScriptMgr.h" #include "Chat.h" +#include "ChatCommand.h" #include "DatabaseEnv.h" #include "DB2Stores.h" #include "Group.h" diff --git a/src/server/scripts/Commands/cs_ticket.cpp b/src/server/scripts/Commands/cs_ticket.cpp index 58f3a346b9..81879aebaf 100644 --- a/src/server/scripts/Commands/cs_ticket.cpp +++ b/src/server/scripts/Commands/cs_ticket.cpp @@ -26,6 +26,7 @@ EndScriptData */ #include "AccountMgr.h" #include "CharacterCache.h" #include "Chat.h" +#include "ChatCommand.h" #include "Language.h" #include "ObjectMgr.h" #include "Player.h" diff --git a/src/server/scripts/Commands/cs_titles.cpp b/src/server/scripts/Commands/cs_titles.cpp index b5a5a2ee42..7aebc7770c 100644 --- a/src/server/scripts/Commands/cs_titles.cpp +++ b/src/server/scripts/Commands/cs_titles.cpp @@ -24,6 +24,7 @@ EndScriptData */ #include "ScriptMgr.h" #include "Chat.h" +#include "ChatCommand.h" #include "DB2Stores.h" #include "Language.h" #include "Player.h" diff --git a/src/server/scripts/Commands/cs_wp.cpp b/src/server/scripts/Commands/cs_wp.cpp index 413adf35b1..fb1fad6dff 100644 --- a/src/server/scripts/Commands/cs_wp.cpp +++ b/src/server/scripts/Commands/cs_wp.cpp @@ -24,6 +24,7 @@ EndScriptData */ #include "ScriptMgr.h" #include "Chat.h" +#include "ChatCommand.h" #include "Creature.h" #include "DatabaseEnv.h" #include "Language.h" @@ -33,7 +34,6 @@ EndScriptData */ #include "PhasingHandler.h" #include "Player.h" #include "RBAC.h" -#include "WaypointDefines.h" #include "WaypointManager.h" #include "WorldSession.h" diff --git a/src/server/worldserver/CommandLine/CliRunnable.cpp b/src/server/worldserver/CommandLine/CliRunnable.cpp index b36e9edf9d..5263d3ba3b 100644 --- a/src/server/worldserver/CommandLine/CliRunnable.cpp +++ b/src/server/worldserver/CommandLine/CliRunnable.cpp @@ -19,22 +19,14 @@ /// @{ /// \file -#include "Common.h" -#include "ObjectMgr.h" -#include "World.h" -#include "WorldSession.h" -#include "Configuration/Config.h" - -#include "AccountMgr.h" -#include "Chat.h" #include "CliRunnable.h" -#include "Language.h" -#include "Log.h" -#include "MapManager.h" -#include "Player.h" +#include "Config.h" #include "Util.h" +#include "World.h" #if TRINITY_PLATFORM != TRINITY_PLATFORM_WINDOWS +#include "Chat.h" +#include "ChatCommand.h" #include #include #endif