diff options
| author | aap <aap@papnet.eu> | 2020-05-10 13:08:02 +0200 |
|---|---|---|
| committer | aap <aap@papnet.eu> | 2020-05-10 13:08:02 +0200 |
| commit | f7300c7a27c3f2633419fe73ec2643fc9d4951cf (patch) | |
| tree | 6483fb404f227882bdaf0979e919adb29887c03d /src/core/World.cpp | |
| parent | Merge pull request #530 from Nick007J/miami (diff) | |
| download | re3-f7300c7a27c3f2633419fe73ec2643fc9d4951cf.tar re3-f7300c7a27c3f2633419fe73ec2643fc9d4951cf.tar.gz re3-f7300c7a27c3f2633419fe73ec2643fc9d4951cf.tar.bz2 re3-f7300c7a27c3f2633419fe73ec2643fc9d4951cf.tar.lz re3-f7300c7a27c3f2633419fe73ec2643fc9d4951cf.tar.xz re3-f7300c7a27c3f2633419fe73ec2643fc9d4951cf.tar.zst re3-f7300c7a27c3f2633419fe73ec2643fc9d4951cf.zip | |
Diffstat (limited to 'src/core/World.cpp')
| -rw-r--r-- | src/core/World.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/core/World.cpp b/src/core/World.cpp index 3e07721a..e48d0f75 100644 --- a/src/core/World.cpp +++ b/src/core/World.cpp @@ -339,11 +339,8 @@ CWorld::ProcessLineOfSightSectorList(CPtrList &list, const CColLine &line, CColP if(e->IsPed()) { if(e->bUsesCollision || deadPeds && ((CPed *)e)->m_nPedState == PED_DEAD) { -#ifdef PED_SKIN - if(IsClumpSkinned(e->GetClump())) - colmodel = ((CPedModelInfo *)CModelInfo::GetModelInfo(e->GetModelIndex()))->AnimatePedColModelSkinned(e->GetClump()); - else -#endif + colmodel = ((CPedModelInfo *)CModelInfo::GetModelInfo(e->GetModelIndex()))->AnimatePedColModelSkinned(e->GetClump()); +/* this should all be gone, right? if(((CPed *)e)->UseGroundColModel()) colmodel = &CTempColModels::ms_colModelPedGroundHit; else @@ -357,8 +354,10 @@ CWorld::ProcessLineOfSightSectorList(CPtrList &list, const CColLine &line, CColP ((CPedModelInfo *)CModelInfo::GetModelInfo(e->GetModelIndex())) ->GetHitColModel(); #endif +*/ } else colmodel = nil; + } else if(e->bUsesCollision) colmodel = CModelInfo::GetModelInfo(e->GetModelIndex())->GetColModel(); |