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

RuntimeCommonB: Make use of bitfield initializers where applicable

Browse Source 
Given that we now target C++20, we can make use of bitfield initializers
where applicable.
This commit is contained in:
Lioncash
2020-04-20 00:57:50 -04:00
parent 2103c38f54
commit 554893ef85
184 changed files with 587 additions and 1117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
Runtime/Weapon/CPlayerGun.hpp
View File

@@ -82,15 +82,13 @@ private:
float x18_transitionFactor = 1.f;
EDir x1c_dir = EDir::Done;
EGunState x20_gunState = EGunState::OutWipeDone;
bool x24_24_morphing : 1;
bool x24_25_weaponChanged : 1;
bool x24_24_morphing : 1 = false;
bool x24_25_weaponChanged : 1 = false;
public:
CGunMorph(float gunTransformTime, float holoHoldTime)
: x4_gunTransformTime(gunTransformTime)
, x10_holoHoldTime(std::fabs(holoHoldTime))
, x24_24_morphing(false)
, x24_25_weaponChanged(false) {}
, x10_holoHoldTime(std::fabs(holoHoldTime)) {}
float GetYLerp() const { return x0_yLerp; }
float GetTransitionFactor() const { return x18_transitionFactor; }
EGunState GetGunState() const { return x20_gunState; }
@@ -222,41 +220,41 @@ private:
std::unique_ptr<CWorldShadow> x82c_shadow;
s16 x830_chargeRumbleHandle = -1;
bool x832_24_coolingCharge : 1;
bool x832_25_chargeEffectVisible : 1;
bool x832_26_comboFiring : 1;
bool x832_27_chargeAnimStarted : 1;
bool x832_28_readyForShot : 1;
bool x832_29_lockedOn : 1;
bool x832_30_requestReturnToDefault : 1;
bool x832_31_inRestPose : 1;
bool x832_24_coolingCharge : 1 = false;
bool x832_25_chargeEffectVisible : 1 = false;
bool x832_26_comboFiring : 1 = false;
bool x832_27_chargeAnimStarted : 1 = false;
bool x832_28_readyForShot : 1 = false;
bool x832_29_lockedOn : 1 = false;
bool x832_30_requestReturnToDefault : 1 = false;
bool x832_31_inRestPose : 1 = true;
bool x833_24_notFidgeting : 1;
bool x833_25_ : 1;
bool x833_26_ : 1;
bool x833_27_ : 1;
bool x833_28_phazonBeamActive : 1;
bool x833_29_pointBlankWorldSurface : 1;
bool x833_30_canShowAuxMuzzleEffect : 1;
bool x833_31_inFreeLook : 1;
bool x833_24_notFidgeting : 1 = true;
bool x833_25_ : 1 = false;
bool x833_26_ : 1 = false;
bool x833_27_ : 1 = false;
bool x833_28_phazonBeamActive : 1 = false;
bool x833_29_pointBlankWorldSurface : 1 = false;
bool x833_30_canShowAuxMuzzleEffect : 1 = true;
bool x833_31_inFreeLook : 1 = false;
bool x834_24_charging : 1;
bool x834_25_gunMotionFidgeting : 1;
bool x834_26_animPlaying : 1;
bool x834_27_underwater : 1;
bool x834_28_requestImmediateRecharge : 1;
bool x834_29_frozen : 1;
bool x834_30_inBigStrike : 1;
bool x834_31_gunMotionInFidgetBasePosition : 1;
bool x834_24_charging : 1 = false;
bool x834_25_gunMotionFidgeting : 1 = false;
bool x834_26_animPlaying : 1 = false;
bool x834_27_underwater : 1 = false;
bool x834_28_requestImmediateRecharge : 1 = false;
bool x834_29_frozen : 1 = false;
bool x834_30_inBigStrike : 1 = false;
bool x834_31_gunMotionInFidgetBasePosition : 1 = false;
bool x835_24_canFirePhazon : 1;
bool x835_25_inPhazonBeam : 1;
bool x835_26_phazonBeamMorphing : 1;
bool x835_27_intoPhazonBeam : 1;
bool x835_28_bombReady : 1;
bool x835_29_powerBombReady : 1;
bool x835_30_inPhazonPool : 1;
bool x835_31_actorAttached : 1;
bool x835_24_canFirePhazon : 1 = false;
bool x835_25_inPhazonBeam : 1 = false;
bool x835_26_phazonBeamMorphing : 1 = false;
bool x835_27_intoPhazonBeam : 1 = false;
bool x835_28_bombReady : 1 = false;
bool x835_29_powerBombReady : 1 = false;
bool x835_30_inPhazonPool : 1 = false;
bool x835_31_actorAttached : 1 = false;
CTexturedQuadFilter m_screenQuad{EFilterType::Blend, CGraphics::g_SpareTexture.get(),
CTexturedQuadFilter::ZTest::GEqualZWrite};