From 75bd30844db2ce8a5e3d1e1e9ea9b12f0bc5854a Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Tue, 12 Mar 2013 14:33:35 +0100
Subject: [PATCH] added optional format sub-record to tes3 record

---
 apps/esmtool/esmtool.cpp     |  1 +
 components/esm/esmreader.cpp |  7 ++++++-
 components/esm/esmreader.hpp |  1 +
 components/esm/esmwriter.cpp | 10 ++++++++++
 components/esm/esmwriter.hpp |  2 ++
 components/esm/loadtes3.cpp  | 13 +++++++++++++
 components/esm/loadtes3.hpp  |  3 +++
 7 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/apps/esmtool/esmtool.cpp b/apps/esmtool/esmtool.cpp
index 5cc1b6bcb..20c01af25 100644
--- a/apps/esmtool/esmtool.cpp
+++ b/apps/esmtool/esmtool.cpp
@@ -426,6 +426,7 @@ int clone(Arguments& info)
     esm.setAuthor(info.data.author);
     esm.setDescription(info.data.description);
     esm.setVersion(info.data.version);
+    esm.setRecordCount (recordCount);
 
     for (std::vector<ESM::Header::MasterData>::iterator it = info.data.masters.begin(); it != info.data.masters.end(); ++it)
         esm.addMaster(it->name, it->size);
diff --git a/components/esm/esmreader.cpp b/components/esm/esmreader.cpp
index 979088b80..580e576d0 100644
--- a/components/esm/esmreader.cpp
+++ b/components/esm/esmreader.cpp
@@ -15,11 +15,16 @@ ESM_Context ESMReader::getContext()
     return mCtx;
 }
 
-ESMReader::ESMReader(void):
+ESMReader::ESMReader():
     mBuffer(50*1024)
 {
 }
 
+int ESMReader::getFormat() const
+{
+    return mHeader.mFormat;
+}
+
 void ESMReader::restoreContext(const ESM_Context &rc)
 {
     // Reopen the file if necessary
diff --git a/components/esm/esmreader.hpp b/components/esm/esmreader.hpp
index e377470ee..f805998e4 100644
--- a/components/esm/esmreader.hpp
+++ b/components/esm/esmreader.hpp
@@ -35,6 +35,7 @@ public:
   const std::string getAuthor() const { return mHeader.mData.author.toString(); }
   const std::string getDesc() const { return mHeader.mData.desc.toString(); }
   const std::vector<Header::MasterData> &getMasters() const { return mHeader.mMaster; }
+  int getFormat() const;
   const NAME &retSubName() const { return mCtx.subName; }
   uint32_t getSubSize() const { return mCtx.leftSub; }
 
diff --git a/components/esm/esmwriter.cpp b/components/esm/esmwriter.cpp
index edb681f32..3ea6bd350 100644
--- a/components/esm/esmwriter.cpp
+++ b/components/esm/esmwriter.cpp
@@ -29,6 +29,16 @@ void ESMWriter::setDescription(const std::string& desc)
     mHeader.mData.desc.assign (desc);
 }
 
+void ESMWriter::setRecordCount (int count)
+{
+    mHeader.mData.records = count;
+}
+
+void ESMWriter::setFormat (int format)
+{
+    mHeader.mFormat = format;
+}
+
 void ESMWriter::addMaster(const std::string& name, uint64_t size)
 {
     Header::MasterData d;
diff --git a/components/esm/esmwriter.hpp b/components/esm/esmwriter.hpp
index b0e9329d4..be3ae33ab 100644
--- a/components/esm/esmwriter.hpp
+++ b/components/esm/esmwriter.hpp
@@ -26,6 +26,8 @@ public:
     void setEncoder(ToUTF8::Utf8Encoder *encoding); // Write strings as UTF-8?
     void setAuthor(const std::string& author);
     void setDescription(const std::string& desc);
+    void setRecordCount (int count);
+    void setFormat (int format);
 
     void addMaster(const std::string& name, uint64_t size);
 
diff --git a/components/esm/loadtes3.cpp b/components/esm/loadtes3.cpp
index 64f1446f1..74d578ba7 100644
--- a/components/esm/loadtes3.cpp
+++ b/components/esm/loadtes3.cpp
@@ -12,12 +12,22 @@ void ESM::Header::blank()
     mData.author.assign ("");
     mData.desc.assign ("");
     mData.records = 0;
+    mFormat = CurrentFormat;
 }
 
 void ESM::Header::load (ESMReader &esm)
 {
     esm.getHNT (mData, "HEDR", 300);
 
+    if (esm.isNextSub ("FORM"))
+    {
+        esm.getHT (mFormat);
+        if (mFormat<0)
+            esm.fail ("invalid format code");
+    }
+    else
+        mFormat = 0;
+
     while (esm.isNextSub ("MAST"))
     {
         MasterData m;
@@ -31,6 +41,9 @@ void ESM::Header::save (ESMWriter &esm)
 {
     esm.writeHNT ("HEDR", mData, 300);
 
+    if (mFormat>0)
+        esm.writeHNT ("FORM", mFormat);
+
     for (std::vector<Header::MasterData>::iterator iter = mMaster.begin();
          iter != mMaster.end(); ++iter)
     {
diff --git a/components/esm/loadtes3.hpp b/components/esm/loadtes3.hpp
index c0b1e3af7..b73a4c31e 100644
--- a/components/esm/loadtes3.hpp
+++ b/components/esm/loadtes3.hpp
@@ -16,6 +16,8 @@ namespace ESM
     /// \brief File header record
     struct Header
     {
+        static const int CurrentFormat = 0; // most recent known format
+
         struct Data
         {
             /* File format version. This is actually a float, the supported
@@ -38,6 +40,7 @@ namespace ESM
         };
 
         Data mData;
+        int mFormat;
         std::vector<MasterData> mMaster;
 
         void blank();