diff options
| author | aap <aap@papnet.eu> | 2020-06-15 23:20:34 +0200 |
|---|---|---|
| committer | aap <aap@papnet.eu> | 2020-06-16 13:54:18 +0200 |
| commit | 7ceedc1d4770b9a02ede4b1adbdd9ea1fc5f295e (patch) | |
| tree | 96ff35ea27589d1ff326eeafa3ba32eb88f8e60a /src/peds | |
| parent | Merge branch 'miami' of github.com:GTAmodding/re3 into miami (diff) | |
| parent | Bike anim. fix (diff) | |
| download | re3-7ceedc1d4770b9a02ede4b1adbdd9ea1fc5f295e.tar re3-7ceedc1d4770b9a02ede4b1adbdd9ea1fc5f295e.tar.gz re3-7ceedc1d4770b9a02ede4b1adbdd9ea1fc5f295e.tar.bz2 re3-7ceedc1d4770b9a02ede4b1adbdd9ea1fc5f295e.tar.lz re3-7ceedc1d4770b9a02ede4b1adbdd9ea1fc5f295e.tar.xz re3-7ceedc1d4770b9a02ede4b1adbdd9ea1fc5f295e.tar.zst re3-7ceedc1d4770b9a02ede4b1adbdd9ea1fc5f295e.zip | |
Diffstat (limited to 'src/peds')
| -rw-r--r-- | src/peds/Ped.cpp | 5 |
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) { |