summaryrefslogtreecommitdiffstats
path: root/src/core/Camera.cpp
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2021-01-18 20:19:30 +0100
committerNikolay Korolev <nickvnuk@gmail.com>2021-01-18 20:19:30 +0100
commitc09297997e9878f06e6cd513e26cbbe50ae860fb (patch)
tree810b97cfd49a9c3b43a3a3f1803d2e04f9c87ce9 /src/core/Camera.cpp
parentMerge branch 'lcs' into lcs-dev (diff)
downloadre3-c09297997e9878f06e6cd513e26cbbe50ae860fb.tar
re3-c09297997e9878f06e6cd513e26cbbe50ae860fb.tar.gz
re3-c09297997e9878f06e6cd513e26cbbe50ae860fb.tar.bz2
re3-c09297997e9878f06e6cd513e26cbbe50ae860fb.tar.lz
re3-c09297997e9878f06e6cd513e26cbbe50ae860fb.tar.xz
re3-c09297997e9878f06e6cd513e26cbbe50ae860fb.tar.zst
re3-c09297997e9878f06e6cd513e26cbbe50ae860fb.zip
Diffstat (limited to '')
-rw-r--r--src/core/Camera.cpp3
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;