From df4e22e3d010b3dd70e0f6add5764b7265370a12 Mon Sep 17 00:00:00 2001
From: withmorten <morten.with@gmail.com>
Date: Mon, 18 Jan 2021 17:25:31 +0100
Subject: some free cam fixes for controller

---
 src/core/Cam.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'src/core/Cam.cpp')

diff --git a/src/core/Cam.cpp b/src/core/Cam.cpp
index d8c66279..ed82b68e 100644
--- a/src/core/Cam.cpp
+++ b/src/core/Cam.cpp
@@ -5062,6 +5062,13 @@ CCam::Process_FollowCar_SA(const CVector& CameraTarget, float TargetOrientation,
 	float stickX = -(pad->GetCarGunLeftRight());
 	float stickY = pad->GetCarGunUpDown();
 
+	// In SA this checks for m_bUseMouse3rdPerson so num2 / num8 do not move camera
+	// when Keyboard & Mouse controls are used. To make it work better with III/VC, check for actual pad state instead
+	if (!CPad::IsAffectedByController && !isCar)
+		stickY = 0.0f;
+	else if (CPad::bInvertLook4Pad)
+		stickY = -stickY;
+
 	if (CCamera::m_bUseMouse3rdPerson)
 		stickY = 0.0f;
 
-- 
cgit v1.2.3