From 671561ea37dc8e3c172030ca150cbe1527a448a7 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sun, 6 Dec 2015 19:11:25 +0100
Subject: [PATCH] Write moved references to the save game file (not resolved on
 loading yet)

---
 apps/openmw/mwworld/cells.cpp     |  1 -
 apps/openmw/mwworld/cellstore.cpp | 22 +++++++++++++++++++++-
 apps/openmw/mwworld/cellstore.hpp |  2 ++
 components/esm/cellref.cpp        |  6 +++---
 components/esm/cellref.hpp        |  2 +-
 5 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/apps/openmw/mwworld/cells.cpp b/apps/openmw/mwworld/cells.cpp
index 127e43fc0..b410e6488 100644
--- a/apps/openmw/mwworld/cells.cpp
+++ b/apps/openmw/mwworld/cells.cpp
@@ -119,7 +119,6 @@ MWWorld::CellStore *MWWorld::Cells::getExterior (int x, int y)
 
     if (result->second.getState()!=CellStore::State_Loaded)
     {
-        // Multiple plugin support for landscape data is much easier than for references. The last plugin wins.
         result->second.load ();
     }
 
diff --git a/apps/openmw/mwworld/cellstore.cpp b/apps/openmw/mwworld/cellstore.cpp
index 47677064e..578e5ed55 100644
--- a/apps/openmw/mwworld/cellstore.cpp
+++ b/apps/openmw/mwworld/cellstore.cpp
@@ -636,7 +636,15 @@ namespace MWWorld
         writeReferenceCollection<ESM::ObjectState> (writer, mStatics);
         writeReferenceCollection<ESM::ObjectState> (writer, mWeapons);
 
-        // TODO: write moved references
+        for (MovedRefTracker::const_iterator it = mMovedToAnotherCell.begin(); it != mMovedToAnotherCell.end(); ++it)
+        {
+            LiveCellRefBase* base = it->first;
+            ESM::RefNum refNum = base->mRef.getRefNum();
+            ESM::CellId movedTo = it->second->getCell()->getCellId();
+
+            refNum.save(writer, true, "MVRF");
+            movedTo.save(writer);
+        }
     }
 
     void CellStore::readReferences (ESM::ESMReader& reader,
@@ -770,6 +778,18 @@ namespace MWWorld
                     throw std::runtime_error ("unknown type in cell reference section");
             }
         }
+
+        while (reader.isNextSub("MVRF"))
+        {
+            reader.cacheSubName();
+            ESM::RefNum refnum;
+            ESM::CellId movedTo;
+            refnum.load(reader, true, "MVRF");
+            movedTo.load(reader);
+
+            std::cout << "moved to " << movedTo.mWorldspace << " " << movedTo.mIndex.mX << " " << movedTo.mIndex.mY << std::endl;
+        }
+
         updateMergedRefs();
     }
 
diff --git a/apps/openmw/mwworld/cellstore.hpp b/apps/openmw/mwworld/cellstore.hpp
index cedf2eeb0..892a5c06b 100644
--- a/apps/openmw/mwworld/cellstore.hpp
+++ b/apps/openmw/mwworld/cellstore.hpp
@@ -12,6 +12,8 @@
 #include "livecellref.hpp"
 #include "cellreflist.hpp"
 
+#include <components/esm/cellid.hpp>
+
 #include <components/esm/loadacti.hpp>
 #include <components/esm/loadalch.hpp>
 #include <components/esm/loadappa.hpp>
diff --git a/components/esm/cellref.cpp b/components/esm/cellref.cpp
index 76a82fe23..7acaed86d 100644
--- a/components/esm/cellref.cpp
+++ b/components/esm/cellref.cpp
@@ -3,12 +3,12 @@
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
 
-void ESM::RefNum::load (ESMReader& esm, bool wide)
+void ESM::RefNum::load (ESMReader& esm, bool wide, const std::string& tag)
 {
     if (wide)
-        esm.getHNT (*this, "FRMR", 8);
+        esm.getHNT (*this, tag.c_str(), 8);
     else
-        esm.getHNT (mIndex, "FRMR");
+        esm.getHNT (mIndex, tag.c_str());
 }
 
 void ESM::RefNum::save (ESMWriter &esm, bool wide, const std::string& tag) const
diff --git a/components/esm/cellref.hpp b/components/esm/cellref.hpp
index c371a4f01..3c646cc61 100644
--- a/components/esm/cellref.hpp
+++ b/components/esm/cellref.hpp
@@ -16,7 +16,7 @@ namespace ESM
         unsigned int mIndex;
         int mContentFile;
 
-        void load (ESMReader& esm, bool wide = false);
+        void load (ESMReader& esm, bool wide = false, const std::string& tag = "FRMR");
 
         void save (ESMWriter &esm, bool wide = false, const std::string& tag = "FRMR") const;