aboutsummaryrefslogtreecommitdiff
path: root/src/server
diff options
context:
space:
mode:
authorNaios <naios-dev@live.de>2016-03-11 15:50:17 +0100
committerNaios <naios-dev@live.de>2016-03-11 18:22:39 +0100
commit5c91586797f199259567629a1d4d3f987c73e53c (patch)
tree0b6a484caf9dfa75d88d14aeb78e9d82da8c87d0 /src/server
parentf123c396591ffb50fa7e02365235740df618f579 (diff)
Core/Common: 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')
-rw-r--r--src/server/game/World/World.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp
index d2ccb025165..f2668cb874a 100644
--- a/src/server/game/World/World.cpp
+++ b/src/server/game/World/World.cpp
@@ -43,6 +43,7 @@
#include "GridNotifiersImpl.h"
#include "GroupMgr.h"
#include "GuildFinderMgr.h"
+#include "GameObjectModel.h"
#include "InstanceSaveMgr.h"
#include "Language.h"
#include "LFGMgr.h"
@@ -1409,8 +1410,6 @@ void World::LoadConfigSettings(bool reload)
sScriptMgr->OnConfigLoad(reload);
}
-extern void LoadGameObjectModelList(std::string const& dataPath);
-
/// Initialize the World
void World::SetInitialWorldSettings()
{