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

Explicit cast in AddOrUpdateEmitter

This commit is contained in:
Henrique Gemignani Passos Lima 2022-10-03 20:01:20 +03:00
parent 4b08f70a0b
commit d531b082ea
No known key found for this signature in database
GPG Key ID: E224F951761145F8
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/MetroidPrime/ScriptObjects/CScriptSpecialFunction.cpp
View File

@ -824,7 +824,7 @@ void CScriptSpecialFunction::ThinkSpinnerController(float dt, CStateManager& mgr
if (!x1e4_27_sfx3Played) { if (!x1e4_27_sfx3Played) {
if (x174_sfx3 != 0xFFFF) { if (x174_sfx3 != 0xFFFF) {
CSfxManager::AddEmitter(x174_sfx3, GetTranslation(), CVector3f::Zero(), true, false, CSfxManager::AddEmitter(x174_sfx3, GetTranslation(), CVector3f::Zero(), true, false,
CSfxManager::kMedPriority, kInvalidAreaId.value); CSfxManager::kMedPriority, CSfxManager::kAllAreas);
} }
x1e4_27_sfx3Played = true; x1e4_27_sfx3Played = true;
@ -840,7 +840,7 @@ void CScriptSpecialFunction::ThinkSpinnerController(float dt, CStateManager& mgr
if (!x1e4_26_sfx2Played) { if (!x1e4_26_sfx2Played) {
if (x172_sfx2 != 0xFFFF) { if (x172_sfx2 != 0xFFFF) {
CSfxManager::AddEmitter(x172_sfx2, GetTranslation(), CVector3f::Zero(), true, false, CSfxManager::AddEmitter(x172_sfx2, GetTranslation(), CVector3f::Zero(), true, false,
CSfxManager::kMedPriority, kInvalidAreaId.value); CSfxManager::kMedPriority, CSfxManager::kAllAreas);
} }
x1e4_26_sfx2Played = true; x1e4_26_sfx2Played = true;
@ -1118,10 +1118,10 @@ void CScriptSpecialFunction::AddOrUpdateEmitter(float pitch, CSfxHandle& handle,
const CVector3f& pos, uchar vol) { const CVector3f& pos, uchar vol) {
if (!handle) { if (!handle) {
handle = CSfxManager::AddEmitter(id, pos, CVector3f::Zero(), vol, true, true, handle = CSfxManager::AddEmitter(id, pos, CVector3f::Zero(), vol, true, true,
CSfxManager::kMedPriority, kInvalidAreaId.value); CSfxManager::kMedPriority, CSfxManager::kAllAreas);
} else { } else {
CSfxManager::UpdateEmitter(handle, pos, CVector3f::Zero(), vol); CSfxManager::UpdateEmitter(handle, pos, CVector3f::Zero(), vol);
CSfxManager::PitchBend(handle, 8192.f * pitch + 8192.f); CSfxManager::PitchBend(handle, static_cast< s16 >(8192.f * pitch + 8192.f));
} }
} }