2
0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 12:27:43 +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

@@ -170,19 +170,14 @@ private:
zeus::CVector3f x544_originalFrontVec;
zeus::CVector3f x550_originalRightVec;
s32 x55c_additiveChargeAnim = -1;
union {
struct {
bool x560_24_dead : 1;
bool x560_25_frozen : 1;
bool x560_26_firedWithSetBurst : 1;
bool x560_27_burstSet : 1;
bool x560_28_hasBeenActivated : 1;
bool x560_29_scriptedStart : 1;
bool x560_30_needsStopClankSound : 1;
bool x560_31_frenzyReverse : 1;
};
u32 _dummy = 0;
};
bool x560_24_dead : 1;
bool x560_25_frozen : 1;
bool x560_26_firedWithSetBurst : 1;
bool x560_27_burstSet : 1;
bool x560_28_hasBeenActivated : 1;
bool x560_29_scriptedStart : 1;
bool x560_30_needsStopClankSound : 1;
bool x560_31_frenzyReverse : 1;
private:
void SetupCollisionManager(CStateManager&);