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/game/Scripting/ScriptMgr.h | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'src/server/game/Scripting/ScriptMgr.h') diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h index fc04b0c7b8b..79c1bc3f60f 100644 --- a/src/server/game/Scripting/ScriptMgr.h +++ b/src/server/game/Scripting/ScriptMgr.h @@ -863,6 +863,15 @@ class ScriptMgr void IncrementScriptCount() { ++_scriptCount; } uint32 GetScriptCount() const { return _scriptCount; } + typedef void(*ScriptLoaderCallbackType)(); + + /// Sets the script loader callback which is invoked to load scripts + /// (Workaround for circular dependency game <-> scripts) + void SetScriptLoader(ScriptLoaderCallbackType script_loader_callback) + { + _script_loader_callback = script_loader_callback; + } + public: /* Unloading */ void Unload(); @@ -1097,6 +1106,8 @@ class ScriptMgr //atomic op counter for active scripts amount std::atomic _scheduledScripts; + + ScriptLoaderCallbackType _script_loader_callback; }; #endif -- cgit v1.2.3