mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-01 03:21:41 +00:00
Code Issues Projects Releases Wiki Activity

ESSImport: convert Attacked flag

Browse Source
This commit is contained in:
scrawl 2015-01-30 16:14:53 +01:00
parent 081c8c8615
commit 7e3843de42
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/essimporter/convertacdt.cpp
View File

@ -29,6 +29,7 @@ namespace ESSImport
} }
cStats.mGoldPool = acdt.mGoldPool; cStats.mGoldPool = acdt.mGoldPool;
cStats.mTalkedTo = acdt.mFlags & TalkedToPlayer; cStats.mTalkedTo = acdt.mFlags & TalkedToPlayer;
cStats.mAttacked = acdt.mFlags & Attacked;
} }
void convertNpcData (const ActorData& actorData, ESM::NpcStats& npcStats) void convertNpcData (const ActorData& actorData, ESM::NpcStats& npcStats)

2
apps/essimporter/importacdt.cpp
View File

@ -24,7 +24,7 @@ namespace ESSImport
esm.getHNOT(mACDT, "ACDT"); esm.getHNOT(mACDT, "ACDT");
ACSC acsc; ACSC acsc;
esm.getHNOT(acsc, "ACSC"); esm.getHNOT(acsc, "ACSC"); // skill progress?
esm.getHNOT(acsc, "ACSL"); esm.getHNOT(acsc, "ACSL");
if (esm.isNextSub("CSTN")) if (esm.isNextSub("CSTN"))

6
apps/essimporter/importacdt.hpp
View File

@ -17,7 +17,8 @@ namespace ESSImport
enum ACDTFlags enum ACDTFlags
{ {
TalkedToPlayer = 0x4 TalkedToPlayer = 0x4,
Attacked = 0x100
}; };
/// Actor data, shared by (at least) REFR and CellRef /// Actor data, shared by (at least) REFR and CellRef
@ -28,8 +29,7 @@ namespace ESSImport
// Note, not stored at *all*: // Note, not stored at *all*:
// - Level changes are lost on reload, except for the player (there it's in the NPC record). // - Level changes are lost on reload, except for the player (there it's in the NPC record).
unsigned char mUnknown[12]; unsigned char mUnknown[12];
unsigned char mFlags; // ACDTFlags unsigned int mFlags;
unsigned char mUnknown1[3];
float mBreathMeter; // Seconds left before drowning float mBreathMeter; // Seconds left before drowning
unsigned char mUnknown2[20]; unsigned char mUnknown2[20];
float mDynamic[3][2]; float mDynamic[3][2];