diff options
author | Shauren <shauren.trinity@gmail.com> | 2024-02-13 23:49:51 +0100 |
---|---|---|
committer | Shauren <shauren.trinity@gmail.com> | 2024-02-13 23:49:51 +0100 |
commit | 16f555f79ef2fdebd18204bc90383ad7761343a5 (patch) | |
tree | d1928466a7aa06ee093d6ac8d6190f88be484fb0 /src/common/Collision/Management/MMapManager.h | |
parent | ca1560f043df275d9241055adbf61a393666a533 (diff) |
Core/MMAPs: Sprinkle master branch thread safety on mmap loading code
Diffstat (limited to 'src/common/Collision/Management/MMapManager.h')
-rw-r--r-- | src/common/Collision/Management/MMapManager.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/common/Collision/Management/MMapManager.h b/src/common/Collision/Management/MMapManager.h index bb787604ec0..29b9f69ffb0 100644 --- a/src/common/Collision/Management/MMapManager.h +++ b/src/common/Collision/Management/MMapManager.h @@ -62,7 +62,8 @@ namespace MMAP ~MMapManager(); void InitializeThreadUnsafe(const std::vector<uint32>& mapIds); - bool loadMap(const std::string& basePath, uint32 mapId, int32 x, int32 y); + bool loadMap(std::string const& basePath, uint32 mapId, int32 x, int32 y); + bool loadMapInstance(std::string const& basePath, uint32 mapId, uint32 instanceId); bool unloadMap(uint32 mapId, int32 x, int32 y); bool unloadMap(uint32 mapId); bool unloadMapInstance(uint32 mapId, uint32 instanceId); @@ -74,7 +75,7 @@ namespace MMAP uint32 getLoadedTilesCount() const { return loadedTiles; } uint32 getLoadedMapsCount() const { return uint32(loadedMMaps.size()); } private: - bool loadMapData(uint32 mapId); + bool loadMapData(std::string const& basePath, uint32 mapId); uint32 packTileID(int32 x, int32 y); MMapDataSet::const_iterator GetMMapData(uint32 mapId) const; |