diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2021-01-18 20:20:44 +0100 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2021-01-18 20:20:44 +0100 |
| commit | 4f36a1fb770653f26dd4fb3f89a6596015fbb4af (patch) | |
| tree | acefb8b0fb1d2ffbf2136e643d327a54a6b27a01 /src/core/Camera.cpp | |
| parent | Merge remote-tracking branch 'upstream/lcs' into lcs (diff) | |
| download | re3-4f36a1fb770653f26dd4fb3f89a6596015fbb4af.tar re3-4f36a1fb770653f26dd4fb3f89a6596015fbb4af.tar.gz re3-4f36a1fb770653f26dd4fb3f89a6596015fbb4af.tar.bz2 re3-4f36a1fb770653f26dd4fb3f89a6596015fbb4af.tar.lz re3-4f36a1fb770653f26dd4fb3f89a6596015fbb4af.tar.xz re3-4f36a1fb770653f26dd4fb3f89a6596015fbb4af.tar.zst re3-4f36a1fb770653f26dd4fb3f89a6596015fbb4af.zip | |
Diffstat (limited to 'src/core/Camera.cpp')
| -rw-r--r-- | src/core/Camera.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/Camera.cpp b/src/core/Camera.cpp index 992c7d74..32aa7850 100644 --- a/src/core/Camera.cpp +++ b/src/core/Camera.cpp @@ -114,6 +114,7 @@ CCamera::Init(void) m_1rstPersonRunCloseToAWall = false; m_fPositionAlongSpline = 0.0f; m_bCameraJustRestored = false; + m_bFreezePedZoomSwitch = false; Cams[0].Init(); Cams[1].Init(); Cams[2].Init(); @@ -985,7 +986,7 @@ CCamera::CamControl(void) // Change user selected mode if(CPad::GetPad(0)->CycleCameraModeUpJustDown() && !CReplay::IsPlayingBack() && (m_bLookingAtPlayer || WhoIsInControlOfTheCamera == CAMCONTROL_OBBE) && - !m_WideScreenOn && !m_bFailedCullZoneTestPreviously && !m_bFirstPersonBeingUsed){ + !m_WideScreenOn && !m_bFailedCullZoneTestPreviously && !m_bFirstPersonBeingUsed && !m_bFreezePedZoomSwitch){ if(FrontEndMenuManager.m_ControlMethod == CONTROL_STANDARD){ if(PedZoomIndicator == CAM_ZOOM_3) PedZoomIndicator = CAM_ZOOM_1; |