mirror of
https://github.com/GTAmodding/re3.git
synced 2025-07-14 22:24:09 +00:00
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
This commit is contained in:
commit
1c01899799
26 changed files with 88 additions and 52 deletions
|
@ -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;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue