summaryrefslogtreecommitdiffstats
path: root/src/entities/Physical.cpp
diff options
context:
space:
mode:
authoreray orçunus <erayorcunus@gmail.com>2020-05-20 19:10:05 +0200
committereray orçunus <erayorcunus@gmail.com>2020-05-20 19:21:27 +0200
commit2ab3fb5dd02aad980718f1ac176f06f7b7e25f41 (patch)
tree974cd9b8b95fb9655621143932eca14154fe7df6 /src/entities/Physical.cpp
parentMerge pull request #569 from aap/miami (diff)
downloadre3-2ab3fb5dd02aad980718f1ac176f06f7b7e25f41.tar
re3-2ab3fb5dd02aad980718f1ac176f06f7b7e25f41.tar.gz
re3-2ab3fb5dd02aad980718f1ac176f06f7b7e25f41.tar.bz2
re3-2ab3fb5dd02aad980718f1ac176f06f7b7e25f41.tar.lz
re3-2ab3fb5dd02aad980718f1ac176f06f7b7e25f41.tar.xz
re3-2ab3fb5dd02aad980718f1ac176f06f7b7e25f41.tar.zst
re3-2ab3fb5dd02aad980718f1ac176f06f7b7e25f41.zip
Diffstat (limited to '')
-rw-r--r--src/entities/Physical.cpp8
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;