diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-03-22 11:09:18 +0100 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-03-22 11:09:18 +0100 |
| commit | 65e85587941101f8ae346a363b1594b63983417b (patch) | |
| tree | 2cb412d78396b2fea57dd39f06d1a3af9cacb8d1 /src/peds/Ped.cpp | |
| parent | Merge remote-tracking branch 'upstream/master' (diff) | |
| parent | Merge pull request #348 from erorcun/erorcun (diff) | |
| download | re3-65e85587941101f8ae346a363b1594b63983417b.tar re3-65e85587941101f8ae346a363b1594b63983417b.tar.gz re3-65e85587941101f8ae346a363b1594b63983417b.tar.bz2 re3-65e85587941101f8ae346a363b1594b63983417b.tar.lz re3-65e85587941101f8ae346a363b1594b63983417b.tar.xz re3-65e85587941101f8ae346a363b1594b63983417b.tar.zst re3-65e85587941101f8ae346a363b1594b63983417b.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; |