a3x/re3
1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-12-23 10:10:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #451 from erorcun/erorcun

Browse source 
Various fixes
This commit is contained in:
erorcun 2020-04-16 05:08:19 +03:00 committed by GitHub
parent 5993c66efb c22e59abab
commit bc764a7e7c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/audio/AudioManager.cpp
View file

@ -9132,6 +9132,9 @@ cAudioManager::ProcessVehicleSirenOrAlarm(cVehicleParams *params)
CVehicle *veh = params->m_pVehicle; CVehicle *veh = params->m_pVehicle;
if(veh->m_bSirenOrAlarm == 0 && veh->m_nAlarmState <= 0) return; 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); CalculateDistance(params->m_bDistanceCalculated, params->m_fDistance);
m_sQueueSample.m_bVolume = ComputeVolume(80, 110.f, m_sQueueSample.m_fDistance); m_sQueueSample.m_bVolume = ComputeVolume(80, 110.f, m_sQueueSample.m_fDistance);
if(m_sQueueSample.m_bVolume) { if(m_sQueueSample.m_bVolume) {

1
src/core/Frontend.cpp
View file

@ -5246,6 +5246,7 @@ CMenuManager::PrintController(void)
void void
CMenuManager::PrintMap(void) CMenuManager::PrintMap(void)
{ {
CFont::SetJustifyOn();
bMenuMapActive = true; bMenuMapActive = true;
CRadar::InitFrontEndMap(); CRadar::InitFrontEndMap();

2
src/weapons/Weapon.cpp
View file

@ -2162,7 +2162,7 @@ CWeapon::MakePedsJumpAtShot(CPhysical *shooter, CVector *source, CVector *target
&& ped->GetPosition().y > miny && ped->GetPosition().y < maxy && ped->GetPosition().y > miny && ped->GetPosition().y < maxy
&& ped->GetPosition().z > minz && ped->GetPosition().z < maxz ) && 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); ped->SetEvasiveDive(shooter, 1);
} }
} }