diff options
| author | aap <aap@papnet.eu> | 2019-06-02 19:33:41 +0200 |
|---|---|---|
| committer | aap <aap@papnet.eu> | 2019-06-02 19:33:41 +0200 |
| commit | f5706a4641312c94d745d2f4f0f3e5d82818c6cc (patch) | |
| tree | 463ee05aaf8d45251176f77c45d22a5603c5d671 | |
| parent | added some small bits and stubs (diff) | |
| download | re3-f5706a4641312c94d745d2f4f0f3e5d82818c6cc.tar re3-f5706a4641312c94d745d2f4f0f3e5d82818c6cc.tar.gz re3-f5706a4641312c94d745d2f4f0f3e5d82818c6cc.tar.bz2 re3-f5706a4641312c94d745d2f4f0f3e5d82818c6cc.tar.lz re3-f5706a4641312c94d745d2f4f0f3e5d82818c6cc.tar.xz re3-f5706a4641312c94d745d2f4f0f3e5d82818c6cc.tar.zst re3-f5706a4641312c94d745d2f4f0f3e5d82818c6cc.zip | |
| -rw-r--r-- | src/entities/Physical.cpp | 10 | ||||
| -rw-r--r-- | src/entities/Physical.h | 6 |
2 files changed, 8 insertions, 8 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; diff --git a/src/entities/Physical.h b/src/entities/Physical.h index 514994f7..c6944b76 100644 --- a/src/entities/Physical.h +++ b/src/entities/Physical.h @@ -49,13 +49,13 @@ public: CVector m_vecDamageNormal; int16 m_nDamagePieceType; - uint8 m_phy_flagA1 : 1; + uint8 bIsHeavy : 1; uint8 bAffectedByGravity : 1; uint8 bInfiniteMass : 1; - uint8 m_phy_flagA8 : 1; + uint8 bIsInWater : 1; uint8 m_phy_flagA10 : 1; uint8 m_phy_flagA20 : 1; - uint8 m_phy_flagA40 : 1; + uint8 bHitByTrain : 1; // from nick uint8 m_phy_flagA80 : 1; uint8 m_nLastCollType; |