mirror of
https://github.com/TES3MP/openmw-tes3mp.git
synced 2025-02-22 11:09:40 +00:00
Bug #1319: Fix references not coming from a content file incorrectly overwriting each other
This commit is contained in:
parent
e7a004824c
commit
136813a882
1 changed files with 11 additions and 8 deletions
|
@ -92,6 +92,8 @@ namespace
|
||||||
if (!record)
|
if (!record)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
if (state.mRef.mRefNum.mContentFile != -1)
|
||||||
|
{
|
||||||
for (typename MWWorld::CellRefList<T>::List::iterator iter (collection.mList.begin());
|
for (typename MWWorld::CellRefList<T>::List::iterator iter (collection.mList.begin());
|
||||||
iter!=collection.mList.end(); ++iter)
|
iter!=collection.mList.end(); ++iter)
|
||||||
if (iter->mRef.mRefNum==state.mRef.mRefNum)
|
if (iter->mRef.mRefNum==state.mRef.mRefNum)
|
||||||
|
@ -100,6 +102,7 @@ namespace
|
||||||
iter->load (state);
|
iter->load (state);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// new reference
|
// new reference
|
||||||
MWWorld::LiveCellRef<T> ref (record);
|
MWWorld::LiveCellRef<T> ref (record);
|
||||||
|
|
Loading…
Reference in a new issue