5 files changed, 1080 insertions, 972 deletions

diff --git a/src/audio/AudioManager.cpp b/src/audio/AudioManager.cpp
index 0a7cd93a..812c9d62 100644
--- a/src/audio/AudioManager.cpp
+++ b/src/audio/AudioManager.cpp
@@ -1,17 +1,362 @@
 #include "AudioManager.h"
+
 #include "DMAudio.h"
 #include "ModelIndices.h"
+#include "MusicManager.h"
 #include "Ped.h"
+#include "Physical.h"
 #include "PlayerPed.h"
 #include "SampleManager.h"
+#include "Vehicle.h"
 #include "World.h"
+
 #include "common.h"
 #include "patcher.h"
 
+#include <cmath>
+
 cAudioManager &AudioManager = *(cAudioManager *)0x880FC0;
 
 constexpr int totalAudioEntitiesSlots = 200;
 
+char &g_nMissionAudioPlayingStatus = *(char *)0x60ED88;
+
+char
+cAudioManager::GetMissionScriptPoliceAudioPlayingStatus()
+{
+	return g_nMissionAudioPlayingStatus;
+}
+
+bool
+cAudioManager::GetMissionAudioLoadingStatus()
+{
+	if(m_bIsInitialised) return m_sMissionAudio.m_bLoadingStatus;
+
+	return true;
+}
+
+
+uint8
+cAudioManager::GetNum3DProvidersAvailable()
+{
+	if(m_bIsInitialised) return num3DProvidersAvailable;
+	return 0;
+}
+
+int8
+cAudioManager::AutoDetect3DProviders()
+{
+	if(m_bIsInitialised) return cSampleManager.AutoDetect3DProviders();
+
+	return -1;
+}
+
+bool
+cAudioManager::IsMP3RadioChannelAvailable()
+{
+	if(m_bIsInitialised) return cSampleManager.IsMP3RadioChannelAvailable();
+
+	return 0;
+}
+
+uint8
+cAudioManager::GetCDAudioDriveLetter()
+{
+	if(m_bIsInitialised) return cSampleManager.GetCDAudioDriveLetter();
+
+	return 0;
+}
+
+void
+cAudioManager::SetEffectsMasterVolume(uint8 volume)
+{
+	cSampleManager.SetEffectsMasterVolume(volume);
+}
+
+void
+cAudioManager::SetMusicMasterVolume(uint8 volume)
+{
+	cSampleManager.SetMusicMasterVolume(volume);
+}
+
+void
+cAudioManager::SetEffectsFadeVol(uint8 volume)
+{
+	cSampleManager.SetEffectsFadeVol(volume);
+}
+
+void
+cAudioManager::SetMusicFadeVol(uint8 volume)
+{
+	cSampleManager.SetMusicFadeVol(volume);
+}
+
+void
+cAudioManager::SetSpeakerConfig(int32 conf)
+{
+	cSampleManager.SetSpeakerConfig(conf);
+}
+
+void
+cAudioManager::ProcessJumboFlying()
+{
+	if(SetupJumboFlySound(127u)) SetupJumboEngineSound(63u, 22050);
+}
+
+WRAPPER
+bool cAudioManager::SetupJumboEngineSound(uint8, int32) { EAXJMP(0x56F140); }
+
+int32 *BankStartOffset = (int32 *)0x6FAB70; //[2]
+
+void
+cAudioManager::PreInitialiseGameSpecificSetup()
+{
+	BankStartOffset[0] = AUDIO_SAMPLE_VEHICLE_HORN_0;
+	BankStartOffset[1] = AUDIO_SAMPLE_POLICE_COP_1_ARREST_1;
+}
+
+int32 &g_nMissionAudioSfx = *(int32 *)0x60ED84;
+
+void
+cAudioManager::SetMissionScriptPoliceAudio(int32 sfx)
+{
+	if(m_bIsInitialised) {
+		if(g_nMissionAudioPlayingStatus != 1) {
+			g_nMissionAudioPlayingStatus = 0;
+			g_nMissionAudioSfx = sfx;
+		}
+	}
+}
+
+void
+cAudioManager::CalculateDistance(bool *ptr, float dist)
+{
+	if(*ptr == false) {
+		m_sQueueSample.m_fDistance = std::sqrt(dist);
+		*ptr = true;
+	}
+}
+
+bool
+cAudioManager::UsesSiren(int32 model)
+{
+	switch(model) {
+	case FIRETRUK:
+	case AMBULAN:
+	case FBICAR:
+	case POLICE:
+	case ENFORCER:
+	case PREDATOR: return true;
+	default: return false;
+	}
+}
+
+bool
+cAudioManager::UsesSirenSwitching(int32 model)
+{
+	switch(model) {
+	case AMBULAN:
+	case POLICE:
+	case ENFORCER:
+	case PREDATOR: return true;
+	default: return false;
+	}
+}
+
+bool
+cAudioManager::MissionScriptAudioUsesPoliceChannel(int32 soundMission)
+{
+	switch(soundMission) {
+	case STREAMED_SOUND_MISSION_J6_D:
+	case STREAMED_SOUND_MISSION_T4_A:
+	case STREAMED_SOUND_MISSION_S1_H:
+	case STREAMED_SOUND_MISSION_S3_B:
+	case STREAMED_SOUND_MISSION_EL3_A:
+	case STREAMED_SOUND_MISSION_A3_A:
+	case STREAMED_SOUND_MISSION_A5_A:
+	case STREAMED_SOUND_MISSION_K1_A:
+	case STREAMED_SOUND_MISSION_R1_A:
+	case STREAMED_SOUND_MISSION_R5_A:
+	case STREAMED_SOUND_MISSION_LO2_A:
+	case STREAMED_SOUND_MISSION_LO6_A: return true;
+	default: return false;
+	}
+}
+
+uint8
+cAudioManager::Get3DProviderName(uint8 id)
+{
+	if(m_bIsInitialised) return 0;
+	if(id >= num3DProvidersAvailable) return 0;
+	return asName3DProviders[id];
+}
+
+void
+cAudioManager::ProcessJumboTaxi()
+{
+	if(SetupJumboFlySound(20u)) {
+		if(SetupJumboTaxiSound(75u)) SetupJumboWhineSound(18u, 29500);
+	}
+}
+
+WRAPPER
+bool cAudioManager::SetupJumboFlySound(uint8) { EAXJMP(0x56F230); }
+
+WRAPPER
+bool cAudioManager::SetupJumboTaxiSound(uint8) { EAXJMP(0x56EF20); }
+
+WRAPPER
+bool cAudioManager::SetupJumboWhineSound(uint8, int32) { EAXJMP(0x56F070); }
+
+void
+cAudioManager::PlayLoadedMissionAudio()
+{
+	if(m_bIsInitialised && m_sMissionAudio.m_nSampleIndex != NO_SAMPLE &&
+	   m_sMissionAudio.m_bLoadingStatus == 1 && !m_sMissionAudio.m_bPlayStatus) {
+		m_sMissionAudio.m_bIsPlayed = true;
+	}
+}
+
+void
+cAudioManager::SetMissionAudioLocation(float x, float y, float z)
+{
+	if(m_bIsInitialised) {
+		m_sMissionAudio.field_12 = 0;
+		m_sMissionAudio.m_vecPos.x = x;
+		m_sMissionAudio.m_vecPos.y = y;
+		m_sMissionAudio.m_vecPos.z = z;
+	}
+}
+
+void
+cAudioManager::ResetPoliceRadio()
+{
+	if(m_bIsInitialised) {
+		if(cSampleManager.GetChannelUsedFlag(28)) cSampleManager.StopChannel(28);
+		InitialisePoliceRadio();
+	}
+}
+
+void
+cAudioManager::InterrogateAudioEntities()
+{
+	int32 i = 0;
+	int32 next;
+
+	while(i < m_nAudioEntitiesTotal) {
+		ProcessEntity(m_anAudioEntityIndices[i]);
+		next = m_anAudioEntityIndices[i++];
+		m_asAudioEntities[next].field_24 = 0;
+	}
+}
+
+void
+cAudioManager::ClearRequestedQueue()
+{
+	for(uint32 i = 0; i < m_bActiveSamples; i++) {
+		m_abSampleQueueIndexTable[i + 27 * m_bActiveSampleQueue] = m_bActiveSamples;
+	}
+	m_bSampleRequestQueuesStatus[m_bActiveSampleQueue] = 0;
+}
+
+// void cAudioManager::AgeCrimes()
+//{
+
+//}
+
+bool
+cAudioManager::UsesReverseWarning(int32 model)
+{
+	return model == LINERUN || std::abs(model - FIRETRUK) <= 1 || model == BUS ||
+	       model == COACH; // fix
+}
+
+bool
+cAudioManager::HasAirBrakes(int32 model)
+{
+	return model == LINERUN || std::abs(model - FIRETRUK) <= 1 || model == BUS ||
+	       model == COACH; // fix
+}
+
+int32
+cAudioManager::GetJumboTaxiFreq()
+{
+	return (60.833f * m_sQueueSample.m_fDistance) + 22050;
+}
+
+void
+cAudioManager::ProcessPhysical(int32 id)
+{
+	CPhysical *entity = m_asAudioEntities[id].m_pEntity;
+	if(entity) {
+		switch(entity->m_type & 7) {
+		case ENTITY_TYPE_VEHICLE: ProcessVehicle(m_asAudioEntities[id].m_pEntity); break;
+		case ENTITY_TYPE_PED: ProcessPed(m_asAudioEntities[id].m_pEntity); break;
+		default: return;
+		}
+	}
+}
+
+WRAPPER
+void
+cAudioManager::ProcessVehicle(CPhysical *)
+{
+	EAXJMP(0x569A00);
+}
+
+WRAPPER
+void
+cAudioManager::ProcessPed(CPhysical *)
+{
+	EAXJMP(0x56F450);
+}
+
+WRAPPER
+void
+cAudioManager::ProcessPlane(void *ptr)
+{
+	EAXJMP(0x56E860);
+}
+
+void
+cAudioManager::ClearMissionAudio()
+{
+	if(m_bIsInitialised) {
+		m_sMissionAudio.m_nSampleIndex = NO_SAMPLE;
+		m_sMissionAudio.m_bLoadingStatus = 0;
+		m_sMissionAudio.m_bPlayStatus = 0;
+		m_sMissionAudio.field_22 = 0;
+		m_sMissionAudio.m_bIsPlayed = false;
+		m_sMissionAudio.field_12 = 1;
+		m_sMissionAudio.field_24 = 0;
+	}
+}
+
+// void
+// cAudioManager::ProcessReverb()
+//{
+//}
+
+bool
+cAudioManager::IsMissionAudioSampleFinished()
+{
+	if(m_bIsInitialised) return m_sMissionAudio.m_bPlayStatus == 2;
+
+	static int32 cPretendFrame = 1;
+
+	return (cPretendFrame++ & 63) == 0;
+}
+
+WRAPPER
+void cAudioManager::ProcessEntity(int32) { EAXJMP(0x569870); }
+
+WRAPPER
+void
+cAudioManager::InitialisePoliceRadio()
+{
+	EAXJMP(0x57EEC0);
+}
+
 int32
 cAudioManager::RandomDisplacement(uint32 seed)
 {
@@ -55,7 +400,7 @@ cAudioManager::IsAudioInitialised() const
 }
 
 int32
-cAudioManager::CreateEntity(int32 type, void *memory)
+cAudioManager::CreateEntity(int32 type, CPhysical *memory)
 {
 	if(!m_bIsInitialised) return -4;
 	if(!memory) return -2;
@@ -148,15 +493,15 @@ cAudioManager::PostTerminateGameSpecificShutdown()
 void
 cAudioManager::GenerateIntegerRandomNumberTable()
 {
-    for(int32 i = 0; i < 5; i++) { m_anRandomTable[i] = rand(); }
+	for(int32 i = 0; i < 5; i++) { m_anRandomTable[i] = rand(); }
 }
 
-bool bPlayerJustGotInCar = *(bool*)0x6508C4;
+bool &bPlayerJustEnteredCar = *(bool *)0x6508C4;
 
 void
 cAudioManager::PlayerJustGotInCar()
 {
-	if(m_bIsInitialised) { bPlayerJustGotInCar = true; }
+	if(m_bIsInitialised) { bPlayerJustEnteredCar = true; }
 }
 
 void
@@ -166,16 +511,13 @@ cAudioManager::PlayerJustLeftCar(void)
 }
 
 void
-cAudioManager::GetPhrase(uint32 *phrase, uint32 *prevPhrase, uint32 sample,
-                         uint32 maxOffset)
+cAudioManager::GetPhrase(uint32 *phrase, uint32 *prevPhrase, uint32 sample, uint32 maxOffset)
 {
-	*phrase = sample + m_anRandomTable[m_sQueueSample.m_nEntityIndex & 3] %
-	                       maxOffset;
+	*phrase = sample + m_anRandomTable[m_sQueueSample.m_nEntityIndex & 3] % maxOffset;
 
 	// check if the same sfx like last time, if yes, then try use next one,
 	// if exceeded range, then choose first available sample
-	if(*phrase == *prevPhrase && ++*phrase >= sample + maxOffset)
-		*phrase = sample;
+	if(*phrase == *prevPhrase && ++*phrase >= sample + maxOffset) *phrase = sample;
 	*prevPhrase = *phrase;
 }
 
@@ -187,17 +529,12 @@ cAudioManager::GetPlayerTalkSfx(int16 sound)
 
 	switch(sound) {
 	case SOUND_PED_DAMAGE:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_DAMAGE_REACTION_1,
-		          11u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_DAMAGE_REACTION_1, 11u);
 		break;
 
-	case SOUND_PED_HIT:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_HIT_REACTION_1, 10u);
-		break;
+	case SOUND_PED_HIT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_HIT_REACTION_1, 10u); break;
 
-	case SOUND_PED_LAND:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_FALL_REACTION_1, 6u);
-		break;
+	case SOUND_PED_LAND: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_FALL_REACTION_1, 6u); break;
 
 	default: sfx = NO_SAMPLE; break;
 	}
@@ -212,19 +549,16 @@ cAudioManager::GetCopTalkSfx(int16 sound)
 	static uint32 lastSfx = NO_SAMPLE;
 
 	if(sound == SOUND_PED_ARREST_COP) {
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_POLICE_COP_1_ARREST_1,
-		          6u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_POLICE_COP_1_ARREST_1, 6u);
 	} else {
 		if(sound != SOUND_PED_PURSUIT_COP) {
 			return cAudioManager::GetGenericMaleTalkSfx(sound);
 		}
 
 		pedState = FindPlayerPed()->m_nPedState;
-		if(pedState == PED_ARRESTED || pedState == PED_DEAD ||
-		   pedState == PED_DIE)
+		if(pedState == PED_ARRESTED || pedState == PED_DEAD || pedState == PED_DIE)
 			return NO_SAMPLE;
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_POLICE_COP_1_PURSUIT_1,
-		          7u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_POLICE_COP_1_PURSUIT_1, 7u);
 	}
 
 	return 13 * (m_sQueueSample.m_nEntityIndex % 5) + sfx;
@@ -238,19 +572,16 @@ cAudioManager::GetSwatTalkSfx(int16 sound)
 	static uint32 lastSfx = NO_SAMPLE;
 
 	if(sound == SOUND_PED_ARREST_SWAT) {
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_POLICE_SWAT_1_PURSUIT_ARREST_1, 6u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_POLICE_SWAT_1_PURSUIT_ARREST_1, 6u);
 	} else {
 		if(sound != SOUND_PED_PURSUIT_SWAT) {
 			return cAudioManager::GetGenericMaleTalkSfx(sound);
 		}
 
 		pedState = FindPlayerPed()->m_nPedState;
-		if(pedState == PED_ARRESTED || pedState == PED_DEAD ||
-		   pedState == PED_DIE)
+		if(pedState == PED_ARRESTED || pedState == PED_DEAD || pedState == PED_DIE)
 			return NO_SAMPLE;
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_POLICE_SWAT_1_PURSUIT_ARREST_1, 6u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_POLICE_SWAT_1_PURSUIT_ARREST_1, 6u);
 	}
 
 	return 6 * (m_sQueueSample.m_nEntityIndex % 3) + sfx;
