2
0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 06:27:43 +00:00

Work on CSpacePirate

This commit is contained in:
Jack Andersen
2018-11-25 16:15:44 -10:00
parent 9c88971df6
commit e1fa938127
29 changed files with 1787 additions and 290 deletions

View File

@@ -1533,7 +1533,7 @@ void CPlayerGun::FireSecondary(float dt, CStateManager& mgr)
fireXf.origin += mgr.GetCameraManager()->GetGlobalCameraTranslation(mgr);
x744_auxWeapon->Fire(dt, x834_27_underwater, x310_currentBeam, x330_chargeState, fireXf,
mgr, x72c_currentBeam->GetWeaponType(), targetId);
mgr.InformListeners(x4a8_gunWorldXf.origin, EListenNoiseType::Character);
mgr.InformListeners(x4a8_gunWorldXf.origin, EListenNoiseType::PlayerFire);
x3a0_missileExitTimer = 7.f;
if (!x832_26_comboFiring)
{
@@ -1659,7 +1659,7 @@ void CPlayerGun::UpdateNormalShotCycle(float dt, CStateManager& mgr)
homingTarget = kInvalidUniqueId;
x72c_currentBeam->Fire(x834_27_underwater, dt, x330_chargeState, xf, mgr, homingTarget,
x340_chargeBeamFactor, x340_chargeBeamFactor);
mgr.InformListeners(x4a8_gunWorldXf.origin, EListenNoiseType::Character);
mgr.InformListeners(x4a8_gunWorldXf.origin, EListenNoiseType::PlayerFire);
}
void CPlayerGun::ProcessNormalState(u32 releasedStates, u32 pressedStates, CStateManager& mgr, float dt)