AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 08:27:42 +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

8
Runtime/Weapon/CGunWeapon.cpp
View File

@@ -94,7 +94,7 @@ void CGunWeapon::BuildDependencyList(CPlayerState::EBeamId beam) {
void CGunWeapon::AsyncLoadSuitArm(CStateManager& mgr) {
xb0_suitArmModelData = rstl::nullopt;
xb0_suitArmModelData = std::nullopt;
x13c_armCharacter = g_SimplePool->GetObj(skSuitArmNames[int(NWeaponTypes::get_current_suit(mgr))]);
x13c_armCharacter.Lock();
x218_28_suitArmLocked = true;
@@ -450,9 +450,9 @@ void CGunWeapon::Unload(CStateManager& mgr) {
UnlockTokens();
x210_loadFlags = 0;
x204_frozenEffect = EFrozenFxType::None;
x10_solidModelData = rstl::nullopt;
x60_holoModelData = rstl::nullopt;
xb0_suitArmModelData = rstl::nullopt;
x10_solidModelData = std::nullopt;
x60_holoModelData = std::nullopt;
xb0_suitArmModelData = std::nullopt;
x100_gunController.reset();
x1bc_rainSplashGenerator = nullptr;
x1b8_frozenGenerator.reset();