diff options
| author | Naios <naios-dev@live.de> | 2016-03-11 18:55:33 +0100 |
|---|---|---|
| committer | Naios <naios-dev@live.de> | 2016-03-11 18:55:33 +0100 |
| commit | 998607b1067c453df0d1ad1a450d72faab5fd922 (patch) | |
| tree | 2cbc52651395c451056605d4781d7e60e693512f /src/server | |
| parent | d1efa0b8b1a553b184f884ad757bcebc913f117b (diff) | |
Core/Common: Move singleton instances into compilation units
* Fixes issues when building shared libraries
(prevents gcc and clang from providing several instance)
(cherry picked from commit 5c91586797f199259567629a1d4d3f987c73e53c)
Diffstat (limited to 'src/server')
| -rw-r--r-- | src/server/game/World/World.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp index f67930a849f..8a29bfe78b0 100644 --- a/src/server/game/World/World.cpp +++ b/src/server/game/World/World.cpp @@ -38,6 +38,7 @@ #include "DatabaseEnv.h" #include "DisableMgr.h" #include "GameEventMgr.h" +#include "GameObjectModel.h" #include "GridNotifiersImpl.h" #include "GroupMgr.h" #include "GuildMgr.h" @@ -1305,8 +1306,6 @@ void World::LoadConfigSettings(bool reload) sScriptMgr->OnConfigLoad(reload); } -extern void LoadGameObjectModelList(std::string const& dataPath); - /// Initialize the World void World::SetInitialWorldSettings() { |