Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-21 17:54:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Movement: ported some undermap fixups from a TC pull request

Browse Source
This commit is contained in:
Ovahlord
2019-02-23 22:37:17 +01:00
parent 326f604c74
commit b0c37b25cc
6 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/server/game/Maps/Map.cpp
View File

@@ -2454,11 +2454,7 @@ float Map::GetStaticHeight(PhaseShift const& phaseShift, float x, float y, float
float mapHeight = VMAP_INVALID_HEIGHT_VALUE;
uint32 terrainMapId = PhasingHandler::GetTerrainMapId(phaseShift, this, x, y);
if (GridMap* gmap = m_parentTerrainMap->GetGrid(terrainMapId, x, y))
{
float gridHeight = gmap->getHeight(x, y);
if (G3D::fuzzyGe(z, gridHeight - GROUND_HEIGHT_TOLERANCE))
mapHeight = gridHeight;
}
float mapHeight = gmap->getHeight(x, y);
float vmapHeight = VMAP_INVALID_HEIGHT_VALUE;
if (checkVMap)
@@ -2480,11 +2476,11 @@ float Map::GetStaticHeight(PhaseShift const& phaseShift, float x, float y, float
// or if the distance of the vmap height is less the land height distance
if (vmapHeight > mapHeight || std::fabs(mapHeight - z) > std::fabs(vmapHeight - z))
return vmapHeight;
else
return mapHeight; // better use .map surface height
return mapHeight; // better use .map surface height
}
else
return vmapHeight; // we have only vmapHeight (if have)
return vmapHeight; // we have only vmapHeight (if have)
}
return mapHeight; // explicitly use map data