diff --git a/CHANGELOG.md b/CHANGELOG.md index 66f5868589..2d264b5f02 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -118,6 +118,7 @@ Bug #6717: Broken script causes interpreter stack corruption Bug #6718: Throwable weapons cause arrow enchantment effect to be applied to the whole body Bug #6730: LoopGroup stalls animation after playing :Stop frame until another animation is played + Bug #6753: Info records without a DATA subrecords are loaded incorrectly Feature #890: OpenMW-CS: Column filtering Feature #1465: "Reset" argument for AI functions Feature #2491: Ability to make OpenMW "portable" diff --git a/components/esm3/loadinfo.cpp b/components/esm3/loadinfo.cpp index 0c7c4db61a..20604c8be4 100644 --- a/components/esm3/loadinfo.cpp +++ b/components/esm3/loadinfo.cpp @@ -133,12 +133,7 @@ namespace ESM void DialInfo::blank() { - mData.mUnknown1 = 0; - mData.mDisposition = 0; - mData.mRank = 0; - mData.mGender = 0; - mData.mPCrank = 0; - mData.mUnknown2 = 0; + mData = {}; mSelects.clear(); mPrev.clear(); diff --git a/components/esm3/loadinfo.hpp b/components/esm3/loadinfo.hpp index 7f135087ee..067dc62471 100644 --- a/components/esm3/loadinfo.hpp +++ b/components/esm3/loadinfo.hpp @@ -43,6 +43,8 @@ struct DialInfo signed char mGender; // See Gender enum signed char mPCrank; // Player rank signed char mUnknown2; + + DATAstruct() : mDisposition(0), mRank(-1), mGender(Gender::NA), mPCrank(-1) {} }; // 12 bytes DATAstruct mData;