diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2019-10-26 14:20:12 +0200 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2019-10-26 14:20:12 +0200 |
| commit | d5a72fa597e7d0885f7a398e204c4085aff5c241 (patch) | |
| tree | b71959c19fa9b88c159ed753ff00c96e9c3b74f9 /src/core | |
| parent | Added timing to RwTextureGtaStreamRead (diff) | |
| download | re3-d5a72fa597e7d0885f7a398e204c4085aff5c241.tar re3-d5a72fa597e7d0885f7a398e204c4085aff5c241.tar.gz re3-d5a72fa597e7d0885f7a398e204c4085aff5c241.tar.bz2 re3-d5a72fa597e7d0885f7a398e204c4085aff5c241.tar.lz re3-d5a72fa597e7d0885f7a398e204c4085aff5c241.tar.xz re3-d5a72fa597e7d0885f7a398e204c4085aff5c241.tar.zst re3-d5a72fa597e7d0885f7a398e204c4085aff5c241.zip | |
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/CutsceneMgr.cpp | 5 | ||||
| -rw-r--r-- | src/core/Frontend.cpp | 3 |
2 files changed, 3 insertions, 5 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..6ba6d5c8 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; } |