4 files changed, 15 insertions, 15 deletions

diff --git a/src/entities/Physical.cpp b/src/entities/Physical.cpp
index 107afccb..842104a4 100644
--- a/src/entities/Physical.cpp
+++ b/src/entities/Physical.cpp
@@ -54,7 +54,7 @@ CPhysical::CPhysical(void)
 	bInfiniteMass = false;
 	bIsInWater = false;
 	bHitByTrain = false;
-	m_phy_flagA80 = false;
+	bSkipLineCol = false;
 
 	m_fDistanceTravelled = 0.0f;
 	m_treadable[PATH_CAR] = nil;
@@ -1401,7 +1401,7 @@ CPhysical::ProcessCollisionSectorList(CPtrList *lists)
 				continue;
 			}
 
-			A->m_phy_flagA80 = false;
+			A->bSkipLineCol = false;
 			skipCollision = false;
 			altcollision = false;
 
@@ -1411,13 +1411,13 @@ CPhysical::ProcessCollisionSectorList(CPtrList *lists)
 			  (B->IsVehicle() || B->IsPed()) &&
 			  A->GetUp().z < 0.66f){
 				skipCollision = true;
-				A->m_phy_flagA80 = true;
+				A->bSkipLineCol = true;
 				Aobj->m_pCollidingEntity = B;
 			}else if((A->IsVehicle() || A->IsPed()) &&
 			  B->GetUp().z < 0.66f &&
 			  IsTrafficLight(B->GetModelIndex())){
 				skipCollision = true;
-				A->m_phy_flagA80 = true;
+				A->bSkipLineCol = true;
 				Bobj->m_pCollidingEntity = A;
 			}else if(A->IsObject() && B->IsVehicle()){
 				if(A->GetModelIndex() == MI_CAR_BUMPER || A->GetModelIndex() == MI_FILES)
@@ -1460,18 +1460,18 @@ CPhysical::ProcessCollisionSectorList(CPtrList *lists)
 				skipCollision = true;
 			}else if(A->IsPed() && IsBodyPart(B->GetModelIndex())){
 				skipCollision = true;
-				A->m_phy_flagA80 = true;
+				A->bSkipLineCol = true;
 			}else if(A->IsPed() && Aped->m_pCollidingEntity == B){
 				skipCollision = true;
 				if(!Aped->bKnockedUpIntoAir)
-					A->m_phy_flagA80 = true;
+					A->bSkipLineCol = true;
 			}else if(B->IsPed() && Bped->m_pCollidingEntity == A){
 				skipCollision = true;
-				A->m_phy_flagA80 = true;
+				A->bSkipLineCol = true;
 			}else if(A->GetModelIndex() == MI_RCBANDIT && (B->IsPed() || B->IsVehicle()) ||
 			         B->GetModelIndex() == MI_RCBANDIT && (A->IsPed() || A->IsVehicle())){
 				skipCollision = true;
-				A->m_phy_flagA80 = true;
+				A->bSkipLineCol = true;
 			}else if(A->IsPed() && B->IsObject() && Bobj->m_fUprootLimit > 0.0f)
 				altcollision = true;
 
@@ -1804,7 +1804,7 @@ CPhysical::ProcessCollision(void)
 
 	m_fDistanceTravelled = 0.0f;
 	m_bIsVehicleBeingShifted = false;
-	m_phy_flagA80 = false;
+	bSkipLineCol = false;
 
 	if(!bUsesCollision){
 		bIsStuck = false;
@@ -1917,7 +1917,7 @@ CPhysical::ProcessCollision(void)
 	ApplyTurnSpeed();
 	GetMatrix().Reorthogonalise();
 	m_bIsVehicleBeingShifted = false;
-	m_phy_flagA80 = false;
+	bSkipLineCol = false;
 	if(!m_vecMoveSpeed.IsZero() ||
 	   !m_vecTurnSpeed.IsZero() ||
 	   bHitByTrain ||
@@ -1931,7 +1931,7 @@ CPhysical::ProcessCollision(void)
 	}
 	bHitByTrain = false;
 	m_fDistanceTravelled = (GetPosition() - savedMatrix.GetPosition()).Magnitude();
-	m_phy_flagA80 = false;
+	bSkipLineCol = false;
 
 	bIsStuck = false;
 	bIsInSafePosition = true;
diff --git a/src/entities/Physical.h b/src/entities/Physical.h
index fa5ada05..b47d556e 100644
--- a/src/entities/Physical.h
+++ b/src/entities/Physical.h
@@ -58,7 +58,7 @@ public:
 	uint8 m_phy_flagA10 : 1; // unused
 	uint8 m_phy_flagA20 : 1; // unused
 	uint8 bHitByTrain : 1;
-	uint8 m_phy_flagA80 : 1;
+	uint8 bSkipLineCol : 1;
 
 	uint8 m_nSurfaceTouched;
 	int8 m_nZoneLevel;
diff --git a/src/peds/Ped.cpp b/src/peds/Ped.cpp
index 37bc2bbb..f81ffb71 100644
--- a/src/peds/Ped.cpp
+++ b/src/peds/Ped.cpp
@@ -14660,7 +14660,7 @@ CPed::ProcessEntityCollision(CEntity *collidingEnt, CColPoint *collidingPoints)
 		collidedWithBoat = true;
 
 	// ofc we're not vehicle
-	if (!m_bIsVehicleBeingShifted && !m_phy_flagA80
+	if (!m_bIsVehicleBeingShifted && !bSkipLineCol
 #ifdef VC_PED_PORTS
 		&& !collidingEnt->IsPed()
 #endif
diff --git a/src/vehicles/Automobile.cpp b/src/vehicles/Automobile.cpp
index 87c270c1..4593966f 100644
--- a/src/vehicles/Automobile.cpp
+++ b/src/vehicles/Automobile.cpp
@@ -563,7 +563,7 @@ CAutomobile::ProcessControl(void)
 			bHasHitWall = false;
 			m_fDistanceTravelled = 0.0f;
 			m_bIsVehicleBeingShifted = false;
-			m_phy_flagA80 = false;
+			bSkipLineCol = false;
 			ApplyMoveSpeed();
 			ApplyTurnSpeed();
 			for(i = 0; CheckCollision() && i < 5; i++){
@@ -2160,7 +2160,7 @@ CAutomobile::ProcessEntityCollision(CEntity *ent, CColPoint *colpoints)
 	// m_aSuspensionSpringRatio are now set to the point where the tyre touches ground.
 	// In ProcessControl these will be re-normalized to ignore the tyre radius.
 
-	if(m_bIsVehicleBeingShifted || m_phy_flagA80 ||
+	if(m_bIsVehicleBeingShifted || bSkipLineCol ||
 	   GetModelIndex() == MI_DODO && (ent->IsPed() || ent->IsVehicle())){
 		// don't do line collision
 		for(i = 0; i < 4; i++)