mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-03-27 12:40:25 +00:00
Code Issues Releases Wiki Activity

Merge branch 'morecicells' into 'master'

Browse source 
Fix more case issues with cells

See merge request OpenMW/openmw!2648
This commit is contained in:
Alexei Kotov 2023-01-25 22:16:22 +00:00
commit 0f9bb71534
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/openmw/mwworld/worldmodel.cpp
View file

@ -233,15 +233,15 @@ const ESM::Cell* MWWorld::WorldModel::getESMCellByName(std::string_view name)
// treat "Wilderness" like an empty string // treat "Wilderness" like an empty string
static const std::string& defaultName static const std::string& defaultName
= mStore.get<ESM::GameSetting>().find("sDefaultCellname")->mValue.getString(); = mStore.get<ESM::GameSetting>().find("sDefaultCellname")->mValue.getString();
if (name == defaultName) if (Misc::StringUtils::ciEqual(name, defaultName))
cell = mStore.get<ESM::Cell>().searchExtByName(""); cell = mStore.get<ESM::Cell>().searchExtByName({});
} }
if (!cell) if (!cell)
{ {
// now check for regions // now check for regions
for (const ESM::Region& region : mStore.get<ESM::Region>()) for (const ESM::Region& region : mStore.get<ESM::Region>())
{ {
if (name == region.mName) if (Misc::StringUtils::ciEqual(name, region.mName))
{ {
cell = mStore.get<ESM::Cell>().searchExtByRegion(region.mId); cell = mStore.get<ESM::Cell>().searchExtByRegion(region.mId);
break; break;