2
0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-07-10 13:25:53 +00:00

Merge pull request #431 from shiiion/wavebeam-chargefx-fix

x24c_effectTimer wasn't counted down
This commit is contained in:
Phillip Stephens 2021-10-31 14:59:28 -07:00 committed by GitHub
commit dac63e3fc3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -54,7 +54,7 @@ void CWaveBeam::UpdateGunFx(bool shotSmoke, float dt, const CStateManager& mgr,
} }
} }
if (x258_25_effectTimerActive && x24c_effectTimer > 0.f) if (x258_25_effectTimerActive && x24c_effectTimer > 0.f)
x24c_effectTimer -= 0.f; x24c_effectTimer -= dt;
} }
CGunWeapon::UpdateGunFx(shotSmoke, dt, mgr, xf); CGunWeapon::UpdateGunFx(shotSmoke, dt, mgr, xf);
} }
@ -165,4 +165,4 @@ void CWaveBeam::Unload(CStateManager& mgr) {
bool CWaveBeam::IsLoaded() const { return CGunWeapon::IsLoaded() && x258_24_loaded; } bool CWaveBeam::IsLoaded() const { return CGunWeapon::IsLoaded() && x258_24_loaded; }
} // namespace metaforce } // namespace metaforce