summaryrefslogtreecommitdiffstats
path: root/src/core/World.cpp
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2019-08-17 21:24:26 +0200
committerGitHub <noreply@github.com>2019-08-17 21:24:26 +0200
commited9ab6c55f5316baa7ce420a682097fcfe8afb05 (patch)
treec05b0093155e8d7a76646cee93a50429430b3b54 /src/core/World.cpp
parentMerge pull request #194 from Nick007J/master (diff)
parentAnimViewer messages, Particle fix, Peds (diff)
downloadre3-ed9ab6c55f5316baa7ce420a682097fcfe8afb05.tar
re3-ed9ab6c55f5316baa7ce420a682097fcfe8afb05.tar.gz
re3-ed9ab6c55f5316baa7ce420a682097fcfe8afb05.tar.bz2
re3-ed9ab6c55f5316baa7ce420a682097fcfe8afb05.tar.lz
re3-ed9ab6c55f5316baa7ce420a682097fcfe8afb05.tar.xz
re3-ed9ab6c55f5316baa7ce420a682097fcfe8afb05.tar.zst
re3-ed9ab6c55f5316baa7ce420a682097fcfe8afb05.zip
Diffstat (limited to 'src/core/World.cpp')
-rw-r--r--src/core/World.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/core/World.cpp b/src/core/World.cpp
index 9c3aafcf..150e87d5 100644
--- a/src/core/World.cpp
+++ b/src/core/World.cpp
@@ -294,10 +294,14 @@ CWorld::ProcessLineOfSightSectorList(CPtrList &list, const CColLine &line, CColP
if(e->IsPed()){
if(e->bUsesCollision ||
deadPeds && ((CPed*)e)->m_nPedState == PED_DEAD){
- if(((CPed*)e)->UseGroundColModel())
+ if (((CPed*)e)->UseGroundColModel())
colmodel = &CTempColModels::ms_colModelPedGroundHit;
else
+#ifdef ANIMATE_PED_COL_MODEL
+ colmodel = CPedModelInfo::AnimatePedColModel(((CPedModelInfo*)CModelInfo::GetModelInfo(e->GetModelIndex()))->GetHitColModel(), RpClumpGetFrame(e->GetClump()));
+#else
colmodel = ((CPedModelInfo*)CModelInfo::GetModelInfo(e->GetModelIndex()))->GetHitColModel();
+#endif
}else
colmodel = nil;
}else if(e->bUsesCollision)