From 45ee989c70682c001d4467d97bf1ecedcf7dbcc3 Mon Sep 17 00:00:00 2001 From: Shauren Date: Thu, 7 Mar 2024 00:23:52 +0100 Subject: Core/vmaps: Removed vmap lookup functions duplicating functionality of each other --- src/common/Collision/DynamicTree.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/common/Collision/DynamicTree.h') diff --git a/src/common/Collision/DynamicTree.h b/src/common/Collision/DynamicTree.h index 9b64c00d09b..50dc3d92993 100644 --- a/src/common/Collision/DynamicTree.h +++ b/src/common/Collision/DynamicTree.h @@ -19,6 +19,7 @@ #define _DYNTREE_H #include "Define.h" +#include "Optional.h" namespace G3D { @@ -49,8 +50,7 @@ public: bool getObjectHitPos(G3D::Vector3 const& startPos, G3D::Vector3 const& endPos, G3D::Vector3& resultHitPos, float modifyDist, PhaseShift const& phaseShift) const; float getHeight(float x, float y, float z, float maxSearchDist, PhaseShift const& phaseShift) const; - bool getAreaInfo(float x, float y, float& z, PhaseShift const& phaseShift, uint32& flags, int32& adtId, int32& rootId, int32& groupId) const; - void getAreaAndLiquidData(float x, float y, float z, PhaseShift const& phaseShift, uint8 reqLiquidType, VMAP::AreaAndLiquidData& data) const; + bool getAreaAndLiquidData(float x, float y, float z, PhaseShift const& phaseShift, Optional reqLiquidType, VMAP::AreaAndLiquidData& data) const; void insert(GameObjectModel const&); void remove(GameObjectModel const&); -- cgit v1.2.3