diff options
| author | Treeston <treeston.mmoc@gmail.com> | 2018-08-16 12:43:36 +0200 |
|---|---|---|
| committer | Treeston <treeston.mmoc@gmail.com> | 2018-08-16 13:04:58 +0200 |
| commit | 2a50f9202bc36faf2b8b48cf52f2f86d974a4544 (patch) | |
| tree | fb0aad9ecd4bf52339e6d037b864056ec8680e00 /src/server/scripts | |
| parent | 8711c539e1c72f4923ff63e0cc9d6a20c3dc0fa7 (diff) | |
Scritpts/Commands: Fix area name display if no area present. Closes #21727.
Diffstat (limited to 'src/server/scripts')
| -rw-r--r-- | src/server/scripts/Commands/cs_misc.cpp | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/src/server/scripts/Commands/cs_misc.cpp b/src/server/scripts/Commands/cs_misc.cpp index d71a0ed3a65..dbc4aacd19e 100644 --- a/src/server/scripts/Commands/cs_misc.cpp +++ b/src/server/scripts/Commands/cs_misc.cpp @@ -1601,8 +1601,8 @@ public: uint32 mapId; uint32 areaId; uint32 phase = 0; - std::string areaName = handler->GetTrinityString(LANG_UNKNOWN); - std::string zoneName = handler->GetTrinityString(LANG_UNKNOWN); + char const* areaName = nullptr; + char const* zoneName = nullptr; // Guild data print variables defined so that they exist, but are not necessarily used uint32 guildId = 0; @@ -1827,17 +1827,23 @@ public: AreaTableEntry const* area = sAreaTableStore.LookupEntry(areaId); if (area) { - areaName = area->area_name[locale]; + zoneName = area->area_name[locale]; AreaTableEntry const* zone = sAreaTableStore.LookupEntry(area->zone); if (zone) + { + areaName = zoneName; zoneName = zone->area_name[locale]; + } } - if (target) - handler->PSendSysMessage(LANG_PINFO_CHR_MAP, map->name[locale], - (!zoneName.empty() ? zoneName.c_str() : handler->GetTrinityString(LANG_UNKNOWN)), - (!areaName.empty() ? areaName.c_str() : handler->GetTrinityString(LANG_UNKNOWN))); + if (!zoneName) + zoneName = handler->GetTrinityString(LANG_UNKNOWN); + + if (areaName) + handler->PSendSysMessage(LANG_PINFO_CHR_MAP_WITH_AREA, map->name[locale], zoneName, areaName); + else + handler->PSendSysMessage(LANG_PINFO_CHR_MAP, map->name[locale], zoneName); // Output XVII. - XVIX. if they are not empty if (!guildName.empty()) |