From 329225b40d110bed634f8cd0a1ab5c6dc7bbbdd1 Mon Sep 17 00:00:00 2001 From: Naios Date: Fri, 11 Mar 2016 17:11:05 +0100 Subject: Core/Game: Move singleton instances into compilation units * Fixes issues when building shared libraries (prevents gcc and clang from providing several instance) --- src/server/game/Scripting/ScriptMgr.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/server/game/Scripting/ScriptMgr.cpp') diff --git a/src/server/game/Scripting/ScriptMgr.cpp b/src/server/game/Scripting/ScriptMgr.cpp index 38ca4911a21..5502dbfc686 100644 --- a/src/server/game/Scripting/ScriptMgr.cpp +++ b/src/server/game/Scripting/ScriptMgr.cpp @@ -246,6 +246,12 @@ ScriptMgr::ScriptMgr() : _scriptCount(0), _scheduledScripts(0) ScriptMgr::~ScriptMgr() { } +ScriptMgr* ScriptMgr::instance() +{ + static ScriptMgr instance; + return &instance; +} + void ScriptMgr::Initialize() { uint32 oldMSTime = getMSTime(); -- cgit v1.2.3