diff options
author | HelloKitty <andrew.blakely@ymail.com> | 2017-01-21 14:44:31 +0100 |
---|---|---|
committer | Shauren <shauren.trinity@gmail.com> | 2017-01-21 14:44:31 +0100 |
commit | 01d715eaef99e91f0959dc85fb7f69eb26d01a22 (patch) | |
tree | 8c1c805c9eca9a0da828b4ddbf566cca4d464e84 /src/common/Collision/Models/ModelInstance.h | |
parent | 998efa55d8c81b923bb0725b5de8b0c5894b89da (diff) |
Core/Vmaps: Stop M2s from occluding for spellcast LoS
Closes #18528
Diffstat (limited to 'src/common/Collision/Models/ModelInstance.h')
-rw-r--r-- | src/common/Collision/Models/ModelInstance.h | 3 |
1 files changed, 2 insertions, 1 deletions
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; |