diff options
| author | aap <aap@papnet.eu> | 2021-01-13 13:01:11 +0100 |
|---|---|---|
| committer | aap <aap@papnet.eu> | 2021-01-13 13:01:11 +0100 |
| commit | 7c3e43aa2ed659a84a83a50a6d55d36b6ae614ba (patch) | |
| tree | 62ec5661820665488efe4b68bc915bc5370aa00c /src/vehicles | |
| parent | Merge branch 'master' of https://github.com/GTAmodding/re3 (diff) | |
| download | re3-7c3e43aa2ed659a84a83a50a6d55d36b6ae614ba.tar re3-7c3e43aa2ed659a84a83a50a6d55d36b6ae614ba.tar.gz re3-7c3e43aa2ed659a84a83a50a6d55d36b6ae614ba.tar.bz2 re3-7c3e43aa2ed659a84a83a50a6d55d36b6ae614ba.tar.lz re3-7c3e43aa2ed659a84a83a50a6d55d36b6ae614ba.tar.xz re3-7c3e43aa2ed659a84a83a50a6d55d36b6ae614ba.tar.zst re3-7c3e43aa2ed659a84a83a50a6d55d36b6ae614ba.zip | |
Diffstat (limited to 'src/vehicles')
| -rw-r--r-- | src/vehicles/Train.cpp | 2 | ||||
| -rw-r--r-- | src/vehicles/Vehicle.cpp | 12 |
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; |