diff options
| author | eray orçunus <erayorcunus@gmail.com> | 2020-06-20 19:26:27 +0200 |
|---|---|---|
| committer | eray orçunus <erayorcunus@gmail.com> | 2020-06-20 19:26:27 +0200 |
| commit | cc60ad1946794bfa8cc8ae86e62829035ff6f360 (patch) | |
| tree | 2710ee93888a29547e66887e3977a4fb2f375dc4 /src/peds/Ped.cpp | |
| parent | more weapon fixes (diff) | |
| download | re3-cc60ad1946794bfa8cc8ae86e62829035ff6f360.tar re3-cc60ad1946794bfa8cc8ae86e62829035ff6f360.tar.gz re3-cc60ad1946794bfa8cc8ae86e62829035ff6f360.tar.bz2 re3-cc60ad1946794bfa8cc8ae86e62829035ff6f360.tar.lz re3-cc60ad1946794bfa8cc8ae86e62829035ff6f360.tar.xz re3-cc60ad1946794bfa8cc8ae86e62829035ff6f360.tar.zst re3-cc60ad1946794bfa8cc8ae86e62829035ff6f360.zip | |
Diffstat (limited to 'src/peds/Ped.cpp')
| -rw-r--r-- | src/peds/Ped.cpp | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/src/peds/Ped.cpp b/src/peds/Ped.cpp index 6f969c5c..8f7e02b7 100644 --- a/src/peds/Ped.cpp +++ b/src/peds/Ped.cpp @@ -1098,8 +1098,7 @@ CPed::FinishedAttackCB(CAnimBlendAssociation *attackAssoc, void *arg) return; } - // Not for unarmed, it's for weapons using unarmed anims - if (currentWeapon->m_bUse2nd && ped->bIsAttacking && currentWeapon->m_AnimToPlay == ASSOCGRP_UNARMED) { + if (currentWeapon->m_bUse2nd && ped->bIsAttacking && currentWeapon->m_AnimToPlay != ASSOCGRP_THROW) { AnimationId groundAnim = GetFireAnimGround(currentWeapon); CAnimBlendAssociation *groundAnimAssoc = RpAnimBlendClumpGetAssociation(ped->GetClump(), groundAnim); if (!groundAnimAssoc || groundAnimAssoc->blendAmount <= 0.95f && groundAnimAssoc->blendDelta <= 0.0f) { @@ -11392,14 +11391,6 @@ CPed::ProcessControl(void) if (m_nWaitState != WAITSTATE_FALSE) Wait(); - if (m_nPedState != PED_IDLE) { - CAnimBlendAssociation *idleAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_IDLE_ARMED); - if(idleAssoc) { - idleAssoc->blendDelta = -8.0f; - idleAssoc->flags |= ASSOC_DELETEFADEDOUT; - } - } - switch (m_nPedState) { case PED_IDLE: Idle(); |