AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-13 16:06:08 +00:00
Code Issues Projects Releases Wiki Activity

Runtime/MP1: Replace bitfield unions with constructor initializers

Browse Source
This commit is contained in:
Luke Street
2020-04-10 15:25:40 -04:00
parent d23e76db54
commit 402e45ecb5
22 changed files with 153 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Runtime/MP1/CSamusDoll.hpp
View File

@@ -71,19 +71,14 @@ class CSamusDoll {
CSfxHandle x264_offsetSfx;
CSfxHandle x268_rotateSfx;
CSfxHandle x26c_zoomSfx;
union {
struct {
bool x270_24_hasSpiderBall : 1;
bool x270_25_hasGrappleBeam : 1;
bool x270_26_pulseSuit : 1;
bool x270_27_pulseBeam : 1;
bool x270_28_pulseGrapple : 1;
bool x270_29_pulseBoots : 1;
bool x270_30_pulseVisor : 1;
bool x270_31_loaded : 1;
};
u32 _dummy = 0;
};
bool x270_24_hasSpiderBall : 1;
bool x270_25_hasGrappleBeam : 1;
bool x270_26_pulseSuit : 1;
bool x270_27_pulseBeam : 1;
bool x270_28_pulseGrapple : 1;
bool x270_29_pulseBoots : 1;
bool x270_30_pulseVisor : 1;
bool x270_31_loaded : 1;
static constexpr zeus::CVector3f skInitialOffset{0.0f, 0.0f, 0.8f};
static CModelData BuildSuitModelData1(CPlayerState::EPlayerSuit suit);