diff options
author | Subv <s.v.h21@hotmail.com> | 2012-03-04 08:23:19 -0500 |
---|---|---|
committer | Subv <s.v.h21@hotmail.com> | 2012-03-04 08:23:19 -0500 |
commit | 4029c2354739a42388b9d3cb4a1f3cdf6a3bff86 (patch) | |
tree | f3ad478ba72f6ec425c362a0c95ca367fe4e7555 /src/server/collision/Management/VMapManager2.cpp | |
parent | c443b03010a1edecaa67f1a91a332a587bc7351c (diff) |
Core/Collisions: Reverted a commit about M2 models.
closes #5312 and probably others
Diffstat (limited to 'src/server/collision/Management/VMapManager2.cpp')
-rw-r--r-- | src/server/collision/Management/VMapManager2.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/server/collision/Management/VMapManager2.cpp b/src/server/collision/Management/VMapManager2.cpp index 81b97f5f352..62abc31831a 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, uint32 flags/* Only used when creating the model */) + WorldModel* VMapManager2::acquireModelInstance(const std::string& basepath, const std::string& filename) { //! Critical section, thread safe access to iLoadedModelFiles TRINITY_GUARD(ACE_Thread_Mutex, LoadedModelFilesLock); @@ -261,7 +261,6 @@ 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); } |