a3x
/
re3
mirror of https://git.rip/DMCA_FUCKER/re3.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

added CPhysical flags from Nick

This commit is contained in:
aap 2019-06-02 19:33:41 +02:00
parent 541665d9d1
commit f5706a4641
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/entities/Physical.cpp
View File

@ -272,7 +272,7 @@ void
CPhysical::ProcessControl(void) CPhysical::ProcessControl(void)
{ {
if(!IsPed()) if(!IsPed())
m_phy_flagA8 = false; bIsInWater = false;
bHasContacted = false; bHasContacted = false;
bIsInSafePosition = false; bIsInSafePosition = false;
bWasPostponed = false; bWasPostponed = false;
@ -438,7 +438,7 @@ CPhysical::ApplyCollision(CPhysical *B, CColPoint &colpoint, float &impulseA, fl
if(B->IsPed() && ((CPed*)B)->m_pCurrentPhysSurface == A) if(B->IsPed() && ((CPed*)B)->m_pCurrentPhysSurface == A)
ispedcontactA = true; ispedcontactA = true;
}else }else
timestepA = A->m_phy_flagA1 ? 2.0f : 1.0f; timestepA = A->bIsHeavy ? 2.0f : 1.0f;
float timestepB; float timestepB;
if(A->bPedPhysics){ if(A->bPedPhysics){
@ -451,7 +451,7 @@ CPhysical::ApplyCollision(CPhysical *B, CColPoint &colpoint, float &impulseA, fl
if(A->IsPed() && ((CPed*)A)->m_pCurrentPhysSurface == B) if(A->IsPed() && ((CPed*)A)->m_pCurrentPhysSurface == B)
ispedcontactB = true; ispedcontactB = true;
}else }else
timestepB = B->m_phy_flagA1 ? 2.0f : 1.0f; timestepB = B->bIsHeavy ? 2.0f : 1.0f;
float speedA, speedB; float speedA, speedB;
if(B->bIsStatic){ if(B->bIsStatic){
@ -1821,7 +1821,7 @@ CPhysical::ProcessCollision(void)
m_phy_flagA80 = false; m_phy_flagA80 = false;
if(!m_vecMoveSpeed.IsZero() || if(!m_vecMoveSpeed.IsZero() ||
!m_vecTurnSpeed.IsZero() || !m_vecTurnSpeed.IsZero() ||
m_phy_flagA40 || bHitByTrain ||
m_status == STATUS_PLAYER || IsPed() && ped->IsPlayer()){ m_status == STATUS_PLAYER || IsPed() && ped->IsPlayer()){
if(IsVehicle()) if(IsVehicle())
((CVehicle*)this)->m_veh_flagD4 = true; ((CVehicle*)this)->m_veh_flagD4 = true;
@ -1830,7 +1830,7 @@ CPhysical::ProcessCollision(void)
return; return;
} }
} }
m_phy_flagA40 = false; bHitByTrain = false;
m_fDistanceTravelled = (GetPosition() - *savedMatrix.GetPosition()).Magnitude(); m_fDistanceTravelled = (GetPosition() - *savedMatrix.GetPosition()).Magnitude();
m_phy_flagA80 = false; m_phy_flagA80 = false;

6
src/entities/Physical.h
View File

@ -49,13 +49,13 @@ public:
CVector m_vecDamageNormal; CVector m_vecDamageNormal;
int16 m_nDamagePieceType; int16 m_nDamagePieceType;
uint8 m_phy_flagA1 : 1; uint8 bIsHeavy : 1;
uint8 bAffectedByGravity : 1; uint8 bAffectedByGravity : 1;
uint8 bInfiniteMass : 1; uint8 bInfiniteMass : 1;
uint8 m_phy_flagA8 : 1; uint8 bIsInWater : 1;
uint8 m_phy_flagA10 : 1; uint8 m_phy_flagA10 : 1;
uint8 m_phy_flagA20 : 1; uint8 m_phy_flagA20 : 1;
uint8 m_phy_flagA40 : 1; uint8 bHitByTrain : 1; // from nick
uint8 m_phy_flagA80 : 1; uint8 m_phy_flagA80 : 1;
uint8 m_nLastCollType; uint8 m_nLastCollType;