diff options
author | Malcrom <malcromdev@gmail.com> | 2012-02-15 17:58:50 -0330 |
---|---|---|
committer | Malcrom <malcromdev@gmail.com> | 2012-02-15 17:58:50 -0330 |
commit | be5715bb60f4fb93d5b8082288ffcdd30649210d (patch) | |
tree | 3046fde9c9dd5f6dd2a1f30cc972202ce345483a /src/server/collision/Management/VMapManager2.cpp | |
parent | 4dd96f27656fd49e0023ddad22afe606b53ed2cb (diff) | |
parent | de706b321113817a5a290c1ef49cddf07a5d53bd (diff) |
Merge branch 'master' of git://github.com/TrinityCore/TrinityCore
Diffstat (limited to 'src/server/collision/Management/VMapManager2.cpp')
-rw-r--r-- | src/server/collision/Management/VMapManager2.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/server/collision/Management/VMapManager2.cpp b/src/server/collision/Management/VMapManager2.cpp index 62abc31831a..81b97f5f352 100644 --- a/src/server/collision/Management/VMapManager2.cpp +++ b/src/server/collision/Management/VMapManager2.cpp @@ -245,7 +245,7 @@ namespace VMAP return false; } - WorldModel* VMapManager2::acquireModelInstance(const std::string& basepath, const std::string& filename) + WorldModel* VMapManager2::acquireModelInstance(const std::string& basepath, const std::string& filename, uint32 flags/* Only used when creating the model */) { //! Critical section, thread safe access to iLoadedModelFiles TRINITY_GUARD(ACE_Thread_Mutex, LoadedModelFilesLock); @@ -261,6 +261,7 @@ namespace VMAP return NULL; } sLog->outDebug(LOG_FILTER_MAPS, "VMapManager2: loading file '%s%s'", basepath.c_str(), filename.c_str()); + worldmodel->Flags = flags; model = iLoadedModelFiles.insert(std::pair<std::string, ManagedModel>(filename, ManagedModel())).first; model->second.setModel(worldmodel); } |