diff options
| author | Shauren <shauren.trinity@gmail.com> | 2024-07-17 00:21:03 +0200 |
|---|---|---|
| committer | Ovahlord <dreadkiller@gmx.de> | 2024-07-18 22:37:10 +0200 |
| commit | d7a26b3897f30cb65ac49f74bfb29677def01057 (patch) | |
| tree | ddbf120a9a1ff9bbd6a0900152a8ca09ff4c5b4f /src/common/Collision/Models/GameObjectModel.cpp | |
| parent | e0adab82f8a64c9ab4ecf7377d606c7ab917130a (diff) | |
Core/GameObject: Implemented NotLOSBlocking door property
(cherry picked from commit 2756ca1c350a7545e3a9e848e9b4db9b904f3a14)
Diffstat (limited to 'src/common/Collision/Models/GameObjectModel.cpp')
| -rw-r--r-- | src/common/Collision/Models/GameObjectModel.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/common/Collision/Models/GameObjectModel.cpp b/src/common/Collision/Models/GameObjectModel.cpp index 24e9489326e..b32a5bdd44f 100644 --- a/src/common/Collision/Models/GameObjectModel.cpp +++ b/src/common/Collision/Models/GameObjectModel.cpp @@ -152,14 +152,14 @@ GameObjectModel* GameObjectModel::Create(std::unique_ptr<GameObjectModelOwnerBas return mdl; } -bool GameObjectModel::isMapObject() const +bool GameObjectModel::IsMapObject() const { return !iModel->IsM2(); } -bool GameObjectModel::intersectRay(G3D::Ray const& ray, float& maxDist, bool stopAtFirstHit, PhaseShift const& phaseShift, VMAP::ModelIgnoreFlags ignoreFlags) const +bool GameObjectModel::IntersectRay(G3D::Ray const& ray, float& maxDist, bool stopAtFirstHit, PhaseShift const& phaseShift, VMAP::ModelIgnoreFlags ignoreFlags) const { - if (!isCollisionEnabled() || !owner->IsSpawned()) + if (!IsCollisionEnabled() || !owner->IsSpawned()) return false; if (!owner->IsInPhase(phaseShift)) @@ -184,7 +184,7 @@ bool GameObjectModel::intersectRay(G3D::Ray const& ray, float& maxDist, bool sto bool GameObjectModel::GetLocationInfo(G3D::Vector3 const& point, VMAP::LocationInfo& info, PhaseShift const& phaseShift) const { - if (!isCollisionEnabled() || !owner->IsSpawned() || !isMapObject()) + if (!IsCollisionEnabled() || !owner->IsSpawned() || !IsMapObject()) return false; if (!owner->IsInPhase(phaseShift)) |