diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2021-07-30 19:36:07 +0200 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2021-07-30 19:36:07 +0200 |
| commit | e8dcc8432df2e9f34e0a914aa3efe01cafd514be (patch) | |
| tree | 1062723b0cb663fd5f7d3f326500658fe5bacf44 /src/audio/AudioLogic.cpp | |
| parent | Merge branch 'miami' into lcs (diff) | |
| download | re3-e8dcc8432df2e9f34e0a914aa3efe01cafd514be.tar re3-e8dcc8432df2e9f34e0a914aa3efe01cafd514be.tar.gz re3-e8dcc8432df2e9f34e0a914aa3efe01cafd514be.tar.bz2 re3-e8dcc8432df2e9f34e0a914aa3efe01cafd514be.tar.lz re3-e8dcc8432df2e9f34e0a914aa3efe01cafd514be.tar.xz re3-e8dcc8432df2e9f34e0a914aa3efe01cafd514be.tar.zst re3-e8dcc8432df2e9f34e0a914aa3efe01cafd514be.zip | |
Diffstat (limited to 'src/audio/AudioLogic.cpp')
| -rw-r--r-- | src/audio/AudioLogic.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/audio/AudioLogic.cpp b/src/audio/AudioLogic.cpp index dfce9b71..7b8fa0d3 100644 --- a/src/audio/AudioLogic.cpp +++ b/src/audio/AudioLogic.cpp @@ -5222,19 +5222,23 @@ cAudioManager::SetupPedComments(cPedParams ¶ms, uint16 sound) switch(sound) { case SOUND_PED_HELI_PLAYER_FOUND: soundIntensity = 400.0f; - pedComment.m_nSampleIndex = NO_SAMPLE; //GetRandomNumberInRange(m_sQueueSample.m_nEntityIndex % 4, SFX_POLICE_HELI_1, SFX_POLICE_HELI_20); + pedComment.m_nSampleIndex = m_anRandomTable[m_sQueueSample.m_nEntityIndex % 4] % 29 + SFX_PHCHAT1; break; case SOUND_PED_VCPA_PLAYER_FOUND: soundIntensity = 400.0f; - pedComment.m_nSampleIndex = NO_SAMPLE; //m_anRandomTable[m_sQueueSample.m_nEntityIndex % 4] % 23 + SFX_POLICE_BOAT_1; + pedComment.m_nSampleIndex = m_anRandomTable[m_sQueueSample.m_nEntityIndex % 4] % 29 + SFX_PBCHAT1; break; case SOUND_INJURED_PED_MALE_OUCH: soundIntensity = 40.0f; - pedComment.m_nSampleIndex = NO_SAMPLE; // = GetRandomNumberInRange(m_sQueueSample.m_nEntityIndex % 4, SFX_GENERIC_MALE_GRUNT_1, SFX_GENERIC_MALE_GRUNT_41); +#ifdef FIX_BUGS + pedComment.m_nSampleIndex = m_anRandomTable[m_sQueueSample.m_nEntityIndex % 4] % 53 + SFX_MALE_PAIN_01; +#else + pedComment.m_nSampleIndex = m_anRandomTable[m_sQueueSample.m_nEntityIndex % 4] % 51 + SFX_MALE_PAIN_01; +#endif break; case SOUND_INJURED_PED_FEMALE: soundIntensity = 40.0f; - pedComment.m_nSampleIndex = NO_SAMPLE; // = GetRandomNumberInRange(m_sQueueSample.m_nEntityIndex % 4, SFX_GENERIC_FEMALE_GRUNT_1, SFX_GENERIC_FEMALE_GRUNT_33); + pedComment.m_nSampleIndex = m_anRandomTable[m_sQueueSample.m_nEntityIndex % 4] % 34 + SFX_FEMALE_PAIN_01; break; default: return; |