a3x/re3
1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-12-24 17:00:00 +00:00
Code Issues Projects Releases Wiki Activity

fixed CPed::AddInCarAnims

Browse source
This commit is contained in:
aap 2020-06-03 16:55:23 +02:00
parent 1e2b087601
commit e1201fc6e2
1 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/peds/Ped.cpp
View file

@ -18606,15 +18606,12 @@ CPed::ClearFollowPath()
void void
CPed::AddInCarAnims(CVehicle* car, bool isDriver) CPed::AddInCarAnims(CVehicle* car, bool isDriver)
{ {
AnimationId anim;
AssocGroupId group;
if (car->IsBoat()) { if (car->IsBoat()) {
if (car->pHandling->Flags & HANDLING_SIT_IN_BOAT) { if (car->pHandling->Flags & HANDLING_SIT_IN_BOAT) {
anim = ANIM_CAR_SIT; m_pVehicleAnim = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_CAR_SIT, 100.0f);
} else { } else {
anim = ANIM_DRIVE_BOAT; m_pVehicleAnim = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_DRIVE_BOAT, 100.0f);
} }
group = ASSOCGRP_STD;
} else if (car->IsBike()) { } else if (car->IsBike()) {
if (isDriver) { if (isDriver) {
m_pVehicleAnim = CAnimManager::BlendAnimation(GetClump(), ((CBike*)car)->m_bikeAnimType, ANIM_BIKE_RIDE, 100.0f); m_pVehicleAnim = CAnimManager::BlendAnimation(GetClump(), ((CBike*)car)->m_bikeAnimType, ANIM_BIKE_RIDE, 100.0f);
@ -18626,20 +18623,18 @@ CPed::AddInCarAnims(CVehicle* car, bool isDriver)
} else { } else {
if (isDriver) { if (isDriver) {
if (car->bLowVehicle) { if (car->bLowVehicle) {
anim = ANIM_CAR_LSIT; m_pVehicleAnim = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_CAR_LSIT, 100.0f);
} else { } else {
anim = ANIM_CAR_SIT; m_pVehicleAnim = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_CAR_SIT, 100.0f);
} }
} else { } else {
if (car->bLowVehicle) { if (car->bLowVehicle) {
anim = ANIM_CAR_SITPLO; m_pVehicleAnim = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_CAR_SITPLO, 100.0f);
} else { } else {
anim = ANIM_CAR_SITP; m_pVehicleAnim = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_CAR_SITP, 100.0f);
} }
} }
group = ASSOCGRP_STD;
} }
m_pVehicleAnim = CAnimManager::BlendAnimation(GetClump(), group, anim, 100.0f);
StopNonPartialAnims(); StopNonPartialAnims();
} }