diff --git a/components/esm4/loadacti.cpp b/components/esm4/loadacti.cpp index 9533feba48..74eaff2dab 100644 --- a/components/esm4/loadacti.cpp +++ b/components/esm4/loadacti.cpp @@ -71,8 +71,10 @@ void ESM4::Activator::load(ESM4::Reader& reader) case ESM4::SUB_XATO: reader.getZString(mActivationPrompt); break; // FONV - 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_DAMC: // Destructible case ESM4::SUB_DEST: case ESM4::SUB_DMDC: diff --git a/components/esm4/loadalch.cpp b/components/esm4/loadalch.cpp index 2e3a762ed1..1ecfda25e8 100644 --- a/components/esm4/loadalch.cpp +++ b/components/esm4/loadalch.cpp @@ -88,13 +88,15 @@ void ESM4::Potion::load(ESM4::Reader& reader) case ESM4::SUB_ZNAM: reader.getFormId(mDropSound); 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_EFID: case ESM4::SUB_EFIT: case ESM4::SUB_CTDA: case ESM4::SUB_KSIZ: case ESM4::SUB_KWDA: - case ESM4::SUB_MODS: case ESM4::SUB_OBND: case ESM4::SUB_ETYP: // FO3 case ESM4::SUB_DESC: diff --git a/components/esm4/loadammo.cpp b/components/esm4/loadammo.cpp index 31442f125d..bc05d007e6 100644 --- a/components/esm4/loadammo.cpp +++ b/components/esm4/loadammo.cpp @@ -133,7 +133,10 @@ void ESM4::Ammunition::load(ESM4::Reader& reader) case ESM4::SUB_SCRI: reader.getFormId(mScript); 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_KSIZ: case ESM4::SUB_KWDA: diff --git a/components/esm4/loadanio.cpp b/components/esm4/loadanio.cpp index 768e4d7822..fa440f5ace 100644 --- a/components/esm4/loadanio.cpp +++ b/components/esm4/loadanio.cpp @@ -56,8 +56,10 @@ void ESM4::AnimObject::load(ESM4::Reader& reader) case ESM4::SUB_MODB: reader.get(mBoundRadius); break; - case ESM4::SUB_MODT: // TES5 only - case ESM4::SUB_MODS: // TES5 only + case ESM4::SUB_MODT: // Model data + case ESM4::SUB_MODC: + case ESM4::SUB_MODS: + case ESM4::SUB_MODF: // Model data end reader.skipSubRecordData(); break; default: diff --git a/components/esm4/loadbptd.cpp b/components/esm4/loadbptd.cpp index a9edc2b145..b4c783c5ff 100644 --- a/components/esm4/loadbptd.cpp +++ b/components/esm4/loadbptd.cpp @@ -90,8 +90,10 @@ void ESM4::BodyPartData::load(ESM4::Reader& reader) break; case ESM4::SUB_NAM5: case ESM4::SUB_RAGA: // ragdoll + case ESM4::SUB_MODT: // Model data + case ESM4::SUB_MODC: case ESM4::SUB_MODS: - case ESM4::SUB_MODT: + case ESM4::SUB_MODF: // Model data end reader.skipSubRecordData(); break; default: diff --git a/components/esm4/loadcont.cpp b/components/esm4/loadcont.cpp index ced92c20a1..2aa7f57b5d 100644 --- a/components/esm4/loadcont.cpp +++ b/components/esm4/loadcont.cpp @@ -74,8 +74,10 @@ void ESM4::Container::load(ESM4::Reader& reader) case ESM4::SUB_MODB: reader.get(mBoundRadius); break; - case ESM4::SUB_MODT: - case ESM4::SUB_MODS: // TES5 only + case ESM4::SUB_MODT: // Model data + case ESM4::SUB_MODC: + case ESM4::SUB_MODS: + case ESM4::SUB_MODF: // Model data end case ESM4::SUB_VMAD: // TES5 only case ESM4::SUB_OBND: // TES5 only case ESM4::SUB_COCT: // TES5 only diff --git a/components/esm4/loaddoor.cpp b/components/esm4/loaddoor.cpp index 4c8f53ac77..8ee771fd0c 100644 --- a/components/esm4/loaddoor.cpp +++ b/components/esm4/loaddoor.cpp @@ -71,8 +71,10 @@ void ESM4::Door::load(ESM4::Reader& reader) case ESM4::SUB_MODB: reader.get(mBoundRadius); 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_VMAD: case ESM4::SUB_DAMC: // Destructible diff --git a/components/esm4/loadflor.cpp b/components/esm4/loadflor.cpp index 65e4cf1353..b3ea69e0d0 100644 --- a/components/esm4/loadflor.cpp +++ b/components/esm4/loadflor.cpp @@ -65,8 +65,10 @@ void ESM4::Flora::load(ESM4::Reader& reader) case ESM4::SUB_MODB: reader.get(mBoundRadius); 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_FNAM: case ESM4::SUB_OBND: case ESM4::SUB_PNAM: diff --git a/components/esm4/loadfurn.cpp b/components/esm4/loadfurn.cpp index a84a980401..9f00827772 100644 --- a/components/esm4/loadfurn.cpp +++ b/components/esm4/loadfurn.cpp @@ -59,7 +59,10 @@ void ESM4::Furniture::load(ESM4::Reader& reader) case ESM4::SUB_MODB: reader.get(mBoundRadius); 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_DAMC: // Destructible case ESM4::SUB_DEST: case ESM4::SUB_DMDC: @@ -76,7 +79,6 @@ void ESM4::Furniture::load(ESM4::Reader& reader) case ESM4::SUB_KNAM: case ESM4::SUB_KSIZ: case ESM4::SUB_KWDA: - case ESM4::SUB_MODS: case ESM4::SUB_NAM0: case ESM4::SUB_OBND: case ESM4::SUB_PNAM: diff --git a/components/esm4/loadgras.cpp b/components/esm4/loadgras.cpp index 88147ecae9..ebcdde04a1 100644 --- a/components/esm4/loadgras.cpp +++ b/components/esm4/loadgras.cpp @@ -53,7 +53,10 @@ void ESM4::Grass::load(ESM4::Reader& reader) case ESM4::SUB_MODB: reader.get(mBoundRadius); 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: reader.skipSubRecordData(); break; diff --git a/components/esm4/loadhdpt.cpp b/components/esm4/loadhdpt.cpp index d74642314f..7592db5486 100644 --- a/components/esm4/loadhdpt.cpp +++ b/components/esm4/loadhdpt.cpp @@ -88,8 +88,10 @@ void ESM4::HeadPart::load(ESM4::Reader& reader) reader.getFormId(mBaseTexture); break; case ESM4::SUB_PNAM: + case ESM4::SUB_MODT: // Model data + case ESM4::SUB_MODC: case ESM4::SUB_MODS: - case ESM4::SUB_MODT: + case ESM4::SUB_MODF: // Model data end case ESM4::SUB_RNAM: case ESM4::SUB_CNAM: case ESM4::SUB_CTDA: diff --git a/components/esm4/loadidlm.cpp b/components/esm4/loadidlm.cpp index 3c561e962f..4b476c46f0 100644 --- a/components/esm4/loadidlm.cpp +++ b/components/esm4/loadidlm.cpp @@ -79,8 +79,10 @@ void ESM4::IdleMarker::load(ESM4::Reader& reader) reader.getZString(mModel); break; case ESM4::SUB_OBND: // object bounds - 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 reader.skipSubRecordData(); break; default: diff --git a/components/esm4/loadingr.cpp b/components/esm4/loadingr.cpp index 8c40d32512..d0b81fd4a1 100644 --- a/components/esm4/loadingr.cpp +++ b/components/esm4/loadingr.cpp @@ -95,8 +95,10 @@ void ESM4::Ingredient::load(ESM4::Reader& reader) reader.adjustFormId(mEffect.formId); break; } - case ESM4::SUB_MODT: - case ESM4::SUB_MODS: // Dragonborn only? + case ESM4::SUB_MODT: // Model data + case ESM4::SUB_MODC: + case ESM4::SUB_MODS: + case ESM4::SUB_MODF: // Model data end case ESM4::SUB_EFID: case ESM4::SUB_EFIT: case ESM4::SUB_OBND: diff --git a/components/esm4/loadkeym.cpp b/components/esm4/loadkeym.cpp index fb5d28b246..9b0c280b8b 100644 --- a/components/esm4/loadkeym.cpp +++ b/components/esm4/loadkeym.cpp @@ -71,7 +71,10 @@ void ESM4::Key::load(ESM4::Reader& reader) case ESM4::SUB_ZNAM: reader.getFormId(mDropSound); 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_KSIZ: case ESM4::SUB_KWDA: case ESM4::SUB_OBND: diff --git a/components/esm4/loadligh.cpp b/components/esm4/loadligh.cpp index 52e6c06c5e..79ff307dc0 100644 --- a/components/esm4/loadligh.cpp +++ b/components/esm4/loadligh.cpp @@ -99,7 +99,10 @@ void ESM4::Light::load(ESM4::Reader& reader) case ESM4::SUB_FNAM: reader.get(mFade); 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_VMAD: // Dragonborn only? case ESM4::SUB_DAMC: // Destructible diff --git a/components/esm4/loadlvln.cpp b/components/esm4/loadlvln.cpp index b1efddc255..b994577b41 100644 --- a/components/esm4/loadlvln.cpp +++ b/components/esm4/loadlvln.cpp @@ -91,7 +91,10 @@ void ESM4::LevelledNpc::load(ESM4::Reader& reader) } case ESM4::SUB_COED: // owner case ESM4::SUB_OBND: // object bounds - case ESM4::SUB_MODT: // model texture data + case ESM4::SUB_MODT: // Model data + case ESM4::SUB_MODC: + case ESM4::SUB_MODS: + case ESM4::SUB_MODF: // Model data end reader.skipSubRecordData(); break; default: diff --git a/components/esm4/loadmato.cpp b/components/esm4/loadmato.cpp index a3b55ce1f2..13d5e7d83d 100644 --- a/components/esm4/loadmato.cpp +++ b/components/esm4/loadmato.cpp @@ -49,6 +49,10 @@ void ESM4::Material::load(ESM4::Reader& reader) break; case ESM4::SUB_DNAM: case ESM4::SUB_DATA: + case ESM4::SUB_MODT: // Model data + case ESM4::SUB_MODC: + case ESM4::SUB_MODS: + case ESM4::SUB_MODF: // Model data end reader.skipSubRecordData(); break; default: diff --git a/components/esm4/loadmisc.cpp b/components/esm4/loadmisc.cpp index b3c8be7d8a..646154309e 100644 --- a/components/esm4/loadmisc.cpp +++ b/components/esm4/loadmisc.cpp @@ -71,10 +71,12 @@ void ESM4::MiscItem::load(ESM4::Reader& reader) case ESM4::SUB_ZNAM: reader.getFormId(mDropSound); 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_KSIZ: case ESM4::SUB_KWDA: - case ESM4::SUB_MODS: case ESM4::SUB_OBND: case ESM4::SUB_VMAD: case ESM4::SUB_RNAM: // FONV diff --git a/components/esm4/loadmstt.cpp b/components/esm4/loadmstt.cpp index 3e67affd51..75a4afe76e 100644 --- a/components/esm4/loadmstt.cpp +++ b/components/esm4/loadmstt.cpp @@ -63,8 +63,10 @@ void ESM4::MovableStatic::load(ESM4::Reader& reader) case ESM4::SUB_DSTD: case ESM4::SUB_DSTF: // Destructible end case ESM4::SUB_OBND: // object bounds - case ESM4::SUB_MODT: // model texture data + case ESM4::SUB_MODT: // Model data + case ESM4::SUB_MODC: case ESM4::SUB_MODS: + case ESM4::SUB_MODF: // Model data end case ESM4::SUB_FULL: case ESM4::SUB_MODB: case ESM4::SUB_PRPS: diff --git a/components/esm4/loadnote.cpp b/components/esm4/loadnote.cpp index 4861ebe653..fbfd4031c3 100644 --- a/components/esm4/loadnote.cpp +++ b/components/esm4/loadnote.cpp @@ -55,6 +55,10 @@ void ESM4::Note::load(ESM4::Reader& reader) break; case ESM4::SUB_DATA: case ESM4::SUB_MODB: + case ESM4::SUB_MODT: // Model data + case ESM4::SUB_MODC: + case ESM4::SUB_MODS: + case ESM4::SUB_MODF: // Model data end case ESM4::SUB_ONAM: case ESM4::SUB_SNAM: case ESM4::SUB_TNAM: diff --git a/components/esm4/loadrace.cpp b/components/esm4/loadrace.cpp index 0b8ced1fb4..28f91787e6 100644 --- a/components/esm4/loadrace.cpp +++ b/components/esm4/loadrace.cpp @@ -705,11 +705,14 @@ void ESM4::Race::load(ESM4::Reader& reader) case ESM4::SUB_CTDA: case ESM4::SUB_CIS1: case ESM4::SUB_CIS2: + case ESM4::SUB_MODT: // Model data + case ESM4::SUB_MODC: + case ESM4::SUB_MODS: + case ESM4::SUB_MODF: // Model data end // case ESM4::SUB_YNAM: // FO3 case ESM4::SUB_NAM2: // FO3 case ESM4::SUB_VTCK: // FO3 - case ESM4::SUB_MODT: // FO3 case ESM4::SUB_MODD: // FO3 case ESM4::SUB_ONAM: // FO3 case ESM4::SUB_APPR: // FO4 diff --git a/components/esm4/loadscol.cpp b/components/esm4/loadscol.cpp index 380e8fbe0f..6f1aef0202 100644 --- a/components/esm4/loadscol.cpp +++ b/components/esm4/loadscol.cpp @@ -47,8 +47,11 @@ void ESM4::StaticCollection::load(ESM4::Reader& reader) reader.getZString(mEditorId); break; case ESM4::SUB_OBND: - case ESM4::SUB_MODL: + case ESM4::SUB_MODL: // Model data start case ESM4::SUB_MODT: + case ESM4::SUB_MODC: + case ESM4::SUB_MODS: + case ESM4::SUB_MODF: // Model data end case ESM4::SUB_ONAM: case ESM4::SUB_DATA: case ESM4::SUB_PTRN: // FO4 diff --git a/components/esm4/loadstat.cpp b/components/esm4/loadstat.cpp index a3bb7618c7..e3b51633cf 100644 --- a/components/esm4/loadstat.cpp +++ b/components/esm4/loadstat.cpp @@ -84,7 +84,9 @@ void ESM4::Static::load(ESM4::Reader& reader) } break; } + case ESM4::SUB_MODC: // More model data case ESM4::SUB_MODS: + case ESM4::SUB_MODF: // Model data end case ESM4::SUB_OBND: case ESM4::SUB_DNAM: case ESM4::SUB_BRUS: // FONV diff --git a/components/esm4/loadtact.cpp b/components/esm4/loadtact.cpp index 695616f613..ad5efb9fbf 100644 --- a/components/esm4/loadtact.cpp +++ b/components/esm4/loadtact.cpp @@ -73,10 +73,12 @@ void ESM4::TalkingActivator::load(ESM4::Reader& reader) case ESM4::SUB_DSTF: // Destructible end case ESM4::SUB_FNAM: case ESM4::SUB_PNAM: - case ESM4::SUB_MODT: // texture file hash? + 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_VMAD: - case ESM4::SUB_MODS: reader.skipSubRecordData(); break; default: diff --git a/components/esm4/loadterm.cpp b/components/esm4/loadterm.cpp index c33afed2d6..d2b11b98c0 100644 --- a/components/esm4/loadterm.cpp +++ b/components/esm4/loadterm.cpp @@ -70,7 +70,10 @@ void ESM4::Terminal::load(ESM4::Reader& reader) case ESM4::SUB_CTDA: case ESM4::SUB_INAM: case ESM4::SUB_ITXT: // Menu Item - case ESM4::SUB_MODT: // texture hash? + case ESM4::SUB_MODT: // Model data + case ESM4::SUB_MODC: + case ESM4::SUB_MODS: + case ESM4::SUB_MODF: // Model data end case ESM4::SUB_SCDA: case ESM4::SUB_SCHR: case ESM4::SUB_SCRO: @@ -80,7 +83,6 @@ void ESM4::Terminal::load(ESM4::Reader& reader) case ESM4::SUB_SLSD: case ESM4::SUB_TNAM: case ESM4::SUB_OBND: - case ESM4::SUB_MODS: // FONV case ESM4::SUB_PRPS: // FO4 case ESM4::SUB_PTRN: // FO4 reader.skipSubRecordData(); diff --git a/components/esm4/loadtree.cpp b/components/esm4/loadtree.cpp index 42ae3ce543..9290ae79c4 100644 --- a/components/esm4/loadtree.cpp +++ b/components/esm4/loadtree.cpp @@ -53,7 +53,10 @@ void ESM4::Tree::load(ESM4::Reader& reader) case ESM4::SUB_MODB: reader.get(mBoundRadius); 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_CNAM: case ESM4::SUB_BNAM: case ESM4::SUB_SNAM: diff --git a/components/esm4/loadweap.cpp b/components/esm4/loadweap.cpp index f266291fc2..9cd134326b 100644 --- a/components/esm4/loadweap.cpp +++ b/components/esm4/loadweap.cpp @@ -109,7 +109,10 @@ void ESM4::Weapon::load(ESM4::Reader& reader) case ESM4::SUB_ZNAM: reader.getFormId(mDropSound); 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_BAMT: case ESM4::SUB_BIDS: case ESM4::SUB_INAM: @@ -132,7 +135,6 @@ void ESM4::Weapon::load(ESM4::Reader& reader) case ESM4::SUB_WNAM: case ESM4::SUB_XNAM: // Dawnguard only? case ESM4::SUB_NNAM: - case ESM4::SUB_MODS: case ESM4::SUB_NAM0: // FO3 case ESM4::SUB_REPL: // FO3 case ESM4::SUB_MOD2: // FO3 diff --git a/components/esm4/loadwrld.cpp b/components/esm4/loadwrld.cpp index ec0ff908cd..2df127c8d3 100644 --- a/components/esm4/loadwrld.cpp +++ b/components/esm4/loadwrld.cpp @@ -164,13 +164,16 @@ void ESM4::World::load(ESM4::Reader& reader) case ESM4::SUB_XLCN: case ESM4::SUB_NAM3: case ESM4::SUB_NAM4: - case ESM4::SUB_MODL: case ESM4::SUB_NAMA: case ESM4::SUB_ONAM: case ESM4::SUB_TNAM: case ESM4::SUB_UNAM: case ESM4::SUB_XWEM: - case ESM4::SUB_MODT: // from Dragonborn onwards? + case ESM4::SUB_MODL: // Model data start + case ESM4::SUB_MODT: + case ESM4::SUB_MODC: + case ESM4::SUB_MODS: + case ESM4::SUB_MODF: // Model data end case ESM4::SUB_INAM: // FO3 case ESM4::SUB_NNAM: // FO3 case ESM4::SUB_XNAM: // FO3