From 6b33765891904c0f4bf881da49545c0d7745e030 Mon Sep 17 00:00:00 2001
From: erorcun <erorcunerorcun@hotmail.com.tr>
Date: Mon, 21 Dec 2020 02:06:00 +0300
Subject: [PATCH] Car entering cancel test

---
 src/peds/Ped.cpp | 84 ++++++++++++++++++++++++------------------------
 1 file changed, 42 insertions(+), 42 deletions(-)

diff --git a/src/peds/Ped.cpp b/src/peds/Ped.cpp
index df78902f..ec56861e 100644
--- a/src/peds/Ped.cpp
+++ b/src/peds/Ped.cpp
@@ -2677,6 +2677,48 @@ CPed::ProcessControl(void)
 				}
 			}
 
+#ifdef CANCELLABLE_CAR_ENTER
+			static bool cancelJack = false;
+			if (IsPlayer()) {
+				if (EnteringCar() && m_pVehicleAnim) {
+					CPad *pad = CPad::GetPad(0);
+
+					if (!pad->ArePlayerControlsDisabled()) {
+						int vehAnim = m_pVehicleAnim->animId;
+
+						int16 padWalkX = pad->GetPedWalkLeftRight();
+						int16 padWalkY = pad->GetPedWalkUpDown();
+						if (Abs(padWalkX) > 0.0f || Abs(padWalkY) > 0.0f) {
+							if (vehAnim == ANIM_CAR_OPEN_LHS || vehAnim == ANIM_CAR_OPEN_RHS || vehAnim == ANIM_COACH_OPEN_L || vehAnim == ANIM_COACH_OPEN_R ||
+								vehAnim == ANIM_VAN_OPEN_L || vehAnim == ANIM_VAN_OPEN) {
+
+								if (!m_pMyVehicle->pDriver) {
+									cancelJack = false;
+									bCancelEnteringCar = true;
+								} else
+									cancelJack = true;
+							} else if (vehAnim == ANIM_CAR_QJACK && m_pVehicleAnim->GetTimeLeft() > 0.75f) {
+								cancelJack = true;
+							} else if (vehAnim == ANIM_CAR_PULLOUT_LHS || vehAnim == ANIM_CAR_PULLOUT_LOW_LHS || vehAnim == ANIM_CAR_PULLOUT_LOW_RHS || vehAnim == ANIM_CAR_PULLOUT_RHS) {
+								bCancelEnteringCar = true;
+								cancelJack = false;
+							}
+						}
+						if (cancelJack && vehAnim == ANIM_CAR_QJACK && m_pVehicleAnim->GetTimeLeft() > 0.75f && m_pVehicleAnim->GetTimeLeft() < 0.78f) {
+							cancelJack = false;
+							QuitEnteringCar();
+							RestorePreviousObjective();
+						}
+						if (cancelJack && (vehAnim == ANIM_CAR_PULLOUT_LHS || vehAnim == ANIM_CAR_PULLOUT_LOW_LHS || vehAnim == ANIM_CAR_PULLOUT_LOW_RHS || vehAnim == ANIM_CAR_PULLOUT_RHS)) {
+							cancelJack = false;
+							bCancelEnteringCar = true;
+						}
+					}
+				} else
+					cancelJack = false;
+			}
+#endif
+
 			switch (m_nPedState) {
 				case PED_IDLE:
 					Idle();
@@ -2694,49 +2736,7 @@ CPed::ProcessControl(void)
 					break;
 				case PED_ENTER_CAR:
 				case PED_CARJACK:
-				{
-#ifdef CANCELLABLE_CAR_ENTER
-					if (!IsPlayer() || !m_pVehicleAnim)
-						break;
-
-					CPad *pad = CPad::GetPad(0);
-
-					if (pad->ArePlayerControlsDisabled())
-						break;
-
-					int vehAnim = m_pVehicleAnim->animId;
-
-					static bool cancelJack = false;
-					int16 padWalkX = pad->GetPedWalkLeftRight();
-					int16 padWalkY = pad->GetPedWalkUpDown();
-					if (Abs(padWalkX) > 0.0f || Abs(padWalkY) > 0.0f) {
-						if (vehAnim == ANIM_CAR_OPEN_LHS || vehAnim == ANIM_CAR_OPEN_RHS || vehAnim == ANIM_COACH_OPEN_L || vehAnim == ANIM_COACH_OPEN_R ||
-							vehAnim == ANIM_VAN_OPEN_L || vehAnim == ANIM_VAN_OPEN) {
-
-							if (!m_pMyVehicle->pDriver) {
-								cancelJack = false;
-								bCancelEnteringCar = true;
-							} else
-								cancelJack = true;
-						} else if (vehAnim == ANIM_CAR_QJACK && m_pVehicleAnim->GetTimeLeft() > 0.75f) {
-							cancelJack = true;
-						} else if (vehAnim == ANIM_CAR_PULLOUT_LHS || vehAnim == ANIM_CAR_PULLOUT_LOW_LHS || vehAnim == ANIM_CAR_PULLOUT_LOW_RHS || vehAnim == ANIM_CAR_PULLOUT_RHS) {
-							bCancelEnteringCar = true;
-							cancelJack = false;
-						}
-					}
-					if (cancelJack && vehAnim == ANIM_CAR_QJACK && m_pVehicleAnim->GetTimeLeft() > 0.75f && m_pVehicleAnim->GetTimeLeft() < 0.78f) {
-						cancelJack = false;
-						QuitEnteringCar();
-						RestorePreviousObjective();
-					}
-					if (cancelJack && (vehAnim == ANIM_CAR_PULLOUT_LHS || vehAnim == ANIM_CAR_PULLOUT_LOW_LHS || vehAnim == ANIM_CAR_PULLOUT_LOW_RHS || vehAnim == ANIM_CAR_PULLOUT_RHS)) {
-						cancelJack = false;
-						bCancelEnteringCar = true;
-					}
-#endif
 					break;
-				}
 				case PED_FLEE_POS:
 					ms_vec2DFleePosition.x = m_fleeFromPosX;
 					ms_vec2DFleePosition.y = m_fleeFromPosY;