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.h | |
| 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.h')
| -rw-r--r-- | src/common/Collision/Models/GameObjectModel.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/common/Collision/Models/GameObjectModel.h b/src/common/Collision/Models/GameObjectModel.h index 287f93f87ca..0ea8bbbbcfb 100644 --- a/src/common/Collision/Models/GameObjectModel.h +++ b/src/common/Collision/Models/GameObjectModel.h @@ -31,6 +31,7 @@ namespace VMAP { class WorldModel; struct AreaInfo; + enum class ModelIgnoreFlags : uint32; } class GameObject; @@ -69,7 +70,7 @@ public: bool isCollisionEnabled() const { return _collisionEnabled; } bool isMapObject() const { return isWmo; } - bool intersectRay(G3D::Ray const& ray, float& maxDist, bool stopAtFirstHit, PhaseShift const& phaseShift) const; + bool intersectRay(G3D::Ray const& ray, float& maxDist, bool stopAtFirstHit, PhaseShift const& phaseShift, VMAP::ModelIgnoreFlags ignoreFlags) const; void intersectPoint(G3D::Vector3 const& point, VMAP::AreaInfo& info, PhaseShift const& phaseShift) const; static GameObjectModel* Create(std::unique_ptr<GameObjectModelOwnerBase> modelOwner, std::string const& dataPath); |