diff options
author | Sergeanur <s.anureev@yandex.ua> | 2021-08-29 09:31:13 +0200 |
---|---|---|
committer | Sergeanur <s.anureev@yandex.ua> | 2021-08-29 09:31:13 +0200 |
commit | eeacbfeb6ac8c594c8f5c2e770300129c8d54eea (patch) | |
tree | 6010523f07d3c7eb2684fd8bdbcbe5d0cd9f3fe7 /src/audio/AudioManager.cpp | |
parent | Merge remote-tracking branch 'origin/miami' into lcs (diff) | |
parent | Audio: fixing bugs, fixing types, making code more accurate to original (diff) | |
download | re3-eeacbfeb6ac8c594c8f5c2e770300129c8d54eea.tar re3-eeacbfeb6ac8c594c8f5c2e770300129c8d54eea.tar.gz re3-eeacbfeb6ac8c594c8f5c2e770300129c8d54eea.tar.bz2 re3-eeacbfeb6ac8c594c8f5c2e770300129c8d54eea.tar.lz re3-eeacbfeb6ac8c594c8f5c2e770300129c8d54eea.tar.xz re3-eeacbfeb6ac8c594c8f5c2e770300129c8d54eea.tar.zst re3-eeacbfeb6ac8c594c8f5c2e770300129c8d54eea.zip |
Diffstat (limited to 'src/audio/AudioManager.cpp')
-rw-r--r-- | src/audio/AudioManager.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/audio/AudioManager.cpp b/src/audio/AudioManager.cpp index 914fb1b1..c339ea43 100644 --- a/src/audio/AudioManager.cpp +++ b/src/audio/AudioManager.cpp @@ -776,7 +776,7 @@ cAudioManager::AddReflectionsToRequestedQueue() } else #endif emittingVolume = (9 * m_sQueueSample.m_nVolume) / 16; - m_sQueueSample.m_MaxDistance /= 2.f; + m_sQueueSample.m_MaxDistance /= 2.0f; uint32 halfOldFreq = oldFreq >> 1; @@ -988,9 +988,9 @@ cAudioManager::AddReleasingSounds() if (sample.m_nSampleIndex >= SAMPLEBANK_PED_START && sample.m_nSampleIndex <= SAMPLEBANK_PED_END) { // check if it's ped comment uint8 vol; if (CWorld::GetIsLineOfSightClear(TheCamera.GetPosition(), sample.m_vecPos, true, false, false, false, false, false)) - vol = MAX_VOLUME; + vol = PED_COMMENT_VOLUME; else - vol = 31; + vol = PED_COMMENT_VOLUME_BEHIND_WALL; #ifdef EXTERNAL_3D_SOUND sample.m_nEmittingVolume = vol; #endif @@ -1006,7 +1006,7 @@ cAudioManager::AddReleasingSounds() if (sample.m_nEmittingVolumeChange > 0) sample.m_nEmittingVolumeChange = volumeDiff * sample.m_nEmittingVolumeChange; #endif - sample.m_nVolume = Min(127, newVolume); + sample.m_nVolume = Min(MAX_VOLUME, newVolume); } } if (sample.m_nVolume == 0) |