diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2021-01-23 14:14:24 +0100 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2021-01-23 14:14:24 +0100 |
| commit | defbb01aaa67ffdb1e3b2ea217a60693830edfbc (patch) | |
| tree | fc9a4a66168745e3bae5c65af0c116441d072028 /src/audio | |
| parent | Merge remote-tracking branch 'origin/miami' into lcs (diff) | |
| parent | Merge pull request #980 from Sergeanur/lcsMID (diff) | |
| download | re3-defbb01aaa67ffdb1e3b2ea217a60693830edfbc.tar re3-defbb01aaa67ffdb1e3b2ea217a60693830edfbc.tar.gz re3-defbb01aaa67ffdb1e3b2ea217a60693830edfbc.tar.bz2 re3-defbb01aaa67ffdb1e3b2ea217a60693830edfbc.tar.lz re3-defbb01aaa67ffdb1e3b2ea217a60693830edfbc.tar.xz re3-defbb01aaa67ffdb1e3b2ea217a60693830edfbc.tar.zst re3-defbb01aaa67ffdb1e3b2ea217a60693830edfbc.zip | |
Diffstat (limited to 'src/audio')
| -rw-r--r-- | src/audio/AudioLogic.cpp | 5 | ||||
| -rw-r--r-- | src/audio/AudioManager.h | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/audio/AudioLogic.cpp b/src/audio/AudioLogic.cpp index 07863e12..36b9eb11 100644 --- a/src/audio/AudioLogic.cpp +++ b/src/audio/AudioLogic.cpp @@ -9311,7 +9311,8 @@ cAudioManager::ProcessBridge() void cAudioManager::ProcessBridgeWarning() { - if (CStats::CommercialPassed && m_sQueueSample.m_fDistance < 450.f) { + // TODO: LCS +/* if (CStats::CommercialPassed && m_sQueueSample.m_fDistance < 450.f) { m_sQueueSample.m_nVolume = ComputeVolume(100, 450.f, m_sQueueSample.m_fDistance); if (m_sQueueSample.m_nVolume != 0) { m_sQueueSample.m_nCounter = 0; @@ -9332,7 +9333,7 @@ cAudioManager::ProcessBridgeWarning() m_sQueueSample.m_bRequireReflection = false; AddSampleToRequestedQueue(); } - } + }*/ } void diff --git a/src/audio/AudioManager.h b/src/audio/AudioManager.h index b5e9b499..f715fb45 100644 --- a/src/audio/AudioManager.h +++ b/src/audio/AudioManager.h @@ -544,8 +544,8 @@ public: #endif }; -#ifdef AUDIO_MSS -static_assert(sizeof(cAudioManager) == 0x5558, "cAudioManager: error"); -#endif +//#ifdef AUDIO_MSS +//static_assert(sizeof(cAudioManager) == 0x5558, "cAudioManager: error"); +//#endif extern cAudioManager AudioManager; |