mirror/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2024-12-29 05:05:40 +00:00
Code Issues Projects Releases Wiki Activity

small refactoring

Browse source
This commit is contained in:
Nikolay Korolev 2021-08-20 17:49:51 +03:00
parent 239367663b
commit 11f2d941f1
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/control/CarCtrl.cpp
View file

@ -1012,11 +1012,12 @@ CCarCtrl::PossiblyRemoveVehicle(CVehicle* pVehicle)
delete pVehicle; delete pVehicle;
return; return;
} }
if (pVehicle->GetStatus() != STATUS_WRECKED || pVehicle->m_nTimeOfDeath == 0) if (pVehicle->GetStatus() == STATUS_WRECKED) {
return; if (pVehicle->m_nTimeOfDeath != 0) {
if (CTimer::GetTimeInMilliseconds() > pVehicle->m_nTimeOfDeath + 60000 && if (CTimer::GetTimeInMilliseconds() > pVehicle->m_nTimeOfDeath + 60000 &&
!pVehicle->GetIsOnScreen()){ CTimer::GetTimeInMilliseconds() > pVehicle->m_nSetPieceExtendedRangeTime &&
if ((pVehicle->GetPosition() - vecPlayerPos).MagnitudeSqr() > SQR(7.5f)){ !(pVehicle->GetIsOnScreen())) {
if ((pVehicle->GetPosition() - vecPlayerPos).MagnitudeSqr() > SQR(6.5f)) {
if (!CGarages::IsPointWithinHideOutGarage(pVehicle->GetPosition())) { if (!CGarages::IsPointWithinHideOutGarage(pVehicle->GetPosition())) {
CWorld::Remove(pVehicle); CWorld::Remove(pVehicle);
delete pVehicle; delete pVehicle;
@ -1024,6 +1025,8 @@ CCarCtrl::PossiblyRemoveVehicle(CVehicle* pVehicle)
} }
} }
} }
}
}
int32 int32
CCarCtrl::CountCarsOfType(int32 mi) CCarCtrl::CountCarsOfType(int32 mi)