diff options
| author | UltraNix <80540499+UltraNix@users.noreply.github.com> | 2022-04-10 14:24:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-10 09:24:35 -0300 |
| commit | 47790c971401c33bbe618cc4aa6302c5f715f86b (patch) | |
| tree | c7670d1271582201b845cb174a63bb7856566793 /src/common/Collision/Models/ModelInstance.cpp | |
| parent | 6efc08f42e8ae731776517b187a79ba2ad546ec7 (diff) | |
fix(Core/Vmaps): Stop M2s from occluding for spellcast LoS. Original autho… (#11341)
* Core/Vmaps: Stop M2s from occluding for spellcast LoS. Original authors: @Shauren & @HelloKitty
Fixes #11293
* buildfix.
Co-Authored-By: HelloKitty <5829095+HelloKitty@users.noreply.github.com>
Diffstat (limited to 'src/common/Collision/Models/ModelInstance.cpp')
| -rw-r--r-- | src/common/Collision/Models/ModelInstance.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/common/Collision/Models/ModelInstance.cpp b/src/common/Collision/Models/ModelInstance.cpp index 4634b006c7..4510461bdd 100644 --- a/src/common/Collision/Models/ModelInstance.cpp +++ b/src/common/Collision/Models/ModelInstance.cpp @@ -30,7 +30,7 @@ namespace VMAP iInvScale = 1.f / iScale; } - bool ModelInstance::intersectRay(const G3D::Ray& pRay, float& pMaxDist, bool StopAtFirstHit) const + bool ModelInstance::intersectRay(const G3D::Ray& pRay, float& pMaxDist, bool StopAtFirstHit, ModelIgnoreFlags ignoreFlags) const { if (!iModel) { @@ -54,7 +54,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, StopAtFirstHit); + bool hit = iModel->IntersectRay(modRay, distance, StopAtFirstHit, ignoreFlags); if (hit) { distance *= iScale; |