summaryrefslogtreecommitdiffstats
path: root/src/control/CarCtrl.cpp
diff options
context:
space:
mode:
authoreray orçunus <erayorcunus@gmail.com>2019-09-16 19:32:58 +0200
committereray orçunus <erayorcunus@gmail.com>2019-09-17 22:22:34 +0200
commit0f9178568b3470d35ffc1d5e21a230d8cc11eef1 (patch)
treee6b421513dfac9908ae727290ab7ec947842cdf3 /src/control/CarCtrl.cpp
parentMerge pull request #208 from Nick007J/master (diff)
downloadre3-0f9178568b3470d35ffc1d5e21a230d8cc11eef1.tar
re3-0f9178568b3470d35ffc1d5e21a230d8cc11eef1.tar.gz
re3-0f9178568b3470d35ffc1d5e21a230d8cc11eef1.tar.bz2
re3-0f9178568b3470d35ffc1d5e21a230d8cc11eef1.tar.lz
re3-0f9178568b3470d35ffc1d5e21a230d8cc11eef1.tar.xz
re3-0f9178568b3470d35ffc1d5e21a230d8cc11eef1.tar.zst
re3-0f9178568b3470d35ffc1d5e21a230d8cc11eef1.zip
Diffstat (limited to '')
-rw-r--r--src/control/CarCtrl.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/control/CarCtrl.cpp b/src/control/CarCtrl.cpp
index cae010d2..0be8a0a0 100644
--- a/src/control/CarCtrl.cpp
+++ b/src/control/CarCtrl.cpp
@@ -696,7 +696,7 @@ CCarCtrl::PossiblyRemoveVehicle(CVehicle* pVehicle)
}
if (pVehicle->bExtendedRange)
threshold *= 1.5f;
- if (distanceToPlayer > threshold && !CGarages::IsPointWithinHideOutGarage(&pVehicle->GetPosition())){
+ if (distanceToPlayer > threshold && !CGarages::IsPointWithinHideOutGarage(pVehicle->GetPosition())){
if (pVehicle->GetIsOnScreen() && CRenderer::IsEntityCullZoneVisible(pVehicle)){
pVehicle->bFadeOut = true;
}else{
@@ -712,9 +712,10 @@ CCarCtrl::PossiblyRemoveVehicle(CVehicle* pVehicle)
(pVehicle->GetPosition() - vecPlayerPos).Magnitude2D() > 25.0f &&
!IsThisVehicleInteresting(pVehicle) &&
!pVehicle->bIsLocked &&
+ pVehicle->CanBeDeleted() &&
!CTrafficLights::ShouldCarStopForLight(pVehicle, true) &&
!CTrafficLights::ShouldCarStopForBridge(pVehicle) &&
- !CGarages::IsPointWithinHideOutGarage(&pVehicle->GetPosition())){
+ !CGarages::IsPointWithinHideOutGarage(pVehicle->GetPosition())){
CWorld::Remove(pVehicle);
delete pVehicle;
return;
@@ -724,7 +725,7 @@ CCarCtrl::PossiblyRemoveVehicle(CVehicle* pVehicle)
if (CTimer::GetTimeInMilliseconds() > pVehicle->m_nTimeOfDeath + 60000 &&
(!pVehicle->GetIsOnScreen() || !CRenderer::IsEntityCullZoneVisible(pVehicle))){
if ((pVehicle->GetPosition() - vecPlayerPos).MagnitudeSqr() > SQR(7.5f)){
- if (!CGarages::IsPointWithinHideOutGarage(&pVehicle->GetPosition())){
+ if (!CGarages::IsPointWithinHideOutGarage(pVehicle->GetPosition())){
CWorld::Remove(pVehicle);
delete pVehicle;
}