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/peds/CopPed.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/peds/CopPed.cpp')
-rw-r--r-- | src/peds/CopPed.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/peds/CopPed.cpp b/src/peds/CopPed.cpp index 29612ccf..44e3baf0 100644 --- a/src/peds/CopPed.cpp +++ b/src/peds/CopPed.cpp @@ -239,9 +239,9 @@ CCopPed::ArrestPlayer(void) if (suspect && (suspect->m_nPedState == PED_ARRESTED || suspect->DyingOrDead() || suspect->EnteringCar())) { - CAnimBlendAssociation *arrestAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_ARREST_GUN); + CAnimBlendAssociation *arrestAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_STD_ARREST); if (!arrestAssoc || arrestAssoc->blendDelta < 0.0f) - CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_ARREST_GUN, 4.0f); + CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_STD_ARREST, 4.0f); CVector suspMidPos; suspect->m_pedIK.GetComponentPosition(suspMidPos, PED_MID); @@ -401,7 +401,7 @@ CCopPed::CopAI(void) if (m_nPedState != PED_ATTACK && m_nPedState != PED_FIGHT && !m_bZoneDisabled) { CVector targetDist = playerOrHisVeh->GetPosition() - GetPosition(); if (m_fDistanceToTarget > 30.0f) { - CAnimBlendAssociation* crouchShootAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_RBLOCK_CSHOOT); + CAnimBlendAssociation* crouchShootAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_STD_RBLOCK_SHOOT); if (crouchShootAssoc) crouchShootAssoc->blendDelta = -1000.0f; |