diff options
author | aap <aap@papnet.eu> | 2020-05-14 14:39:23 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-05-14 14:39:23 +0200 |
commit | 704a5c158f110c14809c62e3cd35adf7029d2542 (patch) | |
tree | 492e7a68919f02d59169fbfc3d02ba2efede57d4 /src/vehicles/Boat.cpp | |
parent | fixed RotateTorso (diff) | |
parent | it works differently (diff) | |
download | re3-704a5c158f110c14809c62e3cd35adf7029d2542.tar re3-704a5c158f110c14809c62e3cd35adf7029d2542.tar.gz re3-704a5c158f110c14809c62e3cd35adf7029d2542.tar.bz2 re3-704a5c158f110c14809c62e3cd35adf7029d2542.tar.lz re3-704a5c158f110c14809c62e3cd35adf7029d2542.tar.xz re3-704a5c158f110c14809c62e3cd35adf7029d2542.tar.zst re3-704a5c158f110c14809c62e3cd35adf7029d2542.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) |