diff options
| author | Filip Gawin <filip.gawin@zoho.com> | 2020-04-12 02:39:27 +0200 |
|---|---|---|
| committer | Filip Gawin <filip.gawin@zoho.com> | 2020-04-12 02:50:52 +0200 |
| commit | 7d137d8f2d3effa96593cae34e7259e0ab025e4d (patch) | |
| tree | ce20ef7e4c6bdad4c9677962bbf5e603e3b89f50 /src/audio/AudioCollision.cpp | |
| parent | Merge pull request #405 from erorcun/erorcun (diff) | |
| download | re3-7d137d8f2d3effa96593cae34e7259e0ab025e4d.tar re3-7d137d8f2d3effa96593cae34e7259e0ab025e4d.tar.gz re3-7d137d8f2d3effa96593cae34e7259e0ab025e4d.tar.bz2 re3-7d137d8f2d3effa96593cae34e7259e0ab025e4d.tar.lz re3-7d137d8f2d3effa96593cae34e7259e0ab025e4d.tar.xz re3-7d137d8f2d3effa96593cae34e7259e0ab025e4d.tar.zst re3-7d137d8f2d3effa96593cae34e7259e0ab025e4d.zip | |
Diffstat (limited to 'src/audio/AudioCollision.cpp')
| -rw-r--r-- | src/audio/AudioCollision.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/audio/AudioCollision.cpp b/src/audio/AudioCollision.cpp index 4039bd75..99c87a6a 100644 --- a/src/audio/AudioCollision.cpp +++ b/src/audio/AudioCollision.cpp @@ -151,7 +151,7 @@ cAudioManager::SetUpLoopingCollisionSound(cAudioCollision *col, uint8 counter) m_sQueueSample.m_bVolume = ComputeVolume(emittingVol, CollisionSoundIntensity, m_sQueueSample.m_fDistance); if(m_sQueueSample.m_bVolume) { - m_sQueueSample.m_counter = counter; + m_sQueueSample.m_nCounter = counter; m_sQueueSample.m_vecPos = col->m_vecPosition; m_sQueueSample.m_bBankIndex = SAMPLEBANK_MAIN; m_sQueueSample.m_bIs2D = false; @@ -164,7 +164,7 @@ cAudioManager::SetUpLoopingCollisionSound(cAudioCollision *col, uint8 counter) SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex); m_sQueueSample.m_fSpeedMultiplier = 4.0f; m_sQueueSample.m_fSoundIntensity = CollisionSoundIntensity; - m_sQueueSample.m_bReleasingSoundFlag = 0; + m_sQueueSample.m_bReleasingSoundFlag = false; m_sQueueSample.m_nReleasingVolumeDivider = 5; m_sQueueSample.m_bReverbFlag = true; m_sQueueSample.m_bRequireReflection = false; @@ -270,7 +270,7 @@ cAudioManager::SetUpOneShotCollisionSound(cAudioCollision *col) break; } m_sQueueSample.m_nFrequency += RandomDisplacement(m_sQueueSample.m_nFrequency / 16); - m_sQueueSample.m_counter = counter++; + m_sQueueSample.m_nCounter = counter++; if(counter >= 255) counter = 28; m_sQueueSample.m_vecPos = col->m_vecPosition; m_sQueueSample.m_bBankIndex = SAMPLEBANK_MAIN; @@ -282,7 +282,7 @@ cAudioManager::SetUpOneShotCollisionSound(cAudioCollision *col) m_sQueueSample.m_nLoopEnd = -1; m_sQueueSample.m_fSpeedMultiplier = 4.0f; m_sQueueSample.m_fSoundIntensity = CollisionSoundIntensity; - m_sQueueSample.m_bReleasingSoundFlag = 1; + m_sQueueSample.m_bReleasingSoundFlag = true; m_sQueueSample.m_bReverbFlag = true; m_sQueueSample.m_bRequireReflection = false; AddSampleToRequestedQueue(); |