summaryrefslogtreecommitdiffstats
path: root/src/vehicles/Bike.cpp
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2020-06-15 22:51:47 +0200
committeraap <aap@papnet.eu>2020-06-15 22:51:47 +0200
commitdc7d4e113495fbb53dc9ebc404e9dbfe22b8eedc (patch)
treecd99240de1f87a71af0e7f5938f36fd5f7d77a8c /src/vehicles/Bike.cpp
parentmore CCam (diff)
parentMerge branch 'miami' of https://github.com/GTAmodding/re3 into miami (diff)
downloadre3-dc7d4e113495fbb53dc9ebc404e9dbfe22b8eedc.tar
re3-dc7d4e113495fbb53dc9ebc404e9dbfe22b8eedc.tar.gz
re3-dc7d4e113495fbb53dc9ebc404e9dbfe22b8eedc.tar.bz2
re3-dc7d4e113495fbb53dc9ebc404e9dbfe22b8eedc.tar.lz
re3-dc7d4e113495fbb53dc9ebc404e9dbfe22b8eedc.tar.xz
re3-dc7d4e113495fbb53dc9ebc404e9dbfe22b8eedc.tar.zst
re3-dc7d4e113495fbb53dc9ebc404e9dbfe22b8eedc.zip
Diffstat (limited to 'src/vehicles/Bike.cpp')
-rw-r--r--src/vehicles/Bike.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/vehicles/Bike.cpp b/src/vehicles/Bike.cpp
index 01b489b2..6f52c33f 100644
--- a/src/vehicles/Bike.cpp
+++ b/src/vehicles/Bike.cpp
@@ -411,13 +411,13 @@ CBike::ProcessControl(void)
fDx = fDAxisXExtra;
if(!(m_aWheelTimer[BIKESUSP_R1] == 0.0f && m_aWheelTimer[BIKESUSP_R2] == 0.0f) &&
GetForward().z > 0.0f)
- res.x -= Max(0.25f*Abs(pBikeHandling->fWheelieAng-GetForward().z), 0.07f);
+ res.x -= Min(0.25f*Abs(pBikeHandling->fWheelieAng-GetForward().z), 0.07f);
else
res.x = fInAirXRes;
}else if(m_aWheelTimer[BIKESUSP_R1] == 0.0f && m_aWheelTimer[BIKESUSP_R2] == 0.0f){
fDx = fDAxisXExtra;
if(GetForward().z < 0.0f)
- res.x *= Max(0.3f*Abs(pBikeHandling->fStoppieAng-GetForward().z), 0.1f) + 0.9f;
+ res.x *= Min(0.3f*Abs(pBikeHandling->fStoppieAng-GetForward().z), 0.1f) + 0.9f;
}
}
@@ -1014,7 +1014,7 @@ CBike::ProcessControl(void)
m_vecAvgSurfaceRight.Normalise();
float lean;
if(m_nWheelsOnGround == 0)
- lean = -m_fSteerAngle/DEGTORAD(pHandling->fSteeringLock)*0.5f*GRAVITY*CTimer::GetTimeStep();
+ lean = -(m_fSteerAngle/DEGTORAD(pHandling->fSteeringLock))*0.5f*GRAVITY*CTimer::GetTimeStep();
else
lean = DotProduct(m_vecMoveSpeed-initialMoveSpeed, m_vecAvgSurfaceRight);
lean /= GRAVITY*Max(CTimer::GetTimeStep(), 0.01f);