aboutsummaryrefslogtreecommitdiff
path: root/src/server/collision/Management/VMapManager2.cpp
diff options
context:
space:
mode:
authorSubv <s.v.h21@hotmail.com>2012-02-14 18:19:40 -0500
committerSubv <s.v.h21@hotmail.com>2012-02-14 18:19:40 -0500
commitc53d722aa29ff3a39d881de7d6ef86b79deffe48 (patch)
tree5e2fb4388553ad768b718542218df4ca8a8d44d5 /src/server/collision/Management/VMapManager2.cpp
parent7d30b061f0bb4b7227b16c9fd97ddd5483d2357a (diff)
Core/Collision: Models with flag MOD_M2 (mostly trees, among some other objects) should not be taken into account for LoS checks, this check does not apply to gameobjects (yet)
closes #3495 Signed-off-by: Subv <s.v.h21@hotmail.com>
Diffstat (limited to 'src/server/collision/Management/VMapManager2.cpp')
-rw-r--r--src/server/collision/Management/VMapManager2.cpp3
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);
}