mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-20 15:40:32 +00:00
Code Issues Projects Releases Wiki Activity

fix oblivion and skyrim

Browse Source
This commit is contained in:
florent.teppe 2023-03-26 14:13:06 +02:00
parent 34dd24b261
commit 464092e323
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apps/openmw/mwworld/cellstore.cpp
View File

@ -766,21 +766,22 @@ namespace MWWorld
{
auto stream = Files::openBinaryInputFileStream(cell.mReaderContext.filename);
const ESM::Format format = ESM::readFormat(*stream);
assert(format == ESM::Tes4);
assert(format == ESM::Format::Tes4);
stream->seekg(0);
ESM4::Reader readerESM4(
std::move(stream), cell.mReaderContext.filename, MWBase::Environment::get().getResourceSystem()->getVFS());
readerESM4.setEncoder(readers.getStatelessEncoder());
bool contextValid = cell.mReaderContext.filePos != -1;
bool contextValid = cell.mReaderContext.filePos != std::numeric_limits<std::size_t>::max();
if (contextValid)
readerESM4.restoreContext(cell.mReaderContext);
while ((ESM::RefId::formIdRefId(readerESM4.getContext().currCell) == cell.mId || !contextValid)
&& readerESM4.hasMoreRecs())
{
readerESM4.exitGroupCheck();
if (!contextValid)
readerESM4.exitGroupCheck();
if (!ESM4::ReaderUtils::readItem(
readerESM4,
[&](ESM4::Reader& reader) {
@ -788,6 +789,7 @@ namespace MWWorld
ESM::RecNameInts esm4RecName = static_cast<ESM::RecNameInts>(ESM::esm4Recname(recordType));
if (esm4RecName == ESM::RecNameInts::REC_REFR4 && contextValid)
{
reader.getRecordData();
ESM4::Reference ref;
ref.load(reader);
invocable(ref);
@ -795,6 +797,7 @@ namespace MWWorld
}
else if (esm4RecName == ESM::RecNameInts::REC_CELL4)
{
reader.getRecordData();
ESM4::Cell cellToLoad;
cellToLoad.load(reader); // This is necessary to exit or to find the correct cell
if (cellToLoad.mId == cell.mId)

2
components/esm4/reader.cpp
View File

@ -134,7 +134,7 @@ namespace ESM4
ReaderContext Reader::getContext()
{
mCtx.filePos = mStream->tellg();
if (mCtx.filePos == -1)
if (mCtx.filePos == std::numeric_limits<std::size_t>::max())
return mCtx;
mCtx.filePos -= mCtx.recHeaderSize; // update file position
return mCtx;