diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2021-06-30 20:26:36 +0200 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2021-06-30 20:26:36 +0200 |
| commit | 138abb91f6232ef40e1093b3c37122e1b0bf2cf1 (patch) | |
| tree | c4c694734bb56c29ddf8b5bbd891741540a7c68b /src/peds/PlayerPed.cpp | |
| parent | Fix script load (diff) | |
| parent | Pause radio when game is paused (diff) | |
| download | re3-138abb91f6232ef40e1093b3c37122e1b0bf2cf1.tar re3-138abb91f6232ef40e1093b3c37122e1b0bf2cf1.tar.gz re3-138abb91f6232ef40e1093b3c37122e1b0bf2cf1.tar.bz2 re3-138abb91f6232ef40e1093b3c37122e1b0bf2cf1.tar.lz re3-138abb91f6232ef40e1093b3c37122e1b0bf2cf1.tar.xz re3-138abb91f6232ef40e1093b3c37122e1b0bf2cf1.tar.zst re3-138abb91f6232ef40e1093b3c37122e1b0bf2cf1.zip | |
Diffstat (limited to 'src/peds/PlayerPed.cpp')
| -rw-r--r-- | src/peds/PlayerPed.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/peds/PlayerPed.cpp b/src/peds/PlayerPed.cpp index 452dda4d..c82fe850 100644 --- a/src/peds/PlayerPed.cpp +++ b/src/peds/PlayerPed.cpp @@ -837,8 +837,8 @@ CPlayerPed::PlayerControlFighter(CPad *padUsed) if (padMove > 0.0f) { m_fRotationDest = CGeneral::GetRadianAngleBetweenPoints(0.0f, 0.0f, -leftRight, upDown) - TheCamera.Orientation; - m_takeAStepAfterAttack = padMove > 2 * PAD_MOVE_TO_GAME_WORLD_MOVE; - if (padUsed->GetSprint() && padMove > 1 * PAD_MOVE_TO_GAME_WORLD_MOVE) + m_takeAStepAfterAttack = padMove > (2 * PAD_MOVE_TO_GAME_WORLD_MOVE); + if (padUsed->GetSprint() && padMove > (1 * PAD_MOVE_TO_GAME_WORLD_MOVE)) bIsAttacking = false; } @@ -2081,13 +2081,13 @@ CPlayerPed::UpdateMeleeAttackers(void) void CPlayerPed::RemovePedFromMeleeList(CPed *ped) { - int i = 0; - for (; m_pMeleeList[i] != ped; i++) { - if (i >= ARRAY_SIZE(m_pMeleeList)) + for (uint16 i = 0; i < ARRAY_SIZE(m_pMeleeList); i++) { + if (m_pMeleeList[i] == ped) { + m_pMeleeList[i] = nil; + ped->m_attackTimer = 0; return; + } } - m_pMeleeList[i] = nil; - ped->m_attackTimer = 0; } void |