diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2021-08-20 14:45:18 +0200 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2021-08-20 14:45:18 +0200 |
| commit | 239367663b53a49b60e655e8e406362bf66daa38 (patch) | |
| tree | 09008866ca82c9ae68deb9cb8a6b5e390630bc13 /src/audio/AudioManager.cpp | |
| parent | Audio refactoring: (diff) | |
| download | re3-239367663b53a49b60e655e8e406362bf66daa38.tar re3-239367663b53a49b60e655e8e406362bf66daa38.tar.gz re3-239367663b53a49b60e655e8e406362bf66daa38.tar.bz2 re3-239367663b53a49b60e655e8e406362bf66daa38.tar.lz re3-239367663b53a49b60e655e8e406362bf66daa38.tar.xz re3-239367663b53a49b60e655e8e406362bf66daa38.tar.zst re3-239367663b53a49b60e655e8e406362bf66daa38.zip | |
Diffstat (limited to 'src/audio/AudioManager.cpp')
| -rw-r--r-- | src/audio/AudioManager.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/audio/AudioManager.cpp b/src/audio/AudioManager.cpp index 9fd43930..614511f3 100644 --- a/src/audio/AudioManager.cpp +++ b/src/audio/AudioManager.cpp @@ -21,7 +21,7 @@ cAudioManager::cAudioManager() { m_bIsInitialised = FALSE; m_bIsSurround = TRUE; - field_6 = 0; + m_nChannelOffset = 0; m_fSpeedOfSound = SPEED_OF_SOUND / TIME_SPENT; m_nTimeSpent = TIME_SPENT; m_nActiveSamples = NUM_CHANNELS_GENERIC; @@ -981,6 +981,7 @@ cAudioManager::ProcessActiveQueues() CVector position; bool8 missionState; + uint8 channelOffset = 0; for (int32 i = 0; i < m_nActiveSamples; i++) { m_asSamples[m_nActiveSampleQueue][i].m_bIsBeingPlayed = FALSE; @@ -1106,7 +1107,7 @@ cAudioManager::ProcessActiveQueues() #endif { for (uint8 j = 0; j < m_nActiveSamples; j++) { - uint8 k = (j + field_6) % m_nActiveSamples; + uint8 k = (j + m_nChannelOffset) % m_nActiveSamples; if (!m_asActiveSamples[k].m_bIsBeingPlayed) { if (sample.m_nLoopCount > 0) { samplesPerFrame = sample.m_nFrequency / m_nTimeSpent; @@ -1185,6 +1186,7 @@ cAudioManager::ProcessActiveQueues() SampleManager.StartChannel(k); } m_asActiveSamples[k].m_bIsBeingPlayed = TRUE; + channelOffset++; sample.m_bIsBeingPlayed = TRUE; sample.m_nVolumeChange = -1; break; @@ -1193,7 +1195,10 @@ cAudioManager::ProcessActiveQueues() } } } - field_6 %= m_nActiveSamples; +#ifdef GTA_PS2 + m_nChannelOffset += channelOffset; +#endif + m_nChannelOffset %= m_nActiveSamples; } void |