summaryrefslogtreecommitdiffstats
path: root/src/audio/AudioLogic.cpp
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2021-08-11 09:55:00 +0200
committerSergeanur <s.anureev@yandex.ua>2021-08-11 09:55:00 +0200
commit68c37d2d8862e80c5e9bcd8e9990f32cb345dd5a (patch)
tree68e951e4413a1551071aba6d09407d54de3c714d /src/audio/AudioLogic.cpp
parentuncomment GetSpecialCharacterTalkSfx (diff)
downloadre3-68c37d2d8862e80c5e9bcd8e9990f32cb345dd5a.tar
re3-68c37d2d8862e80c5e9bcd8e9990f32cb345dd5a.tar.gz
re3-68c37d2d8862e80c5e9bcd8e9990f32cb345dd5a.tar.bz2
re3-68c37d2d8862e80c5e9bcd8e9990f32cb345dd5a.tar.lz
re3-68c37d2d8862e80c5e9bcd8e9990f32cb345dd5a.tar.xz
re3-68c37d2d8862e80c5e9bcd8e9990f32cb345dd5a.tar.zst
re3-68c37d2d8862e80c5e9bcd8e9990f32cb345dd5a.zip
Diffstat (limited to '')
-rw-r--r--src/audio/AudioLogic.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/audio/AudioLogic.cpp b/src/audio/AudioLogic.cpp
index a5fa18cc..8880110a 100644
--- a/src/audio/AudioLogic.cpp
+++ b/src/audio/AudioLogic.cpp
@@ -5398,8 +5398,8 @@ cAudioManager::GetPedCommentSfx(CPed *ped, uint16 sound)
case MI_VICE4:
case MI_VICE5:
case MI_VICE7:
- case MI_VICE8: //return GetViceWhiteTalkSfx(ped, sound);
- case MI_VICE6: //return GetViceBlackTalkSfx(ped, sound);
+ case MI_VICE8: return GetViceWhiteTalkSfx(ped, sound);
+ case MI_VICE6: return GetViceBlackTalkSfx(ped, sound);
case MI_SPECIAL01:
case MI_SPECIAL02:
case MI_SPECIAL03:
@@ -7880,17 +7880,17 @@ cAudioManager::GetPGTalkSfx(CPed *ped, uint16 sound)
}
return (SFX_PLAYER_GANG_2_BLOCKED_1 - SFX_PLAYER_GANG_1_BLOCKED_1) * (m_sQueueSample.m_nEntityIndex % 3) + sfx;
}
-
+*/
uint32
cAudioManager::GetViceWhiteTalkSfx(CPed *ped, uint16 sound)
{
uint32 sfx;
switch(sound) {
- case SOUND_PED_ARREST_COP: GetPhrase(sfx, ped->m_lastComment, SFX_VICE_VOICE_1_ARREST_1, 3); break;
- case SOUND_PED_MIAMIVICE_EXITING_CAR: sfx = SFX_VICE_VOICE_1_MIAMIVICE_EXITING_CAR_1; break;
+ case SOUND_PED_ARREST_COP: GetPhrase(sfx, ped->m_lastComment, SFX_SFX_VICE_VOICE_1_ARREST_1, 3); break;
+ case SOUND_PED_MIAMIVICE_EXITING_CAR: sfx = SFX_SFX_VICE_VOICE_1_MIAMIVICE_EXITING_CAR_1; break;
default: return GetGenericMaleTalkSfx(ped, sound);
}
- sfx += (SFX_VICE_VOICE_2_ARREST_1-SFX_VICE_VOICE_1_ARREST_1) * (m_sQueueSample.m_nEntityIndex % 5);
+ sfx += (SFX_SFX_VICE_VOICE_2_ARREST_1-SFX_SFX_VICE_VOICE_1_ARREST_1) * (m_sQueueSample.m_nEntityIndex % 5);
return sfx;
}
@@ -7899,13 +7899,13 @@ cAudioManager::GetViceBlackTalkSfx(CPed *ped, uint16 sound)
{
uint32 sfx;
switch(sound) {
- case SOUND_PED_ARREST_COP: GetPhrase(sfx, ped->m_lastComment, SFX_VICE_VOICE_6_ARREST_1, 3); break;
- case SOUND_PED_MIAMIVICE_EXITING_CAR: return SFX_VICE_VOICE_6_MIAMIVICE_EXITING_CAR_1;
+ case SOUND_PED_ARREST_COP: GetPhrase(sfx, ped->m_lastComment, SFX_SFX_VICE_VOICE_6_ARREST_1, 3); break;
+ case SOUND_PED_MIAMIVICE_EXITING_CAR: return SFX_SFX_VICE_VOICE_6_MIAMIVICE_EXITING_CAR_1;
default: return GetGenericMaleTalkSfx(ped, sound);
}
return sfx;
}
-
+/*
uint32
cAudioManager::GetBMODKTalkSfx(CPed *ped, uint16 sound)
{