mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-06-19 19:41:33 +00:00
Code Issues Releases Wiki Activity

Merge branch 'getcellnametes4' into 'master'

Browse source 
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
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/openmw/mwworld/worldimp.cpp
View file

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