summaryrefslogtreecommitdiffstats
path: root/src/core/Camera.cpp
diff options
context:
space:
mode:
authorerorcun <erorcunerorcun@hotmail.com.tr>2020-11-29 17:19:50 +0100
committererorcun <erorcunerorcun@hotmail.com.tr>2020-12-02 12:21:46 +0100
commitbd8b907d131ac9e5b471a0a31928849b95f5d1f0 (patch)
treeab3102ea352daf603903342baf4aa696d6cacf56 /src/core/Camera.cpp
parentsome nasty FIX_BUGS for SLIDE_OBJECT (diff)
downloadre3-bd8b907d131ac9e5b471a0a31928849b95f5d1f0.tar
re3-bd8b907d131ac9e5b471a0a31928849b95f5d1f0.tar.gz
re3-bd8b907d131ac9e5b471a0a31928849b95f5d1f0.tar.bz2
re3-bd8b907d131ac9e5b471a0a31928849b95f5d1f0.tar.lz
re3-bd8b907d131ac9e5b471a0a31928849b95f5d1f0.tar.xz
re3-bd8b907d131ac9e5b471a0a31928849b95f5d1f0.tar.zst
re3-bd8b907d131ac9e5b471a0a31928849b95f5d1f0.zip
Diffstat (limited to 'src/core/Camera.cpp')
-rw-r--r--src/core/Camera.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/core/Camera.cpp b/src/core/Camera.cpp
index 68771f64..e8e4a28b 100644
--- a/src/core/Camera.cpp
+++ b/src/core/Camera.cpp
@@ -1011,14 +1011,15 @@ CCamera::CamControl(void)
if((m_bLookingAtPlayer || m_bEnable1rstPersonCamCntrlsScript) && pTargetEntity->IsPed() &&
(!m_WideScreenOn || m_bEnable1rstPersonCamCntrlsScript) && !Cams[0].Using3rdPersonMouseCam()
#ifdef FREE_CAM
- && !CCamera::bFreeCam
+ && (!CCamera::bFreeCam || m_bEnable1rstPersonCamCntrlsScript)
#endif
){
// See if we want to enter first person mode
if(CPad::GetPad(0)->LookAroundLeftRight() || CPad::GetPad(0)->LookAroundUpDown()){
m_uiFirstPersonCamLastInputTime = CTimer::GetTimeInMilliseconds();
m_bFirstPersonBeingUsed = true;
- }else if(m_bFirstPersonBeingUsed){
+ }
+ if(m_bFirstPersonBeingUsed){
// Or if we want to go back to 3rd person
if(CPad::GetPad(0)->GetPedWalkLeftRight() || CPad::GetPad(0)->GetPedWalkUpDown() ||
CPad::GetPad(0)->GetSquare() || CPad::GetPad(0)->GetTriangle() ||
@@ -1701,7 +1702,7 @@ CCamera::CamControl(void)
StartTransitionWhenNotFinishedInter(ReqMode);
pTargetEntity->RegisterReference(&pTargetEntity);
Cams[ActiveCam].CamTargetEntity->RegisterReference(&Cams[ActiveCam].CamTargetEntity);
- }else if(m_bStartInterScript && m_iTypeOfSwitch == JUMP_CUT){
+ }else if(m_bStartInterScript && m_iTypeOfSwitch == JUMP_CUT || jumpCutTo1stPrs){
m_uiTransitionState = 0;
m_vecDoingSpecialInterPolation = false;
if(m_bEnable1rstPersonCamCntrlsScript && ReqMode == CCam::MODE_1STPERSON)