diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2020-05-14 17:05:42 +0300 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2020-05-14 17:05:42 +0300 |
| commit | 24875f34d0e0b21bc6ebd3ec2e184463d28d1522 (patch) | |
| tree | 821cf46dd7aabd6af830462a36fac0e3ed062c5c /src/vehicles/Boat.cpp | |
| parent | 41e9754338c3496a9caa8fc67f892cf043713293 (diff) | |
| parent | 2fb4305a73c2aa1972daf1037189b2bc5b25ea34 (diff) | |
Merge branch 'master' into miami
# Conflicts:
# src/modelinfo/ClumpModelInfo.cpp
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) |