mirror
/
openmw
mirror of https://github.com/OpenMW/openmw.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Skip more CIS1/CIS2 and skip all PRTN subrecords

Browse Source 
Avoid formatting problems with newly added skipped FO4 blocks
macos_ci_fix
Alexei Kotov 1 year ago
parent 3118800dbd
commit db6f76fea8
20 changed files with 88 additions and 71 deletions
Show Stats Download Patch File Download Diff File

15
components/esm4/loadacti.cpp
Unescape Escape View File

@ -95,14 +95,13 @@ void ESM4::Activator::load(ESM4::Reader& reader)
case ESM4::SUB_CIS2: case ESM4::SUB_CIS2:
case ESM4::SUB_CITC: case ESM4::SUB_CITC:
case ESM4::SUB_NVNM: case ESM4::SUB_NVNM:
// Introduced in FO4 case ESM4::SUB_ATTX: // FO4
case ESM4::SUB_ATTX: case ESM4::SUB_FTYP: // FO4
case ESM4::SUB_FTYP: case ESM4::SUB_NTRM: // FO4
case ESM4::SUB_NTRM: case ESM4::SUB_PTRN: // FO4
case ESM4::SUB_PTRN: case ESM4::SUB_PRPS: // FO4
case ESM4::SUB_PRPS: case ESM4::SUB_RADR: // FO4
case ESM4::SUB_RADR: case ESM4::SUB_STCP: // FO4
case ESM4::SUB_STCP:
reader.skipSubRecordData(); reader.skipSubRecordData();
break; break;
default: default:

7
components/esm4/loadalch.cpp
Unescape Escape View File

@ -107,10 +107,9 @@ void ESM4::Potion::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
// FO4 case ESM4::SUB_DNAM: // FO4
case ESM4::SUB_DNAM: case ESM4::SUB_PTRN: // FO4
case ESM4::SUB_PTRN: case ESM4::SUB_CUSD: // FO4
case ESM4::SUB_CUSD:
reader.skipSubRecordData(); reader.skipSubRecordData();
break; break;
default: default:

1
components/esm4/loadammo.cpp
Unescape Escape View File

@ -146,6 +146,7 @@ void ESM4::Ammunition::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_PTRN: // FO4
reader.skipSubRecordData(); reader.skipSubRecordData();
break; break;
default: default:

1
components/esm4/loadarmo.cpp
Unescape Escape View File

@ -200,6 +200,7 @@ void ESM4::Armor::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_PTRN: // FO4
reader.skipSubRecordData(); reader.skipSubRecordData();
break; break;
default: default:

1
components/esm4/loadbook.cpp
Unescape Escape View File

@ -111,6 +111,7 @@ 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_PTRN: // FO4
reader.skipSubRecordData(); reader.skipSubRecordData();
break; break;
default: default:

1
components/esm4/loadcont.cpp
Unescape Escape View File

@ -91,6 +91,7 @@ void ESM4::Container::load(ESM4::Reader& reader)
case ESM4::SUB_DSTF: // Destructible end case ESM4::SUB_DSTF: // Destructible end
case ESM4::SUB_RNAM: // FONV case ESM4::SUB_RNAM: // FONV
case ESM4::SUB_PRPS: // FO4 case ESM4::SUB_PRPS: // FO4
case ESM4::SUB_PTRN: // FO4
reader.skipSubRecordData(); reader.skipSubRecordData();
break; break;
default: default:

1
components/esm4/loaddoor.cpp
Unescape Escape View File

@ -84,6 +84,7 @@ void ESM4::Door::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_PTRN: // FO4
reader.skipSubRecordData(); reader.skipSubRecordData();
break; break;
default: default:

3
components/esm4/loadflor.cpp
Unescape Escape View File

@ -81,7 +81,8 @@ void ESM4::Flora::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_PRPS: case ESM4::SUB_PRPS: // FO4
case ESM4::SUB_PTRN: // FO4
reader.skipSubRecordData(); reader.skipSubRecordData();
break; break;
default: default:

