diff options
author | Shauren <shauren.trinity@gmail.com> | 2024-03-06 00:04:19 +0100 |
---|---|---|
committer | Shauren <shauren.trinity@gmail.com> | 2024-03-06 00:04:19 +0100 |
commit | a70e758ba5eef1e8aa966cbabaee020630d2c872 (patch) | |
tree | f323c8ac0f4bb31d75c3570b838de066190983ba /src/common/Collision/Management/VMapManager2.cpp | |
parent | 382e76f02df5a41c2ba1d964ac6d9258e68265e6 (diff) |
Tools/vmap_extractor: Move information about model type from spawns in vmap tiles to model file itself
Diffstat (limited to 'src/common/Collision/Management/VMapManager2.cpp')
-rw-r--r-- | src/common/Collision/Management/VMapManager2.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/common/Collision/Management/VMapManager2.cpp b/src/common/Collision/Management/VMapManager2.cpp index 5ae50115486..78d5be2b79c 100644 --- a/src/common/Collision/Management/VMapManager2.cpp +++ b/src/common/Collision/Management/VMapManager2.cpp @@ -315,7 +315,7 @@ namespace VMAP } } - WorldModel* VMapManager2::acquireModelInstance(const std::string& basepath, const std::string& filename, uint32 flags/* Only used when creating the model */) + WorldModel* VMapManager2::acquireModelInstance(std::string const& basepath, std::string const& filename) { //! Critical section, thread safe access to iLoadedModelFiles std::lock_guard<std::mutex> lock(LoadedModelFilesLock); @@ -333,7 +333,6 @@ namespace VMAP TC_LOG_DEBUG("maps", "VMapManager2: loading file '{}{}'", basepath, filename); worldmodel->getModel()->SetName(filename); - worldmodel->getModel()->Flags = flags; model = iLoadedModelFiles.insert(std::pair<std::string, ManagedModel*>(filename, worldmodel)).first; } @@ -341,7 +340,7 @@ namespace VMAP return model->second->getModel(); } - void VMapManager2::releaseModelInstance(const std::string &filename) + void VMapManager2::releaseModelInstance(std::string const& filename) { //! Critical section, thread safe access to iLoadedModelFiles std::lock_guard<std::mutex> lock(LoadedModelFilesLock); |