From 01d715eaef99e91f0959dc85fb7f69eb26d01a22 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 --- 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 a9fce400146..c121e421e6d 100644 --- a/src/common/Collision/Models/GameObjectModel.h +++ b/src/common/Collision/Models/GameObjectModel.h @@ -30,6 +30,7 @@ namespace VMAP { class WorldModel; + enum class ModelIgnoreFlags : uint32; } class GameObject; @@ -65,7 +66,7 @@ public: bool isEnabled() const {return phasemask != 0;} - bool intersectRay(const G3D::Ray& Ray, float& MaxDist, bool StopAtFirstHit, uint32 ph_mask) const; + bool intersectRay(const G3D::Ray& Ray, float& MaxDist, bool StopAtFirstHit, uint32 ph_mask, VMAP::ModelIgnoreFlags ignoreFlags) const; static GameObjectModel* Create(std::unique_ptr modelOwner, std::string const& dataPath); -- cgit v1.2.3