@@ -264,19 +595,16 @@ cAudioManager::GetFBITalkSfx(int16 sound)
 	static uint32 lastSfx = NO_SAMPLE;
 
 	if(sound == SOUND_PED_ARREST_FBI) {
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_POLICE_FBI_1_PURSUIT_ARREST_1, 6u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_POLICE_FBI_1_PURSUIT_ARREST_1, 6u);
 	} else {
 		if(sound != SOUND_PED_PURSUIT_FBI) {
 			return cAudioManager::GetGenericMaleTalkSfx(sound);
 		}
 
 		pedState = FindPlayerPed()->m_nPedState;
-		if(pedState == PED_ARRESTED || pedState == PED_DEAD ||
-		   pedState == PED_DIE)
+		if(pedState == PED_ARRESTED || pedState == PED_DEAD || pedState == PED_DIE)
 			return NO_SAMPLE;
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_POLICE_FBI_1_PURSUIT_ARREST_1, 6u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_POLICE_FBI_1_PURSUIT_ARREST_1, 6u);
 	}
 
 	return 6 * (m_sQueueSample.m_nEntityIndex % 3) + sfx;
@@ -289,13 +617,10 @@ cAudioManager::GetArmyTalkSfx(int16 sound)
 	PedState pedState;
 	static uint32 lastSfx = NO_SAMPLE;
 
-	if(sound != SOUND_PED_PURSUIT_ARMY) {
-		return cAudioManager::GetGenericMaleTalkSfx(sound);
-	}
+	if(sound != SOUND_PED_PURSUIT_ARMY) { return cAudioManager::GetGenericMaleTalkSfx(sound); }
 
 	pedState = FindPlayerPed()->m_nPedState;
-	if(pedState == PED_ARRESTED || pedState == PED_DEAD ||
-	   pedState == PED_DIE)
+	if(pedState == PED_ARRESTED || pedState == PED_DEAD || pedState == PED_DIE)
 		return NO_SAMPLE;
 	GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_POLICE_ARMY_1_PURSUIT_1, 15u);
 
@@ -310,24 +635,19 @@ cAudioManager::GetMedicTalkSfx(int16 sound)
 
 	switch(sound) {
 	case SOUND_PED_HANDS_COWER:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_MEDIC_1_HANDS_COWER_1, 5u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MEDIC_1_HANDS_COWER_1, 5u);
 		break;
 	case SOUND_PED_CAR_JACKED:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MEDIC_1_CAR_JACKED_1,
-		          5u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MEDIC_1_CAR_JACKED_1, 5u);
 		break;
 	case SOUND_PED_HEALING:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MEDIC_1_HEALING_1,
-		          12u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MEDIC_1_HEALING_1, 12u);
 		break;
 	case SOUND_PED_LEAVE_VEHICLE:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_MEDIC_1_LEAVE_VEHICLE_1, 9u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MEDIC_1_LEAVE_VEHICLE_1, 9u);
 		break;
 	case SOUND_PED_FLEE_RUN:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MEDIC_1_FLEE_RUN_1,
-		          6u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MEDIC_1_FLEE_RUN_1, 6u);
 		break;
 	default: return cAudioManager::GetGenericMaleTalkSfx(sound);
 	}
@@ -348,36 +668,28 @@ cAudioManager::GetNormalMaleTalkSfx(int16 sound)
 
 	switch(sound) {
 	case SOUND_PED_HANDS_COWER:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_NORMAL_MALE_HANDS_COWER_1, 7u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_NORMAL_MALE_HANDS_COWER_1, 7u);
 		break;
 	case SOUND_PED_CAR_JACKED:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_NORMAL_MALE_CAR_JACKED_1, 7u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_NORMAL_MALE_CAR_JACKED_1, 7u);
 		break;
 	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_NORMAL_MALE_EVADE_1,
-		          9u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_NORMAL_MALE_EVADE_1, 9u);
 		break;
 	case SOUND_PED_FLEE_RUN:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_NORMAL_MALE_FLEE_RUN_1, 5u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_NORMAL_MALE_FLEE_RUN_1, 5u);
 		break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_NORMAL_MALE_CAR_COLLISION_1, 12u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_NORMAL_MALE_CAR_COLLISION_1, 12u);
 		break;
 	case SOUND_PED_CHAT_SEXY:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_NORMAL_MALE_CHAT_SEXY_1, 8u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_NORMAL_MALE_CHAT_SEXY_1, 8u);
 		break;
 	case SOUND_PED_CHAT_EVENT:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_NORMAL_MALE_CHAT_EVENT_1, 0xAu);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_NORMAL_MALE_CHAT_EVENT_1, 0xAu);
 		break;
 	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_NORMAL_MALE_CHAT_1,
-		          25u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_NORMAL_MALE_CHAT_1, 25u);
 		break;
 	default: return cAudioManager::GetGenericMaleTalkSfx(sound);
 	}
@@ -391,13 +703,11 @@ cAudioManager::GetTaxiDriverTalkSfx(int16 sound)
 	static uint32 lastSfx = NO_SAMPLE;
 
 	if(sound == SOUND_PED_CAR_JACKED) {
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_TAXI_DRIVER_1_CAR_JACKED_1, 7u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_TAXI_DRIVER_1_CAR_JACKED_1, 7u);
 	} else {
 		if(sound != SOUND_PED_CAR_COLLISION)
 			return cAudioManager::GetGenericMaleTalkSfx(sound);
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_TAXI_DRIVER_1_CAR_COLLISION_1, 6u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_TAXI_DRIVER_1_CAR_COLLISION_1, 6u);
 	}
 	return 13 * (m_sQueueSample.m_nEntityIndex & 1) + sfx;
 }
@@ -413,26 +723,17 @@ cAudioManager::GetPimpTalkSfx(int16 sound)
 		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_PIMP_HANDS_UP_1, 7u);
 		break;
 	case SOUND_PED_CAR_JACKED:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_PIMP_CAR_JACKED_1,
-		          4u);
-		break;
-	case SOUND_PED_DEFEND:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_PIMP_DEFEND_1, 9u);
-		break;
-	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_PIMP_EVADE_1, 6u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_PIMP_CAR_JACKED_1, 4u);
 		break;
+	case SOUND_PED_DEFEND: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_PIMP_DEFEND_1, 9u); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_PIMP_EVADE_1, 6u); break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_PIMP_CAR_COLLISION_1,
-		          5u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_PIMP_CAR_COLLISION_1, 5u);
 		break;
 	case SOUND_PED_CHAT_EVENT:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_PIMP_CHAT_EVENT_1,
-		          2u);
-		break;
-	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_PIMP_CHAT_1, 17u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_PIMP_CHAT_EVENT_1, 2u);
 		break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_PIMP_CHAT_1, 17u); break;
 	default: return cAudioManager::GetGenericMaleTalkSfx(sound);
 	}
 	return sfx;
@@ -446,31 +747,24 @@ cAudioManager::GetMafiaTalkSfx(int16 sound)
 
 	switch(sound) {
 	case SOUND_PED_CAR_JACKING:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_MAFIA_1_CAR_JACKING_1, 2u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MAFIA_1_CAR_JACKING_1, 2u);
 		break;
 	case SOUND_PED_CAR_JACKED:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MAFIA_1_CAR_JACKED_1,
-		          2u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MAFIA_1_CAR_JACKED_1, 2u);
 		break;
 	case SOUND_PED_ATTACK:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MAFIA_1_ATTACK_1,
-		          5u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MAFIA_1_ATTACK_1, 5u);
 		break;
 	case SOUND_PED_EVADE:
 		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MAFIA_1_EVADE_1, 5u);
 		break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_MAFIA_1_CAR_COLLISION_1, 6u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MAFIA_1_CAR_COLLISION_1, 6u);
 		break;
 	case SOUND_PED_CHAT_SEXY:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MAFIA_1_CHAT_SEXY_1,
-		          3u);
-		break;
-	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MAFIA_1_CHAT_1, 7u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MAFIA_1_CHAT_SEXY_1, 3u);
 		break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MAFIA_1_CHAT_1, 7u); break;
 	default: return cAudioManager::GetGenericMaleTalkSfx(sound);
 	}
 	return 30 * (m_sQueueSample.m_nEntityIndex % 3) + sfx;
@@ -484,35 +778,27 @@ cAudioManager::GetTriadTalkSfx(int16 sound)
 
 	switch(sound) {
 	case SOUND_PED_HANDS_UP:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_TRIAD_1_HANDS_UP_1,
-		          3u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_TRIAD_1_HANDS_UP_1, 3u);
 		break;
 	case SOUND_PED_CAR_JACKING:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_TRIAD_1_CAR_JACKING_1, 2u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_TRIAD_1_CAR_JACKING_1, 2u);
 		break;
 	case SOUND_PED_CAR_JACKED:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_TRIAD_1_CAR_JACKED_1,
-		          2u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_TRIAD_1_CAR_JACKED_1, 2u);
 		break;
 	case SOUND_PED_ATTACK:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_TRIAD_1_ATTACK_1,
-		          5u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_TRIAD_1_ATTACK_1, 5u);
 		break;
 	case SOUND_PED_EVADE:
 		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_TRIAD_1_EVADE_1, 4u);
 		break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_TRIAD_1_CAR_COLLISION_1, 7u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_TRIAD_1_CAR_COLLISION_1, 7u);
 		break;
 	case SOUND_PED_CHAT_SEXY:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_TRIAD_1_CHAT_SEXY_1,
-		          3u);
-		break;
-	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_TRIAD_1_CHAT_1, 8u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_TRIAD_1_CHAT_SEXY_1, 3u);
 		break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_TRIAD_1_CHAT_1, 8u); break;
 	default: return cAudioManager::GetGenericMaleTalkSfx(sound);
 	}
 	return sfx;
@@ -526,40 +812,31 @@ cAudioManager::GetDiabloTalkSfx(int16 sound)
 
 	switch(sound) {
 	case SOUND_PED_HANDS_UP:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_DIABLO_1_HANDS_UP_1,
-		          4u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_DIABLO_1_HANDS_UP_1, 4u);
 		break;
 	case SOUND_PED_HANDS_COWER:
 		sound = SOUND_PED_FLEE_SPRINT;
 		return cAudioManager::GetGenericMaleTalkSfx(sound);
 		break;
 	case SOUND_PED_CAR_JACKING:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_DIABLO_1_CAR_JACKING_1, 2u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_DIABLO_1_CAR_JACKING_1, 2u);
 		break;
 	case SOUND_PED_CAR_JACKED:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_DIABLO_1_CAR_JACKED_1, 2u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_DIABLO_1_CAR_JACKED_1, 2u);
 		break;
 	case SOUND_PED_ATTACK:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_DIABLO_1_ATTACK_1,
-		          4u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_DIABLO_1_ATTACK_1, 4u);
 		break;
 	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_DIABLO_1_EVADE_1,
-		          4u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_DIABLO_1_EVADE_1, 4u);
 		break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_DIABLO_1_CAR_COLLISION_1, 5u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_DIABLO_1_CAR_COLLISION_1, 5u);
 		break;
 	case SOUND_PED_CHAT_SEXY:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_DIABLO_1_CHAT_SEXY_1,
-		          4u);
-		break;
-	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_DIABLO_1_CHAT_1, 5u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_DIABLO_1_CHAT_SEXY_1, 4u);
 		break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_DIABLO_1_CHAT_1, 5u); break;
 	default: return cAudioManager::GetGenericMaleTalkSfx(sound);
 	}
 	return 30 * (m_sQueueSample.m_nEntityIndex & 1) + sfx;
@@ -573,28 +850,21 @@ cAudioManager::GetYakuzaTalkSfx(int16 sound)
 
 	switch(sound) {
 	case SOUND_PED_CAR_JACKING:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_YAKUZA_1_CAR_JACKING_1, 2u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_YAKUZA_1_CAR_JACKING_1, 2u);
 		break;
 	case SOUND_PED_CAR_JACKED:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_YAKUZA_1_CAR_JACKED_1, 2u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_YAKUZA_1_CAR_JACKED_1, 2u);
 		break;
 	case SOUND_PED_ATTACK:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_YAKUZA_1_ATTACK_1,
-		          5u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_YAKUZA_1_ATTACK_1, 5u);
 		break;
 	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_YAKUZA_1_EVADE_1,
-		          4u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_YAKUZA_1_EVADE_1, 4u);
 		break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_YAKUZA_1_CAR_COLLISION_1, 6u);
-		break;
-	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_YAKUZA_1_CHAT_1, 5u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_YAKUZA_1_CAR_COLLISION_1, 6u);
 		break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_YAKUZA_1_CHAT_1, 5u); break;
 	default: return cAudioManager::GetGenericMaleTalkSfx(sound);
 	}
 	return 24 * (m_sQueueSample.m_nEntityIndex & 1) + sfx;
@@ -607,35 +877,24 @@ cAudioManager::GetYardieTalkSfx(int16 sound)
 	static uint32 lastSfx = NO_SAMPLE;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_UP:
-		sfx = AUDIO_SAMPLE_PED_YARDIE_1_HANDS_UP_1;
-		break;
+	case SOUND_PED_HANDS_UP: sfx = AUDIO_SAMPLE_PED_YARDIE_1_HANDS_UP_1; break;
 	case SOUND_PED_CAR_JACKING:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_YARDIE_1_CAR_JACKING_1, 2u);
-		break;
-	case SOUND_PED_CAR_JACKED:
-		sfx = AUDIO_SAMPLE_PED_YARDIE_1_CAR_JACKED_1;
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_YARDIE_1_CAR_JACKING_1, 2u);
 		break;
+	case SOUND_PED_CAR_JACKED: sfx = AUDIO_SAMPLE_PED_YARDIE_1_CAR_JACKED_1; break;
 	case SOUND_PED_ATTACK:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_YARDIE_1_ATTACK_1,
-		          6u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_YARDIE_1_ATTACK_1, 6u);
 		break;
 	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_YARDIE_1_EVADE_1,
-		          5u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_YARDIE_1_EVADE_1, 5u);
 		break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_YARDIE_1_CAR_COLLISION_1, 6u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_YARDIE_1_CAR_COLLISION_1, 6u);
 		break;
 	case SOUND_PED_CHAT_SEXY:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_YARDIE_1_CHAT_SEXY_1,
-		          2u);
-		break;
-	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_YARDIE_1_CHAT_1, 8u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_YARDIE_1_CHAT_SEXY_1, 2u);
 		break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_YARDIE_1_CHAT_1, 8u); break;
 	default: return cAudioManager::GetGenericMaleTalkSfx(sound);
 	}
 	return 31 * (m_sQueueSample.m_nEntityIndex & 1) + sfx;
@@ -649,32 +908,24 @@ cAudioManager::GetColumbianTalkSfx(int16 sound)
 
 	switch(sound) {
 	case SOUND_PED_CAR_JACKING:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_COLUMB_1_CAR_JACKING_1, 2u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_COLUMB_1_CAR_JACKING_1, 2u);
 		break;
 	case SOUND_PED_CAR_JACKED:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_COLUMB_1_CAR_JACKED_1, 2u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_COLUMB_1_CAR_JACKED_1, 2u);
 		break;
 	case SOUND_PED_ATTACK:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_COLUMB_1_ATTACK_1,
