summaryrefslogtreecommitdiffstats
path: root/src/audio/AudioManager.cpp
diff options
context:
space:
mode:
authoreray orçunus <erayorcunus@gmail.com>2020-09-30 01:44:02 +0200
committereray orçunus <erayorcunus@gmail.com>2020-09-30 01:44:02 +0200
commitf740588780897a2d9d0b29724d617b0eaa9b5025 (patch)
tree2d9bb7a9ae9d10a2ebfceba7179b47c249b3e19a /src/audio/AudioManager.cpp
parentPopulation and many small classes done, mouse AUX buttons, Frontend, Hud, fixes (diff)
parentMerge remote-tracking branch 'origin/master' into miami (diff)
downloadre3-f740588780897a2d9d0b29724d617b0eaa9b5025.tar
re3-f740588780897a2d9d0b29724d617b0eaa9b5025.tar.gz
re3-f740588780897a2d9d0b29724d617b0eaa9b5025.tar.bz2
re3-f740588780897a2d9d0b29724d617b0eaa9b5025.tar.lz
re3-f740588780897a2d9d0b29724d617b0eaa9b5025.tar.xz
re3-f740588780897a2d9d0b29724d617b0eaa9b5025.tar.zst
re3-f740588780897a2d9d0b29724d617b0eaa9b5025.zip
Diffstat (limited to 'src/audio/AudioManager.cpp')
-rw-r--r--src/audio/AudioManager.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/audio/AudioManager.cpp b/src/audio/AudioManager.cpp
index c0a70e31..f230731b 100644
--- a/src/audio/AudioManager.cpp
+++ b/src/audio/AudioManager.cpp
@@ -811,7 +811,11 @@ cAudioManager::ProcessActiveQueues()
if (sample.m_nFrequency != m_asActiveSamples[j].m_nFrequency) {
int32 freq;
if (sample.m_nFrequency <= m_asActiveSamples[j].m_nFrequency) {
- freq = Max(sample.m_nFrequency, m_asActiveSamples[j].m_nFrequency - 6000);
+#ifdef FIX_BUGS
+ freq = Max((int32)sample.m_nFrequency, (int32)m_asActiveSamples[j].m_nFrequency - 6000);
+#else
+ freq = Max((int32)sample.m_nFrequency, int32(m_asActiveSamples[j].m_nFrequency - 6000));
+#endif
} else {
freq = Min(sample.m_nFrequency, m_asActiveSamples[j].m_nFrequency + 6000);
}