3
components/esm4/loadfurn.cpp
Unescape Escape View File

@ -85,6 +85,9 @@ void ESM4::Furniture::load(ESM4::Reader& reader)
case ESM4::SUB_XMRK: case ESM4::SUB_XMRK:
case ESM4::SUB_PRPS: case ESM4::SUB_PRPS:
case ESM4::SUB_CTDA: case ESM4::SUB_CTDA:
case ESM4::SUB_CIS1:
case ESM4::SUB_CIS2:
case ESM4::SUB_PTRN: // FO4
reader.skipSubRecordData(); reader.skipSubRecordData();
break; break;
default: default:

1
components/esm4/loadkeym.cpp
Unescape Escape View File

@ -85,6 +85,7 @@ void ESM4::Key::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_PTRN: // FO4
reader.skipSubRecordData(); reader.skipSubRecordData();
break; break;
default: default:

3
components/esm4/loadligh.cpp
Unescape Escape View File

@ -111,7 +111,8 @@ void ESM4::Light::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_PRPS: case ESM4::SUB_PRPS: // FO4
case ESM4::SUB_PTRN: // FO4
reader.skipSubRecordData(); reader.skipSubRecordData();
break; break;
default: default:

1
components/esm4/loadmisc.cpp
Unescape Escape View File

@ -87,6 +87,7 @@ void ESM4::MiscItem::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_PTRN: // FO4
reader.skipSubRecordData(); reader.skipSubRecordData();
break; break;
default: default:

1
components/esm4/loadmstt.cpp
Unescape Escape View File

@ -68,6 +68,7 @@ void ESM4::MovableStatic::load(ESM4::Reader& reader)
case ESM4::SUB_FULL: case ESM4::SUB_FULL:
case ESM4::SUB_MODB: case ESM4::SUB_MODB:
case ESM4::SUB_PRPS: case ESM4::SUB_PRPS:
case ESM4::SUB_PTRN: // FO4
reader.skipSubRecordData(); reader.skipSubRecordData();
break; break;
default: default:

1
components/esm4/loadnote.cpp
Unescape Escape View File

@ -60,6 +60,7 @@ void ESM4::Note::load(ESM4::Reader& reader)
case ESM4::SUB_TNAM: case ESM4::SUB_TNAM:
case ESM4::SUB_XNAM: case ESM4::SUB_XNAM:
case ESM4::SUB_OBND: case ESM4::SUB_OBND:
case ESM4::SUB_PTRN: // FO4
reader.skipSubRecordData(); reader.skipSubRecordData();
break; break;
default: default:

1
components/esm4/loadnpc.cpp
Unescape Escape View File

@ -278,6 +278,7 @@ void ESM4::Npc::load(ESM4::Reader& reader)
case ESM4::SUB_NAM4: // FO3 case ESM4::SUB_NAM4: // FO3
case ESM4::SUB_COED: // FO3 case ESM4::SUB_COED: // FO3
case ESM4::SUB_PRPS: // FO4 case ESM4::SUB_PRPS: // FO4
case ESM4::SUB_PTRN: // FO4
reader.skipSubRecordData(); reader.skipSubRecordData();
break; break;
default: default:

104
components/esm4/loadrace.cpp
Unescape Escape View File

