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

marked stupied code(dotProduct and AudioEvents)

Browse source
This commit is contained in:
Roman Masanin 2020-11-08 22:26:14 +03:00
parent 0853a47a3f
commit 363a2c6098
1 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/audio/AudioLogic.cpp
View file

@ -1047,7 +1047,11 @@ cAudioManager::ProcessModelVehicle(cVehicleParams& params)
freq = clamp2(freq, prevFreq, 800); freq = clamp2(freq, prevFreq, 800);
} }
if (!vehSlowdown) if (!vehSlowdown)
#ifdef THIS_IS_STUPID
freq += 8000.0f * Abs(DotProduct(params.m_pVehicle->GetUp(), CVector(0.0f, 1.0f, 0.0f)));
#else
freq += 8000.0f * Abs(params.m_pVehicle->GetUp().y); freq += 8000.0f * Abs(params.m_pVehicle->GetUp().y);
#endif
if (params.m_pVehicle->bIsDrowning) if (params.m_pVehicle->bIsDrowning)
volume /= 4; volume /= 4;
if (volume > 0) { if (volume > 0) {
@ -2650,7 +2654,11 @@ cAudioManager::ProcessVehicleOneShots(cVehicleParams& params)
break; break;
} }
m_sQueueSample.m_nBankIndex = SFX_BANK_0; m_sQueueSample.m_nBankIndex = SFX_BANK_0;
#ifdef THIS_IS_STUPID
m_sQueueSample.m_nCounter = m_asAudioEntities[m_sQueueSample.m_nEntityIndex].m_awAudioEvent[i] + 22; m_sQueueSample.m_nCounter = m_asAudioEntities[m_sQueueSample.m_nEntityIndex].m_awAudioEvent[i] + 22;
#else
m_sQueueSample.m_nCounter = event + 22;
#endif
if (params.m_pVehicle->GetVehicleAppearance() == VEHICLE_APPEARANCE_HELI) if (params.m_pVehicle->GetVehicleAppearance() == VEHICLE_APPEARANCE_HELI)
m_sQueueSample.m_nFrequency = 28062; m_sQueueSample.m_nFrequency = 28062;
else else
@ -2686,7 +2694,11 @@ cAudioManager::ProcessVehicleOneShots(cVehicleParams& params)
break; break;
} }
m_sQueueSample.m_nBankIndex = SFX_BANK_0; m_sQueueSample.m_nBankIndex = SFX_BANK_0;
#ifdef THIS_IS_STUPID
m_sQueueSample.m_nCounter = m_asAudioEntities[m_sQueueSample.m_nEntityIndex].m_awAudioEvent[i] + 10; m_sQueueSample.m_nCounter = m_asAudioEntities[m_sQueueSample.m_nEntityIndex].m_awAudioEvent[i] + 10;
#else
m_sQueueSample.m_nCounter = event + 10;
#endif
if (params.m_pVehicle->GetVehicleAppearance() == VEHICLE_APPEARANCE_HELI) if (params.m_pVehicle->GetVehicleAppearance() == VEHICLE_APPEARANCE_HELI)
m_sQueueSample.m_nFrequency = 23459; m_sQueueSample.m_nFrequency = 23459;
else else
@ -2715,7 +2727,11 @@ cAudioManager::ProcessVehicleOneShots(cVehicleParams& params)
const float SOUND_INTENSITY = 35.0f; const float SOUND_INTENSITY = 35.0f;
static uint8 WheelIndex = 82; static uint8 WheelIndex = 82;
maxDist = SQR(SOUND_INTENSITY); maxDist = SQR(SOUND_INTENSITY);
#ifdef THIS_IS_STUPID
if (m_asAudioEntities[m_sQueueSample.m_nEntityIndex].m_awAudioEvent[i] == SOUND_CAR_JUMP_2) { if (m_asAudioEntities[m_sQueueSample.m_nEntityIndex].m_awAudioEvent[i] == SOUND_CAR_JUMP_2) {
#else
if (event == SOUND_CAR_JUMP_2) {
#endif
m_sQueueSample.m_nSampleIndex = SFX_TYRE_BURST_B; m_sQueueSample.m_nSampleIndex = SFX_TYRE_BURST_B;
emittingVol = Max(50.0f, 2 * (60.0f * m_asAudioEntities[m_sQueueSample.m_nEntityIndex].m_afVolume[i])); emittingVol = Max(50.0f, 2 * (60.0f * m_asAudioEntities[m_sQueueSample.m_nEntityIndex].m_afVolume[i]));
} else { } else {
@ -7698,7 +7714,6 @@ cAudioManager::ProcessFires(int32)
m_sQueueSample.m_fSoundIntensity = 80.0f; m_sQueueSample.m_fSoundIntensity = 80.0f;
m_sQueueSample.m_nSampleIndex = SFX_CAR_ON_FIRE; m_sQueueSample.m_nSampleIndex = SFX_CAR_ON_FIRE;
m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_CAR_ON_FIRE); m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_CAR_ON_FIRE);
//mb error in III
emittingVol = 80; emittingVol = 80;
m_sQueueSample.m_nReleasingVolumeModificator = 8; m_sQueueSample.m_nReleasingVolumeModificator = 8;
} }