mirror/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2024-11-15 19:19:00 +00:00
Code Issues Projects Releases Wiki Activity

Added f for floats, removed checks for delete

Browse source
This commit is contained in:
Sergeanur 2019-09-28 18:01:05 +03:00
parent 45ead4d0bf
commit ef65ad81ce
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/core/CutsceneMgr.cpp
View file

@ -148,8 +148,7 @@ CCutsceneMgr::Initialise(void)
void void
CCutsceneMgr::Shutdown(void) CCutsceneMgr::Shutdown(void)
{ {
if (ms_pCutsceneDir) delete ms_pCutsceneDir;
delete ms_pCutsceneDir;
} }
void void
@ -234,7 +233,7 @@ CCutsceneMgr::SetHeadAnim(const char *animName, CObject *pObject)
void void
CCutsceneMgr::FinishCutscene() CCutsceneMgr::FinishCutscene()
{ {
CCutsceneMgr::ms_cutsceneTimer = TheCamera.GetCutSceneFinishTime() * 0.001; CCutsceneMgr::ms_cutsceneTimer = TheCamera.GetCutSceneFinishTime() * 0.001f;
TheCamera.FinishCutscene(); TheCamera.FinishCutscene();
FindPlayerPed()->bIsVisible = true; FindPlayerPed()->bIsVisible = true;
@ -337,8 +336,7 @@ CCutsceneMgr::DeleteCutsceneData(void)
for (--ms_numCutsceneObjs; ms_numCutsceneObjs >= 0; ms_numCutsceneObjs--) { for (--ms_numCutsceneObjs; ms_numCutsceneObjs >= 0; ms_numCutsceneObjs--) {
CWorld::Remove(ms_pCutsceneObjects[ms_numCutsceneObjs]); CWorld::Remove(ms_pCutsceneObjects[ms_numCutsceneObjs]);
ms_pCutsceneObjects[ms_numCutsceneObjs]->DeleteRwObject(); ms_pCutsceneObjects[ms_numCutsceneObjs]->DeleteRwObject();
if (ms_pCutsceneObjects[ms_numCutsceneObjs]) delete ms_pCutsceneObjects[ms_numCutsceneObjs];
delete ms_pCutsceneObjects[ms_numCutsceneObjs];
} }
ms_numCutsceneObjs = 0; ms_numCutsceneObjs = 0;
@ -397,7 +395,7 @@ CCutsceneMgr::Update(void)
if (!ms_running) return; if (!ms_running) return;
ms_cutsceneTimer += CTimer::GetTimeStepNonClipped() * 0.02; ms_cutsceneTimer += CTimer::GetTimeStepNonClipped() * 0.02f;
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()
|| (CGame::playingIntro && CPad::GetPad(0)->GetStartJustDown()) || (CGame::playingIntro && CPad::GetPad(0)->GetStartJustDown())
@ -408,7 +406,7 @@ CCutsceneMgr::Update(void)
} }
} }
bool CCutsceneMgr::HasCutsceneFinished(void) { return TheCamera.GetPositionAlongSpline() == 1.0; } bool CCutsceneMgr::HasCutsceneFinished(void) { return TheCamera.GetPositionAlongSpline() == 1.0f; }
STARTPATCHES STARTPATCHES
InjectHook(0x4045D0, &CCutsceneMgr::Initialise, PATCH_JUMP); InjectHook(0x4045D0, &CCutsceneMgr::Initialise, PATCH_JUMP);