diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-04-27 00:53:54 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-27 00:53:54 +0300 |
| commit | 68bf2398689a1de168dce41d31ad2070ce32f70a (patch) | |
| tree | 9de92b6123fb2b7e219768b5b6e5c11b2ac0b75a /src/entities/Physical.cpp | |
| parent | e467cb08b84b747e5c70b319a2d0180a02b50ab7 (diff) | |
| parent | fbca45239d54e9d2caa1dfca4c95947963091c69 (diff) | |
Merge pull request #489 from Nick007J/master
1.1 patch stuff + flying controls
Diffstat (limited to 'src/entities/Physical.cpp')
| -rw-r--r-- | src/entities/Physical.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/entities/Physical.cpp b/src/entities/Physical.cpp index a27e4d7b..d37405ec 100644 --- a/src/entities/Physical.cpp +++ b/src/entities/Physical.cpp @@ -814,7 +814,11 @@ CPhysical::ApplyCollisionAlt(CEntity *B, CColPoint &colpoint, float &impulse, CV normalSpeed = DotProduct(speed, colpoint.normal); if(normalSpeed < 0.0f){ float minspeed = 0.0104f * CTimer::GetTimeStep(); +#ifdef GTA3_1_1_PATCH + if ((IsObject() || IsVehicle() && (GetUp().z < -0.3f || ((CVehicle*)this)->IsBike() && (m_status == STATUS_ABANDONED || m_status == STATUS_WRECKED))) && +#else if((IsObject() || IsVehicle() && GetUp().z < -0.3f) && +#endif !bHasContacted && Abs(m_vecMoveSpeed.x) < minspeed && Abs(m_vecMoveSpeed.y) < minspeed && |