a3x/re3
1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-12-23 11:50:00 +00:00
Code Issues Projects Releases Wiki Activity

Double the volume for mission audio in OAL + small fix

Browse source
This commit is contained in:
Sergeanur 2021-01-04 15:08:02 +02:00
parent ae388c48d0
commit 2db0d7cfa1
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/audio/sampman_oal.cpp
View file

@ -1542,10 +1542,11 @@ cSampleManager::SetChannelEmittingVolume(uint32 nChannel, uint32 nVolume)
nChannelVolume[nChannel] = vol; nChannelVolume[nChannel] = vol;
if ( MusicManager.GetMusicMode() == MUSICMODE_CUTSCENE if (MusicManager.GetMusicMode() == MUSICMODE_CUTSCENE ) {
&& MusicManager.GetCurrentTrack() != STREAMED_SOUND_CUTSCENE_FINALE ) if (MusicManager.GetCurrentTrack() == STREAMED_SOUND_CUTSCENE_FINALE)
{ nChannelVolume[nChannel] = 0;
nChannelVolume[nChannel] = vol / 4; else
nChannelVolume[nChannel] >>= 2;
} }
// no idea, does this one looks like a bug or it's SetChannelVolume ? // 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 ( nEffectFlag ) {
if ( nStream == 1 || nStream == 2 ) 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 else
stream->SetVolume(m_nEffectsFadeVolume*nVolume*m_nEffectsVolume >> 14); stream->SetVolume(m_nEffectsFadeVolume*nVolume*m_nEffectsVolume >> 14);
} }