summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authoreray orçunus <erayorcunus@gmail.com>2020-06-15 23:20:08 +0200
committereray orçunus <erayorcunus@gmail.com>2020-06-15 23:20:08 +0200
commit3a600b46849f4ce9161da94c19ca61cb397a2257 (patch)
treec874937cbf5598c80e13fb37c76cd3e754226ac1 /src
parentMerge branch 'miami' of https://github.com/GTAmodding/re3 into miami (diff)
downloadre3-3a600b46849f4ce9161da94c19ca61cb397a2257.tar
re3-3a600b46849f4ce9161da94c19ca61cb397a2257.tar.gz
re3-3a600b46849f4ce9161da94c19ca61cb397a2257.tar.bz2
re3-3a600b46849f4ce9161da94c19ca61cb397a2257.tar.lz
re3-3a600b46849f4ce9161da94c19ca61cb397a2257.tar.xz
re3-3a600b46849f4ce9161da94c19ca61cb397a2257.tar.zst
re3-3a600b46849f4ce9161da94c19ca61cb397a2257.zip
Diffstat (limited to '')
-rw-r--r--src/peds/Ped.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/peds/Ped.cpp b/src/peds/Ped.cpp
index 79a6202f..1b98dad6 100644
--- a/src/peds/Ped.cpp
+++ b/src/peds/Ped.cpp
@@ -10237,6 +10237,7 @@ CPed::PedAnimAlignCB(CAnimBlendAssociation *animAssoc, void *arg)
ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ((CBike*)veh)->m_bikeAnimType,
enterDoor == DOOR_FRONT_LEFT || enterDoor == DOOR_REAR_LEFT ? ANIM_BIKE_JUMPON_R : ANIM_BIKE_JUMPON_L);
ped->m_pVehicleAnim->SetFinishCallback(PedAnimGetInCB, ped);
+ ((CBike*)veh)->bIsBeingPickedUp = true;
}
} else if (ped->m_vehEnterType == CAR_WINDSCREEN) {
if (veh->pDriver->m_nPedState != PED_DRIVING || veh->pDriver->bDontDragMeOutCar) {
@@ -10246,6 +10247,7 @@ CPed::PedAnimAlignCB(CAnimBlendAssociation *animAssoc, void *arg)
ped->m_pVehicleAnim->SetFinishCallback(PedAnimGetInCB, ped);
pedToDragOut = veh->pDriver;
}
+ ((CBike*)veh)->bIsBeingPickedUp = true;
} else {
if (enterDoor == DOOR_FRONT_LEFT || enterDoor == DOOR_FRONT_RIGHT) {
if (veh->pDriver) {
@@ -10266,6 +10268,7 @@ CPed::PedAnimAlignCB(CAnimBlendAssociation *animAssoc, void *arg)
} else {
ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ((CBike*)veh)->m_bikeAnimType, enterDoor == DOOR_FRONT_LEFT ? ANIM_BIKE_JUMPON_R : ANIM_BIKE_JUMPON_L);
ped->m_pVehicleAnim->SetFinishCallback(PedAnimGetInCB, ped);
+ ((CBike*)veh)->bIsBeingPickedUp = true;
}
} else {
if (veh->pPassengers[0]) {
@@ -10288,10 +10291,10 @@ CPed::PedAnimAlignCB(CAnimBlendAssociation *animAssoc, void *arg)
ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(),
((CBike*)veh)->m_bikeAnimType, enterDoor == DOOR_REAR_LEFT ? ANIM_BIKE_JUMPON_R : ANIM_BIKE_JUMPON_L);
ped->m_pVehicleAnim->SetFinishCallback(PedAnimGetInCB, ped);
+ ((CBike*)veh)->bIsBeingPickedUp = true;
}
}
}
- ((CBike*)veh)->bIsBeingPickedUp = true;
// TODO(Miami): This looks like something inlined
if (pedToDragOut) {