mirror/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2024-12-28 14:15:39 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'miami' into lcs

Browse source 
# Conflicts:
#	src/audio/AudioManager.h
This commit is contained in:
Sergeanur 2021-08-30 11:27:18 +03:00
commit 6df0cb1ddb
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/audio/AudioManager.cpp
View file

@ -1390,18 +1390,20 @@ cAudioManager::ClearActiveSamples()
} }
void void
cAudioManager::LoadBankIfNecessary(uint8 bank) cAudioManager::GenerateIntegerRandomNumberTable()
{ {
if(!SampleManager.IsSampleBankLoaded(bank)) for (uint32 i = 0; i < ARRAY_SIZE(m_anRandomTable); i++)
SampleManager.LoadSampleBank(bank); m_anRandomTable[i] = myrand();
} }
#ifdef GTA_PS2
void void
cAudioManager::GenerateIntegerRandomNumberTable() cAudioManager::LoadBankIfNecessary(uint8 bank)
{ {
for (uint32 i = 0; i < ARRAY_SIZE(m_anRandomTable); i++) if(!SampleManager.IsSampleBankLoaded(bank))
m_anRandomTable[i] = myrand(); SampleManager.LoadSampleBank(bank);
} }
#endif
void void
cAudioManager::DirectlyEnqueueSample(uint32 sample, uint8 bank, uint32 counter, uint32 priority, uint32 freq, uint8 volume, uint8 framesToPlay, uint32 notStereo) cAudioManager::DirectlyEnqueueSample(uint32 sample, uint8 bank, uint32 counter, uint32 priority, uint32 freq, uint8 volume, uint8 framesToPlay, uint32 notStereo)

4
src/audio/AudioManager.h
View file

@ -359,7 +359,9 @@ public:
void ClearRequestedQueue(); // inlined in vc void ClearRequestedQueue(); // inlined in vc
void ClearActiveSamples(); void ClearActiveSamples();
void GenerateIntegerRandomNumberTable(); void GenerateIntegerRandomNumberTable();
void LoadBankIfNecessary(uint8 bank); #ifdef GTA_PS2
void LoadBankIfNecessary(uint8 bank); // this is used only on PS2 but technically not a platform code
#endif
void DirectlyEnqueueSample(uint32 sample, uint8 bank, uint32 counter, uint32 priority, uint32 freq, uint8 volume, uint8 framesToPlay, uint32 notStereo = 0); void DirectlyEnqueueSample(uint32 sample, uint8 bank, uint32 counter, uint32 priority, uint32 freq, uint8 volume, uint8 framesToPlay, uint32 notStereo = 0);
#ifdef EXTERNAL_3D_SOUND // actually must have been && AUDIO_MSS as well #ifdef EXTERNAL_3D_SOUND // actually must have been && AUDIO_MSS as well