summaryrefslogtreecommitdiffstats
path: root/src/vehicles
diff options
context:
space:
mode:
authorerorcun <erorcunerorcun@hotmail.com.tr>2021-01-13 14:54:45 +0100
committererorcun <erorcunerorcun@hotmail.com.tr>2021-01-13 14:54:45 +0100
commit011a9cc775bb37313af2ee6b7af2b84eb00df058 (patch)
treed310b443e28f48b9b39a539bf18d93311a9d58b8 /src/vehicles
parentfix save loading, hopefully (diff)
parentremove scriptspath from premake (diff)
downloadre3-011a9cc775bb37313af2ee6b7af2b84eb00df058.tar
re3-011a9cc775bb37313af2ee6b7af2b84eb00df058.tar.gz
re3-011a9cc775bb37313af2ee6b7af2b84eb00df058.tar.bz2
re3-011a9cc775bb37313af2ee6b7af2b84eb00df058.tar.lz
re3-011a9cc775bb37313af2ee6b7af2b84eb00df058.tar.xz
re3-011a9cc775bb37313af2ee6b7af2b84eb00df058.tar.zst
re3-011a9cc775bb37313af2ee6b7af2b84eb00df058.zip
Diffstat (limited to '')
-rw-r--r--src/vehicles/Train.cpp2
-rw-r--r--src/vehicles/Vehicle.cpp12
2 files changed, 7 insertions, 7 deletions
diff --git a/src/vehicles/Train.cpp b/src/vehicles/Train.cpp
index 4250f6f4..be546c70 100644
--- a/src/vehicles/Train.cpp
+++ b/src/vehicles/Train.cpp
@@ -373,7 +373,7 @@ CTrain::TrainHitStuff(CPtrList &list)
void
CTrain::AddPassenger(CPed *ped)
{
- int i = ped->m_vehEnterType;
+ int i = ped->m_vehDoor;
if((i == TRAIN_POS_LEFT_ENTRY || i == TRAIN_POS_MID_ENTRY || i == TRAIN_POS_RIGHT_ENTRY) && pPassengers[i] == nil){
pPassengers[i] = ped;
m_nNumPassengers++;
diff --git a/src/vehicles/Vehicle.cpp b/src/vehicles/Vehicle.cpp
index 465d9a9e..6696f4a6 100644
--- a/src/vehicles/Vehicle.cpp
+++ b/src/vehicles/Vehicle.cpp
@@ -794,13 +794,13 @@ CVehicle::ShufflePassengersToMakeSpace(void)
if (!pPassengers[2] && !(m_nGettingInFlags & CAR_DOOR_FLAG_RR)) {
pPassengers[2] = pPassengers[1];
pPassengers[1] = nil;
- pPassengers[2]->m_vehEnterType = CAR_DOOR_RR;
+ pPassengers[2]->m_vehDoor = CAR_DOOR_RR;
return true;
}
if (!pPassengers[0] && !(m_nGettingInFlags & CAR_DOOR_FLAG_RF)) {
pPassengers[0] = pPassengers[1];
pPassengers[1] = nil;
- pPassengers[0]->m_vehEnterType = CAR_DOOR_RF;
+ pPassengers[0]->m_vehDoor = CAR_DOOR_RF;
return true;
}
return false;
@@ -811,13 +811,13 @@ CVehicle::ShufflePassengersToMakeSpace(void)
if (!pPassengers[1] && !(m_nGettingInFlags & CAR_DOOR_FLAG_LR)) {
pPassengers[1] = pPassengers[2];
pPassengers[2] = nil;
- pPassengers[1]->m_vehEnterType = CAR_DOOR_LR;
+ pPassengers[1]->m_vehDoor = CAR_DOOR_LR;
return true;
}
if (!pPassengers[0] && !(m_nGettingInFlags & CAR_DOOR_FLAG_RF)) {
pPassengers[0] = pPassengers[2];
pPassengers[2] = nil;
- pPassengers[0]->m_vehEnterType = CAR_DOOR_RF;
+ pPassengers[0]->m_vehDoor = CAR_DOOR_RF;
return true;
}
return false;
@@ -828,13 +828,13 @@ CVehicle::ShufflePassengersToMakeSpace(void)
if (!pPassengers[1] && !(m_nGettingInFlags & CAR_DOOR_FLAG_LR)) {
pPassengers[1] = pPassengers[0];
pPassengers[0] = nil;
- pPassengers[1]->m_vehEnterType = CAR_DOOR_LR;
+ pPassengers[1]->m_vehDoor = CAR_DOOR_LR;
return true;
}
if (!pPassengers[2] && !(m_nGettingInFlags & CAR_DOOR_FLAG_RR)) {
pPassengers[2] = pPassengers[0];
pPassengers[0] = nil;
- pPassengers[2]->m_vehEnterType = CAR_DOOR_RR;
+ pPassengers[2]->m_vehDoor = CAR_DOOR_RR;
return true;
}
return false;