-		          5u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_COLUMB_1_ATTACK_1, 5u);
 		break;
 	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_COLUMB_1_EVADE_1,
-		          5u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_COLUMB_1_EVADE_1, 5u);
 		break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_COLUMB_1_CAR_COLLISION_1, 6u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_COLUMB_1_CAR_COLLISION_1, 6u);
 		break;
 	case SOUND_PED_CHAT_SEXY:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_COLUMB_1_CHAT_SEXY_1,
-		          2u);
-		break;
-	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_COLUMB_1_CHAT_1, 5u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_COLUMB_1_CHAT_SEXY_1, 2u);
 		break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_COLUMB_1_CHAT_1, 5u); break;
 	default: return cAudioManager::GetGenericMaleTalkSfx(sound);
 	}
 	return 27 * (m_sQueueSample.m_nEntityIndex & 1) + sfx;
@@ -688,35 +939,27 @@ cAudioManager::GetHoodTalkSfx(int16 sound)
 
 	switch(sound) {
 	case SOUND_PED_HANDS_UP:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_HOODS_1_HANDS_UP_1,
-		          5u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_HOODS_1_HANDS_UP_1, 5u);
 		break;
 	case SOUND_PED_CAR_JACKING:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_HOODS_1_CAR_JACKING_1, 2u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_HOODS_1_CAR_JACKING_1, 2u);
 		break;
 	case SOUND_PED_CAR_JACKED:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_HOODS_1_CAR_JACKED_1,
-		          2u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_HOODS_1_CAR_JACKED_1, 2u);
 		break;
 	case SOUND_PED_ATTACK:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_HOODS_1_ATTACK_1,
-		          6u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_HOODS_1_ATTACK_1, 6u);
 		break;
 	case SOUND_PED_EVADE:
 		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_HOODS_1_EVADE_1, 5u);
 		break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_HOODS_1_CAR_COLLISION_1, 7u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_HOODS_1_CAR_COLLISION_1, 7u);
 		break;
 	case SOUND_PED_CHAT_SEXY:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_HOODS_1_CHAT_SEXY_1,
-		          2u);
-		break;
-	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_HOODS_1_CHAT_1, 6u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_HOODS_1_CHAT_SEXY_1, 2u);
 		break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_HOODS_1_CHAT_1, 6u); break;
 
 	default: return cAudioManager::GetGenericMaleTalkSfx(sound); break;
 	}
@@ -731,28 +974,20 @@ cAudioManager::GetBlackCriminalTalkSfx(int16 sound)
 
 	switch(sound) {
 	case SOUND_PED_HANDS_UP:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_BLACK_CRIMINAL_1_HANDS_UP_1, 4u);
-		break;
-	case SOUND_PED_CAR_JACKING:
-		sfx = AUDIO_SAMPLE_PED_BLACK_CRIMINAL_1_CAR_JACKING_1;
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_CRIMINAL_1_HANDS_UP_1, 4u);
 		break;
+	case SOUND_PED_CAR_JACKING: sfx = AUDIO_SAMPLE_PED_BLACK_CRIMINAL_1_CAR_JACKING_1; break;
 	case SOUND_PED_MUGGING:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_BLACK_CRIMINAL_1_MUGGING_1, 2u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_CRIMINAL_1_MUGGING_1, 2u);
 		break;
 	case SOUND_PED_ATTACK:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_BLACK_CRIMINAL_1_ATTACK_1, 5u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_CRIMINAL_1_ATTACK_1, 5u);
 		break;
 	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_BLACK_CRIMINAL_1_EVADE_1, 6u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_CRIMINAL_1_EVADE_1, 6u);
 		break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_BLACK_CRIMINAL_1_CAR_COLLISION_1,
-		          5u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_CRIMINAL_1_CAR_COLLISION_1, 5u);
 		break;
 	default: return cAudioManager::GetGenericMaleTalkSfx(sound); break;
 	}
@@ -767,28 +1002,20 @@ cAudioManager::GetWhiteCriminalTalkSfx(int16 sound)
 
 	switch(sound) {
 	case SOUND_PED_HANDS_UP:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_WHITE_CRIMINAL_1_HANDS_UP_1, 3u);
-		break;
-	case SOUND_PED_CAR_JACKING:
-		sfx = AUDIO_SAMPLE_PED_WHITE_CRIMINAL_1_CAR_JACKING_1;
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_CRIMINAL_1_HANDS_UP_1, 3u);
 		break;
+	case SOUND_PED_CAR_JACKING: sfx = AUDIO_SAMPLE_PED_WHITE_CRIMINAL_1_CAR_JACKING_1; break;
 	case SOUND_PED_MUGGING:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_WHITE_CRIMINAL_1_MUGGING_1, 2u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_CRIMINAL_1_MUGGING_1, 2u);
 		break;
 	case SOUND_PED_ATTACK:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_WHITE_CRIMINAL_1_ATTACK_1, 4u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_CRIMINAL_1_ATTACK_1, 4u);
 		break;
 	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_WHITE_CRIMINAL_1_EVADE_1, 5u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_CRIMINAL_1_EVADE_1, 5u);
 		break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_WHITE_CRIMINAL_1_CAR_COLLISION_1,
-		          4u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_CRIMINAL_1_CAR_COLLISION_1, 4u);
 		break;
 	default: return cAudioManager::GetGenericMaleTalkSfx(sound); break;
 	}
@@ -803,34 +1030,27 @@ cAudioManager::GetMaleNo2TalkSfx(int16 sound)
 
 	switch(sound) {
 	case SOUND_PED_CAR_JACKED:
-		cAudioManager::GetPhrase(
-		    &sfx, &lastSfx, AUDIO_SAMPLE_PED_MALE_NO_2_CAR_JACKED_1,
-		    3u);
+		cAudioManager::GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MALE_NO_2_CAR_JACKED_1,
+		                         3u);
 		break;
 	case SOUND_PED_ROBBED:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MALE_NO_2_ROBBED_1,
-		          4u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MALE_NO_2_ROBBED_1, 4u);
 		break;
 	case SOUND_PED_ATTACK:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MALE_NO_2_ATTACK_1,
-		          4u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MALE_NO_2_ATTACK_1, 4u);
 		break;
 	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MALE_NO_2_EVADE_1,
-		          4u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MALE_NO_2_EVADE_1, 4u);
 		break;
 	case SOUND_PED_CAR_COLLISION:
-		cAudioManager::GetPhrase(
-		    &sfx, &lastSfx, AUDIO_SAMPLE_PED_MALE_NO_2_CAR_COLLISION_1,
-		    7u);
+		cAudioManager::GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MALE_NO_2_CAR_COLLISION_1,
+		                         7u);
 		break;
 	case SOUND_PED_CHAT_SEXY:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_MALE_NO_2_CHAT_SEXY_1, 5u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MALE_NO_2_CHAT_SEXY_1, 5u);
 		break;
 	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MALE_NO_2_CHAT_1,
-		          7u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MALE_NO_2_CHAT_1, 7u);
 		break;
 	default: return cAudioManager::GetGenericMaleTalkSfx(sound);
 	}
@@ -845,39 +1065,29 @@ cAudioManager::GetBlackProjectMaleTalkSfx(int16 sound, int32 model)
 
 	switch(sound) {
 	case SOUND_PED_HANDS_UP:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_1_HANDS_UP_1, 3u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_1_HANDS_UP_1, 3u);
 		break;
 	case SOUND_PED_CAR_JACKED:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_1_CAR_JACKED_1,
-		          2u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_1_CAR_JACKED_1, 2u);
 		break;
 	case SOUND_PED_ROBBED:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_1_ROBBED_1, 2u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_1_ROBBED_1, 2u);
 		break;
 	case SOUND_PED_ATTACK:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_1_ATTACK_1, 6u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_1_ATTACK_1, 6u);
 		break;
 	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_1_EVADE_1, 5u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_1_EVADE_1, 5u);
 		break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_1_CAR_COLLISION_1,
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_1_CAR_COLLISION_1,
 		          7u);
 		break;
 	case SOUND_PED_CHAT_SEXY:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_1_CHAT_SEXY_1,
-		          3u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_1_CHAT_SEXY_1, 3u);
 		break;
 	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_1_CHAT_1, 6u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_1_CHAT_1, 6u);
 	default: return GetGenericMaleTalkSfx(sound);
 	}
 
@@ -893,30 +1103,22 @@ cAudioManager::GetWhiteFatMaleTalkSfx(int16 sound)
 
 	switch(sound) {
 	case SOUND_PED_CAR_JACKED:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_WHITE_FAT_MALE_1_CAR_JACKED_1, 3u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_FAT_MALE_1_CAR_JACKED_1, 3u);
 		break;
 	case SOUND_PED_ROBBED:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_WHITE_FAT_MALE_1_ROBBED_1, 3u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_FAT_MALE_1_ROBBED_1, 3u);
 		break;
 	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_WHITE_FAT_MALE_1_EVADE_1, 9u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_FAT_MALE_1_EVADE_1, 9u);
 		break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_WHITE_FAT_MALE_1_CAR_COLLISION_1,
-		          9u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_FAT_MALE_1_CAR_COLLISION_1, 9u);
 		break;
 	case SOUND_PED_WAIT_DOUBLEBACK:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_WHITE_FAT_MALE_1_WAIT_DOUBLEBACK_1,
-		          2u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_FAT_MALE_1_WAIT_DOUBLEBACK_1, 2u);
 		break;
 	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_WHITE_FAT_MALE_1_CHAT_1, 9u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_FAT_MALE_1_CHAT_1, 9u);
 	default: return GetGenericMaleTalkSfx(sound);
 	}
 	return sfx;
@@ -930,30 +1132,22 @@ cAudioManager::GetBlackFatMaleTalkSfx(int16 sound)
 
 	switch(sound) {
 	case SOUND_PED_CAR_JACKED:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_BLACK_FAT_MALE_1_CAR_JACKED_1, 4u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_FAT_MALE_1_CAR_JACKED_1, 4u);
 		break;
 	case SOUND_PED_ROBBED:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_BLACK_FAT_MALE_1_ROBBED_1, 3u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_FAT_MALE_1_ROBBED_1, 3u);
 		break;
 	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_BLACK_FAT_MALE_1_EVADE_1, 7u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_FAT_MALE_1_EVADE_1, 7u);
 		break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_BLACK_FAT_MALE_1_CAR_COLLISION_1,
-		          6u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_FAT_MALE_1_CAR_COLLISION_1, 6u);
 		break;
 	case SOUND_PED_WAIT_DOUBLEBACK:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_BLACK_FAT_MALE_1_WAIT_DOUBLEBACK_1,
-		          3u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_FAT_MALE_1_WAIT_DOUBLEBACK_1, 3u);
 		break;
 	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_BLACK_FAT_MALE_1_CHAT_1, 8u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_FAT_MALE_1_CHAT_1, 8u);
 		break;
 	default: return GetGenericMaleTalkSfx(sound);
 	}
@@ -968,41 +1162,29 @@ cAudioManager::GetBlackCasualFemaleTalkSfx(int16 sound)
 
 	switch(sound) {
 	case SOUND_PED_HANDS_COWER:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_BLACK_CASUAL_FEMALE_1_HANDS_COWER_1,
-		          2u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_CASUAL_FEMALE_1_HANDS_COWER_1, 2u);
 		break;
 	case SOUND_PED_CAR_JACKED:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_BLACK_CASUAL_FEMALE_1_CAR_JACKED_1,
-		          2u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_CASUAL_FEMALE_1_CAR_JACKED_1, 2u);
 		break;
 	case SOUND_PED_ROBBED:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_BLACK_CASUAL_FEMALE_1_ROBBED_1, 3u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_CASUAL_FEMALE_1_ROBBED_1, 3u);
 		break;
 	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_BLACK_CASUAL_FEMALE_1_EVADE_1, 6u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_CASUAL_FEMALE_1_EVADE_1, 6u);
 		break;
 	case SOUND_PED_FLEE_RUN:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_BLACK_CASUAL_FEMALE_1_FLEE_RUN_1,
-		          2u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_CASUAL_FEMALE_1_FLEE_RUN_1, 2u);
 		break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(
-		    &sfx, &lastSfx,
-		    AUDIO_SAMPLE_PED_BLACK_CASUAL_FEMALE_1_CAR_COLLISION_1, 7u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_CASUAL_FEMALE_1_CAR_COLLISION_1,
+		          7u);
 		break;
 	case SOUND_PED_CHAT_EVENT:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_BLACK_CASUAL_FEMALE_1_CHAT_EVENT_1,
-		          4u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_CASUAL_FEMALE_1_CHAT_EVENT_1, 4u);
 		break;
 	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_BLACK_CASUAL_FEMALE_1_CHAT_1, 8u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_CASUAL_FEMALE_1_CHAT_1, 8u);
 		break;
 	default: return GetGenericFemaleTalkSfx(sound);
 	}
@@ -1017,40 +1199,27 @@ cAudioManager::GetWhiteCasualFemaleTalkSfx(int16 sound)
 
 	switch(sound) {
 	case SOUND_PED_HANDS_COWER:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_WHITE_CASUAL_FEMALE_1_HANDS_COWER_1,
-		          2u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_CASUAL_FEMALE_1_HANDS_COWER_1, 2u);
 		break;
 	case SOUND_PED_CAR_JACKED:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_WHITE_CASUAL_FEMALE_1_CAR_JACKED_1,
-		          2u);
-		break;
-	case SOUND_PED_ROBBED:
-		sfx = AUDIO_SAMPLE_PED_WHITE_CASUAL_FEMALE_1_ROBBED_1;
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_CASUAL_FEMALE_1_CAR_JACKED_1, 2u);
 		break;
+	case SOUND_PED_ROBBED: sfx = AUDIO_SAMPLE_PED_WHITE_CASUAL_FEMALE_1_ROBBED_1; break;
 	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_WHITE_CASUAL_FEMALE_1_EVADE_1, 3u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_CASUAL_FEMALE_1_EVADE_1, 3u);
 		break;
 	case SOUND_PED_FLEE_RUN:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_WHITE_CASUAL_FEMALE_1_FLEE_RUN_1,
-		          2u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_CASUAL_FEMALE_1_FLEE_RUN_1, 2u);
 		break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(
-		    &sfx, &lastSfx,
-		    AUDIO_SAMPLE_PED_WHITE_CASUAL_FEMALE_1_CAR_COLLISION_1, 8u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_CASUAL_FEMALE_1_CAR_COLLISION_1,
+		          8u);
 		break;
 	case SOUND_PED_CHAT_EVENT:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_WHITE_CASUAL_FEMALE_1_CHAT_EVENT_1,
-		          2u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_CASUAL_FEMALE_1_CHAT_EVENT_1, 2u);
 		break;
 	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_WHITE_CASUAL_FEMALE_1_CHAT_1, 4u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_CASUAL_FEMALE_1_CHAT_1, 4u);
 		break;
 	default: return GetGenericFemaleTalkSfx(sound);
 	}
@@ -1065,36 +1234,28 @@ cAudioManager::GetFemaleNo3TalkSfx(int16 sound)
 
 	switch(sound) {
 	case SOUND_PED_HANDS_COWER:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_FEMALE_NO_3_HANDS_COWER_1, 5u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_FEMALE_NO_3_HANDS_COWER_1, 5u);
 		break;
 	case SOUND_PED_CAR_JACKED:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_FEMALE_NO_3_CAR_JACKED_1, 3u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_FEMALE_NO_3_CAR_JACKED_1, 3u);
 		break;
 	case SOUND_PED_ROBBED:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_FEMALE_NO_3_ROBBED_1,
-		          3u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_FEMALE_NO_3_ROBBED_1, 3u);
 		break;
 	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_FEMALE_NO_3_EVADE_1,
