Substitute/Re3
Substitute/Re3
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

Refactoring

Browse Source
This commit is contained in:
Sergeanur 2019-09-28 17:31:14 +03:00
parent 6362ceeff3
commit 45ead4d0bf
2 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/core/CutsceneMgr.cpp
View File

@ -329,7 +329,8 @@ CCutsceneMgr::CreateCutsceneObject(int modelId)
void void
CCutsceneMgr::DeleteCutsceneData(void) CCutsceneMgr::DeleteCutsceneData(void)
{ {
if (ms_loaded) { if (!ms_loaded) return;
ms_cutsceneProcessing = false; ms_cutsceneProcessing = false;
ms_useLodMultiplier = false; ms_useLodMultiplier = false;
@ -364,7 +365,6 @@ CCutsceneMgr::DeleteCutsceneData(void)
CGame::DrasticTidyUpMemory(); CGame::DrasticTidyUpMemory();
CTimer::Update(); CTimer::Update();
} }
}
void void
CCutsceneMgr::Update(void) CCutsceneMgr::Update(void)
@ -395,7 +395,8 @@ CCutsceneMgr::Update(void)
break; break;
} }
if (ms_running) { if (!ms_running) return;
ms_cutsceneTimer += CTimer::GetTimeStepNonClipped() * 0.02; ms_cutsceneTimer += CTimer::GetTimeStepNonClipped() * 0.02;
if (strcmpi(ms_cutsceneName, "end") && TheCamera.Cams[TheCamera.ActiveCam].Mode == CCam::MODE_FLYBY && ms_cutsceneLoadStatus == CUTSCENE_LOADING_0) { if (strcmpi(ms_cutsceneName, "end") && TheCamera.Cams[TheCamera.ActiveCam].Mode == CCam::MODE_FLYBY && ms_cutsceneLoadStatus == CUTSCENE_LOADING_0) {
if (CPad::GetPad(0)->GetCrossJustDown() if (CPad::GetPad(0)->GetCrossJustDown()
@ -406,9 +407,8 @@ CCutsceneMgr::Update(void)
FinishCutscene(); FinishCutscene();
} }
} }
}
bool CCutsceneMgr::HasCutsceneFinished() { return TheCamera.GetPositionAlongSpline() == 1.0; } bool CCutsceneMgr::HasCutsceneFinished(void) { return TheCamera.GetPositionAlongSpline() == 1.0; }
STARTPATCHES STARTPATCHES
InjectHook(0x4045D0, &CCutsceneMgr::Initialise, PATCH_JUMP); InjectHook(0x4045D0, &CCutsceneMgr::Initialise, PATCH_JUMP);

2
src/core/CutsceneMgr.h
View File

@ -27,7 +27,7 @@ public:
static bool IsRunning(void) { return ms_running; } static bool IsRunning(void) { return ms_running; }
static bool IsCutsceneProcessing(void) { return ms_cutsceneProcessing; } static bool IsCutsceneProcessing(void) { return ms_cutsceneProcessing; }
static CCutsceneObject* GetCutsceneObject(int id) { return ms_pCutsceneObjects[id]; } static CCutsceneObject* GetCutsceneObject(int id) { return ms_pCutsceneObjects[id]; }
static int GetCutsceneTimeInMilleseconds() { return 1000.0f * ms_cutsceneTimer; } static int GetCutsceneTimeInMilleseconds(void) { return 1000.0f * ms_cutsceneTimer; }
static char *GetCutsceneName(void) { return ms_cutsceneName; } static char *GetCutsceneName(void) { return ms_cutsceneName; }
static bool HasCutsceneFinished(void); static bool HasCutsceneFinished(void);