From 28d8f7f70dcf01b5c849f30846c6b86a11dea7e7 Mon Sep 17 00:00:00 2001 From: Naios Date: Wed, 16 Mar 2016 15:34:25 +0100 Subject: CMake: Use inherited dependencies in scripts * Removes the circular dependency between game <-> scripts (cherry picked from commit 96bc31924a5a418d37bd961ef2880f9072126348) --- src/server/worldserver/Main.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/server/worldserver/Main.cpp') 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 -- cgit v1.2.3