diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2021-02-03 01:14:48 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-03 01:14:48 +0100 |
| commit | b47a23ab794e3520c6ec9d1ee19d3f4e3153494c (patch) | |
| tree | 411b4fcc6a353de7809816672bf4197785f314fc /src/weapons/BulletInfo.cpp | |
| parent | Merge pull request #1017 from IlDucci/master (diff) | |
| parent | Use original animation names from VCS (diff) | |
| download | re3-b47a23ab794e3520c6ec9d1ee19d3f4e3153494c.tar re3-b47a23ab794e3520c6ec9d1ee19d3f4e3153494c.tar.gz re3-b47a23ab794e3520c6ec9d1ee19d3f4e3153494c.tar.bz2 re3-b47a23ab794e3520c6ec9d1ee19d3f4e3153494c.tar.lz re3-b47a23ab794e3520c6ec9d1ee19d3f4e3153494c.tar.xz re3-b47a23ab794e3520c6ec9d1ee19d3f4e3153494c.tar.zst re3-b47a23ab794e3520c6ec9d1ee19d3f4e3153494c.zip | |
Diffstat (limited to 'src/weapons/BulletInfo.cpp')
| -rw-r--r-- | src/weapons/BulletInfo.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/weapons/BulletInfo.cpp b/src/weapons/BulletInfo.cpp index e87a7407..bfe27e18 100644 --- a/src/weapons/BulletInfo.cpp +++ b/src/weapons/BulletInfo.cpp @@ -121,7 +121,7 @@ void CBulletInfo::Update(void) if (pPed->DoesLOSBulletHitPed(point)) { if (pPed->IsPedInControl() && !pPed->bIsDucking) { pPed->ClearAttackByRemovingAnim(); - CAnimBlendAssociation* pAnim = CAnimManager::AddAnimation(pPed->GetClump(), ASSOCGRP_STD, ANIM_SHOT_FRONT_PARTIAL); + CAnimBlendAssociation* pAnim = CAnimManager::AddAnimation(pPed->GetClump(), ASSOCGRP_STD, ANIM_STD_HITBYGUN_FRONT); pAnim->SetBlend(0.0f, 8.0f); } pPed->InflictDamage(pBullet->m_pSource, pBullet->m_eWeaponType, pBullet->m_nDamage, (ePedPieceTypes)point.pieceB, pPed->GetLocalDirection(pPed->GetPosition() - point.point)); @@ -146,9 +146,9 @@ void CBulletInfo::Update(void) if (pPed->GetPedState() == PED_DEAD) { CAnimBlendAssociation* pAnim; if (RpAnimBlendClumpGetFirstAssociation(pPed->GetClump(), ASSOC_FRONTAL)) - pAnim = CAnimManager::BlendAnimation(pPed->GetClump(), ASSOCGRP_STD, ANIM_FLOOR_HIT_F, 8.0f); + pAnim = CAnimManager::BlendAnimation(pPed->GetClump(), ASSOCGRP_STD, ANIM_STD_HIT_FLOOR_FRONT, 8.0f); else - pAnim = CAnimManager::BlendAnimation(pPed->GetClump(), ASSOCGRP_STD, ANIM_FLOOR_HIT, 8.0f); + pAnim = CAnimManager::BlendAnimation(pPed->GetClump(), ASSOCGRP_STD, ANIM_STD_HIT_FLOOR, 8.0f); if (pAnim) { pAnim->SetCurrentTime(0.0f); pAnim->flags |= ASSOC_RUNNING; |