diff options
| author | erorcun <erorcunerorcun@hotmail.com.tr> | 2021-02-03 12:08:28 +0100 |
|---|---|---|
| committer | erorcun <erorcunerorcun@hotmail.com.tr> | 2021-02-03 12:08:28 +0100 |
| commit | 1667ffdd8f7fcde03d283db32694f0dd27086299 (patch) | |
| tree | 4e9c96e731251931d2261a81d03c006a9477d1c5 /src/audio/sampman_oal.cpp | |
| parent | no advanced script log when log level is 0 (diff) | |
| download | re3-1667ffdd8f7fcde03d283db32694f0dd27086299.tar re3-1667ffdd8f7fcde03d283db32694f0dd27086299.tar.gz re3-1667ffdd8f7fcde03d283db32694f0dd27086299.tar.bz2 re3-1667ffdd8f7fcde03d283db32694f0dd27086299.tar.lz re3-1667ffdd8f7fcde03d283db32694f0dd27086299.tar.xz re3-1667ffdd8f7fcde03d283db32694f0dd27086299.tar.zst re3-1667ffdd8f7fcde03d283db32694f0dd27086299.zip | |
Diffstat (limited to '')
| -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; } |