diff options
author | Nikolay Korolev <nickvnuk@gmail.com> | 2021-01-26 00:25:47 +0100 |
---|---|---|
committer | Nikolay Korolev <nickvnuk@gmail.com> | 2021-01-26 00:25:47 +0100 |
commit | 46e63da4d8e6b4c50a663e98d150bd83e0eefb83 (patch) | |
tree | e7a03e5010280216424260da796151cc8c235e15 /src/control/Script5.cpp | |
parent | garage stuff (diff) | |
parent | Merge pull request #992 from ForeverL95/ForeverL95-patch-1 (diff) | |
download | re3-46e63da4d8e6b4c50a663e98d150bd83e0eefb83.tar re3-46e63da4d8e6b4c50a663e98d150bd83e0eefb83.tar.gz re3-46e63da4d8e6b4c50a663e98d150bd83e0eefb83.tar.bz2 re3-46e63da4d8e6b4c50a663e98d150bd83e0eefb83.tar.lz re3-46e63da4d8e6b4c50a663e98d150bd83e0eefb83.tar.xz re3-46e63da4d8e6b4c50a663e98d150bd83e0eefb83.tar.zst re3-46e63da4d8e6b4c50a663e98d150bd83e0eefb83.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 74d187ca..502bc005 100644 --- a/src/control/Script5.cpp +++ b/src/control/Script5.cpp @@ -2665,7 +2665,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; } @@ -2679,7 +2679,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; } |