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/Texts | |
| 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/Texts')
| -rw-r--r-- | src/server/game/Texts/CreatureTextMgr.cpp | 6 | ||||
| -rw-r--r-- | src/server/game/Texts/CreatureTextMgr.h | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/server/game/Texts/CreatureTextMgr.cpp b/src/server/game/Texts/CreatureTextMgr.cpp index 499f0c9cbf0..d8df3310765 100644 --- a/src/server/game/Texts/CreatureTextMgr.cpp +++ b/src/server/game/Texts/CreatureTextMgr.cpp @@ -72,6 +72,12 @@ class PlayerTextBuilder WorldObject const* _target; }; +CreatureTextMgr* CreatureTextMgr::instance() +{ + static CreatureTextMgr instance; + return &instance; +} + void CreatureTextMgr::LoadCreatureTexts() { uint32 oldMSTime = getMSTime(); diff --git a/src/server/game/Texts/CreatureTextMgr.h b/src/server/game/Texts/CreatureTextMgr.h index 28fd98f21a8..e364eb6eefa 100644 --- a/src/server/game/Texts/CreatureTextMgr.h +++ b/src/server/game/Texts/CreatureTextMgr.h @@ -82,11 +82,7 @@ class CreatureTextMgr ~CreatureTextMgr() { } public: - static CreatureTextMgr* instance() - { - static CreatureTextMgr instance; - return &instance; - } + static CreatureTextMgr* instance(); void LoadCreatureTexts(); void LoadCreatureTextLocales(); |
