diff options
| author | aap <aap@papnet.eu> | 2020-04-28 13:41:03 +0200 |
|---|---|---|
| committer | aap <aap@papnet.eu> | 2020-04-28 13:41:03 +0200 |
| commit | dc435a4165417171bbdf2754b1b6cd5c8e43bb19 (patch) | |
| tree | 651606f4a9921c866e327c4cac324a23a34d02f7 /src/audio/AudioCollision.cpp | |
| parent | silly librw bug (diff) | |
| parent | Changing prefixes for some audio fields (diff) | |
| download | re3-dc435a4165417171bbdf2754b1b6cd5c8e43bb19.tar re3-dc435a4165417171bbdf2754b1b6cd5c8e43bb19.tar.gz re3-dc435a4165417171bbdf2754b1b6cd5c8e43bb19.tar.bz2 re3-dc435a4165417171bbdf2754b1b6cd5c8e43bb19.tar.lz re3-dc435a4165417171bbdf2754b1b6cd5c8e43bb19.tar.xz re3-dc435a4165417171bbdf2754b1b6cd5c8e43bb19.tar.zst re3-dc435a4165417171bbdf2754b1b6cd5c8e43bb19.zip | |
Diffstat (limited to 'src/audio/AudioCollision.cpp')
| -rw-r--r-- | src/audio/AudioCollision.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/audio/AudioCollision.cpp b/src/audio/AudioCollision.cpp index a963b293..0e060568 100644 --- a/src/audio/AudioCollision.cpp +++ b/src/audio/AudioCollision.cpp @@ -164,16 +164,16 @@ cAudioManager::SetUpLoopingCollisionSound(cAudioCollision *col, uint8 counter) uint8 emittingVol = SetLoopingCollisionRequestedSfxFreqAndGetVol(col); if(emittingVol) { m_sQueueSample.m_fDistance = Sqrt(col->m_fDistance); - m_sQueueSample.m_bVolume = + m_sQueueSample.m_nVolume = ComputeVolume(emittingVol, CollisionSoundIntensity, m_sQueueSample.m_fDistance); - if(m_sQueueSample.m_bVolume) { + if(m_sQueueSample.m_nVolume) { m_sQueueSample.m_nCounter = counter; m_sQueueSample.m_vecPos = col->m_vecPosition; - m_sQueueSample.m_bBankIndex = SAMPLEBANK_MAIN; + m_sQueueSample.m_nBankIndex = SAMPLEBANK_MAIN; m_sQueueSample.m_bIs2D = false; m_sQueueSample.m_nReleasingVolumeModificator = 7; m_sQueueSample.m_nLoopCount = 0; - m_sQueueSample.m_bEmittingVolume = emittingVol; + m_sQueueSample.m_nEmittingVolume = emittingVol; m_sQueueSample.m_nLoopStart = SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex); m_sQueueSample.m_nLoopEnd = @@ -231,9 +231,9 @@ cAudioManager::SetUpOneShotCollisionSound(cAudioCollision *col) emittingVol = 40.f * ratio; if(emittingVol) { m_sQueueSample.m_fDistance = Sqrt(col->m_fDistance); - m_sQueueSample.m_bVolume = + m_sQueueSample.m_nVolume = ComputeVolume(emittingVol, CollisionSoundIntensity, m_sQueueSample.m_fDistance); - if(m_sQueueSample.m_bVolume) { + if(m_sQueueSample.m_nVolume) { m_sQueueSample.m_nSampleIndex = gOneShotCol[s1]; switch(m_sQueueSample.m_nSampleIndex) { case SFX_COL_TARMAC_1: @@ -289,11 +289,11 @@ cAudioManager::SetUpOneShotCollisionSound(cAudioCollision *col) m_sQueueSample.m_nCounter = counter++; if(counter >= 255) counter = 28; m_sQueueSample.m_vecPos = col->m_vecPosition; - m_sQueueSample.m_bBankIndex = SAMPLEBANK_MAIN; + m_sQueueSample.m_nBankIndex = SAMPLEBANK_MAIN; m_sQueueSample.m_bIs2D = false; m_sQueueSample.m_nReleasingVolumeModificator = 11; m_sQueueSample.m_nLoopCount = 1; - m_sQueueSample.m_bEmittingVolume = emittingVol; + m_sQueueSample.m_nEmittingVolume = emittingVol; m_sQueueSample.m_nLoopStart = 0; m_sQueueSample.m_nLoopEnd = -1; m_sQueueSample.m_fSpeedMultiplier = 4.0f; @@ -380,7 +380,7 @@ cAudioManager::ReportCollision(CEntity *entity1, CEntity *entity2, uint8 surface CVector v1; CVector v2; - if(!m_bIsInitialised || m_nCollisionEntity < 0 || m_bUserPause || + if(!m_bIsInitialised || m_nCollisionEntity < 0 || m_nUserPause || (velocity < 0.0016f && collisionPower < 0.01f)) return; |