diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-11-30 23:47:10 +0100 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-11-30 23:47:10 +0100 |
| commit | bcc51f4a284f7d96d388ec093a3e12c6ab6337c1 (patch) | |
| tree | 3311da68498fc0556882464cb905fa42bd42d06d /src/entities/Physical.cpp | |
| parent | Merge remote-tracking branch 'upstream/master' (diff) | |
| parent | added a few registered pointers and memory debug (diff) | |
| download | re3-bcc51f4a284f7d96d388ec093a3e12c6ab6337c1.tar re3-bcc51f4a284f7d96d388ec093a3e12c6ab6337c1.tar.gz re3-bcc51f4a284f7d96d388ec093a3e12c6ab6337c1.tar.bz2 re3-bcc51f4a284f7d96d388ec093a3e12c6ab6337c1.tar.lz re3-bcc51f4a284f7d96d388ec093a3e12c6ab6337c1.tar.xz re3-bcc51f4a284f7d96d388ec093a3e12c6ab6337c1.tar.zst re3-bcc51f4a284f7d96d388ec093a3e12c6ab6337c1.zip | |
Diffstat (limited to 'src/entities/Physical.cpp')
| -rw-r--r-- | src/entities/Physical.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/entities/Physical.cpp b/src/entities/Physical.cpp index 172bae3f..04cec96b 100644 --- a/src/entities/Physical.cpp +++ b/src/entities/Physical.cpp @@ -824,7 +824,7 @@ CPhysical::ApplyCollisionAlt(CEntity *B, CColPoint &colpoint, float &impulse, CV normalSpeed = DotProduct(speed, colpoint.normal); if(normalSpeed < 0.0f){ float minspeed = 1.3f*GRAVITY * CTimer::GetTimeStep(); -#ifdef GTA3_1_1_PATCH +#if GTA_VERSION >= GTA3_PC_11 if ((IsObject() || IsVehicle() && (GetUp().z < -0.3f || ((CVehicle*)this)->IsBike() && (GetStatus() == STATUS_ABANDONED || GetStatus() == STATUS_WRECKED))) && #else if((IsObject() || IsVehicle() && GetUp().z < -0.3f) && |