diff options
| author | eray orçunus <erayorcunus@gmail.com> | 2020-03-01 02:43:30 +0100 |
|---|---|---|
| committer | eray orçunus <erayorcunus@gmail.com> | 2020-03-01 02:44:58 +0100 |
| commit | ae523a09a7c12ff3c1fd9cb61e741cf09702b3fe (patch) | |
| tree | af779a144813d519e312398ba77cfdbeb9260420 /src/peds/Population.cpp | |
| parent | Merge pull request #338 from erorcun/erorcun (diff) | |
| download | re3-ae523a09a7c12ff3c1fd9cb61e741cf09702b3fe.tar re3-ae523a09a7c12ff3c1fd9cb61e741cf09702b3fe.tar.gz re3-ae523a09a7c12ff3c1fd9cb61e741cf09702b3fe.tar.bz2 re3-ae523a09a7c12ff3c1fd9cb61e741cf09702b3fe.tar.lz re3-ae523a09a7c12ff3c1fd9cb61e741cf09702b3fe.tar.xz re3-ae523a09a7c12ff3c1fd9cb61e741cf09702b3fe.tar.zst re3-ae523a09a7c12ff3c1fd9cb61e741cf09702b3fe.zip | |
Diffstat (limited to 'src/peds/Population.cpp')
| -rw-r--r-- | src/peds/Population.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/peds/Population.cpp b/src/peds/Population.cpp index 6ffb65ba..6b15d8c7 100644 --- a/src/peds/Population.cpp +++ b/src/peds/Population.cpp @@ -820,15 +820,14 @@ CPopulation::AddPedInCar(CVehicle* car) // FIX: Make peds comfortable while driving car/boat #ifdef FIX_BUGS - if (car->IsBoat()) { - newPed->m_pVehicleAnim = CAnimManager::BlendAnimation(newPed->GetClump(), ASSOCGRP_STD, ANIM_DRIVE_BOAT, 100.0f); - } else if (car->IsVehicle() && ((CVehicle*)car)->bLowVehicle) { - newPed->m_pVehicleAnim = CAnimManager::BlendAnimation(newPed->GetClump(), ASSOCGRP_STD, ANIM_CAR_LSIT, 100.0f); - } else -#endif + { + newPed->m_pVehicleAnim = CAnimManager::BlendAnimation(newPed->GetClump(), ASSOCGRP_STD, car->GetDriverAnim(), 100.0f); + } +#else { newPed->m_pVehicleAnim = CAnimManager::BlendAnimation(newPed->GetClump(), ASSOCGRP_STD, ANIM_CAR_SIT, 100.0f); } +#endif newPed->StopNonPartialAnims(); return newPed; |