diff options
| author | aap <aap@papnet.eu> | 2020-05-21 10:32:27 +0200 |
|---|---|---|
| committer | aap <aap@papnet.eu> | 2020-05-21 10:32:27 +0200 |
| commit | ff219da3ebe82e5b4f1db544a49fd101a6e46702 (patch) | |
| tree | df2197b26038bf47d91998bbb173f519e81ec5b6 /src/audio | |
| parent | Merge branch 'miami' of github.com:GTAmodding/re3 into miami (diff) | |
| parent | Merge pull request #573 from Nick007J/miami (diff) | |
| download | re3-ff219da3ebe82e5b4f1db544a49fd101a6e46702.tar re3-ff219da3ebe82e5b4f1db544a49fd101a6e46702.tar.gz re3-ff219da3ebe82e5b4f1db544a49fd101a6e46702.tar.bz2 re3-ff219da3ebe82e5b4f1db544a49fd101a6e46702.tar.lz re3-ff219da3ebe82e5b4f1db544a49fd101a6e46702.tar.xz re3-ff219da3ebe82e5b4f1db544a49fd101a6e46702.tar.zst re3-ff219da3ebe82e5b4f1db544a49fd101a6e46702.zip | |
Diffstat (limited to 'src/audio')
| -rw-r--r-- | src/audio/AudioLogic.cpp | 4 | ||||
| -rw-r--r-- | src/audio/sampman_miles.cpp | 4 | ||||
| -rw-r--r-- | src/audio/sampman_oal.cpp | 4 |
3 files changed, 10 insertions, 2 deletions
diff --git a/src/audio/AudioLogic.cpp b/src/audio/AudioLogic.cpp index 9080a2dd..cc157389 100644 --- a/src/audio/AudioLogic.cpp +++ b/src/audio/AudioLogic.cpp @@ -3849,9 +3849,9 @@ cAudioManager::GetPedCommentSfx(CPed *ped, int32 sound) //if (ped->IsPlayer()) // return GetPlayerTalkSfx(sound); - // TODO: miami peds + // TODO(Miami): ped comments - return TOTAL_AUDIO_SAMPLES; + return NO_SAMPLE; } void diff --git a/src/audio/sampman_miles.cpp b/src/audio/sampman_miles.cpp index a2a206a4..ad2c512f 100644 --- a/src/audio/sampman_miles.cpp +++ b/src/audio/sampman_miles.cpp @@ -1469,6 +1469,10 @@ cSampleManager::_GetPedCommentSlot(uint32 nComment) 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; } diff --git a/src/audio/sampman_oal.cpp b/src/audio/sampman_oal.cpp index 30efd7f5..f16afbba 100644 --- a/src/audio/sampman_oal.cpp +++ b/src/audio/sampman_oal.cpp @@ -800,6 +800,10 @@ cSampleManager::_GetPedCommentSlot(uint32 nComment) 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; } |