diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2021-08-12 10:46:10 +0200 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2021-08-12 10:46:10 +0200 |
| commit | f1545daeae2cbd37732e317609c3a407e9be53be (patch) | |
| tree | 0ef60c48e003aededfc8e2718ab5f0bc9f9f09ba | |
| parent | Replace static_assert with #error (diff) | |
| download | re3-f1545daeae2cbd37732e317609c3a407e9be53be.tar re3-f1545daeae2cbd37732e317609c3a407e9be53be.tar.gz re3-f1545daeae2cbd37732e317609c3a407e9be53be.tar.bz2 re3-f1545daeae2cbd37732e317609c3a407e9be53be.tar.lz re3-f1545daeae2cbd37732e317609c3a407e9be53be.tar.xz re3-f1545daeae2cbd37732e317609c3a407e9be53be.tar.zst re3-f1545daeae2cbd37732e317609c3a407e9be53be.zip | |
| -rw-r--r-- | src/audio/AudioManager.cpp | 14 | ||||
| -rw-r--r-- | src/audio/AudioManager.h | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/audio/AudioManager.cpp b/src/audio/AudioManager.cpp index 7345ceb1..8412f98c 100644 --- a/src/audio/AudioManager.cpp +++ b/src/audio/AudioManager.cpp @@ -29,7 +29,7 @@ cAudioManager::cAudioManager() ClearRequestedQueue(); ClearActiveSamples(); GenerateIntegerRandomNumberTable(); - field_4 = 0; + m_bDoubleVolume = FALSE; m_bDynamicAcousticModelingStatus = TRUE; for (int i = 0; i < NUM_AUDIOENTITIES; i++) { @@ -849,13 +849,13 @@ cAudioManager::ProcessActiveQueues() if (!sample.m_bReleasingSoundFlag) { if (sample.m_bIs2D) { #ifdef EXTERNAL_3D_SOUND - if (field_4) { + if (m_bDoubleVolume) { emittingVol = 2 * Min(63, sample.m_nEmittingVolume); } else { emittingVol = sample.m_nEmittingVolume; } #else - if (field_4) { + if (m_bDoubleVolume) { emittingVol = 2 * Min(63, sample.m_nVolume); } else { emittingVol = sample.m_nVolume; @@ -897,7 +897,7 @@ cAudioManager::ProcessActiveQueues() } uint8 emittingVol; - if (field_4) { + if (m_bDoubleVolume) { emittingVol = 2 * Min(63, vol); } else { emittingVol = vol; @@ -915,7 +915,7 @@ cAudioManager::ProcessActiveQueues() m_asActiveSamples[j].m_nVolume = vol; uint8 emittingVol; - if (field_4) { + if (m_bDoubleVolume) { emittingVol = 2 * Min(63, vol); } else { emittingVol = vol; @@ -973,13 +973,13 @@ cAudioManager::ProcessActiveQueues() } #ifdef EXTERNAL_3D_SOUND - if (field_4) { + if (m_bDoubleVolume) { emittingVol = 2 * Min(63, m_asActiveSamples[j].m_nEmittingVolume); } else { emittingVol = m_asActiveSamples[j].m_nEmittingVolume; } #else - if (field_4) { + if (m_bDoubleVolume) { emittingVol = 2 * Min(63, m_asActiveSamples[j].m_nVolume); } else { emittingVol = m_asActiveSamples[j].m_nVolume; diff --git a/src/audio/AudioManager.h b/src/audio/AudioManager.h index d217c87a..74092c51 100644 --- a/src/audio/AudioManager.h +++ b/src/audio/AudioManager.h @@ -195,7 +195,7 @@ public: bool8 m_bReverb; // unused bool8 m_bFifthFrameFlag; uint8 m_nActiveSamples; - uint8 field_4; // unused + uint8 m_bDoubleVolume; // unused bool8 m_bDynamicAcousticModelingStatus; float m_fSpeedOfSound; bool8 m_bTimerJustReset; |