summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2020-08-07 13:13:04 +0200
committeraap <aap@papnet.eu>2020-08-07 13:13:04 +0200
commit658f94f15591b6cb4c73f51ec5e2f7e3e99462e7 (patch)
tree4024f7709a9520a0b2607a58e5ce0365e454178b
parentMerge remote-tracking branch 'origin/master' into miami (diff)
downloadre3-658f94f15591b6cb4c73f51ec5e2f7e3e99462e7.tar
re3-658f94f15591b6cb4c73f51ec5e2f7e3e99462e7.tar.gz
re3-658f94f15591b6cb4c73f51ec5e2f7e3e99462e7.tar.bz2
re3-658f94f15591b6cb4c73f51ec5e2f7e3e99462e7.tar.lz
re3-658f94f15591b6cb4c73f51ec5e2f7e3e99462e7.tar.xz
re3-658f94f15591b6cb4c73f51ec5e2f7e3e99462e7.tar.zst
re3-658f94f15591b6cb4c73f51ec5e2f7e3e99462e7.zip
-rw-r--r--src/peds/Ped.cpp8
-rw-r--r--src/render/Shadows.cpp2
2 files changed, 4 insertions, 6 deletions
diff --git a/src/peds/Ped.cpp b/src/peds/Ped.cpp
index 4e1c3c6d..be39f26e 100644
--- a/src/peds/Ped.cpp
+++ b/src/peds/Ped.cpp
@@ -2788,14 +2788,12 @@ CPed::SetModelIndex(uint32 mi)
// This is a mistake by R*, velocity is CVector, whereas m_vecAnimMoveDelta is CVector2D.
(*RPANIMBLENDCLUMPDATA(m_rwObject))->velocity = (CVector*) &m_vecAnimMoveDelta;
-#ifdef PED_SKIN
if(modelInfo->GetHitColModel() == nil)
modelInfo->CreateHitColModelSkinned(GetClump());
- if (IsClumpSkinned(GetClump())) // condition isn't there in VC
- UpdateRpHAnim();
-#endif
-#if 1
+ UpdateRpHAnim();
+
+#ifndef LIBRW
if (!m_pRTShadow)
{
m_pRTShadow = new CCutsceneShadow;
diff --git a/src/render/Shadows.cpp b/src/render/Shadows.cpp
index 9b864d27..0ee63b9a 100644
--- a/src/render/Shadows.cpp
+++ b/src/render/Shadows.cpp
@@ -853,7 +853,7 @@ CShadows::StoreShadowForPed(CPed *pPed, float fDisplacementX, float fDisplacemen
{
if ( CTimeCycle::GetShadowStrength() != 0 )
{
- #if 1
+ #ifndef LIBRW
CCutsceneShadow *pShadow = pPed->m_pRTShadow;
if (pShadow)