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/ModelInstance.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/common/Collision/Models/ModelInstance.h') diff --git a/src/common/Collision/Models/ModelInstance.h b/src/common/Collision/Models/ModelInstance.h index 91ce194ddf1..3036ac10117 100644 --- a/src/common/Collision/Models/ModelInstance.h +++ b/src/common/Collision/Models/ModelInstance.h @@ -31,6 +31,7 @@ namespace VMAP class WorldModel; struct AreaInfo; struct LocationInfo; + enum class ModelIgnoreFlags : uint32; enum ModelFlags { @@ -66,7 +67,7 @@ namespace VMAP ModelInstance(): iInvScale(0.0f), iModel(nullptr) { } ModelInstance(const ModelSpawn &spawn, WorldModel* model); void setUnloaded() { iModel = nullptr; } - bool intersectRay(const G3D::Ray& pRay, float& pMaxDist, bool pStopAtFirstHit) const; + bool intersectRay(const G3D::Ray& pRay, float& pMaxDist, bool pStopAtFirstHit, ModelIgnoreFlags ignoreFlags) const; void intersectPoint(const G3D::Vector3& p, AreaInfo &info) const; bool GetLocationInfo(const G3D::Vector3& p, LocationInfo &info) const; bool GetLiquidLevel(const G3D::Vector3& p, LocationInfo &info, float &liqHeight) const; -- cgit v1.2.3