summaryrefslogtreecommitdiffstats
path: root/src/audio/AudioManager.cpp
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2020-03-28 13:24:13 +0100
committerNikolay Korolev <nickvnuk@gmail.com>2020-03-28 13:24:13 +0100
commit268f92bfbe5330149be341855fa52f53ea501c62 (patch)
treee4ec5d4cc96e2bdc1fd153fc605d20e1a410f592 /src/audio/AudioManager.cpp
parentMerge pull request #353 from Sergeanur/Debug (diff)
downloadre3-268f92bfbe5330149be341855fa52f53ea501c62.tar
re3-268f92bfbe5330149be341855fa52f53ea501c62.tar.gz
re3-268f92bfbe5330149be341855fa52f53ea501c62.tar.bz2
re3-268f92bfbe5330149be341855fa52f53ea501c62.tar.lz
re3-268f92bfbe5330149be341855fa52f53ea501c62.tar.xz
re3-268f92bfbe5330149be341855fa52f53ea501c62.tar.zst
re3-268f92bfbe5330149be341855fa52f53ea501c62.zip
Diffstat (limited to '')
-rw-r--r--src/audio/AudioManager.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/audio/AudioManager.cpp b/src/audio/AudioManager.cpp
index 539c9e91..39c03ef6 100644
--- a/src/audio/AudioManager.cpp
+++ b/src/audio/AudioManager.cpp
@@ -3889,7 +3889,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] \
@@ -3925,20 +3925,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(90u, 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;