From d7a26b3897f30cb65ac49f74bfb29677def01057 Mon Sep 17 00:00:00 2001 From: Shauren Date: Wed, 17 Jul 2024 00:21:03 +0200 Subject: Core/GameObject: Implemented NotLOSBlocking door property (cherry picked from commit 2756ca1c350a7545e3a9e848e9b4db9b904f3a14) --- src/common/Collision/Models/GameObjectModel.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/common/Collision/Models/GameObjectModel.cpp') 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_ptrIsM2(); } -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)) -- cgit v1.2.3