From 7c16ecb25831e19860a49632125c56cd17b83055 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Mon, 22 May 2023 21:51:35 +0200
Subject: [PATCH] Skip more unknown ESM4 subrecords

CNAM from HDPT is a part of Dawnguard.esm.
ATKR from RACE is a part of Dawnguard.esm.
CIS2 from SCRL is a part of Dragonborn.esm.
SPMV from RACE is a part of Dragonborn.esm.
---
 components/esm4/common.hpp   | 1 +
 components/esm4/loadhdpt.cpp | 1 +
 components/esm4/loadrace.cpp | 2 ++
 components/esm4/loadscrl.cpp | 1 +
 4 files changed, 5 insertions(+)

diff --git a/components/esm4/common.hpp b/components/esm4/common.hpp
index 77c24f6121..61f18e650d 100644
--- a/components/esm4/common.hpp
+++ b/components/esm4/common.hpp
@@ -571,6 +571,7 @@ namespace ESM4
         SUB_FLTR = fourCC("FLTR"), // TES5
         SUB_QTGL = fourCC("QTGL"), // TES5
         SUB_TWAT = fourCC("TWAT"), // TES5
+        SUB_SPMV = fourCC("SPMV"), // TES5
         SUB_XIBS = fourCC("XIBS"), // FO3
         SUB_REPL = fourCC("REPL"), // FO3
         SUB_BIPL = fourCC("BIPL"), // FO3
diff --git a/components/esm4/loadhdpt.cpp b/components/esm4/loadhdpt.cpp
index f308a6a3a2..51f4b629f3 100644
--- a/components/esm4/loadhdpt.cpp
+++ b/components/esm4/loadhdpt.cpp
@@ -94,6 +94,7 @@ void ESM4::HeadPart::load(ESM4::Reader& reader)
             case ESM4::SUB_MODS:
             case ESM4::SUB_MODT:
             case ESM4::SUB_RNAM:
+            case ESM4::SUB_CNAM:
             {
                 // std::cout << "HDPT " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
                 reader.skipSubRecordData();
diff --git a/components/esm4/loadrace.cpp b/components/esm4/loadrace.cpp
index 04f3bd0fc2..1576743ed3 100644
--- a/components/esm4/loadrace.cpp
+++ b/components/esm4/loadrace.cpp
@@ -677,6 +677,8 @@ void ESM4::Race::load(ESM4::Reader& reader)
             case ESM4::SUB_SPED:
             case ESM4::SUB_SWMV:
             case ESM4::SUB_WKMV:
+            case ESM4::SUB_SPMV:
+            case ESM4::SUB_ATKR:
             //
             case ESM4::SUB_YNAM: // FO3
             case ESM4::SUB_NAM2: // FO3
diff --git a/components/esm4/loadscrl.cpp b/components/esm4/loadscrl.cpp
index 30cc8818fd..bc77d80d07 100644
--- a/components/esm4/loadscrl.cpp
+++ b/components/esm4/loadscrl.cpp
@@ -72,6 +72,7 @@ void ESM4::Scroll::load(ESM4::Reader& reader)
             case ESM4::SUB_MDOB:
             case ESM4::SUB_MODT:
             case ESM4::SUB_SPIT:
+            case ESM4::SUB_CIS2:
             {
                 // std::cout << "SCRL " << ESM::printName(subHdr.typeId) << " skipping..." << std::endl;
                 reader.skipSubRecordData();