summaryrefslogtreecommitdiffstats
path: root/src/entities/Physical.cpp
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2020-04-19 16:38:10 +0200
committerNikolay Korolev <nickvnuk@gmail.com>2020-04-19 16:38:10 +0200
commit9e65eb34ec834de082154ee7559cd1c418f02ae6 (patch)
treec0c12ec094feb67e7ad98c5e8d48440b37035421 /src/entities/Physical.cpp
parentmissing ifded (diff)
downloadre3-9e65eb34ec834de082154ee7559cd1c418f02ae6.tar
re3-9e65eb34ec834de082154ee7559cd1c418f02ae6.tar.gz
re3-9e65eb34ec834de082154ee7559cd1c418f02ae6.tar.bz2
re3-9e65eb34ec834de082154ee7559cd1c418f02ae6.tar.lz
re3-9e65eb34ec834de082154ee7559cd1c418f02ae6.tar.xz
re3-9e65eb34ec834de082154ee7559cd1c418f02ae6.tar.zst
re3-9e65eb34ec834de082154ee7559cd1c418f02ae6.zip
Diffstat (limited to '')
-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 445cd83f..e2099945 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 &&