diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2021-08-15 22:30:25 +0200 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2021-08-15 22:30:25 +0200 |
| commit | dec09bde1c7b9f647aec93b4afc8b7a090644335 (patch) | |
| tree | 97c7b6b91f00ae3bb6ed2314bd9761efd6b7167e | |
| parent | merged correct switch (diff) | |
| download | re3-dec09bde1c7b9f647aec93b4afc8b7a090644335.tar re3-dec09bde1c7b9f647aec93b4afc8b7a090644335.tar.gz re3-dec09bde1c7b9f647aec93b4afc8b7a090644335.tar.bz2 re3-dec09bde1c7b9f647aec93b4afc8b7a090644335.tar.lz re3-dec09bde1c7b9f647aec93b4afc8b7a090644335.tar.xz re3-dec09bde1c7b9f647aec93b4afc8b7a090644335.tar.zst re3-dec09bde1c7b9f647aec93b4afc8b7a090644335.zip | |
| -rw-r--r-- | src/control/CarCtrl.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/control/CarCtrl.cpp b/src/control/CarCtrl.cpp index 1cf09a9f..fa5ac1fe 100644 --- a/src/control/CarCtrl.cpp +++ b/src/control/CarCtrl.cpp @@ -1559,7 +1559,7 @@ void CCarCtrl::WeaveThroughCarsSectorList(CPtrList& lst, CVehicle* pVehicle, CPh continue; if (Abs(pTestVehicle->GetPosition().z - pVehicle->GetPosition().z) >= VEHICLE_HEIGHT_DIFF_TO_CONSIDER_WEAVING) continue; - if (pTestVehicle != pVehicle) + if (pTestVehicle != pVehicle && (!pVehicle->bPartOfConvoy || !pTestVehicle->bPartOfConvoy)) WeaveForOtherCar(pTestVehicle, pVehicle, pAngleToWeaveLeft, pAngleToWeaveRight); } } @@ -1567,8 +1567,6 @@ void CCarCtrl::WeaveThroughCarsSectorList(CPtrList& lst, CVehicle* pVehicle, CPh void CCarCtrl::WeaveForOtherCar(CEntity* pOtherEntity, CVehicle* pVehicle, float* pAngleToWeaveLeft, float* pAngleToWeaveRight) { CVehicle* pOtherCar = (CVehicle*)pOtherEntity; - if (pVehicle->bPartOfConvoy && pOtherCar->bPartOfConvoy) - return; if (pVehicle->AutoPilot.m_nCarMission == MISSION_RAMPLAYER_CLOSE && pOtherEntity == FindPlayerVehicle()) return; if (pVehicle->AutoPilot.m_nCarMission == MISSION_RAMCAR_CLOSE && pOtherEntity == pVehicle->AutoPilot.m_pTargetCar) |