Substitute/Re3
Substitute/Re3
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

audio16 fixes for review

Browse Source
This commit is contained in:
Filip Gawin 2020-03-28 19:20:08 +01:00
parent 58ec4b2157
commit d13afe5cc1
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/audio/AudioManager.cpp
View File

@ -2777,20 +2777,16 @@ cAudioManager::ProcessActiveQueues()
sample.m_nSampleIndex == m_asActiveSamples[j].m_nSampleIndex) { sample.m_nSampleIndex == m_asActiveSamples[j].m_nSampleIndex) {
if (sample.m_nLoopCount) { if (sample.m_nLoopCount) {
if (m_FrameCounter & 1) { if (m_FrameCounter & 1) {
if (!(j & 1)) { flag = 0; } flag = !!(j & 1);
flag = 1;
} }
else { else {
if (!(j & 1)) flag = !(j & 1);
flag = 1;
else
flag = 0;
} }
if (flag && !SampleManager.GetChannelUsedFlag(j)) { if (flag && !SampleManager.GetChannelUsedFlag(j)) {
sample.m_bLoopEnded = 1; sample.m_bLoopEnded = 1;
m_asActiveSamples[j].m_bLoopEnded = 1; m_asActiveSamples[j].m_bLoopEnded = 1;
m_asActiveSamples[j].m_nSampleIndex = NO_SAMPLE; m_asActiveSamples[j].m_nSampleIndex = NO_SAMPLE;
m_asActiveSamples[j].m_nEntityIndex = -5; m_asActiveSamples[j].m_nEntityIndex = AEHANDLE_NONE;
continue; continue;
} }
} }
@ -4115,7 +4111,7 @@ cAudioManager::ProcessGarages()
m_sQueueSample.m_bEmittingVolume = 60; \ m_sQueueSample.m_bEmittingVolume = 60; \
m_sQueueSample.field_48 = 0.0f; \ m_sQueueSample.field_48 = 0.0f; \
m_sQueueSample.m_fSoundIntensity = 80.0f; \ m_sQueueSample.m_fSoundIntensity = 80.0f; \
/*m_sQueueSample.field_16 = 4;*/ \ /*m_sQueueSample.field_16 = 4;*/ \
m_sQueueSample.m_bReverbFlag = true; \ m_sQueueSample.m_bReverbFlag = true; \
/*m_sQueueSample.m_bReverbFlag = true;*/ \ /*m_sQueueSample.m_bReverbFlag = true;*/ \
m_sQueueSample.m_bIsDistant = false; \ m_sQueueSample.m_bIsDistant = false; \
@ -4125,7 +4121,7 @@ cAudioManager::ProcessGarages()
m_sQueueSample.m_nLoopEnd = -1; \ m_sQueueSample.m_nLoopEnd = -1; \
m_sQueueSample.m_counter = iSound++; \ m_sQueueSample.m_counter = iSound++; \
if(iSound < 32) iSound = 32; \ if(iSound < 32) iSound = 32; \
m_sQueueSample.m_bRequireReflection = true; \ m_sQueueSample.m_bRequireReflection = true; \
AddSampleToRequestedQueue(); \ AddSampleToRequestedQueue(); \
} \ } \
} \ } \