diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2021-08-19 10:47:03 +0200 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2021-08-19 10:47:03 +0200 |
| commit | 136b25133d67e9765a954a576ea272c4a0185c52 (patch) | |
| tree | 654021d86604d114e8d2bc34b5c535406541d04c /src/audio/sampman_oal.cpp | |
| parent | disable movies by default; update librw (diff) | |
| parent | Add AUDIO_REVERB define (diff) | |
| download | re3-136b25133d67e9765a954a576ea272c4a0185c52.tar re3-136b25133d67e9765a954a576ea272c4a0185c52.tar.gz re3-136b25133d67e9765a954a576ea272c4a0185c52.tar.bz2 re3-136b25133d67e9765a954a576ea272c4a0185c52.tar.lz re3-136b25133d67e9765a954a576ea272c4a0185c52.tar.xz re3-136b25133d67e9765a954a576ea272c4a0185c52.tar.zst re3-136b25133d67e9765a954a576ea272c4a0185c52.zip | |
Diffstat (limited to 'src/audio/sampman_oal.cpp')
| -rw-r--r-- | src/audio/sampman_oal.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/audio/sampman_oal.cpp b/src/audio/sampman_oal.cpp index b2c364fb..697b5d0b 100644 --- a/src/audio/sampman_oal.cpp +++ b/src/audio/sampman_oal.cpp @@ -1474,6 +1474,7 @@ bool8 cSampleManager::UpdateReverb(void) float fRatio = 0.0f; +#ifdef AUDIO_REFLECTIONS #define MIN_DIST 0.5f #define CALCULATE_RATIO(value, maxDist, maxRatio) (value > MIN_DIST && value < maxDist ? value / maxDist * maxRatio : 0) @@ -1487,6 +1488,7 @@ bool8 cSampleManager::UpdateReverb(void) #undef CALCULATE_RATIO #undef MIN_DIST +#endif fRatio = Clamp(fRatio, 0.0f, 0.6f); @@ -1768,7 +1770,7 @@ cSampleManager::StartPreloadedStreamedFile(uint8 nStream) bool8 cSampleManager::StartStreamedFile(uint32 nFile, uint32 nPos, uint8 nStream) { - int i = 0; + uint32 i = 0; uint32 position = nPos; char filename[MAX_PATH]; @@ -1853,7 +1855,7 @@ cSampleManager::StartStreamedFile(uint32 nFile, uint32 nPos, uint8 nStream) if ( !_pMP3List ) { nFile = 0; - _bIsMp3Active = 0; + _bIsMp3Active = FALSE; sprintf(filename, "%s.VB", StreamedNameTable[nFile]); CStream* stream = aStream[nStream]; @@ -1900,7 +1902,7 @@ cSampleManager::StartStreamedFile(uint32 nFile, uint32 nPos, uint8 nStream) } } - _bIsMp3Active = 0; + _bIsMp3Active = FALSE; } while ( ++i < nNumMP3s ); position = 0; |