diff options
| author | aap <aap@papnet.eu> | 2020-05-09 21:18:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-09 21:18:00 +0200 |
| commit | e4683a30741f9528aa0f62fc259660b66c53bbec (patch) | |
| tree | 38b775b96a2f1bc3ef0020275bf6c18a5a0c310b /src/vehicles | |
| parent | back to ped.ifp (diff) | |
| parent | new curves + boat fix (diff) | |
| download | re3-e4683a30741f9528aa0f62fc259660b66c53bbec.tar re3-e4683a30741f9528aa0f62fc259660b66c53bbec.tar.gz re3-e4683a30741f9528aa0f62fc259660b66c53bbec.tar.bz2 re3-e4683a30741f9528aa0f62fc259660b66c53bbec.tar.lz re3-e4683a30741f9528aa0f62fc259660b66c53bbec.tar.xz re3-e4683a30741f9528aa0f62fc259660b66c53bbec.tar.zst re3-e4683a30741f9528aa0f62fc259660b66c53bbec.zip | |
Diffstat (limited to 'src/vehicles')
| -rw-r--r-- | src/vehicles/Boat.cpp | 2 | ||||
| -rw-r--r-- | src/vehicles/Vehicle.cpp | 1 | ||||
| -rw-r--r-- | src/vehicles/Vehicle.h | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/src/vehicles/Boat.cpp b/src/vehicles/Boat.cpp index 87b8a212..5879717a 100644 --- a/src/vehicles/Boat.cpp +++ b/src/vehicles/Boat.cpp @@ -431,7 +431,7 @@ CBoat::ProcessControl(void) speedUp = pHandling->fBrakeDeceleration - m_vecMoveSpeed.z; if(speedUp < 0.0f) speedUp = 0.0f; float speedFwd = DotProduct(m_vecMoveSpeed, GetForward()); - speedFwd *= -m_nDeltaVolumeUnderWater * 0.01f * pHandling->fTractionLoss; + speedFwd *= -m_nDeltaVolumeUnderWater * 0.01f * pHandling->fBrakeBias; CVector speed = speedFwd*GetForward() + CVector(0.0f, 0.0f, speedUp); CVector splashImpulse = speed * m_fMass; ApplyMoveForce(splashImpulse); diff --git a/src/vehicles/Vehicle.cpp b/src/vehicles/Vehicle.cpp index 1cf41435..496a72de 100644 --- a/src/vehicles/Vehicle.cpp +++ b/src/vehicles/Vehicle.cpp @@ -55,6 +55,7 @@ CVehicle::CVehicle(uint8 CreatedBy) m_fSteerRatio = 0.0f; m_type = ENTITY_TYPE_VEHICLE; VehicleCreatedBy = CreatedBy; + m_nRouteSeed = 0; bIsLocked = false; bIsLawEnforcer = false; bIsAmbulanceOnDuty = false; diff --git a/src/vehicles/Vehicle.h b/src/vehicles/Vehicle.h index 7711e445..c03e9209 100644 --- a/src/vehicles/Vehicle.h +++ b/src/vehicles/Vehicle.h @@ -132,7 +132,7 @@ public: uint8 m_currentColour2; uint8 m_aExtras[2]; int16 m_nAlarmState; - int16 m_nMissionValue; + int16 m_nRouteSeed; CPed *pDriver; CPed *pPassengers[8]; uint8 m_nNumPassengers; |