aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Maps/Map.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/server/game/Maps/Map.cpp')
-rw-r--r--src/server/game/Maps/Map.cpp60
1 files changed, 30 insertions, 30 deletions
diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp
index bc23cc3ec5f..3b5d31af057 100644
--- a/src/server/game/Maps/Map.cpp
+++ b/src/server/game/Maps/Map.cpp
@@ -2352,23 +2352,23 @@ inline ZLiquidStatus GridMap::GetLiquidStatus(float x, float y, float z, uint8 R
if (LiquidTypeEntry const* liquidEntry = sLiquidTypeStore.LookupEntry(entry))
{
type &= MAP_LIQUID_TYPE_DARK_WATER;
- uint32 liqTypeIdx = liquidEntry->Type;
+ uint32 liqTypeIdx = liquidEntry->SoundBank;
if (entry < 21)
{
if (AreaTableEntry const* area = sAreaTableStore.LookupEntry(getArea(x, y)))
{
- uint32 overrideLiquid = area->LiquidTypeOverride[liquidEntry->Type];
- if (!overrideLiquid && area->zone)
+ uint32 overrideLiquid = area->LiquidTypeID[liquidEntry->SoundBank];
+ if (!overrideLiquid && area->ParentAreaID)
{
- area = sAreaTableStore.LookupEntry(area->zone);
+ area = sAreaTableStore.LookupEntry(area->ParentAreaID);
if (area)
- overrideLiquid = area->LiquidTypeOverride[liquidEntry->Type];
+ overrideLiquid = area->LiquidTypeID[liquidEntry->SoundBank];
}
if (LiquidTypeEntry const* liq = sLiquidTypeStore.LookupEntry(overrideLiquid))
{
entry = overrideLiquid;
- liqTypeIdx = liq->Type;
+ liqTypeIdx = liq->SoundBank;
}
}
}
@@ -2589,7 +2589,7 @@ uint32 Map::GetAreaId(uint32 phaseMask, float x, float y, float z) const
{
// wmo found
if (WMOAreaTableEntry const* wmoEntry = GetWMOAreaTableEntryByTripple(rootId, adtId, groupId))
- areaId = wmoEntry->areaId;
+ areaId = wmoEntry->AreaTableID;
if (!areaId)
areaId = gridAreaId;
@@ -2598,7 +2598,7 @@ uint32 Map::GetAreaId(uint32 phaseMask, float x, float y, float z) const
areaId = gridAreaId;
if (!areaId)
- areaId = i_mapEntry->linked_zone;
+ areaId = i_mapEntry->AreaTableID;
return areaId;
}
@@ -2607,8 +2607,8 @@ uint32 Map::GetZoneId(uint32 phaseMask, float x, float y, float z) const
{
uint32 areaId = GetAreaId(phaseMask, x, y, z);
if (AreaTableEntry const* area = sAreaTableStore.LookupEntry(areaId))
- if (area->zone)
- return area->zone;
+ if (area->ParentAreaID)
+ return area->ParentAreaID;
return areaId;
}
@@ -2617,8 +2617,8 @@ void Map::GetZoneAndAreaId(uint32 phaseMask, uint32& zoneid, uint32& areaid, flo
{
areaid = zoneid = GetAreaId(phaseMask, x, y, z);
if (AreaTableEntry const* area = sAreaTableStore.LookupEntry(areaid))
- if (area->zone)
- zoneid = area->zone;
+ if (area->ParentAreaID)
+ zoneid = area->ParentAreaID;
}
ZLiquidStatus Map::GetLiquidStatus(uint32 phaseMask, float x, float y, float z, uint8 ReqLiquidType, LiquidData* data, float collisionHeight) const
@@ -2646,24 +2646,24 @@ ZLiquidStatus Map::GetLiquidStatus(uint32 phaseMask, float x, float y, float z,
uint32 liquidFlagType = 0;
if (LiquidTypeEntry const* liq = sLiquidTypeStore.LookupEntry(liquid_type))
- liquidFlagType = liq->Type;
+ liquidFlagType = liq->SoundBank;
if (liquid_type && liquid_type < 21)
{
if (AreaTableEntry const* area = sAreaTableStore.LookupEntry(GetAreaId(phaseMask, x, y, z)))
{
- uint32 overrideLiquid = area->LiquidTypeOverride[liquidFlagType];
- if (!overrideLiquid && area->zone)
+ uint32 overrideLiquid = area->LiquidTypeID[liquidFlagType];
+ if (!overrideLiquid && area->ParentAreaID)
{
- area = sAreaTableStore.LookupEntry(area->zone);
+ area = sAreaTableStore.LookupEntry(area->ParentAreaID);
if (area)
- overrideLiquid = area->LiquidTypeOverride[liquidFlagType];
+ overrideLiquid = area->LiquidTypeID[liquidFlagType];
}
if (LiquidTypeEntry const* liq = sLiquidTypeStore.LookupEntry(overrideLiquid))
{
liquid_type = overrideLiquid;
- liquidFlagType = liq->Type;
+ liquidFlagType = liq->SoundBank;
}
}
}
@@ -2765,7 +2765,7 @@ void Map::GetFullTerrainStatusForPosition(uint32 phaseMask, float x, float y, fl
data.outdoors = (wmoData->areaInfo->mogpFlags & 0x8) != 0;
if (wmoEntry)
{
- data.areaId = wmoEntry->areaId;
+ data.areaId = wmoEntry->AreaTableID;
if (wmoEntry->Flags & 4)
data.outdoors = true;
else if (wmoEntry->Flags & 2)
@@ -2783,11 +2783,11 @@ void Map::GetFullTerrainStatusForPosition(uint32 phaseMask, float x, float y, fl
data.outdoors = true;
data.areaId = gridAreaId;
if (AreaTableEntry const* areaEntry = sAreaTableStore.LookupEntry(data.areaId))
- data.outdoors = (areaEntry->flags & (AREA_FLAG_INSIDE | AREA_FLAG_OUTSIDE)) != AREA_FLAG_INSIDE;
+ data.outdoors = (areaEntry->Flags & (AREA_FLAG_INSIDE | AREA_FLAG_OUTSIDE)) != AREA_FLAG_INSIDE;
}
if (!data.areaId)
- data.areaId = i_mapEntry->linked_zone;
+ data.areaId = i_mapEntry->AreaTableID;
AreaTableEntry const* areaEntry = sAreaTableStore.LookupEntry(data.areaId);
@@ -2801,22 +2801,22 @@ void Map::GetFullTerrainStatusForPosition(uint32 phaseMask, float x, float y, fl
uint32 liquidFlagType = 0;
if (LiquidTypeEntry const* liquidData = sLiquidTypeStore.LookupEntry(liquidType))
- liquidFlagType = liquidData->Type;
+ liquidFlagType = liquidData->SoundBank;
if (liquidType && liquidType < 21 && areaEntry)
{
- uint32 overrideLiquid = areaEntry->LiquidTypeOverride[liquidFlagType];
- if (!overrideLiquid && areaEntry->zone)
+ uint32 overrideLiquid = areaEntry->LiquidTypeID[liquidFlagType];
+ if (!overrideLiquid && areaEntry->ParentAreaID)
{
- AreaTableEntry const* zoneEntry = sAreaTableStore.LookupEntry(areaEntry->zone);
+ AreaTableEntry const* zoneEntry = sAreaTableStore.LookupEntry(areaEntry->ParentAreaID);
if (zoneEntry)
- overrideLiquid = zoneEntry->LiquidTypeOverride[liquidFlagType];
+ overrideLiquid = zoneEntry->LiquidTypeID[liquidFlagType];
}
if (LiquidTypeEntry const* overrideData = sLiquidTypeStore.LookupEntry(overrideLiquid))
{
liquidType = overrideLiquid;
- liquidFlagType = overrideData->Type;
+ liquidFlagType = overrideData->SoundBank;
}
}
@@ -2915,7 +2915,7 @@ bool Map::CheckGridIntegrity(Creature* c, bool moved) const
char const* Map::GetMapName() const
{
- return i_mapEntry ? i_mapEntry->name[sWorld->GetDefaultDbcLocale()] : "UNNAMEDMAP\x0";
+ return i_mapEntry ? i_mapEntry->MapName[sWorld->GetDefaultDbcLocale()] : "UNNAMEDMAP\x0";
}
void Map::SendInitSelf(Player* player)
@@ -4140,7 +4140,7 @@ MapDifficulty const* Map::GetMapDifficulty() const
uint32 Map::GetId() const
{
- return i_mapEntry->MapID;
+ return i_mapEntry->ID;
}
bool Map::IsRegularDifficulty() const
@@ -4219,7 +4219,7 @@ uint32 InstanceMap::GetMaxPlayers() const
if (mapDiff && mapDiff->maxPlayers)
return mapDiff->maxPlayers;
- return GetEntry()->maxPlayers;
+ return GetEntry()->MaxPlayers;
}
uint32 InstanceMap::GetMaxResetDelay() const