diff options
author | aap <aap@papnet.eu> | 2020-04-24 13:49:30 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-04-24 13:49:30 +0200 |
commit | 17dda21cca625d9c985dded2c3b80746eb937c01 (patch) | |
tree | c4be4fa57b16c61d45e8156a51dd07b11e049bba /src/core/AnimViewer.cpp | |
parent | removed fix that made no sense (diff) | |
parent | implemented skinned peds, no cutscene hands yet (diff) | |
download | re3-17dda21cca625d9c985dded2c3b80746eb937c01.tar re3-17dda21cca625d9c985dded2c3b80746eb937c01.tar.gz re3-17dda21cca625d9c985dded2c3b80746eb937c01.tar.bz2 re3-17dda21cca625d9c985dded2c3b80746eb937c01.tar.lz re3-17dda21cca625d9c985dded2c3b80746eb937c01.tar.xz re3-17dda21cca625d9c985dded2c3b80746eb937c01.tar.zst re3-17dda21cca625d9c985dded2c3b80746eb937c01.zip |
Diffstat (limited to 'src/core/AnimViewer.cpp')
-rw-r--r-- | src/core/AnimViewer.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/core/AnimViewer.cpp b/src/core/AnimViewer.cpp index 20e94bf4..cf3ec5bf 100644 --- a/src/core/AnimViewer.cpp +++ b/src/core/AnimViewer.cpp @@ -367,7 +367,12 @@ CAnimViewer::Update(void) } else { // Originally it was GetPad(1)->LeftShoulder2 if (pad->NewState.Triangle) { - CPedModelInfo::AnimatePedColModel(((CPedModelInfo*)CModelInfo::GetModelInfo(pTarget->m_modelIndex))->GetHitColModel(), RpClumpGetFrame(pTarget->GetClump())); +#ifdef PED_SKIN + if(IsClumpSkinned(pTarget->GetClump())) + ((CPedModelInfo*)CModelInfo::GetModelInfo(pTarget->m_modelIndex))->AnimatePedColModelSkinned(pTarget->GetClump()); + else +#endif + CPedModelInfo::AnimatePedColModel(((CPedModelInfo*)CModelInfo::GetModelInfo(pTarget->m_modelIndex))->GetHitColModel(), RpClumpGetFrame(pTarget->GetClump())); AsciiToUnicode("Ped Col model will be animated as long as you hold the button", gUString); CMessages::AddMessage(gUString, 100, 0); } |