diff options
author | erorcun <erayorcunus@gmail.com> | 2020-04-16 04:08:19 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-04-16 04:08:19 +0200 |
commit | bc764a7e7c4fa9f971fa666fa4518d234f3418d0 (patch) | |
tree | a0981e25dd92d06888922b449c2d96468763d4c3 /src | |
parent | Fixed bridge despawns (diff) | |
parent | Various fixes (diff) | |
download | re3-bc764a7e7c4fa9f971fa666fa4518d234f3418d0.tar re3-bc764a7e7c4fa9f971fa666fa4518d234f3418d0.tar.gz re3-bc764a7e7c4fa9f971fa666fa4518d234f3418d0.tar.bz2 re3-bc764a7e7c4fa9f971fa666fa4518d234f3418d0.tar.lz re3-bc764a7e7c4fa9f971fa666fa4518d234f3418d0.tar.xz re3-bc764a7e7c4fa9f971fa666fa4518d234f3418d0.tar.zst re3-bc764a7e7c4fa9f971fa666fa4518d234f3418d0.zip |
Diffstat (limited to 'src')
-rw-r--r-- | src/audio/AudioManager.cpp | 3 | ||||
-rw-r--r-- | src/core/Frontend.cpp | 1 | ||||
-rw-r--r-- | src/weapons/Weapon.cpp | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/src/audio/AudioManager.cpp b/src/audio/AudioManager.cpp index 1d2835cf..246b1bda 100644 --- a/src/audio/AudioManager.cpp +++ b/src/audio/AudioManager.cpp @@ -9132,6 +9132,9 @@ cAudioManager::ProcessVehicleSirenOrAlarm(cVehicleParams *params) CVehicle *veh = params->m_pVehicle; if(veh->m_bSirenOrAlarm == 0 && veh->m_nAlarmState <= 0) return; +#ifdef FIX_BUGS + if (params->m_pVehicle->m_status == STATUS_WRECKED) return; +#endif CalculateDistance(params->m_bDistanceCalculated, params->m_fDistance); m_sQueueSample.m_bVolume = ComputeVolume(80, 110.f, m_sQueueSample.m_fDistance); if(m_sQueueSample.m_bVolume) { diff --git a/src/core/Frontend.cpp b/src/core/Frontend.cpp index 166ecb35..a01689e4 100644 --- a/src/core/Frontend.cpp +++ b/src/core/Frontend.cpp @@ -5246,6 +5246,7 @@ CMenuManager::PrintController(void) void CMenuManager::PrintMap(void) { + CFont::SetJustifyOn(); bMenuMapActive = true; CRadar::InitFrontEndMap(); diff --git a/src/weapons/Weapon.cpp b/src/weapons/Weapon.cpp index 7b6b4170..98154e93 100644 --- a/src/weapons/Weapon.cpp +++ b/src/weapons/Weapon.cpp @@ -2162,7 +2162,7 @@ CWeapon::MakePedsJumpAtShot(CPhysical *shooter, CVector *source, CVector *target && ped->GetPosition().y > miny && ped->GetPosition().y < maxy && ped->GetPosition().z > minz && ped->GetPosition().z < maxz ) { - if ( ped != FindPlayerPed() && (uint8)(ped->m_randomSeed ^ CGeneral::GetRandomNumber()) & 31 ) + if ( ped != FindPlayerPed() && !((uint8)(ped->m_randomSeed ^ CGeneral::GetRandomNumber()) & 31) ) ped->SetEvasiveDive(shooter, 1); } } |