Skip to content

Commit

Permalink
Merge branch 'getcellnametes4' into 'master'
Browse files Browse the repository at this point in the history
Use the display name instead of the editor ID for World::getCellName

See merge request OpenMW/openmw!3564
  • Loading branch information
Assumeru committed Nov 7, 2023
2 parents 5356f54 + 88749b0 commit 76843af
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions apps/openmw/mwworld/worldimp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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); },
Expand Down

0 comments on commit 76843af

Please sign in to comment.