From e426f608208ac73c8192cc0b038ab910d8921c1c Mon Sep 17 00:00:00 2001 From: Henrique Gemignani Passos Lima Date: Thu, 6 Oct 2022 23:17:03 +0300 Subject: [PATCH] Use SFX defines for UpdateWeaponFire Former-commit-id: c906dd6d23ff18f1df83b4d7683d6e943af49598 --- src/MetroidPrime/Player/CPlayerGun.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/MetroidPrime/Player/CPlayerGun.cpp b/src/MetroidPrime/Player/CPlayerGun.cpp index 1d0555e3..b431af6b 100644 --- a/src/MetroidPrime/Player/CPlayerGun.cpp +++ b/src/MetroidPrime/Player/CPlayerGun.cpp @@ -19,6 +19,7 @@ #include "MetroidPrime/Weapons/CWaveBeam.hpp" #include "MetroidPrime/Weapons/GunController/CGunMotion.hpp" #include "MetroidPrime/Weapons/WeaponTypes.hpp" +#include "MetroidPrime/SFX/Weapons.h" #include "Kyoto/Audio/CSfxManager.hpp" #include "Kyoto/Graphics/CModelFlags.hpp" @@ -748,7 +749,7 @@ void CPlayerGun::UpdateWeaponFire(float dt, CPlayerState& playerState, CStateMan FireSecondary(dt, mgr); } else { 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 { x2e4_invalidSfx.Clear(); }