From 64d517dd796a5f07406f909ee25fca81008c920e Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Mon, 11 Mar 2013 14:42:49 +0100
Subject: [PATCH] removed unused file type information from esm component

---
 apps/esmtool/esmtool.cpp     |  4 ----
 components/esm/esmcommon.hpp |  4 ++--
 components/esm/esmreader.cpp | 24 ------------------------
 components/esm/esmreader.hpp |  3 ---
 components/esm/esmwriter.cpp | 16 +++-------------
 components/esm/esmwriter.hpp |  4 +---
 6 files changed, 6 insertions(+), 49 deletions(-)

diff --git a/apps/esmtool/esmtool.cpp b/apps/esmtool/esmtool.cpp
index 3c9476d7a..b243917be 100644
--- a/apps/esmtool/esmtool.cpp
+++ b/apps/esmtool/esmtool.cpp
@@ -23,7 +23,6 @@ struct ESMData
     std::string author;
     std::string description;
     int version;
-    int type;
     ESM::ESMReader::MasterList masters;
 
     std::deque<EsmTool::RecordBase *> mRecords;
@@ -284,8 +283,6 @@ int load(Arguments& info)
         info.data.author = esm.getAuthor();
         info.data.description = esm.getDesc();
         info.data.masters = esm.getMasters();
-        info.data.version = esm.getVer();
-        info.data.type = esm.getType();
 
         if (!quiet)
         {
@@ -430,7 +427,6 @@ int clone(Arguments& info)
     esm.setAuthor(info.data.author);
     esm.setDescription(info.data.description);
     esm.setVersion(info.data.version);
-    esm.setType(info.data.type);
 
     for (ESM::ESMReader::MasterList::iterator it = info.data.masters.begin(); it != info.data.masters.end(); ++it)
         esm.addMaster(it->name, it->size);
diff --git a/components/esm/esmcommon.hpp b/components/esm/esmcommon.hpp
index 335d12337..f5ddf6280 100644
--- a/components/esm/esmcommon.hpp
+++ b/components/esm/esmcommon.hpp
@@ -41,7 +41,7 @@ union NAME_T
 {
     char name[LEN];
     int32_t val;
-    
+
   bool operator==(const char *str) const
   {
     for(int i=0; i<LEN; i++)
@@ -78,7 +78,7 @@ struct HEDRstruct
      1.2 = 0x3f99999a and 1.3 = 0x3fa66666
   */
   int version;
-  int type;           // 0=esp, 1=esm, 32=ess
+  int type;           // 0=esp, 1=esm, 32=ess (unused)
   NAME32 author;      // Author's name
   NAME256 desc;       // File description
   int records;        // Number of records? Not used.
diff --git a/components/esm/esmreader.cpp b/components/esm/esmreader.cpp
index b4f581d7e..edd047d92 100644
--- a/components/esm/esmreader.cpp
+++ b/components/esm/esmreader.cpp
@@ -86,30 +86,6 @@ void ESMReader::open(Ogre::DataStreamPtr _esm, const std::string &name)
         m.size = getHNLong("DATA");
         mMasters.push_back(m);
     }
-
-    if (mCtx.header.type == FT_ESS)
-    {
-        // Savegame-related data
-
-        // Player position etc
-        getHNT(mSaveData, "GMDT", 124);
-
-        /* Image properties, five ints. Is always:
-         Red-mask:   0xff0000
-         Blue-mask:  0x00ff00
-         Green-mask: 0x0000ff
-         Alpha-mask: 0x000000
-         Bpp:        32
-         */
-        getSubNameIs("SCRD");
-        skipHSubSize(20);
-
-        /* Savegame screenshot:
-         128x128 pixels * 4 bytes per pixel
-         */
-        getSubNameIs("SCRS");
-        skipHSubSize(65536);
-    }
 }
 
 void ESMReader::open(const std::string &file)
diff --git a/components/esm/esmreader.hpp b/components/esm/esmreader.hpp
index ae876edf8..94bf0f3d3 100644
--- a/components/esm/esmreader.hpp
+++ b/components/esm/esmreader.hpp
@@ -39,10 +39,8 @@ public:
   int getVer() const { return mCtx.header.version; }
   float getFVer() const { if(mCtx.header.version == VER_12) return 1.2; else return 1.3; }
   int getSpecial() const { return mSpf; }
-  int getType() const { return mCtx.header.type; }
   const std::string getAuthor() const { return mCtx.header.author.toString(); }
   const std::string getDesc() const { return mCtx.header.desc.toString(); }
-  const SaveData &getSaveData() const { return mSaveData; }
   const MasterList &getMasters() const { return mMasters; }
   const NAME &retSubName() const { return mCtx.subName; }
   uint32_t getSubSize() const { return mCtx.leftSub; }
@@ -268,7 +266,6 @@ private:
   // Buffer for ESM strings
   std::vector<char> mBuffer;
 
-  SaveData mSaveData;
   MasterList mMasters;
   std::vector<ESMReader> *mGlobalReaderList;
   ToUTF8::Utf8Encoder* mEncoder;
diff --git a/components/esm/esmwriter.cpp b/components/esm/esmwriter.cpp
index b9dd5b57b..faceeeaa6 100644
--- a/components/esm/esmwriter.cpp
+++ b/components/esm/esmwriter.cpp
@@ -17,16 +17,6 @@ void ESMWriter::setVersion(int ver)
     m_header.version = ver;
 }
 
-int ESMWriter::getType()
-{
-    return m_header.type;
-}
-
-void ESMWriter::setType(int type)
-{
-    m_header.type = type;
-}
-
 void ESMWriter::setAuthor(const std::string& auth)
 {
     strncpy((char*)&m_header.author, auth.c_str(), 32);
@@ -86,7 +76,7 @@ void ESMWriter::close()
 void ESMWriter::startRecord(const std::string& name, uint32_t flags)
 {
     m_recordCount++;
-    
+
     writeName(name);
     RecordData rec;
     rec.name = name;
@@ -109,7 +99,7 @@ void ESMWriter::startSubRecord(const std::string& name)
     rec.size = 0;
     writeT<int>(0); // Size goes here
     m_records.push_back(rec);
-    
+
     assert(m_records.back().size == 0);
 }
 
@@ -118,7 +108,7 @@ void ESMWriter::endRecord(const std::string& name)
     RecordData rec = m_records.back();
     assert(rec.name == name);
     m_records.pop_back();
-    
+
     m_stream->seekp(rec.position);
 
     count = false;
diff --git a/components/esm/esmwriter.hpp b/components/esm/esmwriter.hpp
index 94e173b4c..f488cce3e 100644
--- a/components/esm/esmwriter.hpp
+++ b/components/esm/esmwriter.hpp
@@ -22,8 +22,6 @@ class ESMWriter
 public:
     int getVersion();
     void setVersion(int ver);
-    int getType();
-    void setType(int type);
     void setEncoder(ToUTF8::Utf8Encoder *encoding); // Write strings as UTF-8?
     void setAuthor(const std::string& author);
     void setDescription(const std::string& desc);
@@ -80,7 +78,7 @@ public:
     {
         write((char*)&data, size);
     }
-    
+
     void startRecord(const std::string& name, uint32_t flags);
     void startSubRecord(const std::string& name);
     void endRecord(const std::string& name);