diff options
| author | aap <aap@papnet.eu> | 2020-02-17 10:12:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-17 10:12:38 +0100 |
| commit | 3fa200dc3e3b0d90787209ee83379dd04691d0e4 (patch) | |
| tree | caaf8977c7d7715f36ad9264d3680da4d4ab1d97 /src/control/CarAI.cpp | |
| parent | Merge pull request #326 from erorcun/erorcun (diff) | |
| parent | review fixes (diff) | |
| download | re3-3fa200dc3e3b0d90787209ee83379dd04691d0e4.tar re3-3fa200dc3e3b0d90787209ee83379dd04691d0e4.tar.gz re3-3fa200dc3e3b0d90787209ee83379dd04691d0e4.tar.bz2 re3-3fa200dc3e3b0d90787209ee83379dd04691d0e4.tar.lz re3-3fa200dc3e3b0d90787209ee83379dd04691d0e4.tar.xz re3-3fa200dc3e3b0d90787209ee83379dd04691d0e4.tar.zst re3-3fa200dc3e3b0d90787209ee83379dd04691d0e4.zip | |
Diffstat (limited to 'src/control/CarAI.cpp')
| -rw-r--r-- | src/control/CarAI.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/control/CarAI.cpp b/src/control/CarAI.cpp index 870a094d..c5d62c48 100644 --- a/src/control/CarAI.cpp +++ b/src/control/CarAI.cpp @@ -265,9 +265,16 @@ void CCarAI::UpdateCarAI(CVehicle* pVehicle) break; case MISSION_RAMCAR_CLOSE: if (pVehicle->AutoPilot.m_pTargetCar){ - /* PlayerPed? */ - if (FindPlayerPed()->m_pWanted->m_bIgnoredByEveryone || pVehicle->bIsLawEnforcer && - (FindPlayerPed()->m_pWanted->m_nWantedLevel == 0 || FindPlayerPed()->m_pWanted->m_bIgnoredByCops || CCullZones::NoPolice())){ + if +#ifdef FIX_BUGS + (FindPlayerVehicle() == pVehicle->AutoPilot.m_pTargetCar && +#endif + (FindPlayerPed()->m_pWanted->m_bIgnoredByEveryone || pVehicle->bIsLawEnforcer && + (FindPlayerPed()->m_pWanted->m_nWantedLevel == 0 || FindPlayerPed()->m_pWanted->m_bIgnoredByCops || CCullZones::NoPolice())) +#ifdef FIX_BUGS + ) +#endif + { CCarCtrl::JoinCarWithRoadSystem(pVehicle); pVehicle->AutoPilot.m_nCarMission = MISSION_CRUISE; pVehicle->AutoPilot.m_nDrivingStyle = DRIVINGSTYLE_STOP_FOR_CARS; |