mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-29 22:20:33 +00:00
Code Issues Projects Releases Wiki Activity

ESM4::NAVM: fix loading of NVNM after XXXX

Browse Source
This commit is contained in:
Alexei Kotov 2023-08-16 21:16:24 +03:00
parent 8822df7e4a
commit ae828064a4
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
components/esm4/loadnavm.cpp
View File

@ -207,14 +207,25 @@ void ESM4::NavMesh::load(ESM4::Reader& reader)
#endif
while (reader.getSubRecordHeader())
{
switch (reader.subRecordHeader().typeId)
const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
switch (subHdr.typeId)
{
case ESM4::SUB_NVNM:
{
// FIXME: FO4 appears to have a different format
if (esmVer == 0x3F800000)
{
reader.skipSubRecordData();
// TODO: check if any valid TES5 plugin prepends XXXX to NVNM
if (subSize)
{
reader.skipSubRecordData(subSize);
reader.updateRecordRead(subSize);
subSize = 0;
}
else
{
// FIXME: FO4 appears to have a different format
reader.skipSubRecordData();
}
break;
}
@ -235,7 +246,6 @@ void ESM4::NavMesh::load(ESM4::Reader& reader)
}
else
{
const ESM4::SubRecordHeader& subHdr = reader.subRecordHeader();
Log(Debug::Verbose) << ESM::printName(subHdr.typeId) << " skipping...";
reader.skipSubRecordData(); // FIXME: process the subrecord rather than skip
}
@ -257,8 +267,7 @@ void ESM4::NavMesh::load(ESM4::Reader& reader)
reader.skipSubRecordData();
break;
default:
throw std::runtime_error(
"ESM4::NAVM::load - Unknown subrecord " + ESM::printName(reader.subRecordHeader().typeId));
throw std::runtime_error("ESM4::NAVM::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
}
}
// std::cout << "num nvnm " << std::dec << mData.size() << std::endl; // FIXME