diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2021-08-16 13:32:15 +0200 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2021-08-16 13:32:15 +0200 |
| commit | 0c55f331cf258c57abba3ed70aa4e8ad25aef0b9 (patch) | |
| tree | 6070ba081850832cb39d92ecc9971c5354e1d797 /src/audio/AudioLogic.cpp | |
| parent | Merge branch 'miami' into lcs (diff) | |
| parent | Merge branch 'master' into miami (diff) | |
| download | re3-0c55f331cf258c57abba3ed70aa4e8ad25aef0b9.tar re3-0c55f331cf258c57abba3ed70aa4e8ad25aef0b9.tar.gz re3-0c55f331cf258c57abba3ed70aa4e8ad25aef0b9.tar.bz2 re3-0c55f331cf258c57abba3ed70aa4e8ad25aef0b9.tar.lz re3-0c55f331cf258c57abba3ed70aa4e8ad25aef0b9.tar.xz re3-0c55f331cf258c57abba3ed70aa4e8ad25aef0b9.tar.zst re3-0c55f331cf258c57abba3ed70aa4e8ad25aef0b9.zip | |
Diffstat (limited to 'src/audio/AudioLogic.cpp')
| -rw-r--r-- | src/audio/AudioLogic.cpp | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/src/audio/AudioLogic.cpp b/src/audio/AudioLogic.cpp index f48259f9..8a2c6cdb 100644 --- a/src/audio/AudioLogic.cpp +++ b/src/audio/AudioLogic.cpp @@ -5275,7 +5275,10 @@ cAudioManager::SetupPedComments(cPedParams ¶ms, uint16 sound) pedComment.m_nEntityIndex = m_sQueueSample.m_nEntityIndex; pedComment.m_vecPos = m_sQueueSample.m_vecPos; pedComment.m_fDistance = m_sQueueSample.m_fDistance; - pedComment.m_bVolume = m_sQueueSample.m_nVolume; + pedComment.m_nVolume = m_sQueueSample.m_nVolume; +#if defined(EXTERNAL_3D_SOUND) && defined(FIX_BUGS) + pedComment.m_nEmittingVolume = emittingVol; +#endif m_sPedComments.Add(&pedComment); } } @@ -8058,7 +8061,10 @@ cAudioManager::DebugPlayPedComment(int32 sound) pedComment.m_nProcess = 10; pedComment.m_nEntityIndex = 0; pedComment.m_fDistance = 0.0f; - pedComment.m_bVolume = 99; + pedComment.m_nVolume = 99; +#if defined(EXTERNAL_3D_SOUND) && defined(FIX_BUGS) + pedComment.m_nEmittingVolume = 99; +#endif pedComment.m_vecPos = CWorld::Players[0].m_pPed->GetPosition(); @@ -8072,7 +8078,7 @@ cPedComments::Add(tPedComment *com) if (m_nCommentsInBank[m_nActiveBank] >= NUM_PED_COMMENTS_SLOTS) { index = m_nIndexMap[m_nActiveBank][NUM_PED_COMMENTS_SLOTS - 1]; - if (m_asPedComments[m_nActiveBank][index].m_bVolume > com->m_bVolume) + if (m_asPedComments[m_nActiveBank][index].m_nVolume > com->m_nVolume) return; } else { index = m_nCommentsInBank[m_nActiveBank]++; @@ -8083,7 +8089,7 @@ cPedComments::Add(tPedComment *com) uint32 i = 0; if (index != 0) { for (i = 0; i < index; i++) { - if (m_asPedComments[m_nActiveBank][m_nIndexMap[m_nActiveBank][i]].m_bVolume < m_asPedComments[m_nActiveBank][index].m_bVolume) { + if (m_asPedComments[m_nActiveBank][m_nIndexMap[m_nActiveBank][i]].m_nVolume < m_asPedComments[m_nActiveBank][index].m_nVolume) { break; } } @@ -8129,7 +8135,7 @@ cPedComments::Process() AudioManager.m_sQueueSample.m_nSampleIndex = sampleIndex; AudioManager.m_sQueueSample.m_nBankIndex = SFX_BANK_PED_COMMENTS; AudioManager.m_sQueueSample.m_nReleasingVolumeModificator = 3; - AudioManager.m_sQueueSample.m_nVolume = m_asPedComments[m_nActiveBank][m_nIndexMap[m_nActiveBank][0]].m_bVolume; + AudioManager.m_sQueueSample.m_nVolume = m_asPedComments[m_nActiveBank][m_nIndexMap[m_nActiveBank][0]].m_nVolume; AudioManager.m_sQueueSample.m_fDistance = m_asPedComments[m_nActiveBank][m_nIndexMap[m_nActiveBank][0]].m_fDistance; AudioManager.m_sQueueSample.m_nLoopCount = 1; #ifndef GTA_PS2 @@ -8137,8 +8143,12 @@ cPedComments::Process() AudioManager.m_sQueueSample.m_nLoopEnd = -1; #endif #ifdef EXTERNAL_3D_SOUND + #ifdef FIX_BUGS + AudioManager.m_sQueueSample.m_nEmittingVolume = m_asPedComments[m_nActiveBank][m_nIndexMap[m_nActiveBank][0]].m_nEmittingVolume; + #else AudioManager.m_sQueueSample.m_nEmittingVolume = MAX_VOLUME; -#endif + #endif // FIX_BUGS +#endif // EXTERNAL_3D_SOUND AudioManager.m_sQueueSample.m_fSpeedMultiplier = 3.0f; AudioManager.m_sQueueSample.m_SoundIntensity = 40.0f; AudioManager.m_sQueueSample.m_bReleasingSoundFlag = TRUE; |