summaryrefslogtreecommitdiffstats
path: root/src/vehicles
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2020-05-14 21:29:23 +0200
committerNikolay Korolev <nickvnuk@gmail.com>2020-05-14 21:29:23 +0200
commit09a0207e55ac8a69639c85997c330ec0f7caf4a6 (patch)
treef7784f9199ee39054ca94a1f6cf5de880c7c243f /src/vehicles
parentmore pedattractor (diff)
parentFix compilation (diff)
downloadre3-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')
-rw-r--r--src/vehicles/Automobile.cpp2
-rw-r--r--src/vehicles/Boat.cpp4
-rw-r--r--src/vehicles/Cranes.cpp2
3 files changed, 6 insertions, 2 deletions
diff --git a/src/vehicles/Automobile.cpp b/src/vehicles/Automobile.cpp
index ecf821bc..6fc0436c 100644
--- a/src/vehicles/Automobile.cpp
+++ b/src/vehicles/Automobile.cpp
@@ -107,7 +107,7 @@ CAutomobile::CAutomobile(int32 id, uint8 CreatedBy)
else
Doors[DOOR_BONNET].Init(0.0f, PI*0.3f, 1, 0);
if(pHandling->Flags & HANDLING_HANGING_BOOT)
- Doors[DOOR_BOOT].Init(PI*0.4f, 0.0f, 0, 0);
+ Doors[DOOR_BOOT].Init(-PI*0.4f, 0.0f, 0, 0);
else if(pHandling->Flags & HANDLING_TAILGATE_BOOT)
Doors[DOOR_BOOT].Init(0.0, HALFPI, 1, 0);
else
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;
}
}