diff options
| author | Roman Masanin <36927roma@gmail.com> | 2020-10-17 20:53:13 +0200 |
|---|---|---|
| committer | Roman Masanin <36927roma@gmail.com> | 2020-10-17 20:53:13 +0200 |
| commit | f5f9b8b79f3803335838cfa7789a07319d0fcc13 (patch) | |
| tree | 2dc1076865ec8e3edf0611269619fdd9af837142 | |
| parent | fix audio bug and some refractoring (diff) | |
| download | re3-f5f9b8b79f3803335838cfa7789a07319d0fcc13.tar re3-f5f9b8b79f3803335838cfa7789a07319d0fcc13.tar.gz re3-f5f9b8b79f3803335838cfa7789a07319d0fcc13.tar.bz2 re3-f5f9b8b79f3803335838cfa7789a07319d0fcc13.tar.lz re3-f5f9b8b79f3803335838cfa7789a07319d0fcc13.tar.xz re3-f5f9b8b79f3803335838cfa7789a07319d0fcc13.tar.zst re3-f5f9b8b79f3803335838cfa7789a07319d0fcc13.zip | |
| -rw-r--r-- | src/audio/AudioLogic.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/audio/AudioLogic.cpp b/src/audio/AudioLogic.cpp index 1b147425..5d72f099 100644 --- a/src/audio/AudioLogic.cpp +++ b/src/audio/AudioLogic.cpp @@ -886,7 +886,11 @@ cAudioManager::ProcessWetRoadNoise(cVehicleParams *params) m_sQueueSample.m_nBankIndex = SFX_BANK_0; m_sQueueSample.m_bIs2D = false; m_sQueueSample.m_nReleasingVolumeModificator = 3; +#ifdef FIX_BUGS multiplier = (m_sQueueSample.m_fDistance / SOUND_INTENSITY) * 0.5f; +#else + multiplier = (m_sQueueSample.m_fDistance / 3.0f) * 0.5f; +#endif freq = SampleManager.GetSampleBaseFrequency(SFX_ROAD_NOISE); m_sQueueSample.m_nFrequency = freq + freq * multiplier; m_sQueueSample.m_nLoopCount = 0; @@ -6496,9 +6500,17 @@ cAudioManager::ProcessWaterCannon(int32) float distSquared = GetDistanceSquared(m_sQueueSample.m_vecPos); if (distSquared < SQR(SOUND_INTENSITY)) { m_sQueueSample.m_fDistance = Sqrt(distSquared); +#ifdef FIX_BUGS m_sQueueSample.m_nVolume = ComputeVolume(50, SOUND_INTENSITY, m_sQueueSample.m_fDistance); +#else + m_sQueueSample.m_nVolume = ComputeVolume(50, m_sQueueSample.m_fSoundIntensity, m_sQueueSample.m_fDistance); +#endif if (m_sQueueSample.m_nVolume != 0) { +#ifdef FIX_BUGS m_sQueueSample.m_fSoundIntensity = SOUND_INTENSITY; +#else + m_sQueueSample.m_fSoundIntensity = SQR(SOUND_INTENSITY); +#endif m_sQueueSample.m_nSampleIndex = SFX_JUMBO_TAXI; m_sQueueSample.m_nBankIndex = SFX_BANK_0; m_sQueueSample.m_nFrequency = 15591; |