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

@@ -158,7 +158,15 @@ CScriptGunTurret::CScriptGunTurret(TUniqueId uid, std::string_view name, ETurret
, x428_targettingLightDesc(g_SimplePool->GetObj({SBIG('PART'), turretData.GetTargettingLightRes()}))
, x434_frozenEffectDesc(g_SimplePool->GetObj({SBIG('PART'), turretData.GetFrozenEffectRes()}))
, x440_chargingEffectDesc(g_SimplePool->GetObj({SBIG('PART'), turretData.GetChargingEffectRes()}))
, x44c_panningEffectDesc(g_SimplePool->GetObj({SBIG('PART'), turretData.GetPanningEffectRes()})) {
, x44c_panningEffectDesc(g_SimplePool->GetObj({SBIG('PART'), turretData.GetPanningEffectRes()}))
, x560_24_dead(false)
, x560_25_frozen(false)
, x560_26_firedWithSetBurst(false)
, x560_27_burstSet(false)
, x560_28_hasBeenActivated(false)
, x560_29_scriptedStart(false)
, x560_30_needsStopClankSound(true)
, x560_31_frenzyReverse(false) {
if (turretData.GetVisorEffectRes().IsValid())
x458_visorEffectDesc = g_SimplePool->GetObj({SBIG('PART'), turretData.GetVisorEffectRes()});
x468_idleLight = std::make_unique<CElementGen>(x410_idleLightDesc);
@@ -171,14 +179,6 @@ CScriptGunTurret::CScriptGunTurret(TUniqueId uid, std::string_view name, ETurret
x514_lastFrontVector = xf.frontVector();
x544_originalFrontVec = xf.frontVector();
x550_originalRightVec = xf.rightVector();
x560_24_dead = false;
x560_25_frozen = false;
x560_26_firedWithSetBurst = false;
x560_27_burstSet = false;
x560_28_hasBeenActivated = false;
x560_29_scriptedStart = false;
x560_30_needsStopClankSound = true;
x560_31_frenzyReverse = false;
if (comp == ETurretComponent::Base && HasModelData() && GetModelData()->HasAnimData())
GetModelData()->EnableLooping(true);