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/GameObjectModel.h | |
| parent | 998efa55d8c81b923bb0725b5de8b0c5894b89da (diff) | |
Core/Vmaps: Stop M2s from occluding for spellcast LoS
Closes #18528
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 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<GameObjectModelOwnerBase> modelOwner, std::string const& dataPath); |