diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2019-10-26 17:20:31 +0300 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2019-10-26 17:20:31 +0300 |
| commit | 3dee880c2941417c9e5ec42297da65f27ab9c5ca (patch) | |
| tree | 93f0daf6f0fdc04fb2898a202157d3d9ec078ffb /src/core/CutsceneMgr.cpp | |
| parent | 542e746f66593ac63eb1a269ba9708593a627b24 (diff) | |
| parent | 35bd3f514d2a673cf17db78103b17c169d2027e1 (diff) | |
merge
Diffstat (limited to 'src/core/CutsceneMgr.cpp')
| -rw-r--r-- | src/core/CutsceneMgr.cpp | 5 |
1 files changed, 2 insertions, 3 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??
|