From 643f8e14a08130565defb863e30b670c10720e5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?eray=20or=C3=A7unus?= <erayorcunus@gmail.com>
Date: Thu, 12 Sep 2019 15:35:05 +0300
Subject: Little cleanup

---
 src/peds/Ped.cpp | 11 ++++++-----
 src/peds/Ped.h   |  8 ++++----
 2 files changed, 10 insertions(+), 9 deletions(-)

(limited to 'src/peds')

diff --git a/src/peds/Ped.cpp b/src/peds/Ped.cpp
index 5f010b20..5ca9a030 100644
--- a/src/peds/Ped.cpp
+++ b/src/peds/Ped.cpp
@@ -500,7 +500,7 @@ CPed::CPed(uint32 pedType) : m_pedIK(this)
 	m_ped_flagG4 = false;
 	bStartWanderPathOnFoot = false;
 	m_ped_flagG10 = false;
-	m_ped_flagG20 = false;
+	bBusJacked = false;
 	m_ped_flagG40 = false;
 	bFadeOut = false;
 
@@ -509,7 +509,7 @@ CPed::CPed(uint32 pedType) : m_pedIK(this)
 	m_ped_flagH4 = false;
 	bClearObjective = false;
 	m_ped_flagH10 = false;
-	m_ped_flagH20 = false;
+	bCollidedWithMyVehicle = false;
 	m_ped_flagH40 = false;
 	m_ped_flagH80 = false;
 
@@ -8872,7 +8872,7 @@ CPed::ProcessControl(void)
 		if (m_fHealth <= 1.0f && m_nPedState <= PED_STATES_NO_AI && !bIsInTheAir && !bIsLanding)
 			SetDie(ANIM_KO_SHOT_FRONT1, 4.0f, 0.0f);
 
-		m_ped_flagH20 = false;
+		bCollidedWithMyVehicle = false;
 
 		CEntity *collidingEnt = m_pDamageEntity;
 		if (!bUsesCollision || m_fDamageImpulse <= 0.0f || m_nPedState == PED_DIE || !collidingEnt) {
@@ -9100,7 +9100,7 @@ CPed::ProcessControl(void)
 					float collidingVehSpeedSqr = collidingVeh->m_vecMoveSpeed.MagnitudeSqr();
 
 					if (collidingVeh == m_pMyVehicle)
-						m_ped_flagH20 = true;
+						bCollidedWithMyVehicle = true;
 
 					if (collidingVehSpeedSqr <= 1.0f / 400.0f) {
 						if (!IsPedInControl()
@@ -10219,7 +10219,7 @@ CPed::PedAnimGetInCB(CAnimBlendAssociation *animAssoc, void *arg)
 					veh->bIsHandbrakeOn = true;
 					veh->m_status = STATUS_PLAYER_DISABLED;
 				}
-				driver->m_ped_flagG20 = true;
+				driver->bBusJacked = true;
 				veh->m_veh_flagC10 = false;
 				PedSetInCarCB(nil, ped);
 				if (ped->m_nPedType == PEDTYPE_COP
@@ -10456,6 +10456,7 @@ CPed::PedAnimStepOutCarCB(CAnimBlendAssociation* animAssoc, void* arg)
 	}
 
 	if (ped->m_ped_flagE80 || ped->m_ped_flagG40) {
+		// POTENTIAL BUG? Why DOOR_FRONT_LEFT instead of door variable? or vice versa?
 		if (!veh->IsDoorMissing(door))
 			((CAutomobile*)veh)->Damage.SetDoorStatus(DOOR_FRONT_LEFT, DOOR_STATUS_SWINGING);
 	} else {
diff --git a/src/peds/Ped.h b/src/peds/Ped.h
index 2808824f..2a745436 100644
--- a/src/peds/Ped.h
+++ b/src/peds/Ped.h
@@ -304,7 +304,7 @@ public:
 	uint8 bIsDucking : 1;
 	uint8 bGetUpAnimStarted : 1;
 	uint8 bDoBloodyFootprints : 1;
-	uint8 m_ped_flagE80 : 1;
+	uint8 m_ped_flagE80 : 1; // bDontDragMeOutCar? bStayInCarOnJack?
 
 	uint8 bWanderPathAfterExitingCar : 1;
 	uint8 m_ped_flagF2 : 1;
@@ -320,8 +320,8 @@ public:
 	uint8 m_ped_flagG4 : 1;
 	uint8 bStartWanderPathOnFoot : 1; // exits the car if he's in it, reset after path found
 	uint8 m_ped_flagG10 : 1;
-	uint8 m_ped_flagG20 : 1;
-	uint8 m_ped_flagG40 : 1;
+	uint8 bBusJacked : 1;
+	uint8 m_ped_flagG40 : 1; // had to exit car due to someone jacked it from RF door
 	uint8 bFadeOut : 1;
 
 	uint8 m_ped_flagH1 : 1;
@@ -329,7 +329,7 @@ public:
 	uint8 m_ped_flagH4 : 1;
 	uint8 bClearObjective : 1;
 	uint8 m_ped_flagH10 : 1;
-	uint8 m_ped_flagH20 : 1; // set if our own vehicle damaged us. I don't know how is that possible
+	uint8 bCollidedWithMyVehicle : 1;
 	uint8 m_ped_flagH40 : 1;
 	uint8 m_ped_flagH80 : 1;
 
-- 
cgit v1.2.3