diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-05-27 23:59:03 +0200 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-05-27 23:59:03 +0200 |
| commit | 7e4ef2162a027f2df96eddddc8d3fca7d5082df8 (patch) | |
| tree | 6c7078b119efcedc89b1e7f08e344ed087cb89b1 /src/vehicles/Vehicle.cpp | |
| parent | Merge remote-tracking branch 'upstream/master' (diff) | |
| parent | bla (diff) | |
| download | re3-7e4ef2162a027f2df96eddddc8d3fca7d5082df8.tar re3-7e4ef2162a027f2df96eddddc8d3fca7d5082df8.tar.gz re3-7e4ef2162a027f2df96eddddc8d3fca7d5082df8.tar.bz2 re3-7e4ef2162a027f2df96eddddc8d3fca7d5082df8.tar.lz re3-7e4ef2162a027f2df96eddddc8d3fca7d5082df8.tar.xz re3-7e4ef2162a027f2df96eddddc8d3fca7d5082df8.tar.zst re3-7e4ef2162a027f2df96eddddc8d3fca7d5082df8.zip | |
Diffstat (limited to 'src/vehicles/Vehicle.cpp')
| -rw-r--r-- | src/vehicles/Vehicle.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/vehicles/Vehicle.cpp b/src/vehicles/Vehicle.cpp index e264d7ed..77c549f9 100644 --- a/src/vehicles/Vehicle.cpp +++ b/src/vehicles/Vehicle.cpp @@ -780,7 +780,7 @@ CVehicle::ShufflePassengersToMakeSpace(void) return false; if (pPassengers[1] && !(m_nGettingInFlags & CAR_DOOR_FLAG_LR) && - IsRoomForPedToLeaveCar(COMPONENT_DOOR_REAR_LEFT, nil)) { + IsRoomForPedToLeaveCar(CAR_DOOR_LR, nil)) { if (!pPassengers[2] && !(m_nGettingInFlags & CAR_DOOR_FLAG_RR)) { pPassengers[2] = pPassengers[1]; pPassengers[1] = nil; @@ -797,7 +797,7 @@ CVehicle::ShufflePassengersToMakeSpace(void) } if (pPassengers[2] && !(m_nGettingInFlags & CAR_DOOR_FLAG_RR) && - IsRoomForPedToLeaveCar(COMPONENT_DOOR_REAR_RIGHT, nil)) { + IsRoomForPedToLeaveCar(CAR_DOOR_RR, nil)) { if (!pPassengers[1] && !(m_nGettingInFlags & CAR_DOOR_FLAG_LR)) { pPassengers[1] = pPassengers[2]; pPassengers[2] = nil; @@ -814,7 +814,7 @@ CVehicle::ShufflePassengersToMakeSpace(void) } if (pPassengers[0] && !(m_nGettingInFlags & CAR_DOOR_FLAG_RF) && - IsRoomForPedToLeaveCar(COMPONENT_DOOR_FRONT_RIGHT, nil)) { + IsRoomForPedToLeaveCar(CAR_DOOR_RF, nil)) { if (!pPassengers[1] && !(m_nGettingInFlags & CAR_DOOR_FLAG_LR)) { pPassengers[1] = pPassengers[0]; pPassengers[0] = nil; @@ -1192,7 +1192,7 @@ CVehicle::ProcessCarAlarm(void) { uint32 step; - if(m_nAlarmState == 0 || m_nAlarmState == -1) + if(!IsAlarmOn()) return; step = CTimer::GetTimeStepInMilliseconds(); |