aboutsummaryrefslogtreecommitdiff
path: root/src/server/worldserver/Main.cpp
diff options
context:
space:
mode:
authorNaios <naios-dev@live.de>2016-03-16 15:34:25 +0100
committerNaios <naios-dev@live.de>2016-03-19 23:19:54 +0100
commit28d8f7f70dcf01b5c849f30846c6b86a11dea7e7 (patch)
tree34ad6f626603ef4533a7b7b49d3c7c9987ef729f /src/server/worldserver/Main.cpp
parent5fe83abbe57c9c640bbfc506f0e879c2ae4f81a9 (diff)
CMake: Use inherited dependencies in scripts
* Removes the circular dependency between game <-> scripts (cherry picked from commit 96bc31924a5a418d37bd961ef2880f9072126348)
Diffstat (limited to 'src/server/worldserver/Main.cpp')
-rw-r--r--src/server/worldserver/Main.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/server/worldserver/Main.cpp b/src/server/worldserver/Main.cpp
index b26027e8960..5b94521817f 100644
--- a/src/server/worldserver/Main.cpp
+++ b/src/server/worldserver/Main.cpp
@@ -35,6 +35,7 @@
#include "InstanceSaveMgr.h"
#include "ObjectAccessor.h"
#include "ScriptMgr.h"
+#include "ScriptLoader.h"
#include "OutdoorPvP/OutdoorPvPMgr.h"
#include "BattlegroundMgr.h"
#include "TCSoap.h"
@@ -193,6 +194,7 @@ extern int main(int argc, char** argv)
LoadRealmInfo();
// Initialize the World
+ sScriptMgr->SetScriptLoader(AddScripts);
sWorld->SetInitialWorldSettings();
// Launch CliRunnable thread