diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-05-14 13:01:24 +0200 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-05-14 13:01:24 +0200 |
| commit | 9d4d83db0d9b9bd2921972a030a0c53566688fbb (patch) | |
| tree | 6e25a7d88c3afb2afb07a4025da316d2b3d0c945 | |
| parent | fixed skinned cutscene head (diff) | |
| download | re3-9d4d83db0d9b9bd2921972a030a0c53566688fbb.tar re3-9d4d83db0d9b9bd2921972a030a0c53566688fbb.tar.gz re3-9d4d83db0d9b9bd2921972a030a0c53566688fbb.tar.bz2 re3-9d4d83db0d9b9bd2921972a030a0c53566688fbb.tar.lz re3-9d4d83db0d9b9bd2921972a030a0c53566688fbb.tar.xz re3-9d4d83db0d9b9bd2921972a030a0c53566688fbb.tar.zst re3-9d4d83db0d9b9bd2921972a030a0c53566688fbb.zip | |
| -rw-r--r-- | src/audio/sampman_miles.cpp | 4 | ||||
| -rw-r--r-- | src/audio/sampman_oal.cpp | 4 | ||||
| -rw-r--r-- | src/peds/Ped.cpp | 4 | ||||
| -rw-r--r-- | src/vehicles/Boat.cpp | 4 |
4 files changed, 16 insertions, 0 deletions
diff --git a/src/audio/sampman_miles.cpp b/src/audio/sampman_miles.cpp index caf2917f..e0c7170c 100644 --- a/src/audio/sampman_miles.cpp +++ b/src/audio/sampman_miles.cpp @@ -1449,7 +1449,11 @@ cSampleManager::IsPedCommentLoaded(uint32 nComment) for ( int32 i = 0; i < _TODOCONST(3); i++ ) { +#ifdef FIX_BUGS + slot = (nCurrentPedSlot - i - 1) % ARRAY_SIZE(nPedSlotSfx); +#else slot = nCurrentPedSlot - i - 1; +#endif if ( nComment == nPedSlotSfx[slot] ) return true; } diff --git a/src/audio/sampman_oal.cpp b/src/audio/sampman_oal.cpp index 64b763ec..7276a895 100644 --- a/src/audio/sampman_oal.cpp +++ b/src/audio/sampman_oal.cpp @@ -779,7 +779,11 @@ cSampleManager::IsPedCommentLoaded(uint32 nComment) for ( int32 i = 0; i < _TODOCONST(3); i++ ) { +#ifdef FIX_BUGS + slot = (nCurrentPedSlot - i - 1) % ARRAY_SIZE(nPedSlotSfx); +#else slot = nCurrentPedSlot - i - 1; +#endif if ( nComment == nPedSlotSfx[slot] ) return true; } diff --git a/src/peds/Ped.cpp b/src/peds/Ped.cpp index d261385a..fd8fd540 100644 --- a/src/peds/Ped.cpp +++ b/src/peds/Ped.cpp @@ -16166,7 +16166,11 @@ CPed::SeekCar(void) } if (dest.x == 0.0f && dest.y == 0.0f) { +#ifdef FIX_BUGS + if ((!IsPlayer() && CharCreatedBy != MISSION_CHAR) || vehToSeek->VehicleCreatedBy != MISSION_VEHICLE || vehToSeek->pDriver || !vehToSeek->CanPedOpenLocks(this)) { +#else if ((!IsPlayer() && CharCreatedBy != MISSION_CHAR) || vehToSeek->VehicleCreatedBy != MISSION_VEHICLE || vehToSeek->pDriver) { +#endif RestorePreviousState(); if (IsPlayer()) { ClearObjective(); diff --git a/src/vehicles/Boat.cpp b/src/vehicles/Boat.cpp index d992d190..72fca542 100644 --- a/src/vehicles/Boat.cpp +++ b/src/vehicles/Boat.cpp @@ -184,7 +184,11 @@ CBoat::ProcessControl(void) } float collisionDamage = pHandling->fCollisionDamageMultiplier * m_fDamageImpulse; +#ifdef FIX_BUGS + if (collisionDamage > 25.0f && GetStatus() != STATUS_WRECKED && m_fHealth >= 150.0f && !bCollisionProof) { +#else if(collisionDamage > 25.0f && GetStatus() != STATUS_WRECKED && m_fHealth >= 150.0f){ +#endif float prevHealth = m_fHealth; if(this == FindPlayerVehicle()){ if(bTakeLessDamage) |