mirror/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2024-11-15 13:49:03 +00:00
Code Issues Projects Releases Wiki Activity

Fix cAudioManager::ProcessCarHeli

Browse source
This commit is contained in:
Sergeanur 2021-06-12 19:37:55 +03:00
parent 23755fdfb4
commit 6426963807
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/audio/AudioLogic.cpp
View file

@ -3552,6 +3552,17 @@ cAudioManager::ProcessCarHeli(cVehicleParams& params)
AddSampleToRequestedQueue(); AddSampleToRequestedQueue();
} }
} }
CVector backPropellerPos;
if (automobile != nil)
automobile->GetComponentWorldPosition(CAR_BOOT, backPropellerPos);
else if (params.m_VehicleType == VEHICLE_TYPE_HELI)
#ifdef FIX_BUGS
backPropellerPos =
#endif
params.m_pVehicle->GetMatrix() * CVector(0.0f, -10.0f, 0.0f);
else
backPropellerPos = m_sQueueSample.m_vecPos;
if (params.m_fDistance >= SQR(140.0f)) if (params.m_fDistance >= SQR(140.0f))
return; return;
@ -3756,12 +3767,8 @@ cAudioManager::ProcessCarHeli(cVehicleParams& params)
vecPosOld = m_sQueueSample.m_vecPos; vecPosOld = m_sQueueSample.m_vecPos;
distanceCalculatedOld = params.m_bDistanceCalculated; distanceCalculatedOld = params.m_bDistanceCalculated;
distanceOld = params.m_fDistance; distanceOld = params.m_fDistance;
if (automobile != nil)
automobile->GetComponentWorldPosition(CAR_BOOT, m_sQueueSample.m_vecPos);
else if (params.m_VehicleType == VEHICLE_TYPE_HELI)
m_sQueueSample.m_vecPos = CVector(0.0f, -10.0f, 0.0f); //this is from android, but for real it's not used
m_sQueueSample.m_vecPos = backPropellerPos;
params.m_bDistanceCalculated = FALSE; params.m_bDistanceCalculated = FALSE;
params.m_fDistance = GetDistanceSquared(m_sQueueSample.m_vecPos); params.m_fDistance = GetDistanceSquared(m_sQueueSample.m_vecPos);
if (params.m_fDistance < SQR(27.0f)) { if (params.m_fDistance < SQR(27.0f)) {
@ -3770,7 +3777,7 @@ cAudioManager::ProcessCarHeli(cVehicleParams& params)
if (m_sQueueSample.m_nVolume) { if (m_sQueueSample.m_nVolume) {
m_sQueueSample.m_nCounter = 2; m_sQueueSample.m_nCounter = 2;
m_sQueueSample.m_nSampleIndex = hunterBool ? SFX_HELI_APACHE_3 : SFX_CAR_HELI_REA; m_sQueueSample.m_nSampleIndex = hunterBool ? SFX_HELI_APACHE_3 : SFX_CAR_HELI_REA;
m_sQueueSample.m_nBankIndex = 0; m_sQueueSample.m_nBankIndex = SFX_BANK_0;
m_sQueueSample.m_bIs2D = FALSE; m_sQueueSample.m_bIs2D = FALSE;
m_sQueueSample.m_nReleasingVolumeModificator = 1; m_sQueueSample.m_nReleasingVolumeModificator = 1;
m_sQueueSample.m_nFrequency = (volumeModifier + 1.0f) * 16000; m_sQueueSample.m_nFrequency = (volumeModifier + 1.0f) * 16000;