Skip to content

Commit 87da40e

Browse files
committed
Merge branch 'iliketomoveitmoveitprovideditisacell' into 'master'
Insert exterior cells created by moved refs into mSharedExt Closes #8875 See merge request OpenMW/openmw!5067
2 parents dbcedf6 + 189e4a6 commit 87da40e

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

apps/openmw/mwworld/store.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -597,9 +597,10 @@ namespace MWWorld
597597
newCell.mAmbi.mFogDensity = 0;
598598
newCell.updateId();
599599

600-
ESM::Cell* newCellInserted = &mCells.insert(std::make_pair(newCell.mId, newCell)).first->second;
601-
602-
return mExt.insert(std::make_pair(key, newCellInserted)).first->second;
600+
ESM::Cell* newCellInserted = &mCells.emplace(newCell.mId, newCell).first->second;
601+
mExt.emplace(key, newCellInserted);
602+
mSharedExt.emplace_back(newCellInserted);
603+
return newCellInserted;
603604
}
604605
const ESM::Cell* Store<ESM::Cell>::find(const ESM::RefId& id) const
605606
{

0 commit comments

Comments
 (0)