diff options
author | aap <aap@papnet.eu> | 2020-05-06 17:13:53 +0200 |
---|---|---|
committer | aap <aap@papnet.eu> | 2020-05-06 17:13:53 +0200 |
commit | aa12251c6b29e169516778473d0e17fce52d9e2d (patch) | |
tree | 1fa2abaacb3617feaa38e7d9932a1cdcc7a3882f /src/audio | |
parent | sorted out object collision enums (diff) | |
parent | Merge remote-tracking branch 'origin/master' (diff) | |
download | re3-aa12251c6b29e169516778473d0e17fce52d9e2d.tar re3-aa12251c6b29e169516778473d0e17fce52d9e2d.tar.gz re3-aa12251c6b29e169516778473d0e17fce52d9e2d.tar.bz2 re3-aa12251c6b29e169516778473d0e17fce52d9e2d.tar.lz re3-aa12251c6b29e169516778473d0e17fce52d9e2d.tar.xz re3-aa12251c6b29e169516778473d0e17fce52d9e2d.tar.zst re3-aa12251c6b29e169516778473d0e17fce52d9e2d.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 0f4281dc..ec520eaa 100644 --- a/src/audio/AudioManager.cpp +++ b/src/audio/AudioManager.cpp @@ -609,10 +609,9 @@ cAudioManager::ComputeVolume(uint8 emittingVolume, float soundIntensity, float d float newSoundIntensity; if (soundIntensity <= 0.0f) return 0; - if ((soundIntensity * 0.2f) <= distance) { - newSoundIntensity = soundIntensity * 0.2f; + newSoundIntensity = soundIntensity / 5.0f; + if (newSoundIntensity <= distance) emittingVolume = sq((soundIntensity - newSoundIntensity - (distance - newSoundIntensity)) / (soundIntensity - newSoundIntensity)) * emittingVolume; - } return emittingVolume; } @@ -3611,11 +3610,10 @@ cAudioManager::ProcessActiveQueues() SampleManager.SetChannel3DDistances(j, sample.m_fSoundIntensity, 0.25f * sample.m_fSoundIntensity); } SampleManager.SetChannelReverbFlag(j, sample.m_bReverbFlag); - continue; + break; } sample.m_bIsProcessed = false; m_asActiveSamples[j].m_bIsProcessed = false; - break; } } } |