mirror of
https://github.com/TrinityCore/TrinityCore.git
synced 2026-01-19 17:05:44 +01:00
*Merge.
--HG-- branch : trunk
This commit is contained in:
@@ -1271,22 +1271,22 @@ float Map::GetHeight(float x, float y, float z, bool pUseVmaps) const
|
||||
|
||||
float Map::GetVmapHeight(float x, float y, float z, bool useMaps) const
|
||||
{
|
||||
float mapHeight;
|
||||
float vmapHeight;
|
||||
if (useMaps)
|
||||
{
|
||||
mapHeight = GetHeight(x, y, z, false);
|
||||
if (fabs(mapHeight - z) < 0.1)
|
||||
return mapHeight;
|
||||
}
|
||||
else
|
||||
mapHeight = INVALID_HEIGHT;
|
||||
VMAP::IVMapManager* vmgr = VMAP::VMapFactory::createOrGetVMapManager();
|
||||
if (vmgr->isLineOfSightCalcEnabled())
|
||||
bool result = vmgr->getObjectHitPos(GetId(), x, y, z + 2.0f, x, y, mapHeight, x, y, vmapHeight, 0);
|
||||
else
|
||||
return INVALID_HEIGHT;
|
||||
return vmapHeight;
|
||||
float mapHeight;
|
||||
float vmapHeight;
|
||||
if (useMaps)
|
||||
{
|
||||
mapHeight = GetHeight(x, y, z, false);
|
||||
if (fabs(mapHeight - z) < 0.1)
|
||||
return mapHeight;
|
||||
}
|
||||
else
|
||||
mapHeight = INVALID_HEIGHT;
|
||||
VMAP::IVMapManager* vmgr = VMAP::VMapFactory::createOrGetVMapManager();
|
||||
if (vmgr->isLineOfSightCalcEnabled())
|
||||
bool result = vmgr->getObjectHitPos(GetId(), x, y, z + 2.0f, x, y, mapHeight, x, y, vmapHeight, 0);
|
||||
else
|
||||
return INVALID_HEIGHT;
|
||||
return vmapHeight;
|
||||
}
|
||||
|
||||
uint16 Map::GetAreaFlag(float x, float y, float z) const
|
||||
|
||||
Reference in New Issue
Block a user