From a70e758ba5eef1e8aa966cbabaee020630d2c872 Mon Sep 17 00:00:00 2001 From: Shauren Date: Wed, 6 Mar 2024 00:04:19 +0100 Subject: Tools/vmap_extractor: Move information about model type from spawns in vmap tiles to model file itself --- src/common/Collision/Management/VMapManager2.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/common/Collision/Management/VMapManager2.cpp') 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 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(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 lock(LoadedModelFilesLock); -- cgit v1.2.3