diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2020-05-05 17:34:46 +0200 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2020-05-05 17:34:46 +0200 |
| commit | 22e8b0e419ad811c977c67ea2f2c06d53ea3be5e (patch) | |
| tree | 655dc6cff470ac28d19678c392a0aebb49cea937 /src/control/CarCtrl.cpp | |
| parent | Merge branch 'master' into miami (diff) | |
| download | re3-22e8b0e419ad811c977c67ea2f2c06d53ea3be5e.tar re3-22e8b0e419ad811c977c67ea2f2c06d53ea3be5e.tar.gz re3-22e8b0e419ad811c977c67ea2f2c06d53ea3be5e.tar.bz2 re3-22e8b0e419ad811c977c67ea2f2c06d53ea3be5e.tar.lz re3-22e8b0e419ad811c977c67ea2f2c06d53ea3be5e.tar.xz re3-22e8b0e419ad811c977c67ea2f2c06d53ea3be5e.tar.zst re3-22e8b0e419ad811c977c67ea2f2c06d53ea3be5e.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/control/CarCtrl.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/control/CarCtrl.cpp b/src/control/CarCtrl.cpp index d5b86478..f0f95941 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 (pVehicle->GetIsOnScreen() && CRenderer::IsEntityCullZoneVisible(pVehicle)) { + if (pVehicle->GetIsOnScreenAndNotCulled()){ pVehicle->bFadeOut = true; }else{ CWorld::Remove(pVehicle); @@ -722,7 +722,7 @@ CCarCtrl::PossiblyRemoveVehicle(CVehicle* pVehicle) if (pVehicle->GetStatus() != STATUS_WRECKED || pVehicle->m_nTimeOfDeath == 0) return; if (CTimer::GetTimeInMilliseconds() > pVehicle->m_nTimeOfDeath + 60000 && - !(pVehicle->GetIsOnScreen() && CRenderer::IsEntityCullZoneVisible(pVehicle)) ){ + !pVehicle->GetIsOnScreenAndNotCulled()){ if ((pVehicle->GetPosition() - vecPlayerPos).MagnitudeSqr() > SQR(7.5f)){ if (!CGarages::IsPointWithinHideOutGarage(pVehicle->GetPosition())){ CWorld::Remove(pVehicle); @@ -2743,9 +2743,13 @@ bool CCarCtrl::ThisRoadObjectCouldMove(int16 mi) bool CCarCtrl::MapCouldMoveInThisArea(float x, float y) { +#ifdef GTA_BRIDGE // actually they forgot that in VC... // bridge moves up and down return x > -342.0f && x < -219.0f && y > -677.0f && y < -580.0f; +#else + return false; +#endif } float CCarCtrl::FindSpeedMultiplierWithSpeedFromNodes(int8 type) |