From 61a4a0807b4ed2398b8169b477132b12a1a3a106 Mon Sep 17 00:00:00 2001
From: Nelsson Huotari <unelsson@gmail.com>
Date: Wed, 9 Dec 2020 00:10:58 +0200
Subject: [PATCH] Load master index in refId to mContentFile, keep master index
 also in mIndex

---
 apps/opencs/model/world/refcollection.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/apps/opencs/model/world/refcollection.cpp b/apps/opencs/model/world/refcollection.cpp
index d8f6b391b7..126a0ea789 100644
--- a/apps/opencs/model/world/refcollection.cpp
+++ b/apps/opencs/model/world/refcollection.cpp
@@ -64,10 +64,12 @@ void CSMWorld::RefCollection::load (ESM::ESMReader& reader, int cellIndex, bool
 
         // ignore content file number
         std::map<ESM::RefNum, std::string>::iterator iter = cache.begin();
-        ref.mRefNum.mIndex = ref.mRefNum.mIndex & 0x00ffffff;
+        unsigned int thisIndex = ref.mRefNum.mIndex & 0x00ffffff;
+        if (ref.mRefNum.mContentFile != -1 && !base) ref.mRefNum.mContentFile = ref.mRefNum.mIndex >> 24;
+
         for (; iter != cache.end(); ++iter)
         {
-            if (ref.mRefNum.mIndex == iter->first.mIndex)
+            if (thisIndex == iter->first.mIndex)
                 break;
         }