diff options
| author | HelloKitty <andrew.blakely@ymail.com> | 2017-01-21 14:44:31 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2018-12-09 14:18:42 +0100 |
| commit | 46c69df3a7cd3f863a7a3cca59a136a0a5cdec9d (patch) | |
| tree | 4c7c6df7b9ca316c3086478b5a69127d4a64a769 /src/common/Collision/Models/GameObjectModel.cpp | |
| parent | da3783876b141f716d5daf09f9d69d8248a8382a (diff) | |
Core/Vmaps: Stop M2s from occluding for spellcast LoS
Closes #18528
(cherry-picked from 01d715eaef99e91f0959dc85fb7f69eb26d01a22)
Diffstat (limited to 'src/common/Collision/Models/GameObjectModel.cpp')
| -rw-r--r-- | src/common/Collision/Models/GameObjectModel.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/common/Collision/Models/GameObjectModel.cpp b/src/common/Collision/Models/GameObjectModel.cpp index 07c1ffe548c..8e4ba0a9679 100644 --- a/src/common/Collision/Models/GameObjectModel.cpp +++ b/src/common/Collision/Models/GameObjectModel.cpp @@ -161,7 +161,7 @@ GameObjectModel* GameObjectModel::Create(std::unique_ptr<GameObjectModelOwnerBas return mdl; } -bool GameObjectModel::intersectRay(G3D::Ray const& ray, float& maxDist, bool stopAtFirstHit, PhaseShift const& phaseShift) const +bool GameObjectModel::intersectRay(G3D::Ray const& ray, float& maxDist, bool stopAtFirstHit, PhaseShift const& phaseShift, VMAP::ModelIgnoreFlags ignoreFlags) const { if (!isCollisionEnabled() || !owner->IsSpawned()) return false; @@ -177,7 +177,7 @@ bool GameObjectModel::intersectRay(G3D::Ray const& ray, float& maxDist, bool sto Vector3 p = iInvRot * (ray.origin() - iPos) * iInvScale; Ray modRay(p, iInvRot * ray.direction()); float distance = maxDist * iInvScale; - bool hit = iModel->IntersectRay(modRay, distance, stopAtFirstHit); + bool hit = iModel->IntersectRay(modRay, distance, stopAtFirstHit, ignoreFlags); if (hit) { distance *= iScale; |