mirrors
/
re3
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge e59fe36cca into 3569b7edfe

This commit is contained in:
Anarky 2021-09-03 01:29:22 +03:00 committed by GitHub
parent 3569b7edfe e59fe36cca
commit 98a1a82da8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/animation/CutsceneMgr.cpp
View File

@ -20,6 +20,7 @@
#include "RpAnimBlend.h"
#include "ModelIndices.h"
#include "TempColModels.h"
#include "postfx.h"
const struct {
const char *szTrackName;
@ -129,6 +130,7 @@ CAnimBlendAssocGroup CCutsceneMgr::ms_cutsceneAssociations;
CVector CCutsceneMgr::ms_cutsceneOffset;
float CCutsceneMgr::ms_cutsceneTimer;
uint32 CCutsceneMgr::ms_cutsceneLoadStatus;
bool CCutsceneMgr::ms_blurSetting;
RpAtomic *
CalculateBoundingSphereRadiusCB(RpAtomic *atomic, void *data)
@ -232,6 +234,10 @@ CCutsceneMgr::LoadCutsceneData(const char *szCutsceneName)
pPlayerPed->m_fCurrentStamina = pPlayerPed->m_fMaxStamina;
CPad::GetPad(0)->SetDisablePlayerControls(PLAYERCONTROL_CUTSCENE);
CWorld::Players[CWorld::PlayerInFocus].MakePlayerSafe(true);
// save blur state and disable it
ms_blurSetting = CPostFX::MotionBlurOn;
CPostFX::MotionBlurOn = false;
}
void
@ -363,6 +369,7 @@ CCutsceneMgr::DeleteCutsceneData(void)
TheCamera.SetWideScreenOff();
ms_running = false;
ms_loaded = false;
CPostFX::MotionBlurOn = ms_blurSetting;
FindPlayerPed()->bIsVisible = true;
CPad::GetPad(0)->SetEnablePlayerControls(PLAYERCONTROL_CUTSCENE);

1
src/animation/CutsceneMgr.h
View File

@ -16,6 +16,7 @@ class CCutsceneMgr
static bool ms_loaded;
static bool ms_animLoaded;
static bool ms_useLodMultiplier;
static bool ms_blurSetting;
static char ms_cutsceneName[CUTSCENENAMESIZE];
static CAnimBlendAssocGroup ms_cutsceneAssociations;