diff options
| author | Naios <naios-dev@live.de> | 2016-03-11 19:41:10 +0100 |
|---|---|---|
| committer | Naios <naios-dev@live.de> | 2016-03-11 20:03:12 +0100 |
| commit | b7f936891aeb86eeb4eb67caa78e672858aa1e20 (patch) | |
| tree | 9a436108fc01da66aaa90ae062bd3d56fc0c37d0 /src/server/game/Globals/ObjectMgr.cpp | |
| parent | 3a4ec8bcbee91e2ad03d4f9e421f45df14b1acac (diff) | |
Core/Game: Move singleton instances into compilation units
* Fixes issues when building shared libraries
(prevents gcc and clang from providing several instance)
(cherry picked from commit 329225b40d110bed634f8cd0a1ab5c6dc7bbbdd1)
Diffstat (limited to 'src/server/game/Globals/ObjectMgr.cpp')
| -rw-r--r-- | src/server/game/Globals/ObjectMgr.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index f45634e9684..cbb1e03d77c 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -235,6 +235,12 @@ ObjectMgr::ObjectMgr(): } } +ObjectMgr* ObjectMgr::instance() +{ + static ObjectMgr instance; + return &instance; +} + ObjectMgr::~ObjectMgr() { for (QuestMap::iterator i = _questTemplates.begin(); i != _questTemplates.end(); ++i) |