diff options
Diffstat (limited to 'src/server/scripts/Commands')
32 files changed, 78 insertions, 46 deletions
diff --git a/src/server/scripts/Commands/cs_achievement.cpp b/src/server/scripts/Commands/cs_achievement.cpp index e843888783d..8a7a1003e8c 100644 --- a/src/server/scripts/Commands/cs_achievement.cpp +++ b/src/server/scripts/Commands/cs_achievement.cpp @@ -22,11 +22,12 @@ Comment: All achievement related commands Category: commandscripts EndScriptData */ +#include "ScriptMgr.h" #include "AchievementMgr.h" #include "Chat.h" #include "Language.h" #include "Player.h" -#include "ScriptMgr.h" +#include "RBAC.h" class achievement_commandscript : public CommandScript { diff --git a/src/server/scripts/Commands/cs_ahbot.cpp b/src/server/scripts/Commands/cs_ahbot.cpp index 08fa562cdb6..82ba2156fe4 100644 --- a/src/server/scripts/Commands/cs_ahbot.cpp +++ b/src/server/scripts/Commands/cs_ahbot.cpp @@ -16,9 +16,10 @@ */ #include "ScriptMgr.h" +#include "AuctionHouseBot.h" #include "Chat.h" #include "Language.h" -#include "AuctionHouseBot.h" +#include "RBAC.h" static const uint32 ahbotQualityIds[MAX_AUCTION_QUALITY] = { diff --git a/src/server/scripts/Commands/cs_arena.cpp b/src/server/scripts/Commands/cs_arena.cpp index 10194b7c896..2ca02645e53 100644 --- a/src/server/scripts/Commands/cs_arena.cpp +++ b/src/server/scripts/Commands/cs_arena.cpp @@ -22,13 +22,14 @@ Comment: All arena team related commands Category: commandscripts EndScriptData */ +#include "ScriptMgr.h" #include "ArenaTeamMgr.h" #include "Chat.h" #include "Language.h" #include "Log.h" #include "ObjectMgr.h" #include "Player.h" -#include "ScriptMgr.h" +#include "RBAC.h" class arena_commandscript : public CommandScript { diff --git a/src/server/scripts/Commands/cs_bf.cpp b/src/server/scripts/Commands/cs_bf.cpp index 6c4097a79b6..06687949f5b 100644 --- a/src/server/scripts/Commands/cs_bf.cpp +++ b/src/server/scripts/Commands/cs_bf.cpp @@ -23,8 +23,9 @@ Category: commandscripts EndScriptData */ #include "ScriptMgr.h" -#include "Chat.h" #include "BattlefieldMgr.h" +#include "Chat.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 2731f65a475..416daaa4b35 100644 --- a/src/server/scripts/Commands/cs_cast.cpp +++ b/src/server/scripts/Commands/cs_cast.cpp @@ -27,6 +27,7 @@ EndScriptData */ #include "Creature.h" #include "Language.h" #include "Player.h" +#include "RBAC.h" class cast_commandscript : public CommandScript { diff --git a/src/server/scripts/Commands/cs_cheat.cpp b/src/server/scripts/Commands/cs_cheat.cpp index 3765cd0d6d3..4eda4cc5017 100644 --- a/src/server/scripts/Commands/cs_cheat.cpp +++ b/src/server/scripts/Commands/cs_cheat.cpp @@ -22,10 +22,11 @@ Comment: All cheat related commands Category: commandscripts EndScriptData */ +#include "ScriptMgr.h" #include "Chat.h" #include "Language.h" #include "Player.h" -#include "ScriptMgr.h" +#include "RBAC.h" class cheat_commandscript : public CommandScript { diff --git a/src/server/scripts/Commands/cs_debug.cpp b/src/server/scripts/Commands/cs_debug.cpp index f98d5e35a4c..1d93561eb85 100644 --- a/src/server/scripts/Commands/cs_debug.cpp +++ b/src/server/scripts/Commands/cs_debug.cpp @@ -22,11 +22,13 @@ Comment: All debug related commands Category: commandscripts EndScriptData */ +#include "ScriptMgr.h" #include "BattlefieldMgr.h" #include "BattlegroundMgr.h" #include "Cell.h" #include "CellImpl.h" #include "Chat.h" +#include "ChatPackets.h" #include "Conversation.h" #include "GossipDef.h" #include "GridNotifiers.h" @@ -37,7 +39,7 @@ EndScriptData */ #include "MapManager.h" #include "MovementPackets.h" #include "ObjectMgr.h" -#include "ScriptMgr.h" +#include "RBAC.h" #include "SpellPackets.h" #include "Transport.h" #include <fstream> diff --git a/src/server/scripts/Commands/cs_deserter.cpp b/src/server/scripts/Commands/cs_deserter.cpp index d1778d14999..333411d78cb 100644 --- a/src/server/scripts/Commands/cs_deserter.cpp +++ b/src/server/scripts/Commands/cs_deserter.cpp @@ -22,10 +22,11 @@ * This file contains the CommandScripts for all deserter sub-commands */ +#include "ScriptMgr.h" #include "Chat.h" -#include "Player.h" #include "Language.h" -#include "ScriptMgr.h" +#include "Player.h" +#include "RBAC.h" #include "SpellAuras.h" enum Spells diff --git a/src/server/scripts/Commands/cs_disable.cpp b/src/server/scripts/Commands/cs_disable.cpp index 6c1df3910c5..724778fe0ca 100644 --- a/src/server/scripts/Commands/cs_disable.cpp +++ b/src/server/scripts/Commands/cs_disable.cpp @@ -22,6 +22,7 @@ Comment: All disable related commands Category: commandscripts EndScriptData */ +#include "ScriptMgr.h" #include "Chat.h" #include "CriteriaHandler.h" #include "DatabaseEnv.h" @@ -30,7 +31,7 @@ EndScriptData */ #include "ObjectMgr.h" #include "OutdoorPvP.h" #include "Player.h" -#include "ScriptMgr.h" +#include "RBAC.h" #include "SpellMgr.h" class disable_commandscript : public CommandScript diff --git a/src/server/scripts/Commands/cs_event.cpp b/src/server/scripts/Commands/cs_event.cpp index 05b49f9b4e7..633891bd4af 100644 --- a/src/server/scripts/Commands/cs_event.cpp +++ b/src/server/scripts/Commands/cs_event.cpp @@ -22,11 +22,12 @@ Comment: All event related commands Category: commandscripts EndScriptData */ +#include "ScriptMgr.h" #include "Chat.h" #include "GameEventMgr.h" #include "Language.h" #include "Player.h" -#include "ScriptMgr.h" +#include "RBAC.h" class event_commandscript : public CommandScript { diff --git a/src/server/scripts/Commands/cs_go.cpp b/src/server/scripts/Commands/cs_go.cpp index 802f8830ff8..c71a7ad2782 100644 --- a/src/server/scripts/Commands/cs_go.cpp +++ b/src/server/scripts/Commands/cs_go.cpp @@ -22,13 +22,14 @@ Comment: All go related commands Category: commandscripts EndScriptData */ +#include "ScriptMgr.h" #include "Chat.h" #include "DatabaseEnv.h" #include "Language.h" #include "MapManager.h" #include "ObjectMgr.h" #include "Player.h" -#include "ScriptMgr.h" +#include "RBAC.h" #include "SupportMgr.h" #include "Transport.h" diff --git a/src/server/scripts/Commands/cs_gobject.cpp b/src/server/scripts/Commands/cs_gobject.cpp index 9fafa61be20..859fad4eae0 100644 --- a/src/server/scripts/Commands/cs_gobject.cpp +++ b/src/server/scripts/Commands/cs_gobject.cpp @@ -22,6 +22,7 @@ Comment: All gobject related commands Category: commandscripts EndScriptData */ +#include "ScriptMgr.h" #include "Chat.h" #include "DatabaseEnv.h" #include "GameEventMgr.h" @@ -32,7 +33,7 @@ EndScriptData */ #include "Opcodes.h" #include "Player.h" #include "PoolMgr.h" -#include "ScriptMgr.h" +#include "RBAC.h" class gobject_commandscript : public CommandScript { diff --git a/src/server/scripts/Commands/cs_group.cpp b/src/server/scripts/Commands/cs_group.cpp index 8abad46babe..311ed64cf18 100644 --- a/src/server/scripts/Commands/cs_group.cpp +++ b/src/server/scripts/Commands/cs_group.cpp @@ -15,6 +15,7 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ +#include "ScriptMgr.h" #include "Chat.h" #include "DatabaseEnv.h" #include "GroupMgr.h" @@ -22,7 +23,7 @@ #include "LFG.h" #include "ObjectMgr.h" #include "Player.h" -#include "ScriptMgr.h" +#include "RBAC.h" class group_commandscript : public CommandScript { diff --git a/src/server/scripts/Commands/cs_guild.cpp b/src/server/scripts/Commands/cs_guild.cpp index d21357a8ef9..02765540582 100644 --- a/src/server/scripts/Commands/cs_guild.cpp +++ b/src/server/scripts/Commands/cs_guild.cpp @@ -22,6 +22,7 @@ Comment: All guild related commands Category: commandscripts EndScriptData */ +#include "ScriptMgr.h" #include "AchievementMgr.h" #include "Chat.h" #include "Language.h" @@ -29,7 +30,7 @@ EndScriptData */ #include "GuildMgr.h" #include "ObjectAccessor.h" #include "ObjectMgr.h" -#include "ScriptMgr.h" +#include "RBAC.h" #include <iomanip> class guild_commandscript : public CommandScript diff --git a/src/server/scripts/Commands/cs_honor.cpp b/src/server/scripts/Commands/cs_honor.cpp index 4cff715fd2c..55b80c727fd 100644 --- a/src/server/scripts/Commands/cs_honor.cpp +++ b/src/server/scripts/Commands/cs_honor.cpp @@ -22,11 +22,12 @@ Comment: All honor related commands Category: commandscripts EndScriptData */ +#include "ScriptMgr.h" #include "Chat.h" #include "Language.h" #include "ObjectMgr.h" #include "Player.h" -#include "ScriptMgr.h" +#include "RBAC.h" class honor_commandscript : public CommandScript { diff --git a/src/server/scripts/Commands/cs_instance.cpp b/src/server/scripts/Commands/cs_instance.cpp index 039668784fe..c5743f29424 100644 --- a/src/server/scripts/Commands/cs_instance.cpp +++ b/src/server/scripts/Commands/cs_instance.cpp @@ -27,9 +27,10 @@ EndScriptData */ #include "Group.h" #include "InstanceSaveMgr.h" #include "InstanceScript.h" +#include "Language.h" #include "MapManager.h" #include "Player.h" -#include "Language.h" +#include "RBAC.h" class instance_commandscript : public CommandScript { diff --git a/src/server/scripts/Commands/cs_learn.cpp b/src/server/scripts/Commands/cs_learn.cpp index 15b90d9490c..cfddaac6aa0 100644 --- a/src/server/scripts/Commands/cs_learn.cpp +++ b/src/server/scripts/Commands/cs_learn.cpp @@ -22,14 +22,15 @@ Comment: All learn related commands Category: commandscripts EndScriptData */ -#include "Chat.h" #include "ScriptMgr.h" -#include "ObjectMgr.h" +#include "Chat.h" #include "Language.h" -#include "SpellMgr.h" -#include "SpellInfo.h" -#include "Player.h" +#include "ObjectMgr.h" #include "Pet.h" +#include "Player.h" +#include "RBAC.h" +#include "SpellInfo.h" +#include "SpellMgr.h" class learn_commandscript : public CommandScript { diff --git a/src/server/scripts/Commands/cs_lfg.cpp b/src/server/scripts/Commands/cs_lfg.cpp index 07123744e18..13670f4dad3 100644 --- a/src/server/scripts/Commands/cs_lfg.cpp +++ b/src/server/scripts/Commands/cs_lfg.cpp @@ -15,6 +15,7 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ +#include "ScriptMgr.h" #include "Chat.h" #include "DatabaseEnv.h" #include "Group.h" @@ -23,7 +24,7 @@ #include "LFGMgr.h" #include "ObjectMgr.h" #include "Player.h" -#include "ScriptMgr.h" +#include "RBAC.h" void GetPlayerInfo(ChatHandler* handler, Player* player) { diff --git a/src/server/scripts/Commands/cs_list.cpp b/src/server/scripts/Commands/cs_list.cpp index c324c292463..af22e91fedd 100644 --- a/src/server/scripts/Commands/cs_list.cpp +++ b/src/server/scripts/Commands/cs_list.cpp @@ -22,13 +22,14 @@ Comment: All list related commands Category: commandscripts EndScriptData */ +#include "ScriptMgr.h" #include "Chat.h" #include "DatabaseEnv.h" #include "Language.h" #include "ObjectAccessor.h" #include "ObjectMgr.h" #include "Player.h" -#include "ScriptMgr.h" +#include "RBAC.h" #include "SpellAuraEffects.h" class list_commandscript : public CommandScript diff --git a/src/server/scripts/Commands/cs_message.cpp b/src/server/scripts/Commands/cs_message.cpp index e9c681f1904..edddedd6e98 100644 --- a/src/server/scripts/Commands/cs_message.cpp +++ b/src/server/scripts/Commands/cs_message.cpp @@ -22,14 +22,16 @@ Comment: All message related commands Category: commandscripts EndScriptData */ +#include "ScriptMgr.h" #include "Chat.h" +#include "ChatPackets.h" #include "Channel.h" #include "ChannelMgr.h" #include "DatabaseEnv.h" #include "Language.h" -#include "Player.h" #include "ObjectMgr.h" -#include "ScriptMgr.h" +#include "Player.h" +#include "RBAC.h" #include "World.h" class message_commandscript : public CommandScript diff --git a/src/server/scripts/Commands/cs_mmaps.cpp b/src/server/scripts/Commands/cs_mmaps.cpp index c56114f0ebd..3e8081eb835 100644 --- a/src/server/scripts/Commands/cs_mmaps.cpp +++ b/src/server/scripts/Commands/cs_mmaps.cpp @@ -24,18 +24,18 @@ */ #include "ScriptMgr.h" +#include "CellImpl.h" #include "Chat.h" #include "DisableMgr.h" +#include "GridNotifiersImpl.h" +#include "Map.h" +#include "MMapFactory.h" #include "ObjectMgr.h" +#include "PathGenerator.h" #include "Player.h" #include "PointMovementGenerator.h" -#include "PathGenerator.h" -#include "MMapFactory.h" -#include "Map.h" +#include "RBAC.h" #include "TargetedMovementGenerator.h" -#include "GridNotifiers.h" -#include "GridNotifiersImpl.h" -#include "CellImpl.h" class mmaps_commandscript : public CommandScript { diff --git a/src/server/scripts/Commands/cs_modify.cpp b/src/server/scripts/Commands/cs_modify.cpp index bc8940a88a1..9246eb4b532 100644 --- a/src/server/scripts/Commands/cs_modify.cpp +++ b/src/server/scripts/Commands/cs_modify.cpp @@ -22,13 +22,13 @@ Comment: All modify related commands Category: commandscripts EndScriptData */ +#include "ScriptMgr.h" #include "Chat.h" #include "Log.h" -#include "Opcodes.h" #include "Pet.h" #include "Player.h" +#include "RBAC.h" #include "ReputationMgr.h" -#include "ScriptMgr.h" #include "SpellPackets.h" class modify_commandscript : public CommandScript diff --git a/src/server/scripts/Commands/cs_npc.cpp b/src/server/scripts/Commands/cs_npc.cpp index 34f77727ca3..981d33c9537 100644 --- a/src/server/scripts/Commands/cs_npc.cpp +++ b/src/server/scripts/Commands/cs_npc.cpp @@ -22,6 +22,7 @@ Comment: All npc related commands Category: commandscripts EndScriptData */ +#include "ScriptMgr.h" #include "Chat.h" #include "CreatureAI.h" #include "CreatureGroups.h" @@ -31,7 +32,7 @@ EndScriptData */ #include "ObjectMgr.h" #include "Pet.h" #include "Player.h" -#include "ScriptMgr.h" +#include "RBAC.h" #include "TargetedMovementGenerator.h" // for HandleNpcUnFollowCommand #include "Transport.h" #include "World.h" diff --git a/src/server/scripts/Commands/cs_pet.cpp b/src/server/scripts/Commands/cs_pet.cpp index 7591600365a..61843fbb00c 100644 --- a/src/server/scripts/Commands/cs_pet.cpp +++ b/src/server/scripts/Commands/cs_pet.cpp @@ -15,13 +15,14 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ +#include "ScriptMgr.h" #include "Chat.h" #include "Language.h" #include "Log.h" #include "Pet.h" -#include "Player.h" #include "ObjectMgr.h" -#include "ScriptMgr.h" +#include "Player.h" +#include "RBAC.h" static inline Pet* GetSelectedPlayerPetOrOwn(ChatHandler* handler) { diff --git a/src/server/scripts/Commands/cs_quest.cpp b/src/server/scripts/Commands/cs_quest.cpp index 5234b3c240b..483585f8b57 100644 --- a/src/server/scripts/Commands/cs_quest.cpp +++ b/src/server/scripts/Commands/cs_quest.cpp @@ -22,12 +22,13 @@ Comment: All quest related commands Category: commandscripts EndScriptData */ +#include "ScriptMgr.h" #include "Chat.h" #include "DatabaseEnv.h" #include "ObjectMgr.h" #include "Player.h" +#include "RBAC.h" #include "ReputationMgr.h" -#include "ScriptMgr.h" #include "World.h" class quest_commandscript : public CommandScript diff --git a/src/server/scripts/Commands/cs_reset.cpp b/src/server/scripts/Commands/cs_reset.cpp index ebce9ccd9c4..c2026b53fac 100644 --- a/src/server/scripts/Commands/cs_reset.cpp +++ b/src/server/scripts/Commands/cs_reset.cpp @@ -22,15 +22,16 @@ Comment: All reset related commands Category: commandscripts EndScriptData */ +#include "ScriptMgr.h" #include "AchievementMgr.h" #include "Chat.h" #include "DatabaseEnv.h" #include "Language.h" #include "Log.h" #include "ObjectAccessor.h" -#include "Player.h" #include "Pet.h" -#include "ScriptMgr.h" +#include "Player.h" +#include "RBAC.h" #include "World.h" #include <boost/thread/shared_mutex.hpp> #include <boost/thread/locks.hpp> diff --git a/src/server/scripts/Commands/cs_scene.cpp b/src/server/scripts/Commands/cs_scene.cpp index a86f94bcf29..b37b09a16b3 100644 --- a/src/server/scripts/Commands/cs_scene.cpp +++ b/src/server/scripts/Commands/cs_scene.cpp @@ -18,8 +18,9 @@ #include "ScriptMgr.h" #include "Chat.h" #include "Language.h" -#include "Player.h" #include "ObjectMgr.h" +#include "Player.h" +#include "RBAC.h" class scene_commandscript : public CommandScript { diff --git a/src/server/scripts/Commands/cs_send.cpp b/src/server/scripts/Commands/cs_send.cpp index 724a1ef7567..37777da1af0 100644 --- a/src/server/scripts/Commands/cs_send.cpp +++ b/src/server/scripts/Commands/cs_send.cpp @@ -15,13 +15,14 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ +#include "ScriptMgr.h" #include "Chat.h" #include "DatabaseEnv.h" #include "Language.h" +#include "ObjectMgr.h" #include "Pet.h" #include "Player.h" -#include "ObjectMgr.h" -#include "ScriptMgr.h" +#include "RBAC.h" class send_commandscript : public CommandScript { diff --git a/src/server/scripts/Commands/cs_server.cpp b/src/server/scripts/Commands/cs_server.cpp index d02e3da9208..7f108bb2994 100644 --- a/src/server/scripts/Commands/cs_server.cpp +++ b/src/server/scripts/Commands/cs_server.cpp @@ -22,6 +22,7 @@ Comment: All server related commands Category: commandscripts EndScriptData */ +#include "ScriptMgr.h" #include "Chat.h" #include "Config.h" #include "GitRevision.h" @@ -29,7 +30,7 @@ EndScriptData */ #include "Log.h" #include "ObjectAccessor.h" #include "Player.h" -#include "ScriptMgr.h" +#include "RBAC.h" #include "Util.h" #include "World.h" diff --git a/src/server/scripts/Commands/cs_tele.cpp b/src/server/scripts/Commands/cs_tele.cpp index c910b942bbf..4dcb8ed1d97 100644 --- a/src/server/scripts/Commands/cs_tele.cpp +++ b/src/server/scripts/Commands/cs_tele.cpp @@ -22,6 +22,7 @@ Comment: All tele related commands Category: commandscripts EndScriptData */ +#include "ScriptMgr.h" #include "Chat.h" #include "DatabaseEnv.h" #include "Group.h" @@ -29,7 +30,7 @@ EndScriptData */ #include "MapManager.h" #include "ObjectMgr.h" #include "Player.h" -#include "ScriptMgr.h" +#include "RBAC.h" class tele_commandscript : public CommandScript { diff --git a/src/server/scripts/Commands/cs_titles.cpp b/src/server/scripts/Commands/cs_titles.cpp index 299a7c78e42..bb7f27d4ad9 100644 --- a/src/server/scripts/Commands/cs_titles.cpp +++ b/src/server/scripts/Commands/cs_titles.cpp @@ -22,11 +22,12 @@ Comment: All titles related commands Category: commandscripts EndScriptData */ +#include "ScriptMgr.h" #include "Chat.h" #include "Language.h" #include "ObjectMgr.h" #include "Player.h" -#include "ScriptMgr.h" +#include "RBAC.h" class titles_commandscript : public CommandScript { diff --git a/src/server/scripts/Commands/cs_wp.cpp b/src/server/scripts/Commands/cs_wp.cpp index 620b68950a4..ab62af74479 100644 --- a/src/server/scripts/Commands/cs_wp.cpp +++ b/src/server/scripts/Commands/cs_wp.cpp @@ -22,12 +22,13 @@ Comment: All wp related commands Category: commandscripts EndScriptData */ +#include "ScriptMgr.h" #include "Chat.h" #include "DatabaseEnv.h" #include "Language.h" #include "ObjectMgr.h" #include "Player.h" -#include "ScriptMgr.h" +#include "RBAC.h" #include "WaypointManager.h" class wp_commandscript : public CommandScript |