-		          6u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_FEMALE_NO_3_EVADE_1, 6u);
 		break;
 	case SOUND_PED_FLEE_RUN:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_FEMALE_NO_3_FLEE_RUN_1, 4u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_FEMALE_NO_3_FLEE_RUN_1, 4u);
 		break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_FEMALE_NO_3_CAR_COLLISION_1, 6u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_FEMALE_NO_3_CAR_COLLISION_1, 6u);
 		break;
 	case SOUND_PED_CHAT_EVENT:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_FEMALE_NO_3_CHAT_EVENT_1, 4u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_FEMALE_NO_3_CHAT_EVENT_1, 4u);
 		break;
 	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_FEMALE_NO_3_CHAT_1,
-		          5u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_FEMALE_NO_3_CHAT_1, 5u);
 		break;
 	default: return GetGenericFemaleTalkSfx(sound);
 	}
@@ -1109,34 +1270,25 @@ cAudioManager::GetBlackFatFemaleTalkSfx(int16 sound)
 
 	switch(sound) {
 	case SOUND_PED_HANDS_COWER:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_BLACK_FAT_FEMALE_1_HANDS_COWER_1,
-		          4u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_FAT_FEMALE_1_HANDS_COWER_1, 4u);
 		break;
 	case SOUND_PED_CAR_JACKED:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_BLACK_FAT_FEMALE_1_CAR_JACKED_1, 2u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_FAT_FEMALE_1_CAR_JACKED_1, 2u);
 		break;
 	case SOUND_PED_ROBBED:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_BLACK_FAT_FEMALE_1_ROBBED_1, 2u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_FAT_FEMALE_1_ROBBED_1, 2u);
 		break;
 	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_BLACK_FAT_FEMALE_1_EVADE_1, 5u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_FAT_FEMALE_1_EVADE_1, 5u);
 		break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_BLACK_FAT_FEMALE_1_CAR_COLLISION_1,
-		          6u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_FAT_FEMALE_1_CAR_COLLISION_1, 6u);
 		break;
 	case SOUND_PED_CHAT_EVENT:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_BLACK_FAT_FEMALE_1_CHAT_EVENT_1, 5u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_FAT_FEMALE_1_CHAT_EVENT_1, 5u);
 		break;
 	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_BLACK_FAT_FEMALE_1_CHAT_1, 7u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_FAT_FEMALE_1_CHAT_1, 7u);
 		break;
 	default: return GetGenericFemaleTalkSfx(sound);
 	}
@@ -1151,34 +1303,26 @@ cAudioManager::GetWhiteFatFemaleTalkSfx(int16 sound)
 
 	switch(sound) {
 	case SOUND_PED_CAR_JACKED:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_WHITE_FAT_FEMALE_1_CAR_JACKED_1, 2u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_FAT_FEMALE_1_CAR_JACKED_1, 2u);
 		break;
 	case SOUND_PED_ROBBED:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_WHITE_FAT_FEMALE_1_ROBBED_1, 2u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_FAT_FEMALE_1_ROBBED_1, 2u);
 		break;
 	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_WHITE_FAT_FEMALE_1_EVADE_1, 6u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_FAT_FEMALE_1_EVADE_1, 6u);
 		break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_WHITE_FAT_FEMALE_1_CAR_COLLISION_1,
-		          8u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_FAT_FEMALE_1_CAR_COLLISION_1, 8u);
 		break;
 	case SOUND_PED_WAIT_DOUBLEBACK:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_WHITE_FAT_FEMALE_1_WAIT_DOUBLEBACK_1,
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_FAT_FEMALE_1_WAIT_DOUBLEBACK_1,
 		          2u);
 		break;
 	case SOUND_PED_CHAT_EVENT:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_WHITE_FAT_FEMALE_1_CHAT_EVENT_1, 4u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_FAT_FEMALE_1_CHAT_EVENT_1, 4u);
 		break;
 	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_WHITE_FAT_FEMALE_1_CHAT_1, 8u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_FAT_FEMALE_1_CHAT_1, 8u);
 		break;
 	default: return GetGenericFemaleTalkSfx(sound);
 	}
@@ -1193,38 +1337,25 @@ cAudioManager::GetBlackFemaleProstituteTalkSfx(int16 sound)
 
 	switch(sound) {
 	case SOUND_PED_HANDS_UP:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_BLACK_FEMALE_PROSTITUTE_1_HANDS_UP_1,
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_FEMALE_PROSTITUTE_1_HANDS_UP_1,
 		          4u);
 		break;
-	case SOUND_PED_ROBBED:
-		sfx = AUDIO_SAMPLE_PED_BLACK_FEMALE_PROSTITUTE_1_ROBBED_1;
-		break;
+	case SOUND_PED_ROBBED: sfx = AUDIO_SAMPLE_PED_BLACK_FEMALE_PROSTITUTE_1_ROBBED_1; break;
 	case SOUND_PED_ATTACK:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_BLACK_FEMALE_PROSTITUTE_1_ATTACK_1,
-		          4u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_FEMALE_PROSTITUTE_1_ATTACK_1, 4u);
 		break;
 	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_BLACK_FEMALE_PROSTITUTE_1_EVADE_1,
-		          3u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_FEMALE_PROSTITUTE_1_EVADE_1, 3u);
 		break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(
-		    &sfx, &lastSfx,
-		    AUDIO_SAMPLE_PED_BLACK_FEMALE_PROSTITUTE_1_CAR_COLLISION_1,
-		    4u);
+		GetPhrase(&sfx, &lastSfx,
+		          AUDIO_SAMPLE_PED_BLACK_FEMALE_PROSTITUTE_1_CAR_COLLISION_1, 4u);
 		break;
 	case SOUND_PED_SOLICIT:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_BLACK_FEMALE_PROSTITUTE_1_SOLICIT_1,
-		          8u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_FEMALE_PROSTITUTE_1_SOLICIT_1, 8u);
 		break;
 	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_BLACK_FEMALE_PROSTITUTE_1_CHAT_1,
-		          4u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_FEMALE_PROSTITUTE_1_CHAT_1, 4u);
 		break;
 	default: return GetGenericFemaleTalkSfx(sound);
 	}
@@ -1239,35 +1370,23 @@ cAudioManager::GetWhiteFemaleProstituteTalkSfx(int16 sound)
 
 	switch(sound) {
 	case SOUND_PED_ROBBED:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_WHITE_FEMALE_PROSTITUTE_1_ROBBED_1,
-		          2u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_FEMALE_PROSTITUTE_1_ROBBED_1, 2u);
 		break;
 	case SOUND_PED_ATTACK:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_WHITE_FEMALE_PROSTITUTE_1_ATTACK_1,
-		          4u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_FEMALE_PROSTITUTE_1_ATTACK_1, 4u);
 		break;
 	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_WHITE_FEMALE_PROSTITUTE_1_EVADE_1,
-		          3u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_FEMALE_PROSTITUTE_1_EVADE_1, 3u);
 		break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(
-		    &sfx, &lastSfx,
-		    AUDIO_SAMPLE_PED_WHITE_FEMALE_PROSTITUTE_1_CAR_COLLISION_1,
-		    4u);
+		GetPhrase(&sfx, &lastSfx,
+		          AUDIO_SAMPLE_PED_WHITE_FEMALE_PROSTITUTE_1_CAR_COLLISION_1, 4u);
 		break;
 	case SOUND_PED_SOLICIT:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_WHITE_FEMALE_PROSTITUTE_1_SOLICIT_1,
-		          8u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_FEMALE_PROSTITUTE_1_SOLICIT_1, 8u);
 		break;
 	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_WHITE_FEMALE_PROSTITUTE_1_CHAT_1,
-		          4u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_FEMALE_PROSTITUTE_1_CHAT_1, 4u);
 		break;
 	default: return GetGenericFemaleTalkSfx(sound);
 	}
@@ -1282,42 +1401,30 @@ cAudioManager::GetBlackProjectFemaleOldTalkSfx(int16 sound)
 
 	switch(sound) {
 	case SOUND_PED_CAR_JACKED:
-		GetPhrase(
-		    &sfx, &lastSfx,
-		    AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_OLD_1_CAR_JACKED_1,
-		    6u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_OLD_1_CAR_JACKED_1,
+		          6u);
 		break;
 	case SOUND_PED_ROBBED:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_OLD_1_ROBBED_1,
-		          2u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_OLD_1_ROBBED_1, 2u);
 		break;
 	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_OLD_1_EVADE_1,
-		          10u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_OLD_1_EVADE_1, 10u);
 		break;
 	case SOUND_PED_FLEE_RUN:
-		GetPhrase(
-		    &sfx, &lastSfx,
-		    AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_OLD_1_FLEE_RUN_1, 6u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_OLD_1_FLEE_RUN_1,
+		          6u);
 		break;
 	case SOUND_PED_CAR_COLLISION:
 		cAudioManager::GetPhrase(
-		    &sfx, &lastSfx,
-		    AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_OLD_1_CAR_COLLISION_1,
+		    &sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_OLD_1_CAR_COLLISION_1,
 		    7u);
 		break;
 	case SOUND_PED_CHAT_EVENT:
-		GetPhrase(
-		    &sfx, &lastSfx,
-		    AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_OLD_1_CHAT_EVENT_1,
-		    2u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_OLD_1_CHAT_EVENT_1,
+		          2u);
 		break;
 	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_OLD_1_CHAT_1,
-		          10u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_OLD_1_CHAT_1, 10u);
 		break;
 	default: return GetGenericFemaleTalkSfx(sound);
 	}
@@ -1333,40 +1440,31 @@ cAudioManager::GetBlackProjectFemaleYoungTalkSfx(int16 sound)
 	switch(sound) {
 	case SOUND_PED_HANDS_COWER:
 		cAudioManager::GetPhrase(
-		    &sfx, &lastSfx,
-		    AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_YOUNG_1_HANDS_COWER_1,
+		    &sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_YOUNG_1_HANDS_COWER_1,
 		    4u);
 		break;
 	case SOUND_PED_CAR_JACKED:
-		sfx =
-		    AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_YOUNG_1_CAR_JACKED_1;
+		sfx = AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_YOUNG_1_CAR_JACKED_1;
 		break;
 	case SOUND_PED_ROBBED:
-		GetPhrase(
-		    &sfx, &lastSfx,
-		    AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_YOUNG_1_ROBBED_1, 2u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_YOUNG_1_ROBBED_1,
+		          2u);
 		break;
 	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_YOUNG_1_EVADE_1,
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_YOUNG_1_EVADE_1,
 		          5u);
 		break;
 	case SOUND_PED_CAR_COLLISION:
 		cAudioManager::GetPhrase(
-		    &sfx, &lastSfx,
-		    AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_YOUNG_1_CAR_COLLISION_1,
+		    &sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_YOUNG_1_CAR_COLLISION_1,
 		    6u);
 		break;
 	case SOUND_PED_CHAT_EVENT:
-		GetPhrase(
-		    &sfx, &lastSfx,
-		    AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_YOUNG_1_CHAT_EVENT_1,
-		    5u);
+		GetPhrase(&sfx, &lastSfx,
+		          AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_YOUNG_1_CHAT_EVENT_1, 5u);
 		break;
 	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_YOUNG_1_CHAT_1,
-		          7u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_YOUNG_1_CHAT_1, 7u);
 		break;
 	default: return GetGenericFemaleTalkSfx(sound);
 	}
@@ -1381,34 +1479,25 @@ cAudioManager::GetChinatownMaleOldTalkSfx(int16 sound)
 
 	switch(sound) {
 	case SOUND_PED_HANDS_COWER:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_CHINATOWN_MALE_OLD_HANDS_COWER_1,
-		          3u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_CHINATOWN_MALE_OLD_HANDS_COWER_1, 3u);
 		break;
 	case SOUND_PED_CAR_JACKED:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_CHINATOWN_MALE_OLD_CAR_JACKED_1, 2u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_CHINATOWN_MALE_OLD_CAR_JACKED_1, 2u);
 		break;
 	case SOUND_PED_ATTACK:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_CHINATOWN_MALE_OLD_ATTACK_1, 5u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_CHINATOWN_MALE_OLD_ATTACK_1, 5u);
 		break;
 	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_CHINATOWN_MALE_OLD_EVADE_1, 6u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_CHINATOWN_MALE_OLD_EVADE_1, 6u);
 		break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_CHINATOWN_MALE_OLD_CAR_COLLISION_1,
-		          6u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_CHINATOWN_MALE_OLD_CAR_COLLISION_1, 6u);
 		break;
 	case SOUND_PED_CHAT_SEXY:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_CHINATOWN_MALE_OLD_CHAT_SEXY_1, 3u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_CHINATOWN_MALE_OLD_CHAT_SEXY_1, 3u);
 		break;
 	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_CHINATOWN_MALE_OLD_CHAT_1, 7u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_CHINATOWN_MALE_OLD_CHAT_1, 7u);
 		break;
 	default: return GetGenericMaleTalkSfx(sound);
 	}
@@ -1423,36 +1512,26 @@ cAudioManager::GetChinatownMaleYoungTalkSfx(int16 sound)
 
 	switch(sound) {
 	case SOUND_PED_HANDS_COWER:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_CHINATOWN_MALE_YOUNG_HANDS_COWER_1,
-		          2u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_CHINATOWN_MALE_YOUNG_HANDS_COWER_1, 2u);
 		break;
 	case SOUND_PED_CAR_JACKED:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_CHINATOWN_MALE_YOUNG_CAR_JACKED_1,
-		          2u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_CHINATOWN_MALE_YOUNG_CAR_JACKED_1, 2u);
 		break;
 	case SOUND_PED_ATTACK:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_CHINATOWN_MALE_YOUNG_ATTACK_1, 6u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_CHINATOWN_MALE_YOUNG_ATTACK_1, 6u);
 		break;
 	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_CHINATOWN_MALE_YOUNG_EVADE_1, 5u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_CHINATOWN_MALE_YOUNG_EVADE_1, 5u);
 		break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_CHINATOWN_MALE_YOUNG_CAR_COLLISION_1,
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_CHINATOWN_MALE_YOUNG_CAR_COLLISION_1,
 		          6u);
 		break;
 	case SOUND_PED_CHAT_SEXY:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_CHINATOWN_MALE_YOUNG_CHAT_SEXY_1,
-		          3u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_CHINATOWN_MALE_YOUNG_CHAT_SEXY_1, 3u);
 		break;
 	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_CHINATOWN_MALE_YOUNG_CHAT_1, 6u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_CHINATOWN_MALE_YOUNG_CHAT_1, 6u);
 		break;
 	default: return GetGenericMaleTalkSfx(sound);
 	}
@@ -1467,29 +1546,21 @@ cAudioManager::GetChinatownFemaleOldTalkSfx(int16 sound)
 
 	switch(sound) {
 	case SOUND_PED_HANDS_COWER:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_CHINATOWN_FEMALE_OLD_HANDS_COWER_1,
-		          3u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_CHINATOWN_FEMALE_OLD_HANDS_COWER_1, 3u);
 		break;
 	case SOUND_PED_ROBBED:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_CHINATOWN_FEMALE_OLD_ROBBED_1, 2u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_CHINATOWN_FEMALE_OLD_ROBBED_1, 2u);
 		break;
 	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_CHINATOWN_FEMALE_OLD_EVADE_1, 5u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_CHINATOWN_FEMALE_OLD_EVADE_1, 5u);
 		break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_CHINATOWN_FEMALE_OLD_CAR_COLLISION_1,
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_CHINATOWN_FEMALE_OLD_CAR_COLLISION_1,
 		          5u);
 		break;
