summaryrefslogtreecommitdiffstats
path: root/src/vehicles
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2020-05-14 16:05:42 +0200
committerSergeanur <s.anureev@yandex.ua>2020-05-14 16:05:42 +0200
commit24875f34d0e0b21bc6ebd3ec2e184463d28d1522 (patch)
tree821cf46dd7aabd6af830462a36fac0e3ed062c5c /src/vehicles
parentfixed hanging boot (diff)
parentfixed hanging boot (diff)
downloadre3-24875f34d0e0b21bc6ebd3ec2e184463d28d1522.tar
re3-24875f34d0e0b21bc6ebd3ec2e184463d28d1522.tar.gz
re3-24875f34d0e0b21bc6ebd3ec2e184463d28d1522.tar.bz2
re3-24875f34d0e0b21bc6ebd3ec2e184463d28d1522.tar.lz
re3-24875f34d0e0b21bc6ebd3ec2e184463d28d1522.tar.xz
re3-24875f34d0e0b21bc6ebd3ec2e184463d28d1522.tar.zst
re3-24875f34d0e0b21bc6ebd3ec2e184463d28d1522.zip
Diffstat (limited to 'src/vehicles')
-rw-r--r--src/vehicles/Boat.cpp4
-rw-r--r--src/vehicles/Cranes.cpp2
2 files changed, 5 insertions, 1 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)
diff --git a/src/vehicles/Cranes.cpp b/src/vehicles/Cranes.cpp
index 764f9a7c..043f1c73 100644
--- a/src/vehicles/Cranes.cpp
+++ b/src/vehicles/Cranes.cpp
@@ -181,7 +181,7 @@ bool CCranes::IsThisCarPickedUp(float X, float Y, CVehicle* pVehicle)
for (int i = 0; i < NumCranes; i++) {
float distance = (CVector2D(X, Y) - aCranes[i].m_pCraneEntity->GetPosition()).Magnitude();
if (distance < MAX_DISTANCE_TO_FIND_CRANE && aCranes[i].m_pVehiclePickedUp == pVehicle) {
- if (aCranes[i].m_nCraneStatus == CCrane::LIFTING_TARGET || aCranes[i].m_nCraneStatus == CCrane::ROTATING_TARGET)
+ if (aCranes[i].m_nCraneState == CCrane::LIFTING_TARGET || aCranes[i].m_nCraneState == CCrane::ROTATING_TARGET)
result = true;
}
}