1 files changed, 9 insertions, 4 deletions

diff --git a/src/vehicles/Cranes.cpp b/src/vehicles/Cranes.cpp
index 043f1c73..db7b514f 100644
--- a/src/vehicles/Cranes.cpp
+++ b/src/vehicles/Cranes.cpp
@@ -88,6 +88,7 @@ void CCranes::AddThisOneCrane(CEntity* pEntity)
 	if (pCrane->m_nAudioEntity >= 0)
 		DMAudio.SetEntityStatus(pCrane->m_nAudioEntity, 1);
 	pCrane->m_bIsTop = (MODELID_CRANE_1 != pEntity->GetModelIndex());
+#if 0
 	// Is this used to avoid military crane?
 	if (pCrane->m_bIsTop || pEntity->GetPosition().y > 0.0f) {
 		CObject* pHook = new CObject(MI_MAGNET, false);
@@ -100,6 +101,7 @@ void CCranes::AddThisOneCrane(CEntity* pEntity)
 		pCrane->SetHookMatrix();
 	}
 	else
+#endif
 		pCrane->m_pHook = nil;
 	NumCranes++;
 }
@@ -185,7 +187,7 @@ bool CCranes::IsThisCarPickedUp(float X, float Y, CVehicle* pVehicle)
 				result = true;
 		}
 	}
-	return true;
+	return result;
 }
 
 void CCranes::UpdateCranes(void)
@@ -244,8 +246,11 @@ void CCrane::Update(void)
 					Abs(m_pVehiclePickedUp->GetMoveSpeed().x) > CAR_MOVING_SPEED_THRESHOLD ||
 					Abs(m_pVehiclePickedUp->GetMoveSpeed().y) > CAR_MOVING_SPEED_THRESHOLD ||
 					Abs(m_pVehiclePickedUp->GetMoveSpeed().z) > CAR_MOVING_SPEED_THRESHOLD ||
-					FindPlayerPed()->GetPedState() == PED_ENTER_CAR && // TODO: fix carjack bug
-					FindPlayerPed()->m_pSeekTarget == m_pVehiclePickedUp) {
+					(FindPlayerPed()->GetPedState() == PED_ENTER_CAR
+#ifdef FIX_BUGS
+					|| FindPlayerPed()->GetPedState() == PED_CARJACK
+#endif
+					) && FindPlayerPed()->m_pSeekTarget == m_pVehiclePickedUp) {
 					m_pVehiclePickedUp = nil;
 					m_nCraneState = IDLE;
 				}
@@ -396,7 +401,7 @@ bool CCrane::RotateCarriedCarProperly()
 	float fDeltaThisFrame = CAR_ROTATION_SPEED * CTimer::GetTimeStep();
 	if (Abs(fAngleDelta) <= fDeltaThisFrame) // no rotation is actually applied?
 		return true;
-	m_pVehiclePickedUp->GetMatrix().RotateZ(Abs(fDeltaThisFrame));
+	m_pVehiclePickedUp->GetMatrix().RotateZ(fAngleDelta < 0 ? -fDeltaThisFrame : fDeltaThisFrame);
 	return false;
 }