Merge branch 'openmw-cs-error-verify-refnums' into 'master'

OpenMW-CS verify duplicate RefNums See merge request OpenMW/openmw!4012
OpenMW · Jun 24, 2024 · 64dd6e3 · 64dd6e3
2 parents cd365b4 + 57e7bf3
commit 64dd6e3
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/apps/opencs/model/tools/referencecheck.cpp b/apps/opencs/model/tools/referencecheck.cpp
@@ -45,6 +45,16 @@ void CSMTools::ReferenceCheckStage::perform(int stage, CSMDoc::Messages& message
     const CSMWorld::CellRef& cellRef = record.get();
     const CSMWorld::UniversalId id(CSMWorld::UniversalId::Type_Reference, cellRef.mId);
 
+    // Check RefNum is unique per content file, otherwise can cause load issues
+    const auto refNum = cellRef.mRefNum;
+    const auto insertResult = mUsedReferenceIDs.emplace(refNum, cellRef.mId);
+    if (!insertResult.second)
+        messages.add(id,
+            "Duplicate RefNum: " + std::to_string(refNum.mContentFile) + std::string("-")
+                + std::to_string(refNum.mIndex) + " shared with cell reference "
+                + insertResult.first->second.toString(),
+            "", CSMDoc::Message::Severity_Error);
+
     // Check reference id
     if (cellRef.mRefID.empty())
         messages.add(id, "Instance is not based on an object", "", CSMDoc::Message::Severity_Error);
@@ -109,6 +119,7 @@ void CSMTools::ReferenceCheckStage::perform(int stage, CSMDoc::Messages& message
 int CSMTools::ReferenceCheckStage::setup()
 {
     mIgnoreBaseRecords = CSMPrefs::get()["Reports"]["ignore-base-records"].isTrue();
+    mUsedReferenceIDs.clear();
 
     return mReferences.getSize();
 }
diff --git a/apps/opencs/model/tools/referencecheck.hpp b/apps/opencs/model/tools/referencecheck.hpp
@@ -43,6 +43,7 @@ namespace CSMTools
         const CSMWorld::IdCollection<CSMWorld::Cell>& mCells;
         const CSMWorld::IdCollection<ESM::Faction>& mFactions;
         const CSMWorld::IdCollection<ESM::BodyPart>& mBodyParts;
+        std::unordered_map<ESM::RefNum, ESM::RefId> mUsedReferenceIDs;
         bool mIgnoreBaseRecords;
     };
 }