diff options
| author | Fire_Head <Fire-Head@users.noreply.github.com> | 2019-10-27 04:39:56 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-27 04:39:56 +0100 |
| commit | c39cf2d960ce546c544872a732560b731d8c3897 (patch) | |
| tree | d7a4b2ec22bcb6a9f6d8ef2602c7fdbac417d18b /src/core/Frontend.cpp | |
| parent | ControllerConfig done (diff) | |
| parent | Merge branch 'master' into master (diff) | |
| download | re3-c39cf2d960ce546c544872a732560b731d8c3897.tar re3-c39cf2d960ce546c544872a732560b731d8c3897.tar.gz re3-c39cf2d960ce546c544872a732560b731d8c3897.tar.bz2 re3-c39cf2d960ce546c544872a732560b731d8c3897.tar.lz re3-c39cf2d960ce546c544872a732560b731d8c3897.tar.xz re3-c39cf2d960ce546c544872a732560b731d8c3897.tar.zst re3-c39cf2d960ce546c544872a732560b731d8c3897.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/core/Frontend.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/core/Frontend.cpp b/src/core/Frontend.cpp index 35302238..984e693f 100644 --- a/src/core/Frontend.cpp +++ b/src/core/Frontend.cpp @@ -11,7 +11,6 @@ #include "Timer.h" #include "Game.h" #include "DMAudio.h" -#include "MusicManager.h" #include "FileMgr.h" #include "Streaming.h" #include "TxdStore.h" @@ -535,7 +534,7 @@ void CMenuManager::Draw() if (m_nPrefsAudio3DProviderIndex == -1) textToPrint[MENUCOLUMN_RIGHT] = TheText.Get("FEA_NAH"); else { - char *provider = MusicManager.Get3DProviderName(m_nPrefsAudio3DProviderIndex); + char *provider = DMAudio.Get3DProviderName(m_nPrefsAudio3DProviderIndex); AsciiToUnicode(provider, gUString); textToPrint[MENUCOLUMN_RIGHT] = gUString; } @@ -1086,7 +1085,7 @@ void CMenuManager::LoadAllTextures() { if (!m_bSpritesLoaded) { CMenuManager::CentreMousePointer(); - DMAudio.ChangeMusicMode(0); + DMAudio.ChangeMusicMode(MUSICMODE_FRONTEND); DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_STARTING, 0); m_nCurrOption = 0; m_PrefsRadioStation = DMAudio.GetRadioInCar(); @@ -2133,7 +2132,7 @@ WRAPPER void CMenuManager::RequestFrontEndShutdown() { EAXJMP(0x488750); } void CMenuManager::RequestFrontEndShutdown() { m_bShutDownFrontEndRequested = true; - DMAudio.ChangeMusicMode(1); + DMAudio.ChangeMusicMode(MUSICMODE_GAME); } #endif |