mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-16 17:59:56 +00:00
Code Issues Releases Wiki Activity

Merge branch 'how_do_we_still_have_these_issues' into 'master'

Browse source 
Initialize DialInfo::DATAstruct with the proper blank values

Closes #6753

See merge request OpenMW/openmw!1857
This commit is contained in:
jvoisin 2022-05-15 14:09:02 +00:00
commit e7fb8b6fd8
3 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -118,6 +118,7 @@
Bug #6717: Broken script causes interpreter stack corruption Bug #6717: Broken script causes interpreter stack corruption
Bug #6718: Throwable weapons cause arrow enchantment effect to be applied to the whole body 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 #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 #890: OpenMW-CS: Column filtering
Feature #1465: "Reset" argument for AI functions Feature #1465: "Reset" argument for AI functions
Feature #2491: Ability to make OpenMW "portable" Feature #2491: Ability to make OpenMW "portable"

7
components/esm3/loadinfo.cpp
View file

@ -133,12 +133,7 @@ namespace ESM
void DialInfo::blank() void DialInfo::blank()
{ {
mData.mUnknown1 = 0; mData = {};
mData.mDisposition = 0;
mData.mRank = 0;
mData.mGender = 0;
mData.mPCrank = 0;
mData.mUnknown2 = 0;
mSelects.clear(); mSelects.clear();
mPrev.clear(); mPrev.clear();

2
components/esm3/loadinfo.hpp
View file

@ -43,6 +43,8 @@ struct DialInfo
signed char mGender; // See Gender enum signed char mGender; // See Gender enum
signed char mPCrank; // Player rank signed char mPCrank; // Player rank
signed char mUnknown2; signed char mUnknown2;
DATAstruct() : mDisposition(0), mRank(-1), mGender(Gender::NA), mPCrank(-1) {}
}; // 12 bytes }; // 12 bytes
DATAstruct mData; DATAstruct mData;