diff options
author | Sergeanur <s.anureev@yandex.ua> | 2021-02-03 01:14:48 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-02-03 01:14:48 +0100 |
commit | b47a23ab794e3520c6ec9d1ee19d3f4e3153494c (patch) | |
tree | 411b4fcc6a353de7809816672bf4197785f314fc /src/core/AnimViewer.cpp | |
parent | Merge pull request #1017 from IlDucci/master (diff) | |
parent | Use original animation names from VCS (diff) | |
download | re3-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 '')
-rw-r--r-- | src/core/AnimViewer.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/AnimViewer.cpp b/src/core/AnimViewer.cpp index a888d528..946693a7 100644 --- a/src/core/AnimViewer.cpp +++ b/src/core/AnimViewer.cpp @@ -230,7 +230,7 @@ CAnimViewer::Update(void) if (modelInfo->GetModelType() == MITYPE_PED) { int animGroup = ((CPedModelInfo*)modelInfo)->m_animGroup; - if (animId > ANIM_IDLE_STANCE) + if (animId > ANIM_STD_IDLE) animGroup = ASSOCGRP_STD; if (reloadIFP) { @@ -318,14 +318,14 @@ CAnimViewer::Update(void) CMessages::AddMessage(gUString, 1000, 0); } else if (pad->GetCircleJustDown()) { - PlayAnimation(pTarget->GetClump(), animGroup, ANIM_IDLE_STANCE); + PlayAnimation(pTarget->GetClump(), animGroup, ANIM_STD_IDLE); AsciiToUnicode("Idle animation playing", gUString); CMessages::AddMessage(gUString, 1000, 0); } else if (pad->GetDPadUpJustDown()) { animId--; if (animId < 0) { - animId = NUM_ANIMS - 1; + animId = ANIM_STD_NUM - 1; } PlayAnimation(pTarget->GetClump(), animGroup, (AnimationId)animId); @@ -334,7 +334,7 @@ CAnimViewer::Update(void) CMessages::AddMessage(gUString, 1000, 0); } else if (pad->GetDPadDownJustDown()) { - animId = (animId == (NUM_ANIMS - 1) ? 0 : animId + 1); + animId = (animId == (ANIM_STD_NUM - 1) ? 0 : animId + 1); PlayAnimation(pTarget->GetClump(), animGroup, (AnimationId)animId); sprintf(gString, "Current anim: %d", animId); |