diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-10-10 05:29:06 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-10-10 05:29:06 +0200 |
| commit | 63d7b348bb1c654ee72bbbb3f29c7a78ee462408 (patch) | |
| tree | 2f0499d553aeb9581c0d40668af9fc0872c9ed48 /src/server/game/World | |
| parent | 0fb9ba4f2848cf5a7e263e1b9d58cf101d063e85 (diff) | |
| parent | 67f9d916cbd920ee72b3e9036e13d0725b38566e (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Diffstat (limited to 'src/server/game/World')
| -rw-r--r-- | src/server/game/World/World.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp index a6195d81ce3..6adb93d4742 100644 --- a/src/server/game/World/World.cpp +++ b/src/server/game/World/World.cpp @@ -1325,6 +1325,13 @@ void World::SetInitialWorldSettings() ///- Initialize detour memory management dtAllocSetCustom(dtCustomAlloc, dtCustomFree); + ///- Initialize VMapManager function pointers (to untangle game/collision circular deps) + if (VMAP::VMapManager2* vmmgr2 = dynamic_cast<VMAP::VMapManager2*>(VMAP::VMapFactory::createOrGetVMapManager())) + { + vmmgr2->GetLiquidFlagsPtr = &GetLiquidFlags; + vmmgr2->IsVMAPDisabledForPtr = &DisableMgr::IsVMAPDisabledFor; + } + ///- Initialize config settings LoadConfigSettings(); |