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

50
components/esm4/loadrefr.cpp
View file

@ -67,19 +67,22 @@ void ESM4::Reference::load(ESM4::Reader& reader)
break;
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;
}
@ -99,22 +102,27 @@ void ESM4::Reference::load(ESM4::Reader& reader)
}
case ESM4::SUB_XTEL:
{
if (subHdr.dataSize == 28 || subHdr.dataSize == 32 || subHdr.dataSize == 36)
switch (subHdr.dataSize)
{
reader.getFormId(mDoor.destDoor);
reader.get(mDoor.destPos);
mDoor.flags = 0;
if (subHdr.dataSize == 32 || subHdr.dataSize == 36)
case 28:
case 32: // FO3, FNV, TES5
case 36: // FO4
{
reader.get(mDoor.flags);
// FO4
if (subHdr.dataSize == 36)
reader.getFormId(mDoor.transitionInt);
reader.getFormId(mDoor.destDoor);
reader.get(mDoor.destPos);
mDoor.flags = 0;
if (subHdr.dataSize >= 32)
{
reader.get(mDoor.flags);
// FO4
if (subHdr.dataSize == 36)
reader.getFormId(mDoor.transitionInt);
}
break;
}
}
else
{
reader.skipSubRecordData();
default:
reader.skipSubRecordData();
break;
}
break;
}