github.com/GTAmodding.re3
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into miami

Browse Source 
# Conflicts:
#	src/audio/AudioLogic.cpp
#	src/audio/AudioManager.h
This commit is contained in:
Sergeanur
2020-06-30 19:12:06 +03:00
parent cbed027c0e da93b0a078
commit 8045bec6a5
3 changed files with 18 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/audio/AudioManager.cpp
View File

@@ -437,7 +437,7 @@ cAudioManager::ServiceSoundEffects()
}
ClearActiveSamples();
}
m_nActiveSampleQueue = m_nActiveSampleQueue != 1;
m_nActiveSampleQueue = m_nActiveSampleQueue == 1 ? 0 : 1;
ProcessReverb();
ProcessSpecial();
ClearRequestedQueue();
@@ -687,7 +687,7 @@ cAudioManager::AddReleasingSounds()
{
bool toProcess[44]; // why not 27?
int8 queue = m_nActiveSampleQueue == 0;
int8 queue = m_nActiveSampleQueue == 0 ? 1 : 0;
for (int32 i = 0; i < m_SampleRequestQueuesStatus[queue]; i++) {
tSound &sample = m_asSamples[queue][m_abSampleQueueIndexTable[queue][i]];