diff options
author | Sergeanur <s.anureev@yandex.ua> | 2021-01-12 12:22:44 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-12 12:22:44 +0100 |
commit | 8888ee3974587cfb6172e420210df75e5c5de3f7 (patch) | |
tree | 10294da8d82bcdedaaf64cee35897a7fe08b64ea /src/audio/sampman_miles.cpp | |
parent | Merge branch 'miami' into lcs (diff) | |
parent | More fix (diff) | |
download | re3-8888ee3974587cfb6172e420210df75e5c5de3f7.tar re3-8888ee3974587cfb6172e420210df75e5c5de3f7.tar.gz re3-8888ee3974587cfb6172e420210df75e5c5de3f7.tar.bz2 re3-8888ee3974587cfb6172e420210df75e5c5de3f7.tar.lz re3-8888ee3974587cfb6172e420210df75e5c5de3f7.tar.xz re3-8888ee3974587cfb6172e420210df75e5c5de3f7.tar.zst re3-8888ee3974587cfb6172e420210df75e5c5de3f7.zip |
Diffstat (limited to 'src/audio/sampman_miles.cpp')
-rw-r--r-- | src/audio/sampman_miles.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/audio/sampman_miles.cpp b/src/audio/sampman_miles.cpp index 2a4286eb..78de4e6b 100644 --- a/src/audio/sampman_miles.cpp +++ b/src/audio/sampman_miles.cpp @@ -1057,7 +1057,7 @@ cSampleManager::Initialise(void) m_szCDRomRootPath[0] = '\0'; strcpy(m_WavFilesPath, m_szCDRomRootPath); - + /* #ifdef AUDIO_CACHE if ( CreateCache ) #endif @@ -1084,7 +1084,7 @@ cSampleManager::Initialise(void) return false; } } - + */ // Find path of MP3s (originally in CD-Rom) // if NO_CDCHECK is NOT defined but AUDIO_CACHE is defined, we still need to find MP3s' path, but will exit after the first file #ifndef NO_CDCHECK @@ -1102,7 +1102,7 @@ cSampleManager::Initialise(void) { #endif - for (int32 i = 0; i < STREAMED_SOUND_MISSION_MOBR1; i++) + for (int32 i = 0; i < TOTAL_STREAMED_SOUNDS; i++) { strcpy(filepath, m_MP3FilesPath); strcat(filepath, StreamedNameTable[i]); @@ -1143,7 +1143,7 @@ cSampleManager::Initialise(void) #endif if ( !bFileNotFound ) { - +/* #ifdef AUDIO_CACHE if ( CreateCache ) #endif @@ -1169,7 +1169,7 @@ cSampleManager::Initialise(void) bFileNotFound = true; break; } - } + }*/ } m_bInitialised = !bFileNotFound; @@ -2046,7 +2046,7 @@ cSampleManager::PreloadStreamedFile(uint32 nFile, uint8 nStream) char filepath[MAX_PATH]; - strcpy(filepath, nFile < STREAMED_SOUND_MISSION_COMPLETED4 ? m_MP3FilesPath : (nFile < STREAMED_SOUND_MISSION_MOBR1 ? m_MiscomPath : m_WavFilesPath)); + strcpy(filepath, m_MP3FilesPath); strcat(filepath, StreamedNameTable[nFile]); mp3Stream[nStream] = AIL_open_stream(DIG, filepath, 0); |