summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2021-01-04 14:08:02 +0100
committerSergeanur <s.anureev@yandex.ua>2021-01-04 14:08:02 +0100
commit2db0d7cfa1a9fdf275885074f7bf221546eb8432 (patch)
tree2442ea0d33e92b1f40063d14e36c6e98e89551b7
parentcfo fix (diff)
downloadre3-2db0d7cfa1a9fdf275885074f7bf221546eb8432.tar
re3-2db0d7cfa1a9fdf275885074f7bf221546eb8432.tar.gz
re3-2db0d7cfa1a9fdf275885074f7bf221546eb8432.tar.bz2
re3-2db0d7cfa1a9fdf275885074f7bf221546eb8432.tar.lz
re3-2db0d7cfa1a9fdf275885074f7bf221546eb8432.tar.xz
re3-2db0d7cfa1a9fdf275885074f7bf221546eb8432.tar.zst
re3-2db0d7cfa1a9fdf275885074f7bf221546eb8432.zip
-rw-r--r--src/audio/sampman_oal.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/audio/sampman_oal.cpp b/src/audio/sampman_oal.cpp
index 80f19e50..fd445226 100644
--- a/src/audio/sampman_oal.cpp
+++ b/src/audio/sampman_oal.cpp
@@ -1542,10 +1542,11 @@ cSampleManager::SetChannelEmittingVolume(uint32 nChannel, uint32 nVolume)
nChannelVolume[nChannel] = vol;
- if ( MusicManager.GetMusicMode() == MUSICMODE_CUTSCENE
- && MusicManager.GetCurrentTrack() != STREAMED_SOUND_CUTSCENE_FINALE )
- {
- nChannelVolume[nChannel] = vol / 4;
+ if (MusicManager.GetMusicMode() == MUSICMODE_CUTSCENE ) {
+ if (MusicManager.GetCurrentTrack() == STREAMED_SOUND_CUTSCENE_FINALE)
+ nChannelVolume[nChannel] = 0;
+ else
+ nChannelVolume[nChannel] >>= 2;
}
// no idea, does this one looks like a bug or it's SetChannelVolume ?
@@ -1936,7 +1937,7 @@ cSampleManager::SetStreamedVolumeAndPan(uint8 nVolume, uint8 nPan, uint8 nEffect
{
if ( nEffectFlag ) {
if ( nStream == 1 || nStream == 2 )
- stream->SetVolume(128*nVolume*m_nEffectsVolume >> 14);
+ stream->SetVolume(2*128*nVolume*m_nEffectsVolume >> 14); // double the volume for now as it plays too quiet
else
stream->SetVolume(m_nEffectsFadeVolume*nVolume*m_nEffectsVolume >> 14);
}