diff options
| author | erorcun <erayorcunus@gmail.com> | 2021-02-03 12:22:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-03 12:22:33 +0100 |
| commit | f42f785c7887760f94bf655eec839b29ebf7868b (patch) | |
| tree | 821b2b5497c99d8dea83ce5ead645002503e5b95 /src/audio/sampman_oal.cpp | |
| parent | Fix compilation (diff) | |
| parent | MusicManager fixes (diff) | |
| download | re3-f42f785c7887760f94bf655eec839b29ebf7868b.tar re3-f42f785c7887760f94bf655eec839b29ebf7868b.tar.gz re3-f42f785c7887760f94bf655eec839b29ebf7868b.tar.bz2 re3-f42f785c7887760f94bf655eec839b29ebf7868b.tar.lz re3-f42f785c7887760f94bf655eec839b29ebf7868b.tar.xz re3-f42f785c7887760f94bf655eec839b29ebf7868b.tar.zst re3-f42f785c7887760f94bf655eec839b29ebf7868b.zip | |
Diffstat (limited to 'src/audio/sampman_oal.cpp')
| -rw-r--r-- | src/audio/sampman_oal.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/audio/sampman_oal.cpp b/src/audio/sampman_oal.cpp index 798ea287..7b82a4e2 100644 --- a/src/audio/sampman_oal.cpp +++ b/src/audio/sampman_oal.cpp @@ -1318,7 +1318,7 @@ cSampleManager::LoadPedComment(uint32 nComment) case MUSICMODE_FRONTEND: { - if ( MusicManager.GetCurrentTrack() == STREAMED_SOUND_GAME_COMPLETED ) + if ( MusicManager.GetNextTrack() == STREAMED_SOUND_GAME_COMPLETED ) return false; break; @@ -1533,8 +1533,8 @@ cSampleManager::SetChannelEmittingVolume(uint32 nChannel, uint32 nVolume) // 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.GetNextTrack() != STREAMED_SOUND_NEWS_INTRO + && MusicManager.GetNextTrack() != STREAMED_SOUND_CUTSCENE_SAL4_BDBD ) { nChannelVolume[nChannel] = vol / 4; } @@ -1575,8 +1575,8 @@ cSampleManager::SetChannelVolume(uint32 nChannel, uint32 nVolume) // 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.GetNextTrack() != STREAMED_SOUND_NEWS_INTRO + && MusicManager.GetNextTrack() != STREAMED_SOUND_CUTSCENE_SAL4_BDBD ) { nChannelVolume[nChannel] = vol / 4; } |