mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-06-27 06:41:37 +00:00
Code Issues Releases Wiki Activity

Initial changes to detect when context isn't usable

Browse source
This commit is contained in:
florent.teppe 2023-03-26 11:34:21 +02:00
parent ba1f91661f
commit 34dd24b261
2 changed files with 41 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -6,6 +6,7 @@
#include <components/debug/debuglog.hpp> #include <components/debug/debuglog.hpp>
#include <components/esm/format.hpp>
#include <components/esm3/cellid.hpp> #include <components/esm3/cellid.hpp>
#include <components/esm3/cellref.hpp> #include <components/esm3/cellref.hpp>
#include <components/esm3/cellstate.hpp> #include <components/esm3/cellstate.hpp>
@ -764,21 +765,28 @@ namespace MWWorld
static void visitCell4References(const ESM4::Cell& cell, ESM::ReadersCache& readers, ReferenceInvocable&& invocable) static void visitCell4References(const ESM4::Cell& cell, ESM::ReadersCache& readers, ReferenceInvocable&& invocable)
{ {
auto stream = Files::openBinaryInputFileStream(cell.mReaderContext.filename); auto stream = Files::openBinaryInputFileStream(cell.mReaderContext.filename);
const ESM::Format format = ESM::readFormat(*stream);
assert(format == ESM::Tes4);
stream->seekg(0);
ESM4::Reader readerESM4( ESM4::Reader readerESM4(
std::move(stream), cell.mReaderContext.filename, MWBase::Environment::get().getResourceSystem()->getVFS()); std::move(stream), cell.mReaderContext.filename, MWBase::Environment::get().getResourceSystem()->getVFS());
readerESM4.setEncoder(readers.getStatelessEncoder()); readerESM4.setEncoder(readers.getStatelessEncoder());
bool contextValid = cell.mReaderContext.filePos != -1;
if (contextValid)
readerESM4.restoreContext(cell.mReaderContext); readerESM4.restoreContext(cell.mReaderContext);
bool continueRead = true;
while (ESM::RefId::formIdRefId(readerESM4.getContext().currCell) == cell.mId && readerESM4.hasMoreRecs() while ((ESM::RefId::formIdRefId(readerESM4.getContext().currCell) == cell.mId || !contextValid)
&& continueRead) && readerESM4.hasMoreRecs())
{ {
continueRead = ESM4::ReaderUtils::readItem( readerESM4.exitGroupCheck();
if (!ESM4::ReaderUtils::readItem(
readerESM4, readerESM4,
[&](ESM4::Reader& reader) { [&](ESM4::Reader& reader) {
auto recordType = static_cast<ESM4::RecordTypes>(reader.hdr().record.typeId); auto recordType = static_cast<ESM4::RecordTypes>(reader.hdr().record.typeId);
ESM::RecNameInts esm4RecName = static_cast<ESM::RecNameInts>(ESM::esm4Recname(recordType)); ESM::RecNameInts esm4RecName = static_cast<ESM::RecNameInts>(ESM::esm4Recname(recordType));
if (esm4RecName == ESM::RecNameInts::REC_REFR4) if (esm4RecName == ESM::RecNameInts::REC_REFR4 && contextValid)
{ {
ESM4::Reference ref; ESM4::Reference ref;
ref.load(reader); ref.load(reader);
@ -788,11 +796,18 @@ namespace MWWorld
else if (esm4RecName == ESM::RecNameInts::REC_CELL4) else if (esm4RecName == ESM::RecNameInts::REC_CELL4)
{ {
ESM4::Cell cellToLoad; ESM4::Cell cellToLoad;
cellToLoad.load(reader); // This is necessary to exit cellToLoad.load(reader); // This is necessary to exit or to find the correct cell
if (cellToLoad.mId == cell.mId)
contextValid = true;
return true;
} }
return false; return false;
}, },
[&](ESM4::Reader& reader) {}); [&](ESM4::Reader& reader) {}))
{
break;
}
} }
} }

2
components/esm4/reader.cpp
View file

@ -134,6 +134,8 @@ namespace ESM4
ReaderContext Reader::getContext() ReaderContext Reader::getContext()
{ {
mCtx.filePos = mStream->tellg(); mCtx.filePos = mStream->tellg();
if (mCtx.filePos == -1)
return mCtx;
mCtx.filePos -= mCtx.recHeaderSize; // update file position mCtx.filePos -= mCtx.recHeaderSize; // update file position
return mCtx; return mCtx;
} }