mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-28 21:39:48 +00:00
Code Issues Releases Wiki Activity

Maybe load FO4 book records

Browse source
This commit is contained in:
Alexei Kotov 2023-08-16 05:41:13 +03:00
parent aedcc28294
commit d9ebdc6e41
1 changed files with 28 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
components/esm4/loadbook.cpp
View file

@ -53,22 +53,31 @@ void ESM4::Book::load(ESM4::Reader& reader)
break; break;
case ESM4::SUB_DATA: case ESM4::SUB_DATA:
{ {
reader.get(mData.flags); if (subHdr.dataSize == 8 || subHdr.dataSize == 10 || subHdr.dataSize == 16)
// if (reader.esmVersion() == ESM::VER_094 || reader.esmVersion() == ESM::VER_170)
if (subHdr.dataSize == 16) // FO3 has 10 bytes even though VER_094
{ {
static std::uint8_t dummy; // TES4, FO3, FNV
reader.get(mData.type); if (subHdr.dataSize == 10)
reader.get(dummy); {
reader.get(dummy); reader.get(mData.flags);
reader.get(mData.teaches); reader.get(mData.bookSkill);
}
// TES5
else if (subHdr.dataSize == 16)
{
reader.get(mData.flags);
reader.get(mData.type);
std::uint16_t dummy;
reader.get(dummy);
reader.get(mData.teaches);
}
// else: FO4
reader.get(mData.value);
reader.get(mData.weight);
} }
else else
{ {
reader.get(mData.bookSkill); reader.skipSubRecordData();
} }
reader.get(mData.value);
reader.get(mData.weight);
break; break;
} }
case ESM4::SUB_ICON: case ESM4::SUB_ICON:
@ -94,8 +103,11 @@ void ESM4::Book::load(ESM4::Reader& reader)
break; break;
case ESM4::SUB_ZNAM: case ESM4::SUB_ZNAM:
reader.getFormId(mDropSound); reader.getFormId(mDropSound);
break; // TODO: does this exist? break;
case ESM4::SUB_MODT: case ESM4::SUB_MODT: // Model data
case ESM4::SUB_MODC:
case ESM4::SUB_MODS:
case ESM4::SUB_MODF: // Model data end
case ESM4::SUB_OBND: case ESM4::SUB_OBND:
case ESM4::SUB_KSIZ: case ESM4::SUB_KSIZ:
case ESM4::SUB_KWDA: case ESM4::SUB_KWDA:
@ -111,6 +123,9 @@ void ESM4::Book::load(ESM4::Reader& reader)
case ESM4::SUB_DSTA: case ESM4::SUB_DSTA:
case ESM4::SUB_DSTD: case ESM4::SUB_DSTD:
case ESM4::SUB_DSTF: // Destructible end case ESM4::SUB_DSTF: // Destructible end
case ESM4::SUB_DNAM: // FO4
case ESM4::SUB_FIMD: // FO4
case ESM4::SUB_MICO: // FO4
case ESM4::SUB_PTRN: // FO4 case ESM4::SUB_PTRN: // FO4
reader.skipSubRecordData(); reader.skipSubRecordData();
break; break;