diff options
| author | Roman Masanin <36927roma@gmail.com> | 2020-11-08 16:23:05 +0300 |
|---|---|---|
| committer | Roman Masanin <36927roma@gmail.com> | 2020-11-08 16:23:05 +0300 |
| commit | 23d23f646273db1a9b6f287110557d83d0a9c5c9 (patch) | |
| tree | 53350895edf7e286180ca226bdef019db089fc5d /src/vehicles | |
| parent | 89b622eea861f5566dc61d8d35fc72ea4bcb8f1d (diff) | |
| parent | a2e0373d225b7826375939e74deff7d6bb6a32ef (diff) | |
merge upstream
Diffstat (limited to 'src/vehicles')
| -rw-r--r-- | src/vehicles/Bike.cpp | 2 | ||||
| -rw-r--r-- | src/vehicles/Boat.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/vehicles/Bike.cpp b/src/vehicles/Bike.cpp index 4a4b0516..b260c7d4 100644 --- a/src/vehicles/Bike.cpp +++ b/src/vehicles/Bike.cpp @@ -792,7 +792,7 @@ CBike::ProcessControl(void) CSurfaceTable::GetAdhesionGroup(m_aWheelColPoints[rearLine].surfaceB) == ADHESIVE_SAND) steer *= pBikeHandling->fSlipSteer; f = Asin(Min(steer/SQR(fwdSpeed), 1.0))/DEGTORAD(pHandling->fSteeringLock); - if(m_fSteerAngle < 0.0f && m_fLeanLRAngle < 0.0f && + if(m_fSteerAngle < 0.0f && m_fLeanLRAngle < 0.0f || m_fSteerAngle > 0.0f && m_fLeanLRAngle > 0.0f) f *= 2.0f; f = Min(f, 1.0f); diff --git a/src/vehicles/Boat.cpp b/src/vehicles/Boat.cpp index 8b5de929..239cb9a1 100644 --- a/src/vehicles/Boat.cpp +++ b/src/vehicles/Boat.cpp @@ -1,4 +1,4 @@ -#include "common.h" +#include "common.h" #include "General.h" #include "Timecycle.h" @@ -145,7 +145,7 @@ CBoat::ProcessControl(void) AutoPilot.m_nCarMission == MISSION_BLOCKPLAYER_CLOSE || AutoPilot.m_nCarMission == MISSION_ATTACKPLAYER) && CTimer::GetTimeInMilliseconds() > m_nPoliceShoutTimer){ - DMAudio.PlayOneShot(m_audioEntityId, SOUND_115, 0.0f); + DMAudio.PlayOneShot(m_audioEntityId, SOUND_PED_VCPA_PLAYER_FOUND, 0.0f); m_nPoliceShoutTimer = CTimer::GetTimeInMilliseconds() + 4500 + (CGeneral::GetRandomNumber()&0xFFF); } } |