From 509d57edcb4e60be87548b202b33cef508f11fd1 Mon Sep 17 00:00:00 2001 From: Nikolay Korolev Date: Wed, 13 May 2020 13:29:17 +0300 Subject: car control and cranes fixes --- src/vehicles/Cranes.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/vehicles') diff --git a/src/vehicles/Cranes.cpp b/src/vehicles/Cranes.cpp index 9c1442c4..9c8f9fda 100644 --- a/src/vehicles/Cranes.cpp +++ b/src/vehicles/Cranes.cpp @@ -180,7 +180,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; } } -- cgit v1.2.3 From 9d4d83db0d9b9bd2921972a030a0c53566688fbb Mon Sep 17 00:00:00 2001 From: Nikolay Korolev Date: Thu, 14 May 2020 14:01:24 +0300 Subject: some fixes --- src/vehicles/Boat.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/vehicles') 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) -- cgit v1.2.3 From 2fb4305a73c2aa1972daf1037189b2bc5b25ea34 Mon Sep 17 00:00:00 2001 From: aap Date: Thu, 14 May 2020 15:03:01 +0200 Subject: fixed hanging boot --- src/vehicles/Automobile.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/vehicles') diff --git a/src/vehicles/Automobile.cpp b/src/vehicles/Automobile.cpp index a880f26d..83fe44d5 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 -- cgit v1.2.3 From 41e9754338c3496a9caa8fc67f892cf043713293 Mon Sep 17 00:00:00 2001 From: aap Date: Thu, 14 May 2020 15:03:01 +0200 Subject: fixed hanging boot --- src/vehicles/Automobile.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/vehicles') 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 -- cgit v1.2.3