diff options
Diffstat (limited to 'src/server/game/Maps/Map.cpp')
| -rw-r--r-- | src/server/game/Maps/Map.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp index b8dabf1f07a..49234d323ea 100644 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -2045,12 +2045,12 @@ inline ZLiquidStatus GridMap::getLiquidStatus(float x, float y, float z, uint8 R { if (AreaTableEntry const* area = GetAreaEntryByAreaFlagAndMap(getArea(x, y), MAPID_INVALID)) { - uint32 overrideLiquid = area->LiquidTypeOverride[liquidEntry->Type]; - if (!overrideLiquid && area->zone) + uint32 overrideLiquid = area->LiquidTypeID[liquidEntry->Type]; + if (!overrideLiquid && area->ParentAreaID) { - area = GetAreaEntryByAreaID(area->zone); + area = GetAreaEntryByAreaID(area->ParentAreaID); if (area) - overrideLiquid = area->LiquidTypeOverride[liquidEntry->Type]; + overrideLiquid = area->LiquidTypeID[liquidEntry->Type]; } if (LiquidTypeEntry const* liq = sLiquidTypeStore.LookupEntry(overrideLiquid)) @@ -2190,9 +2190,9 @@ inline bool IsOutdoorWMO(uint32 mogpFlags, int32 /*adtId*/, int32 /*rootId*/, in if (wmoEntry && atEntry) { - if (atEntry->flags & AREA_FLAG_OUTSIDE) + if (atEntry->Flags[0] & AREA_FLAG_OUTSIDE) return true; - if (atEntry->flags & AREA_FLAG_INSIDE) + if (atEntry->Flags[0] & AREA_FLAG_INSIDE) return false; } @@ -2265,7 +2265,7 @@ uint16 Map::GetAreaFlag(float x, float y, float z, bool *isOutdoors) const uint16 areaflag; if (atEntry) - areaflag = atEntry->exploreFlag; + areaflag = atEntry->AreaBit; else { if (GridMap* gmap = const_cast<Map*>(this)->GetGrid(x, y)) @@ -2321,12 +2321,12 @@ ZLiquidStatus Map::getLiquidStatus(float x, float y, float z, uint8 ReqLiquidTyp { if (AreaTableEntry const* area = GetAreaEntryByAreaFlagAndMap(GetAreaFlag(x, y, z), GetId())) { - uint32 overrideLiquid = area->LiquidTypeOverride[liquidFlagType]; - if (!overrideLiquid && area->zone) + uint32 overrideLiquid = area->LiquidTypeID[liquidFlagType]; + if (!overrideLiquid && area->ParentAreaID) { - area = GetAreaEntryByAreaID(area->zone); + area = GetAreaEntryByAreaID(area->ParentAreaID); if (area) - overrideLiquid = area->LiquidTypeOverride[liquidFlagType]; + overrideLiquid = area->LiquidTypeID[liquidFlagType]; } if (LiquidTypeEntry const* liq = sLiquidTypeStore.LookupEntry(overrideLiquid)) @@ -2401,7 +2401,7 @@ uint32 Map::GetZoneIdByAreaFlag(uint16 areaflag, uint32 map_id) AreaTableEntry const* entry = GetAreaEntryByAreaFlagAndMap(areaflag, map_id); if (entry) - return (entry->zone != 0) ? entry->zone : entry->ID; + return (entry->ParentAreaID != 0) ? entry->ParentAreaID : entry->ID; else return 0; } @@ -2411,7 +2411,7 @@ void Map::GetZoneAndAreaIdByAreaFlag(uint32& zoneid, uint32& areaid, uint16 area AreaTableEntry const* entry = GetAreaEntryByAreaFlagAndMap(areaflag, map_id); areaid = entry ? entry->ID : 0; - zoneid = entry ? ((entry->zone != 0) ? entry->zone : entry->ID) : 0; + zoneid = entry ? ((entry->ParentAreaID != 0) ? entry->ParentAreaID : entry->ID) : 0; } bool Map::isInLineOfSight(float x1, float y1, float z1, float x2, float y2, float z2, uint32 phasemask) const |