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

CActorContraption fixes, better CMake dependency handling

Browse Source
This commit is contained in:
Jack Andersen
2019-06-11 16:05:17 -10:00
parent 77d0ef942d
commit e218b8aeb5
295 changed files with 942 additions and 2219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Runtime/Weapon/CGrappleArm.cpp
View File

@@ -75,7 +75,7 @@ void CGrappleArm::BuildSuitDependencyList() {
void CGrappleArm::LoadAnimations() {
NWeaponTypes::get_token_vector(*x0_grappleArmModel->GetAnimationData(), 0, 42, x18c_anims, true);
x0_grappleArmModel = rstl::nullopt;
x0_grappleArmModel = std::nullopt;
}
void CGrappleArm::AsyncLoadSuit(CStateManager& mgr) {
@@ -83,7 +83,7 @@ void CGrappleArm::AsyncLoadSuit(CStateManager& mgr) {
if (suit == x3a8_loadedSuit)
return;
x0_grappleArmModel = rstl::nullopt;
x0_grappleArmModel = std::nullopt;
x3b2_29_suitLoading = true;
if (x3a8_loadedSuit != CPlayerState::EPlayerSuit::Invalid) {
NWeaponTypes::unlock_tokens(x19c_suitDeps[int(x3a8_loadedSuit)]);
@@ -438,7 +438,7 @@ void CGrappleArm::Update(float grappleSwingT, float dt, CStateManager& mgr) {
BuildXRayModel();
} else {
if (x50_grappleArmSkeletonModel)
x50_grappleArmSkeletonModel = rstl::nullopt;
x50_grappleArmSkeletonModel = std::nullopt;
}
float speed = 1.f;