diff options
| author | erorcun <erayorcunus@gmail.com> | 2020-12-02 12:35:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-02 12:35:06 +0100 |
| commit | 774aa1570fc4985b1a713b5979ffe16719a991c0 (patch) | |
| tree | cd49718c4ab2a9f3c899b7e6627055faa4b14406 /src/core/Camera.cpp | |
| parent | cam lod dist fix (diff) | |
| parent | PlayerPed and "Redefine controls" menu done, fixes (diff) | |
| download | re3-774aa1570fc4985b1a713b5979ffe16719a991c0.tar re3-774aa1570fc4985b1a713b5979ffe16719a991c0.tar.gz re3-774aa1570fc4985b1a713b5979ffe16719a991c0.tar.bz2 re3-774aa1570fc4985b1a713b5979ffe16719a991c0.tar.lz re3-774aa1570fc4985b1a713b5979ffe16719a991c0.tar.xz re3-774aa1570fc4985b1a713b5979ffe16719a991c0.tar.zst re3-774aa1570fc4985b1a713b5979ffe16719a991c0.zip | |
Diffstat (limited to 'src/core/Camera.cpp')
| -rw-r--r-- | src/core/Camera.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/core/Camera.cpp b/src/core/Camera.cpp index 06e72dfc..a6cf71f1 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) |