diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2020-06-07 04:15:10 +0300 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2020-06-07 04:15:10 +0300 |
| commit | 1c0189979965cb237aa5fb300a5522e1408123ac (patch) | |
| tree | 791f188c7d4f87111bf3235b87f4b74e2fbebf9e /src/entities | |
| parent | 5711159e684e0612739ee66d3cd7e4444c7dc72d (diff) | |
| parent | 552205dfbaea70628df56a4966d269a81a97d28e (diff) | |
Merge branch 'master' into miami
# Conflicts:
# src/control/Garages.cpp
# src/core/Frontend.cpp
# src/peds/PlayerPed.cpp
# src/render/Hud.cpp
# src/vehicles/Train.cpp
Diffstat (limited to 'src/entities')
| -rw-r--r-- | src/entities/Physical.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/entities/Physical.cpp b/src/entities/Physical.cpp index 332d3d81..090eae6b 100644 --- a/src/entities/Physical.cpp +++ b/src/entities/Physical.cpp @@ -27,6 +27,10 @@ CPhysical::CPhysical(void) { int i; +#ifdef FIX_BUGS + m_nLastTimeCollided = 0; +#endif + m_fForceMultiplier = 1.0f; m_vecMoveSpeed = CVector(0.0f, 0.0f, 0.0f); m_vecTurnSpeed = CVector(0.0f, 0.0f, 0.0f); @@ -68,6 +72,9 @@ CPhysical::CPhysical(void) m_phy_flagA20 = false; +#ifdef FIX_BUGS + m_nSurfaceTouched = SURFACE_DEFAULT; +#endif m_nZoneLevel = LEVEL_NONE; bIsFrozen = false; |