Archive/re3
0
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2025-05-10 21:16:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Audio stuff moved around, removed MusicManager dependencies, eMusicMode used for ChangeMusicMode

Browse source
This commit is contained in:
Sergeanur 2019-10-26 15:20:12 +03:00
parent 832572664c
commit d5a72fa597
14 changed files with 382 additions and 389 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/core/CutsceneMgr.cpp
View file

@ -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??