summaryrefslogtreecommitdiffstats
path: root/src/entities
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2020-04-26 23:53:54 +0200
committerGitHub <noreply@github.com>2020-04-26 23:53:54 +0200
commit68bf2398689a1de168dce41d31ad2070ce32f70a (patch)
tree9de92b6123fb2b7e219768b5b6e5c11b2ac0b75a /src/entities
parentMerge branch 'master' of github.com:gtamodding/re3 (diff)
parentMerge remote-tracking branch 'upstream/master' (diff)
downloadre3-68bf2398689a1de168dce41d31ad2070ce32f70a.tar
re3-68bf2398689a1de168dce41d31ad2070ce32f70a.tar.gz
re3-68bf2398689a1de168dce41d31ad2070ce32f70a.tar.bz2
re3-68bf2398689a1de168dce41d31ad2070ce32f70a.tar.lz
re3-68bf2398689a1de168dce41d31ad2070ce32f70a.tar.xz
re3-68bf2398689a1de168dce41d31ad2070ce32f70a.tar.zst
re3-68bf2398689a1de168dce41d31ad2070ce32f70a.zip
Diffstat (limited to 'src/entities')
-rw-r--r--src/entities/Physical.cpp4
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 &&