1
0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-25 21:41:04 +00:00

Merge branch 'getcellnametes4' into 'master'

Use the display name instead of the editor ID for World::getCellName

See merge request OpenMW/openmw!3564
This commit is contained in:
Evil Eye 2023-11-07 16:45:55 +00:00
commit 76843aff19

View File

@ -660,8 +660,8 @@ namespace MWWorld
std::string_view World::getCellName(const MWWorld::Cell& cell) const
{
if (!cell.isExterior() || !cell.getNameId().empty())
return cell.getNameId();
if (!cell.isExterior() || !cell.getDisplayName().empty())
return cell.getDisplayName();
return ESM::visit(ESM::VisitOverload{
[&](const ESM::Cell& cellIn) -> std::string_view { return getCellName(&cellIn); },