@ -702,6 +702,9 @@ void ESM4::Race::load(ESM4::Reader& reader)
case ESM4::SUB_WKMV: case ESM4::SUB_WKMV:
case ESM4::SUB_SPMV: case ESM4::SUB_SPMV:
case ESM4::SUB_ATKR: case ESM4::SUB_ATKR:
case ESM4::SUB_CTDA:
case ESM4::SUB_CIS1:
case ESM4::SUB_CIS2:
// //
case ESM4::SUB_YNAM: // FO3 case ESM4::SUB_YNAM: // FO3
case ESM4::SUB_NAM2: // FO3 case ESM4::SUB_NAM2: // FO3
@ -709,57 +712,56 @@ void ESM4::Race::load(ESM4::Reader& reader)
case ESM4::SUB_MODT: // FO3 case ESM4::SUB_MODT: // FO3
case ESM4::SUB_MODD: // FO3 case ESM4::SUB_MODD: // FO3
case ESM4::SUB_ONAM: // FO3 case ESM4::SUB_ONAM: // FO3
// FO4 case ESM4::SUB_APPR: // FO4
case ESM4::SUB_APPR: case ESM4::SUB_ATKS: // FO4
case ESM4::SUB_ATKS: case ESM4::SUB_ATKT: // FO4
case ESM4::SUB_ATKT: case ESM4::SUB_ATKW: // FO4
case ESM4::SUB_ATKW: case ESM4::SUB_BMMP: // FO4
case ESM4::SUB_BMMP: case ESM4::SUB_BSMB: // FO4
case ESM4::SUB_BSMB: case ESM4::SUB_BSMP: // FO4
case ESM4::SUB_BSMP: case ESM4::SUB_BSMS: // FO4
case ESM4::SUB_BSMS:
case ESM4::SUB_CTDA: case ESM4::SUB_FMRI: // FO4
case ESM4::SUB_FMRI: case ESM4::SUB_FMRN: // FO4
case ESM4::SUB_FMRN: case ESM4::SUB_HLTX: // FO4
case ESM4::SUB_HLTX: case ESM4::SUB_MLSI: // FO4
case ESM4::SUB_MLSI: case ESM4::SUB_MPGN: // FO4
case ESM4::SUB_MPGN: case ESM4::SUB_MPGS: // FO4
case ESM4::SUB_MPGS: case ESM4::SUB_MPPC: // FO4
case ESM4::SUB_MPPC: case ESM4::SUB_MPPF: // FO4
case ESM4::SUB_MPPF: case ESM4::SUB_MPPI: // FO4
case ESM4::SUB_MPPI: case ESM4::SUB_MPPK: // FO4
case ESM4::SUB_MPPK: case ESM4::SUB_MPPM: // FO4
case ESM4::SUB_MPPM: case ESM4::SUB_MPPN: // FO4
case ESM4::SUB_MPPN: case ESM4::SUB_MPPT: // FO4
case ESM4::SUB_MPPT: case ESM4::SUB_MSID: // FO4
case ESM4::SUB_MSID: case ESM4::SUB_MSM0: // FO4
case ESM4::SUB_MSM0: case ESM4::SUB_MSM1: // FO4
case ESM4::SUB_MSM1: case ESM4::SUB_NNAM: // FO4
case ESM4::SUB_NNAM: case ESM4::SUB_NTOP: // FO4
case ESM4::SUB_NTOP: case ESM4::SUB_PRPS: // FO4
case ESM4::SUB_PRPS: case ESM4::SUB_PTOP: // FO4
case ESM4::SUB_PTOP: case ESM4::SUB_QSTI: // FO4
case ESM4::SUB_QSTI: case ESM4::SUB_RBPC: // FO4
case ESM4::SUB_RBPC: case ESM4::SUB_SADD: // FO4
case ESM4::SUB_SADD: case ESM4::SUB_SAKD: // FO4
case ESM4::SUB_SAKD: case ESM4::SUB_SAPT: // FO4
case ESM4::SUB_SAPT: case ESM4::SUB_SGNM: // FO4
case ESM4::SUB_SGNM: case ESM4::SUB_SRAC: // FO4
case ESM4::SUB_SRAC: case ESM4::SUB_SRAF: // FO4
case ESM4::SUB_SRAF: case ESM4::SUB_STCP: // FO4
case ESM4::SUB_STCP: case ESM4::SUB_STKD: // FO4
case ESM4::SUB_STKD: case ESM4::SUB_TETI: // FO4
case ESM4::SUB_TETI: case ESM4::SUB_TTEB: // FO4
case ESM4::SUB_TTEB: case ESM4::SUB_TTEC: // FO4
case ESM4::SUB_TTEC: case ESM4::SUB_TTED: // FO4
case ESM4::SUB_TTED: case ESM4::SUB_TTEF: // FO4
case ESM4::SUB_TTEF: case ESM4::SUB_TTET: // FO4
case ESM4::SUB_TTET: case ESM4::SUB_TTGE: // FO4
case ESM4::SUB_TTGE: case ESM4::SUB_TTGP: // FO4
case ESM4::SUB_TTGP: case ESM4::SUB_UNWP: // FO4
case ESM4::SUB_UNWP: case ESM4::SUB_WMAP: // FO4
case ESM4::SUB_WMAP: case ESM4::SUB_ZNAM: // FO4
case ESM4::SUB_ZNAM:
reader.skipSubRecordData(); reader.skipSubRecordData();
break; break;
default: default:

