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

Use VER_100 named constant, note precautions

Browse source
This commit is contained in:
Alexei Kotov 2023-08-17 21:36:49 +03:00
parent 9da6ce23e9
commit 42c6b3b993
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
components/esm4/loadnavi.cpp
View file

@ -249,8 +249,9 @@ void ESM4::Navigation::load(ESM4::Reader& reader)
} }
case ESM4::SUB_NVPP: case ESM4::SUB_NVPP:
{ {
// FO4 // FIXME: this is both the version for FO4 and for some TES4 files
if (esmVer == 0x3F800000) // How to distinguish?
if (esmVer == ESM::VER_100)
{ {
reader.skipSubRecordData(); reader.skipSubRecordData();
break; break;
@ -339,9 +340,11 @@ void ESM4::Navigation::load(ESM4::Reader& reader)
} }
case ESM4::SUB_NVMI: // multiple case ESM4::SUB_NVMI: // multiple
{ {
if (esmVer == ESM::VER_094 || esmVer == ESM::VER_170 || isFONV || esmVer == 0x3F800000) // Can only read TES4 navmesh data
// Note FO4 FIXME above
if (esmVer == ESM::VER_094 || esmVer == ESM::VER_170 || isFONV || esmVer == ESM::VER_100)
{ {
reader.skipSubRecordData(); // FIXME: FO3+ have different form of NavMeshInfo reader.skipSubRecordData();
break; break;
} }

4
components/esm4/loadnavm.cpp
View file

@ -211,7 +211,9 @@ void ESM4::NavMesh::load(ESM4::Reader& reader)
{ {
case ESM4::SUB_NVNM: case ESM4::SUB_NVNM:
{ {
if (esmVer == 0x3F800000) // See FIXME in ESM4::Navigation::load.
// FO4 updates the format
if (esmVer == ESM::VER_100)
{ {
reader.skipSubRecordData(); reader.skipSubRecordData();
break; break;