From 464b232321ea50cc926b6b15c540832cd68aefb7 Mon Sep 17 00:00:00 2001 From: aap Date: Sun, 7 Jun 2020 17:27:23 +0200 Subject: [PATCH 1/2] accidental shadowing in CBike::ProcessControl --- src/vehicles/Bike.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vehicles/Bike.cpp b/src/vehicles/Bike.cpp index 74dd376b..0254247e 100644 --- a/src/vehicles/Bike.cpp +++ b/src/vehicles/Bike.cpp @@ -711,7 +711,7 @@ CBike::ProcessControl(void) fwdSpeed = DotProduct(m_vecMoveSpeed, GetForward()); if(!CVehicle::bCheat3) gripCheat = false; - float acceleration = pHandling->Transmission.CalculateDriveAcceleration(m_fGasPedal, m_nCurrentGear, m_fChangeGearTime, fwdSpeed, gripCheat); + acceleration = pHandling->Transmission.CalculateDriveAcceleration(m_fGasPedal, m_nCurrentGear, m_fChangeGearTime, fwdSpeed, gripCheat); acceleration /= m_fForceMultiplier; brake = m_fBrakePedal * pHandling->fBrakeDeceleration * CTimer::GetTimeStep(); From dda9d03e5486793082dd75e50de419c51a096656 Mon Sep 17 00:00:00 2001 From: aap Date: Sun, 7 Jun 2020 17:35:22 +0200 Subject: [PATCH 2/2] nother bike bug --- src/vehicles/Bike.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vehicles/Bike.cpp b/src/vehicles/Bike.cpp index 0254247e..252f1b87 100644 --- a/src/vehicles/Bike.cpp +++ b/src/vehicles/Bike.cpp @@ -601,7 +601,7 @@ CBike::ProcessControl(void) m_aSuspensionSpringRatio[i] = 1.0f; else if(m_wheelStatus[i/2] == WHEEL_STATUS_BURST){ // wheel more bumpy the faster we are - if(i == BIKESUSP_F1 || BIKESUSP_R1) + if(i == BIKESUSP_F1 || i == BIKESUSP_R1) rnd = CGeneral::GetRandomNumberInRange(0, (uint16)(40*fwdSpeed) + 98) < 100; if(rnd){ m_aSuspensionSpringRatio[i] += 0.3f*(m_aSuspensionLineLength[i]-m_aSuspensionSpringLength[i])/m_aSuspensionSpringLength[i];