mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-25 15:35:23 +00:00
Code Issues Projects Releases Wiki Activity

Load existing exterior CellStore when required

Browse Source
This commit is contained in:
elsid 2023-06-04 22:27:33 +02:00
parent 01775dd6f0
commit 457fa16e37
No known key found for this signature in database
GPG Key ID: 4DE04C198CBA7625
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
apps/openmw/mwworld/worldmodel.cpp
View File

@ -160,16 +160,26 @@ namespace MWWorld
{
CellStore& WorldModel::getExterior(ESM::ExteriorCellLocation location, bool forceLoad) const
{
auto it = mExteriors.find(location);
if (it != mExteriors.end())
return *it->second;
Cell cell = createExteriorCell(location, mStore);
const ESM::RefId id = cell.getId();
CellStore& cellStore = emplaceCellStore(id, std::move(cell), mStore, mReaders, mCells);
mExteriors.emplace(location, &cellStore);
if (forceLoad && cellStore.getState() != CellStore::State_Loaded)
cellStore.load();
return cellStore;
const auto it = mExteriors.find(location);
CellStore* cellStore = nullptr;
if (it == mExteriors.end())
{
Cell cell = createExteriorCell(location, mStore);
const ESM::RefId id = cell.getId();
cellStore = &emplaceCellStore(id, std::move(cell), mStore, mReaders, mCells);
mExteriors.emplace(location, cellStore);
}
else
{
assert(it->second != nullptr);
cellStore = it->second;
}
if (forceLoad && cellStore->getState() != CellStore::State_Loaded)
cellStore->load();
return *cellStore;
}
CellStore* WorldModel::findInterior(std::string_view name, bool forceLoad) const