From 0468c70dfe91794ad272594323dd7feb611d0a93 Mon Sep 17 00:00:00 2001 From: Shauren Date: Wed, 28 Mar 2018 22:01:22 +0200 Subject: Core/Maps: Implemented getting area id from gameobject spawns Yes, you can now spawn LK platform anywhere and it will treat you as inside Icecrown Citadel (cherry picked from commit 42f9deb21ec68e169f7ed1c8cf14092f144b22da) --- src/common/Collision/DynamicTree.h | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src/common/Collision/DynamicTree.h') diff --git a/src/common/Collision/DynamicTree.h b/src/common/Collision/DynamicTree.h index 8f2729cb76a..a890f828b96 100644 --- a/src/common/Collision/DynamicTree.h +++ b/src/common/Collision/DynamicTree.h @@ -30,6 +30,11 @@ namespace G3D class GameObjectModel; struct DynTreeImpl; +namespace VMAP +{ + struct AreaAndLiquidData; +} + class TC_COMMON_API DynamicMapTree { DynTreeImpl *impl; @@ -44,6 +49,8 @@ public: bool getIntersectionTime(uint32 phasemask, const G3D::Ray& ray, const G3D::Vector3& endPos, float& maxDist) const; + bool getAreaInfo(float x, float y, float& z, uint32 phasemask, uint32& flags, int32& adtId, int32& rootId, int32& groupId) const; + void getAreaAndLiquidData(float x, float y, float z, uint32 phasemask, uint8 reqLiquidType, VMAP::AreaAndLiquidData& data) const; bool getObjectHitPos(uint32 phasemask, const G3D::Vector3& pPos1, const G3D::Vector3& pPos2, G3D::Vector3& pResultHitPos, -- cgit v1.2.3