From 7e3843de42c3a1d48beb54a430f96556ebda626d Mon Sep 17 00:00:00 2001 From: scrawl Date: Fri, 30 Jan 2015 16:14:53 +0100 Subject: [PATCH] ESSImport: convert Attacked flag --- apps/essimporter/convertacdt.cpp | 1 + apps/essimporter/importacdt.cpp | 2 +- apps/essimporter/importacdt.hpp | 6 +++--- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/apps/essimporter/convertacdt.cpp b/apps/essimporter/convertacdt.cpp index 496eab9e99..d3b70d1f58 100644 --- a/apps/essimporter/convertacdt.cpp +++ b/apps/essimporter/convertacdt.cpp @@ -29,6 +29,7 @@ namespace ESSImport } cStats.mGoldPool = acdt.mGoldPool; cStats.mTalkedTo = acdt.mFlags & TalkedToPlayer; + cStats.mAttacked = acdt.mFlags & Attacked; } void convertNpcData (const ActorData& actorData, ESM::NpcStats& npcStats) diff --git a/apps/essimporter/importacdt.cpp b/apps/essimporter/importacdt.cpp index 9a062484b3..4cd994b927 100644 --- a/apps/essimporter/importacdt.cpp +++ b/apps/essimporter/importacdt.cpp @@ -24,7 +24,7 @@ namespace ESSImport esm.getHNOT(mACDT, "ACDT"); ACSC acsc; - esm.getHNOT(acsc, "ACSC"); + esm.getHNOT(acsc, "ACSC"); // skill progress? esm.getHNOT(acsc, "ACSL"); if (esm.isNextSub("CSTN")) diff --git a/apps/essimporter/importacdt.hpp b/apps/essimporter/importacdt.hpp index 53783a3644..4876602bcd 100644 --- a/apps/essimporter/importacdt.hpp +++ b/apps/essimporter/importacdt.hpp @@ -17,7 +17,8 @@ namespace ESSImport enum ACDTFlags { - TalkedToPlayer = 0x4 + TalkedToPlayer = 0x4, + Attacked = 0x100 }; /// Actor data, shared by (at least) REFR and CellRef @@ -28,8 +29,7 @@ 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 mUnknown[12]; - unsigned char mFlags; // ACDTFlags - unsigned char mUnknown1[3]; + unsigned int mFlags; float mBreathMeter; // Seconds left before drowning unsigned char mUnknown2[20]; float mDynamic[3][2];