From 89998a6a036fa22cbb81b9113f534571eb3c7a1e Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Sat, 24 Jan 2015 14:22:29 +0100
Subject: [PATCH] save MVRF subrecords

---
 apps/opencs/model/doc/savingstages.cpp | 5 +----
 components/esm/cellref.cpp             | 6 +++---
 components/esm/cellref.hpp             | 2 +-
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/apps/opencs/model/doc/savingstages.cpp b/apps/opencs/model/doc/savingstages.cpp
index 6b8750b44..4354a0313 100644
--- a/apps/opencs/model/doc/savingstages.cpp
+++ b/apps/opencs/model/doc/savingstages.cpp
@@ -314,10 +314,7 @@ void CSMDoc::WriteCellCollectionStage::perform (int stage, Messages& messages)
                         char ignore;
                         stream >> ignore >> moved.mTarget[0] >> moved.mTarget[1];
 
-                        mState.getWriter().startSubRecord ("MVRF");
-
-                        mState.getWriter().endRecord ("MVRF");
-                        mState.getWriter().writeHNT ("FRMR", moved.mRefNum.mIndex, 4);
+                        ref.get().mRefNum.save (mState.getWriter(), false, "MVRF");
                         mState.getWriter().writeHNT ("CNDT", moved.mTarget, 8);
                     }
 
diff --git a/components/esm/cellref.cpp b/components/esm/cellref.cpp
index 0e258571f..546151e27 100644
--- a/components/esm/cellref.cpp
+++ b/components/esm/cellref.cpp
@@ -12,15 +12,15 @@ void ESM::RefNum::load (ESMReader& esm, bool wide)
         esm.getHNT (mIndex, "FRMR");
 }
 
-void ESM::RefNum::save (ESMWriter &esm, bool wide) const
+void ESM::RefNum::save (ESMWriter &esm, bool wide, const std::string& tag) const
 {
     if (wide)
-        esm.writeHNT ("FRMR", *this, 8);
+        esm.writeHNT (tag, *this, 8);
     else
     {
         int refNum = (mIndex & 0xffffff) | ((mContentFile==-1 ? 0xff : mContentFile)<<24);
 
-        esm.writeHNT ("FRMR", refNum, 4);
+        esm.writeHNT (tag, refNum, 4);
     }
 }
 
diff --git a/components/esm/cellref.hpp b/components/esm/cellref.hpp
index 505f676b1..d4e63d6e8 100644
--- a/components/esm/cellref.hpp
+++ b/components/esm/cellref.hpp
@@ -18,7 +18,7 @@ namespace ESM
 
         void load (ESMReader& esm, bool wide = false);
 
-        void save (ESMWriter &esm, bool wide = false) const;
+        void save (ESMWriter &esm, bool wide = false, const std::string& tag = "FRMR") const;
     };
 
     /* Cell reference. This represents ONE object (of many) inside the