diff options
| author | aap <aap@papnet.eu> | 2020-05-17 20:20:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-17 20:20:14 +0200 |
| commit | 8a7210cad162930e800f9632afd99ec15a75ebcf (patch) | |
| tree | b4f2b7bcc798fbc86867839b00cb9b79fd6eecf1 /src/peds/PlayerPed.cpp | |
| parent | loading screens (diff) | |
| parent | Weapon fixes and thingies (diff) | |
| download | re3-8a7210cad162930e800f9632afd99ec15a75ebcf.tar re3-8a7210cad162930e800f9632afd99ec15a75ebcf.tar.gz re3-8a7210cad162930e800f9632afd99ec15a75ebcf.tar.bz2 re3-8a7210cad162930e800f9632afd99ec15a75ebcf.tar.lz re3-8a7210cad162930e800f9632afd99ec15a75ebcf.tar.xz re3-8a7210cad162930e800f9632afd99ec15a75ebcf.tar.zst re3-8a7210cad162930e800f9632afd99ec15a75ebcf.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/peds/PlayerPed.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/peds/PlayerPed.cpp b/src/peds/PlayerPed.cpp index 826cc9e9..69a6d211 100644 --- a/src/peds/PlayerPed.cpp +++ b/src/peds/PlayerPed.cpp @@ -451,7 +451,7 @@ CPlayerPed::SetRealMoveAnim(void) } else if (curSprintAssoc->blendDelta >= 0.0f || curSprintAssoc->blendAmount >= 0.8f) { if (m_fMoveSpeed < 0.4f) { AnimationId runStopAnim; - if (curSprintAssoc->currentTime / curSprintAssoc->hierarchy->totalLength < 0.5) // double + if (curSprintAssoc->GetProgress() < 0.5) // double runStopAnim = ANIM_RUN_STOP; else runStopAnim = ANIM_RUN_STOP_R; @@ -638,7 +638,7 @@ CPlayerPed::PlayerControlSniper(CPad *padUsed) firePos = GetMatrix() * firePos; GetWeapon()->Fire(this, &firePos); } - GetWeapon()->Update(m_audioEntityId); + GetWeapon()->Update(m_audioEntityId, nil); } // --MIAMI: Made compatible with slots, but still TODO @@ -742,7 +742,7 @@ CPlayerPed::PlayerControlM16(CPad *padUsed) firePos = GetMatrix() * firePos; GetWeapon()->Fire(this, &firePos); } - GetWeapon()->Update(m_audioEntityId); + GetWeapon()->Update(m_audioEntityId, nil); } void @@ -1561,7 +1561,7 @@ CPlayerPed::ProcessControl(void) } if (padUsed && IsPedShootable()) { ProcessWeaponSwitch(padUsed); - GetWeapon()->Update(m_audioEntityId); + GetWeapon()->Update(m_audioEntityId, this); } ProcessAnimGroups(); if (padUsed) { |