diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2020-05-27 02:29:54 +0200 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2020-05-27 02:29:54 +0200 |
| commit | 408faf8a663672030682d15c5c85cd17dba85cf1 (patch) | |
| tree | 0f565542461fe3b6185a3a0632c03b5109c0693d /src/core | |
| parent | Merge pull request #553 from Sergeanur/VC/audio (diff) | |
| download | re3-408faf8a663672030682d15c5c85cd17dba85cf1.tar re3-408faf8a663672030682d15c5c85cd17dba85cf1.tar.gz re3-408faf8a663672030682d15c5c85cd17dba85cf1.tar.bz2 re3-408faf8a663672030682d15c5c85cd17dba85cf1.tar.lz re3-408faf8a663672030682d15c5c85cd17dba85cf1.tar.xz re3-408faf8a663672030682d15c5c85cd17dba85cf1.tar.zst re3-408faf8a663672030682d15c5c85cd17dba85cf1.zip | |
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/Frontend.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/core/Frontend.cpp b/src/core/Frontend.cpp index 60a17aee..5c861cf5 100644 --- a/src/core/Frontend.cpp +++ b/src/core/Frontend.cpp @@ -486,9 +486,9 @@ CMenuManager::Initialise(void) // TODO(Miami) // DMAudio.SetMP3BoostVolume(m_PrefsMP3BoostVolume); if (DMAudio.IsMP3RadioChannelAvailable()) { - if (m_PrefsRadioStation < HEAD_RADIO || m_PrefsRadioStation > USERTRACK) + if (m_PrefsRadioStation < WILDSTYLE || m_PrefsRadioStation > USERTRACK) m_PrefsRadioStation = CGeneral::GetRandomNumber() % 10; - } else if (m_PrefsRadioStation < HEAD_RADIO || m_PrefsRadioStation > CHATTERBOX) + } else if (m_PrefsRadioStation < WILDSTYLE || m_PrefsRadioStation > WAVE) m_PrefsRadioStation = CGeneral::GetRandomNumber() % 9; CFileMgr::SetDir(""); @@ -4413,7 +4413,7 @@ CMenuManager::ProcessButtonPresses(void) m_PrefsSpeakers = 0; m_PrefsMusicVolume = 102; m_PrefsStereoMono = 0; - m_PrefsRadioStation = HEAD_RADIO; + m_PrefsRadioStation = WILDSTYLE; DMAudio.SetMusicMasterVolume(102); DMAudio.SetEffectsMasterVolume(m_PrefsSfxVolume); DMAudio.SetRadioInCar(m_PrefsRadioStation); @@ -4609,15 +4609,15 @@ CMenuManager::ProcessButtonPresses(void) m_PrefsRadioStation += changeValueBy; DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_SUCCESS, 0); if (DMAudio.IsMP3RadioChannelAvailable()) { - if (m_PrefsRadioStation < HEAD_RADIO) + if (m_PrefsRadioStation < WILDSTYLE) m_PrefsRadioStation = USERTRACK; if (m_PrefsRadioStation > USERTRACK) - m_PrefsRadioStation = HEAD_RADIO; + m_PrefsRadioStation = WILDSTYLE; } else { - if (m_PrefsRadioStation < HEAD_RADIO) - m_PrefsRadioStation = CHATTERBOX; - if (m_PrefsRadioStation > CHATTERBOX) - m_PrefsRadioStation = HEAD_RADIO; + if (m_PrefsRadioStation < WILDSTYLE) + m_PrefsRadioStation = WAVE; + if (m_PrefsRadioStation > WAVE) + m_PrefsRadioStation = WILDSTYLE; } SaveSettings(); DMAudio.SetRadioInCar(m_PrefsRadioStation); |