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

Merge branch 'initialize' into 'master'

Browse Source 
Explicitly intialize the fields in `ESM4::Cell` that don't have default constructors.

See merge request OpenMW/openmw!3027
This commit is contained in:
psi29a 2023-05-18 21:14:38 +00:00
commit e952eac501
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
components/esm4/loadcell.hpp
View File

@ -64,22 +64,22 @@ namespace ESM4
{ {
FormId mFormId; // from the header FormId mFormId; // from the header
ESM::RefId mId; ESM::RefId mId;
std::uint32_t mFlags; // from the header, see enum type RecordFlag for details std::uint32_t mFlags = 0; // from the header, see enum type RecordFlag for details
ESM::RefId mParent; // world formId (for grouping cells), from the loading sequence ESM::RefId mParent; // world formId (for grouping cells), from the loading sequence
std::string mEditorId; std::string mEditorId;
std::string mFullName; std::string mFullName;
std::uint16_t mCellFlags; // TES5 can also be 8 bits std::uint16_t mCellFlags = 0; // TES5 can also be 8 bits
std::int32_t mX; std::int32_t mX = 0;
std::int32_t mY; std::int32_t mY = 0;
FormId mOwner; FormId mOwner;
FormId mGlobal; FormId mGlobal;
FormId mClimate; FormId mClimate;
FormId mWater; FormId mWater;
float mWaterHeight; float mWaterHeight = 0;
std::vector<FormId> mRegions; std::vector<FormId> mRegions;
Lighting mLighting; Lighting mLighting;
@ -91,9 +91,9 @@ namespace ESM4
FormId mAcousticSpace; // FO3/FONV FormId mAcousticSpace; // FO3/FONV
// TES4: 0 = default, 1 = public, 2 = dungeon // TES4: 0 = default, 1 = public, 2 = dungeon
// FO3/FONV have more types (not sure how they are used, however) // FO3/FONV have more types (not sure how they are used, however)
std::uint8_t mMusicType; std::uint8_t mMusicType = 0;
CellGroup* mCellGroup; CellGroup* mCellGroup = nullptr;
ESM4::ReaderContext mReaderContext; ESM4::ReaderContext mReaderContext;