diff options
author | Shauren <shauren.trinity@gmail.com> | 2017-05-18 23:52:58 +0200 |
---|---|---|
committer | Shauren <shauren.trinity@gmail.com> | 2017-05-18 23:53:25 +0200 |
commit | c5d3dd90bea3889ef5fcd33c9ef0d59d7c544f8a (patch) | |
tree | aa7fde6f924fc39da54908bd6eeeb0be422e5fc3 /src/server/game/Scripting/ScriptMgr.cpp | |
parent | 74456703146194de72424ec98c4ea76402077be6 (diff) |
Core/Game: Include cleanup
* Mostly aimed at removing Log/DatabaseEnv includes from other headers
* Fix most packet headers including other packet headers - moved common structures such as ItemInstance to their own files
* Moved SAI function definitions to source files (massive or requiring many different dependencies)
Diffstat (limited to 'src/server/game/Scripting/ScriptMgr.cpp')
-rw-r--r-- | src/server/game/Scripting/ScriptMgr.cpp | 45 |
1 files changed, 31 insertions, 14 deletions
diff --git a/src/server/game/Scripting/ScriptMgr.cpp b/src/server/game/Scripting/ScriptMgr.cpp index 8b9312c84f2..cf9cb50b3be 100644 --- a/src/server/game/Scripting/ScriptMgr.cpp +++ b/src/server/game/Scripting/ScriptMgr.cpp @@ -17,27 +17,34 @@ */ #include "ScriptMgr.h" -#include "ScriptReloadMgr.h" -#include "Config.h" -#include "DatabaseEnv.h" +#include "AreaTrigger.h" +#include "AreaTriggerAI.h" +#include "Chat.h" +#include "Creature.h" +#include "CreatureAI.h" +#include "CreatureAIImpl.h" +#include "Errors.h" +#include "GameObject.h" +#include "GossipDef.h" +#include "LFGScripts.h" +#include "Log.h" +#include "Map.h" +#include "MapManager.h" #include "ObjectMgr.h" #include "OutdoorPvPMgr.h" +#include "Player.h" +#include "ScriptReloadMgr.h" #include "ScriptSystem.h" -#include "Transport.h" -#include "Vehicle.h" #include "SmartAI.h" #include "SpellInfo.h" +#include "SpellMgr.h" #include "SpellScript.h" -#include "GossipDef.h" -#include "CreatureAIImpl.h" -#include "Player.h" +#include "Timer.h" +#include "Transport.h" +#include "Vehicle.h" +#include "Weather.h" #include "WorldPacket.h" -#include "WorldSession.h" -#include "Chat.h" -#include "MapManager.h" -#include "LFGScripts.h" -#include "InstanceScript.h" -#include "AreaTriggerAI.h" +#include <unordered_map> // Trait which indicates whether this script type // must be assigned in the database. @@ -2518,12 +2525,22 @@ CreatureScript::CreatureScript(const char* name) ScriptRegistry<CreatureScript>::Instance()->AddScript(this); } +uint32 CreatureScript::GetDialogStatus(Player* /*player*/, Creature* /*creature*/) +{ + return DIALOG_STATUS_SCRIPTED_NO_STATUS; +} + GameObjectScript::GameObjectScript(const char* name) : ScriptObject(name) { ScriptRegistry<GameObjectScript>::Instance()->AddScript(this); } +uint32 GameObjectScript::GetDialogStatus(Player* /*player*/, GameObject* /*go*/) +{ + return DIALOG_STATUS_SCRIPTED_NO_STATUS; +} + AreaTriggerScript::AreaTriggerScript(const char* name) : ScriptObject(name) { |