From 46c69df3a7cd3f863a7a3cca59a136a0a5cdec9d Mon Sep 17 00:00:00 2001 From: HelloKitty Date: Sat, 21 Jan 2017 14:44:31 +0100 Subject: Core/Vmaps: Stop M2s from occluding for spellcast LoS Closes #18528 (cherry-picked from 01d715eaef99e91f0959dc85fb7f69eb26d01a22) --- src/common/Collision/Models/GameObjectModel.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/common/Collision/Models/GameObjectModel.h') 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 modelOwner, std::string const& dataPath); -- cgit v1.2.3