diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2021-08-17 12:58:48 +0200 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2021-08-17 12:58:48 +0200 |
| commit | 16ff379ebeca2092e9609eb3163a6bd2ffd68060 (patch) | |
| tree | 75d6ec09e36174454e8bcf66867b9b0ea46ada2b /src/audio/sampman_oal.cpp | |
| parent | Remove FIX_BUGS that wasn't needed (diff) | |
| download | re3-16ff379ebeca2092e9609eb3163a6bd2ffd68060.tar re3-16ff379ebeca2092e9609eb3163a6bd2ffd68060.tar.gz re3-16ff379ebeca2092e9609eb3163a6bd2ffd68060.tar.bz2 re3-16ff379ebeca2092e9609eb3163a6bd2ffd68060.tar.lz re3-16ff379ebeca2092e9609eb3163a6bd2ffd68060.tar.xz re3-16ff379ebeca2092e9609eb3163a6bd2ffd68060.tar.zst re3-16ff379ebeca2092e9609eb3163a6bd2ffd68060.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/audio/sampman_oal.cpp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/audio/sampman_oal.cpp b/src/audio/sampman_oal.cpp index 17776347..b8a3ed3d 100644 --- a/src/audio/sampman_oal.cpp +++ b/src/audio/sampman_oal.cpp @@ -1362,10 +1362,16 @@ bool8 cSampleManager::UpdateReverb(void) if ( AudioManager.m_FrameCounter & 15 ) return FALSE; - + +#ifdef AUDIO_REFLECTIONS float y = AudioManager.m_afReflectionsDistances[REFLECTION_TOP] + AudioManager.m_afReflectionsDistances[REFLECTION_BOTTOM]; float x = AudioManager.m_afReflectionsDistances[REFLECTION_LEFT] + AudioManager.m_afReflectionsDistances[REFLECTION_RIGHT]; float z = AudioManager.m_afReflectionsDistances[REFLECTION_UP]; +#else + float x = 0.0f; + float y = 0.0f; + float z = 0.0f; +#endif float normy = norm(y, 5.0f, 40.0f); float normx = norm(x, 5.0f, 40.0f); @@ -1653,7 +1659,7 @@ cSampleManager::StartPreloadedStreamedFile(uint8 nStream) bool8 cSampleManager::StartStreamedFile(uint8 nFile, uint32 nPos, uint8 nStream) { - int i = 0; + uint32 i = 0; uint32 position = nPos; char filename[MAX_PATH]; @@ -1728,7 +1734,7 @@ cSampleManager::StartStreamedFile(uint8 nFile, uint32 nPos, uint8 nStream) if ( !_pMP3List ) { nFile = 0; - _bIsMp3Active = 0; + _bIsMp3Active = FALSE; CStream *stream = aStream[nStream]; #ifdef PS2_AUDIO_PATHS if(!stream->Open(PS2StreamedNameTable[nFile], IsThisTrackAt16KHz(nFile) ? 16000 : 32000)) @@ -1767,7 +1773,7 @@ cSampleManager::StartStreamedFile(uint8 nFile, uint32 nPos, uint8 nStream) } } - _bIsMp3Active = 0; + _bIsMp3Active = FALSE; } while ( ++i < nNumMP3s ); position = 0; |