diff options
| author | Filip Gawin <filip.gawin@zoho.com> | 2020-03-28 19:20:08 +0100 |
|---|---|---|
| committer | Filip Gawin <filip.gawin@zoho.com> | 2020-03-28 20:18:54 +0100 |
| commit | d13afe5cc132ee6755327edfed6f85e9936c096e (patch) | |
| tree | b7c438af04d873a32bd2c45d75b3234109dc7662 | |
| parent | ProcessVehicleEngine and ProcessActiveQueues (diff) | |
| download | re3-d13afe5cc132ee6755327edfed6f85e9936c096e.tar re3-d13afe5cc132ee6755327edfed6f85e9936c096e.tar.gz re3-d13afe5cc132ee6755327edfed6f85e9936c096e.tar.bz2 re3-d13afe5cc132ee6755327edfed6f85e9936c096e.tar.lz re3-d13afe5cc132ee6755327edfed6f85e9936c096e.tar.xz re3-d13afe5cc132ee6755327edfed6f85e9936c096e.tar.zst re3-d13afe5cc132ee6755327edfed6f85e9936c096e.zip | |
| -rw-r--r-- | src/audio/AudioManager.cpp | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/audio/AudioManager.cpp b/src/audio/AudioManager.cpp index 2be8e36a..5410ed6f 100644 --- a/src/audio/AudioManager.cpp +++ b/src/audio/AudioManager.cpp @@ -2777,20 +2777,16 @@ cAudioManager::ProcessActiveQueues() sample.m_nSampleIndex == m_asActiveSamples[j].m_nSampleIndex) { if (sample.m_nLoopCount) { if (m_FrameCounter & 1) { - if (!(j & 1)) { flag = 0; } - flag = 1; + flag = !!(j & 1); } else { - if (!(j & 1)) - flag = 1; - else - flag = 0; + flag = !(j & 1); } if (flag && !SampleManager.GetChannelUsedFlag(j)) { sample.m_bLoopEnded = 1; m_asActiveSamples[j].m_bLoopEnded = 1; m_asActiveSamples[j].m_nSampleIndex = NO_SAMPLE; - m_asActiveSamples[j].m_nEntityIndex = -5; + m_asActiveSamples[j].m_nEntityIndex = AEHANDLE_NONE; continue; } } @@ -4115,7 +4111,7 @@ cAudioManager::ProcessGarages() m_sQueueSample.m_bEmittingVolume = 60; \ m_sQueueSample.field_48 = 0.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_bIsDistant = false; \ @@ -4125,7 +4121,7 @@ cAudioManager::ProcessGarages() m_sQueueSample.m_nLoopEnd = -1; \ m_sQueueSample.m_counter = iSound++; \ if(iSound < 32) iSound = 32; \ - m_sQueueSample.m_bRequireReflection = true; \ + m_sQueueSample.m_bRequireReflection = true; \ AddSampleToRequestedQueue(); \ } \ } \ |