diff options
| author | aap <aap@papnet.eu> | 2020-11-24 15:18:39 +0100 |
|---|---|---|
| committer | aap <aap@papnet.eu> | 2020-11-24 15:18:39 +0100 |
| commit | 1906a08f7220cb90d136b0a0e4d2e18e0c7ef5eb (patch) | |
| tree | cfe9909a898951fdf4d2bfc7f2339aeed0ea0bc3 /src/core/Camera.cpp | |
| parent | Script commands split to original files (diff) | |
| download | re3-1906a08f7220cb90d136b0a0e4d2e18e0c7ef5eb.tar re3-1906a08f7220cb90d136b0a0e4d2e18e0c7ef5eb.tar.gz re3-1906a08f7220cb90d136b0a0e4d2e18e0c7ef5eb.tar.bz2 re3-1906a08f7220cb90d136b0a0e4d2e18e0c7ef5eb.tar.lz re3-1906a08f7220cb90d136b0a0e4d2e18e0c7ef5eb.tar.xz re3-1906a08f7220cb90d136b0a0e4d2e18e0c7ef5eb.tar.zst re3-1906a08f7220cb90d136b0a0e4d2e18e0c7ef5eb.zip | |
Diffstat (limited to 'src/core/Camera.cpp')
| -rw-r--r-- | src/core/Camera.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/core/Camera.cpp b/src/core/Camera.cpp index 2fa81d24..68771f64 100644 --- a/src/core/Camera.cpp +++ b/src/core/Camera.cpp @@ -1008,7 +1008,8 @@ CCamera::CamControl(void) ReqMode = CCam::MODE_FOLLOWPED; // Check 1st person mode - if(m_bLookingAtPlayer && pTargetEntity->IsPed() && !m_WideScreenOn && !Cams[0].Using3rdPersonMouseCam() + if((m_bLookingAtPlayer || m_bEnable1rstPersonCamCntrlsScript) && pTargetEntity->IsPed() && + (!m_WideScreenOn || m_bEnable1rstPersonCamCntrlsScript) && !Cams[0].Using3rdPersonMouseCam() #ifdef FREE_CAM && !CCamera::bFreeCam #endif @@ -1024,6 +1025,8 @@ CCamera::CamControl(void) CPad::GetPad(0)->GetCross() || CPad::GetPad(0)->GetCircle() || CTimer::GetTimeInMilliseconds() - m_uiFirstPersonCamLastInputTime > 2850.0f){ m_bFirstPersonBeingUsed = false; + }else if(CPad::GetPad(0)->TargetJustDown()){ + m_bFirstPersonBeingUsed = false; m_bJustJumpedOutOf1stPersonBecauseOfTarget = true; } } |