mirror of
https://git.rip/DMCA_FUCKER/re3.git
synced 2024-12-24 18:00:01 +00:00
Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami
This commit is contained in:
commit
6cc39e9bdb
|
@ -601,7 +601,7 @@ CBike::ProcessControl(void)
|
||||||
m_aSuspensionSpringRatio[i] = 1.0f;
|
m_aSuspensionSpringRatio[i] = 1.0f;
|
||||||
else if(m_wheelStatus[i/2] == WHEEL_STATUS_BURST){
|
else if(m_wheelStatus[i/2] == WHEEL_STATUS_BURST){
|
||||||
// wheel more bumpy the faster we are
|
// 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;
|
rnd = CGeneral::GetRandomNumberInRange(0, (uint16)(40*fwdSpeed) + 98) < 100;
|
||||||
if(rnd){
|
if(rnd){
|
||||||
m_aSuspensionSpringRatio[i] += 0.3f*(m_aSuspensionLineLength[i]-m_aSuspensionSpringLength[i])/m_aSuspensionSpringLength[i];
|
m_aSuspensionSpringRatio[i] += 0.3f*(m_aSuspensionLineLength[i]-m_aSuspensionSpringLength[i])/m_aSuspensionSpringLength[i];
|
||||||
|
@ -711,7 +711,7 @@ CBike::ProcessControl(void)
|
||||||
fwdSpeed = DotProduct(m_vecMoveSpeed, GetForward());
|
fwdSpeed = DotProduct(m_vecMoveSpeed, GetForward());
|
||||||
if(!CVehicle::bCheat3)
|
if(!CVehicle::bCheat3)
|
||||||
gripCheat = false;
|
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;
|
acceleration /= m_fForceMultiplier;
|
||||||
|
|
||||||
brake = m_fBrakePedal * pHandling->fBrakeDeceleration * CTimer::GetTimeStep();
|
brake = m_fBrakePedal * pHandling->fBrakeDeceleration * CTimer::GetTimeStep();
|
||||||
|
|
Loading…
Reference in a new issue