diff options
author | aap <aap@papnet.eu> | 2020-06-15 22:51:47 +0200 |
---|---|---|
committer | aap <aap@papnet.eu> | 2020-06-15 22:51:47 +0200 |
commit | dc7d4e113495fbb53dc9ebc404e9dbfe22b8eedc (patch) | |
tree | cd99240de1f87a71af0e7f5938f36fd5f7d77a8c /src/peds/PlayerPed.cpp | |
parent | more CCam (diff) | |
parent | Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami (diff) | |
download | re3-dc7d4e113495fbb53dc9ebc404e9dbfe22b8eedc.tar re3-dc7d4e113495fbb53dc9ebc404e9dbfe22b8eedc.tar.gz re3-dc7d4e113495fbb53dc9ebc404e9dbfe22b8eedc.tar.bz2 re3-dc7d4e113495fbb53dc9ebc404e9dbfe22b8eedc.tar.lz re3-dc7d4e113495fbb53dc9ebc404e9dbfe22b8eedc.tar.xz re3-dc7d4e113495fbb53dc9ebc404e9dbfe22b8eedc.tar.zst re3-dc7d4e113495fbb53dc9ebc404e9dbfe22b8eedc.zip |
Diffstat (limited to '')
-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)); |