1
components/esm4/loadscol.cpp
Unescape Escape View File

@ -51,6 +51,7 @@ void ESM4::StaticCollection::load(ESM4::Reader& reader)
case ESM4::SUB_MODT: case ESM4::SUB_MODT:
case ESM4::SUB_ONAM: case ESM4::SUB_ONAM:
case ESM4::SUB_DATA: case ESM4::SUB_DATA:
case ESM4::SUB_PTRN: // FO4
reader.skipSubRecordData(); reader.skipSubRecordData();
break; break;
default: default:

11
components/esm4/loadstat.cpp
Unescape Escape View File

@ -89,12 +89,11 @@ void ESM4::Static::load(ESM4::Reader& reader)
case ESM4::SUB_DNAM: case ESM4::SUB_DNAM:
case ESM4::SUB_BRUS: // FONV case ESM4::SUB_BRUS: // FONV
case ESM4::SUB_RNAM: // FONV case ESM4::SUB_RNAM: // FONV
// FO4 case ESM4::SUB_FTYP: // FO4
case ESM4::SUB_FTYP: case ESM4::SUB_NVNM: // FO4
case ESM4::SUB_NVNM: case ESM4::SUB_PRPS: // FO4
case ESM4::SUB_PRPS: case ESM4::SUB_PTRN: // FO4
case ESM4::SUB_PTRN: case ESM4::SUB_VMAD: // FO4
case ESM4::SUB_VMAD:
reader.skipSubRecordData(); reader.skipSubRecordData();
break; break;
default: default:

1
components/esm4/loadterm.cpp
Unescape Escape View File

@ -82,6 +82,7 @@ void ESM4::Terminal::load(ESM4::Reader& reader)
case ESM4::SUB_OBND: case ESM4::SUB_OBND:
case ESM4::SUB_MODS: // FONV case ESM4::SUB_MODS: // FONV
case ESM4::SUB_PRPS: // FO4 case ESM4::SUB_PRPS: // FO4
case ESM4::SUB_PTRN: // FO4
reader.skipSubRecordData(); reader.skipSubRecordData();
break; break;
default: default:

1
components/esm4/loadweap.cpp
Unescape Escape View File

@ -180,6 +180,7 @@ void ESM4::Weapon::load(ESM4::Reader& reader)
case ESM4::SUB_WNM6: // FONV case ESM4::SUB_WNM6: // FONV
case ESM4::SUB_WNM7: // FONV case ESM4::SUB_WNM7: // FONV
case ESM4::SUB_EFSD: // FONV DeadMoney case ESM4::SUB_EFSD: // FONV DeadMoney
case ESM4::SUB_PTRN: // FO4
reader.skipSubRecordData(); reader.skipSubRecordData();
break; break;
default: default:

Write Preview
Loading…
Cancel
Save