summaryrefslogtreecommitdiffstats
path: root/src/audio/AudioManager.cpp
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2021-08-30 09:58:51 +0200
committerNikolay Korolev <nickvnuk@gmail.com>2021-08-30 09:58:51 +0200
commit8cbdf272289240913884ef9a484a2fb027349c8d (patch)
treea853b02aaef34a33ddaec5f5d621aaa9be06c5f2 /src/audio/AudioManager.cpp
parentscript revision p2 (diff)
parentFix yet another DirectlyEnqueueSample (diff)
downloadre3-8cbdf272289240913884ef9a484a2fb027349c8d.tar
re3-8cbdf272289240913884ef9a484a2fb027349c8d.tar.gz
re3-8cbdf272289240913884ef9a484a2fb027349c8d.tar.bz2
re3-8cbdf272289240913884ef9a484a2fb027349c8d.tar.lz
re3-8cbdf272289240913884ef9a484a2fb027349c8d.tar.xz
re3-8cbdf272289240913884ef9a484a2fb027349c8d.tar.zst
re3-8cbdf272289240913884ef9a484a2fb027349c8d.zip
Diffstat (limited to 'src/audio/AudioManager.cpp')
-rw-r--r--src/audio/AudioManager.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/audio/AudioManager.cpp b/src/audio/AudioManager.cpp
index b9970562..c3466b59 100644
--- a/src/audio/AudioManager.cpp
+++ b/src/audio/AudioManager.cpp
@@ -687,7 +687,7 @@ cAudioManager::InterrogateAudioEntities()
}
void
-cAudioManager::AddSampleToRequestedQueue()
+cAudioManager::AddSampleToRequestedQueue(uint8 unk_lcs)
{
uint32 finalPriority;
uint8 sampleIndex;
@@ -726,6 +726,7 @@ cAudioManager::AddSampleToRequestedQueue()
m_sQueueSample.m_bReverb = FALSE;
#endif
#endif
+ m_sQueueSample.field_51_lcs = unk_lcs;
m_aRequestedQueue[m_nActiveQueue][sampleIndex] = m_sQueueSample;
@@ -1405,6 +1406,10 @@ cAudioManager::GenerateIntegerRandomNumberTable()
void
cAudioManager::DirectlyEnqueueSample(uint32 sample, uint8 bank, uint32 counter, uint32 priority, uint32 freq, uint8 volume, uint8 framesToPlay, uint32 notStereo)
{
+#ifdef FIX_BUGS
+ if (!m_bIsInitialised || m_nExtraSoundsEntity < 0) return;
+ m_sQueueSample.m_nEntityIndex = m_nExtraSoundsEntity; // not setting entity ID could cause bugs, let's use extra sounds one
+#endif
m_sQueueSample.m_nSampleIndex = sample;
m_sQueueSample.m_nBankIndex = bank;
m_sQueueSample.m_nCounter = counter;