mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-29 09:45:32 +00:00
Code Issues Releases Wiki Activity

updateMergedRefs before reading MVRF tags (Fixes #3161)

Browse source
This commit is contained in:
scrawl 2016-02-03 19:12:46 +01:00
parent 2eda495f89
commit 69c2c4fcc1
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/openmw/mwworld/cellstore.cpp
View file

@ -807,6 +807,10 @@ namespace MWWorld
} }
} }
// Do another update here to make sure objects referred to by MVRF tags can be found
// This update is only needed for old saves that used the old copy&delete way of moving objects
updateMergedRefs();
while (reader.isNextSub("MVRF")) while (reader.isNextSub("MVRF"))
{ {
reader.cacheSubName(); reader.cacheSubName();
@ -848,8 +852,6 @@ namespace MWWorld
moveTo(MWWorld::Ptr(movedRef, this), otherCell); moveTo(MWWorld::Ptr(movedRef, this), otherCell);
} }
updateMergedRefs();
} }
bool operator== (const CellStore& left, const CellStore& right) bool operator== (const CellStore& left, const CellStore& right)