diff options
| author | aap <aap@papnet.eu> | 2020-10-25 16:17:43 +0100 |
|---|---|---|
| committer | aap <aap@papnet.eu> | 2020-10-25 16:17:43 +0100 |
| commit | adfa2645bfb85fcbdfa44ac1677a72f9f4bc78f3 (patch) | |
| tree | dd08dac87b76a74f410d07f6ac473fe28ccd3954 /src/audio | |
| parent | clean up timebar ifdefs (diff) | |
| parent | Finalize frontend sounds, player setup screen (diff) | |
| download | re3-adfa2645bfb85fcbdfa44ac1677a72f9f4bc78f3.tar re3-adfa2645bfb85fcbdfa44ac1677a72f9f4bc78f3.tar.gz re3-adfa2645bfb85fcbdfa44ac1677a72f9f4bc78f3.tar.bz2 re3-adfa2645bfb85fcbdfa44ac1677a72f9f4bc78f3.tar.lz re3-adfa2645bfb85fcbdfa44ac1677a72f9f4bc78f3.tar.xz re3-adfa2645bfb85fcbdfa44ac1677a72f9f4bc78f3.tar.zst re3-adfa2645bfb85fcbdfa44ac1677a72f9f4bc78f3.zip | |
Diffstat (limited to 'src/audio')
| -rw-r--r-- | src/audio/AudioLogic.cpp | 10 | ||||
| -rw-r--r-- | src/audio/MusicManager.cpp | 2 | ||||
| -rw-r--r-- | src/audio/soundlist.h | 11 |
3 files changed, 10 insertions, 13 deletions
diff --git a/src/audio/AudioLogic.cpp b/src/audio/AudioLogic.cpp index 88ef50f0..e9c594cc 100644 --- a/src/audio/AudioLogic.cpp +++ b/src/audio/AudioLogic.cpp @@ -5661,25 +5661,25 @@ cAudioManager::ProcessFrontEnd() case SOUND_AMMUNATION_IMRAN_ARM_BOMB: m_sQueueSample.m_nSampleIndex = SFX_ARM_BOMB; break; - case SOUND_194: + case SOUND_RADIO_CHANGE: m_sQueueSample.m_nSampleIndex = (m_anRandomTable[1] % 2) ? radioDial + 1 : radioDial + 2; if (m_sQueueSample.m_nSampleIndex > SFX_RADIO_DIAL_12) m_sQueueSample.m_nSampleIndex -= 12; radioDial = m_sQueueSample.m_nSampleIndex; break; - case SOUND_FRONTEND_MENU_NEW_PAGE: + case SOUND_FRONTEND_HIGHLIGHT_OPTION: stereo = true; m_sQueueSample.m_nSampleIndex = SFX_FE_HIGHLIGHT_LEFT; break; - case SOUND_FRONTEND_FAIL: + case SOUND_FRONTEND_ENTER_OR_ADJUST: stereo = true; m_sQueueSample.m_nSampleIndex = SFX_FE_SELECT_LEFT; break; - case SOUND_FRONTEND_MENU_SETTING_CHANGE: + case SOUND_FRONTEND_BACK: stereo = true; m_sQueueSample.m_nSampleIndex = SFX_FE_BACK_LEFT; break; - case SOUND_FRONTEND_MENU_BACK: + case SOUND_FRONTEND_FAIL: stereo = true; m_sQueueSample.m_nSampleIndex = SFX_FE_ERROR_LEFT; break; diff --git a/src/audio/MusicManager.cpp b/src/audio/MusicManager.cpp index adae2708..8aedf306 100644 --- a/src/audio/MusicManager.cpp +++ b/src/audio/MusicManager.cpp @@ -618,7 +618,7 @@ cMusicManager::ServiceGameMode() } if (RadioStaticCounter < 2 && CTimer::GetTimeInMilliseconds() > RadioStaticTimer + 800) { - AudioManager.PlayOneShot(AudioManager.m_nFrontEndEntity, SOUND_194, 0.0f); + AudioManager.PlayOneShot(AudioManager.m_nFrontEndEntity, SOUND_RADIO_CHANGE, 0.0f); RadioStaticCounter++; RadioStaticTimer = CTimer::GetTimeInMilliseconds(); } diff --git a/src/audio/soundlist.h b/src/audio/soundlist.h index 973a1585..f4a1d0a6 100644 --- a/src/audio/soundlist.h +++ b/src/audio/soundlist.h @@ -193,15 +193,12 @@ enum eSound : uint16 SOUND_WEAPON_MINIGUN_2, SOUND_WEAPON_MINIGUN_3, SOUND_AMMUNATION_IMRAN_ARM_BOMB, - SOUND_194, - - // TODO(Miami): They're frontend sounds but names are copy-paste and incorrect - SOUND_FRONTEND_MENU_NEW_PAGE, + SOUND_RADIO_CHANGE, + SOUND_FRONTEND_HIGHLIGHT_OPTION, + SOUND_FRONTEND_ENTER_OR_ADJUST, + SOUND_FRONTEND_BACK, SOUND_FRONTEND_FAIL, - SOUND_FRONTEND_MENU_SETTING_CHANGE, - SOUND_FRONTEND_MENU_BACK, SOUND_FRONTEND_AUDIO_TEST, - SOUND_INJURED_PED_MALE_OUCH, SOUND_INJURED_PED_FEMALE, SOUND_SET_202, |