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

Almost match CPowerBomb::AcceptScriptMessage

This commit is contained in:
Phillip Stephens 2023-01-13 17:12:51 -08:00
parent 129709bc0d
commit 267f40bff8
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/Kyoto/Audio/CSfxManager.hpp
View File

@ -81,12 +81,12 @@ public:
static const short kMedPriority; // 0x7F static const short kMedPriority; // 0x7F
static const ushort kInternalInvalidSfxId; // 0xFFFF static const ushort kInternalInvalidSfxId; // 0xFFFF
static const int kAllAreas; // 0xFFFFFFFF static const int kAllAreas; // 0xFFFFFFFF
static CSfxHandle AddEmitter(ushort id, const CVector3f& pos, const CVector3f& dir, static CSfxHandle AddEmitter(const ushort id, const CVector3f& pos, const CVector3f& dir,
bool useAcoustics, bool looped, short prio = kMedPriority, const bool useAcoustics, const bool looped, const short prio = kMedPriority,
int areaId = kAllAreas); const int areaId = kAllAreas);
static CSfxHandle AddEmitter(ushort id, const CVector3f& pos, const CVector3f& dir, uchar vol, static CSfxHandle AddEmitter(const ushort id, const CVector3f& pos, const CVector3f& dir, uchar vol,
bool useAcoustics, bool looped, short prio = kMedPriority, const bool useAcoustics, const bool looped, const short prio = kMedPriority,
int areaId = kAllAreas); const int areaId = kAllAreas);
static CSfxHandle AddEmitter(CAudioSys::C3DEmitterParmData& parmData, bool useAcoustics, static CSfxHandle AddEmitter(CAudioSys::C3DEmitterParmData& parmData, bool useAcoustics,
short prio, bool looped, int areaId = kAllAreas); short prio, bool looped, int areaId = kAllAreas);

1
src/MetroidPrime/Weapons/CPowerBomb.cpp
View File

@ -99,7 +99,6 @@ void CPowerBomb::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CState
case kSM_Registered: case kSM_Registered:
mgr.AddWeaponId(GetOwnerId(), GetWeaponType()); mgr.AddWeaponId(GetOwnerId(), GetWeaponType());
OrigDamageInfo().SetRadius(0.f); OrigDamageInfo().SetRadius(0.f);
if (mgr.GetPlayerState()->IsPlayerAlive()) { if (mgr.GetPlayerState()->IsPlayerAlive()) {
CSfxManager::AddEmitter(SFXsfx0710, GetTranslation(), CVector3f::Zero(), true, false); CSfxManager::AddEmitter(SFXsfx0710, GetTranslation(), CVector3f::Zero(), true, false);
mgr.InformListeners(GetTranslation(), kLNT_BombExplode); mgr.InformListeners(GetTranslation(), kLNT_BombExplode);