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

Implement CAuxBeam

Browse Source
This commit is contained in:
Jack Andersen
2017-09-09 14:36:21 -10:00
parent 0907c52ca3
commit 149eed4b73
19 changed files with 709 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Runtime/Weapon/CGunWeapon.cpp
View File

@@ -245,7 +245,7 @@ void CGunWeapon::Fire(bool underwater, float dt, EChargeState chargeState, const
if (chargeState == EChargeState::Charged)
{
x218_25_enableCharge = true;
mgr.GetCameraManager()->AddCameraShaker(CCameraShakeData::skChargedCameraShakeData, false);
mgr.GetCameraManager()->AddCameraShaker(CCameraShakeData::skChargedShotCameraShakeData, false);
}
x10_solidModelData->AnimationData()->EnableLooping(false);
@@ -674,7 +674,7 @@ void CGunWeapon::EnterFidget(CStateManager& mgr, SamusGun::EFidgetType type, s32
x100_gunController->EnterFidget(mgr, s32(type), s32(x200_beamId), parm2);
}
CDamageInfo CGunWeapon::GetShotDamageInfo(const SShotParam& shotParam, CStateManager& mgr) const
CDamageInfo CGunWeapon::GetShotDamageInfo(const SShotParam& shotParam, CStateManager& mgr)
{
CDamageInfo ret(shotParam);
if (g_GameState->GetHardMode())