diff options
author | erorcun <erayorcunus@gmail.com> | 2020-06-16 22:02:21 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-06-16 22:02:21 +0200 |
commit | d322a8033e07cf286891fdc165c7b77dfe6b762e (patch) | |
tree | 30a5d3a4181030ca731ae38f20df077a22b91e67 /src/peds/PlayerPed.cpp | |
parent | Update ModelIndices.h (diff) | |
parent | fix crash-VC pickup scaling (diff) | |
download | re3-d322a8033e07cf286891fdc165c7b77dfe6b762e.tar re3-d322a8033e07cf286891fdc165c7b77dfe6b762e.tar.gz re3-d322a8033e07cf286891fdc165c7b77dfe6b762e.tar.bz2 re3-d322a8033e07cf286891fdc165c7b77dfe6b762e.tar.lz re3-d322a8033e07cf286891fdc165c7b77dfe6b762e.tar.xz re3-d322a8033e07cf286891fdc165c7b77dfe6b762e.tar.zst re3-d322a8033e07cf286891fdc165c7b77dfe6b762e.zip |
Diffstat (limited to 'src/peds/PlayerPed.cpp')
-rw-r--r-- | src/peds/PlayerPed.cpp | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/src/peds/PlayerPed.cpp b/src/peds/PlayerPed.cpp index 08f79c7e..ee6891c7 100644 --- a/src/peds/PlayerPed.cpp +++ b/src/peds/PlayerPed.cpp @@ -81,7 +81,7 @@ CPlayerPed::CPlayerPed(void) : CPed(PEDTYPE_PLAYER1) for (int i = 0; i < 6; i++) { m_vecSafePos[i] = CVector(0.0f, 0.0f, 0.0f); m_pPedAtSafePos[i] = nil; - m_pCheckPlayers[i] = nil; + m_pMeleeList[i] = nil; } m_nCheckPlayersIndex = 0; m_nPadUpPressedInMilliseconds = 0; @@ -1711,6 +1711,18 @@ CPlayerPed::PlayIdleAnimations(CPad *padUsed) } } +void +CPlayerPed::RemovePedFromMeleeList(CPed *ped) +{ + int i = 0; + for (; m_pMeleeList[i] != ped; i++) { + if (i >= ARRAY_SIZE(m_pMeleeList)) + return; + } + m_pMeleeList[i] = nil; + ped->m_attackTimer = 0; +} + #ifdef COMPATIBLE_SAVES #define CopyFromBuf(buf, data) memcpy(&data, buf, sizeof(data)); SkipSaveBuf(buf, sizeof(data)); #define CopyToBuf(buf, data) memcpy(buf, &data, sizeof(data)); SkipSaveBuf(buf, sizeof(data)); |