summaryrefslogtreecommitdiffstats
path: root/src/control/Script5.cpp
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2021-02-03 01:14:48 +0100
committerGitHub <noreply@github.com>2021-02-03 01:14:48 +0100
commitb47a23ab794e3520c6ec9d1ee19d3f4e3153494c (patch)
tree411b4fcc6a353de7809816672bf4197785f314fc /src/control/Script5.cpp
parentMerge pull request #1017 from IlDucci/master (diff)
parentUse original animation names from VCS (diff)
downloadre3-b47a23ab794e3520c6ec9d1ee19d3f4e3153494c.tar
re3-b47a23ab794e3520c6ec9d1ee19d3f4e3153494c.tar.gz
re3-b47a23ab794e3520c6ec9d1ee19d3f4e3153494c.tar.bz2
re3-b47a23ab794e3520c6ec9d1ee19d3f4e3153494c.tar.lz
re3-b47a23ab794e3520c6ec9d1ee19d3f4e3153494c.tar.xz
re3-b47a23ab794e3520c6ec9d1ee19d3f4e3153494c.tar.zst
re3-b47a23ab794e3520c6ec9d1ee19d3f4e3153494c.zip
Diffstat (limited to 'src/control/Script5.cpp')
-rw-r--r--src/control/Script5.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/control/Script5.cpp b/src/control/Script5.cpp
index b54d425c..464a77d8 100644
--- a/src/control/Script5.cpp
+++ b/src/control/Script5.cpp
@@ -2450,10 +2450,10 @@ bool CTheScripts::IsPlayerStopped(CPlayerInfo* pPlayer)
CPed* pPed = pPlayer->m_pPed;
if (pPed->bInVehicle)
return IsVehicleStopped(pPed->m_pMyVehicle);
- if (RpAnimBlendClumpGetAssociation(pPed->GetClump(), ANIM_RUN_STOP) ||
- RpAnimBlendClumpGetAssociation(pPed->GetClump(), ANIM_RUN_STOP_R) ||
- RpAnimBlendClumpGetAssociation(pPed->GetClump(), ANIM_JUMP_LAUNCH) ||
- RpAnimBlendClumpGetAssociation(pPed->GetClump(), ANIM_JUMP_GLIDE))
+ if (RpAnimBlendClumpGetAssociation(pPed->GetClump(), ANIM_STD_RUNSTOP1) ||
+ RpAnimBlendClumpGetAssociation(pPed->GetClump(), ANIM_STD_RUNSTOP2) ||
+ RpAnimBlendClumpGetAssociation(pPed->GetClump(), ANIM_STD_JUMP_LAUNCH) ||
+ RpAnimBlendClumpGetAssociation(pPed->GetClump(), ANIM_STD_JUMP_GLIDE))
return false;
return pPed->m_nMoveState == PEDMOVE_NONE || pPed->m_nMoveState == PEDMOVE_STILL;
}