aboutsummaryrefslogtreecommitdiff
path: root/src/common/Collision
diff options
context:
space:
mode:
Diffstat (limited to 'src/common/Collision')
-rw-r--r--src/common/Collision/Management/MMapManager.cpp1
-rw-r--r--src/common/Collision/Management/VMapManager2.cpp7
-rw-r--r--src/common/Collision/Management/VMapManager2.h1
3 files changed, 9 insertions, 0 deletions
diff --git a/src/common/Collision/Management/MMapManager.cpp b/src/common/Collision/Management/MMapManager.cpp
index 8c926d79a6e..c10d64bfd36 100644
--- a/src/common/Collision/Management/MMapManager.cpp
+++ b/src/common/Collision/Management/MMapManager.cpp
@@ -21,6 +21,7 @@
#include "Log.h"
#include "MMapDefines.h"
#include "Memory.h"
+#include <algorithm>
namespace MMAP
{
diff --git a/src/common/Collision/Management/VMapManager2.cpp b/src/common/Collision/Management/VMapManager2.cpp
index 93a1f7e4995..481b1cdb0ea 100644
--- a/src/common/Collision/Management/VMapManager2.cpp
+++ b/src/common/Collision/Management/VMapManager2.cpp
@@ -88,6 +88,13 @@ namespace VMAP
thread_safe_environment = false;
}
+ void VMapManager2::InitializeThreadUnsafe(uint32 mapId, int32 parentMapId)
+ {
+ iInstanceMapTrees[mapId] = nullptr;
+ if (parentMapId >= 0)
+ iParentMapData[mapId] = parentMapId;
+ }
+
Vector3 VMapManager2::convertPositionToInternalRep(float x, float y, float z) const
{
Vector3 pos;
diff --git a/src/common/Collision/Management/VMapManager2.h b/src/common/Collision/Management/VMapManager2.h
index 5abe003056c..8fbc9b05ed1 100644
--- a/src/common/Collision/Management/VMapManager2.h
+++ b/src/common/Collision/Management/VMapManager2.h
@@ -84,6 +84,7 @@ namespace VMAP
~VMapManager2();
void InitializeThreadUnsafe(std::unordered_map<uint32, std::vector<uint32>> const& mapData);
+ void InitializeThreadUnsafe(uint32 mapId, int32 parentMapId);
LoadResult loadMap(char const* pBasePath, unsigned int mapId, int x, int y) override;