mirror of
https://github.com/AxioDL/metaforce.git
synced 2025-12-09 05:47:42 +00:00
RuntimeCommonB: Make use of bitfield initializers where applicable
Given that we now target C++20, we can make use of bitfield initializers where applicable.
This commit is contained in:
@@ -4,49 +4,7 @@
|
||||
|
||||
namespace urde {
|
||||
|
||||
CFinalInput::CFinalInput()
|
||||
: x0_dt(0.0)
|
||||
, x4_controllerIdx(0)
|
||||
, x8_anaLeftX(0.0)
|
||||
, xc_anaLeftY(0.0)
|
||||
, x10_anaRightX(0.0)
|
||||
, x14_anaRightY(0.0)
|
||||
, x18_anaLeftTrigger(0.0)
|
||||
, x1c_anaRightTrigger(0.0)
|
||||
, x20_enableAnaLeftXP(false)
|
||||
, x20_enableAnaLeftNegXP(false)
|
||||
, x21_enableAnaLeftYP(false)
|
||||
, x21_enableAnaLeftNegYP(false)
|
||||
, x22_enableAnaRightXP(false)
|
||||
, x22_enableAnaRightNegXP(false)
|
||||
, x23_enableAnaRightYP(false)
|
||||
, x23_enableAnaRightNegYP(false)
|
||||
, x24_anaLeftTriggerP(false)
|
||||
, x28_anaRightTriggerP(false)
|
||||
, x2c_b24_A(false)
|
||||
, x2c_b25_B(false)
|
||||
, x2c_b26_X(false)
|
||||
, x2c_b27_Y(false)
|
||||
, x2c_b28_Z(false)
|
||||
, x2c_b29_L(false)
|
||||
, x2c_b30_R(false)
|
||||
, x2c_b31_DPUp(false)
|
||||
, x2d_b24_DPRight(false)
|
||||
, x2d_b25_DPDown(false)
|
||||
, x2d_b26_DPLeft(false)
|
||||
, x2d_b27_Start(false)
|
||||
, x2d_b28_PA(false)
|
||||
, x2d_b29_PB(false)
|
||||
, x2d_b30_PX(false)
|
||||
, x2d_b31_PY(false)
|
||||
, x2e_b24_PZ(false)
|
||||
, x2e_b25_PL(false)
|
||||
, x2e_b26_PR(false)
|
||||
, x2e_b27_PDPUp(false)
|
||||
, x2e_b28_PDPRight(false)
|
||||
, x2e_b29_PDPDown(false)
|
||||
, x2e_b30_PDPLeft(false)
|
||||
, x2e_b31_PStart(false) {}
|
||||
CFinalInput::CFinalInput() = default;
|
||||
|
||||
CFinalInput::CFinalInput(int cIdx, float dt, const boo::DolphinControllerState& data, const CFinalInput& prevInput,
|
||||
float leftDiv, float rightDiv)
|
||||
@@ -96,10 +54,6 @@ CFinalInput::CFinalInput(int cIdx, float dt, const boo::DolphinControllerState&
|
||||
CFinalInput::CFinalInput(int cIdx, float dt, const CKeyboardMouseControllerData& data, const CFinalInput& prevInput)
|
||||
: x0_dt(dt)
|
||||
, x4_controllerIdx(cIdx)
|
||||
, x8_anaLeftX(0.f)
|
||||
, xc_anaLeftY(0.f)
|
||||
, x10_anaRightX(0.f)
|
||||
, x14_anaRightY(0.f)
|
||||
, x18_anaLeftTrigger(false)
|
||||
, x1c_anaRightTrigger(false)
|
||||
, x20_enableAnaLeftXP(DLARight() && !prevInput.DLARight())
|
||||
@@ -112,18 +66,10 @@ CFinalInput::CFinalInput(int cIdx, float dt, const CKeyboardMouseControllerData&
|
||||
, x23_enableAnaRightNegYP(DRADown() && !prevInput.DRADown())
|
||||
, x24_anaLeftTriggerP(DLTrigger() && !prevInput.DLTrigger())
|
||||
, x28_anaRightTriggerP(DRTrigger() && !prevInput.DRTrigger())
|
||||
, x2c_b24_A(false)
|
||||
, x2c_b25_B(false)
|
||||
, x2c_b26_X(false)
|
||||
, x2c_b27_Y(false)
|
||||
, x2c_b28_Z(false)
|
||||
, x2c_b29_L(false)
|
||||
, x2c_b30_R(false)
|
||||
, x2c_b31_DPUp(data.m_specialKeys[size_t(boo::ESpecialKey::Up)])
|
||||
, x2d_b24_DPRight(data.m_specialKeys[size_t(boo::ESpecialKey::Right)])
|
||||
, x2d_b25_DPDown(data.m_specialKeys[size_t(boo::ESpecialKey::Down)])
|
||||
, x2d_b26_DPLeft(data.m_specialKeys[size_t(boo::ESpecialKey::Left)])
|
||||
, x2d_b27_Start(false)
|
||||
, x2d_b28_PA(DA() && !prevInput.DA())
|
||||
, x2d_b29_PB(DB() && !prevInput.DB())
|
||||
, x2d_b30_PX(DX() && !prevInput.DX())
|
||||
|
||||
Reference in New Issue
Block a user