From 16e2d67b1f6fb47fe0336b23e0b064a940949b23 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Sun, 1 Dec 2013 13:32:11 +0100
Subject: [PATCH] added overloaded start/endRecord functions to ESMWriter

---
 apps/opencs/model/doc/savingstages.cpp | 19 ++++---------------
 apps/opencs/model/doc/savingstages.hpp |  4 ++--
 apps/opencs/model/world/refiddata.hpp  |  9 ++-------
 components/esm/esmwriter.cpp           | 20 ++++++++++++++++++++
 components/esm/esmwriter.hpp           |  2 ++
 5 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/apps/opencs/model/doc/savingstages.cpp b/apps/opencs/model/doc/savingstages.cpp
index 8e9bcfc0de..d7df2117d0 100644
--- a/apps/opencs/model/doc/savingstages.cpp
+++ b/apps/opencs/model/doc/savingstages.cpp
@@ -133,16 +133,10 @@ void CSMDoc::WriteDialogueCollectionStage::perform (int stage, std::vector<std::
         state==CSMWorld::RecordBase::State_ModifiedOnly ||
         infoModified)
     {
-        // always write the topic record
-        std::string type;
-        for (int i=0; i<4; ++i)
-            /// \todo make endianess agnostic (change ESMWriter interface?)
-            type += reinterpret_cast<const char *> (&topic.mModified.sRecordId)[i];
-
-        mState.getWriter().startRecord (type);
+        mState.getWriter().startRecord (topic.mModified.sRecordId);
         mState.getWriter().writeHNCString ("NAME", topic.mModified.mId);
         topic.mModified.save (mState.getWriter());
-        mState.getWriter().endRecord (type);
+        mState.getWriter().endRecord (topic.mModified.sRecordId);
 
         // write modified selected info records
         for (CSMWorld::InfoCollection::RecordConstIterator iter (range.first); iter!=range.second;
@@ -178,15 +172,10 @@ void CSMDoc::WriteDialogueCollectionStage::perform (int stage, std::vector<std::
                         next->mModified.mId.substr (next->mModified.mId.find_last_of ('#')+1);
                 }
 
-                std::string type;
-                for (int i=0; i<4; ++i)
-                    /// \todo make endianess agnostic (change ESMWriter interface?)
-                    type += reinterpret_cast<const char *> (&info.sRecordId)[i];
-
-                mState.getWriter().startRecord (type);
+                mState.getWriter().startRecord (info.sRecordId);
                 mState.getWriter().writeHNCString ("INAM", info.mId);
                 info.save (mState.getWriter());
-                mState.getWriter().endRecord (type);
+                mState.getWriter().endRecord (info.sRecordId);
             }
         }
     }
diff --git a/apps/opencs/model/doc/savingstages.hpp b/apps/opencs/model/doc/savingstages.hpp
index ca5586511d..b8eb0a3b30 100644
--- a/apps/opencs/model/doc/savingstages.hpp
+++ b/apps/opencs/model/doc/savingstages.hpp
@@ -104,10 +104,10 @@ namespace CSMDoc
                 /// \todo make endianess agnostic (change ESMWriter interface?)
                 type += reinterpret_cast<const char *> (&mCollection.getRecord (stage).mModified.sRecordId)[i];
 
-            mState.getWriter().startRecord (type);
+            mState.getWriter().startRecord (mCollection.getRecord (stage).mModified.sRecordId);
             mState.getWriter().writeHNCString ("NAME", mCollection.getId (stage));
             mCollection.getRecord (stage).mModified.save (mState.getWriter());
-            mState.getWriter().endRecord (type);
+            mState.getWriter().endRecord (mCollection.getRecord (stage).mModified.sRecordId);
         }
         else if (state==CSMWorld::RecordBase::State_Deleted)
         {
diff --git a/apps/opencs/model/world/refiddata.hpp b/apps/opencs/model/world/refiddata.hpp
index 9595ab23b5..761c7feaac 100644
--- a/apps/opencs/model/world/refiddata.hpp
+++ b/apps/opencs/model/world/refiddata.hpp
@@ -136,15 +136,10 @@ namespace CSMWorld
         if (state==CSMWorld::RecordBase::State_Modified ||
             state==CSMWorld::RecordBase::State_ModifiedOnly)
         {
-            std::string type;
-            for (int i=0; i<4; ++i)
-                /// \todo make endianess agnostic (change ESMWriter interface?)
-                type += reinterpret_cast<const char *> (&mContainer.at (index).mModified.sRecordId)[i];
-
-            writer.startRecord (type);
+            writer.startRecord (mContainer.at (index).mModified.sRecordId);
             writer.writeHNCString ("NAME", getId (index));
             mContainer.at (index).mModified.save (writer);
-            writer.endRecord (type);
+            writer.endRecord (mContainer.at (index).mModified.sRecordId);
         }
         else if (state==CSMWorld::RecordBase::State_Deleted)
         {
diff --git a/components/esm/esmwriter.cpp b/components/esm/esmwriter.cpp
index 069d75c7bb..f38591b7bf 100644
--- a/components/esm/esmwriter.cpp
+++ b/components/esm/esmwriter.cpp
@@ -88,6 +88,16 @@ namespace ESM
         assert(mRecords.back().size == 0);
     }
 
+    void ESMWriter::startRecord (uint32_t name, uint32_t flags)
+    {
+        std::string type;
+        for (int i=0; i<4; ++i)
+            /// \todo make endianess agnostic
+            type += reinterpret_cast<const char *> (&name)[i];
+
+        startRecord (type, flags);
+    }
+
     void ESMWriter::startSubRecord(const std::string& name)
     {
         writeName(name);
@@ -117,6 +127,16 @@ namespace ESM
 
     }
 
+    void ESMWriter::endRecord (uint32_t name)
+    {
+        std::string type;
+        for (int i=0; i<4; ++i)
+            /// \todo make endianess agnostic
+            type += reinterpret_cast<const char *> (&name)[i];
+
+        endRecord (type);
+    }
+
     void ESMWriter::writeHNString(const std::string& name, const std::string& data)
     {
         startSubRecord(name);
diff --git a/components/esm/esmwriter.hpp b/components/esm/esmwriter.hpp
index d6646471b8..94f0a10048 100644
--- a/components/esm/esmwriter.hpp
+++ b/components/esm/esmwriter.hpp
@@ -90,8 +90,10 @@ class ESMWriter
         }
 
         void startRecord(const std::string& name, uint32_t flags = 0);
+        void startRecord(uint32_t name, uint32_t flags = 0);
         void startSubRecord(const std::string& name);
         void endRecord(const std::string& name);
+        void endRecord(uint32_t name);
         void writeHString(const std::string& data);
         void writeHCString(const std::string& data);
         void writeName(const std::string& data);