aboutsummaryrefslogtreecommitdiff
path: root/src/common/Collision/Models/ModelInstance.cpp
diff options
context:
space:
mode:
authorHelloKitty <andrew.blakely@ymail.com>2017-01-21 14:44:31 +0100
committerShauren <shauren.trinity@gmail.com>2017-01-21 14:44:31 +0100
commit01d715eaef99e91f0959dc85fb7f69eb26d01a22 (patch)
tree8c1c805c9eca9a0da828b4ddbf566cca4d464e84 /src/common/Collision/Models/ModelInstance.cpp
parent998efa55d8c81b923bb0725b5de8b0c5894b89da (diff)
Core/Vmaps: Stop M2s from occluding for spellcast LoS
Closes #18528
Diffstat (limited to 'src/common/Collision/Models/ModelInstance.cpp')
-rw-r--r--src/common/Collision/Models/ModelInstance.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/common/Collision/Models/ModelInstance.cpp b/src/common/Collision/Models/ModelInstance.cpp
index b38f455e546..3390b233c82 100644
--- a/src/common/Collision/Models/ModelInstance.cpp
+++ b/src/common/Collision/Models/ModelInstance.cpp
@@ -31,7 +31,7 @@ namespace VMAP
iInvScale = 1.f/iScale;
}
- bool ModelInstance::intersectRay(const G3D::Ray& pRay, float& pMaxDist, bool pStopAtFirstHit) const
+ bool ModelInstance::intersectRay(const G3D::Ray& pRay, float& pMaxDist, bool pStopAtFirstHit, ModelIgnoreFlags ignoreFlags) const
{
if (!iModel)
{
@@ -55,7 +55,7 @@ namespace VMAP
Vector3 p = iInvRot * (pRay.origin() - iPos) * iInvScale;
Ray modRay(p, iInvRot * pRay.direction());
float distance = pMaxDist * iInvScale;
- bool hit = iModel->IntersectRay(modRay, distance, pStopAtFirstHit);
+ bool hit = iModel->IntersectRay(modRay, distance, pStopAtFirstHit, ignoreFlags);
if (hit)
{
distance *= iScale;