From 142a138b75e3391963ce109b216c7eb625a441b7 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 20 Jan 2015 20:19:08 +0100
Subject: [PATCH] ESSImport: convert TalkedTo flag and gold pool

---
 apps/essimporter/convertacdt.cpp |  2 ++
 apps/essimporter/importacdt.cpp  |  3 ++-
 apps/essimporter/importacdt.hpp  | 15 ++++++++++-----
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/apps/essimporter/convertacdt.cpp b/apps/essimporter/convertacdt.cpp
index af66ec272..496eab9e9 100644
--- a/apps/essimporter/convertacdt.cpp
+++ b/apps/essimporter/convertacdt.cpp
@@ -27,6 +27,8 @@ namespace ESSImport
             cStats.mAttributes[i].mMod = acdt.mAttributes[i][0];
             cStats.mAttributes[i].mCurrent = acdt.mAttributes[i][0];
         }
+        cStats.mGoldPool = acdt.mGoldPool;
+        cStats.mTalkedTo = acdt.mFlags & TalkedToPlayer;
     }
 
     void convertNpcData (const ActorData& actorData, ESM::NpcStats& npcStats)
diff --git a/apps/essimporter/importacdt.cpp b/apps/essimporter/importacdt.cpp
index d961720a7..84c800897 100644
--- a/apps/essimporter/importacdt.cpp
+++ b/apps/essimporter/importacdt.cpp
@@ -22,7 +22,7 @@ namespace ESSImport
         ESM::CellRef bla;
         bla.ESM::CellRef::loadData(esm);
 
-        // FIXME: actually should be required for all actors?, but ActorData is currently in base CellRef
+        // FIXME: not all actors have this, add flag
         esm.getHNOT(mACDT, "ACDT");
 
         ACSC acsc;
@@ -76,6 +76,7 @@ namespace ESSImport
                 esm.skipHSub(); // 4 byte, 0
         }
 
+        // FIXME: not all actors have this, add flag
         if (esm.isNextSub("CHRD")) // npc only
                 esm.getHExact(mSkills, 27*2*sizeof(int));
 
diff --git a/apps/essimporter/importacdt.hpp b/apps/essimporter/importacdt.hpp
index cf72b5cf7..79f67d2c2 100644
--- a/apps/essimporter/importacdt.hpp
+++ b/apps/essimporter/importacdt.hpp
@@ -11,6 +11,10 @@ namespace ESM
 namespace ESSImport
 {
 
+    enum ACDTFlags
+    {
+        TalkedToPlayer = 0x4
+    };
 
     /// Actor data, shared by (at least) REFR and CellRef
 #pragma pack(push)
@@ -19,16 +23,17 @@ namespace ESSImport
     {
         // Note, not stored at *all*:
         // - Level changes are lost on reload, except for the player (there it's in the NPC record).
-        unsigned char mUnknown1[16];
+        unsigned char mUnknown[12];
+        unsigned char mFlags; // ACDTFlags
+        unsigned char mUnknown1[3];
         float mBreathMeter; // Seconds left before drowning
         unsigned char mUnknown2[20];
         float mDynamic[3][2];
         unsigned char mUnknown3[16];
         float mAttributes[8][2];
-        unsigned char mUnknown4[109];
-        // This seems to increase when purchasing training, though I don't see it anywhere ingame.
-        int mGold;
-        unsigned char mUnknown5[7];
+        unsigned char mUnknown4[112];
+        unsigned int mGoldPool;
+        unsigned char mUnknown5[4];
     };
 #pragma pack(pop)