diff options
Diffstat (limited to 'src/audio')
| -rw-r--r-- | src/audio/AudioLogic.cpp | 719 | ||||
| -rw-r--r-- | src/audio/AudioManager.h | 195 |
2 files changed, 459 insertions, 455 deletions
diff --git a/src/audio/AudioLogic.cpp b/src/audio/AudioLogic.cpp index a180b8b0..0290dcee 100644 --- a/src/audio/AudioLogic.cpp +++ b/src/audio/AudioLogic.cpp @@ -5233,7 +5233,7 @@ cAudioManager::SetupPedComments(cPedParams ¶ms, uint16 sound) } uint32 -cAudioManager::GetPedCommentSfx(CPed *ped, int32 sound) +cAudioManager::GetPedCommentSfx(CPed *ped, uint16 sound) { if(ped->m_nPedState != PED_FALL || sound == SOUND_PED_DAMAGE || sound == SOUND_PED_HIT || sound == SOUND_PED_LAND) { if(ped->m_getUpTimer == UINT32_MAX || ped->m_getUpTimer > CTimer::GetTimeInMilliseconds()) { @@ -5342,9 +5342,9 @@ cAudioManager::GetPedCommentSfx(CPed *ped, int32 sound) case MI_VICE3: case MI_VICE4: case MI_VICE5: - case MI_VICE6: case MI_VICE7: - case MI_VICE8: return GetVICETalkSfx(ped, sound, ped->GetModelIndex()); + case MI_VICE8: return GetViceWhiteTalkSfx(ped, sound); + case MI_VICE6: return GetViceBlackTalkSfx(ped, sound); case MI_WFYG1: return GetWFYG1TalkSfx(ped, sound); case MI_WFYG2: return GetWFYG2TalkSfx(ped, sound); case MI_SPECIAL01: @@ -5376,7 +5376,7 @@ cAudioManager::GetPedCommentSfx(CPed *ped, int32 sound) } void -cAudioManager::GetPhrase(uint32 &phrase, uint32 &prevPhrase, uint32 sample, uint32 maxOffset) const +cAudioManager::GetPhrase(uint32 &phrase, uint32 &prevPhrase, uint32 sample, uint32 maxOffset) { phrase = sample + m_anRandomTable[m_sQueueSample.m_nEntityIndex & 3] % maxOffset; @@ -5397,7 +5397,7 @@ if (cooldown != 0) {\ cooldown = 1; uint32 -cAudioManager::GetPlayerTalkSfx(CPed *ped, int16 sound) +cAudioManager::GetPlayerTalkSfx(CPed *ped, uint16 sound) { uint32 sfx; @@ -5604,7 +5604,74 @@ cAudioManager::GetPlayerTalkSfx(CPed *ped, int16 sound) } uint32 -cAudioManager::GetCopTalkSfx(CPed *ped, int16 sound) +cAudioManager::GetGenericMaleTalkSfx(CPed *ped, uint16 sound) +{ + uint32 sfx; + + m_bGenericSfx = TRUE; + switch(sound) { + case SOUND_PED_DEATH: GetPhrase(sfx, ped->m_lastComment, SFX_GENERIC_MALE_DEATH_1, 41); break; + case SOUND_PED_BULLET_HIT: + case SOUND_PED_DEFEND: GetPhrase(sfx, ped->m_lastComment, SFX_GENERIC_MALE_GRUNT_1, 41); break; + case SOUND_PED_BURNING: GetPhrase(sfx, ped->m_lastComment, SFX_GENERIC_MALE_FIRE_1, 32); break; + case SOUND_PED_FLEE_SPRINT: GetPhrase(sfx, ped->m_lastComment, SFX_GENERIC_MALE_PANIC_1, 35); break; + default: return NO_SAMPLE; + } + return sfx; +} + +uint32 +cAudioManager::GetGenericFemaleTalkSfx(CPed *ped, uint16 sound) +{ + uint32 sfx; + m_bGenericSfx = TRUE; + switch(sound) { + case SOUND_PED_DEATH: GetPhrase(sfx, ped->m_lastComment, SFX_GENERIC_FEMALE_DEATH_1, 22); break; + case SOUND_PED_BULLET_HIT: + case SOUND_PED_DEFEND: GetPhrase(sfx, ped->m_lastComment, SFX_GENERIC_FEMALE_GRUNT_1, 33); break; + case SOUND_PED_BURNING: GetPhrase(sfx, ped->m_lastComment, SFX_GENERIC_FEMALE_FIRE_1, 17); break; + case SOUND_PED_FLEE_SPRINT: GetPhrase(sfx, ped->m_lastComment, SFX_GENERIC_FEMALE_PANIC_1, 27); break; + default: return NO_SAMPLE; + } + return sfx; +} + +uint32 +cAudioManager::GetDefaultTalkSfx(CPed *ped, uint16 sound) +{ + uint32 sfx; + + switch(sound) { + case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, SFX_DEFAULT_VOICE_GUN_PANIC_1, 12); break; + case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, SFX_DEFAULT_VOICE_JACKED_1, 12); break; +#ifdef FIX_BUGS + case SOUND_PED_CAR_JACKING: GetPhrase(sfx, ped->m_lastComment, SFX_DEFAULT_VOICE_JACKING_1, 13); break; +#endif + case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, SFX_DEFAULT_VOICE_MUGGED_1, 4); break; + case SOUND_PED_ACCIDENTREACTION1: GetPhrase(sfx, ped->m_lastComment, SFX_DEFAULT_VOICE_SAVED_1, 4); break; + case SOUND_PED_TAXI_WAIT: GetPhrase(sfx, ped->m_lastComment, SFX_DEFAULT_VOICE_TAXI_1, 5); break; + case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, SFX_DEFAULT_VOICE_FIGHT_1, 16); break; + case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_DEFAULT_VOICE_DODGE_1, 19); break; + case SOUND_PED_FLEE_RUN: GetPhrase(sfx, ped->m_lastComment, SFX_DEFAULT_VOICE_RUN_1, 19); break; + case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, SFX_DEFAULT_VOICE_GENERIC_CRASH_1, 13); break; + case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, SFX_DEFAULT_VOICE_CAR_CRASH_1, 15); break; + case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, SFX_DEFAULT_VOICE_BLOCKED_1, 16); break; + case SOUND_PED_WAIT_DOUBLEBACK: GetPhrase(sfx, ped->m_lastComment, SFX_DEFAULT_VOICE_LOST_1, 5); break; +#ifdef FIX_BUGS + case SOUND_PED_CHAT_SEXY_MALE: GetPhrase(sfx, ped->m_lastComment, SFX_DEFAULT_VOICE_EYEING_1, 6); break; +#else + case SOUND_PED_CHAT_SEXY_FEMALE: GetPhrase(sfx, ped->m_lastComment, SFX_DEFAULT_VOICE_EYEING_1, 6); break; +#endif + case SOUND_PED_CHAT_EVENT: GetPhrase(sfx, ped->m_lastComment, SFX_DEFAULT_VOICE_SHOCKED_1, 6); break; + case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_DEFAULT_VOICE_BUMP_1, 25); break; + case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, SFX_DEFAULT_VOICE_CHAT_1, 25); break; + default: return GetGenericMaleTalkSfx(ped, sound); + } + return sfx; +} + +uint32 +cAudioManager::GetCopTalkSfx(CPed *ped, uint16 sound) { uint32 sfx; PedState objective; @@ -5644,7 +5711,7 @@ cAudioManager::GetCopTalkSfx(CPed *ped, int16 sound) } uint32 -cAudioManager::GetSwatTalkSfx(CPed *ped, int16 sound) +cAudioManager::GetSwatTalkSfx(CPed *ped, uint16 sound) { uint32 sfx; switch(sound) { @@ -5658,7 +5725,7 @@ cAudioManager::GetSwatTalkSfx(CPed *ped, int16 sound) } uint32 -cAudioManager::GetFBITalkSfx(CPed *ped, int16 sound) +cAudioManager::GetFBITalkSfx(CPed *ped, uint16 sound) { uint32 sfx; switch(sound) { @@ -5683,13 +5750,13 @@ cAudioManager::GetFBITalkSfx(CPed *ped, int16 sound) } uint32 -cAudioManager::GetArmyTalkSfx(CPed *ped, int16 sound) +cAudioManager::GetArmyTalkSfx(CPed *ped, uint16 sound) { return GetGenericMaleTalkSfx(ped, sound); } uint32 -cAudioManager::GetMedicTalkSfx(CPed *ped, int16 sound) +cAudioManager::GetMedicTalkSfx(CPed *ped, uint16 sound) { uint32 sfx; switch(sound) { @@ -5703,47 +5770,71 @@ cAudioManager::GetMedicTalkSfx(CPed *ped, int16 sound) } uint32 -cAudioManager::GetFiremanTalkSfx(CPed *ped, int16 sound) +cAudioManager::GetFiremanTalkSfx(CPed *ped, uint16 sound) { return GetGenericMaleTalkSfx(ped, sound); } uint32 -cAudioManager::GetDefaultTalkSfx(CPed *ped, int16 sound) +cAudioManager::GetWFYG1TalkSfx(CPed *ped, uint16 sound) { uint32 sfx; switch(sound) { - case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, SFX_DEFAULT_VOICE_GUN_PANIC_1, 12); break; - case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, SFX_DEFAULT_VOICE_JACKED_1, 12); break; -#ifdef FIX_BUGS - case SOUND_PED_CAR_JACKING: GetPhrase(sfx, ped->m_lastComment, SFX_DEFAULT_VOICE_JACKING_1, 13); break; -#endif - case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, SFX_DEFAULT_VOICE_MUGGED_1, 4); break; - case SOUND_PED_ACCIDENTREACTION1: GetPhrase(sfx, ped->m_lastComment, SFX_DEFAULT_VOICE_SAVED_1, 4); break; - case SOUND_PED_TAXI_WAIT: GetPhrase(sfx, ped->m_lastComment, SFX_DEFAULT_VOICE_TAXI_1, 5); break; - case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, SFX_DEFAULT_VOICE_FIGHT_1, 16); break; - case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_DEFAULT_VOICE_DODGE_1, 19); break; - case SOUND_PED_FLEE_RUN: GetPhrase(sfx, ped->m_lastComment, SFX_DEFAULT_VOICE_RUN_1, 19); break; - case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, SFX_DEFAULT_VOICE_GENERIC_CRASH_1, 13); break; - case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, SFX_DEFAULT_VOICE_CAR_CRASH_1, 15); break; - case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, SFX_DEFAULT_VOICE_BLOCKED_1, 16); break; - case SOUND_PED_WAIT_DOUBLEBACK: GetPhrase(sfx, ped->m_lastComment, SFX_DEFAULT_VOICE_LOST_1, 5); break; + case SOUND_PED_HANDS_UP: GetPhrase(sfx, ped->m_lastComment, SFX_WFYG1_GUN_COOL_1, 6); break; + case SOUND_PED_MUGGING: GetPhrase(sfx, ped->m_lastComment, SFX_WFYG1_MUGGING_1, 2); break; + case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, SFX_WFYG1_JACKED_1, 5); break; + case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, SFX_WFYG1_MUGGED_1, 2); break; + case SOUND_PED_ACCIDENTREACTION1: return SFX_WFYG1_SAVED_1; + case SOUND_PED_TAXI_WAIT: return SFX_WFYG1_TAXI_1; + case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, SFX_WFYG1_FIGHT_1, 4); break; + case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_WFYG1_DODGE_1, 9); break; + case SOUND_PED_FLEE_RUN: GetPhrase(sfx, ped->m_lastComment, SFX_WFYG1_RUN_1, 2); break; + case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, SFX_WFYG1_GENERIC_CRASH_1, 7); break; + case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, SFX_WFYG1_CAR_CRASH_1, 9); break; + case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, SFX_WFYG1_BLOCKED_1, 7); break; + case SOUND_PED_WAIT_DOUBLEBACK: GetPhrase(sfx, ped->m_lastComment, SFX_WFYG1_LOST_1, 3); break; + case SOUND_PED_CHAT_SEXY_FEMALE: GetPhrase(sfx, ped->m_lastComment, SFX_WFYG1_EYEING_1, 2); break; + case SOUND_PED_CHAT_EVENT: return SFX_WFYG1_SHOCKED_1; + case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_WFYG1_BUMP_1, 11); break; + case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, SFX_WFYG1_CHAT_1, 10); break; + default: return GetGenericFemaleTalkSfx(ped, sound); + } + return sfx; +} + +uint32 +cAudioManager::GetWFYG2TalkSfx(CPed *ped, uint16 sound) +{ + uint32 sfx; + + switch(sound) { + case SOUND_PED_HANDS_UP: GetPhrase(sfx, ped->m_lastComment, SFX_WFYG2_GUN_COOL_1, 3); break; + case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, SFX_WFYG2_JACKED_1, 5); break; + case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, SFX_WFYG2_MUGGED_1, 2); break; #ifdef FIX_BUGS - case SOUND_PED_CHAT_SEXY_MALE: GetPhrase(sfx, ped->m_lastComment, SFX_DEFAULT_VOICE_EYEING_1, 6); break; + case SOUND_PED_TAXI_WAIT: GetPhrase(sfx, ped->m_lastComment, SFX_WFYG2_TAXI_1, 2); break; #else - case SOUND_PED_CHAT_SEXY_FEMALE: GetPhrase(sfx, ped->m_lastComment, SFX_DEFAULT_VOICE_EYEING_1, 6); break; + case SOUND_PED_TAXI_WAIT: return SFX_WFYG2_TAXI_1; #endif - case SOUND_PED_CHAT_EVENT: GetPhrase(sfx, ped->m_lastComment, SFX_DEFAULT_VOICE_SHOCKED_1, 6); break; - case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_DEFAULT_VOICE_BUMP_1, 25); break; - case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, SFX_DEFAULT_VOICE_CHAT_1, 25); break; - default: return GetGenericMaleTalkSfx(ped, sound); + case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, SFX_WFYG2_FIGHT_1, 5); break; + case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_WFYG2_DODGE_1, 8); break; + case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, SFX_WFYG2_GENERIC_CRASH_1, 7); break; + case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, SFX_WFYG2_CAR_CRASH_1, 9); break; + case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, SFX_WFYG2_BLOCKED_1, 5); break; + case SOUND_PED_WAIT_DOUBLEBACK: return SFX_WFYG2_LOST_1; + case SOUND_PED_CHAT_SEXY_FEMALE: GetPhrase(sfx, ped->m_lastComment, SFX_WFYG2_EYEING_1, 4); break; + case SOUND_PED_CHAT_EVENT: return SFX_WFYG2_SHOCKED_1; + case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_WFYG2_BUMP_1, 11); break; + case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, SFX_WFYG2_CHAT_1, 9); break; + default: return GetGenericFemaleTalkSfx(ped, sound); } + return sfx; } uint32 -cAudioManager::GetHFYSTTalkSfx(CPed *ped, int16 sound) +cAudioManager::GetHFYSTTalkSfx(CPed *ped, uint16 sound) { uint32 sfx; switch(sound) { @@ -5767,7 +5858,7 @@ cAudioManager::GetHFYSTTalkSfx(CPed *ped, int16 sound) } uint32 -cAudioManager::GetHFOSTTalkSfx(CPed *ped, int16 sound) +cAudioManager::GetHFOSTTalkSfx(CPed *ped, uint16 sound) { uint32 sfx; @@ -5790,7 +5881,7 @@ cAudioManager::GetHFOSTTalkSfx(CPed *ped, int16 sound) } uint32 -cAudioManager::GetHMYSTTalkSfx(CPed *ped, int16 sound) +cAudioManager::GetHMYSTTalkSfx(CPed *ped, uint16 sound) { uint32 sfx; @@ -5811,7 +5902,7 @@ cAudioManager::GetHMYSTTalkSfx(CPed *ped, int16 sound) } uint32 -cAudioManager::GetHMOSTTalkSfx(CPed *ped, int16 sound) +cAudioManager::GetHMOSTTalkSfx(CPed *ped, uint16 sound) { uint32 sfx; @@ -5836,7 +5927,7 @@ cAudioManager::GetHMOSTTalkSfx(CPed *ped, int16 sound) } uint32 -cAudioManager::GetHFYRITalkSfx(CPed *ped, int16 sound) +cAudioManager::GetHFYRITalkSfx(CPed *ped, uint16 sound) { uint32 sfx; @@ -5860,7 +5951,7 @@ cAudioManager::GetHFYRITalkSfx(CPed *ped, int16 sound) } uint32 -cAudioManager::GetHFORITalkSfx(CPed *ped, int16 sound) +cAudioManager::GetHFORITalkSfx(CPed *ped, uint16 sound) { uint32 sfx; @@ -5885,7 +5976,7 @@ cAudioManager::GetHFORITalkSfx(CPed *ped, int16 sound) } uint32 -cAudioManager::GetHMYRITalkSfx(CPed *ped, int16 sound) +cAudioManager::GetHMYRITalkSfx(CPed *ped, uint16 sound) { uint32 sfx; @@ -5907,7 +5998,7 @@ cAudioManager::GetHMYRITalkSfx(CPed *ped, int16 sound) } uint32 -cAudioManager::GetHMORITalkSfx(CPed *ped, int16 sound) +cAudioManager::GetHMORITalkSfx(CPed *ped, uint16 sound) { uint32 sfx; @@ -5931,7 +6022,7 @@ cAudioManager::GetHMORITalkSfx(CPed *ped, int16 sound) } uint32 -cAudioManager::GetHFYBETalkSfx(CPed *ped, int16 sound) +cAudioManager::GetHFYBETalkSfx(CPed *ped, uint16 sound) { uint32 sfx; @@ -5955,7 +6046,7 @@ cAudioManager::GetHFYBETalkSfx(CPed *ped, int16 sound) } uint32 -cAudioManager::GetHFOBETalkSfx(CPed *ped, int16 sound) +cAudioManager::GetHFOBETalkSfx(CPed *ped, uint16 sound) { uint32 sfx; @@ -5979,7 +6070,7 @@ cAudioManager::GetHFOBETalkSfx(CPed *ped, int16 sound) } uint32 -cAudioManager::GetHMYBETalkSfx(CPed *ped, int16 sound) +cAudioManager::GetHMYBETalkSfx(CPed *ped, uint16 sound) { uint32 sfx; @@ -6004,7 +6095,7 @@ cAudioManager::GetHMYBETalkSfx(CPed *ped, int16 sound) } uint32 -cAudioManager::GetHMOBETalkSfx(CPed *ped, int16 sound) +cAudioManager::GetHMOBETalkSfx(CPed *ped, uint16 sound) { uint32 sfx; @@ -6023,7 +6114,7 @@ cAudioManager::GetHMOBETalkSfx(CPed *ped, int16 sound) } uint32 -cAudioManager::GetHFYBUTalkSfx(CPed *ped, int16 sound) +cAudioManager::GetHFYBUTalkSfx(CPed *ped, uint16 sound) { uint32 sfx; @@ -6048,7 +6139,7 @@ cAudioManager::GetHFYBUTalkSfx(CPed *ped, int16 sound) } uint32 -cAudioManager::GetHFYMDTalkSfx(CPed *ped, int16 sound) +cAudioManager::GetHFYMDTalkSfx(CPed *ped, uint16 sound) { uint32 sfx; @@ -6071,7 +6162,7 @@ cAudioManager::GetHFYMDTalkSfx(CPed *ped, int16 sound) } uint32 -cAudioManager::GetHFYCGTalkSfx(CPed *ped, int16 sound) +cAudioManager::GetHFYCGTalkSfx(CPed *ped, uint16 sound) { uint32 sfx; @@ -6094,7 +6185,7 @@ cAudioManager::GetHFYCGTalkSfx(CPed *ped, int16 sound) } uint32 -cAudioManager::GetHFYPRTalkSfx(CPed *ped, int16 sound) +cAudioManager::GetHFYPRTalkSfx(CPed *ped, uint16 sound) { uint32 sfx; @@ -6116,7 +6207,7 @@ cAudioManager::GetHFYPRTalkSfx(CPed *ped, int16 sound) } uint32 -cAudioManager::GetHFOTRTalkSfx(CPed *ped, int16 sound) +cAudioManager::GetHFOTRTalkSfx(CPed *ped, uint16 sound) { uint32 sfx; @@ -6136,7 +6227,7 @@ cAudioManager::GetHFOTRTalkSfx(CPed *ped, int16 sound) } uint32 -cAudioManager::GetHMOTRTalkSfx(CPed *ped, int16 sound) +cAudioManager::GetHMOTRTalkSfx(CPed *ped, uint16 sound) { uint32 sfx; @@ -6156,33 +6247,7 @@ cAudioManager::GetHMOTRTalkSfx(CPed *ped, int16 sound) } uint32 -cAudioManager::GetHMYAPTalkSfx(CPed *ped, int16 sound) -{ - uint32 sfx; - - switch(sound) { - case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, SFX_HMYAP_GUN_PANIC_1, 7); break; - case SOUND_PED_CAR_JACKING: GetPhrase(sfx, ped->m_lastComment, SFX_HMYAP_JACKING_1, 4); break; - case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, SFX_HMYAP_JACKED_1, 7); break; - case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, SFX_HMYAP_MUGGED_1, 2); break; - case SOUND_PED_ACCIDENTREACTION1: GetPhrase(sfx, ped->m_lastComment, SFX_HMYAP_SAVED_1, 2); break; - case SOUND_PED_TAXI_WAIT: GetPhrase(sfx, ped->m_lastComment, SFX_HMYAP_TAXI_1, 2); break; - case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_HMYAP_DODGE_1, 9); break; - case SOUND_PED_FLEE_RUN: GetPhrase(sfx, ped->m_lastComment, SFX_HMYAP_RUN_1, 6); break; - case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, SFX_HMYAP_GENERIC_CRASH_1, 6); break; - case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, SFX_HMYAP_CAR_CRASH_1, 9); break; - case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, SFX_HMYAP_BLOCKED_1, 9); break; - case SOUND_PED_WAIT_DOUBLEBACK: GetPhrase(sfx, ped->m_lastComment, SFX_HMYAP_LOST_1, 2); break; - case SOUND_PED_CHAT_SEXY_MALE: GetPhrase(sfx, ped->m_lastComment, SFX_HMYAP_EYEING_1, 3); break; - case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_HMYAP_BUMP_1, 11); break; - case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, SFX_HMYAP_CHAT_1, 9); break; - default: return GetGenericMaleTalkSfx(ped, sound); - } - return sfx; -} - -uint32 -cAudioManager::GetHMOCATalkSfx(CPed *ped, int16 sound) +cAudioManager::GetHMOCATalkSfx(CPed *ped, uint16 sound) { uint32 sfx; @@ -6203,39 +6268,7 @@ cAudioManager::GetHMOCATalkSfx(CPed *ped, int16 sound) } uint32 -cAudioManager::GetBMODKTalkSfx(CPed *ped, int16 sound) -{ - uint32 sfx; - - switch(sound) { - case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, SFX_BMODK_GUN_PANIC_1, 4); break; - case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, SFX_BMODK_JACKED_1, 9); break; - case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, SFX_BMODK_MUGGED_1, 2); break; - case SOUND_PED_INNOCENT: GetPhrase(sfx, ped->m_lastComment, SFX_BMODK_INNOCENT_1, 3); break; - case SOUND_PED_TAXI_WAIT: return SFX_BMODK_TAXI_1; - case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_BMODK_DODGE_1, 7); break; - case SOUND_PED_FLEE_RUN: GetPhrase(sfx, ped->m_lastComment, SFX_BMODK_RUN_1, 4); break; - case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, SFX_BMODK_GENERIC_CRASH_1, 7); break; - case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, SFX_BMODK_CAR_CRASH_1, 10); break; - case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, SFX_BMODK_BLOCKED_1, 8); break; - case SOUND_PED_147: // this is some cut behaviour, the guy was selling something - GetPhrase(sfx, ped->m_lastComment, SFX_BMODK_UNK_147_1, 11); - // what is this? some sort of censorship? - switch(sfx) { - case SFX_BMODK_UNK_147_5: - case SFX_BMODK_UNK_147_6: - case SFX_BMODK_UNK_147_7: GetPhrase(sfx, ped->m_lastComment, SFX_BMODK_UNK_147_1, 4); break; - default: break; - } - break; - case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_BMODK_BUMP_1, 10); break; - default: return GetGenericMaleTalkSfx(ped, sound); - } - return sfx; -} - -uint32 -cAudioManager::GetBMYCRTalkSfx(CPed *ped, int16 sound) +cAudioManager::GetBMYCRTalkSfx(CPed *ped, uint16 sound) { uint32 sfx; @@ -6260,7 +6293,7 @@ cAudioManager::GetBMYCRTalkSfx(CPed *ped, int16 sound) } uint32 -cAudioManager::GetBFYSTTalkSfx(CPed *ped, int16 sound) +cAudioManager::GetBFYSTTalkSfx(CPed *ped, uint16 sound) { uint32 sfx; @@ -6284,7 +6317,7 @@ cAudioManager::GetBFYSTTalkSfx(CPed *ped, int16 sound) } uint32 -cAudioManager::GetBFOSTTalkSfx(CPed *ped, int16 sound) +cAudioManager::GetBFOSTTalkSfx(CPed *ped, uint16 sound) { uint32 sfx; @@ -6308,7 +6341,7 @@ cAudioManager::GetBFOSTTalkSfx(CPed *ped, int16 sound) } uint32 -cAudioManager::GetBMYSTTalkSfx(CPed *ped, int16 sound) +cAudioManager::GetBMYSTTalkSfx(CPed *ped, uint16 sound) { uint32 sfx; @@ -6336,7 +6369,7 @@ cAudioManager::GetBMYSTTalkSfx(CPed *ped, int16 sound) } uint32 -cAudioManager::GetBMOSTTalkSfx(CPed *ped, int16 sound) +cAudioManager::GetBMOSTTalkSfx(CPed *ped, uint16 sound) { uint32 sfx; @@ -6359,7 +6392,7 @@ cAudioManager::GetBMOSTTalkSfx(CPed *ped, int16 sound) } uint32 -cAudioManager::GetBFYRITalkSfx(CPed *ped, int16 sound) +cAudioManager::GetBFYRITalkSfx(CPed *ped, uint16 sound) { uint32 sfx; @@ -6385,7 +6418,7 @@ cAudioManager::GetBFYRITalkSfx(CPed *ped, int16 sound) } uint32 -cAudioManager::GetBFORITalkSfx(CPed *ped, int16 sound) +cAudioManager::GetBFORITalkSfx(CPed *ped, uint16 sound) { uint32 sfx; @@ -6409,7 +6442,7 @@ cAudioManager::GetBFORITalkSfx(CPed *ped, int16 sound) } uint32 -cAudioManager::GetBMYRITalkSfx(CPed *ped, int16 sound) +cAudioManager::GetBMYRITalkSfx(CPed *ped, uint16 sound) { uint32 sfx; @@ -6435,7 +6468,7 @@ cAudioManager::GetBMYRITalkSfx(CPed *ped, int16 sound) } uint32 -cAudioManager::GetBFYBETalkSfx(CPed *ped, int16 sound) +cAudioManager::GetBFYBETalkSfx(CPed *ped, uint16 sound) { uint32 sfx; @@ -6468,7 +6501,7 @@ cAudioManager::GetBFYBETalkSfx(CPed *ped, int16 sound) } uint32 -cAudioManager::GetBMYBETalkSfx(CPed *ped, int16 sound) +cAudioManager::GetBMYBETalkSfx(CPed *ped, uint16 sound) { uint32 sfx; @@ -6494,7 +6527,7 @@ cAudioManager::GetBMYBETalkSfx(CPed *ped, int16 sound) } uint32 -cAudioManager::GetBFOBETalkSfx(CPed *ped, int16 sound) +cAudioManager::GetBFOBETalkSfx(CPed *ped, uint16 sound) { uint32 sfx; @@ -6517,7 +6550,7 @@ cAudioManager::GetBFOBETalkSfx(CPed *ped, int16 sound) } uint32 -cAudioManager::GetBMOBETalkSfx(CPed *ped, int16 sound) +cAudioManager::GetBMOBETalkSfx(CPed *ped, uint16 sound) { uint32 sfx; @@ -6540,7 +6573,7 @@ cAudioManager::GetBMOBETalkSfx(CPed *ped, int16 sound) } uint32 -cAudioManager::GetBMYBUTalkSfx(CPed *ped, int16 sound) +cAudioManager::GetBMYBUTalkSfx(CPed *ped, uint16 sound) { uint32 sfx; @@ -6565,7 +6598,7 @@ cAudioManager::GetBMYBUTalkSfx(CPed *ped, int16 sound) } uint32 -cAudioManager::GetBFYPRTalkSfx(CPed *ped, int16 sound) +cAudioManager::GetBFYPRTalkSfx(CPed *ped, uint16 sound) { uint32 sfx; @@ -6587,7 +6620,7 @@ cAudioManager::GetBFYPRTalkSfx(CPed *ped, int16 sound) } uint32 -cAudioManager::GetBFOTRTalkSfx(CPed *ped, int16 sound) +cAudioManager::GetBFOTRTalkSfx(CPed *ped, uint16 sound) { uint32 sfx; @@ -6609,7 +6642,7 @@ cAudioManager::GetBFOTRTalkSfx(CPed *ped, int16 sound) } uint32 -cAudioManager::GetBMOTRTalkSfx(CPed *ped, int16 sound) +cAudioManager::GetBMOTRTalkSfx(CPed *ped, uint16 sound) { uint32 sfx; @@ -6630,7 +6663,7 @@ cAudioManager::GetBMOTRTalkSfx(CPed *ped, int16 sound) } uint32 -cAudioManager::GetBMYPITalkSfx(CPed *ped, int16 sound) +cAudioManager::GetBMYPITalkSfx(CPed *ped, uint16 sound) { uint32 sfx; @@ -6654,7 +6687,7 @@ cAudioManager::GetBMYPITalkSfx(CPed *ped, int16 sound) } uint32 -cAudioManager::GetBMYBBTalkSfx(CPed *ped, int16 sound) +cAudioManager::GetBMYBBTalkSfx(CPed *ped, uint16 sound) { uint32 sfx; @@ -6684,7 +6717,7 @@ cAudioManager::GetBMYBBTalkSfx(CPed *ped, int16 sound) } uint32 -cAudioManager::GetWMYCRTalkSfx(CPed *ped, int16 sound) +cAudioManager::GetWMYCRTalkSfx(CPed *ped, uint16 sound) { uint32 sfx; @@ -6705,7 +6738,7 @@ cAudioManager::GetWMYCRTalkSfx(CPed *ped, int16 sound) } uint32 -cAudioManager::GetWFYSTTalkSfx(CPed *ped, int16 sound) +cAudioManager::GetWFYSTTalkSfx(CPed *ped, uint16 sound) { uint32 sfx; @@ -6731,7 +6764,49 @@ cAudioManager::GetWFYSTTalkSfx(CPed *ped, int16 sound) } uint32 -cAudioManager::GetWFOSTTalkSfx(CPed *ped, int16 sound) +cAudioManager::GetWFYSKTalkSfx(CPed *ped, uint16 sound) +{ + uint32 sfx; + + switch(sound) { + case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, SFX_WFYSK_GUN_PANIC_1, 5); break; + case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, SFX_WFYSK_MUGGED_1, 2); break; + case SOUND_PED_ACCIDENTREACTION1: GetPhrase(sfx, ped->m_lastComment, SFX_WFYSK_SAVED_1, 2); break; + case SOUND_PED_TAXI_WAIT: return SFX_WFYSK_TAXI_1; + case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, SFX_WFYSK_FIGHT_1, 11); break; + case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_WFYSK_DODGE_1, 9); break; + case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, SFX_WFYSK_BLOCKED_1, 11); break; + case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_WFYSK_BUMP_1, 18); break; + default: return GetGenericFemaleTalkSfx(ped, sound); + } + return sfx; +} + +uint32 +cAudioManager::GetWMYSKTalkSfx(CPed *ped, uint16 sound) +{ + uint32 sfx; + + switch(sound) { + case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, SFX_WMYSK_GUN_PANIC_1, 5); break; + case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, SFX_WMYSK_MUGGED_1, 2); break; + case SOUND_PED_ACCIDENTREACTION1: GetPhrase(sfx, ped->m_lastComment, SFX_WMYSK_SAVED_1, 2); break; + case SOUND_PED_INNOCENT: GetPhrase(sfx, ped->m_lastComment, SFX_WMYSK_INNOCENT_1, 3); break; + case SOUND_PED_TAXI_WAIT: return SFX_WMYSK_TAXI_1; + case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, SFX_WMYSK_FIGHT_1, 5); break; + case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_WMYSK_DODGE_1, 10); break; + case SOUND_PED_WAIT_DOUBLEBACK: GetPhrase(sfx, ped->m_lastComment, SFX_WMYSK_LOST_1, 2); break; + case SOUND_PED_CHAT_SEXY_MALE: GetPhrase(sfx, ped->m_lastComment, SFX_WMYSK_EYEING_1, 2); break; + case SOUND_PED_CHAT_EVENT: GetPhrase(sfx, ped->m_lastComment, SFX_WMYSK_SHOCKED_1, 2); break; + case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_WMYSK_BUMP_1, 14); break; + case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, SFX_WMYSK_CHAT_1, 13); break; + default: return GetGenericMaleTalkSfx(ped, sound); + } + return sfx; +} + +uint32 +cAudioManager::GetWFOSTTalkSfx(CPed *ped, uint16 sound) { uint32 sfx; @@ -6755,7 +6830,7 @@ cAudioManager::GetWFOSTTalkSfx(CPed *ped, int16 sound) } uint32 -cAudioManager::GetWMYSTTalkSfx(CPed *ped, int16 sound) +cAudioManager::GetWMYSTTalkSfx(CPed *ped, uint16 sound) { uint32 sfx; @@ -6782,7 +6857,7 @@ cAudioManager::GetWMYSTTalkSfx(CPed *ped, int16 sound) } uint32 -cAudioManager::GetWMOSTTalkSfx(CPed *ped, int16 sound) +cAudioManager::GetWMOSTTalkSfx(CPed *ped, uint16 sound) { uint32 sfx; @@ -6809,7 +6884,7 @@ cAudioManager::GetWMOSTTalkSfx(CPed *ped, int16 sound) } uint32 -cAudioManager::GetWFYRITalkSfx(CPed *ped, int16 sound) +cAudioManager::GetWFYRITalkSfx(CPed *ped, uint16 sound) { uint32 sfx; @@ -6834,7 +6909,7 @@ cAudioManager::GetWFYRITalkSfx(CPed *ped, int16 sound) } uint32 -cAudioManager::GetWFORITalkSfx(CPed *ped, int16 sound) +cAudioManager::GetWFORITalkSfx(CPed *ped, uint16 sound) { uint32 sfx; @@ -6858,7 +6933,7 @@ cAudioManager::GetWFORITalkSfx(CPed *ped, int16 sound) } uint32 -cAudioManager::GetWMYRITalkSfx(CPed *ped, int16 sound) +cAudioManager::GetWMYRITalkSfx(CPed *ped, uint16 sound) { uint32 sfx; @@ -6885,7 +6960,7 @@ cAudioManager::GetWMYRITalkSfx(CPed *ped, int16 sound) } uint32 -cAudioManager::GetWMORITalkSfx(CPed *ped, int16 sound) +cAudioManager::GetWMORITalkSfx(CPed *ped, uint16 sound) { uint32 sfx; @@ -6910,7 +6985,7 @@ cAudioManager::GetWMORITalkSfx(CPed *ped, int16 sound) } uint32 -cAudioManager::GetWFYBETalkSfx(CPed *ped, int16 sound) +cAudioManager::GetWFYBETalkSfx(CPed *ped, uint16 sound) { uint32 sfx; @@ -6933,7 +7008,7 @@ cAudioManager::GetWFYBETalkSfx(CPed *ped, int16 sound) } uint32 -cAudioManager::GetWMYBETalkSfx(CPed *ped, int16 sound) +cAudioManager::GetWMYBETalkSfx(CPed *ped, uint16 sound) { uint32 sfx; @@ -6958,7 +7033,7 @@ cAudioManager::GetWMYBETalkSfx(CPed *ped, int16 sound) } uint32 -cAudioManager::GetWFOBETalkSfx(CPed *ped, int16 sound) +cAudioManager::GetWFOBETalkSfx(CPed *ped, uint16 sound) { uint32 sfx; @@ -6981,7 +7056,7 @@ cAudioManager::GetWFOBETalkSfx(CPed *ped, int16 sound) } uint32 -cAudioManager::GetWMOBETalkSfx(CPed *ped, int16 sound) +cAudioManager::GetWMOBETalkSfx(CPed *ped, uint16 sound) { uint32 sfx; @@ -7007,7 +7082,7 @@ cAudioManager::GetWMOBETalkSfx(CPed *ped, int16 sound) } uint32 -cAudioManager::GetWMYCWTalkSfx(CPed *ped, int16 sound) +cAudioManager::GetWMYCWTalkSfx(CPed *ped, uint16 sound) { uint32 sfx; @@ -7036,7 +7111,7 @@ cAudioManager::GetWMYCWTalkSfx(CPed *ped, int16 sound) } uint32 -cAudioManager::GetWMYGOTalkSfx(CPed *ped, int16 sound) +cAudioManager::GetWMYGOTalkSfx(CPed *ped, uint16 sound) { uint32 sfx; @@ -7060,7 +7135,7 @@ cAudioManager::GetWMYGOTalkSfx(CPed *ped, int16 sound) } uint32 -cAudioManager::GetWFOGOTalkSfx(CPed *ped, int16 sound) +cAudioManager::GetWFOGOTalkSfx(CPed *ped, uint16 sound) { uint32 sfx; @@ -7083,7 +7158,7 @@ cAudioManager::GetWFOGOTalkSfx(CPed *ped, int16 sound) } uint32 -cAudioManager::GetWMOGOTalkSfx(CPed *ped, int16 sound) +cAudioManager::GetWMOGOTalkSfx(CPed *ped, uint16 sound) { uint32 sfx; @@ -7107,7 +7182,7 @@ cAudioManager::GetWMOGOTalkSfx(CPed *ped, int16 sound) } uint32 -cAudioManager::GetWFYLGTalkSfx(CPed *ped, int16 sound) +cAudioManager::GetWFYLGTalkSfx(CPed *ped, uint16 sound) { uint32 sfx; @@ -7125,7 +7200,7 @@ cAudioManager::GetWFYLGTalkSfx(CPed *ped, int16 sound) } uint32 -cAudioManager::GetWMYLGTalkSfx(CPed *ped, int16 sound) +cAudioManager::GetWMYLGTalkSfx(CPed *ped, uint16 sound) { uint32 sfx; @@ -7143,7 +7218,7 @@ cAudioManager::GetWMYLGTalkSfx(CPed *ped, int16 sound) } uint32 -cAudioManager::GetWFYBUTalkSfx(CPed *ped, int16 sound) +cAudioManager::GetWFYBUTalkSfx(CPed *ped, uint16 sound) { uint32 sfx; @@ -7163,7 +7238,7 @@ cAudioManager::GetWFYBUTalkSfx(CPed *ped, int16 sound) } uint32 -cAudioManager::GetWMYBUTalkSfx(CPed *ped, int16 sound) +cAudioManager::GetWMYBUTalkSfx(CPed *ped, uint16 sound) { uint32 sfx; @@ -7194,7 +7269,7 @@ cAudioManager::GetWMYBUTalkSfx(CPed *ped, int16 sound) } uint32 -cAudioManager::GetWMOBUTalkSfx(CPed *ped, int16 sound) +cAudioManager::GetWMOBUTalkSfx(CPed *ped, uint16 sound) { uint32 sfx; @@ -7218,7 +7293,7 @@ cAudioManager::GetWMOBUTalkSfx(CPed *ped, int16 sound) } uint32 -cAudioManager::GetWFYPRTalkSfx(CPed *ped, int16 sound) +cAudioManager::GetWFYPRTalkSfx(CPed *ped, uint16 sound) { uint32 sfx; @@ -7239,7 +7314,7 @@ cAudioManager::GetWFYPRTalkSfx(CPed *ped, int16 sound) } uint32 -cAudioManager::GetWFOTRTalkSfx(CPed *ped, int16 sound) +cAudioManager::GetWFOTRTalkSfx(CPed *ped, uint16 sound) { uint32 sfx; @@ -7258,7 +7333,7 @@ cAudioManager::GetWFOTRTalkSfx(CPed *ped, int16 sound) } uint32 -cAudioManager::GetWMOTRTalkSfx(CPed *ped, int16 sound) +cAudioManager::GetWMOTRTalkSfx(CPed *ped, uint16 sound) { uint32 sfx; @@ -7279,7 +7354,7 @@ cAudioManager::GetWMOTRTalkSfx(CPed *ped, int16 sound) } uint32 -cAudioManager::GetWMYPITalkSfx(CPed *ped, int16 sound) +cAudioManager::GetWMYPITalkSfx(CPed *ped, uint16 sound) { uint32 sfx; @@ -7308,7 +7383,7 @@ cAudioManager::GetWMYPITalkSfx(CPed *ped, int16 sound) } uint32 -cAudioManager::GetWMOCATalkSfx(CPed *ped, int16 sound) +cAudioManager::GetWMOCATalkSfx(CPed *ped, uint16 sound) { uint32 sfx; @@ -7332,84 +7407,7 @@ cAudioManager::GetWMOCATalkSfx(CPed *ped, int16 sound) } uint32 -cAudioManager::GetWFYJGTalkSfx(CPed *ped, int16 sound) -{ - uint32 sfx; - switch(sound) { - case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, SFX_WFYJG_GUN_PANIC_1, 4); break; - case SOUND_PED_ACCIDENTREACTION1: sfx = SFX_WFYJG_SAVED_1; break; - case SOUND_PED_TAXI_WAIT: sfx = SFX_WFYJG_TAXI_1; break; - case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_WFYJG_DODGE_1, 8); break; - case SOUND_PED_FLEE_RUN: GetPhrase(sfx, ped->m_lastComment, SFX_WFYJG_RUN_1, 6); break; - case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_WFYJG_BUMP_1, 12); break; - default: return GetGenericFemaleTalkSfx(ped, sound); - } - return sfx; -} - -uint32 -cAudioManager::GetWMYJGTalkSfx(CPed *ped, int16 sound) -{ - uint32 sfx; - - switch(sound) { - case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, SFX_WMYJG_GUN_PANIC_1, 4); break; - case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, SFX_WMYJG_MUGGED_1, 2); break; - case SOUND_PED_ACCIDENTREACTION1: return SFX_WMYJG_SAVED_1; - case SOUND_PED_TAXI_WAIT: return SFX_WMYJG_TAXI_1; - case SOUND_PED_FLEE_RUN: GetPhrase(sfx, ped->m_lastComment, SFX_WMYJG_RUN_1, 5); break; - case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, SFX_WMYJG_BLOCKED_1, 10); break; - case SOUND_PED_CHAT_SEXY_MALE: GetPhrase(sfx, ped->m_lastComment, SFX_WMYJG_EYEING_1, 2); break; - case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_WMYJG_BUMP_1, 10); break; - default: return GetGenericMaleTalkSfx(ped, sound); - } - return sfx; -} - -uint32 -cAudioManager::GetWFYSKTalkSfx(CPed *ped, int16 sound) -{ - uint32 sfx; - - switch(sound) { - case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, SFX_WFYSK_GUN_PANIC_1, 5); break; - case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, SFX_WFYSK_MUGGED_1, 2); break; - case SOUND_PED_ACCIDENTREACTION1: GetPhrase(sfx, ped->m_lastComment, SFX_WFYSK_SAVED_1, 2); break; - case SOUND_PED_TAXI_WAIT: return SFX_WFYSK_TAXI_1; - case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, SFX_WFYSK_FIGHT_1, 11); break; - case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_WFYSK_DODGE_1, 9); break; - case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, SFX_WFYSK_BLOCKED_1, 11); break; - case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_WFYSK_BUMP_1, 18); break; - default: return GetGenericFemaleTalkSfx(ped, sound); - } - return sfx; -} - -uint32 -cAudioManager::GetWMYSKTalkSfx(CPed *ped, int16 sound) -{ - uint32 sfx; - - switch(sound) { - case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, SFX_WMYSK_GUN_PANIC_1, 5); break; - case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, SFX_WMYSK_MUGGED_1, 2); break; - case SOUND_PED_ACCIDENTREACTION1: GetPhrase(sfx, ped->m_lastComment, SFX_WMYSK_SAVED_1, 2); break; - case SOUND_PED_INNOCENT: GetPhrase(sfx, ped->m_lastComment, SFX_WMYSK_INNOCENT_1, 3); break; - case SOUND_PED_TAXI_WAIT: return SFX_WMYSK_TAXI_1; - case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, SFX_WMYSK_FIGHT_1, 5); break; - case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_WMYSK_DODGE_1, 10); break; - case SOUND_PED_WAIT_DOUBLEBACK: GetPhrase(sfx, ped->m_lastComment, SFX_WMYSK_LOST_1, 2); break; - case SOUND_PED_CHAT_SEXY_MALE: GetPhrase(sfx, ped->m_lastComment, SFX_WMYSK_EYEING_1, 2); break; - case SOUND_PED_CHAT_EVENT: GetPhrase(sfx, ped->m_lastComment, SFX_WMYSK_SHOCKED_1, 2); break; - case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_WMYSK_BUMP_1, 14); break; - case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, SFX_WMYSK_CHAT_1, 13); break; - default: return GetGenericMaleTalkSfx(ped, sound); - } - return sfx; -} - -uint32 -cAudioManager::GetWFYSHTalkSfx(CPed *ped, int16 sound) +cAudioManager::GetWFYSHTalkSfx(CPed *ped, uint16 sound) { uint32 sfx; @@ -7430,7 +7428,7 @@ cAudioManager::GetWFYSHTalkSfx(CPed *ped, int16 sound) } uint32 -cAudioManager::GetWFOSHTalkSfx(CPed *ped, int16 sound) +cAudioManager::GetWFOSHTalkSfx(CPed *ped, uint16 sound) { uint32 sfx; @@ -7451,7 +7449,7 @@ cAudioManager::GetWFOSHTalkSfx(CPed *ped, int16 sound) } uint32 -cAudioManager::GetJFOTOTalkSfx(CPed *ped, int16 sound) +cAudioManager::GetJFOTOTalkSfx(CPed *ped, uint16 sound) { uint32 sfx; @@ -7476,7 +7474,7 @@ cAudioManager::GetJFOTOTalkSfx(CPed *ped, int16 sound) } uint32 -cAudioManager::GetJMOTOTalkSfx(CPed *ped, int16 sound) +cAudioManager::GetJMOTOTalkSfx(CPed *ped, uint16 sound) { uint32 sfx; @@ -7501,33 +7499,7 @@ cAudioManager::GetJMOTOTalkSfx(CPed *ped, int16 sound) } uint32 -cAudioManager::GetCBTalkSfx(CPed *ped, int16 sound) -{ - uint32 sfx; - - switch(sound) { - case SOUND_PED_HANDS_UP: GetPhrase(sfx, ped->m_lastComment, SFX_CUBAN_GANG_1_GUN_COOL_1, 5); break; - case SOUND_PED_CAR_JACKING: GetPhrase(sfx, ped->m_lastComment, SFX_CUBAN_GANG_1_JACKING_1, 5); break; - case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, SFX_CUBAN_GANG_1_JACKED_1, 4); break; - case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, SFX_CUBAN_GANG_1_MUGGED_1, 2); break; - case SOUND_PED_ACCIDENTREACTION1: sfx = SFX_CUBAN_GANG_1_SAVED_1; break; - case SOUND_PED_TAXI_WAIT: GetPhrase(sfx, ped->m_lastComment, SFX_CUBAN_GANG_1_TAXI_1, 2); break; - case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, SFX_CUBAN_GANG_1_FIGHT_1, 9); break; - case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_CUBAN_GANG_1_DODGE_1, 9); break; - case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, SFX_CUBAN_GANG_1_GENERIC_CRASH_1, 8); break; - case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, SFX_CUBAN_GANG_1_CAR_CRASH_1, 8); break; - case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, SFX_CUBAN_GANG_1_BLOCKED_1, 8); break; - case SOUND_PED_WAIT_DOUBLEBACK: GetPhrase(sfx, ped->m_lastComment, SFX_CUBAN_GANG_1_LOST_1, 2); break; - case SOUND_PED_CHAT_SEXY_MALE: GetPhrase(sfx, ped->m_lastComment, SFX_CUBAN_GANG_1_EYEING_1, 2); break; - case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_CUBAN_GANG_1_BUMP_1, 11); break; - case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, SFX_CUBAN_GANG_1_CHAT_1, 10); break; - default: return GetGenericMaleTalkSfx(ped, sound); - } - return (SFX_CUBAN_GANG_2_BLOCKED_1 - SFX_CUBAN_GANG_1_BLOCKED_1) * (m_sQueueSample.m_nEntityIndex % 3) + sfx; -} - -uint32 -cAudioManager::GetHNTalkSfx(CPed *ped, int16 sound) +cAudioManager::GetHNTalkSfx(CPed *ped, uint16 sound) { uint32 sfx; @@ -7553,7 +7525,57 @@ cAudioManager::GetHNTalkSfx(CPed *ped, int16 sound) } uint32 -cAudioManager::GetSGTalkSfx(CPed *ped, int16 sound) +cAudioManager::GetBKTalkSfx(CPed *ped, uint16 sound) +{ + uint32 sfx; + + switch(sound) { + case SOUND_PED_HANDS_UP: GetPhrase(sfx, ped->m_lastComment, SFX_BIKER_GANG_1_GUN_COOL_1, 5); break; + case SOUND_PED_CAR_JACKING: GetPhrase(sfx, ped->m_lastComment, SFX_BIKER_GANG_1_JACKING_1, 4); break; + case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, SFX_BIKER_GANG_1_JACKED_1, 8); break; + case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, SFX_BIKER_GANG_1_MUGGED_1, 2); break; + case SOUND_PED_ACCIDENTREACTION1: sfx = SFX_BIKER_GANG_1_SAVED_1; break; + case SOUND_PED_TAXI_WAIT: GetPhrase(sfx, ped->m_lastComment, SFX_BIKER_GANG_1_TAXI_1, 2); break; + case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, SFX_BIKER_GANG_1_FIGHT_1, 9); break; + case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_BIKER_GANG_1_DODGE_1, 9); break; + case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, SFX_BIKER_GANG_1_GENERIC_CRASH_1, 8); break; + case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, SFX_BIKER_GANG_1_BLOCKED_1, 10); break; + case SOUND_PED_WAIT_DOUBLEBACK: GetPhrase(sfx, ped->m_lastComment, SFX_BIKER_GANG_1_LOST_1, 2); break; + case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_BIKER_GANG_1_BUMP_1, 10); break; + case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, SFX_BIKER_GANG_1_CHAT_1, 12); break; + default: return GetGenericMaleTalkSfx(ped, sound); + } + return (SFX_BIKER_GANG_2_BLOCKED_1 - SFX_BIKER_GANG_1_BLOCKED_1) * (m_sQueueSample.m_nEntityIndex % 3) + sfx; +} + +uint32 +cAudioManager::GetCBTalkSfx(CPed *ped, uint16 sound) +{ + uint32 sfx; + + switch(sound) { + case SOUND_PED_HANDS_UP: GetPhrase(sfx, ped->m_lastComment, SFX_CUBAN_GANG_1_GUN_COOL_1, 5); break; + case SOUND_PED_CAR_JACKING: GetPhrase(sfx, ped->m_lastComment, SFX_CUBAN_GANG_1_JACKING_1, 5); break; + case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, SFX_CUBAN_GANG_1_JACKED_1, 4); break; + case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, SFX_CUBAN_GANG_1_MUGGED_1, 2); break; + case SOUND_PED_ACCIDENTREACTION1: sfx = SFX_CUBAN_GANG_1_SAVED_1; break; + case SOUND_PED_TAXI_WAIT: GetPhrase(sfx, ped->m_lastComment, SFX_CUBAN_GANG_1_TAXI_1, 2); break; + case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, SFX_CUBAN_GANG_1_FIGHT_1, 9); break; + case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_CUBAN_GANG_1_DODGE_1, 9); break; + case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, SFX_CUBAN_GANG_1_GENERIC_CRASH_1, 8); break; + case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, SFX_CUBAN_GANG_1_CAR_CRASH_1, 8); break; + case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, SFX_CUBAN_GANG_1_BLOCKED_1, 8); break; + case SOUND_PED_WAIT_DOUBLEBACK: GetPhrase(sfx, ped->m_lastComment, SFX_CUBAN_GANG_1_LOST_1, 2); break; + case SOUND_PED_CHAT_SEXY_MALE: GetPhrase(sfx, ped->m_lastComment, SFX_CUBAN_GANG_1_EYEING_1, 2); break; + case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_CUBAN_GANG_1_BUMP_1, 11); break; + case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, SFX_CUBAN_GANG_1_CHAT_1, 10); break; + default: return GetGenericMaleTalkSfx(ped, sound); + } + return (SFX_CUBAN_GANG_2_BLOCKED_1 - SFX_CUBAN_GANG_1_BLOCKED_1) * (m_sQueueSample.m_nEntityIndex % 3) + sfx; +} + +uint32 +cAudioManager::GetSGTalkSfx(CPed *ped, uint16 sound) { uint32 sfx; @@ -7582,7 +7604,7 @@ cAudioManager::GetSGTalkSfx(CPed *ped, int16 sound) } uint32 -cAudioManager::GetCLTalkSfx(CPed *ped, int16 sound) +cAudioManager::GetCLTalkSfx(CPed *ped, uint16 sound) { uint32 sfx; @@ -7608,7 +7630,7 @@ cAudioManager::GetCLTalkSfx(CPed *ped, int16 sound) } uint32 -cAudioManager::GetGDTalkSfx(CPed *ped, int16 sound) +cAudioManager::GetGDTalkSfx(CPed *ped, uint16 sound) { uint32 sfx; @@ -7628,31 +7650,7 @@ cAudioManager::GetGDTalkSfx(CPed *ped, int16 sound) } uint32 -cAudioManager::GetBKTalkSfx(CPed *ped, int16 sound) -{ - uint32 sfx; - - switch(sound) { - case SOUND_PED_HANDS_UP: GetPhrase(sfx, ped->m_lastComment, SFX_BIKER_GANG_1_GUN_COOL_1, 5); break; - case SOUND_PED_CAR_JACKING: GetPhrase(sfx, ped->m_lastComment, SFX_BIKER_GANG_1_JACKING_1, 4); break; - case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, SFX_BIKER_GANG_1_JACKED_1, 8); break; - case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, SFX_BIKER_GANG_1_MUGGED_1, 2); break; - case SOUND_PED_ACCIDENTREACTION1: sfx = SFX_BIKER_GANG_1_SAVED_1; break; - case SOUND_PED_TAXI_WAIT: GetPhrase(sfx, ped->m_lastComment, SFX_BIKER_GANG_1_TAXI_1, 2); break; - case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, SFX_BIKER_GANG_1_FIGHT_1, 9); break; - case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_BIKER_GANG_1_DODGE_1, 9); break; - case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, SFX_BIKER_GANG_1_GENERIC_CRASH_1, 8); break; - case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, SFX_BIKER_GANG_1_BLOCKED_1, 10); break; - case SOUND_PED_WAIT_DOUBLEBACK: GetPhrase(sfx, ped->m_lastComment, SFX_BIKER_GANG_1_LOST_1, 2); break; - case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_BIKER_GANG_1_BUMP_1, 10); break; - case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, SFX_BIKER_GANG_1_CHAT_1, 12); break; - default: return GetGenericMaleTalkSfx(ped, sound); - } - return (SFX_BIKER_GANG_2_BLOCKED_1 - SFX_BIKER_GANG_1_BLOCKED_1) * (m_sQueueSample.m_nEntityIndex % 3) + sfx; -} - -uint32 -cAudioManager::GetPGTalkSfx(CPed *ped, int16 sound) +cAudioManager::GetPGTalkSfx(CPed *ped, uint16 sound) { uint32 sfx; @@ -7679,21 +7677,12 @@ cAudioManager::GetPGTalkSfx(CPed *ped, int16 sound) } uint32 -cAudioManager::GetVICETalkSfx(CPed *ped, int16 sound, int16 model) +cAudioManager::GetViceWhiteTalkSfx(CPed *ped, uint16 sound) { uint32 sfx; - if(model == MI_VICE6) { - - 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; - default: return GetGenericMaleTalkSfx(ped, sound); - } - } 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; - default: return GetGenericMaleTalkSfx(ped, sound); } sfx += (SFX_VICE_VOICE_2_ARREST_1-SFX_VICE_VOICE_1_ARREST_1) * (m_sQueueSample.m_nEntityIndex % 5); @@ -7701,92 +7690,106 @@ cAudioManager::GetVICETalkSfx(CPed *ped, int16 sound, int16 model) } uint32 -cAudioManager::GetWFYG1TalkSfx(CPed *ped, int16 sound) +cAudioManager::GetViceBlackTalkSfx(CPed *ped, uint16 sound) { uint32 sfx; - switch(sound) { - case SOUND_PED_HANDS_UP: GetPhrase(sfx, ped->m_lastComment, SFX_WFYG1_GUN_COOL_1, 6); break; - case SOUND_PED_MUGGING: GetPhrase(sfx, ped->m_lastComment, SFX_WFYG1_MUGGING_1, 2); break; - case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, SFX_WFYG1_JACKED_1, 5); break; - case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, SFX_WFYG1_MUGGED_1, 2); break; - case SOUND_PED_ACCIDENTREACTION1: return SFX_WFYG1_SAVED_1; - case SOUND_PED_TAXI_WAIT: return SFX_WFYG1_TAXI_1; - case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, SFX_WFYG1_FIGHT_1, 4); break; - case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_WFYG1_DODGE_1, 9); break; - case SOUND_PED_FLEE_RUN: GetPhrase(sfx, ped->m_lastComment, SFX_WFYG1_RUN_1, 2); break; - case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, SFX_WFYG1_GENERIC_CRASH_1, 7); break; - case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, SFX_WFYG1_CAR_CRASH_1, 9); break; - case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, SFX_WFYG1_BLOCKED_1, 7); break; - case SOUND_PED_WAIT_DOUBLEBACK: GetPhrase(sfx, ped->m_lastComment, SFX_WFYG1_LOST_1, 3); break; - case SOUND_PED_CHAT_SEXY_FEMALE: GetPhrase(sfx, ped->m_lastComment, SFX_WFYG1_EYEING_1, 2); break; - case SOUND_PED_CHAT_EVENT: return SFX_WFYG1_SHOCKED_1; - case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_WFYG1_BUMP_1, 11); break; - case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, SFX_WFYG1_CHAT_1, 10); break; - default: return GetGenericFemaleTalkSfx(ped, 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; + default: return GetGenericMaleTalkSfx(ped, sound); } return sfx; } uint32 -cAudioManager::GetWFYG2TalkSfx(CPed *ped, int16 sound) +cAudioManager::GetBMODKTalkSfx(CPed *ped, uint16 sound) { uint32 sfx; switch(sound) { - case SOUND_PED_HANDS_UP: GetPhrase(sfx, ped->m_lastComment, SFX_WFYG2_GUN_COOL_1, 3); break; - case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, SFX_WFYG2_JACKED_1, 5); break; - case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, SFX_WFYG2_MUGGED_1, 2); break; -#ifdef FIX_BUGS - case SOUND_PED_TAXI_WAIT: GetPhrase(sfx, ped->m_lastComment, SFX_WFYG2_TAXI_1, 2); break; -#else - case SOUND_PED_TAXI_WAIT: return SFX_WFYG2_TAXI_1; -#endif - case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, SFX_WFYG2_FIGHT_1, 5); break; - case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_WFYG2_DODGE_1, 8); break; - case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, SFX_WFYG2_GENERIC_CRASH_1, 7); break; - case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, SFX_WFYG2_CAR_CRASH_1, 9); break; - case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, SFX_WFYG2_BLOCKED_1, 5); break; - case SOUND_PED_WAIT_DOUBLEBACK: return SFX_WFYG2_LOST_1; - case SOUND_PED_CHAT_SEXY_FEMALE: GetPhrase(sfx, ped->m_lastComment, SFX_WFYG2_EYEING_1, 4); break; - case SOUND_PED_CHAT_EVENT: return SFX_WFYG2_SHOCKED_1; - case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_WFYG2_BUMP_1, 11); break; - case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, SFX_WFYG2_CHAT_1, 9); break; - default: return GetGenericFemaleTalkSfx(ped, sound); + case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, SFX_BMODK_GUN_PANIC_1, 4); break; + case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, SFX_BMODK_JACKED_1, 9); break; + case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, SFX_BMODK_MUGGED_1, 2); break; + case SOUND_PED_INNOCENT: GetPhrase(sfx, ped->m_lastComment, SFX_BMODK_INNOCENT_1, 3); break; + case SOUND_PED_TAXI_WAIT: return SFX_BMODK_TAXI_1; + case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_BMODK_DODGE_1, 7); break; + case SOUND_PED_FLEE_RUN: GetPhrase(sfx, ped->m_lastComment, SFX_BMODK_RUN_1, 4); break; + case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, SFX_BMODK_GENERIC_CRASH_1, 7); break; + case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, SFX_BMODK_CAR_CRASH_1, 10); break; + case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, SFX_BMODK_BLOCKED_1, 8); break; + case SOUND_PED_147: // this is some cut behaviour, the guy was selling something + GetPhrase(sfx, ped->m_lastComment, SFX_BMODK_UNK_147_1, 11); + // what is this? some sort of censorship? + switch(sfx) { + case SFX_BMODK_UNK_147_5: + case SFX_BMODK_UNK_147_6: + case SFX_BMODK_UNK_147_7: GetPhrase(sfx, ped->m_lastComment, SFX_BMODK_UNK_147_1, 4); break; + default: break; + } + break; + case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_BMODK_BUMP_1, 10); break; + default: return GetGenericMaleTalkSfx(ped, sound); } - return sfx; } uint32 -cAudioManager::GetGenericMaleTalkSfx(CPed *ped, int16 sound) +cAudioManager::GetHMYAPTalkSfx(CPed *ped, uint16 sound) { uint32 sfx; - m_bGenericSfx = TRUE; switch(sound) { - case SOUND_PED_DEATH: GetPhrase(sfx, ped->m_lastComment, SFX_GENERIC_MALE_DEATH_1, 41); break; - case SOUND_PED_BULLET_HIT: - case SOUND_PED_DEFEND: GetPhrase(sfx, ped->m_lastComment, SFX_GENERIC_MALE_GRUNT_1, 41); break; - case SOUND_PED_BURNING: GetPhrase(sfx, ped->m_lastComment, SFX_GENERIC_MALE_FIRE_1, 32); break; - case SOUND_PED_FLEE_SPRINT: GetPhrase(sfx, ped->m_lastComment, SFX_GENERIC_MALE_PANIC_1, 35); break; - default: return NO_SAMPLE; + case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, SFX_HMYAP_GUN_PANIC_1, 7); break; + case SOUND_PED_CAR_JACKING: GetPhrase(sfx, ped->m_lastComment, SFX_HMYAP_JACKING_1, 4); break; + case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, SFX_HMYAP_JACKED_1, 7); break; + case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, SFX_HMYAP_MUGGED_1, 2); break; + case SOUND_PED_ACCIDENTREACTION1: GetPhrase(sfx, ped->m_lastComment, SFX_HMYAP_SAVED_1, 2); break; + case SOUND_PED_TAXI_WAIT: GetPhrase(sfx, ped->m_lastComment, SFX_HMYAP_TAXI_1, 2); break; + case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_HMYAP_DODGE_1, 9); break; + case SOUND_PED_FLEE_RUN: GetPhrase(sfx, ped->m_lastComment, SFX_HMYAP_RUN_1, 6); break; + case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, SFX_HMYAP_GENERIC_CRASH_1, 6); break; + case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, SFX_HMYAP_CAR_CRASH_1, 9); break; + case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, SFX_HMYAP_BLOCKED_1, 9); break; + case SOUND_PED_WAIT_DOUBLEBACK: GetPhrase(sfx, ped->m_lastComment, SFX_HMYAP_LOST_1, 2); break; + case SOUND_PED_CHAT_SEXY_MALE: GetPhrase(sfx, ped->m_lastComment, SFX_HMYAP_EYEING_1, 3); break; + case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_HMYAP_BUMP_1, 11); break; + case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, SFX_HMYAP_CHAT_1, 9); break; + default: return GetGenericMaleTalkSfx(ped, sound); } return sfx; } uint32 -cAudioManager::GetGenericFemaleTalkSfx(CPed *ped, int16 sound) +cAudioManager::GetWFYJGTalkSfx(CPed *ped, uint16 sound) { uint32 sfx; - m_bGenericSfx = TRUE; switch(sound) { - case SOUND_PED_DEATH: GetPhrase(sfx, ped->m_lastComment, SFX_GENERIC_FEMALE_DEATH_1, 22); break; - case SOUND_PED_BULLET_HIT: - case SOUND_PED_DEFEND: GetPhrase(sfx, ped->m_lastComment, SFX_GENERIC_FEMALE_GRUNT_1, 33); break; - case SOUND_PED_BURNING: GetPhrase(sfx, ped->m_lastComment, SFX_GENERIC_FEMALE_FIRE_1, 17); break; - case SOUND_PED_FLEE_SPRINT: GetPhrase(sfx, ped->m_lastComment, SFX_GENERIC_FEMALE_PANIC_1, 27); break; - default: return NO_SAMPLE; + case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, SFX_WFYJG_GUN_PANIC_1, 4); break; + case SOUND_PED_ACCIDENTREACTION1: sfx = SFX_WFYJG_SAVED_1; break; + case SOUND_PED_TAXI_WAIT: sfx = SFX_WFYJG_TAXI_1; break; + case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_WFYJG_DODGE_1, 8); break; + case SOUND_PED_FLEE_RUN: GetPhrase(sfx, ped->m_lastComment, SFX_WFYJG_RUN_1, 6); break; + case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_WFYJG_BUMP_1, 12); break; + default: return GetGenericFemaleTalkSfx(ped, sound); + } + return sfx; +} + +uint32 +cAudioManager::GetWMYJGTalkSfx(CPed *ped, uint16 sound) +{ + uint32 sfx; + + switch(sound) { + case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, SFX_WMYJG_GUN_PANIC_1, 4); break; + case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, SFX_WMYJG_MUGGED_1, 2); break; + case SOUND_PED_ACCIDENTREACTION1: return SFX_WMYJG_SAVED_1; + case SOUND_PED_TAXI_WAIT: return SFX_WMYJG_TAXI_1; + case SOUND_PED_FLEE_RUN: GetPhrase(sfx, ped->m_lastComment, SFX_WMYJG_RUN_1, 5); break; + case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, SFX_WMYJG_BLOCKED_1, 10); break; + case SOUND_PED_CHAT_SEXY_MALE: GetPhrase(sfx, ped->m_lastComment, SFX_WMYJG_EYEING_1, 2); break; + case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_WMYJG_BUMP_1, 10); break; + default: return GetGenericMaleTalkSfx(ped, sound); } return sfx; } diff --git a/src/audio/AudioManager.h b/src/audio/AudioManager.h index 450a8818..f68c53ad 100644 --- a/src/audio/AudioManager.h +++ b/src/audio/AudioManager.h @@ -282,101 +282,102 @@ public: // functions returning talk sfx, // order from GetPedCommentSfx - uint32 GetPlayerTalkSfx(CPed *ped, int16 sound); - uint32 GetCopTalkSfx(CPed *ped, int16 sound); - uint32 GetSwatTalkSfx(CPed *ped, int16 sound); - uint32 GetFBITalkSfx(CPed *ped, int16 sound); - uint32 GetArmyTalkSfx(CPed *ped, int16 sound); - uint32 GetMedicTalkSfx(CPed *ped, int16 sound); - uint32 GetFiremanTalkSfx(CPed *ped, int16 sound); - uint32 GetDefaultTalkSfx(CPed *ped, int16 sound); - uint32 GetHFYSTTalkSfx(CPed *ped, int16 sound); - uint32 GetHFOSTTalkSfx(CPed *ped, int16 sound); - uint32 GetHMYSTTalkSfx(CPed *ped, int16 sound); - uint32 GetHMOSTTalkSfx(CPed *ped, int16 sound); - uint32 GetHFYRITalkSfx(CPed *ped, int16 sound); - uint32 GetHFORITalkSfx(CPed *ped, int16 sound); - uint32 GetHMYRITalkSfx(CPed *ped, int16 sound); - uint32 GetHMORITalkSfx(CPed *ped, int16 sound); - uint32 GetHFYBETalkSfx(CPed *ped, int16 sound); - uint32 GetHFOBETalkSfx(CPed *ped, int16 sound); - uint32 GetHMYBETalkSfx(CPed *ped, int16 sound); - uint32 GetHMOBETalkSfx(CPed *ped, int16 sound); - uint32 GetHFYBUTalkSfx(CPed *ped, int16 sound); - uint32 GetHFYMDTalkSfx(CPed *ped, int16 sound); - uint32 GetHFYCGTalkSfx(CPed *ped, int16 sound); - uint32 GetHFYPRTalkSfx(CPed *ped, int16 sound); - uint32 GetHFOTRTalkSfx(CPed *ped, int16 sound); - uint32 GetHMOTRTalkSfx(CPed *ped, int16 sound); - uint32 GetHMYAPTalkSfx(CPed *ped, int16 sound); - uint32 GetHMOCATalkSfx(CPed *ped, int16 sound); - uint32 GetBMODKTalkSfx(CPed *ped, int16 sound); - uint32 GetBMYCRTalkSfx(CPed *ped, int16 sound); - uint32 GetBFYSTTalkSfx(CPed *ped, int16 sound); - uint32 GetBFOSTTalkSfx(CPed *ped, int16 sound); - uint32 GetBMYSTTalkSfx(CPed *ped, int16 sound); - uint32 GetBMOSTTalkSfx(CPed *ped, int16 sound); - uint32 GetBFYRITalkSfx(CPed *ped, int16 sound); - uint32 GetBFORITalkSfx(CPed *ped, int16 sound); - uint32 GetBMYRITalkSfx(CPed *ped, int16 sound); - uint32 GetBFYBETalkSfx(CPed *ped, int16 sound); - uint32 GetBMYBETalkSfx(CPed *ped, int16 sound); - uint32 GetBFOBETalkSfx(CPed *ped, int16 sound); - uint32 GetBMOBETalkSfx(CPed *ped, int16 sound); - uint32 GetBMYBUTalkSfx(CPed *ped, int16 sound); - uint32 GetBFYPRTalkSfx(CPed *ped, int16 sound); - uint32 GetBFOTRTalkSfx(CPed *ped, int16 sound); - uint32 GetBMOTRTalkSfx(CPed *ped, int16 sound); - uint32 GetBMYPITalkSfx(CPed *ped, int16 sound); - uint32 GetBMYBBTalkSfx(CPed *ped, int16 sound); - uint32 GetWMYCRTalkSfx(CPed *ped, int16 sound); - uint32 GetWFYSTTalkSfx(CPed *ped, int16 sound); - uint32 GetWFOSTTalkSfx(CPed *ped, int16 sound); - uint32 GetWMYSTTalkSfx(CPed *ped, int16 sound); - uint32 GetWMOSTTalkSfx(CPed *ped, int16 sound); - uint32 GetWFYRITalkSfx(CPed *ped, int16 sound); - uint32 GetWFORITalkSfx(CPed *ped, int16 sound); - uint32 GetWMYRITalkSfx(CPed *ped, int16 sound); - uint32 GetWMORITalkSfx(CPed *ped, int16 sound); - uint32 GetWFYBETalkSfx(CPed *ped, int16 sound); - uint32 GetWMYBETalkSfx(CPed *ped, int16 sound); - uint32 GetWFOBETalkSfx(CPed *ped, int16 sound); - uint32 GetWMOBETalkSfx(CPed *ped, int16 sound); - uint32 GetWMYCWTalkSfx(CPed *ped, int16 sound); - uint32 GetWMYGOTalkSfx(CPed *ped, int16 sound); - uint32 GetWFOGOTalkSfx(CPed *ped, int16 sound); - uint32 GetWMOGOTalkSfx(CPed *ped, int16 sound); - uint32 GetWFYLGTalkSfx(CPed *ped, int16 sound); - uint32 GetWMYLGTalkSfx(CPed *ped, int16 sound); - uint32 GetWFYBUTalkSfx(CPed *ped, int16 sound); - uint32 GetWMYBUTalkSfx(CPed *ped, int16 sound); - uint32 GetWMOBUTalkSfx(CPed *ped, int16 sound); - uint32 GetWFYPRTalkSfx(CPed *ped, int16 sound); - uint32 GetWFOTRTalkSfx(CPed *ped, int16 sound); - uint32 GetWMOTRTalkSfx(CPed *ped, int16 sound); - uint32 GetWMYPITalkSfx(CPed *ped, int16 sound); - uint32 GetWMOCATalkSfx(CPed *ped, int16 sound); - uint32 GetWFYJGTalkSfx(CPed *ped, int16 sound); - uint32 GetWMYJGTalkSfx(CPed *ped, int16 sound); - uint32 GetWFYSKTalkSfx(CPed *ped, int16 sound); - uint32 GetWMYSKTalkSfx(CPed *ped, int16 sound); - uint32 GetWFYSHTalkSfx(CPed *ped, int16 sound); - uint32 GetWFOSHTalkSfx(CPed *ped, int16 sound); - uint32 GetJFOTOTalkSfx(CPed *ped, int16 sound); - uint32 GetJMOTOTalkSfx(CPed *ped, int16 sound); - uint32 GetCBTalkSfx(CPed *ped, int16 sound); - uint32 GetHNTalkSfx(CPed *ped, int16 sound); - uint32 GetSGTalkSfx(CPed *ped, int16 sound); - uint32 GetCLTalkSfx(CPed *ped, int16 sound); - uint32 GetGDTalkSfx(CPed *ped, int16 sound); - uint32 GetBKTalkSfx(CPed *ped, int16 sound); - uint32 GetPGTalkSfx(CPed *ped, int16 sound); - uint32 GetVICETalkSfx(CPed *ped, int16 sound, int16 model); - uint32 GetWFYG1TalkSfx(CPed *ped, int16 sound); - uint32 GetWFYG2TalkSfx(CPed *ped, int16 sound); - - uint32 GetGenericMaleTalkSfx(CPed *ped, int16 sound); // todo names (inlined in vc) - uint32 GetGenericFemaleTalkSfx(CPed *ped, int16 sound); // todo names (inlined in vc) + uint32 GetPlayerTalkSfx(CPed *ped, uint16 sound); + uint32 GetCopTalkSfx(CPed *ped, uint16 sound); + uint32 GetSwatTalkSfx(CPed *ped, uint16 sound); + uint32 GetFBITalkSfx(CPed *ped, uint16 sound); + uint32 GetArmyTalkSfx(CPed *ped, uint16 sound); + uint32 GetMedicTalkSfx(CPed *ped, uint16 sound); + uint32 GetFiremanTalkSfx(CPed *ped, uint16 sound); + uint32 GetDefaultTalkSfx(CPed *ped, uint16 sound); + uint32 GetHFYSTTalkSfx(CPed *ped, uint16 sound); + uint32 GetHFOSTTalkSfx(CPed *ped, uint16 sound); + uint32 GetHMYSTTalkSfx(CPed *ped, uint16 sound); + uint32 GetHMOSTTalkSfx(CPed *ped, uint16 sound); + uint32 GetHFYRITalkSfx(CPed *ped, uint16 sound); + uint32 GetHFORITalkSfx(CPed *ped, uint16 sound); + uint32 GetHMYRITalkSfx(CPed *ped, uint16 sound); + uint32 GetHMORITalkSfx(CPed *ped, uint16 sound); + uint32 GetHFYBETalkSfx(CPed *ped, uint16 sound); + uint32 GetHFOBETalkSfx(CPed *ped, uint16 sound); + uint32 GetHMYBETalkSfx(CPed *ped, uint16 sound); + uint32 GetHMOBETalkSfx(CPed *ped, uint16 sound); + uint32 GetHFYBUTalkSfx(CPed *ped, uint16 sound); + uint32 GetHFYMDTalkSfx(CPed *ped, uint16 sound); + uint32 GetHFYCGTalkSfx(CPed *ped, uint16 sound); + uint32 GetHFYPRTalkSfx(CPed *ped, uint16 sound); + uint32 GetHFOTRTalkSfx(CPed *ped, uint16 sound); + uint32 GetHMOTRTalkSfx(CPed *ped, uint16 sound); + uint32 GetHMYAPTalkSfx(CPed *ped, uint16 sound); + uint32 GetHMOCATalkSfx(CPed *ped, uint16 sound); + uint32 GetBMODKTalkSfx(CPed *ped, uint16 sound); + uint32 GetBMYCRTalkSfx(CPed *ped, uint16 sound); + uint32 GetBFYSTTalkSfx(CPed *ped, uint16 sound); + uint32 GetBFOSTTalkSfx(CPed *ped, uint16 sound); + uint32 GetBMYSTTalkSfx(CPed *ped, uint16 sound); + uint32 GetBMOSTTalkSfx(CPed *ped, uint16 sound); + uint32 GetBFYRITalkSfx(CPed *ped, uint16 sound); + uint32 GetBFORITalkSfx(CPed *ped, uint16 sound); + uint32 GetBMYRITalkSfx(CPed *ped, uint16 sound); + uint32 GetBFYBETalkSfx(CPed *ped, uint16 sound); + uint32 GetBMYBETalkSfx(CPed *ped, uint16 sound); + uint32 GetBFOBETalkSfx(CPed *ped, uint16 sound); + uint32 GetBMOBETalkSfx(CPed *ped, uint16 sound); + uint32 GetBMYBUTalkSfx(CPed *ped, uint16 sound); + uint32 GetBFYPRTalkSfx(CPed *ped, uint16 sound); + uint32 GetBFOTRTalkSfx(CPed *ped, uint16 sound); + uint32 GetBMOTRTalkSfx(CPed *ped, uint16 sound); + uint32 GetBMYPITalkSfx(CPed *ped, uint16 sound); + uint32 GetBMYBBTalkSfx(CPed *ped, uint16 sound); + uint32 GetWMYCRTalkSfx(CPed *ped, uint16 sound); + uint32 GetWFYSTTalkSfx(CPed *ped, uint16 sound); + uint32 GetWFOSTTalkSfx(CPed *ped, uint16 sound); + uint32 GetWMYSTTalkSfx(CPed *ped, uint16 sound); + uint32 GetWMOSTTalkSfx(CPed *ped, uint16 sound); + uint32 GetWFYRITalkSfx(CPed *ped, uint16 sound); + uint32 GetWFORITalkSfx(CPed *ped, uint16 sound); + uint32 GetWMYRITalkSfx(CPed *ped, uint16 sound); + uint32 GetWMORITalkSfx(CPed *ped, uint16 sound); + uint32 GetWFYBETalkSfx(CPed *ped, uint16 sound); + uint32 GetWMYBETalkSfx(CPed *ped, uint16 sound); + uint32 GetWFOBETalkSfx(CPed *ped, uint16 sound); + uint32 GetWMOBETalkSfx(CPed *ped, uint16 sound); + uint32 GetWMYCWTalkSfx(CPed *ped, uint16 sound); + uint32 GetWMYGOTalkSfx(CPed *ped, uint16 sound); + uint32 GetWFOGOTalkSfx(CPed *ped, uint16 sound); + uint32 GetWMOGOTalkSfx(CPed *ped, uint16 sound); + uint32 GetWFYLGTalkSfx(CPed *ped, uint16 sound); + uint32 GetWMYLGTalkSfx(CPed *ped, uint16 sound); + uint32 GetWFYBUTalkSfx(CPed *ped, uint16 sound); + uint32 GetWMYBUTalkSfx(CPed *ped, uint16 sound); + uint32 GetWMOBUTalkSfx(CPed *ped, uint16 sound); + uint32 GetWFYPRTalkSfx(CPed *ped, uint16 sound); + uint32 GetWFOTRTalkSfx(CPed *ped, uint16 sound); + uint32 GetWMOTRTalkSfx(CPed *ped, uint16 sound); + uint32 GetWMYPITalkSfx(CPed *ped, uint16 sound); + uint32 GetWMOCATalkSfx(CPed *ped, uint16 sound); + uint32 GetWFYJGTalkSfx(CPed *ped, uint16 sound); + uint32 GetWMYJGTalkSfx(CPed *ped, uint16 sound); + uint32 GetWFYSKTalkSfx(CPed *ped, uint16 sound); + uint32 GetWMYSKTalkSfx(CPed *ped, uint16 sound); + uint32 GetWFYSHTalkSfx(CPed *ped, uint16 sound); + uint32 GetWFOSHTalkSfx(CPed *ped, uint16 sound); + uint32 GetJFOTOTalkSfx(CPed *ped, uint16 sound); + uint32 GetJMOTOTalkSfx(CPed *ped, uint16 sound); + uint32 GetCBTalkSfx(CPed *ped, uint16 sound); + uint32 GetHNTalkSfx(CPed *ped, uint16 sound); + uint32 GetSGTalkSfx(CPed *ped, uint16 sound); + uint32 GetCLTalkSfx(CPed *ped, uint16 sound); + uint32 GetGDTalkSfx(CPed *ped, uint16 sound); + uint32 GetBKTalkSfx(CPed *ped, uint16 sound); + uint32 GetPGTalkSfx(CPed *ped, uint16 sound); + uint32 GetViceWhiteTalkSfx(CPed *ped, uint16 sound); + uint32 GetViceBlackTalkSfx(CPed *ped, uint16 sound); + uint32 GetWFYG1TalkSfx(CPed *ped, uint16 sound); + uint32 GetWFYG2TalkSfx(CPed *ped, uint16 sound); + + uint32 GetGenericMaleTalkSfx(CPed *ped, uint16 sound); // todo names (inlined in vc) + uint32 GetGenericFemaleTalkSfx(CPed *ped, uint16 sound); // todo names (inlined in vc) // end of functions returning talk sfx void GenerateIntegerRandomNumberTable(); @@ -392,8 +393,8 @@ public: uint8 GetMissionAudioLoadingStatus(uint8 slot); int8 GetMissionScriptPoliceAudioPlayingStatus(); uint8 GetNum3DProvidersAvailable(); - uint32 GetPedCommentSfx(CPed *ped, int32 sound); - void GetPhrase(uint32 &phrase, uint32 &prevPhrase, uint32 sample, uint32 maxOffset) const; + uint32 GetPedCommentSfx(CPed *ped, uint16 sound); + void GetPhrase(uint32 &phrase, uint32 &prevPhrase, uint32 sample, uint32 maxOffset); float GetVehicleDriveWheelSkidValue(CVehicle *veh, tWheelState wheelState, float gasPedalAudio, cTransmission *transmission, float velocityChange); float GetVehicleNonDriveWheelSkidValue(CVehicle *veh, tWheelState wheelState, cTransmission *transmission, float velocityChange); |