summaryrefslogtreecommitdiffstats
path: root/src/vehicles/Vehicle.cpp
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2020-05-27 22:32:57 +0200
committeraap <aap@papnet.eu>2020-05-27 22:32:57 +0200
commit2a1b9281e49685b6d5d3cf0770cfa0c3e15d1e94 (patch)
tree8c6f2c1bb61493bd69643f811d91fdd6a5d6b8e9 /src/vehicles/Vehicle.cpp
parentlibrw update (diff)
downloadre3-2a1b9281e49685b6d5d3cf0770cfa0c3e15d1e94.tar
re3-2a1b9281e49685b6d5d3cf0770cfa0c3e15d1e94.tar.gz
re3-2a1b9281e49685b6d5d3cf0770cfa0c3e15d1e94.tar.bz2
re3-2a1b9281e49685b6d5d3cf0770cfa0c3e15d1e94.tar.lz
re3-2a1b9281e49685b6d5d3cf0770cfa0c3e15d1e94.tar.xz
re3-2a1b9281e49685b6d5d3cf0770cfa0c3e15d1e94.tar.zst
re3-2a1b9281e49685b6d5d3cf0770cfa0c3e15d1e94.zip
Diffstat (limited to '')
-rw-r--r--src/vehicles/Vehicle.cpp8
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();