aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Chat/Chat.cpp4
-rw-r--r--src/server/game/DataStores/DBCStructure.h4
-rw-r--r--src/server/game/DataStores/DBCfmt.h2
-rw-r--r--src/server/game/Entities/Player/Player.cpp6
-rw-r--r--src/server/game/Handlers/MiscHandler.cpp2
-rw-r--r--src/server/scripts/Commands/cs_go.cpp2
-rw-r--r--src/server/scripts/Commands/cs_group.cpp2
-rw-r--r--src/server/scripts/Commands/cs_lookup.cpp2
-rw-r--r--src/server/scripts/Commands/cs_misc.cpp8
9 files changed, 16 insertions, 16 deletions
diff --git a/src/server/game/Chat/Chat.cpp b/src/server/game/Chat/Chat.cpp
index 837ff0be60f..c7952d7758c 100644
--- a/src/server/game/Chat/Chat.cpp
+++ b/src/server/game/Chat/Chat.cpp
@@ -321,9 +321,9 @@ bool ChatHandler::ExecuteCommandInTable(ChatCommand* table, const char* text, st
std::string zoneName = "Unknown";
if (AreaTableEntry const* area = GetAreaEntryByAreaID(areaId))
{
- areaName = area->ZoneName;
+ areaName = area->AreaName_lang;
if (AreaTableEntry const* zone = GetAreaEntryByAreaID(area->ParentAreaID))
- zoneName = zone->ZoneName;
+ zoneName = zone->AreaName_lang;
}
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/DataStores/DBCStructure.h b/src/server/game/DataStores/DBCStructure.h
index ca1ec344d04..2893ea3df83 100644
--- a/src/server/game/DataStores/DBCStructure.h
+++ b/src/server/game/DataStores/DBCStructure.h
@@ -72,10 +72,10 @@ struct AreaTableEntry
//uint32 SoundProviderPrefUnderwater; // 7,
//uint32 AmbienceID; // 8,
//uint32 ZoneMusic; // 9,
- char* ZoneName; // 10
+ //char* ZoneName; // 10 - Internal name
//uint32 IntroSound; // 11
uint32 ExplorationLevel; // 12
- //char* AreaName_lang // 13
+ char* AreaName_lang; // 13 - In-game name
uint32 FactionGroupMask; // 14
uint32 LiquidTypeID[4]; // 15-18
//float AmbientMultiplier; // 19
diff --git a/src/server/game/DataStores/DBCfmt.h b/src/server/game/DataStores/DBCfmt.h
index 5e07065a122..e3b474bc27b 100644
--- a/src/server/game/DataStores/DBCfmt.h
+++ b/src/server/game/DataStores/DBCfmt.h
@@ -25,7 +25,7 @@
char const Achievementfmt[] = "niixsxiixixxiii";
const std::string CustomAchievementfmt = "pppaaaapapaapp";
const std::string CustomAchievementIndex = "ID";
-char const AreaTableEntryfmt[] = "iiiniixxxxsxixiiiiixxxxxxxxxx";
+char const AreaTableEntryfmt[] = "iiiniixxxxxxisiiiiixxxxxxxxxx";
char const AreaTriggerEntryfmt[] = "nifffxxxfffffxxxx";
char const ArmorLocationfmt[] = "nfffff";
char const AuctionHouseEntryfmt[] = "niiix";
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index 2a4d97ac9a0..8e04f2c5104 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -5233,7 +5233,7 @@ void Player::UpdateLocalChannels(uint32 newZone)
if (channel->Flags & CHANNEL_DBC_FLAG_CITY_ONLY)
currentNameExt = sObjectMgr->GetTrinityStringForDBCLocale(LANG_CHANNEL_CITY);
else
- currentNameExt = current_zone->ZoneName;
+ currentNameExt = current_zone->AreaName_lang;
snprintf(new_channel_name_buf, 100, channel->Name_lang, currentNameExt);
@@ -26223,9 +26223,9 @@ std::string Player::GetMapAreaAndZoneString()
std::string zoneName = "Unknown";
if (AreaTableEntry const* area = GetAreaEntryByAreaID(areaId))
{
- areaName = area->ZoneName;
+ areaName = area->AreaName_lang;
if (AreaTableEntry const* zone = GetAreaEntryByAreaID(area->ParentAreaID))
- zoneName = zone->ZoneName;
+ zoneName = zone->AreaName_lang;
}
std::ostringstream str;
diff --git a/src/server/game/Handlers/MiscHandler.cpp b/src/server/game/Handlers/MiscHandler.cpp
index 1dbdc38af7e..025bb45b42b 100644
--- a/src/server/game/Handlers/MiscHandler.cpp
+++ b/src/server/game/Handlers/MiscHandler.cpp
@@ -209,7 +209,7 @@ void WorldSession::HandleWhoOpcode(WorldPackets::Who::WhoRequestPkt& whoRequest)
{
std::string aName;
if (AreaTableEntry const* areaEntry = GetAreaEntryByAreaID(target->GetZoneId()))
- aName = areaEntry->ZoneName;
+ aName = areaEntry->AreaName_lang;
bool show = false;
for (size_t i = 0; i < wWords.size(); ++i)
diff --git a/src/server/scripts/Commands/cs_go.cpp b/src/server/scripts/Commands/cs_go.cpp
index 90d2b832333..53522736718 100644
--- a/src/server/scripts/Commands/cs_go.cpp
+++ b/src/server/scripts/Commands/cs_go.cpp
@@ -514,7 +514,7 @@ public:
if (map->Instanceable())
{
- handler->PSendSysMessage(LANG_INVALID_ZONE_MAP, areaEntry->ID, areaEntry->ZoneName, map->GetId(), map->GetMapName());
+ handler->PSendSysMessage(LANG_INVALID_ZONE_MAP, areaEntry->ID, areaEntry->AreaName_lang, map->GetId(), map->GetMapName());
handler->SetSentErrorMessage(true);
return false;
}
diff --git a/src/server/scripts/Commands/cs_group.cpp b/src/server/scripts/Commands/cs_group.cpp
index ae7b2039e81..5e5694ba23a 100644
--- a/src/server/scripts/Commands/cs_group.cpp
+++ b/src/server/scripts/Commands/cs_group.cpp
@@ -354,7 +354,7 @@ public:
{
AreaTableEntry const* zone = GetAreaEntryByAreaID(area->ParentAreaID);
if (zone)
- zoneName = zone->ZoneName;
+ zoneName = zone->AreaName_lang;
}
}
else
diff --git a/src/server/scripts/Commands/cs_lookup.cpp b/src/server/scripts/Commands/cs_lookup.cpp
index d8f98e90275..4d1d484cb2f 100644
--- a/src/server/scripts/Commands/cs_lookup.cpp
+++ b/src/server/scripts/Commands/cs_lookup.cpp
@@ -106,7 +106,7 @@ public:
AreaTableEntry const* areaEntry = sAreaStore.LookupEntry(areaflag);
if (areaEntry)
{
- std::string name = areaEntry->ZoneName;
+ std::string name = areaEntry->AreaName_lang;
if (name.empty())
continue;
diff --git a/src/server/scripts/Commands/cs_misc.cpp b/src/server/scripts/Commands/cs_misc.cpp
index 9e537e42d20..61df922452f 100644
--- a/src/server/scripts/Commands/cs_misc.cpp
+++ b/src/server/scripts/Commands/cs_misc.cpp
@@ -236,8 +236,8 @@ public:
handler->PSendSysMessage(LANG_MAP_POSITION,
mapId, (mapEntry ? mapEntry->MapName_lang : unknown),
- zoneId, (zoneEntry ? zoneEntry->ZoneName : unknown),
- areaId, (areaEntry ? areaEntry->ZoneName : unknown),
+ zoneId, (zoneEntry ? zoneEntry->AreaName_lang : unknown),
+ areaId, (areaEntry ? areaEntry->AreaName_lang : unknown),
object->GetPhaseMask(),
object->GetPositionX(), object->GetPositionY(), object->GetPositionZ(), object->GetOrientation());
handler->PSendSysMessage(LANG_GRID_POSITION,
@@ -1762,11 +1762,11 @@ public:
AreaTableEntry const* area = GetAreaEntryByAreaID(areaId);
if (area)
{
- areaName = area->ZoneName;
+ areaName = area->AreaName_lang;
AreaTableEntry const* zone = GetAreaEntryByAreaID(area->ParentAreaID);
if (zone)
- zoneName = zone->ZoneName;
+ zoneName = zone->AreaName_lang;
}
if (target)