-	case SOUND_PED_CHAT_EVENT:
-		sfx = AUDIO_SAMPLE_PED_CHINATOWN_FEMALE_OLD_CHAT_EVENT_1;
-		break;
+	case SOUND_PED_CHAT_EVENT: sfx = AUDIO_SAMPLE_PED_CHINATOWN_FEMALE_OLD_CHAT_EVENT_1; break;
 	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_CHINATOWN_FEMALE_OLD_CHAT_1, 6u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_CHINATOWN_FEMALE_OLD_CHAT_1, 6u);
 		break;
 	default: return GetGenericFemaleTalkSfx(sound);
 	}
@@ -1504,32 +1575,23 @@ cAudioManager::GetChinatownFemaleYoungTalkSfx(int16 sound)
 
 	switch(sound) {
 	case SOUND_PED_CAR_JACKED:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_CHINATOWN_FEMALE_YOUNG_CAR_JACKED_1,
-		          2u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_CHINATOWN_FEMALE_YOUNG_CAR_JACKED_1, 2u);
 		break;
 	case SOUND_PED_ROBBED:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_CHINATOWN_FEMALE_YOUNG_ROBBED_1, 2u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_CHINATOWN_FEMALE_YOUNG_ROBBED_1, 2u);
 		break;
 	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_CHINATOWN_FEMALE_YOUNG_EVADE_1, 6u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_CHINATOWN_FEMALE_YOUNG_EVADE_1, 6u);
 		break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(
-		    &sfx, &lastSfx,
-		    AUDIO_SAMPLE_PED_CHINATOWN_FEMALE_YOUNG_CAR_COLLISION_1,
-		    7u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_CHINATOWN_FEMALE_YOUNG_CAR_COLLISION_1,
+		          7u);
 		break;
 	case SOUND_PED_CHAT_EVENT:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_CHINATOWN_FEMALE_YOUNG_CHAT_EVENT_1,
-		          4u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_CHINATOWN_FEMALE_YOUNG_CHAT_EVENT_1, 4u);
 		break;
 	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_CHINATOWN_FEMALE_YOUNG_CHAT_1, 7u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_CHINATOWN_FEMALE_YOUNG_CHAT_1, 7u);
 		break;
 	default: return GetGenericFemaleTalkSfx(sound);
 	}
@@ -1544,35 +1606,25 @@ cAudioManager::GetLittleItalyMaleTalkSfx(int16 sound)
 
 	switch(sound) {
 	case SOUND_PED_HANDS_COWER:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_LITTLE_ITALY_MALE_1_HANDS_COWER_1,
-		          3u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_LITTLE_ITALY_MALE_1_HANDS_COWER_1, 3u);
 		break;
 	case SOUND_PED_CAR_JACKED:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_LITTLE_ITALY_MALE_1_CAR_JACKED_1,
-		          2u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_LITTLE_ITALY_MALE_1_CAR_JACKED_1, 2u);
 		break;
 	case SOUND_PED_ROBBED:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_LITTLE_ITALY_MALE_1_ROBBED_1, 2u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_LITTLE_ITALY_MALE_1_ROBBED_1, 2u);
 		break;
 	case SOUND_PED_ATTACK:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_LITTLE_ITALY_MALE_1_ATTACK_1, 5u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_LITTLE_ITALY_MALE_1_ATTACK_1, 5u);
 		break;
 	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_LITTLE_ITALY_MALE_1_EVADE_1, 5u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_LITTLE_ITALY_MALE_1_EVADE_1, 5u);
 		break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_LITTLE_ITALY_MALE_1_CAR_COLLISION_1,
-		          7u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_LITTLE_ITALY_MALE_1_CAR_COLLISION_1, 7u);
 		break;
 	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_LITTLE_ITALY_MALE_1_CHAT_1, 6u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_LITTLE_ITALY_MALE_1_CHAT_1, 6u);
 		break;
 	default: return GetGenericMaleTalkSfx(sound);
 	}
@@ -1587,33 +1639,25 @@ cAudioManager::GetLittleItalyFemaleOldTalkSfx(int16 sound)
 
 	switch(sound) {
 	case SOUND_PED_CAR_JACKED:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_OLD_CAR_JACKED_1,
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_OLD_CAR_JACKED_1,
 		          2u);
 		break;
 	case SOUND_PED_ROBBED:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_OLD_ROBBED_1,
-		          2u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_OLD_ROBBED_1, 2u);
 		break;
 	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_OLD_EVADE_1, 6u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_OLD_EVADE_1, 6u);
 		break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(
-		    &sfx, &lastSfx,
-		    AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_OLD_CAR_COLLISION_1,
-		    7u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_OLD_CAR_COLLISION_1,
+		          7u);
 		break;
 	case SOUND_PED_CHAT_EVENT:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_OLD_CHAT_EVENT_1,
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_OLD_CHAT_EVENT_1,
 		          4u);
 		break;
 	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_OLD_CHAT_1, 7u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_OLD_CHAT_1, 7u);
 		break;
 	default: return GetGenericFemaleTalkSfx(sound);
 	}
@@ -1628,37 +1672,25 @@ cAudioManager::GetLittleItalyFemaleYoungTalkSfx(int16 sound)
 
 	switch(sound) {
 	case SOUND_PED_CAR_JACKED:
-		GetPhrase(
-		    &sfx, &lastSfx,
-		    AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_YOUNG_CAR_JACKED_1,
-		    2u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_YOUNG_CAR_JACKED_1,
+		          2u);
 		break;
 	case SOUND_PED_ROBBED:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_YOUNG_ROBBED_1,
-		          2u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_YOUNG_ROBBED_1, 2u);
 		break;
 	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_YOUNG_EVADE_1,
-		          7u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_YOUNG_EVADE_1, 7u);
 		break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(
-		    &sfx, &lastSfx,
-		    AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_YOUNG_CAR_COLLISION_1,
-		    6u);
+		GetPhrase(&sfx, &lastSfx,
+		          AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_YOUNG_CAR_COLLISION_1, 6u);
 		break;
 	case SOUND_PED_CHAT_EVENT:
-		GetPhrase(
-		    &sfx, &lastSfx,
-		    AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_YOUNG_CHAT_EVENT_1,
-		    4u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_YOUNG_CHAT_EVENT_1,
+		          4u);
 		break;
 	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_YOUNG_CHAT_1,
-		          6u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_YOUNG_CHAT_1, 6u);
 		break;
 	default: return GetGenericFemaleTalkSfx(sound);
 	}
@@ -1673,29 +1705,22 @@ cAudioManager::GetWhiteDockerMaleTalkSfx(int16 sound)
 
 	switch(sound) {
 	case SOUND_PED_HANDS_COWER:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_WHITE_DOCKER_MALE_HANDS_COWER_1, 2u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_DOCKER_MALE_HANDS_COWER_1, 2u);
 		break;
 	case SOUND_PED_ATTACK:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_WHITE_DOCKER_MALE_ATTACK_1, 3u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_DOCKER_MALE_ATTACK_1, 3u);
 		break;
 	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_WHITE_DOCKER_MALE_EVADE_1, 4u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_DOCKER_MALE_EVADE_1, 4u);
 		break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_WHITE_DOCKER_MALE_CAR_COLLISION_1,
-		          4u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_DOCKER_MALE_CAR_COLLISION_1, 4u);
 		break;
 	case SOUND_PED_CHAT_SEXY:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_WHITE_DOCKER_MALE_CHAT_SEXY_1, 3u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_DOCKER_MALE_CHAT_SEXY_1, 3u);
 		break;
 	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_WHITE_DOCKER_MALE_CHAT_1, 5u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_DOCKER_MALE_CHAT_1, 5u);
 		break;
 	default: return GetGenericMaleTalkSfx(sound);
 	}
@@ -1710,29 +1735,22 @@ cAudioManager::GetBlackDockerMaleTalkSfx(int16 sound)
 
 	switch(sound) {
 	case SOUND_PED_HANDS_COWER:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_BLACK_DOCKER_MALE_HANDS_COWER_1, 3u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_DOCKER_MALE_HANDS_COWER_1, 3u);
 		break;
 	case SOUND_PED_ATTACK:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_BLACK_DOCKER_MALE_ATTACK_1, 5u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_DOCKER_MALE_ATTACK_1, 5u);
 		break;
 	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_BLACK_DOCKER_MALE_EVADE_1, 5u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_DOCKER_MALE_EVADE_1, 5u);
 		break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_BLACK_DOCKER_MALE_CAR_COLLISION_1,
-		          6u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_DOCKER_MALE_CAR_COLLISION_1, 6u);
 		break;
 	case SOUND_PED_CHAT_SEXY:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_BLACK_DOCKER_MALE_CHAT_SEXY_1, 3u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_DOCKER_MALE_CHAT_SEXY_1, 3u);
 		break;
 	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_BLACK_DOCKER_MALE_CHAT_1, 5u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_DOCKER_MALE_CHAT_1, 5u);
 		break;
 	default: return GetGenericMaleTalkSfx(sound);
 	}
@@ -1747,33 +1765,26 @@ cAudioManager::GetScumMaleTalkSfx(int16 sound)
 
 	switch(sound) {
 	case SOUND_PED_HANDS_COWER:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_SCUM_MALE_HANDS_COWER_1, 5u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SCUM_MALE_HANDS_COWER_1, 5u);
 		break;
 	case SOUND_PED_ROBBED: sfx = AUDIO_SAMPLE_PED_SCUM_MALE_ROBBED_1; break;
 	case SOUND_PED_ATTACK:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SCUM_MALE_ATTACK_1,
-		          0xAu);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SCUM_MALE_ATTACK_1, 0xAu);
 		break;
 	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SCUM_MALE_EVADE_1,
-		          5u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SCUM_MALE_EVADE_1, 5u);
 		break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_SCUM_MALE_CAR_COLLISION_1, 6u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SCUM_MALE_CAR_COLLISION_1, 6u);
 		break;
 	case SOUND_PED_WAIT_DOUBLEBACK:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_SCUM_MALE_WAIT_DOUBLEBACK_1, 3u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SCUM_MALE_WAIT_DOUBLEBACK_1, 3u);
 		break;
 	case SOUND_PED_CHAT_SEXY:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_SCUM_MALE_CHAT_SEXY_1, 5u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SCUM_MALE_CHAT_SEXY_1, 5u);
 		break;
 	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SCUM_MALE_CHAT_1,
-		          9u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SCUM_MALE_CHAT_1, 9u);
 		break;
 	default: return GetGenericMaleTalkSfx(sound);
 	}
@@ -1788,28 +1799,22 @@ cAudioManager::GetScumFemaleTalkSfx(int16 sound)
 
 	switch(sound) {
 	case SOUND_PED_HANDS_COWER:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_SCUM_FEMALE_HANDS_COWER_1, 4u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SCUM_FEMALE_HANDS_COWER_1, 4u);
 		break;
 	case SOUND_PED_ROBBED:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SCUM_FEMALE_ROBBED_1,
-		          2u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SCUM_FEMALE_ROBBED_1, 2u);
 		break;
 	case SOUND_PED_ATTACK:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SCUM_FEMALE_ATTACK_1,
-		          4u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SCUM_FEMALE_ATTACK_1, 4u);
 		break;
 	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SCUM_FEMALE_EVADE_1,
-		          8u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SCUM_FEMALE_EVADE_1, 8u);
 		break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_SCUM_FEMALE_CAR_COLLISION_1, 5u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SCUM_FEMALE_CAR_COLLISION_1, 5u);
 		break;
 	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SCUM_FEMALE_CHAT_1,
-		          13u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SCUM_FEMALE_CHAT_1, 13u);
 		break;
 	default: return GetGenericFemaleTalkSfx(sound);
 	}
@@ -1824,29 +1829,22 @@ cAudioManager::GetWhiteWorkerMaleTalkSfx(int16 sound)
 
 	switch(sound) {
 	case SOUND_PED_HANDS_COWER:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_WHITE_WORKER_MALE_HANDS_COWER_1, 3u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_WORKER_MALE_HANDS_COWER_1, 3u);
 		break;
 	case SOUND_PED_ATTACK:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_WHITE_WORKER_MALE_ATTACK_1, 3u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_WORKER_MALE_ATTACK_1, 3u);
 		break;
 	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_WHITE_WORKER_MALE_EVADE_1, 4u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_WORKER_MALE_EVADE_1, 4u);
 		break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_WHITE_WORKER_MALE_CAR_COLLISION_1,
-		          6u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_WORKER_MALE_CAR_COLLISION_1, 6u);
 		break;
 	case SOUND_PED_CHAT_SEXY:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_WHITE_WORKER_MALE_CHAT_SEXY_1, 2u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_WORKER_MALE_CHAT_SEXY_1, 2u);
 		break;
 	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_WHITE_WORKER_MALE_CHAT_1, 6u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_WORKER_MALE_CHAT_1, 6u);
 		break;
 	default: return GetGenericMaleTalkSfx(sound);
 	}
@@ -1861,29 +1859,22 @@ cAudioManager::GetBlackWorkerMaleTalkSfx(int16 sound)
 
 	switch(sound) {
 	case SOUND_PED_HANDS_COWER:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_BLACK_WORKER_MALE_HANDS_COWER_1, 4u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_WORKER_MALE_HANDS_COWER_1, 4u);
 		break;
 	case SOUND_PED_ATTACK:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_BLACK_WORKER_MALE_ATTACK_1, 3u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_WORKER_MALE_ATTACK_1, 3u);
 		break;
 	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_BLACK_WORKER_MALE_EVADE_1, 3u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_WORKER_MALE_EVADE_1, 3u);
 		break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_BLACK_WORKER_MALE_CAR_COLLISION_1,
-		          4u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_WORKER_MALE_CAR_COLLISION_1, 4u);
 		break;
 	case SOUND_PED_CHAT_SEXY:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_BLACK_WORKER_MALE_CHAT_SEXY_1, 3u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_WORKER_MALE_CHAT_SEXY_1, 3u);
 		break;
 	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_BLACK_WORKER_MALE_CHAT_1, 4u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_WORKER_MALE_CHAT_1, 4u);
 
 		break;
 	default: return GetGenericMaleTalkSfx(sound);
@@ -1899,40 +1890,29 @@ cAudioManager::GetBusinessMaleYoungTalkSfx(int16 sound, int32 model)
 
 	switch(sound) {
 	case SOUND_PED_HANDS_COWER:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_BUSINESS_MALE_YOUNG_1_HANDS_COWER_1,
-		          3u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BUSINESS_MALE_YOUNG_1_HANDS_COWER_1, 3u);
 		break;
 	case SOUND_PED_CAR_JACKED:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_BUSINESS_MALE_YOUNG_1_CAR_JACKED_1,
-		          2u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BUSINESS_MALE_YOUNG_1_CAR_JACKED_1, 2u);
 		break;
 	case SOUND_PED_ROBBED:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_BUSINESS_MALE_YOUNG_1_ROBBED_1, 2u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BUSINESS_MALE_YOUNG_1_ROBBED_1, 2u);
 		break;
 	case SOUND_PED_ATTACK:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_BUSINESS_MALE_YOUNG_1_ATTACK_1, 4u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BUSINESS_MALE_YOUNG_1_ATTACK_1, 4u);
 		break;
 	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_BUSINESS_MALE_YOUNG_1_EVADE_1, 4u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BUSINESS_MALE_YOUNG_1_EVADE_1, 4u);
 		break;
 	case SOUND_PED_FLEE_RUN:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_BUSINESS_MALE_YOUNG_1_FLEE_RUN_1,
-		          5u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BUSINESS_MALE_YOUNG_1_FLEE_RUN_1, 5u);
 		break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(
-		    &sfx, &lastSfx,
-		    AUDIO_SAMPLE_PED_BUSINESS_MALE_YOUNG_1_CAR_COLLISION_1, 6u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BUSINESS_MALE_YOUNG_1_CAR_COLLISION_1,
+		          6u);
 		break;
 	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_BUSINESS_MALE_YOUNG_1_CHAT_1, 6u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BUSINESS_MALE_YOUNG_1_CHAT_1, 6u);
 		break;
 	default: return GetGenericMaleTalkSfx(sound);
 	}
