summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorwithmorten <morten.with@gmail.com>2021-01-21 23:21:03 +0100
committerwithmorten <morten.with@gmail.com>2021-01-21 23:21:03 +0100
commita511d79bf056a8ff65d4687822dcba6185d9c7ef (patch)
tree680e9e8b555781c1982696e1fd7adc805bf0250c /src
parenthow the hell did that happen? (diff)
downloadre3-a511d79bf056a8ff65d4687822dcba6185d9c7ef.tar
re3-a511d79bf056a8ff65d4687822dcba6185d9c7ef.tar.gz
re3-a511d79bf056a8ff65d4687822dcba6185d9c7ef.tar.bz2
re3-a511d79bf056a8ff65d4687822dcba6185d9c7ef.tar.lz
re3-a511d79bf056a8ff65d4687822dcba6185d9c7ef.tar.xz
re3-a511d79bf056a8ff65d4687822dcba6185d9c7ef.tar.zst
re3-a511d79bf056a8ff65d4687822dcba6185d9c7ef.zip
Diffstat (limited to '')
-rw-r--r--src/core/Cam.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/core/Cam.cpp b/src/core/Cam.cpp
index 74de0ab7..f43ff57a 100644
--- a/src/core/Cam.cpp
+++ b/src/core/Cam.cpp
@@ -193,7 +193,7 @@ CCam::Process(void)
break;
case MODE_CAM_ON_A_STRING:
#ifdef FREE_CAM
- if(CCamera::bFreeCam)
+ if(CCamera::bFreeCam && !CVehicle::bCheat5)
Process_FollowCar_SA(CameraTarget, TargetOrientation, SpeedVar, TargetSpeedVar);
else
#endif
@@ -5039,11 +5039,15 @@ CCam::Process_FollowCar_SA(const CVector& CameraTarget, float TargetOrientation,
// Using GetCarGun(LR/UD) will give us same unprocessed RightStick value as SA
float stickX = -(pad->GetCarGunLeftRight());
- float stickY = pad->GetCarGunUpDown();
+ float stickY = -pad->GetCarGunUpDown();
// In SA this is for not let num2/num8 move camera when Keyboard & Mouse controls are used.
// if (CCamera::m_bUseMouse3rdPerson)
// stickY = 0.0f;
+#ifdef INVERT_LOOK_FOR_PAD
+ if (CPad::bInvertLook4Pad)
+ stickY = -stickY;
+#endif
float xMovement = Abs(stickX) * (FOV / 80.0f * 5.f / 70.f) * stickX * 0.007f * 0.007f;
float yMovement = Abs(stickY) * (FOV / 80.0f * 3.f / 70.f) * stickY * 0.007f * 0.007f;