diff options
| author | eray orçunus <erayorcunus@gmail.com> | 2019-06-20 23:44:06 +0200 |
|---|---|---|
| committer | eray orçunus <erayorcunus@gmail.com> | 2019-06-20 23:44:06 +0200 |
| commit | 817f8b0e3fb974ab5765975856ad8de195524d16 (patch) | |
| tree | 218d1fcded5f2f5028033ee3335b5f55546a310f /src | |
| parent | Merge branch 'master' of git://github.com/GTAmodding/re3 into eray (diff) | |
| download | re3-817f8b0e3fb974ab5765975856ad8de195524d16.tar re3-817f8b0e3fb974ab5765975856ad8de195524d16.tar.gz re3-817f8b0e3fb974ab5765975856ad8de195524d16.tar.bz2 re3-817f8b0e3fb974ab5765975856ad8de195524d16.tar.lz re3-817f8b0e3fb974ab5765975856ad8de195524d16.tar.xz re3-817f8b0e3fb974ab5765975856ad8de195524d16.tar.zst re3-817f8b0e3fb974ab5765975856ad8de195524d16.zip | |
Diffstat (limited to 'src')
| -rw-r--r-- | src/entities/Ped.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/entities/Ped.cpp b/src/entities/Ped.cpp index 2977ab19..81534915 100644 --- a/src/entities/Ped.cpp +++ b/src/entities/Ped.cpp @@ -678,13 +678,14 @@ CPed::Attack(void) if (!weaponAnimAssoc) { if (ourWeapon->m_bThrow) { - weaponAnimAssoc = RpAnimBlendClumpGetAssociation((RpClump*)m_rwObject, ANIM_WEAPON_THROWU); + weaponAnimAssoc = RpAnimBlendClumpGetAssociation((RpClump*) m_rwObject, ANIM_WEAPON_THROWU); delayBetweenAnimAndFire = 0.2f; } else { weaponAnimAssoc = RpAnimBlendClumpGetAssociation((RpClump*) m_rwObject, ourWeapon->m_Anim2ToPlay); delayBetweenAnimAndFire = ourWeapon->m_fAnim2FrameFire; } - } else { + } + if (weaponAnimAssoc) { animStart = ourWeapon->m_fAnimLoopStart; weaponAnimTime = weaponAnimAssoc->currentTime; if (weaponAnimTime > animStart && weaponAnimTime - weaponAnimAssoc->timeStep <= animStart) { |