diff options
| author | Treeston <treeston.mmoc@gmail.com> | 2017-06-08 00:25:06 +0200 |
|---|---|---|
| committer | Carbenium <carbenium@outlook.com> | 2020-07-16 22:00:24 +0200 |
| commit | 51ce3b1c1dc6a53938ed6f240bac00681d18a44f (patch) | |
| tree | cd6415f3c7a1dc12cc003a707b16fb0e1cd468eb /src/common/Collision/Models | |
| parent | f7a7d02a7f50400cdc2be3c4722afeefe7efce80 (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/Models')
| -rw-r--r-- | src/common/Collision/Models/WorldModel.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/common/Collision/Models/WorldModel.cpp b/src/common/Collision/Models/WorldModel.cpp index 2e81b650028..c725aea9d6c 100644 --- a/src/common/Collision/Models/WorldModel.cpp +++ b/src/common/Collision/Models/WorldModel.cpp @@ -558,6 +558,7 @@ namespace VMAP groupTree.intersectPoint(p, callback); if (callback.hit != groupModels.end()) { + info.rootId = RootWMOID; info.hitModel = &(*callback.hit); dist = callback.zDist; return true; |