summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authoreray orçunus <erayorcunus@gmail.com>2020-04-16 04:07:32 +0200
committereray orçunus <erayorcunus@gmail.com>2020-04-16 04:07:32 +0200
commitc22e59abab331376cdc8557a863eb2584b4bef4b (patch)
treea0981e25dd92d06888922b449c2d96468763d4c3 /src
parentFixed bridge despawns (diff)
downloadre3-c22e59abab331376cdc8557a863eb2584b4bef4b.tar
re3-c22e59abab331376cdc8557a863eb2584b4bef4b.tar.gz
re3-c22e59abab331376cdc8557a863eb2584b4bef4b.tar.bz2
re3-c22e59abab331376cdc8557a863eb2584b4bef4b.tar.lz
re3-c22e59abab331376cdc8557a863eb2584b4bef4b.tar.xz
re3-c22e59abab331376cdc8557a863eb2584b4bef4b.tar.zst
re3-c22e59abab331376cdc8557a863eb2584b4bef4b.zip
Diffstat (limited to '')
-rw-r--r--src/audio/AudioManager.cpp3
-rw-r--r--src/core/Frontend.cpp1
-rw-r--r--src/weapons/Weapon.cpp2
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);
}
}