diff --git a/src/server/game/Achievements/AchievementMgr.cpp b/src/server/game/Achievements/AchievementMgr.cpp index e16e8a63a6..5b8f936e1f 100644 --- a/src/server/game/Achievements/AchievementMgr.cpp +++ b/src/server/game/Achievements/AchievementMgr.cpp @@ -2726,11 +2726,11 @@ bool AchievementMgr::RequirementsSatisfied(AchievementCriteriaEntry const* ac if (!area) break; - uint32 playerIndexOffset = uint32(area->exploreFlag) / 32; + uint32 playerIndexOffset = uint32(area->AreaBit) / 32; if (playerIndexOffset >= PLAYER_EXPLORED_ZONES_SIZE) continue; - uint32 mask = 1 << (uint32(area->exploreFlag) % 32); + uint32 mask = 1 << (uint32(area->AreaBit) % 32); if (referencePlayer->GetUInt32Value(PLAYER_EXPLORED_ZONES_1 + playerIndexOffset) & mask) { matchFound = true; diff --git a/src/server/game/Chat/Channels/Channel.cpp b/src/server/game/Chat/Channels/Channel.cpp index d15a938393..1883786c34 100644 --- a/src/server/game/Chat/Channels/Channel.cpp +++ b/src/server/game/Chat/Channels/Channel.cpp @@ -122,7 +122,7 @@ void Channel::GetChannelName(std::string& channelName, uint32 channelId, LocaleC if (channelEntry->flags & CHANNEL_DBC_FLAG_CITY_ONLY) channelName = Trinity::StringFormat(channelEntry->pattern, sObjectMgr->GetTrinityString(LANG_CHANNEL_CITY, locale)); else - channelName = Trinity::StringFormat(channelEntry->pattern, ASSERT_NOTNULL(zoneEntry)->area_name); + channelName = Trinity::StringFormat(channelEntry->pattern, ASSERT_NOTNULL(zoneEntry)->AreaName); } else channelName = channelEntry->pattern; diff --git a/src/server/game/Chat/Chat.cpp b/src/server/game/Chat/Chat.cpp index c3897f8204..a7b0fbb1c7 100644 --- a/src/server/game/Chat/Chat.cpp +++ b/src/server/game/Chat/Chat.cpp @@ -320,9 +320,9 @@ bool ChatHandler::ExecuteCommandInTable(std::vector const& table, c std::string zoneName = "Unknown"; if (AreaTableEntry const* area = sAreaTableStore.LookupEntry(areaId)) { - areaName = area->area_name; - if (AreaTableEntry const* zone = sAreaTableStore.LookupEntry(area->zone)) - zoneName = zone->area_name; + areaName = area->AreaName; + if (AreaTableEntry const* zone = sAreaTableStore.LookupEntry(area->ParentAreaID)) + zoneName = zone->AreaName; } sLog->outCommand(m_session->GetAccountId(), "Command: %s [Player: %s (%s) (Account: %u) X: %f Y: %f Z: %f Map: %u (%s) Area: %u (%s) Zone: %s Selected: %s (%s)]", diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp index 4c69cae38f..8e1279f82c 100644 --- a/src/server/game/Conditions/ConditionMgr.cpp +++ b/src/server/game/Conditions/ConditionMgr.cpp @@ -1927,7 +1927,7 @@ bool ConditionMgr::isConditionTypeValid(Condition* cond) const return false; } - if (areaEntry->zone != 0) + if (areaEntry->ParentAreaID != 0) { TC_LOG_ERROR("sql.sql", "%s requires to be in area (%u) which is a subzone but zone expected, skipped.", cond->ToString(true).c_str(), cond->ConditionValue1); return false; diff --git a/src/server/game/DataStores/DBCStores.cpp b/src/server/game/DataStores/DBCStores.cpp index eeb8519ac2..37297b67a4 100644 --- a/src/server/game/DataStores/DBCStores.cpp +++ b/src/server/game/DataStores/DBCStores.cpp @@ -1314,7 +1314,7 @@ bool IsInArea(uint32 objectAreaId, uint32 areaId) if (!objectArea) break; - objectAreaId = objectArea->zone; + objectAreaId = objectArea->ParentAreaID; } while (objectAreaId); return false; diff --git a/src/server/game/DataStores/DBCStructure.h b/src/server/game/DataStores/DBCStructure.h index 142c48be7c..c870afb0e6 100644 --- a/src/server/game/DataStores/DBCStructure.h +++ b/src/server/game/DataStores/DBCStructure.h @@ -630,43 +630,43 @@ struct AnimKitEntry struct AreaTableEntry { - uint32 ID; // 0 - uint32 mapid; // 1 - uint32 zone; // 2 if 0 then it's zone, else it's zone id of this area - uint32 exploreFlag; // 3 - uint32 flags; // 4, - //uint32 unk5; // 5, - //uint32 unk6; // 6, - //uint32 unk7; // 7, - //uint32 unk8; // 8, - //uint32 unk9; // 9, - int32 area_level; // 10 - char* area_name; // 11 - uint32 team; // 12 - uint32 LiquidTypeOverride[4]; // 13-16 liquid override by type - float MaxDepth; // 17, - float AmbientMultiplier; // 18 client only? - uint32 LightId; // 19 - uint32 MountFlags; // 20 - //uint32 unk21; // 21 4.0.0 - //uint32 unk22; // 22 4.0.0 - //uint32 unk23; // 23 4.0.0 - //uint32 unk24; // 24 - worldStateId - //uint32 unk25 // 25 + uint32 ID; // 0 + uint32 ContinentID; // 1 + uint32 ParentAreaID; // 2 if 0 then it's zone, else it's zone id of this area + uint32 AreaBit; // 3 + uint32 Flags; // 4, + uint32 SoundProviderPref; // 5, + uint32 SoundProviderPrefUnderwater; // 6, + uint32 AmbienceID; // 7, + uint32 ZoneMusic; // 8, + uint32 IntroSound; // 9, + uint32 ExplorationLevel; // 10 + char const* AreaName; // 11 + uint32 FactionGroupMask; // 12 + uint32 LiquidTypeID[4]; // 13-16 liquid override by type + float MinElevation; // 17, + float AmbientMultiplier; // 18 client only? + uint32 LightID; // 19 + uint32 MountFlags; // 20 + uint32 UwIntroSound; // 21 4.0.0 + uint32 UwZoneMusic; // 22 4.0.0 + uint32 UwAmbience; // 23 4.0.0 + uint32 World_pvp_ID; // 24 + int32 PvpCombatWorldStateID; // 25- worldStateId // helpers bool IsSanctuary() const { - if (mapid == 609) + if (ContinentID == 609) return true; - return (flags & AREA_FLAG_SANCTUARY) != 0; + return (Flags & AREA_FLAG_SANCTUARY) != 0; } bool IsFlyable() const { - if (flags & AREA_FLAG_OUTLAND) + if (Flags & AREA_FLAG_OUTLAND) { - if (!(flags & AREA_FLAG_NO_FLY_ZONE)) + if (!(Flags & AREA_FLAG_NO_FLY_ZONE)) return true; } diff --git a/src/server/game/DataStores/DBCfmt.h b/src/server/game/DataStores/DBCfmt.h index 3fa1d53cf6..36a6466bd3 100644 --- a/src/server/game/DataStores/DBCfmt.h +++ b/src/server/game/DataStores/DBCfmt.h @@ -27,7 +27,7 @@ const std::string CustomAchievementfmt = "pppaaaapapaapp"; const std::string CustomAchievementIndex = "ID"; char const AnimKitfmt[] = "nxx"; char const AchievementCriteriafmt[] = "niiiliiiisiiiiixxiiiiii"; -char const AreaTableEntryfmt[] = "niiiixxxxxisiiiiiffiixxxxx"; +char const AreaTableEntryfmt[] = "niiiiiiiiiisiiiiiffiiiiiii"; char const AreaGroupEntryfmt[] = "niiiiiii"; char const AreaPOIEntryfmt[] = "niiiiiiiiiiiffixixxixx"; char const AreaTriggerEntryfmt[] = "nifffiiifffff"; diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp index db68b8559a..6f8e5f8770 100644 --- a/src/server/game/Entities/Object/Object.cpp +++ b/src/server/game/Entities/Object/Object.cpp @@ -1297,8 +1297,8 @@ void WorldObject::ProcessPositionDataChanged(PositionFullTerrainStatus const& da { m_zoneId = m_areaId = data.areaId; if (AreaTableEntry const* area = sAreaTableStore.LookupEntry(m_areaId)) - if (area->zone) - m_zoneId = area->zone; + if (area->ParentAreaID) + m_zoneId = area->ParentAreaID; m_outdoors = data.outdoors; m_staticFloorZ = data.floorZ; } diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 6c3526319f..c83659f10d 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -5077,7 +5077,7 @@ void Player::RepopAtGraveyard() AreaTableEntry const* zone = sAreaTableStore.LookupEntry(GetAreaId()); // Such zones are considered unreachable as a ghost and the player must be automatically revived - if ((!IsAlive() && zone && zone->flags & AREA_FLAG_NEED_FLY) || GetTransport() || GetPositionZ() < (zone ? zone->MaxDepth : -500.0f)) + if ((!IsAlive() && zone && zone->Flags & AREA_FLAG_NEED_FLY) || GetTransport() || GetPositionZ() < (zone ? zone->MinElevation : -500.0f)) { ResurrectPlayer(0.5f); SpawnCorpseBones(); @@ -5115,7 +5115,7 @@ void Player::RepopAtGraveyard() SendDirectMessage(&data); } } - else if (GetPositionZ() < zone->MaxDepth) + else if (GetPositionZ() < zone->MinElevation) TeleportTo(m_homebindMapId, m_homebindX, m_homebindY, m_homebindZ, GetOrientation()); RemoveFlag(PLAYER_FLAGS, PLAYER_FLAGS_IS_OUT_OF_BOUNDS); @@ -5123,10 +5123,10 @@ void Player::RepopAtGraveyard() bool Player::CanJoinConstantChannelInZone(ChatChannelsEntry const* channel, AreaTableEntry const* zone) const { - if (channel->flags & CHANNEL_DBC_FLAG_ZONE_DEP && zone->flags & AREA_FLAG_ARENA_INSTANCE) + if (channel->flags & CHANNEL_DBC_FLAG_ZONE_DEP && zone->Flags & AREA_FLAG_ARENA_INSTANCE) return false; - if ((channel->flags & CHANNEL_DBC_FLAG_CITY_ONLY) && (!(zone->flags & AREA_FLAG_SLAVE_CAPITAL))) + if ((channel->flags & CHANNEL_DBC_FLAG_CITY_ONLY) && (!(zone->Flags & AREA_FLAG_SLAVE_CAPITAL))) return false; if ((channel->flags & CHANNEL_DBC_FLAG_GUILD_REQ) && GetGuildId()) @@ -6472,16 +6472,16 @@ void Player::CheckAreaExploreAndOutdoor() return; } - uint32 offset = areaEntry->exploreFlag / 32; + uint32 offset = areaEntry->AreaBit / 32; if (offset >= PLAYER_EXPLORED_ZONES_SIZE) { TC_LOG_ERROR("entities.player", "Player::CheckAreaExploreAndOutdoor: Wrong area flag %u in map data for (X: %f Y: %f) point to field PLAYER_EXPLORED_ZONES_1 + %u ( %u must be < %u ).", - areaEntry->exploreFlag, GetPositionX(), GetPositionY(), offset, offset, PLAYER_EXPLORED_ZONES_SIZE); + areaEntry->AreaBit, GetPositionX(), GetPositionY(), offset, offset, PLAYER_EXPLORED_ZONES_SIZE); return; } - uint32 val = (uint32)(1 << (areaEntry->exploreFlag % 32)); + uint32 val = (uint32)(1 << (areaEntry->AreaBit % 32)); uint32 currFields = GetUInt32Value(PLAYER_EXPLORED_ZONES_1 + offset); if (!(currFields & val)) @@ -6490,7 +6490,7 @@ void Player::CheckAreaExploreAndOutdoor() UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_EXPLORE_AREA); - if (areaEntry->area_level > 0) + if (areaEntry->ExplorationLevel > 0) { if (getLevel() >= sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL)) { @@ -6498,7 +6498,7 @@ void Player::CheckAreaExploreAndOutdoor() } else { - int32 diff = int32(getLevel()) - areaEntry->area_level; + int32 diff = int32(getLevel()) - areaEntry->ExplorationLevel; uint32 XP; if (diff < -5) { @@ -6510,16 +6510,16 @@ void Player::CheckAreaExploreAndOutdoor() if (exploration_percent < 0) exploration_percent = 0; - XP = uint32(sObjectMgr->GetBaseXP(areaEntry->area_level)*exploration_percent/100*sWorld->getRate(RATE_XP_EXPLORE)); + XP = uint32(sObjectMgr->GetBaseXP(areaEntry->ExplorationLevel)*exploration_percent/100*sWorld->getRate(RATE_XP_EXPLORE)); } else { - XP = uint32(sObjectMgr->GetBaseXP(areaEntry->area_level)*sWorld->getRate(RATE_XP_EXPLORE)); + XP = uint32(sObjectMgr->GetBaseXP(areaEntry->ExplorationLevel)*sWorld->getRate(RATE_XP_EXPLORE)); } if (sWorld->getIntConfig(CONFIG_MIN_DISCOVERED_SCALED_XP_RATIO)) { - uint32 minScaledXP = uint32(sObjectMgr->GetBaseXP(areaEntry->area_level)*sWorld->getRate(RATE_XP_EXPLORE)) * sWorld->getIntConfig(CONFIG_MIN_DISCOVERED_SCALED_XP_RATIO) / 100; + uint32 minScaledXP = uint32(sObjectMgr->GetBaseXP(areaEntry->ExplorationLevel)*sWorld->getRate(RATE_XP_EXPLORE)) * sWorld->getIntConfig(CONFIG_MIN_DISCOVERED_SCALED_XP_RATIO) / 100; XP = std::max(minScaledXP, XP); } @@ -7519,7 +7519,7 @@ void Player::UpdateArea(uint32 newArea) m_areaUpdateId = newArea; AreaTableEntry const* area = sAreaTableStore.LookupEntry(newArea); - pvpInfo.IsInFFAPvPArea = area && (area->flags & AREA_FLAG_ARENA); + pvpInfo.IsInFFAPvPArea = area && (area->Flags & AREA_FLAG_ARENA); UpdatePvPState(true); PhasingHandler::OnAreaChange(this); @@ -7538,7 +7538,7 @@ void Player::UpdateArea(uint32 newArea) RemoveByteFlag(UNIT_FIELD_BYTES_2, UNIT_BYTES_2_OFFSET_PVP_FLAG, UNIT_BYTE2_FLAG_SANCTUARY); uint32 const areaRestFlag = (GetTeam() == ALLIANCE) ? AREA_FLAG_REST_ZONE_ALLIANCE : AREA_FLAG_REST_ZONE_HORDE; - if (area && area->flags & areaRestFlag) + if (area && area->Flags & areaRestFlag) SetRestFlag(REST_FLAG_IN_FACTION_AREA); else RemoveRestFlag(REST_FLAG_IN_FACTION_AREA); @@ -7579,17 +7579,17 @@ void Player::UpdateZone(uint32 newZone, uint32 newArea) // in PvP, any not controlled zone (except zone->team == 6, default case) // in PvE, only opposition team capital - switch (zone->team) + switch (zone->FactionGroupMask) { case AREATEAM_ALLY: - pvpInfo.IsInHostileArea = GetTeam() != ALLIANCE && (sWorld->IsPvPRealm() || zone->flags & AREA_FLAG_CAPITAL); + pvpInfo.IsInHostileArea = GetTeam() != ALLIANCE && (sWorld->IsPvPRealm() || zone->Flags & AREA_FLAG_CAPITAL); break; case AREATEAM_HORDE: - pvpInfo.IsInHostileArea = GetTeam() != HORDE && (sWorld->IsPvPRealm() || zone->flags & AREA_FLAG_CAPITAL); + pvpInfo.IsInHostileArea = GetTeam() != HORDE && (sWorld->IsPvPRealm() || zone->Flags & AREA_FLAG_CAPITAL); break; case AREATEAM_NONE: // overwrite for battlegrounds, maybe batter some zone flags but current known not 100% fit to this - pvpInfo.IsInHostileArea = sWorld->IsPvPRealm() || InBattleground() || zone->flags & AREA_FLAG_WINTERGRASP; + pvpInfo.IsInHostileArea = sWorld->IsPvPRealm() || InBattleground() || zone->Flags & AREA_FLAG_WINTERGRASP; break; default: // 6 in fact pvpInfo.IsInHostileArea = false; @@ -7599,7 +7599,7 @@ void Player::UpdateZone(uint32 newZone, uint32 newArea) // Treat players having a quest flagging for PvP as always in hostile area pvpInfo.IsHostile = pvpInfo.IsInHostileArea || HasPvPForcingQuest(); - if (zone->flags & AREA_FLAG_CAPITAL) // Is in a capital city + if (zone->Flags & AREA_FLAG_CAPITAL) // Is in a capital city { if (!pvpInfo.IsHostile || zone->IsSanctuary()) SetRestFlag(REST_FLAG_IN_CITY); @@ -27989,9 +27989,9 @@ std::string Player::GetMapAreaAndZoneString() const if (AreaTableEntry const* area = sAreaTableStore.LookupEntry(areaId)) { int locale = GetSession()->GetSessionDbcLocale(); - areaName = area->area_name[locale]; - if (AreaTableEntry const* zone = sAreaTableStore.LookupEntry(area->zone)) - zoneName = zone->area_name[locale]; + areaName = area->AreaName[locale]; + if (AreaTableEntry const* zone = sAreaTableStore.LookupEntry(area->ParentAreaID)) + zoneName = zone->AreaName[locale]; } std::ostringstream str; diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index 5ed57030dc..4c24e33c5f 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -6720,7 +6720,7 @@ void ObjectMgr::LoadGraveyardZones() continue; } - if (areaEntry->zone != 0) + if (areaEntry->ParentAreaID != 0) { TC_LOG_ERROR("sql.sql", "Table `graveyard_zone` has a record for SubZone (ID: %u) instead of zone, skipped.", zoneId); continue; @@ -10215,7 +10215,7 @@ void ObjectMgr::LoadAreaPhases() if (!area) break; - parentAreaId = area->zone; + parentAreaId = area->ParentAreaID; if (!parentAreaId) break; diff --git a/src/server/game/Handlers/MiscHandler.cpp b/src/server/game/Handlers/MiscHandler.cpp index 5ca5c78a30..a7d012904f 100644 --- a/src/server/game/Handlers/MiscHandler.cpp +++ b/src/server/game/Handlers/MiscHandler.cpp @@ -310,7 +310,7 @@ void WorldSession::HandleWhoOpcode(WorldPacket& recvData) std::string aname; if (AreaTableEntry const* areaEntry = sAreaTableStore.LookupEntry(playerZoneId)) - aname = areaEntry->area_name[GetSessionDbcLocale()]; + aname = areaEntry->AreaName[GetSessionDbcLocale()]; bool s_show = true; for (uint32 i = 0; i < strCount; ++i) @@ -1630,7 +1630,7 @@ void WorldSession::HandleHearthAndResurrect(WorldPacket& /*recvData*/) } AreaTableEntry const* atEntry = sAreaTableStore.LookupEntry(_player->GetAreaId()); - if (!atEntry || !(atEntry->flags & AREA_FLAG_WINTERGRASP_2)) + if (!atEntry || !(atEntry->Flags & AREA_FLAG_WINTERGRASP_2)) return; _player->BuildPlayerRepop(); diff --git a/src/server/game/Handlers/MovementHandler.cpp b/src/server/game/Handlers/MovementHandler.cpp index a4337dbaf9..fa5af8e451 100644 --- a/src/server/game/Handlers/MovementHandler.cpp +++ b/src/server/game/Handlers/MovementHandler.cpp @@ -429,7 +429,7 @@ void WorldSession::HandleMovementOpcodes(WorldPacket& recvPacket) plrMover->UpdateFallInformationIfNeed(movementInfo, opcode); AreaTableEntry const* zone = sAreaTableStore.LookupEntry(plrMover->GetAreaId()); - float depth = zone ? zone->MaxDepth : -500.0f; + float depth = zone ? zone->MinElevation : -500.0f; if (movementInfo.pos.GetPositionZ() < depth) { if (!(plrMover->GetBattleground() && plrMover->GetBattleground()->HandlePlayerUnderMap(_player))) diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp index 9dde3d4f18..49c3298517 100644 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -2325,12 +2325,12 @@ inline ZLiquidStatus GridMap::GetLiquidStatus(float x, float y, float z, uint8 R { if (AreaTableEntry const* area = sAreaTableStore.LookupEntry(getArea(x, y))) { - uint32 overrideLiquid = area->LiquidTypeOverride[liquidEntry->Type]; - if (!overrideLiquid && area->zone) + uint32 overrideLiquid = area->LiquidTypeID[liquidEntry->Type]; + 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->Type]; } if (LiquidTypeEntry const* liq = sLiquidTypeStore.LookupEntry(overrideLiquid)) @@ -2532,8 +2532,8 @@ uint32 Map::GetZoneId(PhaseShift const& phaseShift, float x, float y, float z) c { uint32 areaId = GetAreaId(phaseShift, x, y, z); if (AreaTableEntry const* area = sAreaTableStore.LookupEntry(areaId)) - if (area->zone) - return area->zone; + if (area->ParentAreaID) + return area->ParentAreaID; return areaId; } @@ -2542,8 +2542,8 @@ void Map::GetZoneAndAreaId(PhaseShift const& phaseShift, uint32& zoneid, uint32& { areaid = zoneid = GetAreaId(phaseShift, 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(PhaseShift const& phaseShift, float x, float y, float z, uint8 ReqLiquidType, LiquidData* data, float collisionHeight) const @@ -2578,12 +2578,12 @@ ZLiquidStatus Map::GetLiquidStatus(PhaseShift const& phaseShift, float x, float { if (AreaTableEntry const* area = sAreaTableStore.LookupEntry(GetAreaId(phaseShift, 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)) @@ -2697,7 +2697,7 @@ void Map::GetFullTerrainStatusForPosition(PhaseShift const& phaseShift, float x, 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) @@ -2719,12 +2719,12 @@ void Map::GetFullTerrainStatusForPosition(PhaseShift const& phaseShift, float x, 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)) diff --git a/src/server/game/OutdoorPvP/OutdoorPvP.cpp b/src/server/game/OutdoorPvP/OutdoorPvP.cpp index 088e8778df..8442daa52b 100644 --- a/src/server/game/OutdoorPvP/OutdoorPvP.cpp +++ b/src/server/game/OutdoorPvP/OutdoorPvP.cpp @@ -693,7 +693,7 @@ void OutdoorPvP::SetMapFromZone(uint32 zone) { AreaTableEntry const* areaTable = sAreaTableStore.LookupEntry(zone); ASSERT(areaTable); - Map* map = sMapMgr->CreateBaseMap(areaTable->mapid); + Map* map = sMapMgr->CreateBaseMap(areaTable->ContinentID); ASSERT(!map->Instanceable()); m_map = map; } diff --git a/src/server/game/Phasing/PhasingHandler.cpp b/src/server/game/Phasing/PhasingHandler.cpp index a9c66840ae..933922f3eb 100644 --- a/src/server/game/Phasing/PhasingHandler.cpp +++ b/src/server/game/Phasing/PhasingHandler.cpp @@ -249,7 +249,7 @@ void PhasingHandler::OnAreaChange(WorldObject* object) } } - areaEntry = sAreaTableStore.LookupEntry(areaEntry->zone); + areaEntry = sAreaTableStore.LookupEntry(areaEntry->ParentAreaID); } bool changed = phaseShift.Phases != oldPhases; diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index 29266fceab..cd471dfab7 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -6018,7 +6018,7 @@ SpellCastResult Spell::CheckCast(bool strict, uint32* param1 /*= nullptr*/, uint { Battlefield* Bf = sBattlefieldMgr->GetBattlefieldToZoneId(m_originalCaster->GetZoneId()); if (AreaTableEntry const* area = sAreaTableStore.LookupEntry(m_originalCaster->GetAreaId())) - if (area->flags & AREA_FLAG_NO_FLY_ZONE || (Bf && !Bf->CanFlyIn())) + if (area->Flags & AREA_FLAG_NO_FLY_ZONE || (Bf && !Bf->CanFlyIn())) return (_triggeredCastFlags & TRIGGERED_DONT_REPORT_CAST_ERROR) ? SPELL_FAILED_DONT_REPORT : SPELL_FAILED_NOT_HERE; } break; diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index 91621c0fe4..4b5bcb34d8 100644 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -3761,14 +3761,14 @@ void Spell::EffectDuel(SpellEffIndex effIndex) // Players can only fight a duel in zones with this flag AreaTableEntry const* casterAreaEntry = sAreaTableStore.LookupEntry(caster->GetAreaId()); - if (casterAreaEntry && !(casterAreaEntry->flags & AREA_FLAG_ALLOW_DUELS)) + if (casterAreaEntry && !(casterAreaEntry->Flags & AREA_FLAG_ALLOW_DUELS)) { SendCastResult(SPELL_FAILED_NO_DUELING); // Dueling isn't allowed here return; } AreaTableEntry const* targetAreaEntry = sAreaTableStore.LookupEntry(target->GetAreaId()); - if (targetAreaEntry && !(targetAreaEntry->flags & AREA_FLAG_ALLOW_DUELS)) + if (targetAreaEntry && !(targetAreaEntry->Flags & AREA_FLAG_ALLOW_DUELS)) { SendCastResult(SPELL_FAILED_NO_DUELING); // Dueling isn't allowed here return; diff --git a/src/server/scripts/Commands/cs_go.cpp b/src/server/scripts/Commands/cs_go.cpp index c6dc3d8fe1..1a7223f50e 100644 --- a/src/server/scripts/Commands/cs_go.cpp +++ b/src/server/scripts/Commands/cs_go.cpp @@ -311,23 +311,23 @@ public: } // update to parent zone if exist (client map show only zones without parents) - AreaTableEntry const* zoneEntry = areaEntry->zone ? sAreaTableStore.LookupEntry(areaEntry->zone) : areaEntry; + AreaTableEntry const* zoneEntry = areaEntry->ParentAreaID ? sAreaTableStore.LookupEntry(areaEntry->ParentAreaID) : areaEntry; ASSERT(zoneEntry); - Map const* map = sMapMgr->CreateBaseMap(zoneEntry->mapid); + Map const* map = sMapMgr->CreateBaseMap(zoneEntry->ContinentID); if (map->Instanceable()) { - handler->PSendSysMessage(LANG_INVALID_ZONE_MAP, areaEntry->ID, areaEntry->area_name, map->GetId(), map->GetMapName()); + handler->PSendSysMessage(LANG_INVALID_ZONE_MAP, areaEntry->ID, areaEntry->AreaName, map->GetId(), map->GetMapName()); handler->SetSentErrorMessage(true); return false; } Zone2MapCoordinates(x, y, zoneEntry->ID); - if (!MapManager::IsValidMapCoord(zoneEntry->mapid, x, y)) + if (!MapManager::IsValidMapCoord(zoneEntry->ContinentID, x, y)) { - handler->PSendSysMessage(LANG_INVALID_TARGET_COORD, x, y, zoneEntry->mapid); + handler->PSendSysMessage(LANG_INVALID_TARGET_COORD, x, y, zoneEntry->ContinentID); handler->SetSentErrorMessage(true); return false; } @@ -344,7 +344,7 @@ public: float z = std::max(map->GetHeight(PhasingHandler::GetEmptyPhaseShift(), x, y, MAX_HEIGHT), map->GetWaterLevel(PhasingHandler::GetEmptyPhaseShift(), x, y)); - player->TeleportTo(zoneEntry->mapid, x, y, z, player->GetOrientation()); + player->TeleportTo(zoneEntry->ContinentID, x, y, z, player->GetOrientation()); return true; } diff --git a/src/server/scripts/Commands/cs_group.cpp b/src/server/scripts/Commands/cs_group.cpp index 2372bfcfcf..de9d057ab2 100644 --- a/src/server/scripts/Commands/cs_group.cpp +++ b/src/server/scripts/Commands/cs_group.cpp @@ -430,9 +430,9 @@ public: AreaTableEntry const* area = sAreaTableStore.LookupEntry(p->GetAreaId()); if (area) { - AreaTableEntry const* zone = sAreaTableStore.LookupEntry(area->zone); + AreaTableEntry const* zone = sAreaTableStore.LookupEntry(area->ParentAreaID); if (zone) - zoneName = zone->area_name[localeConstant]; + zoneName = zone->AreaName[localeConstant]; } } else diff --git a/src/server/scripts/Commands/cs_list.cpp b/src/server/scripts/Commands/cs_list.cpp index 76ac9c7c8e..b71bc99be5 100644 --- a/src/server/scripts/Commands/cs_list.cpp +++ b/src/server/scripts/Commands/cs_list.cpp @@ -681,7 +681,7 @@ public: static char const* GetZoneName(uint32 zoneId, LocaleConstant /*locale*/) { AreaTableEntry const* zoneEntry = sAreaTableStore.LookupEntry(zoneId); - return zoneEntry ? zoneEntry->area_name : ""; + return zoneEntry ? zoneEntry->AreaName : ""; } static bool HandleListRespawnsCommand(ChatHandler* handler, char const* args) { diff --git a/src/server/scripts/Commands/cs_lookup.cpp b/src/server/scripts/Commands/cs_lookup.cpp index eb02148bf3..a155e5e51d 100644 --- a/src/server/scripts/Commands/cs_lookup.cpp +++ b/src/server/scripts/Commands/cs_lookup.cpp @@ -104,7 +104,7 @@ public: // Search in AreaTable.dbc for (AreaTableEntry const* areaEntry : sAreaTableStore) { - std::string name = areaEntry->area_name; + std::string name = areaEntry->AreaName; if (name.empty()) continue; diff --git a/src/server/scripts/Commands/cs_message.cpp b/src/server/scripts/Commands/cs_message.cpp index 428ac9b374..0b6e346ec4 100644 --- a/src/server/scripts/Commands/cs_message.cpp +++ b/src/server/scripts/Commands/cs_message.cpp @@ -88,7 +88,7 @@ public: AreaTableEntry const* zoneEntry = nullptr; for (AreaTableEntry const* entry : sAreaTableStore) { - if (strstr(entry->area_name, channelStr)) + if (strstr(entry->AreaName, channelStr)) { zoneEntry = entry; break; diff --git a/src/server/scripts/Commands/cs_misc.cpp b/src/server/scripts/Commands/cs_misc.cpp index b239593e43..e10cf98820 100644 --- a/src/server/scripts/Commands/cs_misc.cpp +++ b/src/server/scripts/Commands/cs_misc.cpp @@ -278,8 +278,8 @@ public: handler->PSendSysMessage(LANG_MAP_POSITION, mapId, (mapEntry ? mapEntry->Name : unknown), - zoneId, (zoneEntry ? zoneEntry->area_name : unknown), - areaId, (areaEntry ? areaEntry->area_name : unknown), + zoneId, (zoneEntry ? zoneEntry->AreaName : unknown), + areaId, (areaEntry ? areaEntry->AreaName : unknown), object->GetPositionX(), object->GetPositionY(), object->GetPositionZ(), object->GetOrientation()); if (Transport* transport = object->GetTransport()) { @@ -1062,7 +1062,7 @@ public: uint32 zoneId = player->GetZoneId(); AreaTableEntry const* areaEntry = sAreaTableStore.LookupEntry(zoneId); - if (!areaEntry || areaEntry->zone !=0) + if (!areaEntry || areaEntry->ParentAreaID != 0) { handler->PSendSysMessage(LANG_COMMAND_GRAVEYARDWRONGZONE, graveyardId, zoneId); handler->SetSentErrorMessage(true); @@ -1160,7 +1160,7 @@ public: return false; } - int32 offset = area->exploreFlag / 32; + int32 offset = area->AreaBit / 32; if (offset >= PLAYER_EXPLORED_ZONES_SIZE) { handler->SendSysMessage(LANG_BAD_VALUE); @@ -1168,7 +1168,7 @@ public: return false; } - uint32 val = uint32((1 << (area->exploreFlag % 32))); + uint32 val = uint32((1 << (area->AreaBit % 32))); uint32 currFields = playerTarget->GetUInt32Value(PLAYER_EXPLORED_ZONES_1 + offset); playerTarget->SetUInt32Value(PLAYER_EXPLORED_ZONES_1 + offset, uint32((currFields | val))); @@ -1197,7 +1197,7 @@ public: return false; } - int32 offset = area->exploreFlag / 32; + int32 offset = area->AreaBit / 32; if (offset >= PLAYER_EXPLORED_ZONES_SIZE) { handler->SendSysMessage(LANG_BAD_VALUE); @@ -1205,7 +1205,7 @@ public: return false; } - uint32 val = uint32((1 << (area->exploreFlag % 32))); + uint32 val = uint32((1 << (area->AreaBit % 32))); uint32 currFields = playerTarget->GetUInt32Value(PLAYER_EXPLORED_ZONES_1 + offset); playerTarget->SetUInt32Value(PLAYER_EXPLORED_ZONES_1 + offset, uint32((currFields ^ val))); @@ -1840,11 +1840,11 @@ public: AreaTableEntry const* area = sAreaTableStore.LookupEntry(areaId); if (area) { - areaName = area->area_name; + areaName = area->AreaName; - AreaTableEntry const* zone = sAreaTableStore.LookupEntry(area->zone); + AreaTableEntry const* zone = sAreaTableStore.LookupEntry(area->ParentAreaID); if (zone) - zoneName = zone->area_name; + zoneName = zone->AreaName; } if (target)