@@ -1949,39 +1929,28 @@ cAudioManager::GetBusinessMaleOldTalkSfx(int16 sound)
 
 	switch(sound) {
 	case SOUND_PED_HANDS_COWER:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_BUSINESS_MALE_OLD_1_HANDS_COWER_1,
-		          3u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BUSINESS_MALE_OLD_1_HANDS_COWER_1, 3u);
 		break;
 	case SOUND_PED_CAR_JACKED:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_BUSINESS_MALE_OLD_1_CAR_JACKED_1,
-		          2u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BUSINESS_MALE_OLD_1_CAR_JACKED_1, 2u);
 		break;
 	case SOUND_PED_ROBBED:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_BUSINESS_MALE_OLD_1_ROBBED_1, 2u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BUSINESS_MALE_OLD_1_ROBBED_1, 2u);
 		break;
 	case SOUND_PED_ATTACK:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_BUSINESS_MALE_OLD_1_ATTACK_1, 5u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BUSINESS_MALE_OLD_1_ATTACK_1, 5u);
 		break;
 	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_BUSINESS_MALE_OLD_1_EVADE_1, 4u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BUSINESS_MALE_OLD_1_EVADE_1, 4u);
 		break;
 	case SOUND_PED_FLEE_RUN:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_BUSINESS_MALE_OLD_1_FLEE_RUN_1, 5u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BUSINESS_MALE_OLD_1_FLEE_RUN_1, 5u);
 		break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_BUSINESS_MALE_OLD_1_CAR_COLLISION_1,
-		          5u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BUSINESS_MALE_OLD_1_CAR_COLLISION_1, 5u);
 		break;
 	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_BUSINESS_MALE_OLD_1_CHAT_1, 5u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BUSINESS_MALE_OLD_1_CHAT_1, 5u);
 
 		break;
 	default: return GetGenericMaleTalkSfx(sound);
@@ -1997,37 +1966,28 @@ cAudioManager::GetWhiteBusinessFemaleTalkSfx(int16 sound, int32 model)
 
 	switch(sound) {
 	case SOUND_PED_HANDS_COWER:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_BUSINESS_WOMAN_1_HANDS_COWER_1, 4u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BUSINESS_WOMAN_1_HANDS_COWER_1, 4u);
 		break;
 	case SOUND_PED_CAR_JACKED:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_BUSINESS_WOMAN_1_CAR_JACKED_1, 2u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BUSINESS_WOMAN_1_CAR_JACKED_1, 2u);
 		break;
 	case SOUND_PED_ROBBED:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_BUSINESS_WOMAN_1_ROBBED_1, 2u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BUSINESS_WOMAN_1_ROBBED_1, 2u);
 		break;
 	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_BUSINESS_WOMAN_1_EVADE_1, 6u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BUSINESS_WOMAN_1_EVADE_1, 6u);
 		break;
 	case SOUND_PED_FLEE_RUN:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_BUSINESS_WOMAN_1_FLEE_RUN_1, 4u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BUSINESS_WOMAN_1_FLEE_RUN_1, 4u);
 		break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_BUSINESS_WOMAN_1_CAR_COLLISION_1,
-		          5u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BUSINESS_WOMAN_1_CAR_COLLISION_1, 5u);
 		break;
 	case SOUND_PED_CHAT_EVENT:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_BUSINESS_WOMAN_1_CHAT_EVENT_1, 4u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BUSINESS_WOMAN_1_CHAT_EVENT_1, 4u);
 		break;
 	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_BUSINESS_WOMAN_1_CHAT_1, 7u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BUSINESS_WOMAN_1_CHAT_1, 7u);
 		break;
 	default: return GetGenericFemaleTalkSfx(sound);
 	}
@@ -2044,41 +2004,29 @@ cAudioManager::GetBlackBusinessFemaleTalkSfx(int16 sound)
 
 	switch(sound) {
 	case SOUND_PED_HANDS_COWER:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_BLACK_BUSINESS_FEMALE_HANDS_COWER_1,
-		          5u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_BUSINESS_FEMALE_HANDS_COWER_1, 5u);
 		break;
 	case SOUND_PED_CAR_JACKED:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_BLACK_BUSINESS_FEMALE_CAR_JACKED_1,
-		          4u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_BUSINESS_FEMALE_CAR_JACKED_1, 4u);
 		break;
 	case SOUND_PED_ROBBED:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_BLACK_BUSINESS_FEMALE_ROBBED_1, 3u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_BUSINESS_FEMALE_ROBBED_1, 3u);
 		break;
 	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_BLACK_BUSINESS_FEMALE_EVADE_1, 6u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_BUSINESS_FEMALE_EVADE_1, 6u);
 		break;
 	case SOUND_PED_FLEE_RUN:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_BLACK_BUSINESS_FEMALE_FLEE_RUN_1,
-		          6u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_BUSINESS_FEMALE_FLEE_RUN_1, 6u);
 		break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(
-		    &sfx, &lastSfx,
-		    AUDIO_SAMPLE_PED_BLACK_BUSINESS_FEMALE_CAR_COLLISION_1, 7u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_BUSINESS_FEMALE_CAR_COLLISION_1,
+		          7u);
 		break;
 	case SOUND_PED_CHAT_EVENT:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_BLACK_BUSINESS_FEMALE_CHAT_EVENT_1,
-		          4u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_BUSINESS_FEMALE_CHAT_EVENT_1, 4u);
 		break;
 	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_BLACK_BUSINESS_FEMALE_CHAT_1, 7u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_BUSINESS_FEMALE_CHAT_1, 7u);
 
 		break;
 	default: return GetGenericFemaleTalkSfx(sound);
@@ -2094,32 +2042,25 @@ cAudioManager::GetSupermodelMaleTalkSfx(int16 sound)
 
 	switch(sound) {
 	case SOUND_PED_CAR_JACKED:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_SUPERMODEL_MALE_CAR_JACKED_1, 2u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SUPERMODEL_MALE_CAR_JACKED_1, 2u);
 		break;
 	case SOUND_PED_ROBBED:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_SUPERMODEL_MALE_ROBBED_1, 2u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SUPERMODEL_MALE_ROBBED_1, 2u);
 		break;
 	case SOUND_PED_ATTACK:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_SUPERMODEL_MALE_ATTACK_1, 5u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SUPERMODEL_MALE_ATTACK_1, 5u);
 		break;
 	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_SUPERMODEL_MALE_EVADE_1, 6u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SUPERMODEL_MALE_EVADE_1, 6u);
 		break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_SUPERMODEL_MALE_CAR_COLLISION_1, 6u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SUPERMODEL_MALE_CAR_COLLISION_1, 6u);
 		break;
 	case SOUND_PED_CHAT_SEXY:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_SUPERMODEL_MALE_CHAT_SEXY_1, 3u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SUPERMODEL_MALE_CHAT_SEXY_1, 3u);
 		break;
 	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_SUPERMODEL_MALE_CHAT_1, 6u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SUPERMODEL_MALE_CHAT_1, 6u);
 
 		break;
 	default: return GetGenericMaleTalkSfx(sound);
@@ -2135,29 +2076,22 @@ cAudioManager::GetSupermodelFemaleTalkSfx(int16 sound)
 
 	switch(sound) {
 	case SOUND_PED_HANDS_COWER:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_SUPERMODEL_FEMALE_HANDS_COWER_1, 4u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SUPERMODEL_FEMALE_HANDS_COWER_1, 4u);
 		break;
 	case SOUND_PED_ROBBED:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_SUPERMODEL_FEMALE_ROBBED_1, 3u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SUPERMODEL_FEMALE_ROBBED_1, 3u);
 		break;
 	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_SUPERMODEL_FEMALE_EVADE_1, 4u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SUPERMODEL_FEMALE_EVADE_1, 4u);
 		break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_SUPERMODEL_FEMALE_CAR_COLLISION_1,
-		          7u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SUPERMODEL_FEMALE_CAR_COLLISION_1, 7u);
 		break;
 	case SOUND_PED_CHAT_EVENT:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_SUPERMODEL_FEMALE_CHAT_EVENT_1, 5u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SUPERMODEL_FEMALE_CHAT_EVENT_1, 5u);
 		break;
 	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_SUPERMODEL_FEMALE_CHAT_1, 8u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SUPERMODEL_FEMALE_CHAT_1, 8u);
 
 		break;
 	default: return GetGenericFemaleTalkSfx(sound);
@@ -2173,24 +2107,19 @@ cAudioManager::GetStewardMaleTalkSfx(int16 sound)
 
 	switch(sound) {
 	case SOUND_PED_HANDS_COWER:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_STEWARD_MALE_HANDS_COWER_1, 3u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_STEWARD_MALE_HANDS_COWER_1, 3u);
 		break;
 	case SOUND_PED_ATTACK:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_STEWARD_MALE_ATTACK_1, 4u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_STEWARD_MALE_ATTACK_1, 4u);
 		break;
 	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_STEWARD_MALE_EVADE_1,
-		          3u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_STEWARD_MALE_EVADE_1, 3u);
 		break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_STEWARD_MALE_CAR_COLLISION_1, 5u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_STEWARD_MALE_CAR_COLLISION_1, 5u);
 		break;
 	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_STEWARD_MALE_CHAT_1,
-		          4u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_STEWARD_MALE_CHAT_1, 4u);
 
 		break;
 	default: return GetGenericMaleTalkSfx(sound);
@@ -2206,21 +2135,16 @@ cAudioManager::GetStewardFemaleTalkSfx(int16 sound)
 
 	switch(sound) {
 	case SOUND_PED_HANDS_COWER:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_STEWARD_FEMALE_1_HANDS_COWER_1, 3u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_STEWARD_FEMALE_1_HANDS_COWER_1, 3u);
 		break;
 	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_STEWARD_FEMALE_1_EVADE_1, 5u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_STEWARD_FEMALE_1_EVADE_1, 5u);
 		break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_STEWARD_FEMALE_1_CAR_COLLISION_1,
-		          5u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_STEWARD_FEMALE_1_CAR_COLLISION_1, 5u);
 		break;
 	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_STEWARD_FEMALE_1_CHAT_1, 5u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_STEWARD_FEMALE_1_CHAT_1, 5u);
 		break;
 	default: return GetGenericFemaleTalkSfx(sound);
 	}
@@ -2235,24 +2159,19 @@ cAudioManager::GetFanMaleTalkSfx(int16 sound, int32 model)
 
 	switch(sound) {
 	case SOUND_PED_ATTACK:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_FAN_MALE_1_ATTACK_1,
-		          3u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_FAN_MALE_1_ATTACK_1, 3u);
 		break;
 	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_FAN_MALE_1_EVADE_1,
-		          4u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_FAN_MALE_1_EVADE_1, 4u);
 		break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_FAN_MALE_1_CAR_COLLISION_1, 5u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_FAN_MALE_1_CAR_COLLISION_1, 5u);
 		break;
 	case SOUND_PED_CHAT_EVENT:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_FAN_MALE_1_CHAT_EVENT_1, 2u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_FAN_MALE_1_CHAT_EVENT_1, 2u);
 		break;
 	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_FAN_MALE_1_CHAT_1,
-		          6u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_FAN_MALE_1_CHAT_1, 6u);
 		break;
 	default: return GetGenericMaleTalkSfx(sound);
 	}
@@ -2268,24 +2187,18 @@ cAudioManager::GetFanFemaleTalkSfx(int16 sound)
 	static uint32 lastSfx = NO_SAMPLE;
 
 	switch(sound) {
-	case SOUND_PED_ROBBED:
-		sfx = AUDIO_SAMPLE_PED_FAN_FEMALE_1_ROBBED_1;
-		break;
+	case SOUND_PED_ROBBED: sfx = AUDIO_SAMPLE_PED_FAN_FEMALE_1_ROBBED_1; break;
 	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_FAN_FEMALE_1_EVADE_1,
-		          4u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_FAN_FEMALE_1_EVADE_1, 4u);
 		break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_FAN_FEMALE_1_CAR_COLLISION_1, 5u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_FAN_FEMALE_1_CAR_COLLISION_1, 5u);
 		break;
 	case SOUND_PED_CHAT_EVENT:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_FAN_FEMALE_1_CHAT_EVENT_1, 2u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_FAN_FEMALE_1_CHAT_EVENT_1, 2u);
 		break;
 	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_FAN_FEMALE_1_CHAT_1,
-		          6u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_FAN_FEMALE_1_CHAT_1, 6u);
 		break;
 	default: return GetGenericFemaleTalkSfx(sound);
 	}
@@ -2300,24 +2213,19 @@ cAudioManager::GetHospitalMaleTalkSfx(int16 sound)
 
 	switch(sound) {
 	case SOUND_PED_HANDS_COWER:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_HOSPITAL_MALE_HANDS_COWER_1, 4u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_HOSPITAL_MALE_HANDS_COWER_1, 4u);
 		break;
 	case SOUND_PED_ATTACK:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_HOSPITAL_MALE_ATTACK_1, 4u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_HOSPITAL_MALE_ATTACK_1, 4u);
 		break;
 	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_HOSPITAL_MALE_EVADE_1, 4u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_HOSPITAL_MALE_EVADE_1, 4u);
 		break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_HOSPITAL_MALE_CAR_COLLISION_1, 5u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_HOSPITAL_MALE_CAR_COLLISION_1, 5u);
 		break;
 	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_HOSPITAL_MALE_CHAT_1,
-		          5u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_HOSPITAL_MALE_CHAT_1, 5u);
 		break;
 	default: return GetGenericMaleTalkSfx(sound);
 	}
@@ -2332,16 +2240,13 @@ cAudioManager::GetHospitalFemaleTalkSfx(int16 sound)
 
 	switch(sound) {
 	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_HOSPITAL_FEMALE_EVADE_1, 5u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_HOSPITAL_FEMALE_EVADE_1, 5u);
 		break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_HOSPITAL_FEMALE_CAR_COLLISION_1, 6u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_HOSPITAL_FEMALE_CAR_COLLISION_1, 6u);
 		break;
 	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_HOSPITAL_FEMALE_CHAT_1, 6u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_HOSPITAL_FEMALE_CHAT_1, 6u);
 
 		break;
 	default: return GetGenericFemaleTalkSfx(sound);
@@ -2357,39 +2262,28 @@ cAudioManager::GetWhiteConstructionWorkerTalkSfx(int16 sound)
 
 	switch(sound) {
 	case SOUND_PED_HANDS_COWER:
-		GetPhrase(
-		    &sfx, &lastSfx,
-		    AUDIO_SAMPLE_PED_WHITE_CONSTRUCTION_WORKER_HANDS_COWER_1,
-		    3u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_CONSTRUCTION_WORKER_HANDS_COWER_1,
+		          3u);
 		break;
 	case SOUND_PED_CAR_JACKED:
 		sfx = AUDIO_SAMPLE_PED_WHITE_CONSTRUCTION_WORKER_CAR_JACKED_1;
 		break;
 	case SOUND_PED_ATTACK:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_WHITE_CONSTRUCTION_WORKER_ATTACK_1,
-		          5u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_CONSTRUCTION_WORKER_ATTACK_1, 5u);
 		break;
 	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_WHITE_CONSTRUCTION_WORKER_EVADE_1,
-		          5u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_CONSTRUCTION_WORKER_EVADE_1, 5u);
 		break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(
-		    &sfx, &lastSfx,
-		    AUDIO_SAMPLE_PED_WHITE_CONSTRUCTION_WORKER_CAR_COLLISION_1,
-		    4u);
+		GetPhrase(&sfx, &lastSfx,
+		          AUDIO_SAMPLE_PED_WHITE_CONSTRUCTION_WORKER_CAR_COLLISION_1, 4u);
 		break;
 	case SOUND_PED_CHAT_SEXY:
