teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Check whether any subrecords remain after skipping moved references. Should resolve bug #2070.

Browse source
This commit is contained in:
cc9cii 2014-11-29 20:39:25 +11:00
parent dadc089ddb
commit 33c454e073
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
components/esm/loadcell.cpp
View file

@ -182,6 +182,13 @@ bool Cell::getNextRef(ESMReader &esm, CellRef &ref, bool& deleted)
// That should be it, I haven't seen any other fields yet. // That should be it, I haven't seen any other fields yet.
} }
// If moved references are not handled then it is possible that CellRef::load() can lead
// to strange results because ESMReader::isNextSub("xxx") will always return false when
// there are no more subrecords. When moved references are handled properly by OpenCS
// below 2 lines can be removed.
if (!esm.hasMoreSubs())
return false;
ref.load (esm); ref.load (esm);
// Identify references belonging to a parent file and adapt the ID accordingly. // Identify references belonging to a parent file and adapt the ID accordingly.