diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2021-08-30 11:27:18 +0300 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2021-08-30 11:27:18 +0300 |
| commit | 6df0cb1ddbcc15017a699400007bb2da62a18c58 (patch) | |
| tree | 07137642260a312ea09730744a986d5d163e8395 /src/audio/AudioManager.cpp | |
| parent | 145af411ab7b0c73c6c1d611dabef621f084c0f3 (diff) | |
| parent | 320624edc87778960906d28252752f2471f8a571 (diff) | |
Merge branch 'miami' into lcs
# Conflicts:
# src/audio/AudioManager.h
Diffstat (limited to 'src/audio/AudioManager.cpp')
| -rw-r--r-- | src/audio/AudioManager.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/audio/AudioManager.cpp b/src/audio/AudioManager.cpp index c3466b59..fc7d1bac 100644 --- a/src/audio/AudioManager.cpp +++ b/src/audio/AudioManager.cpp @@ -1390,18 +1390,20 @@ cAudioManager::ClearActiveSamples() } void -cAudioManager::LoadBankIfNecessary(uint8 bank) +cAudioManager::GenerateIntegerRandomNumberTable() { - if(!SampleManager.IsSampleBankLoaded(bank)) - SampleManager.LoadSampleBank(bank); + for (uint32 i = 0; i < ARRAY_SIZE(m_anRandomTable); i++) + m_anRandomTable[i] = myrand(); } +#ifdef GTA_PS2 void -cAudioManager::GenerateIntegerRandomNumberTable() +cAudioManager::LoadBankIfNecessary(uint8 bank) { - for (uint32 i = 0; i < ARRAY_SIZE(m_anRandomTable); i++) - m_anRandomTable[i] = myrand(); + if(!SampleManager.IsSampleBankLoaded(bank)) + SampleManager.LoadSampleBank(bank); } +#endif void cAudioManager::DirectlyEnqueueSample(uint32 sample, uint8 bank, uint32 counter, uint32 priority, uint32 freq, uint8 volume, uint8 framesToPlay, uint32 notStereo) |