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/render/SpecialFX.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/render/SpecialFX.cpp')
| -rw-r--r-- | src/render/SpecialFX.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/render/SpecialFX.cpp b/src/render/SpecialFX.cpp index 16057420..fc081fa3 100644 --- a/src/render/SpecialFX.cpp +++ b/src/render/SpecialFX.cpp @@ -117,8 +117,14 @@ CSpecialFX::Update(void) if(FindPlayerPed() && FindPlayerPed()->GetWeapon()->m_eWeaponType == WEAPONTYPE_BASEBALLBAT && - FindPlayerPed()->GetWeapon()->m_eWeaponState == WEAPONSTATE_FIRING) - RwFrameForAllObjects(FindPlayerPed()->GetNodeFrame(PED_HANDR), LookForBatCB, CModelInfo::GetModelInfo(MI_BASEBALL_BAT)); + FindPlayerPed()->GetWeapon()->m_eWeaponState == WEAPONSTATE_FIRING){ +#ifdef PED_SKIN + if(IsClumpSkinned(FindPlayerPed()->GetClump())){ + LookForBatCB((RwObject*)FindPlayerPed()->m_pWeaponModel, CModelInfo::GetModelInfo(MI_BASEBALL_BAT)); + }else +#endif + RwFrameForAllObjects(FindPlayerPed()->m_pFrames[PED_HANDR]->frame, LookForBatCB, CModelInfo::GetModelInfo(MI_BASEBALL_BAT)); + } } void |