krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests 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)
return;
for (typename MWWorld::CellRefList<T>::List::iterator iter (collection.mList.begin());
iter!=collection.mList.end(); ++iter)
if (iter->mRef.mRefNum==state.mRef.mRefNum)
{
// overwrite existing reference
iter->load (state);
return;
}
if (state.mRef.mRefNum.mContentFile != -1)
{
for (typename MWWorld::CellRefList<T>::List::iterator iter (collection.mList.begin());
iter!=collection.mList.end(); ++iter)
if (iter->mRef.mRefNum==state.mRef.mRefNum)
{
// overwrite existing reference
iter->load (state);
return;
}
}
// new reference
MWWorld::LiveCellRef<T> ref (record);