2
0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-10 17:47:42 +00:00

Runtime/World: Replace bitfield unions with constructor initializers

This commit is contained in:
2020-04-11 01:50:10 -04:00
parent 22880abb7e
commit bb7e94f304
69 changed files with 583 additions and 657 deletions

View File

@@ -130,16 +130,10 @@ private:
IFactory& x64_resFactory;
TAreaId x68_curAreaId = kInvalidAreaId;
u32 x6c_loadedAudioGrpCount = 0;
union {
struct {
bool x70_24_currentAreaNeedsAllocation : 1;
bool x70_25_loadPaused : 1;
bool x70_26_skyboxActive : 1;
bool x70_27_skyboxVisible : 1;
};
u32 dummy = 0;
};
bool x70_24_currentAreaNeedsAllocation : 1;
bool x70_25_loadPaused : 1;
bool x70_26_skyboxActive : 1;
bool x70_27_skyboxVisible : 1;
std::vector<CSoundGroupData> x74_soundGroupData;
std::string x84_defAudioTrack;
std::optional<TLockedToken<CModel>> x94_skyboxWorld;