AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-10 09:47:43 +00:00
Code Issues Projects Releases Wiki Activity

Runtime/World: Replace bitfield unions with constructor initializers

Browse Source
This commit is contained in:
Luke Street
2020-04-11 01:50:10 -04:00
parent 22880abb7e
commit bb7e94f304
69 changed files with 583 additions and 657 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Runtime/World/CGameArea.hpp
View File

@@ -229,18 +229,13 @@ public:
// std::vector<CAramToken> x10f0_tokens;
u32 x1100_ = 0;
u32 x1104_ = 0;
union {
struct {
bool x1108_24_ : 1;
bool x1108_25_modelsConstructed : 1;
bool x1108_26_ : 1;
bool x1108_27_ : 1;
bool x1108_28_occlusionPinged : 1;
bool x1108_29_pvsHasActors : 1;
bool x1108_30_ : 1;
};
u32 _dummy = 0;
};
bool x1108_24_ : 1;
bool x1108_25_modelsConstructed : 1;
bool x1108_26_ : 1;
bool x1108_27_ : 1;
bool x1108_28_occlusionPinged : 1;
bool x1108_29_pvsHasActors : 1;
bool x1108_30_ : 1;
std::vector<std::pair<const u8*, u32>> x110c_layerPtrs;
float x111c_thermalCurrent = 0.f;
float x1120_thermalSpeed = 0.f;
@@ -251,6 +246,15 @@ public:
float x1134_weaponWorldLightingSpeed = 0.f;
float x1138_weaponWorldLightingTarget = 1.f;
u32 x113c_playerActorsLoading = 0;
CPostConstructed()
: x1108_24_(false)
, x1108_25_modelsConstructed(false)
, x1108_26_(false)
, x1108_27_(false)
, x1108_28_occlusionPinged(false)
, x1108_29_pvsHasActors(false)
, x1108_30_(false) {}
};
private: