diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2019-10-26 15:23:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-26 15:23:04 +0200 |
| commit | fd8096aec8deaaa3ce3500853f8a4b4cba2b688a (patch) | |
| tree | 0f5c8a4a2197ef2812d63e6333ec267eda8ddcf0 /src/core | |
| parent | Fix audio bug (diff) | |
| parent | A bit more enums for ChangeMusicMode (diff) | |
| download | re3-fd8096aec8deaaa3ce3500853f8a4b4cba2b688a.tar re3-fd8096aec8deaaa3ce3500853f8a4b4cba2b688a.tar.gz re3-fd8096aec8deaaa3ce3500853f8a4b4cba2b688a.tar.bz2 re3-fd8096aec8deaaa3ce3500853f8a4b4cba2b688a.tar.lz re3-fd8096aec8deaaa3ce3500853f8a4b4cba2b688a.tar.xz re3-fd8096aec8deaaa3ce3500853f8a4b4cba2b688a.tar.zst re3-fd8096aec8deaaa3ce3500853f8a4b4cba2b688a.zip | |
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/CutsceneMgr.cpp | 5 | ||||
| -rw-r--r-- | src/core/Frontend.cpp | 7 |
2 files changed, 5 insertions, 7 deletions
diff --git a/src/core/CutsceneMgr.cpp b/src/core/CutsceneMgr.cpp index 95abfcc9..f147e8c9 100644 --- a/src/core/CutsceneMgr.cpp +++ b/src/core/CutsceneMgr.cpp @@ -17,7 +17,6 @@ #include "RpAnimBlend.h" #include "ModelIndices.h" #include "TempColModels.h" -#include "MusicManager.h" const struct { const char *szTrackName; @@ -209,7 +208,7 @@ CCutsceneMgr::LoadCutsceneData(const char *szCutsceneName) CFileMgr::CloseFile(file);
if (strcmpi(ms_cutsceneName, "end")) {
- DMAudio.ChangeMusicMode(2);
+ DMAudio.ChangeMusicMode(MUSICMODE_CUTSCENE);
int trackId = FindCutsceneAudioTrackId(szCutsceneName);
if (trackId != -1) {
printf("Start preload audio %s\n", szCutsceneName);
@@ -368,7 +367,7 @@ CCutsceneMgr::DeleteCutsceneData(void) if (strcmpi(ms_cutsceneName, "end")) {
DMAudio.StopCutSceneMusic();
if (strcmpi(ms_cutsceneName, "bet"))
- DMAudio.ChangeMusicMode(1);
+ DMAudio.ChangeMusicMode(MUSICMODE_GAME);
}
CTimer::Stop();
//TheCamera.GetScreenFadeStatus() == 2; // what for??
diff --git a/src/core/Frontend.cpp b/src/core/Frontend.cpp index 0be25e8a..5f87049a 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 |