diff options
| author | Naios <naios-dev@live.de> | 2016-03-16 15:34:25 +0100 |
|---|---|---|
| committer | Naios <naios-dev@live.de> | 2016-03-19 23:19:54 +0100 |
| commit | 28d8f7f70dcf01b5c849f30846c6b86a11dea7e7 (patch) | |
| tree | 34ad6f626603ef4533a7b7b49d3c7c9987ef729f /src/server/game/Scripting/ScriptMgr.cpp | |
| parent | 5fe83abbe57c9c640bbfc506f0e879c2ae4f81a9 (diff) | |
CMake: Use inherited dependencies in scripts
* Removes the circular dependency between game <-> scripts
(cherry picked from commit 96bc31924a5a418d37bd961ef2880f9072126348)
Diffstat (limited to 'src/server/game/Scripting/ScriptMgr.cpp')
| -rw-r--r-- | src/server/game/Scripting/ScriptMgr.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/server/game/Scripting/ScriptMgr.cpp b/src/server/game/Scripting/ScriptMgr.cpp index 7e2146b4751..2184899de02 100644 --- a/src/server/game/Scripting/ScriptMgr.cpp +++ b/src/server/game/Scripting/ScriptMgr.cpp @@ -22,10 +22,10 @@ #include "DBCStores.h" #include "ObjectMgr.h" #include "OutdoorPvPMgr.h" -#include "ScriptLoader.h" #include "ScriptSystem.h" #include "Transport.h" #include "Vehicle.h" +#include "SmartAI.h" #include "SpellInfo.h" #include "SpellScript.h" #include "GossipDef.h" @@ -240,7 +240,8 @@ struct TSpellSummary uint8 Effects; // set of enum SelectEffect } *SpellSummary; -ScriptMgr::ScriptMgr() : _scriptCount(0), _scheduledScripts(0) +ScriptMgr::ScriptMgr() + : _scriptCount(0), _scheduledScripts(0), _script_loader_callback(nullptr) { } @@ -261,7 +262,13 @@ void ScriptMgr::Initialize() TC_LOG_INFO("server.loading", "Loading C++ scripts"); FillSpellSummary(); - AddScripts(); + + AddSC_SmartScripts(); + + ASSERT(_script_loader_callback, + "Script loader callback wasn't registered!"); + + _script_loader_callback(); #ifdef SCRIPTS for (std::string const& scriptName : UnusedScriptNames) |