mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-04-10 06:44:29 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'construct_me_not' into 'master'

Browse Source 
Address feedback on !1857

See merge request OpenMW/openmw!1865
This commit is contained in:
Alexei Kotov 2022-05-16 16:58:43 +00:00
commit 8140cceb3e
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
components/esm3/loadinfo.hpp
View File

@ -33,18 +33,16 @@ struct DialInfo
struct DATAstruct struct DATAstruct
{ {
int mUnknown1; int mUnknown1 = 0;
union union
{ {
int mDisposition; // Used for dialogue responses int mDisposition = 0; // Used for dialogue responses
int mJournalIndex; // Used for journal entries int mJournalIndex; // Used for journal entries
}; };
signed char mRank; // Rank of NPC signed char mRank = -1; // Rank of NPC
signed char mGender; // See Gender enum signed char mGender = Gender::NA; // See Gender enum
signed char mPCrank; // Player rank signed char mPCrank = -1; // Player rank
signed char mUnknown2; signed char mUnknown2 = 0;
DATAstruct() : mDisposition(0), mRank(-1), mGender(Gender::NA), mPCrank(-1) {}
}; // 12 bytes }; // 12 bytes
DATAstruct mData; DATAstruct mData;