Core/Objects: merged new changes from undermap issue fixup PR

This commit is contained in:
Ovahlord committed 2019-03-17 12:29:08 +01:00
1 parent 8b608139d2
commit c98be9d2d7
3 files changed
+39 -4

No files matched your search

+4 -1
View File
@@ -2535,7 +2535,10 @@ float Map::GetStaticHeight(PhaseShift const& phaseShift, float x, float y, float
{
// find raw .map surface under Z coordinates
uint32 terrainMapId = PhasingHandler::GetTerrainMapId(phaseShift, this, x, y);
float const mapHeight = GetGridHeight(terrainMapId, x, y);
float mapHeight = VMAP_INVALID_HEIGHT_VALUE;
float gridHeight = GetGridHeight(terrainMapId, x, y);
if (G3D::fuzzyGe(z, gridHeight - GROUND_HEIGHT_TOLERANCE))
mapHeight = gridHeight;
float vmapHeight = VMAP_INVALID_HEIGHT_VALUE;
if (checkVMap)