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

52
components/esm4/loadcell.cpp
View file

@ -147,19 +147,22 @@ void ESM4::Cell::load(ESM4::Reader& reader)
}
case ESM4::SUB_XOWN:
{
if (subHdr.dataSize == 4 || subHdr.dataSize == 12)
switch (subHdr.dataSize)
{
reader.getFormId(mOwner);
if (subHdr.dataSize == 12)
case 4:
reader.getFormId(mOwner);
break;
case 12:
{
reader.getFormId(mOwner);
std::uint32_t dummy;
reader.get(dummy); // Unknown
reader.get(dummy); // Flags
reader.get(dummy); // No crime flag, FO4
break;
}
}
else
{
reader.skipSubRecordData();
default:
reader.skipSubRecordData();
break;
}
break;
}
@ -177,27 +180,20 @@ void ESM4::Cell::load(ESM4::Reader& reader)
break;
case ESM4::SUB_XCLL:
{
// TES4
if (subHdr.dataSize == 36)
reader.get(&mLighting, 36);
// FO3, FONV
else if (subHdr.dataSize == 40)
reader.get(mLighting);
// TES5
else if (subHdr.dataSize == 92)
switch (subHdr.dataSize)
{
reader.get(mLighting);
reader.skipSubRecordData(52); // FIXME
}
// FO4
else if (subHdr.dataSize == 136)
{
reader.get(mLighting);
reader.skipSubRecordData(96); // FIXME
}
else
{
reader.skipSubRecordData();
case 36: // TES4
reader.get(&mLighting, 36);
break;
case 40: // FO3/FNV
case 92: // TES5 (FIXME)
case 136: // FO4 (FIXME)
reader.get(mLighting);
reader.skipSubRecordData(subHdr.dataSize - 40);
break;
default:
reader.skipSubRecordData();
break;
}
break;
}