Archive/openmw
0
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-04-28 21:07:59 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 40

ESM4: use switch-cases when relevant

Browse source
This commit is contained in:
Alexei Kotov 2023-08-17 21:39:50 +03:00
parent 42c6b3b993
commit 1a62b2e6b5
9 changed files with 168 additions and 160 deletions
Download patch file Download diff file Expand all files Collapse all files

30
components/esm4/loadbook.cpp
View file

@ -53,30 +53,32 @@ void ESM4::Book::load(ESM4::Reader& reader)
break;
case ESM4::SUB_DATA:
{
if (subHdr.dataSize == 8 || subHdr.dataSize == 10 || subHdr.dataSize == 16)
switch (subHdr.dataSize)
{
// TES4, FO3, FNV
if (subHdr.dataSize == 10)
{
case 10: // TES4, FO3, FNV
reader.get(mData.flags);
reader.get(mData.bookSkill);
}
// TES5
else if (subHdr.dataSize == 16)
reader.get(mData.value);
reader.get(mData.weight);
break;
case 16: // TES5
{
reader.get(mData.flags);
reader.get(mData.type);
std::uint16_t dummy;
reader.get(dummy);
reader.get(mData.teaches);
reader.get(mData.value);
reader.get(mData.weight);
break;
}
// else: FO4
reader.get(mData.value);
reader.get(mData.weight);
}
else
{
reader.skipSubRecordData();
case 8: // FO4
reader.get(mData.value);
reader.get(mData.weight);
break;
default:
reader.skipSubRecordData();
break;
}
break;
}