summaryrefslogtreecommitdiffstats
path: root/src/control/CarCtrl.cpp
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2020-05-05 17:33:32 +0200
committerSergeanur <s.anureev@yandex.ua>2020-05-05 17:33:32 +0200
commit12fbf8ceded75438d1c5ac532f83319405fbb02d (patch)
tree2062de5cd1582676c62ed4f8673eaa5d7ba8a2e4 /src/control/CarCtrl.cpp
parentMerge pull request #514 from Nick007J/miami (diff)
parentRemove GTA_TRAIN, GTA_BRIDGE, GTA_ZONECULL (diff)
downloadre3-12fbf8ceded75438d1c5ac532f83319405fbb02d.tar
re3-12fbf8ceded75438d1c5ac532f83319405fbb02d.tar.gz
re3-12fbf8ceded75438d1c5ac532f83319405fbb02d.tar.bz2
re3-12fbf8ceded75438d1c5ac532f83319405fbb02d.tar.lz
re3-12fbf8ceded75438d1c5ac532f83319405fbb02d.tar.xz
re3-12fbf8ceded75438d1c5ac532f83319405fbb02d.tar.zst
re3-12fbf8ceded75438d1c5ac532f83319405fbb02d.zip
Diffstat (limited to '')
-rw-r--r--src/control/CarCtrl.cpp8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/control/CarCtrl.cpp b/src/control/CarCtrl.cpp
index f0f95941..d5b86478 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->GetIsOnScreenAndNotCulled()){
+ if (pVehicle->GetIsOnScreen() && CRenderer::IsEntityCullZoneVisible(pVehicle)) {
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->GetIsOnScreenAndNotCulled()){
+ !(pVehicle->GetIsOnScreen() && CRenderer::IsEntityCullZoneVisible(pVehicle)) ){
if ((pVehicle->GetPosition() - vecPlayerPos).MagnitudeSqr() > SQR(7.5f)){
if (!CGarages::IsPointWithinHideOutGarage(pVehicle->GetPosition())){
CWorld::Remove(pVehicle);
@@ -2743,13 +2743,9 @@ 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)