diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-05-14 21:29:23 +0200 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-05-14 21:29:23 +0200 |
| commit | 09a0207e55ac8a69639c85997c330ec0f7caf4a6 (patch) | |
| tree | f7784f9199ee39054ca94a1f6cf5de880c7c243f /src/vehicles/Boat.cpp | |
| parent | more pedattractor (diff) | |
| parent | Fix compilation (diff) | |
| download | re3-09a0207e55ac8a69639c85997c330ec0f7caf4a6.tar re3-09a0207e55ac8a69639c85997c330ec0f7caf4a6.tar.gz re3-09a0207e55ac8a69639c85997c330ec0f7caf4a6.tar.bz2 re3-09a0207e55ac8a69639c85997c330ec0f7caf4a6.tar.lz re3-09a0207e55ac8a69639c85997c330ec0f7caf4a6.tar.xz re3-09a0207e55ac8a69639c85997c330ec0f7caf4a6.tar.zst re3-09a0207e55ac8a69639c85997c330ec0f7caf4a6.zip | |
Diffstat (limited to 'src/vehicles/Boat.cpp')
| -rw-r--r-- | src/vehicles/Boat.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/vehicles/Boat.cpp b/src/vehicles/Boat.cpp index 2f056b02..784d859f 100644 --- a/src/vehicles/Boat.cpp +++ b/src/vehicles/Boat.cpp @@ -184,7 +184,11 @@ CBoat::ProcessControl(void) } float collisionDamage = pHandling->fCollisionDamageMultiplier * m_fDamageImpulse; +#ifdef FIX_BUGS + if (collisionDamage > 25.0f && GetStatus() != STATUS_WRECKED && m_fHealth >= 150.0f && !bCollisionProof) { +#else if(collisionDamage > 25.0f && GetStatus() != STATUS_WRECKED && m_fHealth >= 150.0f){ +#endif float prevHealth = m_fHealth; if(this == FindPlayerVehicle()){ if(bTakeLessDamage) |