diff options
| author | aap <aap@papnet.eu> | 2020-05-19 21:42:55 +0200 |
|---|---|---|
| committer | aap <aap@papnet.eu> | 2020-05-19 21:42:55 +0200 |
| commit | 0b0ba49abc34315f532f9adcdbc277d5275723c7 (patch) | |
| tree | eaad5557debdcc21e0936cb47ba9eb975d1431ea /src/entities/Physical.cpp | |
| parent | little cleanup of handlingmgr (diff) | |
| download | re3-0b0ba49abc34315f532f9adcdbc277d5275723c7.tar re3-0b0ba49abc34315f532f9adcdbc277d5275723c7.tar.gz re3-0b0ba49abc34315f532f9adcdbc277d5275723c7.tar.bz2 re3-0b0ba49abc34315f532f9adcdbc277d5275723c7.tar.lz re3-0b0ba49abc34315f532f9adcdbc277d5275723c7.tar.xz re3-0b0ba49abc34315f532f9adcdbc277d5275723c7.tar.zst re3-0b0ba49abc34315f532f9adcdbc277d5275723c7.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 64358cbf..31f8fcbc 100644 --- a/src/entities/Physical.cpp +++ b/src/entities/Physical.cpp @@ -1076,13 +1076,13 @@ CPhysical::ProcessShiftSectorList(CPtrList *lists) if(B->IsBuilding()) skipShift = false; - else if(IsTrafficLight(A->GetModelIndex()) && + else if(IsStreetLight(A->GetModelIndex()) && (B->IsVehicle() || B->IsPed()) && A->GetUp().z < 0.66f) skipShift = true; else if((A->IsVehicle() || A->IsPed()) && B->GetUp().z < 0.66f && - IsTrafficLight(B->GetModelIndex())) + IsStreetLight(B->GetModelIndex())) skipShift = true; // TODO: maybe flip some ifs here else if(A->IsObject() && B->IsVehicle()){ @@ -1407,7 +1407,7 @@ CPhysical::ProcessCollisionSectorList(CPtrList *lists) if(B->IsBuilding()) skipCollision = false; - else if(IsTrafficLight(A->GetModelIndex()) && + else if(IsStreetLight(A->GetModelIndex()) && (B->IsVehicle() || B->IsPed()) && A->GetUp().z < 0.66f){ skipCollision = true; @@ -1415,7 +1415,7 @@ CPhysical::ProcessCollisionSectorList(CPtrList *lists) Aobj->m_pCollidingEntity = B; }else if((A->IsVehicle() || A->IsPed()) && B->GetUp().z < 0.66f && - IsTrafficLight(B->GetModelIndex())){ + IsStreetLight(B->GetModelIndex())){ skipCollision = true; A->bSkipLineCol = true; Bobj->m_pCollidingEntity = A; |