diff options
| author | aap <aap@papnet.eu> | 2020-05-20 20:19:47 +0200 |
|---|---|---|
| committer | aap <aap@papnet.eu> | 2020-05-20 20:19:47 +0200 |
| commit | f2e55d57cc84af072d7955be90924c1cbdecfd9b (patch) | |
| tree | bcdf3151eaab37430d9aeac886a55acbe7f65ccd /src/entities | |
| parent | Merge branch 'miami' of github.com:GTAmodding/re3 into miami (diff) | |
| parent | Merge pull request #572 from erorcun/miami (diff) | |
| download | re3-f2e55d57cc84af072d7955be90924c1cbdecfd9b.tar re3-f2e55d57cc84af072d7955be90924c1cbdecfd9b.tar.gz re3-f2e55d57cc84af072d7955be90924c1cbdecfd9b.tar.bz2 re3-f2e55d57cc84af072d7955be90924c1cbdecfd9b.tar.lz re3-f2e55d57cc84af072d7955be90924c1cbdecfd9b.tar.xz re3-f2e55d57cc84af072d7955be90924c1cbdecfd9b.tar.zst re3-f2e55d57cc84af072d7955be90924c1cbdecfd9b.zip | |
Diffstat (limited to 'src/entities')
| -rw-r--r-- | src/entities/Entity.cpp | 4 | ||||
| -rw-r--r-- | src/entities/Physical.cpp | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/entities/Entity.cpp b/src/entities/Entity.cpp index efa67f36..a0c5c484 100644 --- a/src/entities/Entity.cpp +++ b/src/entities/Entity.cpp @@ -399,8 +399,8 @@ CEntity::HasPreRenderEffects(void) GetModelIndex() == MI_MISSILE || GetModelIndex() == MI_BEACHBALL || IsGlass(GetModelIndex()) || - IsObject() && ((CObject*)this)->bIsPickup; - IsStreetLight(GetModelIndex()); + IsObject() && ((CObject*)this)->bIsPickup || + IsLightWithPreRenderEffects(GetModelIndex()); } void diff --git a/src/entities/Physical.cpp b/src/entities/Physical.cpp index 423662f7..92542071 100644 --- a/src/entities/Physical.cpp +++ b/src/entities/Physical.cpp @@ -1067,13 +1067,13 @@ CPhysical::ProcessShiftSectorList(CPtrList *lists) if(B->IsBuilding()) skipShift = false; - else if(IsStreetLight(A->GetModelIndex()) && + else if(IsLightWithoutShift(A->GetModelIndex()) && (B->IsVehicle() || B->IsPed()) && A->GetUp().z < 0.66f) skipShift = true; else if((A->IsVehicle() || A->IsPed()) && B->GetUp().z < 0.66f && - IsStreetLight(B->GetModelIndex())) + IsLightWithoutShift(B->GetModelIndex())) skipShift = true; // TODO: maybe flip some ifs here else if(A->IsObject() && B->IsVehicle()){ @@ -1398,7 +1398,7 @@ CPhysical::ProcessCollisionSectorList(CPtrList *lists) if(B->IsBuilding()) skipCollision = false; - else if(IsStreetLight(A->GetModelIndex()) && + else if(IsLightWithoutShift(A->GetModelIndex()) && (B->IsVehicle() || B->IsPed()) && A->GetUp().z < 0.66f){ skipCollision = true; @@ -1406,7 +1406,7 @@ CPhysical::ProcessCollisionSectorList(CPtrList *lists) Aobj->m_pCollidingEntity = B; }else if((A->IsVehicle() || A->IsPed()) && B->GetUp().z < 0.66f && - IsStreetLight(B->GetModelIndex())){ + IsLightWithoutShift(B->GetModelIndex())){ skipCollision = true; A->bSkipLineCol = true; Bobj->m_pCollidingEntity = A; |