-		GetPhrase(
-		    &sfx, &lastSfx,
-		    AUDIO_SAMPLE_PED_WHITE_CONSTRUCTION_WORKER_CHAT_SEXY_1, 3u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_CONSTRUCTION_WORKER_CHAT_SEXY_1,
+		          3u);
 		break;
 	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_WHITE_CONSTRUCTION_WORKER_CHAT_1,
-		          7u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_CONSTRUCTION_WORKER_CHAT_1, 7u);
 		break;
 	default: return GetGenericMaleTalkSfx(sound);
 	}
@@ -2404,42 +2298,29 @@ cAudioManager::GetBlackConstructionWorkerTalkSfx(int16 sound)
 
 	switch(sound) {
 	case SOUND_PED_HANDS_COWER:
-		GetPhrase(
-		    &sfx, &lastSfx,
-		    AUDIO_SAMPLE_PED_BLACK_CONSTRUCTION_WORKER_HANDS_COWER_1,
-		    3u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_CONSTRUCTION_WORKER_HANDS_COWER_1,
+		          3u);
 		break;
 	case SOUND_PED_CAR_JACKED:
-		GetPhrase(
-		    &sfx, &lastSfx,
-		    AUDIO_SAMPLE_PED_BLACK_CONSTRUCTION_WORKER_CAR_JACKED_1,
-		    2u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_CONSTRUCTION_WORKER_CAR_JACKED_1,
+		          2u);
 		break;
 	case SOUND_PED_ATTACK:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_BLACK_CONSTRUCTION_WORKER_ATTACK_1,
-		          5u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_CONSTRUCTION_WORKER_ATTACK_1, 5u);
 		break;
 	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_BLACK_CONSTRUCTION_WORKER_EVADE_1,
-		          5u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_CONSTRUCTION_WORKER_EVADE_1, 5u);
 		break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(
-		    &sfx, &lastSfx,
-		    AUDIO_SAMPLE_PED_BLACK_CONSTRUCTION_WORKER_CAR_COLLISION_1,
-		    5u);
+		GetPhrase(&sfx, &lastSfx,
+		          AUDIO_SAMPLE_PED_BLACK_CONSTRUCTION_WORKER_CAR_COLLISION_1, 5u);
 		break;
 	case SOUND_PED_CHAT_SEXY:
-		GetPhrase(
-		    &sfx, &lastSfx,
-		    AUDIO_SAMPLE_PED_BLACK_CONSTRUCTION_WORKER_CHAT_SEXY_1, 4u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_CONSTRUCTION_WORKER_CHAT_SEXY_1,
+		          4u);
 		break;
 	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_BLACK_CONSTRUCTION_WORKER_CHAT_1,
-		          4u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_CONSTRUCTION_WORKER_CHAT_1, 4u);
 		break;
 	default: return GetGenericMaleTalkSfx(sound);
 	}
@@ -2454,29 +2335,22 @@ cAudioManager::GetShopperFemaleTalkSfx(int16 sound, int32 model)
 
 	switch(sound) {
 	case SOUND_PED_CAR_JACKED:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_SHOPPER_FEMALE_1_CAR_JACKED_1, 2u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SHOPPER_FEMALE_1_CAR_JACKED_1, 2u);
 		break;
 	case SOUND_PED_ROBBED:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_SHOPPER_FEMALE_1_ROBBED_1, 2u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SHOPPER_FEMALE_1_ROBBED_1, 2u);
 		break;
 	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_SHOPPER_FEMALE_1_EVADE_1, 6u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SHOPPER_FEMALE_1_EVADE_1, 6u);
 		break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_SHOPPER_FEMALE_1_CAR_COLLISION_1,
-		          7u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SHOPPER_FEMALE_1_CAR_COLLISION_1, 7u);
 		break;
 	case SOUND_PED_CHAT_EVENT:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_SHOPPER_FEMALE_1_CHAT_EVENT_1, 4u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SHOPPER_FEMALE_1_CHAT_EVENT_1, 4u);
 		break;
 	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_SHOPPER_FEMALE_1_CHAT_1, 7u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SHOPPER_FEMALE_1_CHAT_1, 7u);
 		break;
 	default: return GetGenericFemaleTalkSfx(sound);
 	}
@@ -2497,32 +2371,25 @@ cAudioManager::GetStudentMaleTalkSfx(int16 sound)
 
 	switch(sound) {
 	case SOUND_PED_HANDS_COWER:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_STUDENT_MALE_HANDS_COWER_1, 2u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_STUDENT_MALE_HANDS_COWER_1, 2u);
 		break;
 	case SOUND_PED_ROBBED:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_STUDENT_MALE_ROBBED_1, 2u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_STUDENT_MALE_ROBBED_1, 2u);
 		break;
 	case SOUND_PED_ATTACK:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_STUDENT_MALE_ATTACK_1, 4u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_STUDENT_MALE_ATTACK_1, 4u);
 		break;
 	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_STUDENT_MALE_EVADE_1,
-		          4u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_STUDENT_MALE_EVADE_1, 4u);
 		break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_STUDENT_MALE_CAR_COLLISION_1, 4u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_STUDENT_MALE_CAR_COLLISION_1, 4u);
 		break;
 	case SOUND_PED_CHAT_EVENT:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_STUDENT_MALE_CHAT_EVENT_1, 3u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_STUDENT_MALE_CHAT_EVENT_1, 3u);
 		break;
 	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_STUDENT_MALE_CHAT_1,
-		          5u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_STUDENT_MALE_CHAT_1, 5u);
 
 		break;
 	default: return GetGenericMaleTalkSfx(sound);
@@ -2538,32 +2405,25 @@ cAudioManager::GetStudentFemaleTalkSfx(int16 sound)
 
 	switch(sound) {
 	case SOUND_PED_HANDS_COWER:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_STUDENT_FEMALE_HANDS_COWER_1, 4u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_STUDENT_FEMALE_HANDS_COWER_1, 4u);
 		break;
 	case SOUND_PED_ROBBED:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_STUDENT_FEMALE_ROBBED_1, 2u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_STUDENT_FEMALE_ROBBED_1, 2u);
 		break;
 	case SOUND_PED_ATTACK:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_STUDENT_FEMALE_ATTACK_1, 4u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_STUDENT_FEMALE_ATTACK_1, 4u);
 		break;
 	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_STUDENT_FEMALE_EVADE_1, 4u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_STUDENT_FEMALE_EVADE_1, 4u);
 		break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_STUDENT_FEMALE_CAR_COLLISION_1, 4u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_STUDENT_FEMALE_CAR_COLLISION_1, 4u);
 		break;
 	case SOUND_PED_CHAT_EVENT:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_STUDENT_FEMALE_CHAT_EVENT_1, 2u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_STUDENT_FEMALE_CHAT_EVENT_1, 2u);
 		break;
 	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_STUDENT_FEMALE_CHAT_1, 4u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_STUDENT_FEMALE_CHAT_1, 4u);
 
 		break;
 	default: return GetGenericFemaleTalkSfx(sound);
@@ -2581,36 +2441,20 @@ uint32
 cAudioManager::GetSpecialCharacterTalkSfx(int32 modelIndex, int32 sound)
 {
 	char *modelName = CModelInfo::GetModelInfo(modelIndex)->GetName();
-	if(strcmp(modelName, "eight") == 0 ||
-	   strcmp(modelName, "eight2") == 0) {
+	if(strcmp(modelName, "eight") == 0 || strcmp(modelName, "eight2") == 0) {
 		return GetEightTalkSfx(sound);
 	}
-	if(strcmp(modelName, "frankie") == 0) {
-		return GetFrankieTalkSfx(sound);
-	}
+	if(strcmp(modelName, "frankie") == 0) { return GetFrankieTalkSfx(sound); }
 	if(strcmp(modelName, "misty") == 0) { return GetMistyTalkSfx(sound); }
-	if(strcmp(modelName, "ojg") == 0 ||
-	   strcmp(modelName, "ojg_p") == 0) {
+	if(strcmp(modelName, "ojg") == 0 || strcmp(modelName, "ojg_p") == 0) {
 		return GetOJGTalkSfx(sound);
 	}
-	if(strcmp(modelName, "cat") == 0) {
-		return GetCatatalinaTalkSfx(sound);
-	}
-	if(strcmp(modelName, "bomber") == 0) {
-		return GetBomberTalkSfx(sound);
-	}
-	if(strcmp(modelName, "s_guard") == 0) {
-		return GetSecurityGuardTalkSfx(sound);
-	}
-	if(strcmp(modelName, "chunky") == 0) {
-		return GetChunkyTalkSfx(sound);
-	}
-	if(strcmp(modelName, "asuka") == 0) {
-		return GetGenericFemaleTalkSfx(sound);
-	}
-	if(strcmp(modelName, "maria") == 0) {
-		return GetGenericFemaleTalkSfx(sound);
-	}
+	if(strcmp(modelName, "cat") == 0) { return GetCatatalinaTalkSfx(sound); }
+	if(strcmp(modelName, "bomber") == 0) { return GetBomberTalkSfx(sound); }
+	if(strcmp(modelName, "s_guard") == 0) { return GetSecurityGuardTalkSfx(sound); }
+	if(strcmp(modelName, "chunky") == 0) { return GetChunkyTalkSfx(sound); }
+	if(strcmp(modelName, "asuka") == 0) { return GetGenericFemaleTalkSfx(sound); }
+	if(strcmp(modelName, "maria") == 0) { return GetGenericFemaleTalkSfx(sound); }
 
 	return GetGenericMaleTalkSfx(sound);
 }
@@ -2622,20 +2466,16 @@ cAudioManager::GetEightTalkSfx(int16 sound)
 
 	switch(sound) {
 	case SOUND_PED_HANDS_UP:
-		cAudioManager::GetPhrase(&sfx, &lastSfx,
-		                         AUDIO_SAMPLE_PED_EIGHT_HANDS_UP_1, 2u);
+		cAudioManager::GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_EIGHT_HANDS_UP_1, 2u);
 		break;
 	case SOUND_PED_ROBBED:
-		cAudioManager::GetPhrase(&sfx, &lastSfx,
-		                         AUDIO_SAMPLE_PED_EIGHT_ROBBED_1, 2u);
+		cAudioManager::GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_EIGHT_ROBBED_1, 2u);
 		break;
 	case SOUND_PED_ATTACK:
-		cAudioManager::GetPhrase(&sfx, &lastSfx,
-		                         AUDIO_SAMPLE_PED_EIGHT_ATTACK_1, 6u);
+		cAudioManager::GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_EIGHT_ATTACK_1, 6u);
 		break;
 	case SOUND_PED_EVADE:
-		cAudioManager::GetPhrase(&sfx, &lastSfx,
-		                         AUDIO_SAMPLE_PED_EIGHT_EVADE_1, 7u);
+		cAudioManager::GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_EIGHT_EVADE_1, 7u);
 		break;
 	default: return GetGenericMaleTalkSfx(sound);
 	}
@@ -2650,16 +2490,13 @@ cAudioManager::GetFrankieTalkSfx(int16 sound)
 
 	switch(sound) {
 	case SOUND_PED_HANDS_UP:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_FRANKIE_HANDS_UP_1,
-		          4u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_FRANKIE_HANDS_UP_1, 4u);
 		break;
 	case SOUND_PED_ROBBED:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_FRANKIE_ROBBED_1,
-		          2u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_FRANKIE_ROBBED_1, 2u);
 		break;
 	case SOUND_PED_ATTACK:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_FRANKIE_ATTACK_1,
-		          6u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_FRANKIE_ATTACK_1, 6u);
 		break;
 	case SOUND_PED_EVADE:
 		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_FRANKIE_EVADE_1, 3u);
@@ -2677,8 +2514,7 @@ cAudioManager::GetMistyTalkSfx(int16 sound)
 
 	switch(sound) {
 	case SOUND_PED_HANDS_UP:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MISTY_HANDS_UP_1,
-		          5u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MISTY_HANDS_UP_1, 5u);
 		break;
 	case SOUND_PED_ROBBED:
 		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MISTY_ROBBED_1, 2u);
@@ -2686,12 +2522,9 @@ cAudioManager::GetMistyTalkSfx(int16 sound)
 	case SOUND_PED_ATTACK:
 		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MISTY_ATTACK_1, 4u);
 		break;
-	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MISTY_EVADE_1, 5u);
-		break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MISTY_EVADE_1, 5u); break;
 	case SOUND_PED_TAXI_CALL:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MISTY_THUMB_LIFT_1,
-		          4u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MISTY_THUMB_LIFT_1, 4u);
 		break;
 	default: return GetGenericFemaleTalkSfx(sound); break;
 	}
@@ -2730,24 +2563,18 @@ cAudioManager::GetSecurityGuardTalkSfx(int16 sound)
 
 	switch(sound) {
 	case SOUND_PED_HANDS_UP:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_SECURITY_GUARD_HANDS_UP_1, 2u);
-		break;
-	case SOUND_PED_HANDS_COWER:
-		sfx = AUDIO_SAMPLE_PED_SECURITY_GUARD_HANDS_COWER_1;
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SECURITY_GUARD_HANDS_UP_1, 2u);
 		break;
+	case SOUND_PED_HANDS_COWER: sfx = AUDIO_SAMPLE_PED_SECURITY_GUARD_HANDS_COWER_1; break;
 	case SOUND_PED_CAR_JACKED:
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_SECURITY_GUARD_CAR_EVENT_1, 6u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SECURITY_GUARD_CAR_EVENT_1, 6u);
 		break;
 	case SOUND_PED_ATTACK:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_SECURITY_GUARD_ATTACK_1, 2u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SECURITY_GUARD_ATTACK_1, 2u);
 		break;
 	case SOUND_PED_FLEE_RUN:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_SECURITY_GUARD_CAR_EVENT_1, 12u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SECURITY_GUARD_CAR_EVENT_1, 12u);
 		break;
 	default: return GetGenericMaleTalkSfx(sound);
 	}
@@ -2775,20 +2602,16 @@ cAudioManager::GetGenericMaleTalkSfx(int16 sound)
 	static uint32 lastSfx = NO_SAMPLE;
 
 	switch(sound) {
-	case SOUND_PED_DEATH:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MALE_DEATH_1, 8u);
-		break;
+	case SOUND_PED_DEATH: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MALE_DEATH_1, 8u); break;
 	case SOUND_PED_BULLET_HIT:
 	case SOUND_PED_DEFEND:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_INJURED_PED_MALE_OUCH_1,
-		          15u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_INJURED_PED_MALE_OUCH_1, 15u);
 		break;
 	case SOUND_PED_BURNING:
 		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MALE_BURNING_1, 8u);
 		break;
 	case SOUND_PED_FLEE_SPRINT:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MALE_FLEE_SPRINT_1,
-		          6u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MALE_FLEE_SPRINT_1, 6u);
 		break;
 	default: return NO_SAMPLE;
 	}
@@ -2803,22 +2626,18 @@ cAudioManager::GetGenericFemaleTalkSfx(int16 sound)
 
 	switch(sound) {
 	case SOUND_PED_DEATH:
-		cAudioManager::GetPhrase(&sfx, &lastSfx,
-		                         AUDIO_SAMPLE_PED_FEMALE_DEATH_1, 10u);
+		cAudioManager::GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_FEMALE_DEATH_1, 10u);
 		break;
 	case SOUND_PED_BULLET_HIT:
 	case SOUND_PED_DEFEND:
-		cAudioManager::GetPhrase(&sfx, &lastSfx,
-		                         AUDIO_SAMPLE_INJURED_PED_FEMALE_OUCH_1,
+		cAudioManager::GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_INJURED_PED_FEMALE_OUCH_1,
 		                         11u);
 		break;
 	case SOUND_PED_BURNING:
