mirror/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2024-12-29 19:55:41 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'miami' into lcs

Browse source
This commit is contained in:
Sergeanur 2021-08-20 15:45:58 +03:00
commit 071dbc3086
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/audio/AudioManager.cpp
View file

@ -21,7 +21,7 @@ cAudioManager::cAudioManager()
{ {
m_bIsInitialised = FALSE; m_bIsInitialised = FALSE;
m_bIsSurround = TRUE; m_bIsSurround = TRUE;
field_6 = 0; m_nChannelOffset = 0;
m_fSpeedOfSound = SPEED_OF_SOUND / TIME_SPENT; m_fSpeedOfSound = SPEED_OF_SOUND / TIME_SPENT;
m_nTimeSpent = TIME_SPENT; m_nTimeSpent = TIME_SPENT;
m_nActiveSamples = NUM_CHANNELS_GENERIC; m_nActiveSamples = NUM_CHANNELS_GENERIC;
@ -991,6 +991,7 @@ cAudioManager::ProcessActiveQueues()
CVector position; CVector position;
bool8 missionState; bool8 missionState;
uint8 channelOffset = 0;
for (int32 i = 0; i < m_nActiveSamples; i++) { for (int32 i = 0; i < m_nActiveSamples; i++) {
m_asSamples[m_nActiveSampleQueue][i].m_bIsBeingPlayed = FALSE; m_asSamples[m_nActiveSampleQueue][i].m_bIsBeingPlayed = FALSE;
@ -1116,7 +1117,7 @@ cAudioManager::ProcessActiveQueues()
#endif #endif
{ {
for (uint8 j = 0; j < m_nActiveSamples; j++) { 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 (!m_asActiveSamples[k].m_bIsBeingPlayed) {
if (sample.m_nLoopCount > 0) { if (sample.m_nLoopCount > 0) {
samplesPerFrame = sample.m_nFrequency / m_nTimeSpent; samplesPerFrame = sample.m_nFrequency / m_nTimeSpent;
@ -1195,6 +1196,7 @@ cAudioManager::ProcessActiveQueues()
SampleManager.StartChannel(k); SampleManager.StartChannel(k);
} }
m_asActiveSamples[k].m_bIsBeingPlayed = TRUE; m_asActiveSamples[k].m_bIsBeingPlayed = TRUE;
channelOffset++;
sample.m_bIsBeingPlayed = TRUE; sample.m_bIsBeingPlayed = TRUE;
sample.m_nVolumeChange = -1; sample.m_nVolumeChange = -1;
break; break;
@ -1203,7 +1205,10 @@ cAudioManager::ProcessActiveQueues()
} }
} }
} }
field_6 %= m_nActiveSamples; #ifdef GTA_PS2
m_nChannelOffset += channelOffset;
#endif
m_nChannelOffset %= m_nActiveSamples;
} }
void void

2
src/audio/AudioManager.h
View file

@ -240,7 +240,7 @@ public:
uint8 m_nActiveSamples; uint8 m_nActiveSamples;
bool8 m_bDoubleVolume; // unused bool8 m_bDoubleVolume; // unused
bool8 m_bDynamicAcousticModelingStatus; bool8 m_bDynamicAcousticModelingStatus;
int8 field_6; uint8 m_nChannelOffset;
float m_fSpeedOfSound; float m_fSpeedOfSound;
bool8 m_bTimerJustReset; bool8 m_bTimerJustReset;
int32 m_nTimer; int32 m_nTimer;