From 0d3e6a3dce52b72f7e6ab47df0cf501ec019e6fd Mon Sep 17 00:00:00 2001
From: erorcun <erorcunerorcun@hotmail.com.tr>
Date: Tue, 5 Jan 2021 04:41:24 +0300
Subject: [PATCH] Vehicle: Automobile: more pointless fixes

---
 src/vehicles/Automobile.cpp | 4 ++--
 src/vehicles/Vehicle.cpp    | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/vehicles/Automobile.cpp b/src/vehicles/Automobile.cpp
index db99c0de..a946bacb 100644
--- a/src/vehicles/Automobile.cpp
+++ b/src/vehicles/Automobile.cpp
@@ -260,6 +260,7 @@ CAutomobile::ProcessControl(void)
 	int i;
 	float wheelRot;
 	CColModel *colModel;
+	float brake = 0.0f;
 
 	if(bUsingSpecialColModel)
 		colModel = &CWorld::Players[CWorld::PlayerInFocus].m_ColModel;
@@ -450,7 +451,7 @@ CAutomobile::ProcessControl(void)
 			m_fBrakePedal = 1.0f;
 			m_fGasPedal = 0.0f;
 		}
-		if(CPad::GetPad(0)->WeaponJustDown())
+		if(CPad::GetPad(0)->CarGunJustDown())
 			ActivateBomb();
 		break;
 
@@ -682,7 +683,6 @@ CAutomobile::ProcessControl(void)
 		   AutoPilot.m_nCarMission == MISSION_PLANE_FLYTOCOORS)
 			skipPhysics = true;
 
-	float brake;
 	if(skipPhysics){
 		bHasContacted = false;
 		bIsInSafePosition = false;
diff --git a/src/vehicles/Vehicle.cpp b/src/vehicles/Vehicle.cpp
index 06a545ef..1849fd7f 100644
--- a/src/vehicles/Vehicle.cpp
+++ b/src/vehicles/Vehicle.cpp
@@ -149,6 +149,7 @@ CVehicle::CVehicle(uint8 CreatedBy)
 	m_nAlarmState = 0;
 	m_nDoorLock = CARLOCK_UNLOCKED;
 	m_nLastWeaponDamage = -1;
+	m_pLastDamageEntity = nil;
 	m_fMapObjectHeightAhead = m_fMapObjectHeightBehind = 0.0f;
 	m_audioEntityId = DMAudio.CreateEntity(AUDIOTYPE_PHYSICAL, this);
 	if(m_audioEntityId >= 0)
@@ -839,7 +840,7 @@ CVehicle::ProcessWheel(CVector &wheelFwd, CVector &wheelRight, CVector &wheelCon
 				if(IsBike())
 					brake = 0.6f * mod_HandlingManager.fWheelFriction / (pHandling->fMass + 200.0f);
 				else if(pHandling->fMass < 500.0f)
-					brake = mod_HandlingManager.fWheelFriction / pHandling->fMass;
+					brake = 0.2f * mod_HandlingManager.fWheelFriction / pHandling->fMass;
 				else if(GetModelIndex() == MI_RCBANDIT)
 					brake = 0.2f * mod_HandlingManager.fWheelFriction / pHandling->fMass;
 				else