diff options
46 files changed, 59 insertions, 38 deletions
diff --git a/src/server/game/Chat/Chat.cpp b/src/server/game/Chat/Chat.cpp index dc26c3cf0c7..1a219ba9085 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 9aa32019ae2..46db7e56246 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 <vector> +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 a439949cd26..1ca7264aa2d 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 bca622225d9..d20cabcad2e 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 ba2c764e4ee..51ed80da280 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 8ce3331d1fe..d3c9256bc12 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 e8aefb5b844..7a80eca4868 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 48718cf16bc..a960f0b79b4 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 03ff81c0a20..8eae5a7b411 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 f01aa611f7f..2219c912d47 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 be22fe8eb0a..633099077e8 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 3821c5185ae..a604764c667 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 500cf29f479..279821bb6d7 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 1475ad8e180..1121be61059 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 32e2a296edb..b72d723d141 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 0738aa518cd..b3bffc4049b 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 17bfa0df4ca..7e1473e53a9 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 a7b863aafd3..f8b1497e9e8 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 47f402d8122..e5caaadecb0 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 dddbd0ed0ce..d22e53739f6 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 078d1c319e5..b18233d5a6e 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 d7245f22fb6..17efbbac016 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 cf3ad51ba38..0b435e2cba0 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 72dc11eb7c4..4c275943b48 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 b23f38bc2e2..18bec6401c2 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 8b9a73cc8d6..3cb094ba2e0 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 3a1060bc0df..568a0bf993f 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 6eb2ef1d6c5..e3c0ab66617 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 503912ef564..2f2fa9f4f57 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 d97fafaa23d..088233742ad 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 aeb05492f62..15cd88eee88 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 972c3761168..fd1748bab37 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 547574d0d9f..4e0ce23949e 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 b23a71780af..144527bc7bf 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 825e94beb5b..751848c35bd 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 93bf814600b..851a1e28420 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 c25403bd88f..75e7f8c6455 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 dc5260c434f..e95d0cd37b9 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 9d1bd83e6a1..cad61904f7c 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 bcb7141e639..aedd128072d 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 1add2091a97..ea2ea7f5fb2 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 <numeric> - #include <boost/filesystem/operations.hpp> #include <openssl/crypto.h> #include <openssl/opensslv.h> +#include <numeric> class server_commandscript : public CommandScript { diff --git a/src/server/scripts/Commands/cs_tele.cpp b/src/server/scripts/Commands/cs_tele.cpp index 4d454465df8..9af0fe00e8e 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 58f3a346b9e..81879aebaf7 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 b5a5a2ee429..7aebc7770c7 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 413adf35b1e..fb1fad6dff4 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 b36e9edf9d1..5263d3ba3b6 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 <readline/readline.h> #include <readline/history.h> #endif |