From 43866a4f7033fbb2ea1d515c037f291e0f377165 Mon Sep 17 00:00:00 2001 From: Filip Gawin Date: Sat, 12 Oct 2019 22:36:45 +0200 Subject: [PATCH] Fix rebasing --- src/control/CarAI.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/control/CarAI.cpp b/src/control/CarAI.cpp index b4dd8777..c2f2bb43 100644 --- a/src/control/CarAI.cpp +++ b/src/control/CarAI.cpp @@ -592,7 +592,7 @@ void CCarAI::MakeWayForCarWithSiren(CVehicle *pVehicle) CVehicle* vehicle = CPools::GetVehiclePool()->GetSlot(i); if (!vehicle) continue; - if (vehicle->m_vehType != VEHICLE_TYPE_CAR && vehicle->m_vehType != VEHICLE_TYPE_BIKE) + if (vehicle->m_vehType != VEHICLE_TYPE_AUTOMOBILE && vehicle->m_vehType != VEHICLE_TYPE_BIKE) continue; if (vehicle->m_status != STATUS_SIMPLE && vehicle->m_status != STATUS_PHYSICS) continue;