-		cAudioManager::GetPhrase(&sfx, &lastSfx,
-		                         AUDIO_SAMPLE_PED_FEMALE_BURNING_1, 9u);
+		cAudioManager::GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_FEMALE_BURNING_1, 9u);
 		break;
 	case SOUND_PED_FLEE_SPRINT:
-		cAudioManager::GetPhrase(
-		    &sfx, &lastSfx, AUDIO_SAMPLE_PED_FEMALE_FLEE_SPRINT_1, 8u);
+		cAudioManager::GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_FEMALE_FLEE_SPRINT_1, 8u);
 		break;
 	default: return NO_SAMPLE;
 	}
@@ -2832,6 +2651,60 @@ cAudioManager::Service()
 }
 
 STARTPATCHES
+InjectHook(0x57F050, &cAudioManager::GetMissionScriptPoliceAudioPlayingStatus, PATCH_JUMP);
+InjectHook(0x5795D0, &cAudioManager::GetMissionAudioLoadingStatus, PATCH_JUMP);
+
+InjectHook(0x57A8A0, &cAudioManager::GetNum3DProvidersAvailable, PATCH_JUMP);
+InjectHook(0x57A8F0, &cAudioManager::AutoDetect3DProviders, PATCH_JUMP);
+InjectHook(0x57A9C0, &cAudioManager::IsMP3RadioChannelAvailable, PATCH_JUMP);
+InjectHook(0x57AA30, &cAudioManager::GetCDAudioDriveLetter, PATCH_JUMP);
+
+InjectHook(0x57A730, &cAudioManager::SetEffectsMasterVolume, PATCH_JUMP);
+InjectHook(0x57A750, &cAudioManager::SetMusicMasterVolume, PATCH_JUMP);
+InjectHook(0x57A770, &cAudioManager::SetEffectsFadeVol, PATCH_JUMP);
+InjectHook(0x57A790, &cAudioManager::SetMusicFadeVol, PATCH_JUMP);
+
+InjectHook(0x57A9A0, &cAudioManager::SetSpeakerConfig, PATCH_JUMP);
+
+InjectHook(0x56ECF0, &cAudioManager::ProcessJumboFlying, PATCH_JUMP);
+InjectHook(0x569400, &cAudioManager::PreInitialiseGameSpecificSetup, PATCH_JUMP);
+
+InjectHook(0x57F020, &cAudioManager::SetMissionScriptPoliceAudio, PATCH_JUMP);
+
+InjectHook(0x5697A0, &cAudioManager::CalculateDistance, PATCH_JUMP);
+
+InjectHook(0x56C3C0, &cAudioManager::UsesSiren, PATCH_JUMP);
+InjectHook(0x56C3F0, &cAudioManager::UsesSirenSwitching, PATCH_JUMP);
+
+InjectHook(0x579520, &cAudioManager::MissionScriptAudioUsesPoliceChannel, PATCH_JUMP);
+
+InjectHook(0x57A8C0, &cAudioManager::Get3DProviderName, PATCH_JUMP);
+InjectHook(0x56EA10, &cAudioManager::ProcessJumboTaxi, PATCH_JUMP);
+
+InjectHook(0x579620, &cAudioManager::PlayLoadedMissionAudio, PATCH_JUMP);
+
+InjectHook(0x5795F0, &cAudioManager::SetMissionAudioLocation, PATCH_JUMP);
+
+InjectHook(0x57EFF0, &cAudioManager::ResetPoliceRadio, PATCH_JUMP);
+
+InjectHook(0x57B030, &cAudioManager::InterrogateAudioEntities, PATCH_JUMP);
+
+InjectHook(0x57C120, &cAudioManager::ClearRequestedQueue, PATCH_JUMP);
+// InjectHook(0x580AF0, &cAudioManager::AgeCrimes, PATCH_JUMP);
+
+InjectHook(0x56C600, &cAudioManager::UsesReverseWarning, PATCH_JUMP);
+InjectHook(0x56CAB0, &cAudioManager::HasAirBrakes, PATCH_JUMP);
+
+InjectHook(0x56F410, &cAudioManager::GetJumboTaxiFreq, PATCH_JUMP);
+
+InjectHook(0x5699C0, &cAudioManager::ProcessPhysical, PATCH_JUMP);
+// InjectHook(0x56E860, &cAudioManager::ProcessPlane, PATCH_JUMP);
+
+InjectHook(0x5796A0, &cAudioManager::ClearMissionAudio, PATCH_JUMP);
+// InjectHook(0x569700, &cAudioManager::ProcessReverb, PATCH_JUMP);
+
+InjectHook(0x579650, &cAudioManager::IsMissionAudioSampleFinished, PATCH_JUMP);
+// done
 InjectHook(0x57AF90, &cAudioManager::RandomDisplacement, PATCH_JUMP);
 
 InjectHook(0x57A9E0, &cAudioManager::ReleaseDigitalHandle, PATCH_JUMP);
diff --git a/src/audio/AudioManager.h b/src/audio/AudioManager.h
index 95478922..24dae2ce 100644
--- a/src/audio/AudioManager.h
+++ b/src/audio/AudioManager.h
@@ -71,11 +71,13 @@ enum eAudioType : int32 {
 	TOTAL_AUDIO_TYPES = 14,
 };
 
+class CPhysical;
+
 class tAudioEntity
 {
 public:
 	eAudioType m_nType;
-	void *m_pEntity;
+	CPhysical *m_pEntity;
 	bool m_bIsUsed;
 	char m_bStatus;
 	int16 m_awAudioEvent[4];
@@ -159,7 +161,7 @@ public:
 	char field_22;
 	char field_23;
 	int field_24;
-	char m_bIsPlayed;
+	bool m_bIsPlayed;
 	char field_29;
 	char field_30;
 	char field_31;
@@ -185,7 +187,7 @@ public:
 	char field_15;
 	int m_nTimer;
 	tActiveSample m_sQueueSample;
-	char m_bActiveSampleQueue;
+	uint8 m_bActiveSampleQueue;
 	char gap_109[3];
 	tActiveSample m_asSamples[54];
 	char m_abSampleQueueIndexTable[54];
@@ -216,6 +218,72 @@ public:
 	char field_19195;
 	int m_nTimeOfRecentCrime;
 
+	char GetMissionScriptPoliceAudioPlayingStatus();
+	bool GetMissionAudioLoadingStatus();
+
+	uint8 GetNum3DProvidersAvailable();
+	int8 AutoDetect3DProviders();
+	bool IsMP3RadioChannelAvailable();
+	uint8 GetCDAudioDriveLetter();
+
+	void SetEffectsMasterVolume(uint8 volume);
+	void SetMusicMasterVolume(uint8 volume);
+	void SetEffectsFadeVol(uint8 volume);
+	void SetMusicFadeVol(uint8 volume);
+
+	void SetSpeakerConfig(int32 conf);
+
+	void ProcessJumboFlying();
+	bool SetupJumboEngineSound(uint8, int32); // todo
+	void PreInitialiseGameSpecificSetup();
+	void SetMissionScriptPoliceAudio(int32 sfx);
+
+	void CalculateDistance(bool *ptr, float dist);
+
+	bool UsesSiren(int32 model);
+	bool UsesSirenSwitching(int32 model);
+
+	bool MissionScriptAudioUsesPoliceChannel(int32 soundMission);
+
+	uint8 Get3DProviderName(uint8 id);
+
+	void ProcessJumboTaxi();
+	bool SetupJumboFlySound(uint8);          // todo
+	bool SetupJumboTaxiSound(uint8);         // todo
+	bool SetupJumboWhineSound(uint8, int32); // todo
+
+	void PlayLoadedMissionAudio();
+
+	void SetMissionAudioLocation(float x, float y, float z);
+
+	void ResetPoliceRadio();
+
+	void InterrogateAudioEntities();
+
+	void ClearRequestedQueue();
+//	void AgeCrimes();
+
+	bool UsesReverseWarning(int32 model);
+	bool HasAirBrakes(int32 model);
+
+	int32 GetJumboTaxiFreq();
+
+	void ProcessPhysical(int32 id);
+	void ProcessVehicle(CPhysical *); // todo
+	void ProcessPed(CPhysical *);     // todo
+	void ProcessPlane(void *);        // todo
+
+	void ClearMissionAudio();
+//	void ProcessReverb();
+
+	bool IsMissionAudioSampleFinished();
+
+	void ProcessEntity(int32);
+
+	void InitialisePoliceRadio();
+
+	// done
+
 	int32 RandomDisplacement(uint32 seed);
 
 	void ReleaseDigitalHandle();
@@ -224,7 +292,7 @@ public:
 
 	bool IsAudioInitialised() const;
 
-	int32 CreateEntity(int32 type, void *memory);
+	int32 CreateEntity(int32 type, CPhysical *memory);
 	void DestroyEntity(int32 id);
 	void SetEntityStatus(int32 id, bool status);
 
diff --git a/src/audio/SampleManager.cpp b/src/audio/SampleManager.cpp
index ca08ad8b..7af3446b 100644
--- a/src/audio/SampleManager.cpp
+++ b/src/audio/SampleManager.cpp
@@ -3,7 +3,10 @@
 #include "SampleManager.h"
 
 CSampleManager &cSampleManager = *(CSampleManager *)0x7341E0;
-uint32 &CSampleManager::nNumOfMp3Files = *(uint32*)0x95CC00;
+
+uint32 &nNumOfMp3Files = *(uint32 *)0x95CC00;
+uint8 &num3DProvidersAvailable = *(uint8 *)0x734237;
+uint32 *asName3DProviders = (uint32 *)0x734238;
 
 bool CSampleManager::IsMP3RadioChannelAvailable() {
 	return nNumOfMp3Files != 0;
@@ -21,3 +24,69 @@ CSampleManager::RequireDigitalHandle()
 {
 	EAXJMP(0x5664F0);
 }
+
+WRAPPER
+char
+CSampleManager::AutoDetect3DProviders()
+{
+	EAXJMP(0x565990);
+}
+
+WRAPPER
+uint8
+CSampleManager::GetCDAudioDriveLetter()
+{
+	EAXJMP(0x566F20);
+}
+
+WRAPPER
+void
+CSampleManager::SetEffectsMasterVolume(uint8 volume)
+{
+	EAXJMP(0x567010);
+}
+
+WRAPPER
+void
+CSampleManager::SetMusicMasterVolume(uint8 volume)
+{
+	EAXJMP(0x567020);
+}
+
+WRAPPER
+void
+CSampleManager::SetEffectsFadeVol(uint8 volume)
+{
+	EAXJMP(0x567030);
+}
+
+WRAPPER
+void
+CSampleManager::SetMusicFadeVol(uint8 volume)
+{
+	EAXJMP(0x567040);
+}
+
+WRAPPER
+void
+CSampleManager::SetSpeakerConfig(uint32 config)
+{
+	EAXJMP(0x565900);
+}
+
+WRAPPER
+bool
+CSampleManager::GetChannelUsedFlag(int32 id)
+{
+	EAXJMP(0x567B00);
+}
+
+WRAPPER
+void
+CSampleManager::StopChannel(int32 id)
+{
+	EAXJMP(0x567BE0);
+}
+STARTPATCHES
+InjectHook(0x566490, CSampleManager::IsMP3RadioChannelAvailable, PATCH_JUMP);
+ENDPATCHES
\ No newline at end of file
diff --git a/src/audio/SampleManager.h b/src/audio/SampleManager.h
index e688b3fb..1bee1775 100644
--- a/src/audio/SampleManager.h
+++ b/src/audio/SampleManager.h
@@ -1,13 +1,37 @@
 #pragma once
 
-class CSampleManager {
-public:
-	static uint32 &nNumOfMp3Files;
+struct tSample {
+	int m_nOffset;
+	unsigned int m_nSize;
+	int m_nFrequency;
+	int m_nLoopStart;
+	int m_nLoopEnd;
+};
 
+class CSampleManager
+{
 public:
 	void ReleaseDigitalHandle();
 	void RequireDigitalHandle();
+
+	char AutoDetect3DProviders();
+	uint8 GetCDAudioDriveLetter();
+
+	void SetEffectsMasterVolume(uint8 volume);
+	void SetMusicMasterVolume(uint8 volume);
+	void SetEffectsFadeVol(uint8 volume);
+	void SetMusicFadeVol(uint8 volume);
+
+	void SetSpeakerConfig(uint32 config);
+
+	bool GetChannelUsedFlag(int32 id);
+	void StopChannel(int32 id);
+
 	static bool IsMP3RadioChannelAvailable();
 };
 
+extern uint32 &nNumOfMp3Files;
+extern uint8 &num3DProvidersAvailable;
+extern uint32* asName3DProviders;
+
 extern CSampleManager &cSampleManager;
\ No newline at end of file
diff --git a/src/entities/Vehicle.h b/src/entities/Vehicle.h
index ba3e568e..8739e5db 100644
--- a/src/entities/Vehicle.h
+++ b/src/entities/Vehicle.h
@@ -24,6 +24,80 @@ enum eCarLock : uint8 {
 	CARLOCK_SKIP_SHUT_DOORS
 };
 
+enum eVehicleModel : int32
+{
+  LANDSTAL = 0x0,
+  IDAHO = 0x1,
+  STINGER = 0x2,
+  LINERUN = 0x3,
+  PEREN = 0x4,
+  SENTINEL = 0x5,
+  PATRIOT = 0x6,
+  FIRETRUK = 0x7,
+  TRASH = 0x8,
+  STRETCH = 0x9,
+  MANANA = 0xA,
+  INFERNUS = 0xB,
+  BLISTA = 0xC,
+  PONY = 0xD,
+  MULE = 0xE,
+  CHEETAH = 0xF,
+  AMBULAN = 0x10,
+  FBICAR = 0x11,
+  MOONBEAM = 0x12,
+  ESPERANT = 0x13,
+  TAXI = 0x14,
+  KURUMA = 0x15,
+  BOBCAT = 0x16,
+  MRWHOOP = 0x17,
+  BFINJECT = 0x18,
+  CORPSE = 0x19,
+  POLICE = 0x1A,
+  ENFORCER = 0x1B,
+  SECURICA = 0x1C,
+  BANSHEE = 0x1D,
+  PREDATOR = 0x1E,
+  BUS = 0x1F,
+  RHINO = 0x20,
+  BARRACKS = 0x21,
+  TRAIN = 0x22,
+  CHOPPER = 0x23,
+  DODO = 0x24,
+  COACH = 0x25,
+  CABBIE = 0x26,
+  STALLION = 0x27,
+  RUMPO = 0x28,
+  RCBANDIT = 0x29,
+  BELLYUP = 0x2A,
+  MRWONGS = 0x2B,
+  MAFIA = 0x2C,
+  YARDIE = 0x2D,
+  YAKUZA = 0x2E,
+  DIABLOS = 0x2F,
+  COLUMB = 0x30,
+  HOODS = 0x31,
+  AIRTRAIN = 0x32,
+  DEADDODO = 0x33,
+  SPEEDER = 0x34,
+  REEFER = 0x35,
+  PANLANT = 0x36,
+  FLATBED = 0x37,
+  YANKEE = 0x38,
+  ESCAPE = 0x39,
+  BORGNINE = 0x3A,
+  TOYZ = 0x3B,
+  GHOST = 0x3C,
+  CAR151 = 0x3D,
+  CAR152 = 0x3E,
+  CAR153 = 0x3F,
+  CAR154 = 0x40,
+  CAR155 = 0x41,
+  CAR156 = 0x42,
+  CAR157 = 0x43,
+  CAR158 = 0x44,
+  CAR159 = 0x45,
+};
+
 class CVehicle : public CPhysical
 {
 public: