diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-05-14 13:01:24 +0200 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-05-14 13:01:24 +0200 |
| commit | 9d4d83db0d9b9bd2921972a030a0c53566688fbb (patch) | |
| tree | 6e25a7d88c3afb2afb07a4025da316d2b3d0c945 /src/vehicles/Boat.cpp | |
| parent | fixed skinned cutscene head (diff) | |
| download | re3-9d4d83db0d9b9bd2921972a030a0c53566688fbb.tar re3-9d4d83db0d9b9bd2921972a030a0c53566688fbb.tar.gz re3-9d4d83db0d9b9bd2921972a030a0c53566688fbb.tar.bz2 re3-9d4d83db0d9b9bd2921972a030a0c53566688fbb.tar.lz re3-9d4d83db0d9b9bd2921972a030a0c53566688fbb.tar.xz re3-9d4d83db0d9b9bd2921972a030a0c53566688fbb.tar.zst re3-9d4d83db0d9b9bd2921972a030a0c53566688fbb.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 d992d190..72fca542 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) |