mirror of
https://gitlab.com/GaryOderNichts/re3-wiiu.git
synced 2024-12-26 01:31:49 +01:00
Bike anim. fix
This commit is contained in:
parent
595576b151
commit
3a600b4684
@ -10237,6 +10237,7 @@ CPed::PedAnimAlignCB(CAnimBlendAssociation *animAssoc, void *arg)
|
|||||||
ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ((CBike*)veh)->m_bikeAnimType,
|
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);
|
enterDoor == DOOR_FRONT_LEFT || enterDoor == DOOR_REAR_LEFT ? ANIM_BIKE_JUMPON_R : ANIM_BIKE_JUMPON_L);
|
||||||
ped->m_pVehicleAnim->SetFinishCallback(PedAnimGetInCB, ped);
|
ped->m_pVehicleAnim->SetFinishCallback(PedAnimGetInCB, ped);
|
||||||
|
((CBike*)veh)->bIsBeingPickedUp = true;
|
||||||
}
|
}
|
||||||
} else if (ped->m_vehEnterType == CAR_WINDSCREEN) {
|
} else if (ped->m_vehEnterType == CAR_WINDSCREEN) {
|
||||||
if (veh->pDriver->m_nPedState != PED_DRIVING || veh->pDriver->bDontDragMeOutCar) {
|
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);
|
ped->m_pVehicleAnim->SetFinishCallback(PedAnimGetInCB, ped);
|
||||||
pedToDragOut = veh->pDriver;
|
pedToDragOut = veh->pDriver;
|
||||||
}
|
}
|
||||||
|
((CBike*)veh)->bIsBeingPickedUp = true;
|
||||||
} else {
|
} else {
|
||||||
if (enterDoor == DOOR_FRONT_LEFT || enterDoor == DOOR_FRONT_RIGHT) {
|
if (enterDoor == DOOR_FRONT_LEFT || enterDoor == DOOR_FRONT_RIGHT) {
|
||||||
if (veh->pDriver) {
|
if (veh->pDriver) {
|
||||||
@ -10266,6 +10268,7 @@ CPed::PedAnimAlignCB(CAnimBlendAssociation *animAssoc, void *arg)
|
|||||||
} else {
|
} 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 = 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);
|
ped->m_pVehicleAnim->SetFinishCallback(PedAnimGetInCB, ped);
|
||||||
|
((CBike*)veh)->bIsBeingPickedUp = true;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if (veh->pPassengers[0]) {
|
if (veh->pPassengers[0]) {
|
||||||
@ -10288,10 +10291,10 @@ CPed::PedAnimAlignCB(CAnimBlendAssociation *animAssoc, void *arg)
|
|||||||
ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(),
|
ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(),
|
||||||
((CBike*)veh)->m_bikeAnimType, enterDoor == DOOR_REAR_LEFT ? ANIM_BIKE_JUMPON_R : ANIM_BIKE_JUMPON_L);
|
((CBike*)veh)->m_bikeAnimType, enterDoor == DOOR_REAR_LEFT ? ANIM_BIKE_JUMPON_R : ANIM_BIKE_JUMPON_L);
|
||||||
ped->m_pVehicleAnim->SetFinishCallback(PedAnimGetInCB, ped);
|
ped->m_pVehicleAnim->SetFinishCallback(PedAnimGetInCB, ped);
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
((CBike*)veh)->bIsBeingPickedUp = true;
|
((CBike*)veh)->bIsBeingPickedUp = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// TODO(Miami): This looks like something inlined
|
// TODO(Miami): This looks like something inlined
|
||||||
if (pedToDragOut) {
|
if (pedToDragOut) {
|
||||||
|
Loading…
Reference in New Issue
Block a user