diff options
| author | aap <aap@papnet.eu> | 2020-05-27 07:10:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-27 07:10:36 +0200 |
| commit | 4868bf13a8cab8fd62567c9544ff06197d6991a5 (patch) | |
| tree | 917402726d9ec883378751256c1232ab7cc0b734 /src/audio/sampman_oal.cpp | |
| parent | MT function for fakerw (diff) | |
| parent | OpenAL support (diff) | |
| download | re3-4868bf13a8cab8fd62567c9544ff06197d6991a5.tar re3-4868bf13a8cab8fd62567c9544ff06197d6991a5.tar.gz re3-4868bf13a8cab8fd62567c9544ff06197d6991a5.tar.bz2 re3-4868bf13a8cab8fd62567c9544ff06197d6991a5.tar.lz re3-4868bf13a8cab8fd62567c9544ff06197d6991a5.tar.xz re3-4868bf13a8cab8fd62567c9544ff06197d6991a5.tar.zst re3-4868bf13a8cab8fd62567c9544ff06197d6991a5.zip | |
Diffstat (limited to 'src/audio/sampman_oal.cpp')
| -rw-r--r-- | src/audio/sampman_oal.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/audio/sampman_oal.cpp b/src/audio/sampman_oal.cpp index 1952f370..5092a4b1 100644 --- a/src/audio/sampman_oal.cpp +++ b/src/audio/sampman_oal.cpp @@ -833,7 +833,7 @@ cSampleManager::LoadPedComment(uint32 nComment) case MUSICMODE_FRONTEND: { - if ( MusicManager.GetCurrentTrack() == STREAMED_SOUND_GAME_COMPLETED ) + if ( MusicManager.GetCurrentTrack() == STREAMED_SOUND_CUTSCENE_FINALE) return false; break; @@ -1057,10 +1057,8 @@ cSampleManager::SetChannelEmittingVolume(uint32 nChannel, uint32 nVolume) nChannelVolume[nChannel] = vol; - // reduce channel volume when JB.MP3 or S4_BDBD.MP3 playing if ( MusicManager.GetMusicMode() == MUSICMODE_CUTSCENE - && MusicManager.GetCurrentTrack() != STREAMED_SOUND_NEWS_INTRO - && MusicManager.GetCurrentTrack() != STREAMED_SOUND_CUTSCENE_SAL4_BDBD ) + && MusicManager.GetCurrentTrack() != STREAMED_SOUND_CUTSCENE_FINALE ) { nChannelVolume[nChannel] = vol / 4; } @@ -1099,10 +1097,8 @@ cSampleManager::SetChannelVolume(uint32 nChannel, uint32 nVolume) nChannelVolume[nChannel] = vol; - // reduce the volume for JB.MP3 and S4_BDBD.MP3 if ( MusicManager.GetMusicMode() == MUSICMODE_CUTSCENE - && MusicManager.GetCurrentTrack() != STREAMED_SOUND_NEWS_INTRO - && MusicManager.GetCurrentTrack() != STREAMED_SOUND_CUTSCENE_SAL4_BDBD ) + && MusicManager.GetCurrentTrack() != STREAMED_SOUND_CUTSCENE_FINALE ) { nChannelVolume[nChannel] = vol / 4; } |