Se.Cherkasov/re3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove cMissionAudio, move cAMCrime array outside of cPoliceRadioQueue (R* vision)

Browse Source
This commit is contained in:
Sergeanur
2021-08-21 13:02:07 +03:00
parent fe51abd534
commit 7c80093efa
5 changed files with 200 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/audio/AudioManager.cpp
View File

@@ -999,7 +999,7 @@ cAudioManager::ProcessActiveQueues()
uint8 emittingVol;
CVector position;
bool8 missionState;
bool8 isPhoneCall;
uint8 channelOffset = 0;
for (int32 i = 0; i < m_nActiveSamples; i++) {
@@ -1065,18 +1065,18 @@ cAudioManager::ProcessActiveQueues()
#endif
emittingVol = m_bDoubleVolume ? 2 * Min(63, vol) : vol;
missionState = FALSE;
isPhoneCall = FALSE;
for (int32 k = 0; k < MISSION_AUDIO_SLOTS; k++) {
if (m_sMissionAudio.m_bIsMobile[k]) {
missionState = TRUE;
if (m_bIsMissionAudioPhoneCall[k]) {
isPhoneCall = TRUE;
break;
}
}
if (missionState) {
emittingVol = (emittingVol * field_5538) / 127;
if (isPhoneCall) {
emittingVol = (emittingVol * m_nGlobalSfxVolumeMultiplier) / 127;
} else {
if (field_5538 < 127)
emittingVol = (emittingVol * field_5538) / 127;
if (m_nGlobalSfxVolumeMultiplier < 127)
emittingVol = (emittingVol * m_nGlobalSfxVolumeMultiplier) / 127;
}
#ifdef EXTERNAL_3D_SOUND
@@ -1154,19 +1154,19 @@ cAudioManager::ProcessActiveQueues()
if (SampleManager.InitialiseChannel(k, m_asActiveSamples[k].m_nSampleIndex, m_asActiveSamples[k].m_nBankIndex)) {
#endif
SampleManager.SetChannelFrequency(k, m_asActiveSamples[k].m_nFrequency);
bool8 isMobile = FALSE;
isPhoneCall = FALSE;
for (int32 l = 0; l < MISSION_AUDIO_SLOTS; l++) {
if (m_sMissionAudio.m_bIsMobile[l]) {
isMobile = TRUE;
if (m_bIsMissionAudioPhoneCall[l]) {
isPhoneCall = TRUE;
break;
}
}
if (!isMobile || m_asActiveSamples[k].m_bIs2D) {
if (field_5538 < 127)
emittingVol *= field_5538 / 127;
if (!isPhoneCall || m_asActiveSamples[k].m_bIs2D) {
if (m_nGlobalSfxVolumeMultiplier < 127)
emittingVol = (emittingVol * m_nGlobalSfxVolumeMultiplier) / 127;
vol = emittingVol;
} else {
vol = (emittingVol * field_5538 / 127);
vol = (emittingVol * m_nGlobalSfxVolumeMultiplier) / 127;
}
#ifdef EXTERNAL_3D_SOUND
SampleManager.SetChannelEmittingVolume(k, vol);