aboutsummaryrefslogtreecommitdiff
path: root/src/common/Collision/Maps/MapTree.h
diff options
context:
space:
mode:
authorTreeston <treeston.mmoc@gmail.com>2017-06-08 00:25:06 +0200
committerCarbenium <carbenium@outlook.com>2020-07-16 22:00:24 +0200
commit51ce3b1c1dc6a53938ed6f240bac00681d18a44f (patch)
treecd6415f3c7a1dc12cc003a707b16fb0e1cd468eb /src/common/Collision/Maps/MapTree.h
parentf7a7d02a7f50400cdc2be3c4722afeefe7efce80 (diff)
[3.3.5] Get zone/area IDs from vmap data in the liquid update (#19840)
* Add new method Map::getFullVMapDataForPosition to get area info and liquid info in a single vmap lookup * Use this lookup in Map:: relocation methods to update m_areaId and m_zoneId fields on WorldObject * Adjust GetZoneId/GetAreaId on WorldObject to always return these cached fields * Clean up liquid state handling on Unit and Player * Hand floor's Z coord up through GetFullTerrainStatusForPosition, use it to update a new field in WorldObject, and use that to feed a new GetFloorZ call on WorldObject. Closes #16489 (cherry picked from commit f6c849729b27b77228704b595de3adaf24da2c10)
Diffstat (limited to 'src/common/Collision/Maps/MapTree.h')
-rw-r--r--src/common/Collision/Maps/MapTree.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/common/Collision/Maps/MapTree.h b/src/common/Collision/Maps/MapTree.h
index edacfe50f7d..1a0e8965c56 100644
--- a/src/common/Collision/Maps/MapTree.h
+++ b/src/common/Collision/Maps/MapTree.h
@@ -33,6 +33,7 @@ namespace VMAP
struct TC_COMMON_API LocationInfo
{
LocationInfo(): hitInstance(nullptr), hitModel(nullptr), ground_Z(-G3D::finf()) { }
+ int32 rootId;
const ModelInstance* hitInstance;
const GroupModel* hitModel;
float ground_Z;