From 9e6795a09e89b1022ef504d1e5dd811545ef7f3d Mon Sep 17 00:00:00 2001 From: Sergeanur Date: Wed, 22 Sep 2021 19:51:40 +0300 Subject: [PATCH] Rename STREAMED_SOUND_MISSION_COMPLETED4 --- src/audio/audio_enums.h | 2 +- src/audio/sampman_miles.cpp | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/audio/audio_enums.h b/src/audio/audio_enums.h index 6393d506..dcc007c4 100644 --- a/src/audio/audio_enums.h +++ b/src/audio/audio_enums.h @@ -150,8 +150,8 @@ enum eStreamedSounds STREAMED_SOUND_CUTSCENE_ELBURRO1_PH1, STREAMED_SOUND_CUTSCENE_ELBURRO2_PH2, STREAMED_SOUND_MISSION_COMPLETED, - STREAMED_SOUND_MISSION_COMPLETED4, #ifndef GTA_PS2 + STREAMED_SOUND_CD_CHECK_1, SFX_MISSION_MOBR1, SFX_MISSION_PAGER, SFX_MISSION_CARREV, diff --git a/src/audio/sampman_miles.cpp b/src/audio/sampman_miles.cpp index 841f479b..4d7c6982 100644 --- a/src/audio/sampman_miles.cpp +++ b/src/audio/sampman_miles.cpp @@ -1137,7 +1137,7 @@ cSampleManager::Initialise(void) { #endif - for (int32 i = 0; i < SFX_MISSION_MOBR1; i++) + for (int32 i = 0; i < STREAMED_SOUND_CD_CHECK_1; i++) { #ifdef PS2_AUDIO_PATHS strcpy(filepath, m_MP3FilesPath); @@ -1192,7 +1192,7 @@ cSampleManager::Initialise(void) #ifdef AUDIO_CACHE if ( CreateCache ) #endif - for ( int32 i = STREAMED_SOUND_MISSION_COMPLETED4; i < SFX_MISSION_PAGER; i++ ) + for ( int32 i = STREAMED_SOUND_CD_CHECK_1; i < SFX_MISSION_MOBR1; i++ ) { #ifdef PS2_AUDIO_PATHS strcpy(filepath, m_MiscomPath); @@ -1467,7 +1467,7 @@ cSampleManager::CheckForAnAudioFileOnCD(void) FILE *f; strcpy(filepath, m_MiscomPath); - strcat(filepath, StreamedNameTable[STREAMED_SOUND_MISSION_COMPLETED4]); + strcat(filepath, StreamedNameTable[STREAMED_SOUND_CD_CHECK_1]); FILE *f = fopen(filepath, "rb"); @@ -2228,7 +2228,7 @@ cSampleManager::PreloadStreamedFile(tTrack nFile, uint8 nStream) char filepath[MAX_PATH]; #ifdef PS2_AUDIO_PATHS - strcpy(filepath, nFile < STREAMED_SOUND_MISSION_COMPLETED4 ? m_MP3FilesPath : (nFile < SFX_MISSION_MOBR1 ? m_MiscomPath : m_WavFilesPath)); + strcpy(filepath, nFile < STREAMED_SOUND_CD_CHECK_1 ? m_MP3FilesPath : (nFile < SFX_MISSION_MOBR1 ? m_MiscomPath : m_WavFilesPath)); strcat(filepath, PS2StreamedNameTable[nFile]); mp3Stream[nStream] = AIL_open_stream(DIG, filepath, 0); @@ -2236,7 +2236,7 @@ cSampleManager::PreloadStreamedFile(tTrack nFile, uint8 nStream) if ( !mp3Stream[nStream] ) #endif { - strcpy(filepath, nFile < STREAMED_SOUND_MISSION_COMPLETED4 ? m_MP3FilesPath : (nFile < SFX_MISSION_MOBR1 ? m_MiscomPath : m_WavFilesPath)); + strcpy(filepath, nFile < STREAMED_SOUND_CD_CHECK_1 ? m_MP3FilesPath : (nFile < SFX_MISSION_MOBR1 ? m_MiscomPath : m_WavFilesPath)); strcat(filepath, StreamedNameTable[nFile]); mp3Stream[nStream] = AIL_open_stream(DIG, filepath, 0);