From 49884f54f7f00e1d4413b77eae3d6091043aa016 Mon Sep 17 00:00:00 2001
From: cc9cii <cc9c@iinet.net.au>
Date: Tue, 28 Apr 2015 08:07:01 +1000
Subject: [PATCH] Fix loading moved references.

---
 apps/opencs/model/world/data.cpp          | 4 ++--
 apps/opencs/model/world/refcollection.cpp | 8 +++++++-
 apps/opencs/view/world/util.cpp           | 1 -
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/apps/opencs/model/world/data.cpp b/apps/opencs/model/world/data.cpp
index 97b34551d..fc4532fb0 100644
--- a/apps/opencs/model/world/data.cpp
+++ b/apps/opencs/model/world/data.cpp
@@ -458,6 +458,8 @@ CSMWorld::Data::Data (ToUTF8::FromType encoding, const ResourcesManager& resourc
         UniversalId::Type_Texture);
     addModel (new ResourceTable (&mResourcesManager.get (UniversalId::Type_Videos)),
         UniversalId::Type_Video);
+
+    mRefLoadCache.clear(); // clear here rather than startLoading() and continueLoading() for multiple content files
 }
 
 CSMWorld::Data::~Data()
@@ -779,7 +781,6 @@ int CSMWorld::Data::startLoading (const boost::filesystem::path& path, bool base
     mReader = 0;
 
     mDialogue = 0;
-    mRefLoadCache.clear();
 
     mReader = new ESM::ESMReader;
     mReader->setEncoder (&mEncoder);
@@ -816,7 +817,6 @@ bool CSMWorld::Data::continueLoading (CSMDoc::Messages& messages)
         mReader = 0;
 
         mDialogue = 0;
-        mRefLoadCache.clear();
         return true;
     }
 
diff --git a/apps/opencs/model/world/refcollection.cpp b/apps/opencs/model/world/refcollection.cpp
index 8f12b6844..ff30dafae 100644
--- a/apps/opencs/model/world/refcollection.cpp
+++ b/apps/opencs/model/world/refcollection.cpp
@@ -84,7 +84,13 @@ void CSMWorld::RefCollection::load (ESM::ESMReader& reader, int cellIndex, bool
         else
             ref.mCell = cell2.mId;
 
-        std::map<ESM::RefNum, std::string>::iterator iter = cache.find (ref.mRefNum);
+        // ignore content file number
+        std::map<ESM::RefNum, std::string>::iterator iter = cache.begin();
+        for (; iter != cache.end(); ++iter)
+        {
+            if (ref.mRefNum.mIndex == iter->first.mIndex)
+                break;
+        }
 
         if (deleted)
         {
diff --git a/apps/opencs/view/world/util.cpp b/apps/opencs/view/world/util.cpp
index 8b4bfeaac..a11b5bdde 100644
--- a/apps/opencs/view/world/util.cpp
+++ b/apps/opencs/view/world/util.cpp
@@ -125,7 +125,6 @@ void CSVWorld::CommandDelegate::setModelDataImp (QWidget *editor, QAbstractItemM
     QVariant new_ = hack.getData();
 
     if ((model->data (index)!=new_) && (model->flags(index) & Qt::ItemIsEditable))
-        //getUndoStack().push (new CSMWorld::ModifyCommand (*model, index, new_)); // FIXME
         mCommandDispatcher->executeModify (model, index, new_);
 }