diff options
| author | withmorten <morten.with@gmail.com> | 2021-01-25 14:06:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-25 14:06:53 +0100 |
| commit | 9d4053419b213a37e34f39a903b1226c9a6909d1 (patch) | |
| tree | e18ceeaef321e70bbd8d0f8d3aa7a9a7a4deb7ff /src/control/Script5.cpp | |
| parent | modelinfo and visibility plg fixes (diff) | |
| parent | make building with Codewarrior 7 possible (diff) | |
| download | re3-9d4053419b213a37e34f39a903b1226c9a6909d1.tar re3-9d4053419b213a37e34f39a903b1226c9a6909d1.tar.gz re3-9d4053419b213a37e34f39a903b1226c9a6909d1.tar.bz2 re3-9d4053419b213a37e34f39a903b1226c9a6909d1.tar.lz re3-9d4053419b213a37e34f39a903b1226c9a6909d1.tar.xz re3-9d4053419b213a37e34f39a903b1226c9a6909d1.tar.zst re3-9d4053419b213a37e34f39a903b1226c9a6909d1.zip | |
Diffstat (limited to 'src/control/Script5.cpp')
| -rw-r--r-- | src/control/Script5.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/control/Script5.cpp b/src/control/Script5.cpp index b03ff49d..cc70a170 100644 --- a/src/control/Script5.cpp +++ b/src/control/Script5.cpp @@ -2618,7 +2618,7 @@ bool CTheScripts::IsPedStopped(CPed* pPed) { if (pPed->InVehicle()) return IsVehicleStopped(pPed->m_pMyVehicle); - return (pPed->m_nMoveState == eMoveState::PEDMOVE_NONE || pPed->m_nMoveState == eMoveState::PEDMOVE_STILL) && + return (pPed->m_nMoveState == PEDMOVE_NONE || pPed->m_nMoveState == PEDMOVE_STILL) && !pPed->bIsInTheAir && !pPed->bIsLanding && pPed->bIsStanding && pPed->m_vecAnimMoveDelta.x == 0.0f && pPed->m_vecAnimMoveDelta.y == 0.0f; } @@ -2632,7 +2632,7 @@ bool CTheScripts::IsPlayerStopped(CPlayerInfo* pPlayer) RpAnimBlendClumpGetAssociation(pPed->GetClump(), ANIM_JUMP_LAUNCH) || RpAnimBlendClumpGetAssociation(pPed->GetClump(), ANIM_JUMP_GLIDE)) return false; - return (pPed->m_nMoveState == eMoveState::PEDMOVE_NONE || pPed->m_nMoveState == eMoveState::PEDMOVE_STILL) && + return (pPed->m_nMoveState == PEDMOVE_NONE || pPed->m_nMoveState == PEDMOVE_STILL) && !pPed->bIsInTheAir && !pPed->bIsLanding && pPed->bIsStanding && pPed->m_vecAnimMoveDelta.x == 0.0f && pPed->m_vecAnimMoveDelta.y == 0.0f; } |