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

Bug #1319: Fix references not coming from a content file incorrectly overwriting each other

Browse Source
This commit is contained in:
scrawl 2014-05-10 00:00:36 +02:00
parent e7a004824c
commit 136813a882
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
apps/openmw/mwworld/cellstore.cpp
View File

@ -92,14 +92,17 @@ namespace
if (!record) if (!record)
return; return;
for (typename MWWorld::CellRefList<T>::List::iterator iter (collection.mList.begin()); if (state.mRef.mRefNum.mContentFile != -1)
iter!=collection.mList.end(); ++iter) {
if (iter->mRef.mRefNum==state.mRef.mRefNum) for (typename MWWorld::CellRefList<T>::List::iterator iter (collection.mList.begin());
{ iter!=collection.mList.end(); ++iter)
// overwrite existing reference if (iter->mRef.mRefNum==state.mRef.mRefNum)
iter->load (state); {
return; // overwrite existing reference
} iter->load (state);
return;
}
}
// new reference // new reference
MWWorld::LiveCellRef<T> ref (record); MWWorld::LiveCellRef<T> ref (record);