mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-03-29 03:36:40 +00:00
Code Issues 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

19
components/esm4/loadnavm.cpp
View file

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