diff options
| author | aap <aap@papnet.eu> | 2020-03-29 19:12:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-29 19:12:53 +0200 |
| commit | 8e3ee096e2ec54ea852c29f8eb44ec0eaa4588cd (patch) | |
| tree | e086c6d1056146aa7b986e602a6dc00bd4db3632 /src/audio | |
| parent | Merge pull request #370 from erorcun/erorcun (diff) | |
| parent | fixed PS2 build (diff) | |
| download | re3-8e3ee096e2ec54ea852c29f8eb44ec0eaa4588cd.tar re3-8e3ee096e2ec54ea852c29f8eb44ec0eaa4588cd.tar.gz re3-8e3ee096e2ec54ea852c29f8eb44ec0eaa4588cd.tar.bz2 re3-8e3ee096e2ec54ea852c29f8eb44ec0eaa4588cd.tar.lz re3-8e3ee096e2ec54ea852c29f8eb44ec0eaa4588cd.tar.xz re3-8e3ee096e2ec54ea852c29f8eb44ec0eaa4588cd.tar.zst re3-8e3ee096e2ec54ea852c29f8eb44ec0eaa4588cd.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/audio/AudioManager.cpp | 14 | ||||
| -rw-r--r-- | src/audio/DMAudio.h | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/audio/AudioManager.cpp b/src/audio/AudioManager.cpp index 5410ed6f..8e8d024a 100644 --- a/src/audio/AudioManager.cpp +++ b/src/audio/AudioManager.cpp @@ -3938,7 +3938,7 @@ cAudioManager::ProcessFrontEnd() break; case SOUND_GARAGE_NO_MONEY: case SOUND_GARAGE_BAD_VEHICLE: - case SOUND_3C: + case SOUND_GARAGE_BOMB_ALREADY_SET: m_sQueueSample.m_nSampleIndex = SFX_PICKUP_ERROR_LEFT; stereo = true; break; @@ -4095,7 +4095,7 @@ cAudioManager::ProcessGarages() CalculateDistance(distCalculated, distSquared); \ m_sQueueSample.m_bVolume = ComputeVolume(60, 80.f, m_sQueueSample.m_fDistance); \ if(m_sQueueSample.m_bVolume) { \ - if(CGarages::Garages[i].m_eGarageType == GARAGE_CRUSHER) { \ + if(CGarages::aGarages[i].m_eGarageType == GARAGE_CRUSHER) { \ m_sQueueSample.m_nSampleIndex = SFX_COL_CAR_PANEL_2; \ m_sQueueSample.m_nFrequency = 6735; \ } else if(m_asAudioEntities[m_sQueueSample.m_nEntityIndex] \ @@ -4131,20 +4131,20 @@ cAudioManager::ProcessGarages() } for(uint32 i = 0; i < CGarages::NumGarages; ++i) { - if(CGarages::Garages[i].m_eGarageType == GARAGE_NONE) continue; - entity = CGarages::Garages[i].m_pDoor1; + if(CGarages::aGarages[i].m_eGarageType == GARAGE_NONE) continue; + entity = CGarages::aGarages[i].m_pDoor1; if(!entity) continue; m_sQueueSample.m_vecPos = entity->GetPosition(); distCalculated = false; distSquared = GetDistanceSquared(&m_sQueueSample.m_vecPos); if(distSquared < 6400.f) { - state = CGarages::Garages[i].m_eGarageState; + state = CGarages::aGarages[i].m_eGarageState; if(state == GS_OPENING || state == GS_CLOSING || state == GS_AFTERDROPOFF) { CalculateDistance(distCalculated, distSquared); m_sQueueSample.m_bVolume = ComputeVolume(90, 80.f, m_sQueueSample.m_fDistance); if(m_sQueueSample.m_bVolume) { - if(CGarages::Garages[i].m_eGarageType == GARAGE_CRUSHER) { - if(CGarages::Garages[i].m_eGarageState == GS_AFTERDROPOFF) { + if(CGarages::aGarages[i].m_eGarageType == GARAGE_CRUSHER) { + if(CGarages::aGarages[i].m_eGarageState == GS_AFTERDROPOFF) { if(!(m_FrameCounter & 1)) { LOOP_HELPER continue; diff --git a/src/audio/DMAudio.h b/src/audio/DMAudio.h index c792b414..d2cdf466 100644 --- a/src/audio/DMAudio.h +++ b/src/audio/DMAudio.h @@ -64,7 +64,7 @@ enum eSound : int16 SOUND_GARAGE_NO_MONEY = 57, SOUND_GARAGE_BAD_VEHICLE = 58, SOUND_GARAGE_OPENING = 59, - SOUND_3C = 60, + SOUND_GARAGE_BOMB_ALREADY_SET = 60, SOUND_GARAGE_BOMB1_SET = 61, SOUND_GARAGE_BOMB2_SET = 62, SOUND_GARAGE_BOMB3_SET = 63, |