Substitute/Re3
Substitute/Re3
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

Rename m_phy_flagA80 to bSkipLineCol

Browse Source
This commit is contained in:
Sergeanur 2020-04-30 18:58:15 +03:00
parent 81094f2cd7
commit e14733367e
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/entities/Physical.cpp
View File

@ -54,7 +54,7 @@ CPhysical::CPhysical(void)
bInfiniteMass = false; bInfiniteMass = false;
bIsInWater = false; bIsInWater = false;
bHitByTrain = false; bHitByTrain = false;
m_phy_flagA80 = false; bSkipLineCol = false;
m_fDistanceTravelled = 0.0f; m_fDistanceTravelled = 0.0f;
m_treadable[PATH_CAR] = nil; m_treadable[PATH_CAR] = nil;
@ -1401,7 +1401,7 @@ CPhysical::ProcessCollisionSectorList(CPtrList *lists)
continue; continue;
} }
A->m_phy_flagA80 = false; A->bSkipLineCol = false;
skipCollision = false; skipCollision = false;
altcollision = false; altcollision = false;
@ -1411,13 +1411,13 @@ CPhysical::ProcessCollisionSectorList(CPtrList *lists)
(B->IsVehicle() || B->IsPed()) && (B->IsVehicle() || B->IsPed()) &&
A->GetUp().z < 0.66f){ A->GetUp().z < 0.66f){
skipCollision = true; skipCollision = true;
A->m_phy_flagA80 = true; A->bSkipLineCol = true;
Aobj->m_pCollidingEntity = B; Aobj->m_pCollidingEntity = B;
}else if((A->IsVehicle() || A->IsPed()) && }else if((A->IsVehicle() || A->IsPed()) &&
B->GetUp().z < 0.66f && B->GetUp().z < 0.66f &&
IsTrafficLight(B->GetModelIndex())){ IsTrafficLight(B->GetModelIndex())){
skipCollision = true; skipCollision = true;
A->m_phy_flagA80 = true; A->bSkipLineCol = true;
Bobj->m_pCollidingEntity = A; Bobj->m_pCollidingEntity = A;
}else if(A->IsObject() && B->IsVehicle()){ }else if(A->IsObject() && B->IsVehicle()){
if(A->GetModelIndex() == MI_CAR_BUMPER || A->GetModelIndex() == MI_FILES) if(A->GetModelIndex() == MI_CAR_BUMPER || A->GetModelIndex() == MI_FILES)
@ -1460,18 +1460,18 @@ CPhysical::ProcessCollisionSectorList(CPtrList *lists)
skipCollision = true; skipCollision = true;
}else if(A->IsPed() && IsBodyPart(B->GetModelIndex())){ }else if(A->IsPed() && IsBodyPart(B->GetModelIndex())){
skipCollision = true; skipCollision = true;
A->m_phy_flagA80 = true; A->bSkipLineCol = true;
}else if(A->IsPed() && Aped->m_pCollidingEntity == B){ }else if(A->IsPed() && Aped->m_pCollidingEntity == B){
skipCollision = true; skipCollision = true;
if(!Aped->bKnockedUpIntoAir) if(!Aped->bKnockedUpIntoAir)
A->m_phy_flagA80 = true; A->bSkipLineCol = true;
}else if(B->IsPed() && Bped->m_pCollidingEntity == A){ }else if(B->IsPed() && Bped->m_pCollidingEntity == A){
skipCollision = true; skipCollision = true;
A->m_phy_flagA80 = true; A->bSkipLineCol = true;
}else if(A->GetModelIndex() == MI_RCBANDIT && (B->IsPed() || B->IsVehicle()) || }else if(A->GetModelIndex() == MI_RCBANDIT && (B->IsPed() || B->IsVehicle()) ||
B->GetModelIndex() == MI_RCBANDIT && (A->IsPed() || A->IsVehicle())){ B->GetModelIndex() == MI_RCBANDIT && (A->IsPed() || A->IsVehicle())){
skipCollision = true; skipCollision = true;
A->m_phy_flagA80 = true; A->bSkipLineCol = true;
}else if(A->IsPed() && B->IsObject() && Bobj->m_fUprootLimit > 0.0f) }else if(A->IsPed() && B->IsObject() && Bobj->m_fUprootLimit > 0.0f)
altcollision = true; altcollision = true;
@ -1804,7 +1804,7 @@ CPhysical::ProcessCollision(void)
m_fDistanceTravelled = 0.0f; m_fDistanceTravelled = 0.0f;
m_bIsVehicleBeingShifted = false; m_bIsVehicleBeingShifted = false;
m_phy_flagA80 = false; bSkipLineCol = false;
if(!bUsesCollision){ if(!bUsesCollision){
bIsStuck = false; bIsStuck = false;
@ -1917,7 +1917,7 @@ CPhysical::ProcessCollision(void)
ApplyTurnSpeed(); ApplyTurnSpeed();
GetMatrix().Reorthogonalise(); GetMatrix().Reorthogonalise();
m_bIsVehicleBeingShifted = false; m_bIsVehicleBeingShifted = false;
m_phy_flagA80 = false; bSkipLineCol = false;
if(!m_vecMoveSpeed.IsZero() || if(!m_vecMoveSpeed.IsZero() ||
!m_vecTurnSpeed.IsZero() || !m_vecTurnSpeed.IsZero() ||
bHitByTrain || bHitByTrain ||
@ -1931,7 +1931,7 @@ CPhysical::ProcessCollision(void)
} }
bHitByTrain = false; bHitByTrain = false;
m_fDistanceTravelled = (GetPosition() - savedMatrix.GetPosition()).Magnitude(); m_fDistanceTravelled = (GetPosition() - savedMatrix.GetPosition()).Magnitude();
m_phy_flagA80 = false; bSkipLineCol = false;
bIsStuck = false; bIsStuck = false;
bIsInSafePosition = true; bIsInSafePosition = true;

2
src/entities/Physical.h
View File

@ -58,7 +58,7 @@ public:
uint8 m_phy_flagA10 : 1; // unused uint8 m_phy_flagA10 : 1; // unused
uint8 m_phy_flagA20 : 1; // unused uint8 m_phy_flagA20 : 1; // unused
uint8 bHitByTrain : 1; uint8 bHitByTrain : 1;
uint8 m_phy_flagA80 : 1; uint8 bSkipLineCol : 1;
uint8 m_nSurfaceTouched; uint8 m_nSurfaceTouched;
int8 m_nZoneLevel; int8 m_nZoneLevel;

2
src/peds/Ped.cpp
View File

@ -14660,7 +14660,7 @@ CPed::ProcessEntityCollision(CEntity *collidingEnt, CColPoint *collidingPoints)
collidedWithBoat = true; collidedWithBoat = true;
// ofc we're not vehicle // ofc we're not vehicle
if (!m_bIsVehicleBeingShifted && !m_phy_flagA80 if (!m_bIsVehicleBeingShifted && !bSkipLineCol
#ifdef VC_PED_PORTS #ifdef VC_PED_PORTS
&& !collidingEnt->IsPed() && !collidingEnt->IsPed()
#endif #endif

4
src/vehicles/Automobile.cpp
View File

@ -563,7 +563,7 @@ CAutomobile::ProcessControl(void)
bHasHitWall = false; bHasHitWall = false;
m_fDistanceTravelled = 0.0f; m_fDistanceTravelled = 0.0f;
m_bIsVehicleBeingShifted = false; m_bIsVehicleBeingShifted = false;
m_phy_flagA80 = false; bSkipLineCol = false;
ApplyMoveSpeed(); ApplyMoveSpeed();
ApplyTurnSpeed(); ApplyTurnSpeed();
for(i = 0; CheckCollision() && i < 5; i++){ 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. // 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. // 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())){ GetModelIndex() == MI_DODO && (ent->IsPed() || ent->IsVehicle())){
// don't do line collision // don't do line collision
for(i = 0; i < 4; i++) for(i = 0; i < 4; i++)