From 89be27734b6c51339cdb29b508954d990ac948c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?eray=20or=C3=A7unus?= <erayorcunus@gmail.com>
Date: Thu, 13 Feb 2020 23:34:36 +0300
Subject: a fix

---
 src/peds/Ped.cpp       |  2 +-
 src/peds/PlayerPed.cpp | 22 +++++++++++-----------
 src/peds/PlayerPed.h   |  2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'src')

diff --git a/src/peds/Ped.cpp b/src/peds/Ped.cpp
index 543dae57..44aaae5b 100644
--- a/src/peds/Ped.cpp
+++ b/src/peds/Ped.cpp
@@ -4534,7 +4534,7 @@ CPed::SetEvasiveDive(CPhysical *reason, uint8 onlyRandomJump)
 		}
 	} else {
 		if (IsPlayer()) {
-			((CPlayerPed*)this)->m_bShouldEvade = 5;
+			((CPlayerPed*)this)->m_nEvadeAmount = 5;
 			((CPlayerPed*)this)->m_pEvadingFrom = reason;
 			reason->RegisterReference((CEntity**) &((CPlayerPed*)this)->m_pEvadingFrom);
 			return;
diff --git a/src/peds/PlayerPed.cpp b/src/peds/PlayerPed.cpp
index 78a1de99..22ebefe0 100644
--- a/src/peds/PlayerPed.cpp
+++ b/src/peds/PlayerPed.cpp
@@ -36,7 +36,7 @@ CPlayerPed::CPlayerPed(void) : CPed(PEDTYPE_PLAYER1)
 	m_fMaxStamina = 150.0f;
 	m_fCurrentStamina = m_fMaxStamina;
 	m_fStaminaProgress = 0.0f;
-	m_bShouldEvade = false;
+	m_nEvadeAmount = 0;
 	field_1367 = 0;
 	m_nShotDelay = 0;
 	field_1376 = 0.0f;
@@ -230,7 +230,7 @@ CPlayerPed::SetInitialState(void)
 	m_animGroup = ASSOCGRP_PLAYER;
 	m_fMoveSpeed = 0.0f;
 	m_nSelectedWepSlot = WEAPONTYPE_UNARMED;
-	m_bShouldEvade = false;
+	m_nEvadeAmount = 0;
 	m_pEvadingFrom = nil;
 	bIsPedDieAnimPlaying = false;
 	SetRealMoveAnim();
@@ -661,9 +661,9 @@ CPlayerPed::PlayerControlFighter(CPad *padUsed)
 	}
 
 	if (!CWeaponInfo::GetWeaponInfo(GetWeapon()->m_eWeaponType)->m_bHeavy && padUsed->JumpJustDown()) {
-		if (m_bShouldEvade && m_pEvadingFrom) {
+		if (m_nEvadeAmount != 0 && m_pEvadingFrom) {
 			SetEvasiveDive((CPhysical*)m_pEvadingFrom, 1);
-			m_bShouldEvade = false;
+			m_nEvadeAmount = 0;
 			m_pEvadingFrom = nil;
 		} else {
 			SetJump();
@@ -710,9 +710,9 @@ CPlayerPed::PlayerControl1stPersonRunAround(CPad *padUsed)
 		&& padUsed->JumpJustDown() && m_nPedState != PED_JUMP) {
 		ClearAttack();
 		ClearWeaponTarget();
-		if (m_bShouldEvade && m_pEvadingFrom) {
+		if (m_nEvadeAmount != 0 && m_pEvadingFrom) {
 			SetEvasiveDive((CPhysical*)m_pEvadingFrom, 1);
-			m_bShouldEvade = false;
+			m_nEvadeAmount = 0;
 			m_pEvadingFrom = nil;
 		} else {
 			SetJump();
@@ -1129,9 +1129,9 @@ CPlayerPed::PlayerControlZelda(CPad *padUsed)
 		&& padUsed->JumpJustDown() && m_nPedState != PED_JUMP) {
 		ClearAttack();
 		ClearWeaponTarget();
-		if (m_bShouldEvade && m_pEvadingFrom) {
+		if (m_nEvadeAmount != 0 && m_pEvadingFrom) {
 			SetEvasiveDive((CPhysical*)m_pEvadingFrom, 1);
-			m_bShouldEvade = false;
+			m_nEvadeAmount = 0;
 			m_pEvadingFrom = nil;
 		} else {
 			SetJump();
@@ -1142,10 +1142,10 @@ CPlayerPed::PlayerControlZelda(CPad *padUsed)
 void
 CPlayerPed::ProcessControl(void)
 {
-	if (m_bShouldEvade)
-		m_bShouldEvade = false;  //--m_bShouldEvade;
+	if (m_nEvadeAmount != 0)
+		--m_nEvadeAmount;
 
-	if (!m_bShouldEvade)
+	if (m_nEvadeAmount == 0)
 		m_pEvadingFrom = nil;
 
 	if (m_pCurrentPhysSurface && m_pCurrentPhysSurface->IsVehicle() && ((CVehicle*)m_pCurrentPhysSurface)->IsBoat()) {
diff --git a/src/peds/PlayerPed.h b/src/peds/PlayerPed.h
index 0da15412..b27cd983 100644
--- a/src/peds/PlayerPed.h
+++ b/src/peds/PlayerPed.h
@@ -15,7 +15,7 @@ public:
 	float m_fStaminaProgress;
 	int8 m_nSelectedWepSlot;	// eWeaponType
 	bool m_bSpeedTimerFlag;
-	bool m_bShouldEvade;
+	uint8 m_nEvadeAmount;
 	int8 field_1367;
 	uint32 m_nSpeedTimer;
 	int32 m_nShotDelay;
-- 
cgit v1.2.3