Merge pull request #921 from TheOfficialFloW/patch-2

Fix typo in ProcessMissionAudioSlot.
This commit is contained in:
aap 2021-01-03 17:00:08 +01:00 committed by GitHub
commit 12a869c62a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -9938,7 +9938,7 @@ cAudioManager::ProcessMissionAudioSlot(uint8 slot)
} else { } else {
if (m_nUserPause) if (m_nUserPause)
SampleManager.PauseStream(1, slot + 1); SampleManager.PauseStream(1, slot + 1);
if (m_sMissionAudio.m_bPredefinedProperties) { if (m_sMissionAudio.m_bPredefinedProperties[slot]) {
if (m_sMissionAudio.m_nSampleIndex[slot] == STREAMED_SOUND_MISSION_CAMERAL) if (m_sMissionAudio.m_nSampleIndex[slot] == STREAMED_SOUND_MISSION_CAMERAL)
SampleManager.SetStreamedVolumeAndPan(80, 0, 1, slot + 1); SampleManager.SetStreamedVolumeAndPan(80, 0, 1, slot + 1);
else if (m_sMissionAudio.m_nSampleIndex[slot] == STREAMED_SOUND_MISSION_CAMERAR) else if (m_sMissionAudio.m_nSampleIndex[slot] == STREAMED_SOUND_MISSION_CAMERAR)
@ -9992,7 +9992,7 @@ cAudioManager::ProcessMissionAudioSlot(uint8 slot)
else else
{ {
SampleManager.PauseStream(0, slot + 1); SampleManager.PauseStream(0, slot + 1);
if (!m_sMissionAudio.m_bPredefinedProperties) { if (!m_sMissionAudio.m_bPredefinedProperties[slot]) {
distSquared = GetDistanceSquared(m_sMissionAudio.m_vecPos[slot]); distSquared = GetDistanceSquared(m_sMissionAudio.m_vecPos[slot]);
if (distSquared >= SQR(80.0f)) { if (distSquared >= SQR(80.0f)) {
emittingVol = 0; emittingVol = 0;