From 4cb095ce39e766e3d965dc3b34aac565add61174 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Fri, 3 Mar 2023 00:02:56 +0100
Subject: [PATCH] Use ESM::RefId as key for MergeReferencesStage::mIndex

---
 apps/opencs/model/tools/mergestages.cpp | 3 +--
 apps/opencs/model/tools/mergestages.hpp | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/apps/opencs/model/tools/mergestages.cpp b/apps/opencs/model/tools/mergestages.cpp
index e11be72d4e..5a7fa6c1b9 100644
--- a/apps/opencs/model/tools/mergestages.cpp
+++ b/apps/opencs/model/tools/mergestages.cpp
@@ -15,7 +15,6 @@
 
 #include <components/esm3/cellref.hpp>
 #include <components/esm3/esmreader.hpp>
-#include <components/misc/strings/lower.hpp>
 
 #include "mergestate.hpp"
 
@@ -117,7 +116,7 @@ void CSMTools::MergeReferencesStage::perform(int stage, CSMDoc::Messages& messag
 
         ref.mOriginalCell = ref.mCell;
 
-        ref.mRefNum.mIndex = mIndex[Misc::StringUtils::lowerCase(ref.mCell.getRefIdString())]++;
+        ref.mRefNum.mIndex = mIndex[ref.mCell]++;
         ref.mRefNum.mContentFile = 0;
         ref.mNew = false;
 
diff --git a/apps/opencs/model/tools/mergestages.hpp b/apps/opencs/model/tools/mergestages.hpp
index 0763398e9d..42f06858b1 100644
--- a/apps/opencs/model/tools/mergestages.hpp
+++ b/apps/opencs/model/tools/mergestages.hpp
@@ -113,7 +113,7 @@ namespace CSMTools
     class MergeReferencesStage : public CSMDoc::Stage
     {
         MergeState& mState;
-        std::map<std::string, int> mIndex;
+        std::map<ESM::RefId, int> mIndex;
 
     public:
         MergeReferencesStage(MergeState& state);