diff options
| author | eray orçunus <erayorcunus@gmail.com> | 2020-03-17 19:03:13 +0100 |
|---|---|---|
| committer | eray orçunus <erayorcunus@gmail.com> | 2020-03-21 12:58:54 +0100 |
| commit | d5a6e17079ab87b946132155bbe37bd20e27c239 (patch) | |
| tree | 87a72ec36821bb04d9c08ed0e5730c2393b8fcf4 /src/peds/Ped.cpp | |
| parent | Merge pull request #346 from Sergeanur/Radar2 (diff) | |
| download | re3-d5a6e17079ab87b946132155bbe37bd20e27c239.tar re3-d5a6e17079ab87b946132155bbe37bd20e27c239.tar.gz re3-d5a6e17079ab87b946132155bbe37bd20e27c239.tar.bz2 re3-d5a6e17079ab87b946132155bbe37bd20e27c239.tar.lz re3-d5a6e17079ab87b946132155bbe37bd20e27c239.tar.xz re3-d5a6e17079ab87b946132155bbe37bd20e27c239.tar.zst re3-d5a6e17079ab87b946132155bbe37bd20e27c239.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/peds/Ped.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/peds/Ped.cpp b/src/peds/Ped.cpp index 3c62512e..b7dbab82 100644 --- a/src/peds/Ped.cpp +++ b/src/peds/Ped.cpp @@ -2261,7 +2261,7 @@ CPed::SetModelIndex(uint32 mi) RpAnimBlendClumpInit(GetClump()); RpAnimBlendClumpFillFrameArray(GetClump(), m_pFrames); CPedModelInfo *modelInfo = (CPedModelInfo*)CModelInfo::GetModelInfo(m_modelIndex); - SetPedStats((ePedStats) modelInfo->m_pedStatType); + SetPedStats(modelInfo->m_pedStatType); m_headingRate = m_pedStats->m_headingChangeRate; m_animGroup = (AssocGroupId) modelInfo->m_animGroup; CAnimManager::AddAnimation(GetClump(), m_animGroup, ANIM_IDLE_STANCE); @@ -6928,11 +6928,9 @@ CPed::FinishLaunchCB(CAnimBlendAssociation *animAssoc, void *arg) if (obstacle) { animAssoc->flags |= ASSOC_DELETEFADEDOUT; -#ifndef VC_PED_PORTS + + // ANIM_HIT_WALL in VC (which makes more sense) CAnimBlendAssociation *handsCoverAssoc = CAnimManager::BlendAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_HANDSCOWER, 8.0f); -#else - CAnimBlendAssociation* handsCoverAssoc = CAnimManager::BlendAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_HIT_WALL, 8.0f); -#endif handsCoverAssoc->flags &= ~ASSOC_FADEOUTWHENDONE; handsCoverAssoc->SetFinishCallback(FinishHitHeadCB, ped); ped->bIsLanding = true; |