diff options
| author | Fire_Head <Fire-Head@users.noreply.github.com> | 2019-06-02 23:56:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-02 23:56:56 +0200 |
| commit | aa1163ccb2784f618f012ca878e07af54b2e9041 (patch) | |
| tree | 04a15b6ef8896ad99ba22258c7bdee00c43c7df6 /src/entities/Physical.cpp | |
| parent | gamestates fixed, mpeg now working (diff) | |
| parent | added CPhysical flags from Nick (diff) | |
| download | re3-aa1163ccb2784f618f012ca878e07af54b2e9041.tar re3-aa1163ccb2784f618f012ca878e07af54b2e9041.tar.gz re3-aa1163ccb2784f618f012ca878e07af54b2e9041.tar.bz2 re3-aa1163ccb2784f618f012ca878e07af54b2e9041.tar.lz re3-aa1163ccb2784f618f012ca878e07af54b2e9041.tar.xz re3-aa1163ccb2784f618f012ca878e07af54b2e9041.tar.zst re3-aa1163ccb2784f618f012ca878e07af54b2e9041.zip | |
Diffstat (limited to 'src/entities/Physical.cpp')
| -rw-r--r-- | src/entities/Physical.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/entities/Physical.cpp b/src/entities/Physical.cpp index 55eab951..9cd36070 100644 --- a/src/entities/Physical.cpp +++ b/src/entities/Physical.cpp @@ -272,7 +272,7 @@ void CPhysical::ProcessControl(void) { if(!IsPed()) - m_phy_flagA8 = false; + bIsInWater = false; bHasContacted = false; bIsInSafePosition = false; bWasPostponed = false; @@ -438,7 +438,7 @@ CPhysical::ApplyCollision(CPhysical *B, CColPoint &colpoint, float &impulseA, fl if(B->IsPed() && ((CPed*)B)->m_pCurrentPhysSurface == A) ispedcontactA = true; }else - timestepA = A->m_phy_flagA1 ? 2.0f : 1.0f; + timestepA = A->bIsHeavy ? 2.0f : 1.0f; float timestepB; if(A->bPedPhysics){ @@ -451,7 +451,7 @@ CPhysical::ApplyCollision(CPhysical *B, CColPoint &colpoint, float &impulseA, fl if(A->IsPed() && ((CPed*)A)->m_pCurrentPhysSurface == B) ispedcontactB = true; }else - timestepB = B->m_phy_flagA1 ? 2.0f : 1.0f; + timestepB = B->bIsHeavy ? 2.0f : 1.0f; float speedA, speedB; if(B->bIsStatic){ @@ -1821,7 +1821,7 @@ CPhysical::ProcessCollision(void) m_phy_flagA80 = false; if(!m_vecMoveSpeed.IsZero() || !m_vecTurnSpeed.IsZero() || - m_phy_flagA40 || + bHitByTrain || m_status == STATUS_PLAYER || IsPed() && ped->IsPlayer()){ if(IsVehicle()) ((CVehicle*)this)->m_veh_flagD4 = true; @@ -1830,7 +1830,7 @@ CPhysical::ProcessCollision(void) return; } } - m_phy_flagA40 = false; + bHitByTrain = false; m_fDistanceTravelled = (GetPosition() - *savedMatrix.GetPosition()).Magnitude(); m_phy_flagA80 = false; |