diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2021-08-08 14:34:02 +0200 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2021-08-08 14:34:02 +0200 |
| commit | 88b4c7b50b032f06510fec278babe7502cd85d64 (patch) | |
| tree | a3696b405ab314eb845766c57f4c3e941753c3d5 /src/audio/sampman_miles.cpp | |
| parent | Merge pull request #1266 from Nick007J/miami (diff) | |
| parent | CVehicle fixes and cleanup (diff) | |
| download | re3-88b4c7b50b032f06510fec278babe7502cd85d64.tar re3-88b4c7b50b032f06510fec278babe7502cd85d64.tar.gz re3-88b4c7b50b032f06510fec278babe7502cd85d64.tar.bz2 re3-88b4c7b50b032f06510fec278babe7502cd85d64.tar.lz re3-88b4c7b50b032f06510fec278babe7502cd85d64.tar.xz re3-88b4c7b50b032f06510fec278babe7502cd85d64.tar.zst re3-88b4c7b50b032f06510fec278babe7502cd85d64.zip | |
Diffstat (limited to 'src/audio/sampman_miles.cpp')
| -rw-r--r-- | src/audio/sampman_miles.cpp | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/src/audio/sampman_miles.cpp b/src/audio/sampman_miles.cpp index f94768cb..95a094ba 100644 --- a/src/audio/sampman_miles.cpp +++ b/src/audio/sampman_miles.cpp @@ -1025,11 +1025,20 @@ cSampleManager::Initialise(void) if ( GetDriveType(m_szCDRomRootPath) == DRIVE_CDROM ) { + FILE *f; +#ifdef PS2_AUDIO_PATHS strcpy(filepath, m_szCDRomRootPath); - strcat(filepath, StreamedNameTable[0]); - - FILE *f = fopen(filepath, "rb"); + strcat(filepath, PS2StreamedNameTable[0]); + f = fopen(filepath, "rb"); + + if ( !f ) +#endif + { + strcpy(filepath, m_szCDRomRootPath); + strcat(filepath, StreamedNameTable[0]); + f = fopen(filepath, "rb"); + } if ( f ) { fclose(f); @@ -1410,6 +1419,7 @@ cSampleManager::CheckForAnAudioFileOnCD(void) { #if !defined(NO_CDCHECK) // TODO: check steam, probably GTAVC_STEAM_PATCH needs to be added char filepath[MAX_PATH]; + FILE *f; strcpy(filepath, m_MiscomPath); strcat(filepath, StreamedNameTable[STREAMED_SOUND_MISSION_COMPLETED4]); |