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

Audio fixes

Browse source
This commit is contained in:
Sergeanur 2021-01-05 00:32:03 +02:00
parent 150f5302b7
commit 63e9f6d826
2 changed files with 75 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/audio/AudioLogic.cpp
View file

@ -3038,7 +3038,8 @@ cAudioManager::ProcessPedOneShots(cPedParams &params)
switch (sound) { switch (sound) {
case SOUND_STEP_START: case SOUND_STEP_START:
case SOUND_STEP_END: case SOUND_STEP_END:
if (!params.m_pPed->bIsLooking) { if (!params.m_pPed->bIsInTheAir)
continue;
emittingVol = m_anRandomTable[3] % 15 + 45; emittingVol = m_anRandomTable[3] % 15 + 45;
if (FindPlayerPed() != m_asAudioEntities[m_sQueueSample.m_nEntityIndex].m_pEntity) if (FindPlayerPed() != m_asAudioEntities[m_sQueueSample.m_nEntityIndex].m_pEntity)
emittingVol /= 2; emittingVol /= 2;
@ -3084,7 +3085,7 @@ cAudioManager::ProcessPedOneShots(cPedParams &params)
} }
m_sQueueSample.m_nSampleIndex = sampleIndex; m_sQueueSample.m_nSampleIndex = sampleIndex;
m_sQueueSample.m_nBankIndex = SFX_BANK_0; m_sQueueSample.m_nBankIndex = SFX_BANK_0;
m_sQueueSample.m_nCounter = m_asAudioEntities[m_sQueueSample.m_nEntityIndex].m_awAudioEvent[i] - 28; m_sQueueSample.m_nCounter = m_asAudioEntities[m_sQueueSample.m_nEntityIndex].m_awAudioEvent[i] - SOUND_STEP_START + 1;
m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(m_sQueueSample.m_nSampleIndex); m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(m_sQueueSample.m_nSampleIndex);
m_sQueueSample.m_nFrequency += RandomDisplacement(m_sQueueSample.m_nFrequency / 17); m_sQueueSample.m_nFrequency += RandomDisplacement(m_sQueueSample.m_nFrequency / 17);
switch (params.m_pPed->m_nMoveState) { switch (params.m_pPed->m_nMoveState) {
@ -3112,7 +3113,6 @@ cAudioManager::ProcessPedOneShots(cPedParams &params)
m_sQueueSample.m_bIs2D = false; m_sQueueSample.m_bIs2D = false;
m_sQueueSample.m_bReleasingSoundFlag = true; m_sQueueSample.m_bReleasingSoundFlag = true;
m_sQueueSample.m_bRequireReflection = true; m_sQueueSample.m_bRequireReflection = true;
}
break; break;
case SOUND_FALL_LAND: case SOUND_FALL_LAND:
case SOUND_FALL_COLLAPSE: case SOUND_FALL_COLLAPSE:

2
src/audio/oal/stream.cpp
View file

@ -466,7 +466,7 @@ void CStream::Pause()
if ( !HasSource() ) return; if ( !HasSource() ) return;
ALint sourceState = AL_PAUSED; ALint sourceState = AL_PAUSED;
alGetSourcei(m_pAlSources[0], AL_SOURCE_STATE, &sourceState); alGetSourcei(m_pAlSources[0], AL_SOURCE_STATE, &sourceState);
if (sourceState != AL_PAUSED ) if (sourceState != AL_PAUSED)
alSourcePause(m_pAlSources[0]); alSourcePause(m_pAlSources[0]);
alGetSourcei(m_pAlSources[1], AL_SOURCE_STATE, &sourceState); alGetSourcei(m_pAlSources[1], AL_SOURCE_STATE, &sourceState);
if (sourceState != AL_PAUSED) if (sourceState != AL_PAUSED)