diff options
| author | Naios <naios-dev@live.de> | 2016-03-11 17:11:05 +0100 |
|---|---|---|
| committer | Naios <naios-dev@live.de> | 2016-03-11 18:35:49 +0100 |
| commit | 329225b40d110bed634f8cd0a1ab5c6dc7bbbdd1 (patch) | |
| tree | 5cf3f149429e6821660cdc9c04ef3210ac374e4b /src/server/game/Events | |
| parent | a8fe7f6eb7195368bbb4d0256927405f5e5c6f87 (diff) | |
Core/Game: Move singleton instances into compilation units
* Fixes issues when building shared libraries
(prevents gcc and clang from providing several instance)
Diffstat (limited to 'src/server/game/Events')
| -rw-r--r-- | src/server/game/Events/GameEventMgr.cpp | 6 | ||||
| -rw-r--r-- | src/server/game/Events/GameEventMgr.h | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/server/game/Events/GameEventMgr.cpp b/src/server/game/Events/GameEventMgr.cpp index 89d2a53c071..879e5032b73 100644 --- a/src/server/game/Events/GameEventMgr.cpp +++ b/src/server/game/Events/GameEventMgr.cpp @@ -29,6 +29,12 @@ #include "GameObjectAI.h" #include "WorldStatePackets.h" +GameEventMgr* GameEventMgr::instance() +{ + static GameEventMgr instance; + return &instance; +} + bool GameEventMgr::CheckOneGameEvent(uint16 entry) const { switch (mGameEvent[entry].state) diff --git a/src/server/game/Events/GameEventMgr.h b/src/server/game/Events/GameEventMgr.h index aaff9c3700f..a01d361fc68 100644 --- a/src/server/game/Events/GameEventMgr.h +++ b/src/server/game/Events/GameEventMgr.h @@ -101,11 +101,7 @@ class GameEventMgr ~GameEventMgr() { } public: - static GameEventMgr* instance() - { - static GameEventMgr instance; - return &instance; - } + static GameEventMgr* instance(); typedef std::set<uint16> ActiveEvents; typedef std::vector<GameEventData> GameEventDataMap; |
