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

CAnimPlaybackParms: Make class constexpr constructible

Browse Source 
Allows for removal of some trivial runtime initializers.
This commit is contained in:
Lioncash
2020-04-11 20:49:56 -04:00
parent 1b42bda711
commit 1fff540102
6 changed files with 31 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Runtime/Weapon/CGrappleArm.cpp
View File

@@ -131,35 +131,35 @@ void CGrappleArm::SetAnimState(EArmState state) {
switch (state) {
case EArmState::IntoGrapple: {
ResetAuxParams(true);
CAnimPlaybackParms parms(0, -1, 1.f, true);
constexpr CAnimPlaybackParms parms(0, -1, 1.f, true);
x0_grappleArmModel->GetAnimationData()->SetAnimation(parms, false);
x3b2_25_beamActive = false;
x3b2_24_active = true;
break;
}
case EArmState::IntoGrappleIdle: {
CAnimPlaybackParms parms(1, -1, 1.f, true);
constexpr CAnimPlaybackParms parms(1, -1, 1.f, true);
x0_grappleArmModel->GetAnimationData()->EnableLooping(true);
x0_grappleArmModel->GetAnimationData()->SetAnimation(parms, false);
break;
}
case EArmState::FireGrapple: {
CAnimPlaybackParms parms(2, -1, 1.f, true);
constexpr CAnimPlaybackParms parms(2, -1, 1.f, true);
x0_grappleArmModel->GetAnimationData()->SetAnimation(parms, false);
break;
}
case EArmState::ConnectGrapple: {
CAnimPlaybackParms parms(3, -1, 1.f, true);
constexpr CAnimPlaybackParms parms(3, -1, 1.f, true);
x0_grappleArmModel->GetAnimationData()->SetAnimation(parms, false);
break;
}
case EArmState::Connected: {
CAnimPlaybackParms parms(3, -1, 1.f, true);
constexpr CAnimPlaybackParms parms(3, -1, 1.f, true);
x0_grappleArmModel->GetAnimationData()->SetAnimation(parms, false);
break;
}
case EArmState::OutOfGrapple: {
CAnimPlaybackParms parms(4, -1, 1.f, true);
constexpr CAnimPlaybackParms parms(4, -1, 1.f, true);
x0_grappleArmModel->GetAnimationData()->SetAnimation(parms, false);
DisconnectGrappleBeam();
break;