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

Simplify skipping moved references (thanks scrawl)

Browse source
This commit is contained in:
cc9cii 2014-11-30 04:00:06 +11:00
parent 33c454e073
commit 5ae1554a75
1 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
components/esm/loadcell.cpp
View file

@ -177,17 +177,10 @@ bool Cell::getNextRef(ESMReader &esm, CellRef &ref, bool& deleted)
// NOTE: We should not need this check. It is a safety check until we have checked
// more plugins, and how they treat these moved references.
if (esm.isNextSub("MVRF")) {
esm.skipRecord(); // skip MVRF
esm.skipRecord(); // skip CNDT
// 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())
// skip rest of cell record (moved references), they are handled elsewhere
esm.skipRecord(); // skip MVRF, CNDT
return false;
}
ref.load (esm);