PrimeDecomp
/
prime
mirror of https://github.com/PrimeDecomp/prime.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use SFX defines for UpdateWeaponFire 

Former-commit-id: c906dd6d23
This commit is contained in:
Henrique Gemignani Passos Lima 2022-10-06 23:17:03 +03:00
parent 742d3a86da
commit e426f60820
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/MetroidPrime/Player/CPlayerGun.cpp
View File

@ -19,6 +19,7 @@
#include "MetroidPrime/Weapons/CWaveBeam.hpp" #include "MetroidPrime/Weapons/CWaveBeam.hpp"
#include "MetroidPrime/Weapons/GunController/CGunMotion.hpp" #include "MetroidPrime/Weapons/GunController/CGunMotion.hpp"
#include "MetroidPrime/Weapons/WeaponTypes.hpp" #include "MetroidPrime/Weapons/WeaponTypes.hpp"
#include "MetroidPrime/SFX/Weapons.h"
#include "Kyoto/Audio/CSfxManager.hpp" #include "Kyoto/Audio/CSfxManager.hpp"
#include "Kyoto/Graphics/CModelFlags.hpp" #include "Kyoto/Graphics/CModelFlags.hpp"
@ -748,7 +749,7 @@ void CPlayerGun::UpdateWeaponFire(float dt, CPlayerState& playerState, CStateMan
FireSecondary(dt, mgr); FireSecondary(dt, mgr);
} else { } else {
if (!CSfxManager::IsPlaying(x2e4_invalidSfx)) { if (!CSfxManager::IsPlaying(x2e4_invalidSfx)) {
x2e4_invalidSfx = NWeaponTypes::play_sfx(1781, x834_27_underwater, false, 0x4a); x2e4_invalidSfx = NWeaponTypes::play_sfx(SFXwpn_invalid_action, x834_27_underwater, false, 0x4a);
} else { } else {
x2e4_invalidSfx.Clear(); x2e4_invalidSfx.Clear();
} }