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

Core/Vmaps: sync wmo related code with master branch

Browse Source
This commit is contained in:
Ovahlord
2020-02-27 13:36:08 +01:00
parent 25b18096d8
commit de74f05f90
3 changed files with 91 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2506,7 +2506,7 @@ float Map::GetWaterOrGroundLevel(PhaseShift const& phaseShift, float x, float y,
if (m_parentTerrainMap->GetGrid(x, y))
{
// we need ground level (including grid height version) for proper return water level in point
float ground_z = GetHeight(phaseShift, x, y, z + collisionHeight, true, 50.0f);
float ground_z = GetHeight(phaseShift, x, y, z + collisionHeight);
if (ground)
*ground = ground_z;
@@ -2556,11 +2556,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;
return mapHeight; // better use .map surface height
else
return mapHeight; // better use .map surface height
}
return vmapHeight; // we have only vmapHeight (if have)
else
return vmapHeight; // we have only vmapHeight (if have)
}
return mapHeight; // explicitly use map data