Core/Maps: Fixed outdoors check (#21551)

This commit is contained in:
Jeremy
2018-03-03 22:00:41 +01:00
committed by Shauren
parent bca2a36616
commit 367db4e1d6

View File

@@ -2696,7 +2696,6 @@ void Map::GetFullTerrainStatusForPosition(float x, float y, float z, PositionFul
{
data.areaId = areaEntry->ID;
data.floorZ = vmapData.floorZ;
data.outdoors = IsOutdoorWMO(vmapData.areaInfo->mogpFlags, wmoEntry, areaEntry);
}
else
{
@@ -2710,9 +2709,13 @@ void Map::GetFullTerrainStatusForPosition(float x, float y, float z, PositionFul
areaEntry = sAreaTableStore.LookupEntry(data.areaId);
data.floorZ = mapHeight;
data.outdoors = true; // @todo default true taken from old GetAreaId check, maybe review
}
if (vmapData.areaInfo)
data.outdoors = IsOutdoorWMO(vmapData.areaInfo->mogpFlags, wmoEntry, areaEntry);
else
data.outdoors = true; // @todo default true taken from old GetAreaId check, maybe review
// liquid processing
data.liquidStatus = LIQUID_MAP_NO_WATER;
if (vmapData.liquidInfo && vmapData.liquidInfo->level > vmapData.floorZ && z > vmapData.floorZ)