ESSImport: convert kill counter

apps/essimporter/CMakeLists.txt

@@ -7,6 +7,7 @@ set(ESSIMPORTER_FILES
     importcellref.cpp
     importacdt.cpp
     importinventory.cpp
+    importklst.cpp
     importercontext.cpp
     converter.cpp
     convertacdt.cpp

apps/essimporter/converter.hpp

@@ -15,6 +15,7 @@
 
 #include "importercontext.hpp"
 #include "importcellref.hpp"
+#include "importklst.hpp"
 
 #include "convertacdt.hpp"
 #include "convertnpcc.hpp"
@@ -93,6 +94,7 @@ public:
             mContext->mPlayer.mObject.mCreatureStats.mLevel = npc.mNpdt52.mLevel;
             mContext->mPlayerBase = npc;
             std::map<const int, float> empty;
+            // FIXME: not working?
             for (std::vector<std::string>::const_iterator it = npc.mSpells.mList.begin(); it != npc.mSpells.mList.end(); ++it)
                 mContext->mPlayer.mObject.mCreatureStats.mSpells.mSpells[*it] = empty;
         }
@@ -245,6 +247,33 @@ private:
     std::vector<ESM::CustomMarker> mMarkers;
 };
 
+class ConvertKLST : public Converter
+{
+public:
+    virtual void read(ESM::ESMReader& esm)
+    {
+        KLST klst;
+        klst.load(esm);
+        mKillCounter = klst.mKillCounter;
+
+        mContext->mPlayer.mObject.mNpcStats.mWerewolfKills = klst.mWerewolfKills;
+    }
+
+    virtual void write(ESM::ESMWriter &esm)
+    {
+        esm.startRecord(ESM::REC_DCOU);
+        for (std::map<std::string, int>::const_iterator it = mKillCounter.begin(); it != mKillCounter.end(); ++it)
+        {
+            esm.writeHNString("ID__", it->first);
+            esm.writeHNT ("COUN", it->second);
+        }
+        esm.endRecord(ESM::REC_DCOU);
+    }
+
+private:
+    std::map<std::string, int> mKillCounter;
+};
+
 }
 
 #endif

apps/essimporter/importer.cpp

@@ -146,7 +146,7 @@ namespace ESSImport
                 {
                     std::cout << "Different subrecord name (" << rec.mName << "." << sub.mName << " vs. " << sub2.mName << ") at (1) 0x" << std::hex << sub.mFileOffset
                               << " (2) 0x" << sub2.mFileOffset << std::endl;
-                    return; // TODO: try to recover
+                    break; // TODO: try to recover
                 }
 
                 if (sub.mData != sub2.mData)
@@ -177,6 +177,7 @@ namespace ESSImport
 
     void Importer::run()
     {
+        // construct Ogre::Root to gain access to image codecs
         Ogre::LogManager logman;
         Ogre::Root root;
 
@@ -191,6 +192,7 @@ namespace ESSImport
         const unsigned int recREFR = ESM::FourCC<'R','E','F','R'>::value;
         const unsigned int recPCDT = ESM::FourCC<'P','C','D','T'>::value;
         const unsigned int recFMAP = ESM::FourCC<'F','M','A','P'>::value;
+        const unsigned int recKLST = ESM::FourCC<'K','L','S','T'>::value;
 
         std::map<unsigned int, boost::shared_ptr<Converter> > converters;
         converters[ESM::REC_GLOB] = boost::shared_ptr<Converter>(new ConvertGlobal());
@@ -201,6 +203,7 @@ namespace ESSImport
         converters[recREFR] = boost::shared_ptr<Converter>(new ConvertREFR());
         converters[recPCDT] = boost::shared_ptr<Converter>(new ConvertPCDT());
         converters[recFMAP] = boost::shared_ptr<Converter>(new ConvertFMAP());
+        converters[recKLST] = boost::shared_ptr<Converter>(new ConvertKLST());
         converters[ESM::REC_CELL] = boost::shared_ptr<Converter>(new ConvertCell());
         converters[ESM::REC_ALCH] = boost::shared_ptr<Converter>(new DefaultConverter<ESM::Potion>());
         converters[ESM::REC_CLAS] = boost::shared_ptr<Converter>(new ConvertClass());

apps/essimporter/importklst.cpp

@@ -0,0 +1,22 @@
+#include "importklst.hpp"
+
+#include <components/esm/esmreader.hpp>
+
+namespace ESSImport
+{
+
+    void KLST::load(ESM::ESMReader &esm)
+    {
+        while (esm.isNextSub("KNAM"))
+        {
+            std::string refId = esm.getHString();
+            int count;
+            esm.getHNT(count, "CNAM");
+            mKillCounter[refId] = count;
+        }
+
+        mWerewolfKills = 0;
+        esm.getHNOT(mWerewolfKills, "INTV");
+    }
+
+}

apps/essimporter/importklst.hpp

@@ -0,0 +1,28 @@
+#ifndef OPENMW_ESSIMPORT_KLST_H
+#define OPENMW_ESSIMPORT_KLST_H
+
+#include <string>
+#include <map>
+
+namespace ESM
+{
+    struct ESMReader;
+}
+
+namespace ESSImport
+{
+
+    /// Kill Stats
+    struct KLST
+    {
+        void load(ESM::ESMReader& esm);
+
+        /// RefId, kill count
+        std::map<std::string, int> mKillCounter;
+
+        int mWerewolfKills;
+    };
+
+}
+
+#endif