diff options
| author | aap <aap@papnet.eu> | 2019-07-22 23:04:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-22 23:04:26 +0200 |
| commit | 07c6c7d0a2ab94bf4e5e6856bb535013148ad55c (patch) | |
| tree | bc6f72a16f4155dd2047375847bbb599531cd210 /src/audio | |
| parent | Merge pull request #160 from erorcun/erorcun (diff) | |
| parent | Try to fix rpg bug (diff) | |
| download | re3-07c6c7d0a2ab94bf4e5e6856bb535013148ad55c.tar re3-07c6c7d0a2ab94bf4e5e6856bb535013148ad55c.tar.gz re3-07c6c7d0a2ab94bf4e5e6856bb535013148ad55c.tar.bz2 re3-07c6c7d0a2ab94bf4e5e6856bb535013148ad55c.tar.lz re3-07c6c7d0a2ab94bf4e5e6856bb535013148ad55c.tar.xz re3-07c6c7d0a2ab94bf4e5e6856bb535013148ad55c.tar.zst re3-07c6c7d0a2ab94bf4e5e6856bb535013148ad55c.zip | |
Diffstat (limited to 'src/audio')
| -rw-r--r-- | src/audio/AudioManager.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/audio/AudioManager.cpp b/src/audio/AudioManager.cpp index 368c08e8..c0479002 100644 --- a/src/audio/AudioManager.cpp +++ b/src/audio/AudioManager.cpp @@ -172,9 +172,7 @@ cAudioManager::AddReflectionsToRequestedQueue() reflectionDistance = m_afReflectionsDistances[i]; if(reflectionDistance > 0.0f && reflectionDistance < 100.f && reflectionDistance < m_sQueueSample.m_fSoundIntensity) { - m_sQueueSample.m_bLoopsRemaining = - (reflectionDistance * - 0.38873f); // @todo assert value, here used from VC + m_sQueueSample.m_bLoopsRemaining = (reflectionDistance * 500.f / 1029.f); if(m_sQueueSample.m_bLoopsRemaining > 5u) { m_sQueueSample.m_fDistance = m_afReflectionsDistances[i]; m_sQueueSample.m_bEmittingVolume = emittingVolume; @@ -287,8 +285,8 @@ cAudioManager::AddSampleToRequestedQueue() calculatedVolume = m_sQueueSample.field_16 * (maxVolume - m_sQueueSample.m_bVolume); sampleIndex = m_bSampleRequestQueuesStatus[m_bActiveSampleQueue]; if(sampleIndex >= m_bActiveSamples) { - sampleIndex = *(&m_asSamples[1][26].field_91 + m_bActiveSamples + - 27 * m_bActiveSampleQueue); + sampleIndex = + m_abSampleQueueIndexTable[m_bActiveSampleQueue][m_bActiveSamples - 1]; if(m_asSamples[m_bActiveSampleQueue][sampleIndex].calculatedVolume <= calculatedVolume) return; |