fix merge failure

1 files changed, 0 insertions, 38 deletions

diff --git a/src/control/Garages.cpp b/src/control/Garages.cpp
index e8ced3f1..9238f51d 100644
--- a/src/control/Garages.cpp
+++ b/src/control/Garages.cpp
@@ -2489,41 +2489,3 @@ bool CGarage::IsPlayerEntirelyInsideGarage()
 {
 	return IsEntityEntirelyInside3D(FindPlayerVehicle() ? (CEntity*)FindPlayerVehicle() : (CEntity*)FindPlayerPed(), 0.0f);
 }
-
-void CGarages::StopCarFromBlowingUp(CAutomobile* pCar)
-{
-	pCar->m_fFireBlowUpTimer = 0.0f;
-	pCar->m_fHealth = Max(pCar->m_fHealth, 300.0f);
-	pCar->Damage.SetEngineStatus(Max(pCar->Damage.GetEngineStatus(), 275));
-}
-
-bool CGarage::Does60SecondsNeedThisCarAtAll(int mi)
-{
-	for (int i = 0; i < ARRAY_SIZE(gaCarsToCollectIn60Seconds); i++) {
-		if (gaCarsToCollectIn60Seconds[i] == mi)
-			return true;
-	}
-	return false;
-}
-
-bool CGarage::Does60SecondsNeedThisCar(int mi)
-{
-	for (int i = 0; i < ARRAY_SIZE(gaCarsToCollectIn60Seconds); i++) {
-		if (gaCarsToCollectIn60Seconds[i] == mi)
-			return m_bCollectedCarsState & BIT(i);
-	}
-	return false;
-}
-
-void CGarage::MarkThisCarAsCollectedFor60Seconds(int mi)
-{
-	for (int i = 0; i < ARRAY_SIZE(gaCarsToCollectIn60Seconds); i++) {
-		if (gaCarsToCollectIn60Seconds[i] == mi)
-			m_bCollectedCarsState |= BIT(i);
-	}
-}
-
-bool CGarage::IsPlayerEntirelyInsideGarage()
-{
-	return IsEntityEntirelyInside3D(FindPlayerVehicle() ? (CEntity*)FindPlayerVehicle() : (CEntity*)FindPlayerPed(), 0.0f);
-}