aboutsummaryrefslogtreecommitdiffstats
path: root/src/audio/sampman_oal.cpp
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2020-05-22 17:41:03 +0300
committerSergeanur <s.anureev@yandex.ua>2020-05-22 17:41:03 +0300
commitab161d12d8cf0326bf072777b7eeef31e8cd516c (patch)
treed9fb154d49338cab92e278fc34952386daa9e314 /src/audio/sampman_oal.cpp
parent0af4d57408842d501af2fce4617e19a3bf9466eb (diff)
parent21071edbfe5794393d1e64322e4689f50ddc1bc3 (diff)
Merge remote-tracking branch 'origin/master' into opus
Diffstat (limited to 'src/audio/sampman_oal.cpp')
-rw-r--r--src/audio/sampman_oal.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/audio/sampman_oal.cpp b/src/audio/sampman_oal.cpp
index d8d7ac24..ff50ac07 100644
--- a/src/audio/sampman_oal.cpp
+++ b/src/audio/sampman_oal.cpp
@@ -809,7 +809,7 @@ cSampleManager::IsPedCommentLoaded(uint32 nComment)
{
ASSERT( nComment < TOTAL_AUDIO_SAMPLES );
- uint8 slot;
+ int8 slot;
for ( int32 i = 0; i < _TODOCONST(3); i++ )
{
@@ -829,11 +829,15 @@ cSampleManager::IsPedCommentLoaded(uint32 nComment)
int32
cSampleManager::_GetPedCommentSlot(uint32 nComment)
{
- uint8 slot;
+ int8 slot;
for (int32 i = 0; i < _TODOCONST(3); i++)
{
slot = nCurrentPedSlot - i - 1;
+#ifdef FIX_BUGS
+ if (slot < 0)
+ slot += ARRAY_SIZE(nPedSlotSfx);
+#endif
if (nComment == nPedSlotSfx[slot])
return slot;
}