diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-05-20 22:54:22 +0200 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-05-20 22:54:22 +0200 |
| commit | 510261cb058d00bc0388ad58a33b173e5b1536ac (patch) | |
| tree | 2aa795fe25f5d3bc4fa22d93f7a966838e50b3b5 /src/entities/Physical.cpp | |
| parent | script revision (diff) | |
| parent | Pickup and audio fix (diff) | |
| download | re3-510261cb058d00bc0388ad58a33b173e5b1536ac.tar re3-510261cb058d00bc0388ad58a33b173e5b1536ac.tar.gz re3-510261cb058d00bc0388ad58a33b173e5b1536ac.tar.bz2 re3-510261cb058d00bc0388ad58a33b173e5b1536ac.tar.lz re3-510261cb058d00bc0388ad58a33b173e5b1536ac.tar.xz re3-510261cb058d00bc0388ad58a33b173e5b1536ac.tar.zst re3-510261cb058d00bc0388ad58a33b173e5b1536ac.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/entities/Physical.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
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; |