From 89879341235437f057e731e1bcdab05d4e341e9b Mon Sep 17 00:00:00 2001
From: Sergeanur <s.anureev@yandex.ua>
Date: Thu, 17 Oct 2019 02:22:39 +0300
Subject: [PATCH 01/37] Full C3dMarkers

---
 src/core/FileLoader.h    |   2 +-
 src/core/config.h        |   1 +
 src/math/Matrix.h        |  22 ++-
 src/render/SpecialFX.cpp | 298 ++++++++++++++++++++++++++++++++++++++-
 src/render/SpecialFX.h   |  48 ++++++-
 5 files changed, 354 insertions(+), 17 deletions(-)

diff --git a/src/core/FileLoader.h b/src/core/FileLoader.h
index f9121ace..ea7f47d9 100644
--- a/src/core/FileLoader.h
+++ b/src/core/FileLoader.h
@@ -9,7 +9,7 @@ public:
 	static char *LoadLine(int fd);
 	static RwTexDictionary *LoadTexDictionary(const char *filename);
 	static void LoadCollisionFile(const char *filename);
-	static void LoadCollisionModel(uint8 *buf, CColModel &model, char *name);
+	static void LoadCollisionModel(uint8 *buf, struct CColModel &model, char *name);
 	static void LoadModelFile(const char *filename);
 	static RpAtomic *FindRelatedModelInfoCB(RpAtomic *atomic, void *data);
 	static void LoadClumpFile(const char *filename);
diff --git a/src/core/config.h b/src/core/config.h
index 08ddd007..12cb7be8 100644
--- a/src/core/config.h
+++ b/src/core/config.h
@@ -67,6 +67,7 @@ enum Config {
 	NUMANTENNAS = 8,
 	NUMCORONAS = 56,
 	NUMPOINTLIGHTS = 32,
+	NUM3DMARKERS = 32,
 	NUMMONEYMESSAGES = 16,
 	NUMPICKUPMESSAGES = 16,
 
diff --git a/src/math/Matrix.h b/src/math/Matrix.h
index b4a866a0..96f56a0f 100644
--- a/src/math/Matrix.h
+++ b/src/math/Matrix.h
@@ -127,20 +127,14 @@ public:
 	}
 	void Scale(float scale)
 	{
-		// GTA treats this as 4x4 floats
-		m_matrix.right.x *= scale;
-		m_matrix.right.y *= scale;
-		m_matrix.right.z *= scale;
-		m_matrix.up.x *= scale;
-		m_matrix.up.y *= scale;
-		m_matrix.up.z *= scale;
-		m_matrix.at.x *= scale;
-		m_matrix.at.y *= scale;
-		m_matrix.at.z *= scale;
-		m_matrix.pos.x *= scale;
-		m_matrix.pos.y *= scale;
-		m_matrix.pos.z *= scale;
-		m_matrix.flags = 0;
+		float *pFloatMatrix = (float*)&m_matrix;
+		for (int i = 0; i < 3; i++)
+#ifdef FIX_BUGS // BUGFIX from VC
+			for (int j = 0; j < 3; j++)
+#else
+			for (int j = 0; j < 4; j++)
+#endif
+				pFloatMatrix[i * 4 + j] *= scale;
 	}
 
 
diff --git a/src/render/SpecialFX.cpp b/src/render/SpecialFX.cpp
index 44e1e029..37bc306f 100644
--- a/src/render/SpecialFX.cpp
+++ b/src/render/SpecialFX.cpp
@@ -5,6 +5,12 @@
 #include "Sprite.h"
 #include "Font.h"
 #include "Text.h"
+#include "TxdStore.h"
+#include "FileMgr.h"
+#include "FileLoader.h"
+#include "Lights.h"
+#include "VisibilityPlugins.h"
+#include "World.h"
 
 WRAPPER void CSpecialFX::Render(void) { EAXJMP(0x518DC0); }
 
@@ -17,9 +23,290 @@ WRAPPER void CBulletTraces::Init(void) { EAXJMP(0x518DE0); }
 
 WRAPPER void CBrightLights::RegisterOne(CVector pos, CVector up, CVector right, CVector fwd, uint8 type, uint8 unk1, uint8 unk2, uint8 unk3) { EAXJMP(0x51A410); }
 
-WRAPPER void C3dMarkers::PlaceMarkerSet(uint32 id, uint16 type, CVector& pos, float size, uint8 r, uint8 g, uint8 b, uint8 a, uint16 pulsePeriod, float pulseFraction, int16 rotateRate)  { EAXJMP(0x51BB80); }
+RpAtomic *
+MarkerAtomicCB(RpAtomic *atomic, void *data)
+{
+	*(RpAtomic**)data = atomic;
+	return atomic;
+}
 
+bool
+C3dMarker::AddMarker(uint32 identifier, uint16 type, float fSize, uint8 r, uint8 g, uint8 b, uint8 a, uint16 pulsePeriod, float pulseFraction, int16 rotateRate)
+{
+	m_nIdentifier = identifier;
+
+	m_Matrix.SetUnity();
+
+	RpAtomic *origAtomic;
+	origAtomic = nil;
+	RpClumpForAllAtomics(C3dMarkers::m_pRpClumpArray[type], MarkerAtomicCB, &origAtomic);
+
+	RpAtomic *atomic = RpAtomicClone(origAtomic);
+	RwFrame *frame = RwFrameCreate();
+	RpAtomicSetFrame(atomic, frame);
+	CVisibilityPlugins::SetAtomicRenderCallback(atomic, nil);
+	
+	RpGeometry *geometry = RpAtomicGetGeometry(atomic);
+	RpGeometrySetFlags(geometry, RpGeometryGetFlags(geometry) | rpGEOMETRYMODULATEMATERIALCOLOR);
+
+	m_pAtomic = atomic;
+	m_Matrix.Attach(RwFrameGetMatrix(RpAtomicGetFrame(m_pAtomic)));
+	m_pMaterial = RpGeometryGetMaterial(geometry, 0);
+	m_fSize = fSize;
+	m_fStdSize = m_fSize;
+	m_Color.red = r;
+	m_Color.green = g;
+	m_Color.blue = b;
+	m_Color.alpha = a;
+	m_nPulsePeriod = pulsePeriod;
+	m_fPulseFraction = pulseFraction;
+	m_nRotateRate = rotateRate;
+	m_nStartTime = CTimer::GetTimeInMilliseconds();
+	m_nType = type;
+	return m_pAtomic != nil;
+}
 
+void
+C3dMarker::DeleteMarkerObject()
+{
+	RwFrame *frame;
+
+	m_nIdentifier = 0;
+	m_nStartTime = 0;
+	m_bIsUsed = false;
+	m_nType = MARKERTYPE_INVALID;
+
+	frame = RpAtomicGetFrame(m_pAtomic);
+	RpAtomicDestroy(m_pAtomic);
+	RwFrameDestroy(frame);
+	m_pAtomic = nil;
+}
+
+void
+C3dMarker::Render()
+{
+	if (m_pAtomic == nil) return;
+
+	RwRGBA *color = RpMaterialGetColor(m_pMaterial);
+	*color = m_Color;
+
+	m_Matrix.UpdateRW();
+
+	CMatrix matrix;
+	matrix.Attach(m_Matrix.m_attachment);
+	matrix.Scale(m_fSize);
+	matrix.UpdateRW();
+
+	RwFrameUpdateObjects(RpAtomicGetFrame(m_pAtomic));
+	SetBrightMarkerColours(m_fBrightness);
+	if (m_nType != MARKERTYPE_ARROW)
+		RwRenderStateSet(rwRENDERSTATEZWRITEENABLE, (void*)FALSE);
+	RpAtomicRender(m_pAtomic);
+	if (m_nType != MARKERTYPE_ARROW)
+		RwRenderStateSet(rwRENDERSTATEZWRITEENABLE, (void*)TRUE);
+	ReSetAmbientAndDirectionalColours();
+}
+
+C3dMarker(&C3dMarkers::m_aMarkerArray)[NUM3DMARKERS] = *(C3dMarker(*)[NUM3DMARKERS])*(uintptr*)0x72D408;
+int32 &C3dMarkers::NumActiveMarkers = *(int32*)0x8F2A08;
+RpClump* (&C3dMarkers::m_pRpClumpArray)[NUMMARKERTYPES] = *(RpClump*(*)[NUMMARKERTYPES])*(uintptr*)0x8E2888;
+
+void
+C3dMarkers::Init()
+{
+	for (int i = 0; i < NUM3DMARKERS; i++) {
+		m_aMarkerArray[i].m_pAtomic = nil;
+		m_aMarkerArray[i].m_nType = MARKERTYPE_INVALID;
+		m_aMarkerArray[i].m_bIsUsed = false;
+		m_aMarkerArray[i].m_nIdentifier = 0;
+		m_aMarkerArray[i].m_Color.red = 255;
+		m_aMarkerArray[i].m_Color.green = 255;
+		m_aMarkerArray[i].m_Color.blue = 255;
+		m_aMarkerArray[i].m_Color.alpha = 255;
+		m_aMarkerArray[i].m_nPulsePeriod = 1024;
+		m_aMarkerArray[i].m_nRotateRate = 5;
+		m_aMarkerArray[i].m_nStartTime = 0;
+		m_aMarkerArray[i].m_fPulseFraction = 0.25f;
+		m_aMarkerArray[i].m_fStdSize = 1.0f;
+		m_aMarkerArray[i].m_fSize = 1.0f;
+		m_aMarkerArray[i].m_fBrightness = 1.0f;
+		m_aMarkerArray[i].m_fCameraRange = 0.0f;
+	}
+	NumActiveMarkers = 0;
+	int txdSlot = CTxdStore::FindTxdSlot("particle");
+	CTxdStore::PushCurrentTxd();
+	CTxdStore::SetCurrentTxd(txdSlot);
+	CFileMgr::ChangeDir("\\");
+	m_pRpClumpArray[MARKERTYPE_ARROW] = CFileLoader::LoadAtomicFile2Return("models/generic/arrow.dff");
+	m_pRpClumpArray[MARKERTYPE_CYLINDER] = CFileLoader::LoadAtomicFile2Return("models/generic/zonecylb.dff");
+	CTxdStore::PopCurrentTxd();
+}
+
+void
+C3dMarkers::Shutdown()
+{
+	for (int i = 0; i < NUM3DMARKERS; i++) {
+		if (m_aMarkerArray[i].m_pAtomic != nil)
+			m_aMarkerArray[i].DeleteMarkerObject();
+	}
+
+	for (int i = 0; i < NUMMARKERTYPES; i++) {
+		if (m_pRpClumpArray[i] != nil)
+			RpClumpDestroy(m_pRpClumpArray[i]);
+	}
+}
+
+void
+C3dMarkers::Render()
+{
+	NumActiveMarkers = 0;
+	ActivateDirectional();
+	for (int i = 0; i < NUM3DMARKERS; i++) {
+		if (m_aMarkerArray[i].m_bIsUsed) {
+			if (m_aMarkerArray[i].m_fCameraRange < 120.0f)
+				m_aMarkerArray[i].Render();
+			NumActiveMarkers++;
+			m_aMarkerArray[i].m_bIsUsed = false;
+		} else if (m_aMarkerArray[i].m_pAtomic != nil) {
+			m_aMarkerArray[i].DeleteMarkerObject();
+		}
+	}
+}
+
+C3dMarker *
+C3dMarkers::PlaceMarker(uint32 identifier, uint16 type, CVector &pos, float size, uint8 r, uint8 g, uint8 b, uint8 a, uint16 pulsePeriod, float pulseFraction, int16 rotateRate)
+{
+	C3dMarker *pMarker;
+
+	pMarker = nil;
+	float dist = sqrt((pos.x - FindPlayerCentreOfWorld(0).x) * (pos.x - FindPlayerCentreOfWorld(0).x) + (pos.y - FindPlayerCentreOfWorld(0).y) * (pos.y - FindPlayerCentreOfWorld(0).y));
+
+	if (type != MARKERTYPE_ARROW && type != MARKERTYPE_CYLINDER) return nil;
+
+	for (int i = 0; i < NUM3DMARKERS; i++) {
+		if (!m_aMarkerArray[i].m_bIsUsed && m_aMarkerArray[i].m_nIdentifier == identifier) {
+			pMarker = &m_aMarkerArray[i];
+			break;
+		}
+	}
+
+	if (pMarker == nil) {
+		for (int i = 0; i < NUM3DMARKERS; i++) {
+			if (m_aMarkerArray[i].m_nType == MARKERTYPE_INVALID) {
+				pMarker = &m_aMarkerArray[i];
+				break;
+			}
+		}
+	}
+
+	if (pMarker == nil && type == MARKERTYPE_ARROW) {
+		for (int i = 0; i < NUM3DMARKERS; i++) {
+			if (dist < m_aMarkerArray[i].m_fCameraRange && m_aMarkerArray[i].m_nType == MARKERTYPE_ARROW && (pMarker == nil || m_aMarkerArray[i].m_fCameraRange > pMarker->m_fCameraRange)) {
+				pMarker = &m_aMarkerArray[i];
+				break;
+			}
+		}
+
+		if (pMarker != nil)
+			pMarker->m_nType = MARKERTYPE_INVALID;
+	}
+
+	if (pMarker == nil) return pMarker;
+
+	pMarker->m_fCameraRange = dist;
+	if (pMarker->m_nIdentifier == identifier && pMarker->m_nType == type) {
+		if (type == MARKERTYPE_ARROW) {
+			if (dist < 25.0f) {
+				if (dist > 5.0f)
+					pMarker->m_fStdSize = size - (25.0f - dist) * (0.3f * size) / 20.0f;
+				else
+					pMarker->m_fStdSize = size - 0.3f * size;
+			} else {
+				pMarker->m_fStdSize = size;
+			}
+		} else if (type == MARKERTYPE_CYLINDER) {
+			if (dist < size + 12.0f) {
+				if (dist > size + 1.0f)
+					pMarker->m_Color.alpha = (1.0f - (size + 12.0f - dist) * 0.7f / 11.0f) * (float)a;
+				else
+					pMarker->m_Color.alpha = (float)a * 0.3f;
+			} else {
+				pMarker->m_Color.alpha = a;
+			}
+		}
+		float someSin = sinf(TWOPI * (float)((pMarker->m_nPulsePeriod - 1) & (CTimer::GetTimeInMilliseconds() - pMarker->m_nStartTime)) / (float)pMarker->m_nPulsePeriod);
+		pMarker->m_fSize = pMarker->m_fStdSize - pulseFraction * pMarker->m_fStdSize * someSin;
+
+		if (type == MARKERTYPE_ARROW) {
+			pos.z += 0.25f * pMarker->m_fStdSize * someSin;
+		} else if (type == MARKERTYPE_0) {
+			if (someSin > 0.0f)
+				pMarker->m_Color.alpha = (float)a * 0.7f * someSin + a;
+			else
+				pMarker->m_Color.alpha = (float)a * 0.4f * someSin + a;
+		}
+		if (pMarker->m_nRotateRate) {
+			RwV3d pos = pMarker->m_Matrix.m_matrix.pos;
+			pMarker->m_Matrix.RotateZ(DEGTORAD(pMarker->m_nRotateRate * CTimer::GetTimeStep()));
+			pMarker->m_Matrix.GetPosition() = pos;
+		}
+		if (type == MARKERTYPE_ARROW)
+			pMarker->m_Matrix.GetPosition() = pos;
+		pMarker->m_bIsUsed = true;
+		return pMarker;
+	}
+
+	if (pMarker->m_nIdentifier != 0)
+		pMarker->DeleteMarkerObject();
+
+	pMarker->AddMarker(identifier, type, size, r, g, b, a, pulsePeriod, pulseFraction, rotateRate);
+	if (type == MARKERTYPE_CYLINDER || type == MARKERTYPE_0 || type == MARKERTYPE_2) {
+		float z = CWorld::FindGroundZFor3DCoord(pos.x, pos.y, pos.z + 1.0f, nil);
+		if (z != 0.0f)
+			pos.z = z - 0.05f * size;
+	}
+	pMarker->m_Matrix.SetTranslate(pos.x, pos.y, pos.z);
+	if (type == MARKERTYPE_2) {
+		pMarker->m_Matrix.RotateX(PI);
+		pMarker->m_Matrix.GetPosition() = pos;
+	}
+	pMarker->m_Matrix.UpdateRW();
+	if (type == MARKERTYPE_ARROW) {
+		if (dist < 25.0f) {
+			if (dist > 5.0f)
+				pMarker->m_fStdSize = size - (25.0f - dist) * (0.3f * size) / 20.0f;
+			else
+				pMarker->m_fStdSize = size - 0.3f * size;
+		} else {
+			pMarker->m_fStdSize = size;
+		}
+	} else if (type == MARKERTYPE_CYLINDER) {
+		if (dist < size + 12.0f) {
+			if (dist > size + 1.0f)
+				pMarker->m_Color.alpha = (1.0f - (size + 12.0f - dist) * 0.7f / 11.0f) * (float)a;
+			else
+				pMarker->m_Color.alpha = (float)a * 0.3f;
+		} else {
+			pMarker->m_Color.alpha = a;
+		}
+	}
+	pMarker->m_bIsUsed = true;
+	return pMarker;
+}
+
+void
+C3dMarkers::PlaceMarkerSet(uint32 id, uint16 type, CVector &pos, float size, uint8 r, uint8 g, uint8 b, uint8 a, uint16 pulsePeriod, float pulseFraction, int16 rotateRate)
+{
+	PlaceMarker(id, type, pos, size, r, g, b, a, pulsePeriod, pulseFraction, 1);
+	PlaceMarker(id, type, pos, size * 0.93f, r, g, b, a, pulsePeriod, pulseFraction, 2);
+	PlaceMarker(id, type, pos, size * 0.86f, r, g, b, a, pulsePeriod, pulseFraction, -1);
+}
+
+
+void
+C3dMarkers::Update()
+{
+}
 
 #define MONEY_MESSAGE_LIFETIME_MS 2000
 
@@ -96,6 +383,15 @@ CMoneyMessages::RegisterOne(CVector vecPos, const char *pText, uint8 bRed, uint8
 }
 
 STARTPATCHES
+	InjectHook(0x51B070, &C3dMarker::AddMarker, PATCH_JUMP);
+	InjectHook(0x51B170, &C3dMarker::DeleteMarkerObject, PATCH_JUMP);
+	InjectHook(0x51B1B0, &C3dMarker::Render, PATCH_JUMP);
+	InjectHook(0x51B2B0, C3dMarkers::Init, PATCH_JUMP);
+	InjectHook(0x51B480, C3dMarkers::PlaceMarker, PATCH_JUMP);
+	InjectHook(0x51BB80, C3dMarkers::PlaceMarkerSet, PATCH_JUMP);
+	InjectHook(0x51B400, C3dMarkers::Render, PATCH_JUMP);
+	InjectHook(0x51B3B0, C3dMarkers::Shutdown, PATCH_JUMP);
+	
 	InjectHook(0x51AF70, CMoneyMessages::Init, PATCH_JUMP);
 	InjectHook(0x51B030, CMoneyMessages::Render, PATCH_JUMP);
 ENDPATCHES
diff --git a/src/render/SpecialFX.h b/src/render/SpecialFX.h
index bdd74bee..c3966f33 100644
--- a/src/render/SpecialFX.h
+++ b/src/render/SpecialFX.h
@@ -35,10 +35,56 @@ public:
 	static void RegisterOne(CVector pos, CVector up, CVector right, CVector fwd, uint8 type, uint8 unk1 = 0, uint8 unk2 = 0, uint8 unk3 = 0);
 };
 
+enum
+{
+	MARKERTYPE_0 = 0,
+	MARKERTYPE_ARROW,
+	MARKERTYPE_2,
+	MARKERTYPE_3,
+	MARKERTYPE_CYLINDER,
+	NUMMARKERTYPES,
+
+	MARKERTYPE_INVALID = 0x101
+};
+
+
+class C3dMarker
+{
+public:
+	CMatrix m_Matrix;
+	RpAtomic *m_pAtomic;
+	RpMaterial *m_pMaterial;
+	uint16 m_nType;
+	bool m_bIsUsed;
+	uint32 m_nIdentifier;
+	RwRGBA m_Color;
+	uint16 m_nPulsePeriod;
+	uint16 m_nRotateRate;
+	uint32 m_nStartTime;
+	float m_fPulseFraction;
+	float m_fStdSize;
+	float m_fSize;
+	float m_fBrightness;
+	float m_fCameraRange;
+
+	bool AddMarker(uint32 identifier, uint16 type, float fSize, uint8 r, uint8 g, uint8 b, uint8 a, uint16 pulsePeriod, float pulseFraction, int16 rotateRate);
+	void DeleteMarkerObject();
+	void Render();
+};
+
 class C3dMarkers
 {
 public:
-	static void PlaceMarkerSet(uint32 id, uint16 type, CVector& pos, float size, uint8 r, uint8 g, uint8 b, uint8 a, uint16 pulsePeriod, float pulseFraction, int16 rotateRate);  
+	static void Init();
+	static void Shutdown();
+	static C3dMarker *PlaceMarker(uint32 id, uint16 type, CVector &pos, float size, uint8 r, uint8 g, uint8 b, uint8 a, uint16 pulsePeriod, float pulseFraction, int16 rotateRate);
+	static void PlaceMarkerSet(uint32 id, uint16 type, CVector &pos, float size, uint8 r, uint8 g, uint8 b, uint8 a, uint16 pulsePeriod, float pulseFraction, int16 rotateRate);
+	static void Render();
+	static void Update();
+
+	static C3dMarker(&m_aMarkerArray)[NUM3DMARKERS];
+	static int32 &NumActiveMarkers;
+	static RpClump* (&m_pRpClumpArray)[NUMMARKERTYPES];
 };
 
 class CMoneyMessage

From 07c46936c334d4c620bc0a5866fb10ec0f6abc78 Mon Sep 17 00:00:00 2001
From: Sergeanur <s.anureev@yandex.ua>
Date: Thu, 17 Oct 2019 12:40:50 +0300
Subject: [PATCH 02/37] Changed math functions

---
 src/render/SpecialFX.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/render/SpecialFX.cpp b/src/render/SpecialFX.cpp
index 37bc306f..09881831 100644
--- a/src/render/SpecialFX.cpp
+++ b/src/render/SpecialFX.cpp
@@ -179,7 +179,7 @@ C3dMarkers::PlaceMarker(uint32 identifier, uint16 type, CVector &pos, float size
 	C3dMarker *pMarker;
 
 	pMarker = nil;
-	float dist = sqrt((pos.x - FindPlayerCentreOfWorld(0).x) * (pos.x - FindPlayerCentreOfWorld(0).x) + (pos.y - FindPlayerCentreOfWorld(0).y) * (pos.y - FindPlayerCentreOfWorld(0).y));
+	float dist = Sqrt((pos.x - FindPlayerCentreOfWorld(0).x) * (pos.x - FindPlayerCentreOfWorld(0).x) + (pos.y - FindPlayerCentreOfWorld(0).y) * (pos.y - FindPlayerCentreOfWorld(0).y));
 
 	if (type != MARKERTYPE_ARROW && type != MARKERTYPE_CYLINDER) return nil;
 
@@ -234,7 +234,7 @@ C3dMarkers::PlaceMarker(uint32 identifier, uint16 type, CVector &pos, float size
 				pMarker->m_Color.alpha = a;
 			}
 		}
-		float someSin = sinf(TWOPI * (float)((pMarker->m_nPulsePeriod - 1) & (CTimer::GetTimeInMilliseconds() - pMarker->m_nStartTime)) / (float)pMarker->m_nPulsePeriod);
+		float someSin = Sin(TWOPI * (float)((pMarker->m_nPulsePeriod - 1) & (CTimer::GetTimeInMilliseconds() - pMarker->m_nStartTime)) / (float)pMarker->m_nPulsePeriod);
 		pMarker->m_fSize = pMarker->m_fStdSize - pulseFraction * pMarker->m_fStdSize * someSin;
 
 		if (type == MARKERTYPE_ARROW) {

From bc0ddc6b18405d4602a90edae02e98e8a001eab9 Mon Sep 17 00:00:00 2001
From: Sergeanur <s.anureev@yandex.ua>
Date: Sun, 20 Oct 2019 20:31:59 +0300
Subject: [PATCH 03/37] CText encoding fixes

---
 premake5.lua                |  2 +
 src/{core => text}/Text.cpp | 85 ++++++++++++++++++++++++++++---------
 src/{core => text}/Text.h   |  7 ++-
 3 files changed, 71 insertions(+), 23 deletions(-)
 rename src/{core => text}/Text.cpp (67%)
 rename src/{core => text}/Text.h (86%)

diff --git a/premake5.lua b/premake5.lua
index 8b2373a1..b06749c5 100644
--- a/premake5.lua
+++ b/premake5.lua
@@ -15,6 +15,7 @@ workspace "re3"
 	files { "src/render/*.*" }
 	files { "src/skel/*.*" }
 	files { "src/skel/win/*.*" }
+	files { "src/text/*.*" }
 	files { "src/vehicles/*.*" }
 	files { "src/weapons/*.*" }
 	files { "eax/*.*" }
@@ -32,6 +33,7 @@ workspace "re3"
 	includedirs { "src/render" }
 	includedirs { "src/skel/" }
 	includedirs { "src/skel/win" }
+	includedirs { "src/text" }
 	includedirs { "src/vehicles" }
 	includedirs { "src/weapons" }
 	includedirs { "eax" }
diff --git a/src/core/Text.cpp b/src/text/Text.cpp
similarity index 67%
rename from src/core/Text.cpp
rename to src/text/Text.cpp
index dfa9815c..40717ed5 100644
--- a/src/core/Text.cpp
+++ b/src/text/Text.cpp
@@ -11,20 +11,10 @@ CText &TheText = *(CText*)0x941520;
 
 CText::CText(void)
 {
-	keyArray.entries = nil;
-	keyArray.numEntries = 0;
-	data.chars = nil;
-	data.numChars = 0;
-	encoding = 101;
+	encoding = 'e';
 	memset(WideErrorString, 0, sizeof(WideErrorString));
 }
 
-CText::~CText(void)
-{
-	data.Unload();
-	keyArray.Unload();
-}
-
 void
 CText::Load(void)
 {
@@ -96,12 +86,64 @@ CText::Get(const char *key)
 	return keyArray.Search(key);
 }
 
+wchar UpperCaseTable[128] = {
+	128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138,
+	139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149,
+	150, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137,
+	138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148,
+	149, 173, 173, 175, 176, 177, 178, 179, 180, 181, 182,
+	183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193,
+	194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204,
+	205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215,
+	216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226,
+	227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237,
+	238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248,
+	249, 250, 251, 252, 253, 254, 255
+};
+
+wchar FrenchUpperCaseTable[128] = {
+	128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138,
+	139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149,
+	150, 65, 65, 65, 65, 132, 133, 69, 69, 69, 69, 73, 73,
+	73, 73, 79, 79, 79, 79, 85, 85, 85, 85, 173, 173, 175,
+	176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186,
+	187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197,
+	198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208,
+	209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219,
+	220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230,
+	231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241,
+	242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252,
+	253, 254, 255
+};
+
 wchar
 CText::GetUpperCase(wchar c)
-{
-	// TODO: do this depending on encoding
-	if(islower(c))
-		return toupper(c);
+{
+	switch (encoding)
+	{
+	case 'e':
+		if (c >= 'a' && c <= 'z')
+			return c - 32;
+		break;
+	case 'f':
+		if (c >= 'a' && c <= 'z')
+			return c - 32;
+
+		if (c >= 128 && c <= 255)
+			return FrenchUpperCaseTable[c-128];
+		break;
+	case 'g':
+	case 'i':
+	case 's':
+		if (c >= 'a' && c <= 'z')
+			return c - 32;
+
+		if (c >= 128 && c <= 255)
+			return UpperCaseTable[c-128];
+		break;
+	default:
+		break;
+	}
 	return c;
 }
 
@@ -205,7 +247,7 @@ CData::Unload(void)
 }
 
 void
-AsciiToUnicode(const char *src, uint16 *dst)
+AsciiToUnicode(const char *src, wchar *dst)
 {
 	while((*dst++ = *src++) != '\0');
 }
@@ -215,8 +257,8 @@ UnicodeToAscii(wchar *src)
 {
 	static char aStr[256];
 	int len;
-	for(len = 0; src && *src != 0 && len < 256-1; len++, src++)
-		if(*src < 256)
+	for(len = 0; *src != '\0' && len < 256-1; len++, src++)
+		if(*src < 128)
 			aStr[len] = *src;
 		else
 			aStr[len] = '#';
@@ -227,10 +269,9 @@ UnicodeToAscii(wchar *src)
 char*
 UnicodeToAsciiForSaveLoad(wchar *src)
 {
-	// exact same code as above
 	static char aStr[256];
 	int len;
-	for(len = 0; src && *src != 0 && len < 256-1; len++, src++)
+	for(len = 0; *src != '\0' && len < 256-1; len++, src++)
 		if(*src < 256)
 			aStr[len] = *src;
 		else
@@ -249,7 +290,7 @@ int
 UnicodeStrlen(const wchar *str)
 {
 	int len;
-	for(len = 0; *str != 0; len++, str++);
+	for(len = 0; *str != '\0'; len++, str++);
 	return len;
 }
 
@@ -264,6 +305,8 @@ STARTPATCHES
 	InjectHook(0x52C3C0, &CText::Load, PATCH_JUMP);
 	InjectHook(0x52C580, &CText::Unload, PATCH_JUMP);
 	InjectHook(0x52C5A0, &CText::Get, PATCH_JUMP);
+	InjectHook(0x52C220, &CText::GetUpperCase, PATCH_JUMP);
+	InjectHook(0x52C2C0, &CText::UpperCase, PATCH_JUMP);
 
 	InjectHook(0x52BE70, &CKeyArray::Load, PATCH_JUMP);
 	InjectHook(0x52BF60, &CKeyArray::Unload, PATCH_JUMP);
diff --git a/src/core/Text.h b/src/text/Text.h
similarity index 86%
rename from src/core/Text.h
rename to src/text/Text.h
index f554628c..6f39ba49 100644
--- a/src/core/Text.h
+++ b/src/text/Text.h
@@ -21,6 +21,8 @@ public:
 	CKeyEntry *entries;
 	int numEntries;
 
+	CKeyArray(void) : entries(nil), numEntries(0) {}
+	~CKeyArray(void) { Unload(); }
 	void Load(uint32 length, uint8 *data, int *offset);
 	void Unload(void);
 	void Update(wchar *chars);
@@ -34,6 +36,8 @@ public:
 	wchar *chars;
 	int numChars;
 
+	CData(void) : chars(nil), numChars(0) {}
+	~CData(void) { Unload(); }
 	void Load(uint32 length, uint8 *data, int *offset);
 	void Unload(void);
 };
@@ -42,10 +46,9 @@ class CText
 {
 	CKeyArray keyArray;
 	CData data;
-	int8 encoding;
+	char encoding;
 public:
 	CText(void);
-	~CText(void);
 	void Load(void);
 	void Unload(void);
 	wchar *Get(const char *key);

From 383f70d1e7fe838b193f77d8a11400457a92f4ee Mon Sep 17 00:00:00 2001
From: Sergeanur <s.anureev@yandex.ua>
Date: Sun, 20 Oct 2019 20:33:16 +0300
Subject: [PATCH 04/37] Move Messages

---
 src/{core => text}/Messages.cpp | 0
 src/{core => text}/Messages.h   | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename src/{core => text}/Messages.cpp (100%)
 rename src/{core => text}/Messages.h (100%)

diff --git a/src/core/Messages.cpp b/src/text/Messages.cpp
similarity index 100%
rename from src/core/Messages.cpp
rename to src/text/Messages.cpp
diff --git a/src/core/Messages.h b/src/text/Messages.h
similarity index 100%
rename from src/core/Messages.h
rename to src/text/Messages.h

From c97a28b3857b0ae589bb9032a1a43c5f6f8e46d2 Mon Sep 17 00:00:00 2001
From: Sergeanur <s.anureev@yandex.ua>
Date: Sun, 20 Oct 2019 20:34:16 +0300
Subject: [PATCH 05/37] Full CPager

---
 src/core/User.cpp  |   2 -
 src/core/User.h    |   8 +-
 src/text/Pager.cpp | 194 +++++++++++++++++++++++++++++++++++++++++++++
 src/text/Pager.h   |  29 +++++++
 4 files changed, 225 insertions(+), 8 deletions(-)
 create mode 100644 src/text/Pager.cpp
 create mode 100644 src/text/Pager.h

diff --git a/src/core/User.cpp b/src/core/User.cpp
index 693333b7..600fa443 100644
--- a/src/core/User.cpp
+++ b/src/core/User.cpp
@@ -13,8 +13,6 @@ COnscreenTimer& CUserDisplay::OnscnTimer = *(COnscreenTimer*)0x862238;
 CPager& CUserDisplay::Pager = *(CPager*)0x8F2744;
 CCurrentVehicle& CUserDisplay::CurrentVehicle = *(CCurrentVehicle*)0x8F5FE8;
 
-WRAPPER void CPager::AddMessage(wchar*, uint16, uint16, uint16) { EAXJMP(0x52B940); }
-
 WRAPPER void CUserDisplay::Process(void) { EAXJMP(0x4AD690); }
 
 void COnscreenTimer::Init() {
diff --git a/src/core/User.h b/src/core/User.h
index 27bb7f9e..90b2da55 100644
--- a/src/core/User.h
+++ b/src/core/User.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "Pager.h"
+
 class COnscreenTimerEntry
 {
 public:
@@ -50,12 +52,6 @@ class CCurrentVehicle
 {
 };
 
-class CPager
-{
-public:
-	void AddMessage(wchar*, uint16, uint16, uint16);
-};
-
 class CUserDisplay
 {
 public:
diff --git a/src/text/Pager.cpp b/src/text/Pager.cpp
new file mode 100644
index 00000000..d20be45d
--- /dev/null
+++ b/src/text/Pager.cpp
@@ -0,0 +1,194 @@
+#include "common.h"
+#include "patcher.h"
+#include "Pager.h"
+#include "Timer.h"
+#include "Messages.h"
+#include "Hud.h"
+#include "Camera.h"
+
+void
+CPager::Init()
+{
+	ClearMessages();
+	m_nNumDisplayLetters = 8;
+}
+
+void
+CPager::Process()
+{
+	if (m_messages[0].m_pText != nil && m_messages[0].m_nCurrentPosition >= (int32)m_messages[0].m_nStringLength) {
+		m_messages[0].m_pText = nil;
+		uint16 i = 0;
+		while (i < 7) {
+			if (m_messages[i + 1].m_pText == nil) break;
+			m_messages[i] = m_messages[i + 1];
+		}
+		m_messages[i].m_pText = nil;
+		if (m_messages[0].m_pText)
+			CMessages::AddToPreviousBriefArray(
+				m_messages[0].m_pText,
+				m_messages[0].m_nNumber[0],
+				m_messages[0].m_nNumber[1],
+				m_messages[0].m_nNumber[2],
+				m_messages[0].m_nNumber[3],
+				m_messages[0].m_nNumber[4],
+				m_messages[0].m_nNumber[5],
+				0);
+	}
+	Display();
+	if (m_messages[0].m_pText != nil) {
+		if (TheCamera.m_WideScreenOn || !CHud::m_Wants_To_Draw_Hud || CHud::m_BigMessage[0][0] || CHud::m_BigMessage[2][0]) {
+			RestartCurrentMessage();
+		} else {
+			if (CTimer::GetTimeInMilliseconds() > m_messages[0].m_nTimeToChangePosition) {
+				m_messages[0].m_nCurrentPosition++;
+				m_messages[0].m_nTimeToChangePosition = CTimer::GetTimeInMilliseconds() + m_messages[0].m_nSpeedMs;
+			}
+		}
+	}
+}
+
+void
+CPager::Display()
+{
+	wchar outstr1[256];
+	wchar outstr2[260];
+
+	wchar *pText = m_messages[0].m_pText;
+	uint16 i = 0;
+	if (pText) {
+		CMessages::InsertNumberInString(
+			pText,
+			m_messages[0].m_nNumber[0],
+			m_messages[0].m_nNumber[1],
+			m_messages[0].m_nNumber[2],
+			m_messages[0].m_nNumber[3],
+			m_messages[0].m_nNumber[4],
+			m_messages[0].m_nNumber[5],
+			outstr1);
+		for (; i < m_nNumDisplayLetters; i++) {
+			int pos = m_messages[0].m_nCurrentPosition + i;
+			if (pos >= 0) {
+				if (!outstr1[pos]) break;
+
+				outstr2[i] = outstr1[pos];
+			}
+			else {
+				outstr2[i] = ' ';
+			}
+		}
+	}
+	outstr2[i] = '\0';
+	CHud::SetPagerMessage(outstr2);
+}
+
+void
+CPager::AddMessage(wchar *str, uint16 speed, uint16 priority, uint16 a5)
+{
+	uint16 size = CMessages::GetWideStringLength(str);
+	for (int i = 0; i < 8; i++) {
+		if (m_messages[i].m_pText) {
+			if (m_messages[i].m_nPriority >= priority)
+				continue;
+
+			for (int j = 7; j > i; j--)
+				m_messages[j] = m_messages[j-1];
+
+		}
+		m_messages[i].m_pText = str;
+		m_messages[i].m_nSpeedMs = speed;
+		m_messages[i].m_nPriority = priority;
+		m_messages[i].field_10 = a5;
+		m_messages[i].m_nCurrentPosition = -(m_nNumDisplayLetters + 10);
+		m_messages[i].m_nTimeToChangePosition = CTimer::GetTimeInMilliseconds() + speed;
+		m_messages[i].m_nStringLength = size;
+		m_messages[i].m_nNumber[0] = -1;
+		m_messages[i].m_nNumber[1] = -1;
+		m_messages[i].m_nNumber[2] = -1;
+		m_messages[i].m_nNumber[3] = -1;
+		m_messages[i].m_nNumber[4] = -1;
+		m_messages[i].m_nNumber[5] = -1;
+
+		if (i == 0)
+			CMessages::AddToPreviousBriefArray(
+				m_messages[0].m_pText,
+				m_messages[0].m_nNumber[0],
+				m_messages[0].m_nNumber[1],
+				m_messages[0].m_nNumber[2],
+				m_messages[0].m_nNumber[3],
+				m_messages[0].m_nNumber[4],
+				m_messages[0].m_nNumber[5],
+				nil);
+			return;
+	}
+}
+
+void
+CPager::AddMessageWithNumber(wchar *str, int32 n1, int32 n2, int32 n3, int32 n4, int32 n5, int32 n6, uint16 speed, uint16 priority, uint16 a11)
+{
+	wchar nstr[520];
+
+	CMessages::InsertNumberInString(str, n1, n2, n3, n4, n5, n6, nstr);
+	uint16 size = CMessages::GetWideStringLength(nstr);
+	for (int i = 0; i < 8; i++) {
+		if (m_messages[i].m_pText) {
+			if (m_messages[i].m_nPriority >= priority)
+				continue;
+
+			for (int j = 7; j > i; j--)
+				m_messages[j] = m_messages[j - 1];
+
+		}
+		m_messages[i].m_pText = str;
+		m_messages[i].m_nSpeedMs = speed;
+		m_messages[i].m_nPriority = priority;
+		m_messages[i].field_10 = a11;
+		m_messages[i].m_nCurrentPosition = -(m_nNumDisplayLetters + 10);
+		m_messages[i].m_nTimeToChangePosition = CTimer::GetTimeInMilliseconds() + speed;
+		m_messages[i].m_nStringLength = size;
+		m_messages[i].m_nNumber[0] = n1;
+		m_messages[i].m_nNumber[1] = n2;
+		m_messages[i].m_nNumber[2] = n3;
+		m_messages[i].m_nNumber[3] = n4;
+		m_messages[i].m_nNumber[4] = n5;
+		m_messages[i].m_nNumber[5] = n6;
+
+		if (i == 0)
+			CMessages::AddToPreviousBriefArray(
+				m_messages[0].m_pText,
+				m_messages[0].m_nNumber[0],
+				m_messages[0].m_nNumber[1],
+				m_messages[0].m_nNumber[2],
+				m_messages[0].m_nNumber[3],
+				m_messages[0].m_nNumber[4],
+				m_messages[0].m_nNumber[5],
+				nil);
+		return;
+	}
+}
+
+void
+CPager::ClearMessages()
+{
+	for (int i = 0; i < 8; i++)
+		m_messages[i].m_pText = nil;
+}
+
+void
+CPager::RestartCurrentMessage()
+{
+	if (m_messages[0].m_pText) {
+		m_messages[0].m_nCurrentPosition = -(m_nNumDisplayLetters + 10);
+		m_messages[0].m_nTimeToChangePosition = CTimer::GetTimeInMilliseconds() + m_messages[0].m_nSpeedMs;
+	}
+}
+
+STARTPATCHES
+	InjectHook(0x52B6F0, &CPager::Init, PATCH_JUMP);
+	InjectHook(0x52B740, &CPager::Process, PATCH_JUMP);
+	InjectHook(0x52B890, &CPager::Display, PATCH_JUMP);
+	InjectHook(0x52B940, &CPager::AddMessage, PATCH_JUMP);
+	InjectHook(0x52BB50, &CPager::AddMessageWithNumber, PATCH_JUMP);
+	InjectHook(0x52BE50, &CPager::RestartCurrentMessage, PATCH_JUMP);
+	InjectHook(0x52BE00, &CPager::ClearMessages, PATCH_JUMP);
+ENDPATCHES
\ No newline at end of file
diff --git a/src/text/Pager.h b/src/text/Pager.h
new file mode 100644
index 00000000..90291c74
--- /dev/null
+++ b/src/text/Pager.h
@@ -0,0 +1,29 @@
+#pragma once
+
+struct PagerMessage {
+	wchar *m_pText;
+	uint16 m_nSpeedMs;
+	int16 m_nCurrentPosition;
+	uint16 m_nStringLength;
+	uint16 m_nPriority;
+	uint32 m_nTimeToChangePosition;
+	int16 field_10;
+private:
+	char _pad12[2];
+public:
+	int32 m_nNumber[6];
+};
+
+class CPager
+{
+	int16 m_nNumDisplayLetters;
+	PagerMessage m_messages[8];
+public:
+	void Init();
+	void Process();
+	void Display();
+	void AddMessage(wchar*, uint16, uint16, uint16);
+	void AddMessageWithNumber(wchar *str, int32 n1, int32 n2, int32 n3, int32 n4, int32 n5, int32 n6, uint16 speed, uint16 priority, uint16 a11);
+	void ClearMessages();
+	void RestartCurrentMessage();
+};
\ No newline at end of file

From e35780df43d5bd17f1e2a6ae731a63d034d1c5c4 Mon Sep 17 00:00:00 2001
From: Sergeanur <s.anureev@yandex.ua>
Date: Mon, 21 Oct 2019 01:08:26 +0300
Subject: [PATCH 06/37] Full Messages

---
 src/control/Script.cpp        |  12 +-
 src/core/ControllerConfig.cpp |   1 +
 src/core/ControllerConfig.h   |  62 ++-
 src/text/Messages.cpp         | 863 +++++++++++++++++++++++++++++++++-
 src/text/Messages.h           |  58 ++-
 src/text/Pager.cpp            |  18 +-
 src/text/Pager.h              |   7 +-
 7 files changed, 950 insertions(+), 71 deletions(-)

diff --git a/src/control/Script.cpp b/src/control/Script.cpp
index 777acb12..ced06f1e 100644
--- a/src/control/Script.cpp
+++ b/src/control/Script.cpp
@@ -662,12 +662,12 @@ void CRunningScript::Process()
 	if (!CPad::GetPad(0)->GetCrossJustDown())
 		return;
 	m_nWakeTime = 0;
-	for (int i = 0; i < 6; i++){ /* TODO: add constant for number of messages */
-		if (CMessages::BIGMessages[i].m_Current.m_pText)
-			CMessages::BIGMessages[i].m_Current.m_nStartTime = 0;
-		if (CMessages::BriefMessages[0].m_pText)
-			CMessages::BriefMessages[0].m_nStartTime = 0;
+	for (int i = 0; i < NUMBIGMESSAGES; i++){
+		if (CMessages::BIGMessages[i].m_Stack[0].m_pText != nil)
+			CMessages::BIGMessages[i].m_Stack[0].m_nStartTime = 0;
 	}
+	if (CMessages::BriefMessages[0].m_pText != nil)
+		CMessages::BriefMessages[0].m_nStartTime = 0;
 }
 
 int8 CRunningScript::ProcessOneCommand()
@@ -2183,7 +2183,7 @@ int8 CRunningScript::ProcessCommandsFrom100To199(int32 command)
 		wchar* key = TheText.Get((char*)&CTheScripts::ScriptSpace[m_nIp]);
 		m_nIp += 8;
 		CollectParameters(&m_nIp, 2);
-		CMessages::AddMessage(key, ScriptParams[0], ScriptParams[1]);
+		CMessages::AddMessageSoon(key, ScriptParams[0], ScriptParams[1]);
 		return 0;
 	}
 	case COMMAND_CLEAR_PRINTS:
diff --git a/src/core/ControllerConfig.cpp b/src/core/ControllerConfig.cpp
index e3a586b2..6eef4d3d 100644
--- a/src/core/ControllerConfig.cpp
+++ b/src/core/ControllerConfig.cpp
@@ -22,6 +22,7 @@ WRAPPER void CControllerConfigManager::ClearSimButtonPressCheckers() { EAXJMP(0x
 WRAPPER void CControllerConfigManager::AffectPadFromKeyBoard() { EAXJMP(0x58D0C0); }
 WRAPPER void CControllerConfigManager::AffectPadFromMouse() { EAXJMP(0x58D1A0); }
 WRAPPER void CControllerConfigManager::ClearSettingsAssociatedWithAction(int, int) { EAXJMP(0x58EB40); }
+WRAPPER void CControllerConfigManager::GetWideStringOfCommandKeys(uint16, wchar*, uint16) { EAXJMP(0x58F460); }
 
 void CControllerConfigManager::LoadSettings(int32 file)
 {
diff --git a/src/core/ControllerConfig.h b/src/core/ControllerConfig.h
index b064a381..ab17577b 100644
--- a/src/core/ControllerConfig.h
+++ b/src/core/ControllerConfig.h
@@ -9,10 +9,64 @@ enum eControllerType
 	OPTIONAL_EXTRA,
 	MOUSE,
 	JOYSTICK,
+	TOTAL_CONTROLLER_TYPES
+};
+
+enum e_ControllerAction
+{
+	PED_FIREWEAPON = 0,
+	PED_CYCLE_WEAPON_RIGHT,
+	PED_CYCLE_WEAPON_LEFT,
+	GO_FORWARD,
+	GO_BACK,
+	GO_LEFT,
+	GO_RIGHT,
+	PED_SNIPER_ZOOM_IN,
+	PED_SNIPER_ZOOM_OUT,
+	VEHICLE_ENTER_EXIT,
+	CAMERA_CHANGE_VIEW_ALL_SITUATIONS,
+	PED_JUMPING,
+	PED_SPRINT,
+	PED_LOOKBEHIND,
+	//PED_DUCK,				// VC
+	//PED_ANSWER_PHONE,		// VC
+	VEHICLE_ACCELERATE,
+	VEHICLE_BRAKE,
+	VEHICLE_CHANGE_RADIO_STATION,
+	VEHICLE_HORN,
+	TOGGLE_SUBMISSIONS,
+	VEHICLE_HANDBRAKE,
+	PED_1RST_PERSON_LOOK_LEFT,
+	PED_1RST_PERSON_LOOK_RIGHT,
+	VEHICLE_LOOKLEFT,
+	VEHICLE_LOOKRIGHT,
+	VEHICLE_LOOKBEHIND,
+	VEHICLE_TURRETLEFT,
+	VEHICLE_TURRETRIGHT,
+	VEHICLE_TURRETUP,
+	VEHICLE_TURRETDOWN,
+	PED_CYCLE_TARGET_LEFT,
+	PED_CYCLE_TARGET_RIGHT,
+	PED_CENTER_CAMERA_BEHIND_PLAYER,
+	PED_LOCK_TARGET,
+	NETWORK_TALK,
+	PED_1RST_PERSON_LOOK_UP,
+	PED_1RST_PERSON_LOOK_DOWN,
+
+	CONTROLLERACTION_36, // unk, unused?
+
+	TOGGLE_DPAD,
+	SWITCH_DEBUG_CAM_ON,
+	TAKE_SCREEN_SHOT,
+	SHOW_MOUSE_POINTER_TOGGLE,
+
+	TOTAL_CONTROL_ACTIONS
 };
 
 class CMouseControllerState;
 
+#define ACTIONNAME_LENGTH 40
+
 class CControllerConfigManager
 {
 public:
@@ -23,16 +77,13 @@ public:
 	};
 
 	bool firstCapture;
-	char _pad0[3];
 	DIJOYSTATE2 m_OldState;
 	DIJOYSTATE2 m_NewState;
-	wchar m_aActionNames[41][40];
+	wchar m_aActionNames[TOTAL_CONTROL_ACTIONS][ACTIONNAME_LENGTH];
 	bool m_aButtonStates[17];
-	char _pad1[3];
-	tControllerConfigBind m_aSettings[41][4];
+	tControllerConfigBind m_aSettings[TOTAL_CONTROL_ACTIONS][TOTAL_CONTROLLER_TYPES];
 	uint8 m_aSimCheckers[4][4];
 	bool m_bMouseAssociated;
-	char _pad2[3];
 	
 	void UpdateJoyButtonState(int padnumber);
 	void UpdateJoyInConfigMenus_ButtonDown(int button, int padnumber);
@@ -52,6 +103,7 @@ public:
 	void AffectPadFromMouse();
 	void ClearSettingsAssociatedWithAction(int, int);
 
+	void GetWideStringOfCommandKeys(uint16, wchar*, uint16);
 };
 
 VALIDATE_SIZE(CControllerConfigManager, 0x143C);
diff --git a/src/text/Messages.cpp b/src/text/Messages.cpp
index 9b5342ac..83369b84 100644
--- a/src/text/Messages.cpp
+++ b/src/text/Messages.cpp
@@ -1,26 +1,845 @@
+#define DIRECTINPUT_VERSION 0x0800
+#include "dinput.h"
+
 #include "common.h"
 #include "patcher.h"
 #include "Messages.h"
+#include "RwHelper.h"
+#include "Hud.h"
+#include "User.h"
+#include "Timer.h"
+#include "Text.h"
 
-WRAPPER void CMessages::Display(void) { EAXJMP(0x529800); }
-WRAPPER void CMessages::ClearAllMessagesDisplayedByGame(void) { EAXJMP(0x52B670); }
-WRAPPER int CMessages::WideStringCopy(wchar* dst, wchar* src, unsigned short size) { EAXJMP(0x5294B0); }
-WRAPPER char CMessages::WideStringCompare(wchar* str1, wchar* str2, unsigned short size) { EAXJMP(0x529510); }
-WRAPPER void CMessages::InsertNumberInString(wchar* src, int n1, int n2, int n3, int n4, int n5, int n6, wchar* dst) { EAXJMP(0x52A1A0); }
-WRAPPER void CMessages::InsertPlayerControlKeysInString(wchar* src) { EAXJMP(0x52A490); }
-WRAPPER int CMessages::GetWideStringLength(wchar* src) { EAXJMP(0x529490); }
-WRAPPER void CMessages::AddBigMessage(wchar* key, uint32 time, uint16 pos) { EAXJMP(0x529EB0);  }
-WRAPPER void CMessages::AddBigMessageWithNumber(wchar* key, uint32 time, uint16 pos, int n1, int n2, int n3, int n4, int n5, int n6) { EAXJMP(0x52AD10); }
-WRAPPER void CMessages::AddBigMessageWithNumberQ(wchar* key, uint32 time, uint16 pos, int n1, int n2, int n3, int n4, int n5, int n6) { EAXJMP(0x52AE00); }
-WRAPPER void CMessages::AddMessage(wchar* key, uint32 time, uint16 pos) { EAXJMP(0x529900); }
-WRAPPER void CMessages::AddMessageJumpQ(wchar* key, uint32 time, uint16 pos) { EAXJMP(0x529A10); }
-WRAPPER void CMessages::AddMessageSoon(wchar* key, uint32 time, uint16 pos) { EAXJMP(0x529AF0); }
-WRAPPER void CMessages::AddMessageWithNumber(wchar* key, uint32 time, uint16 pos, int n1, int n2, int n3, int n4, int n5, int n6) { EAXJMP(0x52A850); }
-WRAPPER void CMessages::AddMessageJumpQWithNumber(wchar* key, uint32 time, uint16 pos, int n1, int n2, int n3, int n4, int n5, int n6) { EAXJMP(0x52A9A0); }
-WRAPPER void CMessages::AddMessageSoonWithNumber(wchar* key, uint32 time, uint16 pos, int n1, int n2, int n3, int n4, int n5, int n6) { EAXJMP(0x52AAC0); }
-WRAPPER void CMessages::ClearMessages() { EAXJMP(0x529CE0); }
-WRAPPER void CMessages::Init() { EAXJMP(0x529310); }
-WRAPPER void CMessages::Process() { EAXJMP(0x529580); }
-tPreviousBrief *CMessages::PreviousBriefs = (tPreviousBrief *)0x713C08;
-tMessage *CMessages::BriefMessages = (tMessage *)0x8786E0;
-tBigMessage *CMessages::BIGMessages = (tBigMessage *)0x773628;
+#include "ControllerConfig.h"
+
+tMessage(&CMessages::BriefMessages)[NUMBRIEFMESSAGES] = *(tMessage(*)[NUMBRIEFMESSAGES])*(uintptr*)0x8786E0;
+tPreviousBrief(&CMessages::PreviousBriefs)[NUMPREVIOUSBRIEFS] = *(tPreviousBrief(*)[NUMPREVIOUSBRIEFS])*(uintptr*)0x713C08;
+tBigMessage(&CMessages::BIGMessages)[NUMBIGMESSAGES] = *(tBigMessage(*)[NUMBIGMESSAGES])*(uintptr*)0x773628;
+
+void
+CMessages::Init()
+{
+	ClearMessages();
+
+	for (int32 i = 0; i < NUMPREVIOUSBRIEFS; i++) {
+		PreviousBriefs[i].m_pText = nil;
+		PreviousBriefs[i].m_pString = nil;
+	}
+}
+
+uint16
+CMessages::GetWideStringLength(wchar *src)
+{
+	uint16 length = 0;
+	while (*(src++)) length++;
+	return length;
+}
+
+void
+CMessages::WideStringCopy(wchar *dst, wchar *src, uint16 size)
+{
+	int32 i = 0;
+	if (src) {
+		while (i < size - 1) {
+			if (!src[i]) break;
+			dst[i] = src[i];
+			i++;
+		}
+	} else {
+		while (i < size - 1)
+			dst[i++] = '\0';
+	}
+	dst[i] = '\0';
+}
+
+bool
+CMessages::WideStringCompare(wchar *str1, wchar *str2, uint16 size)
+{
+	uint16 len1 = GetWideStringLength(str1);
+	uint16 len2 = GetWideStringLength(str2);
+	if (len1 != len2 && (len1 < size || len2 < size))
+		return false;
+
+	for (int32 i = 0; i < size; i++) {
+		if (!str1[i])
+			break;
+
+		if (str1[i] != str2[i])
+			return false;
+	}
+	return true;
+}
+
+void
+CMessages::Process()
+{
+	for (int32 style = 0; style < 6; style++) {
+		if (BIGMessages[style].m_Stack[0].m_pText != nil && CTimer::GetTimeInMilliseconds() > BIGMessages[style].m_Stack[0].m_nTime + BIGMessages[style].m_Stack[0].m_nStartTime) {
+			BIGMessages[style].m_Stack[0].m_pText = nil;
+
+			int32 i = 0;
+			while (i < 3) {
+				if (BIGMessages[style].m_Stack[i + 1].m_pText == nil) break;
+				BIGMessages[style].m_Stack[i] = BIGMessages[style].m_Stack[i + 1];
+				i++;
+			}
+
+			BIGMessages[style].m_Stack[i].m_pText = nil;
+			BIGMessages[style].m_Stack[0].m_nStartTime = CTimer::GetTimeInMilliseconds();
+		}
+	}
+
+	if (BriefMessages[0].m_pText != nil && CTimer::GetTimeInMilliseconds() > BriefMessages[0].m_nTime + BriefMessages[0].m_nStartTime) {
+		BriefMessages[0].m_pText = nil;
+		int32 i = 0;
+		while (i < NUMBRIEFMESSAGES-1) {
+			if (BriefMessages[i + 1].m_pText == nil)
+				break;
+
+			BriefMessages[i] = BriefMessages[i + 1];
+			i++;
+		}
+		CMessages::BriefMessages[i].m_pText = nil;
+		CMessages::BriefMessages[0].m_nStartTime = CTimer::GetTimeInMilliseconds();
+		if (BriefMessages[0].m_pText != nil)
+			AddToPreviousBriefArray(
+				BriefMessages[0].m_pText,
+				BriefMessages[0].m_nNumber[0],
+				BriefMessages[0].m_nNumber[1],
+				BriefMessages[0].m_nNumber[2],
+				BriefMessages[0].m_nNumber[3],
+				BriefMessages[0].m_nNumber[4],
+				BriefMessages[0].m_nNumber[5],
+				BriefMessages[0].m_pString);
+	}
+}
+
+void
+CMessages::Display()
+{
+	wchar outstr[260];
+
+	DefinedState();
+
+	for (int32 i = 0; i < NUMBIGMESSAGES; i++) {
+		InsertNumberInString(
+			BIGMessages[i].m_Stack[0].m_pText,
+			BIGMessages[i].m_Stack[0].m_nNumber[0],
+			BIGMessages[i].m_Stack[0].m_nNumber[1],
+			BIGMessages[i].m_Stack[0].m_nNumber[2],
+			BIGMessages[i].m_Stack[0].m_nNumber[3],
+			BIGMessages[i].m_Stack[0].m_nNumber[4],
+			BIGMessages[i].m_Stack[0].m_nNumber[5],
+			outstr);
+		InsertStringInString(outstr, BIGMessages[i].m_Stack[0].m_pString);
+		InsertPlayerControlKeysInString(outstr);
+		CHud::SetBigMessage(outstr, i);
+	}
+
+	InsertNumberInString(
+		BriefMessages[0].m_pText,
+		BriefMessages[0].m_nNumber[0],
+		BriefMessages[0].m_nNumber[1],
+		BriefMessages[0].m_nNumber[2],
+		BriefMessages[0].m_nNumber[3],
+		BriefMessages[0].m_nNumber[4],
+		BriefMessages[0].m_nNumber[5],
+		outstr);
+	InsertStringInString(outstr, BriefMessages[0].m_pString);
+	InsertPlayerControlKeysInString(outstr);
+	CHud::SetMessage(outstr);
+}
+
+void
+CMessages::AddMessage(wchar *msg, uint32 time, uint16 flag)
+{
+	wchar outstr[514];
+
+	WideStringCopy(outstr, msg, 256);
+	InsertPlayerControlKeysInString(outstr);
+	GetWideStringLength(outstr); // unused, was assert? 
+
+	int32 i = 0;
+	while (i < NUMBRIEFMESSAGES && BriefMessages[i].m_pText != nil)
+		i++;
+	if (i >= NUMBRIEFMESSAGES) return;
+
+	BriefMessages[i].m_pText = msg;
+	BriefMessages[i].m_nFlag = flag;
+	BriefMessages[i].m_nTime = time;
+	BriefMessages[i].m_nStartTime = CTimer::GetTimeInMilliseconds();
+	BriefMessages[i].m_nNumber[0] = -1;
+	BriefMessages[i].m_nNumber[1] = -1;
+	BriefMessages[i].m_nNumber[2] = -1;
+	BriefMessages[i].m_nNumber[3] = -1;
+	BriefMessages[i].m_nNumber[4] = -1;
+	BriefMessages[i].m_nNumber[5] = -1;
+	BriefMessages[i].m_pString = nil;
+	if (i == 0)
+		AddToPreviousBriefArray(
+			BriefMessages[0].m_pText,
+			BriefMessages[0].m_nNumber[0],
+			BriefMessages[0].m_nNumber[1],
+			BriefMessages[0].m_nNumber[2],
+			BriefMessages[0].m_nNumber[3],
+			BriefMessages[0].m_nNumber[4],
+			BriefMessages[0].m_nNumber[5],
+			BriefMessages[0].m_pString);
+}
+
+void
+CMessages::AddMessageJumpQ(wchar *msg, uint32 time, uint16 flag)
+{
+	wchar outstr[514];
+
+	WideStringCopy(outstr, msg, 256);
+	InsertPlayerControlKeysInString(outstr);
+	GetWideStringLength(outstr); // unused, was assert? 
+
+	BriefMessages[0].m_pText = msg;
+	BriefMessages[0].m_nFlag = flag;
+	BriefMessages[0].m_nTime = time;
+	BriefMessages[0].m_nStartTime = CTimer::GetTimeInMilliseconds();
+	BriefMessages[0].m_nNumber[0] = -1;
+	BriefMessages[0].m_nNumber[1] = -1;
+	BriefMessages[0].m_nNumber[2] = -1;
+	BriefMessages[0].m_nNumber[3] = -1;
+	BriefMessages[0].m_nNumber[4] = -1;
+	BriefMessages[0].m_nNumber[5] = -1;
+	BriefMessages[0].m_pString = nil;
+	AddToPreviousBriefArray(msg, -1, -1, -1, -1, -1, -1, 0);
+}
+
+void
+CMessages::AddMessageSoon(wchar *msg, uint32 time, uint16 flag)
+{
+	wchar outstr[520];
+
+	WideStringCopy(outstr, msg, 256);
+	InsertPlayerControlKeysInString(outstr);
+	GetWideStringLength(outstr); // unused, was assert? 
+	if (BriefMessages[0].m_pText != nil) {
+		for (int i = NUMBRIEFMESSAGES-1; i > 1; i--)
+			BriefMessages[i] = BriefMessages[i-1];
+
+		BriefMessages[1].m_pText = msg;
+		BriefMessages[1].m_nFlag = flag;
+		BriefMessages[1].m_nTime = time;
+		BriefMessages[1].m_nStartTime = CTimer::GetTimeInMilliseconds();
+		BriefMessages[1].m_nNumber[0] = -1;
+		BriefMessages[1].m_nNumber[1] = -1;
+		BriefMessages[1].m_nNumber[2] = -1;
+		BriefMessages[1].m_nNumber[3] = -1;
+		BriefMessages[1].m_nNumber[4] = -1;
+		BriefMessages[1].m_nNumber[5] = -1;
+		BriefMessages[1].m_pString = nil;
+	}else{
+		BriefMessages[0].m_pText = msg;
+		BriefMessages[0].m_nFlag = flag;
+		BriefMessages[0].m_nTime = time;
+		BriefMessages[0].m_nStartTime = CTimer::GetTimeInMilliseconds();
+		BriefMessages[0].m_nNumber[0] = -1;
+		BriefMessages[0].m_nNumber[1] = -1;
+		BriefMessages[0].m_nNumber[2] = -1;
+		BriefMessages[0].m_nNumber[3] = -1;
+		BriefMessages[0].m_nNumber[4] = -1;
+		BriefMessages[0].m_nNumber[5] = -1;
+		BriefMessages[0].m_pString = nil;
+		AddToPreviousBriefArray(msg, -1, -1, -1, -1, -1, -1, nil);
+	}
+}
+
+void
+CMessages::ClearMessages()
+{
+	for (int32 i = 0; i < NUMBIGMESSAGES; i++) {
+		for (int32 j = 0; j < 4; j++) {
+			BIGMessages[i].m_Stack[j].m_pText = nil;
+			BIGMessages[i].m_Stack[j].m_pString = nil;
+		}
+	}
+	ClearSmallMessagesOnly();
+}
+
+void
+CMessages::ClearSmallMessagesOnly()
+{
+	for (int32 i = 0; i < NUMBRIEFMESSAGES; i++) {
+		BriefMessages[i].m_pText = nil;
+		BriefMessages[i].m_pString = nil;
+	}
+}
+
+void
+CMessages::AddBigMessage(wchar *msg, uint32 time, uint16 style)
+{
+	wchar outstr[514];
+
+	WideStringCopy(outstr, msg, 256);
+	InsertPlayerControlKeysInString(outstr);
+	GetWideStringLength(outstr); // unused, was assert? 
+	BIGMessages[style].m_Stack[0].m_pText = msg;
+	BIGMessages[style].m_Stack[0].m_nFlag = 0;
+	BIGMessages[style].m_Stack[0].m_nTime = time;
+	BIGMessages[style].m_Stack[0].m_nStartTime = CTimer::GetTimeInMilliseconds();
+	BIGMessages[style].m_Stack[0].m_nNumber[0] = -1;
+	BIGMessages[style].m_Stack[0].m_nNumber[1] = -1;
+	BIGMessages[style].m_Stack[0].m_nNumber[2] = -1;
+	BIGMessages[style].m_Stack[0].m_nNumber[3] = -1;
+	BIGMessages[style].m_Stack[0].m_nNumber[4] = -1;
+	BIGMessages[style].m_Stack[0].m_nNumber[5] = -1;
+	BIGMessages[style].m_Stack[0].m_pString = nil;
+}
+void
+CMessages::AddBigMessageQ(wchar *msg, uint32 time, uint16 style)
+{
+	wchar outstr[518];
+
+	WideStringCopy(outstr, msg, 256);
+	InsertPlayerControlKeysInString(outstr);
+	GetWideStringLength(outstr); // unused, was assert? 
+	int32 i = 0;
+	while (i < 4 && BIGMessages[style].m_Stack[i].m_pText != nil)
+		i++;
+
+	if (i >= 4) return;
+
+	BIGMessages[style].m_Stack[i].m_pText = msg;
+	BIGMessages[style].m_Stack[i].m_nFlag = 0;
+	BIGMessages[style].m_Stack[i].m_nTime = time;
+	BIGMessages[style].m_Stack[i].m_nStartTime = CTimer::GetTimeInMilliseconds();
+	BIGMessages[style].m_Stack[i].m_nNumber[0] = -1;
+	BIGMessages[style].m_Stack[i].m_nNumber[1] = -1;
+	BIGMessages[style].m_Stack[i].m_nNumber[2] = -1;
+	BIGMessages[style].m_Stack[i].m_nNumber[3] = -1;
+	BIGMessages[style].m_Stack[i].m_nNumber[4] = -1;
+	BIGMessages[style].m_Stack[i].m_nNumber[5] = -1;
+	BIGMessages[style].m_Stack[i].m_pString = nil;
+}
+
+void
+CMessages::AddToPreviousBriefArray(wchar *text, int32 n1, int32 n2, int32 n3, int32 n4, int32 n5, int32 n6, wchar *string)
+{
+	int32 i = 0;
+	while (i < NUMPREVIOUSBRIEFS) {
+		if (PreviousBriefs[i].m_pText == nil)
+			break;
+		if (PreviousBriefs[i].m_nNumber[0] == n1
+			&& PreviousBriefs[i].m_nNumber[1] == n2
+			&& PreviousBriefs[i].m_nNumber[2] == n3
+			&& PreviousBriefs[i].m_nNumber[3] == n4
+			&& PreviousBriefs[i].m_nNumber[4] == n5
+			&& PreviousBriefs[i].m_nNumber[5] == n6
+			&& PreviousBriefs[i].m_pText == text
+			&& PreviousBriefs[i].m_pString == string)
+			return;
+
+		i++;
+	}
+
+	if (i != 0) {
+		if (i == NUMPREVIOUSBRIEFS) i -= 2;
+		else i--;
+
+		while (i >= 0) {
+			PreviousBriefs[i + 1] = PreviousBriefs[i];
+			i--;
+		}
+	}
+	PreviousBriefs[0].m_pText = text;
+	PreviousBriefs[0].m_nNumber[0] = n1;
+	PreviousBriefs[0].m_nNumber[1] = n2;
+	PreviousBriefs[0].m_nNumber[2] = n3;
+	PreviousBriefs[0].m_nNumber[3] = n4;
+	PreviousBriefs[0].m_nNumber[4] = n5;
+	PreviousBriefs[0].m_nNumber[5] = n6;
+	PreviousBriefs[0].m_pString = string;
+}
+
+void
+CMessages::InsertNumberInString(wchar *str, int32 n1, int32 n2, int32 n3, int32 n4, int32 n5, int32 n6, wchar *outstr)
+{
+	char numStr[12];
+	wchar wNumStr[18];
+
+	if (str == nil) {
+		*outstr = '\0';
+		return;
+	}
+
+	int32 size = GetWideStringLength(str);
+
+	int32 i = 0;
+
+	for (int32 c = 0; c < size;) {
+		if (str[c] == '~' && str[c + 1] == '1' && str[c + 2] == '~') {
+			switch (i) {
+			case 0: sprintf(numStr, "%d", n1); break;
+			case 1: sprintf(numStr, "%d", n2); break;
+			case 2: sprintf(numStr, "%d", n3); break;
+			case 3: sprintf(numStr, "%d", n4); break;
+			case 4: sprintf(numStr, "%d", n5); break;
+			case 5: sprintf(numStr, "%d", n6); break;
+			}
+			i++;
+			AsciiToUnicode(numStr, wNumStr);
+
+			int j = 0;
+			while (wNumStr[j] != '\0')
+				*(outstr++) = wNumStr[j++];
+				
+			c += 3;
+		} else {
+			*(outstr++) = str[c++];
+		}
+	}
+	*outstr = '\0';
+}
+
+void
+CMessages::InsertStringInString(wchar *str1, wchar *str2)
+{
+	wchar tempstr[264];
+
+	if (!str1 || !str2) return;
+
+	int32 str1_size = GetWideStringLength(str1);
+	int32 str2_size = GetWideStringLength(str2);
+	int32 total_size = str1_size + str2_size;
+	
+	wchar *_str1 = str1;
+	uint16 i;
+	for (i = 0; i < total_size; ) {
+		if (_str1[0] == '~' && _str1[1] == 'a' && _str1[1] == '~') {
+			_str1 += 3;
+			for (int j = 0; j < str2_size; j++) {
+				tempstr[i++] = str2[j];
+			}
+		} else {
+			tempstr[i++] = *(_str1++);
+		}
+	}
+	tempstr[i] = '\0';
+
+	for (i = 0; i < total_size; i++)
+		str1[i] = tempstr[i];
+
+	while (i < 256)
+		str1[i++] = '\0';
+}
+
+void
+CMessages::InsertPlayerControlKeysInString(wchar *str)
+{
+	uint16 i;
+	wchar outstr[256];
+	wchar keybuf[264];
+
+	if (!str) return;
+	uint16 strSize = CMessages::GetWideStringLength(str);
+	memset(keybuf, 0, 256*sizeof(wchar));
+
+	wchar *_outstr = outstr;
+	for (i = 0; i < strSize;) {
+		if (str[i] == '~' && str[i + 1] == 'k' && str[i + 2] == '~') {
+			i += 4;
+			for (int32 cont = 0; cont < TOTAL_CONTROL_ACTIONS; cont++) {
+				uint16 contSize = GetWideStringLength(ControlsManager.m_aActionNames[cont]);
+				if (contSize != 0) {
+					if (WideStringCompare(&str[i], ControlsManager.m_aActionNames[cont], contSize)) {
+						ControlsManager.GetWideStringOfCommandKeys(cont, keybuf, 256);
+						uint16 keybuf_size = GetWideStringLength(keybuf);
+						for (uint16 j = 0; j < keybuf_size; j++) {
+							*(_outstr++) = keybuf[j];
+							keybuf[j] = '\0';
+						}
+						i += contSize + 1;
+					}
+				}
+			}
+		} else {
+			*(_outstr++) = str[i++];
+		}
+	}
+	*_outstr = '\0';
+
+	for (i = 0; i < CMessages::GetWideStringLength(outstr); i++)
+		str[i] = outstr[i];
+
+	while (i < 256)
+		str[i++] = '\0';
+}
+
+void
+CMessages::AddMessageWithNumber(wchar *str, uint32 time, uint16 flag, int32 n1, int32 n2, int32 n3, int32 n4, int32 n5, int32 n6)
+{
+	wchar outstr[520];
+
+	InsertNumberInString(str, n1, n2, n3, n4, n5, n6, outstr);
+	InsertPlayerControlKeysInString(outstr);
+	GetWideStringLength(outstr); // unused
+
+	uint16 i = 0;
+	while (i < NUMBRIEFMESSAGES && BriefMessages[i].m_pText)
+		i++;
+
+	if (i >= NUMBRIEFMESSAGES) return;
+
+	BriefMessages[i].m_pText = str;
+	BriefMessages[i].m_nFlag = flag;
+	BriefMessages[i].m_nTime = time;
+	BriefMessages[i].m_nStartTime = CTimer::GetTimeInMilliseconds();
+	BriefMessages[i].m_nNumber[0] = n1;
+	BriefMessages[i].m_nNumber[1] = n2;
+	BriefMessages[i].m_nNumber[2] = n3;
+	BriefMessages[i].m_nNumber[3] = n4;
+	BriefMessages[i].m_nNumber[4] = n5;
+	BriefMessages[i].m_nNumber[5] = n6;
+	BriefMessages[i].m_pString = nil;
+	if (i == 0)
+		AddToPreviousBriefArray(
+			BriefMessages[0].m_pText,
+			BriefMessages[0].m_nNumber[0],
+			BriefMessages[0].m_nNumber[1],
+			BriefMessages[0].m_nNumber[2],
+			BriefMessages[0].m_nNumber[3],
+			BriefMessages[0].m_nNumber[4],
+			BriefMessages[0].m_nNumber[5],
+			BriefMessages[0].m_pString);
+}
+
+void 
+CMessages::AddMessageJumpQWithNumber(wchar *str, uint32 time, uint16 flag, int32 n1, int32 n2, int32 n3, int32 n4, int32 n5, int32 n6)
+{
+	wchar outstr[520];
+
+	InsertNumberInString(str, n1, n2, n3, n4, n5, n6, outstr);
+	InsertPlayerControlKeysInString(outstr);
+	GetWideStringLength(outstr);
+	BriefMessages[0].m_pText = str;
+	BriefMessages[0].m_nFlag = flag;
+	BriefMessages[0].m_nTime = time;
+	BriefMessages[0].m_nStartTime = CTimer::GetTimeInMilliseconds();
+	BriefMessages[0].m_nNumber[0] = n1;
+	BriefMessages[0].m_nNumber[1] = n2;
+	BriefMessages[0].m_nNumber[2] = n3;
+	BriefMessages[0].m_nNumber[3] = n4;
+	BriefMessages[0].m_nNumber[4] = n5;
+	BriefMessages[0].m_nNumber[5] = n6;
+	BriefMessages[0].m_pString = nil;
+	AddToPreviousBriefArray(str, n1, n2, n3, n4, n5, n6, nil);
+}
+
+void
+CMessages::AddMessageSoonWithNumber(wchar *str, uint32 time, uint16 flag, int32 n1, int32 n2, int32 n3, int32 n4, int32 n5, int32 n6)
+{
+	wchar outstr[520]; // is unused, bug?
+
+	InsertNumberInString(str, n1, n2, n3, n4, n5, n6, outstr);
+	InsertPlayerControlKeysInString(outstr);
+	GetWideStringLength(outstr);
+	if (BriefMessages[0].m_pText != nil) {
+		for (int32 i = NUMBRIEFMESSAGES-1; i > 1; i--)
+			BriefMessages[i] = BriefMessages[i-1];
+
+		BriefMessages[1].m_pText = str;
+		BriefMessages[1].m_nFlag = flag;
+		BriefMessages[1].m_nTime = time;
+		BriefMessages[1].m_nStartTime = CTimer::GetTimeInMilliseconds();
+		BriefMessages[1].m_nNumber[0] = n1;
+		BriefMessages[1].m_nNumber[1] = n2;
+		BriefMessages[1].m_nNumber[2] = n3;
+		BriefMessages[1].m_nNumber[3] = n4;
+		BriefMessages[1].m_nNumber[4] = n5;
+		BriefMessages[1].m_nNumber[5] = n6;
+		BriefMessages[1].m_pString = nil;
+	} else {
+		BriefMessages[0].m_pText = str;
+		BriefMessages[0].m_nFlag = flag;
+		BriefMessages[0].m_nTime = time;
+		BriefMessages[0].m_nStartTime = CTimer::GetTimeInMilliseconds();
+		BriefMessages[0].m_nNumber[0] = n1;
+		BriefMessages[0].m_nNumber[1] = n2;
+		BriefMessages[0].m_nNumber[2] = n3;
+		BriefMessages[0].m_nNumber[3] = n4;
+		BriefMessages[0].m_nNumber[4] = n5;
+		BriefMessages[0].m_nNumber[5] = n6;
+		BriefMessages[0].m_pString = nil;
+		AddToPreviousBriefArray(str, n1, n2, n3, n4, n5, n6, nil);
+	}
+}
+
+void
+CMessages::AddBigMessageWithNumber(wchar *str, uint32 time, uint16 style, int32 n1, int32 n2, int32 n3, int32 n4, int32 n5, int32 n6)
+{
+	wchar outstr[520]; // is unused, bug?
+
+	InsertNumberInString(str, n1, n2, n3, n4, n5, n6, outstr);
+	InsertPlayerControlKeysInString(outstr);
+	GetWideStringLength(outstr);
+	BIGMessages[style].m_Stack[0].m_pText = str;
+	BIGMessages[style].m_Stack[0].m_nFlag = 0;
+	BIGMessages[style].m_Stack[0].m_nTime = time;
+	BIGMessages[style].m_Stack[0].m_nStartTime = CTimer::GetTimeInMilliseconds();
+	BIGMessages[style].m_Stack[0].m_nNumber[0] = n1;
+	BIGMessages[style].m_Stack[0].m_nNumber[1] = n2;
+	BIGMessages[style].m_Stack[0].m_nNumber[2] = n3;
+	BIGMessages[style].m_Stack[0].m_nNumber[3] = n4;
+	BIGMessages[style].m_Stack[0].m_nNumber[4] = n5;
+	BIGMessages[style].m_Stack[0].m_nNumber[5] = n6;
+	BIGMessages[style].m_Stack[0].m_pString = nil;
+}
+
+void
+CMessages::AddBigMessageWithNumberQ(wchar *str, uint32 time, uint16 style, int32 n1, int32 n2, int32 n3, int32 n4, int32 n5, int32 n6)
+{
+	wchar outstr[520]; // is unused, bug?
+
+	CMessages::InsertNumberInString(str, n1, n2, n3, n4, n5, n6, outstr);
+	CMessages::InsertPlayerControlKeysInString(outstr);
+	CMessages::GetWideStringLength(outstr);
+	int32 i = 0;
+
+	while (i < 4 && CMessages::BIGMessages[style].m_Stack[i].m_pText)
+		i++;
+
+	if (i >= 4) return;
+
+	BIGMessages[style].m_Stack[i].m_pText = str;
+	BIGMessages[style].m_Stack[i].m_nFlag = 0;
+	BIGMessages[style].m_Stack[i].m_nTime = time;
+	BIGMessages[style].m_Stack[i].m_nStartTime = CTimer::GetTimeInMilliseconds();
+	BIGMessages[style].m_Stack[i].m_nNumber[0] = n1;
+	BIGMessages[style].m_Stack[i].m_nNumber[1] = n2;
+	BIGMessages[style].m_Stack[i].m_nNumber[2] = n3;
+	BIGMessages[style].m_Stack[i].m_nNumber[3] = n4;
+	BIGMessages[style].m_Stack[i].m_nNumber[4] = n5;
+	BIGMessages[style].m_Stack[i].m_nNumber[5] = n6;
+	BIGMessages[style].m_Stack[i].m_pString = nil;
+}
+
+void
+CMessages::AddMessageWithString(wchar *text, uint32 time, uint16 flag, wchar *str)
+{
+	wchar outstr[516]; // is unused, bug?
+
+	WideStringCopy(outstr, text, 256);
+	InsertStringInString(outstr, str);
+	InsertPlayerControlKeysInString(outstr);
+	GetWideStringLength(outstr);
+
+	int32 i = 0;
+	while (i < NUMBRIEFMESSAGES && BriefMessages[i].m_pText != nil)
+		i++;
+
+	if (i >= NUMBRIEFMESSAGES) return;
+
+	BriefMessages[i].m_pText = text;
+	BriefMessages[i].m_nFlag = flag;
+	BriefMessages[i].m_nTime = time;
+	BriefMessages[i].m_nStartTime = CTimer::GetTimeInMilliseconds();
+	BriefMessages[i].m_nNumber[0] = -1;
+	BriefMessages[i].m_nNumber[1] = -1;
+	BriefMessages[i].m_nNumber[2] = -1;
+	BriefMessages[i].m_nNumber[3] = -1;
+	BriefMessages[i].m_nNumber[4] = -1;
+	BriefMessages[i].m_nNumber[5] = -1;
+	BriefMessages[i].m_pString = str;
+	if (i == 0)
+		AddToPreviousBriefArray(
+			BriefMessages[0].m_pText,
+			BriefMessages[0].m_nNumber[0],
+			BriefMessages[0].m_nNumber[1],
+			BriefMessages[0].m_nNumber[2],
+			BriefMessages[0].m_nNumber[3],
+			BriefMessages[0].m_nNumber[4],
+			BriefMessages[0].m_nNumber[5],
+			BriefMessages[0].m_pString);
+}
+
+void
+CMessages::AddMessageJumpQWithString(wchar *text, uint32 time, uint16 flag, wchar *str)
+{
+	wchar outstr[516];
+
+	WideStringCopy(outstr, text, 256);
+	InsertStringInString(outstr, str);
+	InsertPlayerControlKeysInString(outstr);
+	GetWideStringLength(outstr);
+	BriefMessages[0].m_pText = text;
+	BriefMessages[0].m_nFlag = flag;
+	BriefMessages[0].m_nTime = time;
+	BriefMessages[0].m_nStartTime = CTimer::GetTimeInMilliseconds();
+	BriefMessages[0].m_nNumber[0] = -1;
+	BriefMessages[0].m_nNumber[1] = -1;
+	BriefMessages[0].m_nNumber[2] = -1;
+	BriefMessages[0].m_nNumber[3] = -1;
+	BriefMessages[0].m_nNumber[4] = -1;
+	BriefMessages[0].m_nNumber[5] = -1;
+	BriefMessages[0].m_pString = str;
+	AddToPreviousBriefArray(text, -1, -1, -1, -1, -1, -1, str);
+}
+
+void
+CMessages::ClearThisPrint(wchar *str)
+{
+	bool equal;
+	wchar *v4;
+	wchar *v5;
+
+	do {
+		equal = false;
+		uint16 i = 0;
+		while (i < NUMBRIEFMESSAGES) {
+			if (BriefMessages[i].m_pText == nil)
+				break;
+			
+			v4 = str;
+			v5 = BriefMessages[i].m_pText;
+			while (*v5 == *v4 && !equal) {
+				++v4;
+				++v5;
+				if (!*v4 && !*v5)
+					equal = true;
+			}
+
+			if (equal) break;
+			i++;
+		}
+
+		if (equal) {
+			if (i != 0) {
+				BriefMessages[i].m_pText = nil;
+				while (i < NUMBRIEFMESSAGES-1) {
+					if (BriefMessages[i + 1].m_pText == nil)
+						break;
+
+					BriefMessages[i] = BriefMessages[i + 1];
+					i++;
+				}
+				BriefMessages[i].m_pText = nil;
+			} else {
+				BriefMessages[0].m_pText = nil;
+				while (i < NUMBRIEFMESSAGES-1) {
+					if (BriefMessages[i + 1].m_pText == nil)
+						break;
+					BriefMessages[i] = BriefMessages[i + 1];
+					i++;
+				}
+				BriefMessages[i].m_pText = nil;
+				BriefMessages[0].m_nStartTime = CTimer::GetTimeInMilliseconds();
+				if (BriefMessages[0].m_pText == nil)
+					AddToPreviousBriefArray(
+						BriefMessages[0].m_pText,
+						BriefMessages[0].m_nNumber[0],
+						BriefMessages[0].m_nNumber[1],
+						BriefMessages[0].m_nNumber[2],
+						BriefMessages[0].m_nNumber[3],
+						BriefMessages[0].m_nNumber[4],
+						BriefMessages[0].m_nNumber[5],
+						BriefMessages[0].m_pString);
+			}
+		}
+	} while (equal);
+}
+
+void
+CMessages::ClearThisBigPrint(wchar *str)
+{
+	bool equal;
+	wchar *v4;
+	wchar *v5;
+
+	do
+	{
+		uint16 i = 0;
+		equal = false;
+		uint16 style = 0;
+		while (style < NUMBIGMESSAGES)
+		{
+			if (i >= 4)
+				break;
+			if (CMessages::BIGMessages[style].m_Stack[i].m_pText == nil || equal)
+				break;
+
+			v5 = CMessages::BIGMessages[style].m_Stack[i].m_pText;
+			v4 = str;
+			while (*v5 == *v4 && !equal) {
+				++v4;
+				++v5;
+				if (!*v4 && !*v5)
+					equal = true;
+			}
+
+			if (!equal && ++i == 4) {
+				i = 0;
+				style++;
+			}
+		}
+		if (equal) {
+			if (i != 0) {
+				BIGMessages[style].m_Stack[i].m_pText = nil;
+				while (i < 3) {
+					if (BIGMessages[style].m_Stack[i + 1].m_pText == nil)
+						break;
+					BIGMessages[style].m_Stack[i] = BIGMessages[style].m_Stack[i + 1];
+					i++;
+				}
+				BIGMessages[style].m_Stack[i].m_pText = nil;
+			} else {
+				BIGMessages[style].m_Stack[0].m_pText = 0;
+				i = 0;
+				while (i < 3) {
+					if (BIGMessages[style].m_Stack[i + 1].m_pText == nil)
+						break;
+					BIGMessages[style].m_Stack[i] = BIGMessages[style].m_Stack[i + 1];
+					i++;
+				}
+				BIGMessages[style].m_Stack[i].m_pText = nil;
+				BIGMessages[style].m_Stack[0].m_nStartTime = CTimer::GetTimeInMilliseconds();
+			}
+		}
+	} while (equal);
+}
+
+void
+CMessages::ClearAllMessagesDisplayedByGame()
+{
+	ClearMessages();
+	for (int32 i = 0; i < NUMPREVIOUSBRIEFS; i++) {
+		PreviousBriefs[i].m_pText = nil;
+		PreviousBriefs[i].m_pString = nil;
+	}
+	CHud::GetRidOfAllHudMessages();
+	CUserDisplay::Pager.ClearMessages();
+}
+
+STARTPATCHES
+	InjectHook(0x529310, CMessages::Init, PATCH_JUMP);
+	InjectHook(0x529490, CMessages::GetWideStringLength, PATCH_JUMP);
+	InjectHook(0x5294B0, CMessages::WideStringCopy, PATCH_JUMP);
+	InjectHook(0x529510, CMessages::WideStringCompare, PATCH_JUMP);
+	InjectHook(0x529580, CMessages::Process, PATCH_JUMP);
+	InjectHook(0x529800, CMessages::Display, PATCH_JUMP);
+	InjectHook(0x529900, CMessages::AddMessage, PATCH_JUMP);
+	InjectHook(0x529A10, CMessages::AddMessageJumpQ, PATCH_JUMP);
+	InjectHook(0x529AF0, CMessages::AddMessageSoon, PATCH_JUMP);
+	InjectHook(0x529CE0, CMessages::ClearMessages, PATCH_JUMP);
+	InjectHook(0x529E00, CMessages::ClearSmallMessagesOnly, PATCH_JUMP);
+	InjectHook(0x529EB0, CMessages::AddBigMessage, PATCH_JUMP);
+	InjectHook(0x529F60, CMessages::AddBigMessageQ, PATCH_JUMP);
+	InjectHook(0x52A040, CMessages::AddToPreviousBriefArray, PATCH_JUMP);
+	InjectHook(0x52A1A0, CMessages::InsertNumberInString, PATCH_JUMP);
+	InjectHook(0x52A300, CMessages::InsertStringInString, PATCH_JUMP);
+	InjectHook(0x52A490, CMessages::InsertPlayerControlKeysInString, PATCH_JUMP);
+	InjectHook(0x52A850, CMessages::AddMessageWithNumber, PATCH_JUMP);
+	InjectHook(0x52A9A0, CMessages::AddMessageJumpQWithNumber, PATCH_JUMP);
+	InjectHook(0x52AAC0, CMessages::AddMessageSoonWithNumber, PATCH_JUMP);
+	InjectHook(0x52AD10, CMessages::AddBigMessageWithNumber, PATCH_JUMP);
+	InjectHook(0x52AE00, CMessages::AddBigMessageWithNumberQ, PATCH_JUMP);
+	InjectHook(0x52AF30, CMessages::AddMessageWithString, PATCH_JUMP);
+	InjectHook(0x52B050, CMessages::AddMessageJumpQWithString, PATCH_JUMP);
+	InjectHook(0x52B140, CMessages::ClearThisPrint, PATCH_JUMP);
+	InjectHook(0x52B3C0, CMessages::ClearThisBigPrint, PATCH_JUMP);
+	InjectHook(0x52B670, CMessages::ClearAllMessagesDisplayedByGame, PATCH_JUMP);
+ENDPATCHES
\ No newline at end of file
diff --git a/src/text/Messages.h b/src/text/Messages.h
index 7caf5786..fac2c2af 100644
--- a/src/text/Messages.h
+++ b/src/text/Messages.h
@@ -4,9 +4,6 @@ struct tMessage
 {
 	wchar *m_pText;
 	uint16 m_nFlag;
-private:
-	int8 _pad6[2];
-public:
 	uint32 m_nTime;
 	uint32 m_nStartTime;
 	int32 m_nNumber[6];
@@ -15,8 +12,7 @@ public:
 
 struct tBigMessage 
 {
-	tMessage m_Current;
-	tMessage m_Stack[3];
+	tMessage m_Stack[4];
 };
 
 struct tPreviousBrief 
@@ -26,31 +22,43 @@ struct tPreviousBrief
 	wchar *m_pString;
 };
 
+#define NUMBRIEFMESSAGES 8
+#define NUMBIGMESSAGES 6
+#define NUMPREVIOUSBRIEFS 5
+
 class CMessages 
 {
 public:
-	static tPreviousBrief *PreviousBriefs;
-	static tMessage *BriefMessages;
-	static tBigMessage *BIGMessages;
+	static tMessage(&BriefMessages)[NUMBRIEFMESSAGES];
+	static tBigMessage(&BIGMessages)[NUMBIGMESSAGES];
+	static tPreviousBrief(&PreviousBriefs)[NUMPREVIOUSBRIEFS];
 
 public:
+	static void Init(void);
+	static uint16 GetWideStringLength(wchar *src);
+	static void WideStringCopy(wchar *dst, wchar *src, uint16 size);
+	static bool WideStringCompare(wchar *str1, wchar *str2, uint16 size);
+	static void Process(void);
 	static void Display(void);
+	static void AddMessage(wchar *key, uint32 time, uint16 pos);
+	static void AddMessageJumpQ(wchar *key, uint32 time, uint16 pos);
+	static void AddMessageSoon(wchar *key, uint32 time, uint16 pos);
+	static void ClearMessages(void);
+	static void ClearSmallMessagesOnly(void);
+	static void AddBigMessage(wchar *key, uint32 time, uint16 pos);
+	static void AddBigMessageQ(wchar *key, uint32 time, uint16 pos);
+	static void AddToPreviousBriefArray(wchar *text, int32 n1, int32 n2, int32 n3, int32 n4, int32 n5, int32 n6, wchar *string);
+	static void InsertNumberInString(wchar *src, int32 n1, int32 n2, int32 n3, int32 n4, int32 n5, int32 n6, wchar *dst);
+	static void InsertStringInString(wchar *str1, wchar *str2);
+	static void InsertPlayerControlKeysInString(wchar *src);
+	static void AddMessageWithNumber(wchar *key, uint32 time, uint16 pos, int32 n1, int32 n2, int32 n3, int32 n4, int32 n5, int32 n6);
+	static void AddMessageJumpQWithNumber(wchar *key, uint32 time, uint16 pos, int32 n1, int32 n2, int32 n3, int32 n4, int32 n5, int32 n6);
+	static void AddMessageSoonWithNumber(wchar *key, uint32 time, uint16 pos, int32 n1, int32 n2, int32 n3, int32 n4, int32 n5, int32 n6);
+	static void AddBigMessageWithNumber(wchar *key, uint32 time, uint16 pos, int32 n1, int32 n2, int32 n3, int32 n4, int32 n5, int32 n6);
+	static void AddBigMessageWithNumberQ(wchar *key, uint32 time, uint16 pos, int32 n1, int32 n2, int32 n3, int32 n4, int32 n5, int32 n6);
+	static void AddMessageWithString(wchar *text, uint32 time, uint16 flag, wchar *str);
+	static void AddMessageJumpQWithString(wchar *text, uint32 time, uint16 flag, wchar *str);
+	static void ClearThisPrint(wchar *str);
+	static void ClearThisBigPrint(wchar *str);
 	static void ClearAllMessagesDisplayedByGame(void);
-	static int WideStringCopy(wchar* dst, wchar* src, unsigned short size);
-	static char WideStringCompare(wchar* str1, wchar* str2, unsigned short size);
-	static void InsertNumberInString(wchar* src, int n1, int n2, int n3, int n4, int n5, int n6, wchar* dst);
-	static void InsertPlayerControlKeysInString(wchar* src);
-	static int GetWideStringLength(wchar *src);
-	static void AddBigMessage(wchar* key, uint32 time, uint16 pos);
-	static void AddBigMessageWithNumber(wchar* key, uint32 time, uint16 pos, int n1, int n2, int n3, int n4, int n5, int n6);
-	static void AddBigMessageWithNumberQ(wchar* key, uint32 time, uint16 pos, int n1, int n2, int n3, int n4, int n5, int n6);
-	static void AddMessage(wchar* key, uint32 time, uint16 pos);
-	static void AddMessageJumpQ(wchar* key, uint32 time, uint16 pos);
-	static void AddMessageSoon(wchar* key, uint32 time, uint16 pos);
-	static void AddMessageWithNumber(wchar* key, uint32 time, uint16 pos, int n1, int n2, int n3, int n4, int n5, int n6);
-	static void AddMessageJumpQWithNumber(wchar* key, uint32 time, uint16 pos, int n1, int n2, int n3, int n4, int n5, int n6);
-	static void AddMessageSoonWithNumber(wchar* key, uint32 time, uint16 pos, int n1, int n2, int n3, int n4, int n5, int n6);
-	static void ClearMessages();
-	static void Init();
-	static void Process();
 };
diff --git a/src/text/Pager.cpp b/src/text/Pager.cpp
index d20be45d..68caca9a 100644
--- a/src/text/Pager.cpp
+++ b/src/text/Pager.cpp
@@ -19,12 +19,12 @@ CPager::Process()
 	if (m_messages[0].m_pText != nil && m_messages[0].m_nCurrentPosition >= (int32)m_messages[0].m_nStringLength) {
 		m_messages[0].m_pText = nil;
 		uint16 i = 0;
-		while (i < 7) {
+		while (i < NUMPAGERMESSAGES-1) {
 			if (m_messages[i + 1].m_pText == nil) break;
 			m_messages[i] = m_messages[i + 1];
 		}
 		m_messages[i].m_pText = nil;
-		if (m_messages[0].m_pText)
+		if (m_messages[0].m_pText != nil)
 			CMessages::AddToPreviousBriefArray(
 				m_messages[0].m_pText,
 				m_messages[0].m_nNumber[0],
@@ -56,7 +56,7 @@ CPager::Display()
 
 	wchar *pText = m_messages[0].m_pText;
 	uint16 i = 0;
-	if (pText) {
+	if (pText != nil) {
 		CMessages::InsertNumberInString(
 			pText,
 			m_messages[0].m_nNumber[0],
@@ -86,12 +86,12 @@ void
 CPager::AddMessage(wchar *str, uint16 speed, uint16 priority, uint16 a5)
 {
 	uint16 size = CMessages::GetWideStringLength(str);
-	for (int i = 0; i < 8; i++) {
+	for (int32 i = 0; i < NUMPAGERMESSAGES; i++) {
 		if (m_messages[i].m_pText) {
 			if (m_messages[i].m_nPriority >= priority)
 				continue;
 
-			for (int j = 7; j > i; j--)
+			for (int j = NUMPAGERMESSAGES-1; j > i; j--)
 				m_messages[j] = m_messages[j-1];
 
 		}
@@ -130,12 +130,12 @@ CPager::AddMessageWithNumber(wchar *str, int32 n1, int32 n2, int32 n3, int32 n4,
 
 	CMessages::InsertNumberInString(str, n1, n2, n3, n4, n5, n6, nstr);
 	uint16 size = CMessages::GetWideStringLength(nstr);
-	for (int i = 0; i < 8; i++) {
+	for (int32 i = 0; i < NUMPAGERMESSAGES; i++) {
 		if (m_messages[i].m_pText) {
 			if (m_messages[i].m_nPriority >= priority)
 				continue;
 
-			for (int j = 7; j > i; j--)
+			for (int j = NUMPAGERMESSAGES-1; j > i; j--)
 				m_messages[j] = m_messages[j - 1];
 
 		}
@@ -170,14 +170,14 @@ CPager::AddMessageWithNumber(wchar *str, int32 n1, int32 n2, int32 n3, int32 n4,
 void
 CPager::ClearMessages()
 {
-	for (int i = 0; i < 8; i++)
+	for (int32 i = 0; i < NUMPAGERMESSAGES; i++)
 		m_messages[i].m_pText = nil;
 }
 
 void
 CPager::RestartCurrentMessage()
 {
-	if (m_messages[0].m_pText) {
+	if (m_messages[0].m_pText != nil) {
 		m_messages[0].m_nCurrentPosition = -(m_nNumDisplayLetters + 10);
 		m_messages[0].m_nTimeToChangePosition = CTimer::GetTimeInMilliseconds() + m_messages[0].m_nSpeedMs;
 	}
diff --git a/src/text/Pager.h b/src/text/Pager.h
index 90291c74..727eeb24 100644
--- a/src/text/Pager.h
+++ b/src/text/Pager.h
@@ -8,16 +8,15 @@ struct PagerMessage {
 	uint16 m_nPriority;
 	uint32 m_nTimeToChangePosition;
 	int16 field_10;
-private:
-	char _pad12[2];
-public:
 	int32 m_nNumber[6];
 };
 
+#define NUMPAGERMESSAGES 8
+
 class CPager
 {
 	int16 m_nNumDisplayLetters;
-	PagerMessage m_messages[8];
+	PagerMessage m_messages[NUMPAGERMESSAGES];
 public:
 	void Init();
 	void Process();

From 6fec86475066ea5ffca204509734192ce54cdec6 Mon Sep 17 00:00:00 2001
From: Sergeanur <s.anureev@yandex.ua>
Date: Mon, 21 Oct 2019 01:27:30 +0300
Subject: [PATCH 07/37] Fixes

---
 src/text/Messages.cpp | 106 +++++++++++++++++++-----------------------
 src/text/Messages.h   |   7 ++-
 src/text/Pager.cpp    |   3 +-
 3 files changed, 55 insertions(+), 61 deletions(-)

diff --git a/src/text/Messages.cpp b/src/text/Messages.cpp
index 83369b84..c5259910 100644
--- a/src/text/Messages.cpp
+++ b/src/text/Messages.cpp
@@ -15,6 +15,7 @@
 tMessage(&CMessages::BriefMessages)[NUMBRIEFMESSAGES] = *(tMessage(*)[NUMBRIEFMESSAGES])*(uintptr*)0x8786E0;
 tPreviousBrief(&CMessages::PreviousBriefs)[NUMPREVIOUSBRIEFS] = *(tPreviousBrief(*)[NUMPREVIOUSBRIEFS])*(uintptr*)0x713C08;
 tBigMessage(&CMessages::BIGMessages)[NUMBIGMESSAGES] = *(tBigMessage(*)[NUMBIGMESSAGES])*(uintptr*)0x773628;
+char CMessages::PreviousMissionTitle[16]; // unused
 
 void
 CMessages::Init()
@@ -153,11 +154,10 @@ CMessages::Display()
 void
 CMessages::AddMessage(wchar *msg, uint32 time, uint16 flag)
 {
-	wchar outstr[514];
-
+	wchar outstr[514]; // unused
 	WideStringCopy(outstr, msg, 256);
 	InsertPlayerControlKeysInString(outstr);
-	GetWideStringLength(outstr); // unused, was assert? 
+	GetWideStringLength(outstr);
 
 	int32 i = 0;
 	while (i < NUMBRIEFMESSAGES && BriefMessages[i].m_pText != nil)
@@ -190,11 +190,10 @@ CMessages::AddMessage(wchar *msg, uint32 time, uint16 flag)
 void
 CMessages::AddMessageJumpQ(wchar *msg, uint32 time, uint16 flag)
 {
-	wchar outstr[514];
-
+	wchar outstr[514]; // unused
 	WideStringCopy(outstr, msg, 256);
 	InsertPlayerControlKeysInString(outstr);
-	GetWideStringLength(outstr); // unused, was assert? 
+	GetWideStringLength(outstr);
 
 	BriefMessages[0].m_pText = msg;
 	BriefMessages[0].m_nFlag = flag;
@@ -213,11 +212,11 @@ CMessages::AddMessageJumpQ(wchar *msg, uint32 time, uint16 flag)
 void
 CMessages::AddMessageSoon(wchar *msg, uint32 time, uint16 flag)
 {
-	wchar outstr[520];
-
+	wchar outstr[520]; // unused
 	WideStringCopy(outstr, msg, 256);
 	InsertPlayerControlKeysInString(outstr);
-	GetWideStringLength(outstr); // unused, was assert? 
+	GetWideStringLength(outstr);
+
 	if (BriefMessages[0].m_pText != nil) {
 		for (int i = NUMBRIEFMESSAGES-1; i > 1; i--)
 			BriefMessages[i] = BriefMessages[i-1];
@@ -273,11 +272,11 @@ CMessages::ClearSmallMessagesOnly()
 void
 CMessages::AddBigMessage(wchar *msg, uint32 time, uint16 style)
 {
-	wchar outstr[514];
-
+	wchar outstr[514]; // unused
 	WideStringCopy(outstr, msg, 256);
 	InsertPlayerControlKeysInString(outstr);
-	GetWideStringLength(outstr); // unused, was assert? 
+	GetWideStringLength(outstr);
+
 	BIGMessages[style].m_Stack[0].m_pText = msg;
 	BIGMessages[style].m_Stack[0].m_nFlag = 0;
 	BIGMessages[style].m_Stack[0].m_nTime = time;
@@ -293,11 +292,11 @@ CMessages::AddBigMessage(wchar *msg, uint32 time, uint16 style)
 void
 CMessages::AddBigMessageQ(wchar *msg, uint32 time, uint16 style)
 {
-	wchar outstr[518];
-
+	wchar outstr[518]; // unused
 	WideStringCopy(outstr, msg, 256);
 	InsertPlayerControlKeysInString(outstr);
-	GetWideStringLength(outstr); // unused, was assert? 
+	GetWideStringLength(outstr);
+
 	int32 i = 0;
 	while (i < 4 && BIGMessages[style].m_Stack[i].m_pText != nil)
 		i++;
@@ -410,7 +409,7 @@ CMessages::InsertStringInString(wchar *str1, wchar *str2)
 	wchar *_str1 = str1;
 	uint16 i;
 	for (i = 0; i < total_size; ) {
-		if (_str1[0] == '~' && _str1[1] == 'a' && _str1[1] == '~') {
+		if (*_str1 == '~' && *(_str1 + 1) == 'a' && *(_str1 + 2) == '~') {
 			_str1 += 3;
 			for (int j = 0; j < str2_size; j++) {
 				tempstr[i++] = str2[j];
@@ -436,7 +435,7 @@ CMessages::InsertPlayerControlKeysInString(wchar *str)
 	wchar keybuf[264];
 
 	if (!str) return;
-	uint16 strSize = CMessages::GetWideStringLength(str);
+	uint16 strSize = GetWideStringLength(str);
 	memset(keybuf, 0, 256*sizeof(wchar));
 
 	wchar *_outstr = outstr;
@@ -463,7 +462,7 @@ CMessages::InsertPlayerControlKeysInString(wchar *str)
 	}
 	*_outstr = '\0';
 
-	for (i = 0; i < CMessages::GetWideStringLength(outstr); i++)
+	for (i = 0; i < GetWideStringLength(outstr); i++)
 		str[i] = outstr[i];
 
 	while (i < 256)
@@ -473,11 +472,10 @@ CMessages::InsertPlayerControlKeysInString(wchar *str)
 void
 CMessages::AddMessageWithNumber(wchar *str, uint32 time, uint16 flag, int32 n1, int32 n2, int32 n3, int32 n4, int32 n5, int32 n6)
 {
-	wchar outstr[520];
-
+	wchar outstr[520]; // unused
 	InsertNumberInString(str, n1, n2, n3, n4, n5, n6, outstr);
 	InsertPlayerControlKeysInString(outstr);
-	GetWideStringLength(outstr); // unused
+	GetWideStringLength(outstr);
 
 	uint16 i = 0;
 	while (i < NUMBRIEFMESSAGES && BriefMessages[i].m_pText)
@@ -511,11 +509,11 @@ CMessages::AddMessageWithNumber(wchar *str, uint32 time, uint16 flag, int32 n1,
 void 
 CMessages::AddMessageJumpQWithNumber(wchar *str, uint32 time, uint16 flag, int32 n1, int32 n2, int32 n3, int32 n4, int32 n5, int32 n6)
 {
-	wchar outstr[520];
-
+	wchar outstr[520]; // unused
 	InsertNumberInString(str, n1, n2, n3, n4, n5, n6, outstr);
 	InsertPlayerControlKeysInString(outstr);
 	GetWideStringLength(outstr);
+
 	BriefMessages[0].m_pText = str;
 	BriefMessages[0].m_nFlag = flag;
 	BriefMessages[0].m_nTime = time;
@@ -533,11 +531,11 @@ CMessages::AddMessageJumpQWithNumber(wchar *str, uint32 time, uint16 flag, int32
 void
 CMessages::AddMessageSoonWithNumber(wchar *str, uint32 time, uint16 flag, int32 n1, int32 n2, int32 n3, int32 n4, int32 n5, int32 n6)
 {
-	wchar outstr[520]; // is unused, bug?
-
+	wchar outstr[520]; // unused
 	InsertNumberInString(str, n1, n2, n3, n4, n5, n6, outstr);
 	InsertPlayerControlKeysInString(outstr);
 	GetWideStringLength(outstr);
+
 	if (BriefMessages[0].m_pText != nil) {
 		for (int32 i = NUMBRIEFMESSAGES-1; i > 1; i--)
 			BriefMessages[i] = BriefMessages[i-1];
@@ -572,11 +570,11 @@ CMessages::AddMessageSoonWithNumber(wchar *str, uint32 time, uint16 flag, int32
 void
 CMessages::AddBigMessageWithNumber(wchar *str, uint32 time, uint16 style, int32 n1, int32 n2, int32 n3, int32 n4, int32 n5, int32 n6)
 {
-	wchar outstr[520]; // is unused, bug?
-
+	wchar outstr[520]; // unused
 	InsertNumberInString(str, n1, n2, n3, n4, n5, n6, outstr);
 	InsertPlayerControlKeysInString(outstr);
 	GetWideStringLength(outstr);
+
 	BIGMessages[style].m_Stack[0].m_pText = str;
 	BIGMessages[style].m_Stack[0].m_nFlag = 0;
 	BIGMessages[style].m_Stack[0].m_nTime = time;
@@ -593,14 +591,14 @@ CMessages::AddBigMessageWithNumber(wchar *str, uint32 time, uint16 style, int32
 void
 CMessages::AddBigMessageWithNumberQ(wchar *str, uint32 time, uint16 style, int32 n1, int32 n2, int32 n3, int32 n4, int32 n5, int32 n6)
 {
-	wchar outstr[520]; // is unused, bug?
+	wchar outstr[520]; // unused
+	InsertNumberInString(str, n1, n2, n3, n4, n5, n6, outstr);
+	InsertPlayerControlKeysInString(outstr);
+	GetWideStringLength(outstr);
 
-	CMessages::InsertNumberInString(str, n1, n2, n3, n4, n5, n6, outstr);
-	CMessages::InsertPlayerControlKeysInString(outstr);
-	CMessages::GetWideStringLength(outstr);
 	int32 i = 0;
 
-	while (i < 4 && CMessages::BIGMessages[style].m_Stack[i].m_pText)
+	while (i < 4 && BIGMessages[style].m_Stack[i].m_pText != nil)
 		i++;
 
 	if (i >= 4) return;
@@ -621,8 +619,7 @@ CMessages::AddBigMessageWithNumberQ(wchar *str, uint32 time, uint16 style, int32
 void
 CMessages::AddMessageWithString(wchar *text, uint32 time, uint16 flag, wchar *str)
 {
-	wchar outstr[516]; // is unused, bug?
-
+	wchar outstr[516]; // unused
 	WideStringCopy(outstr, text, 256);
 	InsertStringInString(outstr, str);
 	InsertPlayerControlKeysInString(outstr);
@@ -660,12 +657,12 @@ CMessages::AddMessageWithString(wchar *text, uint32 time, uint16 flag, wchar *st
 void
 CMessages::AddMessageJumpQWithString(wchar *text, uint32 time, uint16 flag, wchar *str)
 {
-	wchar outstr[516];
-
+	wchar outstr[516]; // unused
 	WideStringCopy(outstr, text, 256);
 	InsertStringInString(outstr, str);
 	InsertPlayerControlKeysInString(outstr);
 	GetWideStringLength(outstr);
+
 	BriefMessages[0].m_pText = text;
 	BriefMessages[0].m_nFlag = flag;
 	BriefMessages[0].m_nTime = time;
@@ -680,12 +677,21 @@ CMessages::AddMessageJumpQWithString(wchar *text, uint32 time, uint16 flag, wcha
 	AddToPreviousBriefArray(text, -1, -1, -1, -1, -1, -1, str);
 }
 
+inline bool
+FastWideStringComparison(wchar *str1, wchar *str2)
+{
+	while (*str1 == *str2) {
+		++str1;
+		++str2;
+		if (!*str1 && !*str2) return true;
+	}
+	return false;
+}
+
 void
 CMessages::ClearThisPrint(wchar *str)
 {
 	bool equal;
-	wchar *v4;
-	wchar *v5;
 
 	do {
 		equal = false;
@@ -694,14 +700,7 @@ CMessages::ClearThisPrint(wchar *str)
 			if (BriefMessages[i].m_pText == nil)
 				break;
 			
-			v4 = str;
-			v5 = BriefMessages[i].m_pText;
-			while (*v5 == *v4 && !equal) {
-				++v4;
-				++v5;
-				if (!*v4 && !*v5)
-					equal = true;
-			}
+			equal = FastWideStringComparison(str, BriefMessages[i].m_pText);
 
 			if (equal) break;
 			i++;
@@ -747,11 +746,8 @@ void
 CMessages::ClearThisBigPrint(wchar *str)
 {
 	bool equal;
-	wchar *v4;
-	wchar *v5;
 
-	do
-	{
+	do {
 		uint16 i = 0;
 		equal = false;
 		uint16 style = 0;
@@ -759,17 +755,11 @@ CMessages::ClearThisBigPrint(wchar *str)
 		{
 			if (i >= 4)
 				break;
+
 			if (CMessages::BIGMessages[style].m_Stack[i].m_pText == nil || equal)
 				break;
 
-			v5 = CMessages::BIGMessages[style].m_Stack[i].m_pText;
-			v4 = str;
-			while (*v5 == *v4 && !equal) {
-				++v4;
-				++v5;
-				if (!*v4 && !*v5)
-					equal = true;
-			}
+			equal = FastWideStringComparison(str, BIGMessages[style].m_Stack[i].m_pText);
 
 			if (!equal && ++i == 4) {
 				i = 0;
diff --git a/src/text/Messages.h b/src/text/Messages.h
index fac2c2af..8044c626 100644
--- a/src/text/Messages.h
+++ b/src/text/Messages.h
@@ -32,7 +32,7 @@ public:
 	static tMessage(&BriefMessages)[NUMBRIEFMESSAGES];
 	static tBigMessage(&BIGMessages)[NUMBIGMESSAGES];
 	static tPreviousBrief(&PreviousBriefs)[NUMPREVIOUSBRIEFS];
-
+	static char PreviousMissionTitle[16]; // unused
 public:
 	static void Init(void);
 	static uint16 GetWideStringLength(wchar *src);
@@ -61,4 +61,9 @@ public:
 	static void ClearThisPrint(wchar *str);
 	static void ClearThisBigPrint(wchar *str);
 	static void ClearAllMessagesDisplayedByGame(void);
+
+	// unused or cut
+	//static void AddMessageSoonWithString(wchar*, uint32, uint16, wchar*);
+	//static void CutString(int16, char*, char**);
+	//static void PrintString(char*, int16, int16, int16);
 };
diff --git a/src/text/Pager.cpp b/src/text/Pager.cpp
index 68caca9a..a9813b18 100644
--- a/src/text/Pager.cpp
+++ b/src/text/Pager.cpp
@@ -72,8 +72,7 @@ CPager::Display()
 				if (!outstr1[pos]) break;
 
 				outstr2[i] = outstr1[pos];
-			}
-			else {
+			} else {
 				outstr2[i] = ' ';
 			}
 		}

From 17441c972bad7d17a6ec2f5b9103a2a5921b45f3 Mon Sep 17 00:00:00 2001
From: Sergeanur <s.anureev@yandex.ua>
Date: Fri, 25 Oct 2019 22:15:07 +0300
Subject: [PATCH 08/37] Fix CPager::Process loop

---
 src/text/Pager.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/text/Pager.cpp b/src/text/Pager.cpp
index a9813b18..9e484c29 100644
--- a/src/text/Pager.cpp
+++ b/src/text/Pager.cpp
@@ -22,6 +22,7 @@ CPager::Process()
 		while (i < NUMPAGERMESSAGES-1) {
 			if (m_messages[i + 1].m_pText == nil) break;
 			m_messages[i] = m_messages[i + 1];
+			i++;
 		}
 		m_messages[i].m_pText = nil;
 		if (m_messages[0].m_pText != nil)

From 2d998b24163060e225481d0f9a59092fa0981db1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?eray=20or=C3=A7unus?= <erayorcunus@gmail.com>
Date: Fri, 25 Oct 2019 02:25:11 +0300
Subject: [PATCH 09/37] Fixes&Peds

---
 src/core/Game.cpp       |   3 +
 src/core/re3.cpp        |   2 +
 src/peds/Ped.cpp        | 347 +++++++++++++++++++++++++++++++++++++++-
 src/peds/Ped.h          |   3 +-
 src/render/Hud.cpp      |   3 +-
 src/render/Particle.cpp |  15 +-
 src/render/Particle.h   |   3 +
 7 files changed, 368 insertions(+), 8 deletions(-)

diff --git a/src/core/Game.cpp b/src/core/Game.cpp
index 00d50fa8..b2bac8dd 100644
--- a/src/core/Game.cpp
+++ b/src/core/Game.cpp
@@ -80,12 +80,15 @@ WRAPPER void CGame::Initialise(const char *datFile) { EAXJMP(0x48BED0); }
 #if 0
 WRAPPER void CGame::Process(void) { EAXJMP(0x48C850); }
 #else
+extern void (*DebugMenuProcess)(void);
 void CGame::Process(void) 
 {
 	CPad::UpdatePads();
 	TheCamera.SetMotionBlurAlpha(0);
 	if (TheCamera.m_BlurType == MBLUR_NONE || TheCamera.m_BlurType == MBLUR_SNIPER || TheCamera.m_BlurType == MBLUR_NORMAL)
 		TheCamera.SetMotionBlur(0, 0, 0, 0, MBLUR_NONE);
+
+	DebugMenuProcess();
 	CCutsceneMgr::Update();
 	if (!CCutsceneMgr::IsCutsceneProcessing() && !CTimer::GetIsCodePaused())
 		FrontEndMenuManager.Process();
diff --git a/src/core/re3.cpp b/src/core/re3.cpp
index c8b50d55..62e9a040 100644
--- a/src/core/re3.cpp
+++ b/src/core/re3.cpp
@@ -18,6 +18,7 @@
 #include "Automobile.h"
 #include "Ped.h"
 #include "debugmenu_public.h"
+#include "Particle.h"
 
 #include <vector>
 #include <list>
@@ -352,6 +353,7 @@ DebugMenuPopulate(void)
 		DebugMenuAddCmd("Debug", "Make peds follow you in formation", LetThemFollowYou);
 #ifndef MASTER
 		DebugMenuAddVarBool8("Debug", "Toggle unused fight feature", (int8*)&CPed::bUnusedFightThingOnPlayer, nil);
+		DebugMenuAddVarBool8("Debug", "Toggle banned particles", (int8*)&CParticle::bEnableBannedParticles, nil);
 #endif
 
 		DebugMenuAddCmd("Debug", "Start Credits", CCredits::Start);
diff --git a/src/peds/Ped.cpp b/src/peds/Ped.cpp
index b0dc96cf..11141b04 100644
--- a/src/peds/Ped.cpp
+++ b/src/peds/Ped.cpp
@@ -59,7 +59,6 @@ WRAPPER void CPed::UpdatePosition(void) { EAXJMP(0x4C7A00); }
 WRAPPER void CPed::WanderPath(void) { EAXJMP(0x4D28D0); }
 WRAPPER void CPed::SeekCar(void) { EAXJMP(0x4D3F90); }
 WRAPPER void CPed::UpdateFromLeader(void) {	EAXJMP(0x4D8F30); }
-WRAPPER int CPed::ScanForThreats(void) { EAXJMP(0x4C5FE0); }
 WRAPPER void CPed::SetEnterCar_AllClear(CVehicle*, uint32, uint32) { EAXJMP(0x4E0A40); }
 WRAPPER bool CPed::WarpPedToNearEntityOffScreen(CEntity*) { EAXJMP(0x4E5570); }
 WRAPPER void CPed::SetObjective(eObjective, CVector) { EAXJMP(0x4D8A90); }
@@ -3245,7 +3244,7 @@ CPed::CheckForGunShots(void)
 	int event;
 	if (CEventList::FindClosestEvent(EVENT_GUNSHOT, GetPosition(), &event)) {
 		if (gaEvent[event].entityType == EVENT_ENTITY_PED) {
-			// Is that a bug?!? (same on VC)
+			// Probably due to we don't want peds to go gunshot area? (same on VC)
 			m_ped_flagD2 = false;
 			return CPools::GetPed(gaEvent[event].entityRef);
 		}
@@ -12357,7 +12356,7 @@ CPed::ProcessObjective(void)
 						SetLookTimer(CGeneral::GetRandomNumberInRange(500, 1500));
 
 						// Second condition is pointless and isn't there in Mobile.
-						if (threatType == 0x100000 || (threatType == 0x800000 && m_threatEntity) || m_threatEntity) {
+						if (threatType == PED_FLAG_GUN || (threatType == PED_FLAG_EXPLOSION && m_threatEntity) || m_threatEntity) {
 							if (m_threatEntity->IsPed())
 								SetObjective(OBJECTIVE_KILL_CHAR_ON_FOOT, m_threatEntity);
 						}
@@ -15236,6 +15235,346 @@ CPed::SetExitCar(CVehicle *veh, uint32 wantedDoorNode)
 	}
 }
 
+void
+CPed::ScanForInterestingStuff(void)
+{
+	if (!IsPedInControl())
+		return;
+
+	if (m_objective != OBJECTIVE_NONE)
+		return;
+
+	if (CharCreatedBy == MISSION_CHAR)
+		return;
+
+	LookForSexyPeds();
+	LookForSexyCars();
+	if (LookForInterestingNodes())
+		return;
+
+	if (m_nPedType == PEDTYPE_CRIMINAL && m_hitRecoverTimer < CTimer::GetTimeInMilliseconds()) {
+		if (CGeneral::GetRandomNumber() % 100 >= 10) {
+			if (m_objective != OBJECTIVE_MUG_CHAR && !(CGeneral::GetRandomNumber() & 7)) {
+				CPed *charToMug = nil;
+				for (int i = 0; i < m_numNearPeds; ++i) {
+					CPed *nearPed = m_nearPeds[i];
+
+					if ((nearPed->GetPosition() - GetPosition()).MagnitudeSqr() > 49.0f)
+						break;
+
+					if ((nearPed->m_nPedType == PEDTYPE_CIVFEMALE || nearPed->m_nPedType == PEDTYPE_CIVMALE
+						|| nearPed->m_nPedType == PEDTYPE_CRIMINAL || nearPed->m_nPedType == PEDTYPE_UNUSED1
+						|| nearPed->m_nPedType == PEDTYPE_PROSTITUTE)
+						&& nearPed->CharCreatedBy != MISSION_CHAR
+						&& nearPed->IsPedShootable()
+						&& nearPed->m_objective != OBJECTIVE_MUG_CHAR) {
+						charToMug = nearPed;
+						break;
+					}
+				}
+				if (charToMug)
+					SetObjective(OBJECTIVE_MUG_CHAR, charToMug);
+
+				m_hitRecoverTimer = CTimer::GetTimeInMilliseconds() + 5000;
+			}
+		} else {
+			int mostExpensiveVehAround = -1;
+			int bestMonetaryValue = 0;
+
+			CVector pos = GetPosition();
+			int16 lastVehicle;
+			CEntity *vehicles[8];
+			CWorld::FindObjectsInRange(pos, 10.0f, true, &lastVehicle, 6, vehicles, false, true, false, false, false);
+
+			for (int i = 0; i < lastVehicle; i++) {
+				CVehicle* veh = (CVehicle*)vehicles[i];
+
+				if (veh->VehicleCreatedBy != MISSION_VEHICLE) {
+					if (veh->m_vecMoveSpeed.Magnitude() <= 0.1f && veh->IsVehicleNormal()
+						&& veh->IsCar() && bestMonetaryValue < veh->pHandling->nMonetaryValue) {
+						mostExpensiveVehAround = i;
+						bestMonetaryValue = veh->pHandling->nMonetaryValue;
+					}
+				}
+			}
+			if (bestMonetaryValue > 2000 && mostExpensiveVehAround != -1 && vehicles[mostExpensiveVehAround]) {
+				SetObjective(OBJECTIVE_ENTER_CAR_AS_DRIVER, vehicles[mostExpensiveVehAround]);
+				m_hitRecoverTimer = CTimer::GetTimeInMilliseconds() + 5000;
+				return;
+			}
+			m_hitRecoverTimer = CTimer::GetTimeInMilliseconds() + 5000;
+		}
+	}
+
+	if (m_nPedState == PEDTYPE_CIVFEMALE) {
+#ifndef VC_PED_PORTS
+		if (CTimer::GetTimeInMilliseconds() > m_standardTimer) {
+
+			// += 2 is weird
+			for (int i = 0; i < m_numNearPeds; i += 2) {
+				if (m_nearPeds[i]->m_nPedState == PED_WANDER_PATH && WillChat(m_nearPeds[i])) {
+					if (CGeneral::GetRandomNumberInRange(0, 100) >= 100)
+						m_standardTimer = CTimer::GetTimeInMilliseconds() + 30000;
+					else {
+						if ((GetPosition() - m_nearPeds[i]->GetPosition()).Magnitude() >= 1.8f) {
+							m_standardTimer = CTimer::GetTimeInMilliseconds() + 30000;
+						} else if (CanSeeEntity(m_nearPeds[i], DEGTORAD(60.0f))) {
+							int time = CGeneral::GetRandomNumber() % 4000 + 10000;
+							SetChat(m_nearPeds[i], time);
+							m_nearPeds[i]->SetChat(this, time);
+							return;
+						}
+					}
+				}
+			}
+		}
+#else
+		if (CGeneral::GetRandomNumberInRange(0.0f, 1.0f) >= 0.5f) {
+			m_standardTimer = CTimer::GetTimeInMilliseconds() + 200;
+		} else {
+			if (CTimer::GetTimeInMilliseconds() > m_standardTimer) {
+				for (int i = 0; i < m_numNearPeds; i ++) {
+					if (m_nearPeds[i]->m_nPedState == PED_WANDER_PATH) {
+						if ((GetPosition() - m_nearPeds[i]->GetPosition()).Magnitude() < 1.8f
+							&& CanSeeEntity(m_nearPeds[i], DEGTORAD(60.0f)
+							&& m_nearPeds[i]->CanSeeEntity(this, DEGTORAD(60.0f)))
+							&& WillChat(m_nearPeds[i])) {
+
+							int time = CGeneral::GetRandomNumber() % 4000 + 10000;
+							SetChat(m_nearPeds[i], time);
+							m_nearPeds[i]->SetChat(this, time);
+							return;
+						}
+					}
+				}
+			}
+		}
+#endif
+	}
+
+	// Parts below aren't there in VC, they're in somewhere else.
+	if (!CGame::noProstitutes && m_nPedType == PEDTYPE_PROSTITUTE && CharCreatedBy != MISSION_CHAR
+		&& m_objectiveTimer < CTimer::GetTimeInMilliseconds() && !CTheScripts::IsPlayerOnAMission()) {
+
+		CVector pos = GetPosition();
+		int16 lastVehicle;
+		CEntity* vehicles[8];
+		CWorld::FindObjectsInRange(pos, 15.0f, true, &lastVehicle, 6, vehicles, false, true, false, false, false);
+
+		for (int i = 0; i < lastVehicle; i++) {
+			CVehicle* veh = (CVehicle*)vehicles[i];
+
+			if (veh->IsVehicleNormal()) {
+				if (veh->IsCar()) {
+					if ((GetPosition() - veh->GetPosition()).Magnitude() < 5.0f && veh->IsRoomForPedToLeaveCar(CAR_DOOR_LF, nil)) {
+						SetObjective(OBJECTIVE_SOLICIT, veh);
+						Say(SOUND_PED_SOLICIT);
+						return;
+					}
+				}
+			}
+		}
+	}
+	if (m_nPedType == PEDTYPE_CIVMALE || m_nPedType == PEDTYPE_CIVFEMALE) {
+		CVector pos = GetPosition();
+		int16 lastVehicle;
+		CEntity* vehicles[8];
+		CWorld::FindObjectsInRange(pos, 15.0f, true, &lastVehicle, 6, vehicles, false, true, false, false, false);
+
+		for (int i = 0; i < lastVehicle; i++) {
+			CVehicle* veh = (CVehicle*)vehicles[i];
+
+			if (veh->m_modelIndex == MI_MRWHOOP) {
+				if (veh->m_status != STATUS_ABANDONED && veh->m_status != STATUS_WRECKED) {
+					if ((GetPosition() - veh->GetPosition()).Magnitude() < 5.0f) {
+						SetObjective(OBJECTIVE_BUY_ICE_CREAM, veh);
+						return;
+					}
+				}
+			}
+		}
+	}
+}
+
+uint32
+CPed::ScanForThreats(void)
+{
+	int fearFlags = m_fearFlags;
+	CVector ourPos = GetPosition();
+	float closestPedDist = 60.0f;
+	CVector2D explosionPos = GetPosition();
+	if (fearFlags & PED_FLAG_EXPLOSION && CheckForExplosions(explosionPos)) {
+		m_eventOrThreat = explosionPos;
+		return PED_FLAG_EXPLOSION;
+	}
+	
+	CPed *shooter = nil;
+	if ((fearFlags & PED_FLAG_GUN) && (shooter = CheckForGunShots()) && (m_nPedType != shooter->m_nPedType || m_nPedType == PEDTYPE_CIVMALE || m_nPedType == PEDTYPE_CIVFEMALE)) {
+		if (!IsGangMember()) {
+			m_threatEntity = shooter;
+			m_threatEntity->RegisterReference((CEntity **) &m_threatEntity);
+			return PED_FLAG_GUN;
+		}
+
+		if (CPedType::GetFlag(shooter->m_nPedType) & fearFlags) {
+			m_threatEntity = shooter;
+			m_threatEntity->RegisterReference((CEntity **) &m_threatEntity);
+			return CPedType::GetFlag(shooter->m_nPedType);
+		}
+	}
+
+	CPed *deadPed = nil;
+	if (fearFlags & PED_FLAG_DEADPEDS && CharCreatedBy != MISSION_CHAR
+		&& (deadPed = CheckForDeadPeds()) != nil && (deadPed->GetPosition() - ourPos).MagnitudeSqr() < 400.0f) {
+		m_pEventEntity = deadPed;
+		m_pEventEntity->RegisterReference((CEntity **) &m_pEventEntity);
+		return PED_FLAG_DEADPEDS;
+	} else {
+		uint32 flagsOfSomePed = 0;
+
+		CPed *pedToFearFrom = nil;
+#ifndef VC_PED_PORTS
+		for (int i = 0; i < m_numNearPeds; i++) {
+			if (CharCreatedBy != RANDOM_CHAR || m_nearPeds[i]->CharCreatedBy != MISSION_CHAR || m_nearPeds[i]->IsPlayer()) {
+				CPed *nearPed = m_nearPeds[i];
+
+				// BUG: WTF Rockstar?! Putting this here will result in returning the flags of farthest ped to us, since m_nearPeds is sorted by distance.
+				// Fixed at the bottom of the function.
+				flagsOfSomePed = CPedType::GetFlag(nearPed->m_nPedType);
+
+				if (CPedType::GetFlag(nearPed->m_nPedType) & fearFlags) {
+					if (nearPed->m_fHealth > 0.0f && OurPedCanSeeThisOne(m_nearPeds[i])) {
+						// FIX: Taken from VC
+#ifdef FIX_BUGS
+						float nearPedDistSqr = (nearPed->GetPosition() - ourPos).MagnitudeSqr2D();
+#else
+						float nearPedDistSqr = (CVector2D(ourPos) - explosionPos).MagnitudeSqr();
+#endif
+						if (sq(closestPedDist) > nearPedDistSqr) {
+							closestPedDist = Sqrt(nearPedDistSqr);
+							pedToFearFrom = m_nearPeds[i];
+						}
+					}
+				}
+			}
+		}
+#else
+		bool weSawOurEnemy = false;
+		bool weMaySeeOurEnemy = false;
+		float closestEnemyDist = 60.0f;
+		if ((CTimer::GetFrameCounter() + (uint8)m_randomSeed + 16) & 4) {
+
+			for (int i = 0; i < m_numNearPeds; ++i) {
+				if (CharCreatedBy == RANDOM_CHAR && m_nearPeds[i]->CharCreatedBy == MISSION_CHAR && !m_nearPeds[i]->IsPlayer()) {
+						continue;
+				}
+
+				// BUG: Explained at the same occurence of this bug above. Fixed at the bottom of the function.
+				flagsOfSomePed = CPedType::GetFlag(m_nearPeds[i]->m_nPedType);
+
+				if (flagsOfSomePed & fearFlags) {
+					if (m_nearPeds[i]->m_fHealth > 0.0f) {
+
+						// VC also has ability to include objects to line of sight check here (via last bit of flagsL)
+						if (OurPedCanSeeThisOne(m_nearPeds[i])) {
+							if (m_nearPeds[i]->m_nPedState == PED_ATTACK) {
+								if (m_nearPeds[i]->m_pedInObjective == this) {
+
+									float enemyDistSqr = (m_nearPeds[i]->GetPosition() - ourPos).MagnitudeSqr2D();
+									if (sq(closestEnemyDist) > enemyDistSqr) {
+										float enemyDist = Sqrt(enemyDistSqr);
+										weSawOurEnemy = true;
+										closestPedDist = enemyDist;
+										closestEnemyDist = enemyDist;
+										pedToFearFrom = m_nearPeds[i];
+									}
+								}
+							} else {
+								float nearPedDistSqr = (m_nearPeds[i]->GetPosition() - ourPos).MagnitudeSqr2D();
+								if (sq(closestPedDist) > nearPedDistSqr && !weSawOurEnemy) {
+									closestPedDist = Sqrt(nearPedDistSqr);
+									pedToFearFrom = m_nearPeds[i];
+								}
+							}
+						} else if (!weSawOurEnemy) {
+							CPed *nearPed = m_nearPeds[i];
+							if (nearPed->m_nPedState == PED_ATTACK) {
+								CColPoint foundCol;
+								CEntity *foundEnt;
+
+								// We don't see him yet but he's behind a ped, vehicle or object
+								// VC also has ability to include objects to line of sight check here (via last bit of flagsL)
+								if (!CWorld::ProcessLineOfSight(ourPos, nearPed->GetPosition(), foundCol, foundEnt,
+									true, false, false, false, false, false, false)) {
+
+									if (nearPed->m_pedInObjective == this) {
+										float enemyDistSqr = (m_nearPeds[i]->GetPosition() - ourPos).MagnitudeSqr2D();
+										if (sq(closestEnemyDist) > enemyDistSqr) {
+											float enemyDist = Sqrt(enemyDistSqr);
+											weMaySeeOurEnemy = true;
+											closestPedDist = enemyDist;
+											closestEnemyDist = enemyDist;
+											pedToFearFrom = m_nearPeds[i];
+										}
+									} else if (!nearPed->GetWeapon()->IsTypeMelee() && !weMaySeeOurEnemy) {
+										float nearPedDistSqr = (m_nearPeds[i]->GetPosition() - ourPos).MagnitudeSqr2D();
+										if (sq(closestPedDist) > nearPedDistSqr) {
+											weMaySeeOurEnemy = true;
+											closestPedDist = Sqrt(nearPedDistSqr);
+											pedToFearFrom = m_nearPeds[i];
+										}
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+#endif
+		int16 lastVehicle;
+		CEntity* vehicles[8];
+		CWorld::FindObjectsInRange(ourPos, 20.0f, true, &lastVehicle, 6, vehicles, false, true, false, false, false);
+		CVehicle* foundVeh = nil;
+		for (int i = 0; i < lastVehicle; i++) {
+			CVehicle* nearVeh = (CVehicle*)vehicles[i];
+
+			CPed *driver = nearVeh->pDriver;
+			if (driver) {
+
+				// BUG: Same bug as above. Fixed at the bottom of function.
+				flagsOfSomePed = CPedType::GetFlag(driver->m_nPedType);
+				if (CPedType::GetFlag(driver->m_nPedType) & fearFlags) {
+					if (driver->m_fHealth > 0.0f && OurPedCanSeeThisOne(nearVeh->pDriver)) {
+						// FIX: Taken from VC
+#ifdef FIX_BUGS
+						float driverDistSqr = (driver->GetPosition() - ourPos).MagnitudeSqr2D();
+#else
+						float driverDistSqr = (CVector2D(ourPos) - explosionPos).MagnitudeSqr();
+#endif
+						if (sq(closestPedDist) > driverDistSqr) {
+							closestPedDist = Sqrt(driverDistSqr);
+							pedToFearFrom = nearVeh->pDriver;
+						}
+					}
+				}
+			}
+		}
+		m_threatEntity = pedToFearFrom;
+		if (m_threatEntity)
+			m_threatEntity->RegisterReference((CEntity **) &m_threatEntity);
+
+#ifdef FIX_BUGS
+		if (pedToFearFrom)
+			flagsOfSomePed = CPedType::GetFlag(((CPed*)m_threatEntity)->m_nPedType);
+		else
+			flagsOfSomePed = 0;
+#endif
+
+		return flagsOfSomePed;
+	}
+}
+
 class CPed_ : public CPed
 {
 public:
@@ -15451,4 +15790,6 @@ STARTPATCHES
 	InjectHook(0x4D6620, &CPed::SetSolicit, PATCH_JUMP);
 	InjectHook(0x4D2EA0, &CPed::SetFollowPath, PATCH_JUMP);
 	InjectHook(0x4E1010, &CPed::SetExitCar, PATCH_JUMP);
+	InjectHook(0x4C5FE0, &CPed::ScanForThreats, PATCH_JUMP);
+	InjectHook(0x4C6C10, &CPed::ScanForInterestingStuff, PATCH_JUMP);
 ENDPATCHES
\ No newline at end of file
diff --git a/src/peds/Ped.h b/src/peds/Ped.h
index 7a0ade14..b3d0f145 100644
--- a/src/peds/Ped.h
+++ b/src/peds/Ped.h
@@ -669,7 +669,7 @@ public:
 	bool PlacePedOnDryLand(void);
 	bool PossiblyFindBetterPosToSeekCar(CVector*, CVehicle*);
 	void UpdateFromLeader(void);
-	int ScanForThreats(void);
+	uint32 ScanForThreats(void);
 	void SetEnterCar(CVehicle*, uint32);
 	bool WarpPedToNearEntityOffScreen(CEntity*);
 	void SetExitCar(CVehicle*, uint32);
@@ -678,6 +678,7 @@ public:
 	void SetEnterTrain(CVehicle*, uint32);
 	void SetEnterCar_AllClear(CVehicle*, uint32, uint32);
 	void SetSolicit(uint32 time);
+	void ScanForInterestingStuff(void);
 
 	// Static methods
 	static CVector GetLocalPositionToOpenCarDoor(CVehicle *veh, uint32 component, float offset);
diff --git a/src/render/Hud.cpp b/src/render/Hud.cpp
index a9215cb7..aa728a5e 100644
--- a/src/render/Hud.cpp
+++ b/src/render/Hud.cpp
@@ -637,6 +637,7 @@ void CHud::Draw()
 		/*
 			DrawOnScreenTimer
 		*/
+		
 		wchar sTimer[16];
 
 		if (!CUserDisplay::OnscnTimer.m_sEntries[0].m_bTimerProcessed)
@@ -697,7 +698,7 @@ void CHud::Draw()
 				if (CTimer::GetFrameCounter() & 4 || !CounterFlashTimer) {
 					if (CUserDisplay::OnscnTimer.m_sEntries[0].m_nType) {
 						CSprite2d::DrawRect(CRect(SCREEN_SCALE_FROM_RIGHT(27.0f) - SCREEN_SCALE_X(100.0f) / 2 + SCREEN_SCALE_X(4.0f), SCREEN_SCALE_Y(132.0f) + SCREEN_SCALE_Y(8.0f), SCREEN_SCALE_FROM_RIGHT(27.0f) + SCREEN_SCALE_X(4.0f), SCREEN_SCALE_Y(132.0f) + SCREEN_SCALE_Y(11.0f) + SCREEN_SCALE_Y(8.0f)), CRGBA(0, 106, 164, 80));
-						CSprite2d::DrawRect(CRect(SCREEN_SCALE_FROM_RIGHT(27.0f) - SCREEN_SCALE_X(100.0f) / 2 + SCREEN_SCALE_X(4.0f), SCREEN_SCALE_Y(132.0f) + SCREEN_SCALE_Y(8.0f), SCREEN_SCALE_X(atoi(CUserDisplay::OnscnTimer.m_sEntries[0].m_bCounterBuffer)) / 2 + SCREEN_SCALE_FROM_RIGHT(27.0f) - SCREEN_SCALE_X(100.0f) / 2 + SCREEN_SCALE_X(4.0f), SCREEN_SCALE_Y(132.0f) + SCREEN_SCALE_Y(11.0f) + SCREEN_SCALE_Y(8.0f)), CRGBA(0, 106, 164, 255));
+						CSprite2d::DrawRect(CRect(SCREEN_SCALE_FROM_RIGHT(27.0f) - SCREEN_SCALE_X(100.0f) / 2 + SCREEN_SCALE_X(4.0f), SCREEN_SCALE_Y(132.0f) + SCREEN_SCALE_Y(8.0f), SCREEN_SCALE_X(atoi(CUserDisplay::OnscnTimer.m_sEntries[0].m_bCounterBuffer)) / 2 + SCREEN_SCALE_FROM_RIGHT(27.0f + 50.0f) + SCREEN_SCALE_X(4.0f), SCREEN_SCALE_Y(132.0f) + SCREEN_SCALE_Y(11.0f) + SCREEN_SCALE_Y(8.0f)), CRGBA(0, 106, 164, 255));
 					} else {
 						AsciiToUnicode(CUserDisplay::OnscnTimer.m_sEntries[0].m_bCounterBuffer, sTimer);
 						CFont::SetPropOn();
diff --git a/src/render/Particle.cpp b/src/render/Particle.cpp
index e2db55c7..56ac9512 100644
--- a/src/render/Particle.cpp
+++ b/src/render/Particle.cpp
@@ -12,6 +12,10 @@
 #include "ParticleObject.h"
 #include "Particle.h"
 
+#ifndef MASTER
+bool CParticle::bEnableBannedParticles = false;
+#endif
+
 #define MAX_PARTICLES_ON_SCREEN   (1000)
 
 
@@ -768,7 +772,9 @@ CParticle *CParticle::AddParticle(tParticleType type, CVector const &vecPos, CVe
 {
 	if ( CTimer::GetIsPaused() )
 		return NULL;
-
+#ifndef MASTER
+	if(!bEnableBannedParticles)
+#endif
 	if ( ( type == PARTICLE_ENGINE_SMOKE
 		|| type == PARTICLE_ENGINE_SMOKE2
 		|| type == PARTICLE_ENGINE_STEAM
@@ -781,7 +787,7 @@ CParticle *CParticle::AddParticle(tParticleType type, CVector const &vecPos, CVe
 	{
 		return nil;
 	}
-	
+
 	CParticle *pParticle = m_pUnusedListHead;
 	
 	if ( pParticle == nil )
@@ -1455,7 +1461,10 @@ void CParticle::Render()
 		RwRaster **frames = psystem->m_ppRaster;
 		
 		tParticleType type = psystem->m_Type;
-	
+
+#ifndef MASTER
+		if (!bEnableBannedParticles)
+#endif
 		if ( type == PARTICLE_ENGINE_SMOKE
 			|| type == PARTICLE_ENGINE_SMOKE2
 			|| type == PARTICLE_ENGINE_STEAM
diff --git a/src/render/Particle.h b/src/render/Particle.h
index 4e41ea2d..310ef0d4 100644
--- a/src/render/Particle.h
+++ b/src/render/Particle.h
@@ -97,6 +97,9 @@ public:
 	static void AddJetExplosion(CVector const &vecPos, float fPower, float fSize);
 	static void AddYardieDoorSmoke(CVector const &vecPos, CMatrix const &matMatrix);
 
+#ifndef MASTER
+	static bool bEnableBannedParticles;
+#endif
 };
 
 VALIDATE_SIZE(CParticle, 0x68);
\ No newline at end of file

From ccf9c53049e42ceee1a6fef7a584fc5815078a83 Mon Sep 17 00:00:00 2001
From: Sergeanur <s.anureev@yandex.ua>
Date: Fri, 25 Oct 2019 22:44:00 +0300
Subject: [PATCH 10/37] Fixing array sizes in CMessages

---
 src/text/Messages.cpp | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/text/Messages.cpp b/src/text/Messages.cpp
index c5259910..0e8f5494 100644
--- a/src/text/Messages.cpp
+++ b/src/text/Messages.cpp
@@ -118,7 +118,7 @@ CMessages::Process()
 void
 CMessages::Display()
 {
-	wchar outstr[260];
+	wchar outstr[256];
 
 	DefinedState();
 
@@ -154,7 +154,7 @@ CMessages::Display()
 void
 CMessages::AddMessage(wchar *msg, uint32 time, uint16 flag)
 {
-	wchar outstr[514]; // unused
+	wchar outstr[512]; // unused
 	WideStringCopy(outstr, msg, 256);
 	InsertPlayerControlKeysInString(outstr);
 	GetWideStringLength(outstr);
@@ -190,7 +190,7 @@ CMessages::AddMessage(wchar *msg, uint32 time, uint16 flag)
 void
 CMessages::AddMessageJumpQ(wchar *msg, uint32 time, uint16 flag)
 {
-	wchar outstr[514]; // unused
+	wchar outstr[512]; // unused
 	WideStringCopy(outstr, msg, 256);
 	InsertPlayerControlKeysInString(outstr);
 	GetWideStringLength(outstr);
@@ -212,7 +212,7 @@ CMessages::AddMessageJumpQ(wchar *msg, uint32 time, uint16 flag)
 void
 CMessages::AddMessageSoon(wchar *msg, uint32 time, uint16 flag)
 {
-	wchar outstr[520]; // unused
+	wchar outstr[512]; // unused
 	WideStringCopy(outstr, msg, 256);
 	InsertPlayerControlKeysInString(outstr);
 	GetWideStringLength(outstr);
@@ -272,7 +272,7 @@ CMessages::ClearSmallMessagesOnly()
 void
 CMessages::AddBigMessage(wchar *msg, uint32 time, uint16 style)
 {
-	wchar outstr[514]; // unused
+	wchar outstr[512]; // unused
 	WideStringCopy(outstr, msg, 256);
 	InsertPlayerControlKeysInString(outstr);
 	GetWideStringLength(outstr);
@@ -292,7 +292,7 @@ CMessages::AddBigMessage(wchar *msg, uint32 time, uint16 style)
 void
 CMessages::AddBigMessageQ(wchar *msg, uint32 time, uint16 style)
 {
-	wchar outstr[518]; // unused
+	wchar outstr[512]; // unused
 	WideStringCopy(outstr, msg, 256);
 	InsertPlayerControlKeysInString(outstr);
 	GetWideStringLength(outstr);
@@ -358,8 +358,8 @@ CMessages::AddToPreviousBriefArray(wchar *text, int32 n1, int32 n2, int32 n3, in
 void
 CMessages::InsertNumberInString(wchar *str, int32 n1, int32 n2, int32 n3, int32 n4, int32 n5, int32 n6, wchar *outstr)
 {
-	char numStr[12];
-	wchar wNumStr[18];
+	char numStr[10];
+	wchar wNumStr[10];
 
 	if (str == nil) {
 		*outstr = '\0';
@@ -398,7 +398,7 @@ CMessages::InsertNumberInString(wchar *str, int32 n1, int32 n2, int32 n3, int32
 void
 CMessages::InsertStringInString(wchar *str1, wchar *str2)
 {
-	wchar tempstr[264];
+	wchar tempstr[256];
 
 	if (!str1 || !str2) return;
 
@@ -432,7 +432,7 @@ CMessages::InsertPlayerControlKeysInString(wchar *str)
 {
 	uint16 i;
 	wchar outstr[256];
-	wchar keybuf[264];
+	wchar keybuf[256];
 
 	if (!str) return;
 	uint16 strSize = GetWideStringLength(str);
@@ -472,7 +472,7 @@ CMessages::InsertPlayerControlKeysInString(wchar *str)
 void
 CMessages::AddMessageWithNumber(wchar *str, uint32 time, uint16 flag, int32 n1, int32 n2, int32 n3, int32 n4, int32 n5, int32 n6)
 {
-	wchar outstr[520]; // unused
+	wchar outstr[512]; // unused
 	InsertNumberInString(str, n1, n2, n3, n4, n5, n6, outstr);
 	InsertPlayerControlKeysInString(outstr);
 	GetWideStringLength(outstr);
@@ -509,7 +509,7 @@ CMessages::AddMessageWithNumber(wchar *str, uint32 time, uint16 flag, int32 n1,
 void 
 CMessages::AddMessageJumpQWithNumber(wchar *str, uint32 time, uint16 flag, int32 n1, int32 n2, int32 n3, int32 n4, int32 n5, int32 n6)
 {
-	wchar outstr[520]; // unused
+	wchar outstr[512]; // unused
 	InsertNumberInString(str, n1, n2, n3, n4, n5, n6, outstr);
 	InsertPlayerControlKeysInString(outstr);
 	GetWideStringLength(outstr);
@@ -531,7 +531,7 @@ CMessages::AddMessageJumpQWithNumber(wchar *str, uint32 time, uint16 flag, int32
 void
 CMessages::AddMessageSoonWithNumber(wchar *str, uint32 time, uint16 flag, int32 n1, int32 n2, int32 n3, int32 n4, int32 n5, int32 n6)
 {
-	wchar outstr[520]; // unused
+	wchar outstr[512]; // unused
 	InsertNumberInString(str, n1, n2, n3, n4, n5, n6, outstr);
 	InsertPlayerControlKeysInString(outstr);
 	GetWideStringLength(outstr);
@@ -570,7 +570,7 @@ CMessages::AddMessageSoonWithNumber(wchar *str, uint32 time, uint16 flag, int32
 void
 CMessages::AddBigMessageWithNumber(wchar *str, uint32 time, uint16 style, int32 n1, int32 n2, int32 n3, int32 n4, int32 n5, int32 n6)
 {
-	wchar outstr[520]; // unused
+	wchar outstr[512]; // unused
 	InsertNumberInString(str, n1, n2, n3, n4, n5, n6, outstr);
 	InsertPlayerControlKeysInString(outstr);
 	GetWideStringLength(outstr);
@@ -591,7 +591,7 @@ CMessages::AddBigMessageWithNumber(wchar *str, uint32 time, uint16 style, int32
 void
 CMessages::AddBigMessageWithNumberQ(wchar *str, uint32 time, uint16 style, int32 n1, int32 n2, int32 n3, int32 n4, int32 n5, int32 n6)
 {
-	wchar outstr[520]; // unused
+	wchar outstr[512]; // unused
 	InsertNumberInString(str, n1, n2, n3, n4, n5, n6, outstr);
 	InsertPlayerControlKeysInString(outstr);
 	GetWideStringLength(outstr);
@@ -619,7 +619,7 @@ CMessages::AddBigMessageWithNumberQ(wchar *str, uint32 time, uint16 style, int32
 void
 CMessages::AddMessageWithString(wchar *text, uint32 time, uint16 flag, wchar *str)
 {
-	wchar outstr[516]; // unused
+	wchar outstr[512]; // unused
 	WideStringCopy(outstr, text, 256);
 	InsertStringInString(outstr, str);
 	InsertPlayerControlKeysInString(outstr);
@@ -657,7 +657,7 @@ CMessages::AddMessageWithString(wchar *text, uint32 time, uint16 flag, wchar *st
 void
 CMessages::AddMessageJumpQWithString(wchar *text, uint32 time, uint16 flag, wchar *str)
 {
-	wchar outstr[516]; // unused
+	wchar outstr[512]; // unused
 	WideStringCopy(outstr, text, 256);
 	InsertStringInString(outstr, str);
 	InsertPlayerControlKeysInString(outstr);

From 12ee71e4f732c883b33b9165c448302ea726186b Mon Sep 17 00:00:00 2001
From: Filip Gawin <filip.gawin@zoho.com>
Date: Fri, 30 Aug 2019 00:44:57 +0200
Subject: [PATCH 11/37] audio7

---
 src/audio/AudioManager.cpp | 921 +++++++++++++++++++++++++++++++++----
 src/audio/AudioManager.h   | 116 +++--
 src/audio/DMAudio.cpp      |   2 +-
 src/audio/DMAudio.h        |   3 +-
 src/audio/MusicManager.cpp |  10 +-
 src/audio/MusicManager.h   |   4 +-
 src/control/PathFind.cpp   |  53 ++-
 src/core/common.h          |   8 +-
 8 files changed, 956 insertions(+), 161 deletions(-)

diff --git a/src/audio/AudioManager.cpp b/src/audio/AudioManager.cpp
index b82c650c..ae520684 100644
--- a/src/audio/AudioManager.cpp
+++ b/src/audio/AudioManager.cpp
@@ -39,9 +39,12 @@ int32 *BankStartOffset = (int32 *)0x6FAB70; //[2]
 int32 &g_nMissionAudioSfx = *(int32 *)0x60ED84;
 bool &bPlayerJustEnteredCar = *(bool *)0x6508C4;
 bool &g_bMissionAudioLoadFailed = *(bool *)0x95CD8E;
+uint32 *gMinTimeToNextReport = (uint32 *)0x8E2828;
+uint8 &gSpecialSuspectLastSeenReport = *(uint8 *)0x95CD4D;
 
 constexpr int totalAudioEntitiesSlots = 200;
 constexpr int maxVolume = 127;
+constexpr int policeChannel = 28;
 
 // TODO: where is this used? Is this the right file?
 enum eVehicleModel {
@@ -236,6 +239,43 @@ cPedComments::Process()
 	}
 }
 
+void
+cAudioCollisionManager::AddCollisionToRequestedQueue()
+{
+	int32 collisionsIndex;
+	int32 i;
+
+	if(m_bCollisionsInQueue >= 10u) {
+		collisionsIndex = m_bIndicesTable[9];
+		if(m_sQueue.m_fDistance >= m_asCollisions1[collisionsIndex].m_fDistance) return;
+	} else {
+		collisionsIndex = m_bCollisionsInQueue++;
+	}
+
+	m_asCollisions1[collisionsIndex] = m_sQueue;
+
+	i = 0;
+	if(collisionsIndex) {
+		while(m_asCollisions1[m_bIndicesTable[i]].m_fDistance <=
+		      m_asCollisions1[collisionsIndex].m_fDistance) {
+			if(++i >= collisionsIndex) {
+				m_bIndicesTable[i] = collisionsIndex;
+				return;
+			}
+		}
+		memmove(&m_bIndicesTable[i + 1], &m_bIndicesTable[i], 9 - i);
+	}
+	m_bIndicesTable[i] = collisionsIndex;
+}
+
+void
+cAudioScriptObject::Reset()
+{
+	AudioId = 125;
+	Posn = {0.0f, 0.0f, 0.0f};
+	AudioEntity = -5;
+}
+
 void *
 cAudioScriptObject::operator new(size_t sz)
 {
@@ -347,15 +387,63 @@ cAudioManager::AddReflectionsToRequestedQueue()
 	}
 }
 
-#if 1
-WRAPPER void
+void
 cAudioManager::AddReleasingSounds()
 {
-	EAXJMP(0x57B8D0);
-}
-#else
+	bool toProcess[44];
 
-#endif
+	for(int32 i = 0; i < m_bSampleRequestQueuesStatus[m_bActiveSampleQueue]; i++) {
+		tActiveSample &sample =
+		    m_asSamples[!m_bActiveSampleQueue]
+		               [m_abSampleQueueIndexTable[!m_bActiveSampleQueue][i]];
+		if(!m_asSamples[!m_bActiveSampleQueue]
+		               [m_abSampleQueueIndexTable[!m_bActiveSampleQueue][i]]
+		                   .m_bLoopEnded) {
+			toProcess[i] = 0;
+			for(int32 j = 0; j < m_bSampleRequestQueuesStatus[m_bActiveSampleQueue];
+			    j++) {
+				if(sample.m_nEntityIndex ==
+				       m_asSamples[m_bActiveSampleQueue]
+				                  [m_abSampleQueueIndexTable[m_bActiveSampleQueue]
+				                                            [j]]
+				                      .m_nEntityIndex &&
+				   sample.m_counter ==
+				       m_asSamples[m_bActiveSampleQueue]
+				                  [m_abSampleQueueIndexTable[m_bActiveSampleQueue]
+				                                            [j]]
+				                      .m_counter) {
+					toProcess[i] = 1;
+					break;
+				}
+			}
+			if(!toProcess[i]) {
+				if(sample.m_counter <= 255u || !sample.m_bLoopsRemaining) {
+					if(!sample.field_76) continue;
+					if(!sample.m_nLoopCount) {
+						if(sample.field_88 == -1) {
+							sample.field_88 =
+							    sample.m_bVolume / sample.field_76;
+							if(sample.field_88 <= 0)
+								sample.field_88 = 1;
+						}
+						if(sample.m_bVolume <= sample.field_88) {
+							sample.field_76 = 0;
+							continue;
+						}
+						sample.m_bVolume -= sample.field_88;
+					}
+					--sample.field_76;
+					if(field_2) {
+						if(sample.field_16 < 20u) ++sample.field_16;
+					}
+					sample.field_56 = 0;
+				}
+				memcpy(&m_sQueueSample, &sample, 92);
+				AddSampleToRequestedQueue();
+			}
+		}
+	}
+}
 
 void
 cAudioManager::AddSampleToRequestedQueue()
@@ -399,18 +487,21 @@ cAudioManager::AddSampleToRequestedQueue()
 	}
 }
 
-WRAPPER
 void
 cAudioManager::AgeCrimes()
 {
-	EAXJMP(0x580AF0);
+	for(uint8 i = 0; i < 10; i++) {
+		if(crimes[i].type) {
+			if(++crimes[i].timer > 1500u) crimes[i].type = 0;
+		}
+	}
 }
 
 void
 cAudioManager::CalculateDistance(bool *ptr, float dist)
 {
 	if(*ptr == false) {
-		m_sQueueSample.m_fDistance = sqrt(dist);
+		m_sQueueSample.m_fDistance = Sqrt(dist);
 		*ptr = true;
 	}
 }
@@ -421,6 +512,39 @@ cAudioManager::CheckForAnAudioFileOnCD() const
 	return SampleManager.CheckForAnAudioFileOnCD();
 }
 
+void
+cAudioManager::ClearActiveSamples()
+{
+	for(int32 i = 0; i < m_bActiveSamples; i++) {
+		m_asActiveSamples[i].m_nEntityIndex = -5;
+		m_asActiveSamples[i].m_counter = 0;
+		m_asActiveSamples[i].m_nSampleIndex = NO_SAMPLE;
+		m_asActiveSamples[i].m_bBankIndex = 3;
+		m_asActiveSamples[i].m_bIsDistant = 0;
+		m_asActiveSamples[i].field_16 = 5;
+		m_asActiveSamples[i].m_nFrequency = 0;
+		m_asActiveSamples[i].m_bVolume = 0;
+		m_asActiveSamples[i].m_bEmittingVolume = 0;
+		m_asActiveSamples[i].m_fDistance = 0.0f;
+		m_asActiveSamples[i].m_bIsProcessed = 0;
+		m_asActiveSamples[i].m_bLoopEnded = 0;
+		m_asActiveSamples[i].m_nLoopCount = 1;
+		m_asActiveSamples[i].m_nLoopStart = 0;
+		m_asActiveSamples[i].m_nLoopEnd = -1;
+		m_asActiveSamples[i].field_48 = 0.0f;
+		m_asActiveSamples[i].m_fSoundIntensity = 200.0f;
+		m_asActiveSamples[i].m_bOffset = 63;
+		m_asActiveSamples[i].field_56 = 0;
+		m_asActiveSamples[i].calculatedVolume = 0;
+		m_asActiveSamples[i].field_76 = 0;
+		m_asActiveSamples[i].field_88 = -1;
+		m_asActiveSamples[i].m_vecPos = {0.0f, 0.0f, 0.0f};
+		m_asActiveSamples[i].m_bReverbFlag = 0;
+		m_asActiveSamples[i].m_bLoopsRemaining = 0;
+		m_asActiveSamples[i].m_bRequireReflection = 0;
+	}
+}
+
 void
 cAudioManager::ClearMissionAudio()
 {
@@ -563,7 +687,7 @@ cAudioManager::DestroyEntity(int32 id)
 void
 cAudioManager::DoJumboVolOffset() const
 {
-	if(!(m_FrameCounter % (m_anRandomTable[0] % 6u + 3)))
+	if(!(m_nTimeOfRecentCrime % (m_anRandomTable[0] % 6u + 3)))
 		jumboVolOffset = m_anRandomTable[1] % 60u;
 }
 
@@ -2736,46 +2860,47 @@ cAudioManager::GetCollisionLoopingRatio(uint32 a, uint32 b, float c) const
 }
 
 float
-cAudioManager::GetCollisionOneShotRatio(uint32 a, float b) const
+cAudioManager::GetCollisionOneShotRatio(int32 a, float b) const
 {
 	float result;
 
 	switch(a) {
-	case 0u:
-	case 1u:
-	case 5u:
-	case 26u:
-	case 31u: result = GetCollisionRatio(b, 10.0, 60.0, 50.0); break;
-	case 2u:
-	case 3u:
-	case 4u:
-	case 30u: result = GetCollisionRatio(b, 0.0, 2.0, 2.0); break;
-	case 6u: result = GetCollisionRatio(b, 6.0, 50.0, 44.0); break;
-	case 7u:
-	case 16u: result = GetCollisionRatio(b, 0.1, 10.0, 9.9); break;
-	case 8u:
-	case 11u: result = GetCollisionRatio(b, 30.0, 130.0, 100.0); break;
-	case 9u: result = GetCollisionRatio(b, 20.0, 100.0, 80.0); break;
-	case 10u: result = GetCollisionRatio(b, 0.0, 4.0, 4.0); break;
-	case 12u:
-	case 13u:
-	case 32u: result = GetCollisionRatio(b, 1.0, 10.0, 9.0); break;
-	case 14u: result = GetCollisionRatio(b, 1.0, 15.0, 14.0); break;
-	case 15u: result = GetCollisionRatio(b, 8.0, 50.0, 42.0); break;
-	case 17u: result = GetCollisionRatio(b, 0.0, 20.0, 20.0); break;
-	case 18u:
-	case 19u:
-	case 23u:
-	case 29u: result = GetCollisionRatio(b, 0.0, 10.0, 10.0); break;
-	case 20u: result = GetCollisionRatio(b, 1.0, 4.0, 3.0); break;
-	case 21u: result = GetCollisionRatio(b, 0.1, 5.0, 4.9); break;
-	case 22u: result = GetCollisionRatio(b, 0.1, 40.0, 39.9); break;
-	case 24u: result = GetCollisionRatio(b, 0.1, 4.0, 3.9); break;
-	case 25u: result = GetCollisionRatio(b, 0.0, 0.5, 0.5); break;
-	case 27u: result = GetCollisionRatio(b, 4.0, 40.0, 36.0); break;
-	case 28u: result = GetCollisionRatio(b, 0.0, 5.0, 5.0); break;
-	default: result = 0.0; break;
+	case SURFACE_DEFAULT:
+	case SURFACE_TARMAC:
+	case SURFACE_PAVEMENT:
+	case SURFACE_STONE:
+	case SURFACE_BOLLARD: result = GetCollisionRatio(b, 10.f, 60.f, 50.f); break;
+	case SURFACE_GRASS:
+	case SURFACE_LOOSE30: result = GetCollisionRatio(b, 0.f, 2.f, 2.f); break;
+	case SURFACE_DIRT: result = GetCollisionRatio(b, 0.f, 2.f, 2.f); break;
+	case SURFACE_DIRTTRACK: result = GetCollisionRatio(b, 0.f, 2.f, 2.f); break;
+	case SURFACE_METAL6: result = GetCollisionRatio(b, 6.f, 50.f, 44.f); break;
+	case SURFACE_GLASS: result = GetCollisionRatio(b, 0.1f, 10.f, 9.9f); break;
+	case SURFACE_SCAFFOLD:
+	case SURFACE_STEEL: result = GetCollisionRatio(b, 30.f, 130.f, 100.f); break;
+	case SURFACE_METAL_DOOR: result = GetCollisionRatio(b, 20.f, 100.f, 80.f); break;
+	case SURFACE_BILLBOARD: result = GetCollisionRatio(b, 0.f, 4.f, 4.f); break;
+	case SURFACE_METAL_POLE:
+	case SURFACE_GATE: result = GetCollisionRatio(b, 1.f, 10.f, 9.f); break;
+	case SURFACE_STREET_LIGHT: result = GetCollisionRatio(b, 1.f, 10.f, 9.f); break;
+	case SURFACE_METAL14: result = GetCollisionRatio(b, 1.f, 15.f, 14.f); break;
+	case SURFACE_METAL15: result = GetCollisionRatio(b, 8.f, 50.f, 42.f); break;
+	case SURFACE_METAL_FENCE: result = GetCollisionRatio(b, 0.1f, 10.f, 9.9f); break;
+	case SURFACE_FLESH: result = GetCollisionRatio(b, 0.f, 20.f, 20.f); break;
+	case SURFACE_SAND: result = GetCollisionRatio(b, 0.f, 10.f, 10.f); break;
+	case SURFACE_PUDDLE: result = GetCollisionRatio(b, 0.f, 10.f, 10.f); break;
+	case SURFACE_WOOD: result = GetCollisionRatio(b, 1.f, 4.f, 3.f); break;
+	case SURFACE_WOOD_BOX: result = GetCollisionRatio(b, 0.1f, 5.f, 4.9f); break;
+	case SURFACE_WOOD_PLANK: result = GetCollisionRatio(b, 0.1f, 40.f, 39.9f); break;
+	case SURFACE_TIRE:
+	case SURFACE_RUBBER29: result = GetCollisionRatio(b, 0.f, 10.f, 10.f); break;
+	case SURFACE_HARD24: result = GetCollisionRatio(b, 0.1f, 4.f, 3.9f); break;
+	case SURFACE_HEDGE: result = GetCollisionRatio(b, 0.f, 0.5f, 0.5f); break;
+	case SURFACE_METAL27: result = GetCollisionRatio(b, 4.f, 40.f, 36.f); break;
+	case SURFACE_METAL28: result = GetCollisionRatio(b, 0.f, 5.f, 5.f); break;
+	default: result = 0.f; break;
 	}
+
 	return result;
 }
 
@@ -2926,6 +3051,60 @@ cAudioManager::GetPhrase(uint32 *phrase, uint32 *prevPhrase, uint32 sample, uint
 	*prevPhrase = *phrase;
 }
 
+float
+cAudioManager::GetVehicleDriveWheelSkidValue(uint8 wheel, CAutomobile *automobile,
+                                             cTransmission *transmission, float velocityChange)
+{
+	int wheelState;
+	float relativeVelChange;
+	float gasPedalAudio = automobile->m_fGasPedalAudio;
+	float modificator;
+	float velChange;
+	float relativeVel;
+
+	wheelState = automobile->m_aWheelState[wheel];
+	if(wheelState == 1 && gasPedalAudio > 0.4f) {
+		relativeVelChange = (gasPedalAudio + -0.4f) * 1.25f;
+
+	} else if(wheelState == 2) {
+		relativeVelChange = min(1.0f, Abs(velocityChange) / transmission->fMaxVelocity);
+	} else if(wheelState == 3) {
+		modificator = 0.4f;
+		relativeVelChange = gasPedalAudio;
+		if(relativeVelChange > 0.4f) {
+			relativeVelChange = relativeVelChange - 0.4f;
+			modificator = 1.6667f;
+		}
+		velChange = Abs(velocityChange);
+		if(relativeVelChange > 0.4f) relativeVelChange = relativeVelChange * modificator;
+		if(velChange > 0.04f) {
+			relativeVel = min(1.0f, velChange / transmission->fMaxVelocity);
+		} else {
+			relativeVel = 0.0f;
+		}
+		if(relativeVel >= relativeVelChange) relativeVelChange = relativeVel;
+	} else {
+		relativeVelChange = 0.0f;
+	}
+
+	return max(relativeVelChange, min(1.0f, Abs(automobile->m_vecTurnSpeed.z) * 20.0f));
+}
+
+float
+cAudioManager::GetVehicleNonDriveWheelSkidValue(uint8 wheel, CAutomobile *automobile,
+                                                cTransmission *transmission, float velocityChange)
+{
+	float relativeVelChange;
+
+	if(automobile->m_aWheelState[wheel] == 2) {
+		relativeVelChange = min(1.0f, Abs(velocityChange) / transmission->fMaxVelocity);
+	} else {
+		relativeVelChange = 0.0;
+	}
+
+	return max(relativeVelChange, min(1.0f, Abs(automobile->m_vecTurnSpeed.z) * 20.0f));
+}
+
 bool
 cAudioManager::HasAirBrakes(int32 model) const
 {
@@ -2954,11 +3133,17 @@ cAudioManager::Initialise()
 	}
 }
 
-WRAPPER
 void
 cAudioManager::InitialisePoliceRadio()
 {
-	EAXJMP(0x57EEC0);
+	unk2 = 0;
+	unk3 = 0;
+	unk4 = 0;
+	for(int32 i = 0; i < 10; i++) { crimes[i].type = 0; }
+
+	SampleManager.SetChannelReverbFlag(28, 0);
+	gSpecialSuspectLastSeenReport = 0;
+	for(int32 i = 0; i < 18; i++) { gMinTimeToNextReport[i] = m_nTimeOfRecentCrime; }
 }
 
 WRAPPER
@@ -3427,7 +3612,7 @@ cAudioManager::ProcessBoatMovingOverWater(cVehicleParams *params)
 	if(velocityChange <= 0.0005f && params->m_pVehicle->GetPosition().y) return 1;
 
 	velocityChange = min(0.75f, velocityChange);
-	multiplier = (velocityChange - 0.0005f) * 1.3342f;
+	multiplier = (velocityChange - 0.0005f) * 4 / 3;
 	CalculateDistance((bool *)params, params->m_fDistance);
 	vol = (30.f * multiplier);
 	m_sQueueSample.m_bVolume = ComputeVolume(vol, 50.f, m_sQueueSample.m_fDistance);
@@ -3671,7 +3856,7 @@ cAudioManager::ProcessCinemaScriptObject(uint8 sound)
 				m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(
 				    m_sQueueSample.m_nSampleIndex);
 				m_sQueueSample.m_nFrequency +=
-				    RandomDisplacement(m_sQueueSample.m_nFrequency >> 2);
+				    RandomDisplacement(m_sQueueSample.m_nFrequency / 4);
 				m_sQueueSample.m_counter = counter++;
 				m_sQueueSample.m_bIsDistant = 0;
 				m_sQueueSample.m_nLoopCount = 1;
@@ -4266,7 +4451,7 @@ cAudioManager::ProcessHomeScriptObject(uint8 sound)
 				m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(
 				    m_sQueueSample.m_nSampleIndex);
 				m_sQueueSample.m_nFrequency +=
-				    RandomDisplacement(m_sQueueSample.m_nFrequency >> 4);
+				    RandomDisplacement(m_sQueueSample.m_nFrequency / 16);
 				m_sQueueSample.m_counter = counter++;
 				m_sQueueSample.m_bIsDistant = 0;
 				m_sQueueSample.m_nLoopCount = 1;
@@ -4371,7 +4556,7 @@ cAudioManager::ProcessJumboFlying()
 void
 cAudioManager::ProcessJumboLanding(CPlane *plane)
 {
-	float modificator = (LandingPoint - PlanePathPosition[plane->m_nPlaneId]) * 0.0028571f;
+	float modificator = (LandingPoint - PlanePathPosition[plane->m_nPlaneId]) / 350.f;
 	if(SetupJumboFlySound(107.f * modificator + 20)) {
 		if(SetupJumboTaxiSound(75.f * (1.f - modificator))) {
 			SetupJumboEngineSound(maxVolume, 22050);
@@ -4384,7 +4569,7 @@ cAudioManager::ProcessJumboLanding(CPlane *plane)
 void
 cAudioManager::ProcessJumboTakeOff(CPlane *plane)
 {
-	float modificator = (PlanePathPosition[plane->m_nPlaneId] - TakeOffPoint) * 0.0033333f;
+	float modificator = (PlanePathPosition[plane->m_nPlaneId] - TakeOffPoint) / 300.f;
 
 	if(SetupJumboFlySound((107.f * modificator) + 20) &&
 	   SetupJumboRumbleSound(maxVolume * (1.f - modificator))) {
@@ -6671,15 +6856,6 @@ struct tVehicleSampleData {
 int32 *CSWTCH_554 = (int32 *)0x606A50;
 tVehicleSampleData *vehicleSampleData = (tVehicleSampleData *)0x606204;
 
-#if 0
-WRAPPER
-void
-cAudioManager::ProcessPlayersVehicleEngine(cVehicleParams *params, CAutomobile *automobile)
-{
-	EAXJMP(0x56B0D0);
-}
-#else
-
 void
 cAudioManager::ProcessPlayersVehicleEngine(cVehicleParams *params, CAutomobile *automobile)
 {
@@ -6963,13 +7139,70 @@ cAudioManager::ProcessPlayersVehicleEngine(cVehicleParams *params, CAutomobile *
 	bHandbrakeOnLastFrame = automobile->bIsHandbrakeOn;
 	bLostTractionLastFrame = lostTraction;
 }
-#endif
 
-WRAPPER
 void
 cAudioManager::ProcessPoliceCellBeatingScriptObject(uint8 sound)
 {
-	EAXJMP(0x578190);
+	uint32 time = CTimer::GetTimeInMilliseconds();
+	int32 sampleIndex;
+	uint8 emittingVol;
+	float distSquared;
+	float maxDist;
+	cPedParams params;
+
+	static uint8 counter = 0;
+
+	if(time > audioLogicTimers[7]) {
+		switch(sound) {
+		case SCRIPT_SOUND_POLICE_CELL_BEATING_LOOP_S:
+			maxDist = 900.f;
+			m_sQueueSample.m_fSoundIntensity = 30.0f;
+			break;
+		case SCRIPT_SOUND_POLICE_CELL_BEATING_LOOP_L:
+			maxDist = 6400.f;
+			m_sQueueSample.m_fSoundIntensity = 80.0f;
+			break;
+		default: break;
+		}
+		distSquared = GetDistanceSquared(&m_sQueueSample.m_vecPos);
+		if(distSquared < maxDist) {
+			m_sQueueSample.m_fDistance = sqrt(distSquared);
+			if(m_nTimeOfRecentCrime & 1)
+				sampleIndex = (m_anRandomTable[1] & 3) + AUDIO_SAMPLE_PED_HIT_1;
+			else
+				sampleIndex =
+				    (m_anRandomTable[3] & 1) + AUDIO_SAMPLE_PED_HIT_BY_BAT;
+			m_sQueueSample.m_nSampleIndex = sampleIndex;
+			emittingVol = m_anRandomTable[0] % 50u + 55;
+			m_sQueueSample.m_bVolume =
+			    ComputeVolume(emittingVol, m_sQueueSample.m_fSoundIntensity,
+			                  m_sQueueSample.m_fDistance);
+			if(m_sQueueSample.m_bVolume) {
+				m_sQueueSample.m_bBankIndex = 0;
+				m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(
+				    m_sQueueSample.m_nSampleIndex);
+				m_sQueueSample.m_nFrequency +=
+				    RandomDisplacement(m_sQueueSample.m_nFrequency / 16);
+				m_sQueueSample.m_counter = counter++;
+				m_sQueueSample.m_bIsDistant = 0;
+				m_sQueueSample.m_nLoopCount = 1;
+				m_sQueueSample.field_56 = 1;
+				m_sQueueSample.field_16 = 3;
+				m_sQueueSample.field_48 = 0.0f;
+				m_sQueueSample.m_bEmittingVolume = emittingVol;
+				m_sQueueSample.m_nLoopStart = 0;
+				m_sQueueSample.m_nLoopEnd = -1;
+				m_sQueueSample.m_bReverbFlag = 1;
+				m_sQueueSample.m_bRequireReflection = 0;
+				AddSampleToRequestedQueue();
+				params.m_bDistanceCalculated = 1;
+				params.m_fDistance = distSquared;
+				params.m_pPed = 0;
+				SetupPedComments(&params, SOUND_8A);
+			}
+			audioLogicTimers[7] = time + 500 + m_anRandomTable[3] % 1500u;
+		}
+	}
 }
 
 void
@@ -7611,6 +7844,107 @@ cAudioManager::ProcessVehicleRoadNoise(cVehicleParams *params)
 	return 1;
 }
 
+void
+cAudioManager::ProcessVehicleSkidding(cVehicleParams *params)
+{
+
+	CAutomobile *automobile;
+	cTransmission *transmission;
+	signed int emittingVol;
+	float newSkidVal = 0.f;
+	float skidVal = 0.f;
+
+	if(params->m_fDistance >= 1600.f) return;
+	automobile = (CAutomobile *)params->m_pVehicle;
+	if(!automobile->m_nWheelsOnGround) return;
+	CalculateDistance((bool *)params, params->m_fDistance);
+	for(int32 i = 0; i < 4; i++) {
+		if(!automobile->m_aWheelState[i] || automobile->Damage.GetWheelStatus(i) == 2)
+			continue;
+		transmission = params->m_pTransmission;
+		if(transmission->nDriveType == '4') {
+			newSkidVal = GetVehicleDriveWheelSkidValue(i, automobile, transmission,
+			                                           params->m_fVelocityChange);
+			if(newSkidVal > skidVal) skidVal = newSkidVal;
+			continue;
+		}
+		if(transmission->nDriveType != 'F') {
+			if(transmission->nDriveType != 'R') {
+				if(newSkidVal > skidVal) skidVal = newSkidVal;
+				continue;
+			}
+			if(i != 1 && i != 3) {
+				newSkidVal = GetVehicleNonDriveWheelSkidValue(
+				    i, automobile, transmission, params->m_fVelocityChange);
+				if(newSkidVal > skidVal) skidVal = newSkidVal;
+				continue;
+			}
+			newSkidVal = GetVehicleDriveWheelSkidValue(i, automobile, transmission,
+			                                           params->m_fVelocityChange);
+			if(newSkidVal > skidVal) skidVal = newSkidVal;
+			continue;
+		}
+		if(!i || i == 2) {
+			newSkidVal = GetVehicleDriveWheelSkidValue(i, automobile, transmission,
+			                                           params->m_fVelocityChange);
+			if(newSkidVal > skidVal) skidVal = newSkidVal;
+			continue;
+		}
+		newSkidVal = GetVehicleNonDriveWheelSkidValue(i, automobile, transmission,
+		                                              params->m_fVelocityChange);
+		if(newSkidVal > skidVal) skidVal = newSkidVal;
+	}
+
+	if(skidVal > 0.0f) {
+		emittingVol = 50.f * skidVal;
+		m_sQueueSample.m_bVolume =
+		    ComputeVolume(emittingVol, 40.f, m_sQueueSample.m_fDistance);
+		if(m_sQueueSample.m_bVolume) {
+			m_sQueueSample.m_counter = 3;
+			switch(params->m_pVehicle->m_nSurfaceTouched) {
+			case SURFACE_GRASS:
+			case SURFACE_HEDGE:
+				m_sQueueSample.m_nSampleIndex =
+				    AUDIO_SAMPLE_COLLISION_LOOPING_GRASS;
+				emittingVol /= 4;
+				m_sQueueSample.m_nFrequency =
+				    (signed __int64)(13000.f * skidVal + 35000.f);
+				m_sQueueSample.m_bVolume /= 4;
+				break;
+			case SURFACE_DIRT:
+			case SURFACE_DIRTTRACK:
+			case SURFACE_SAND:
+			case SURFACE_PUDDLE:
+				m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_COLLISION_LOOPING_SOFT;
+				m_sQueueSample.m_nFrequency = 6000.f * skidVal + 10000.f;
+				break;
+
+			default:
+				m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_VEHICLE_SKIDDING;
+				m_sQueueSample.m_nFrequency = 5000.f * skidVal + 11000.f;
+				break;
+			}
+
+			m_sQueueSample.m_bBankIndex = 0;
+			m_sQueueSample.m_bIsDistant = 0;
+			m_sQueueSample.field_16 = 8;
+			m_sQueueSample.m_nLoopCount = 0;
+			m_sQueueSample.m_bEmittingVolume = emittingVol;
+			m_sQueueSample.m_nLoopStart =
+			    SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
+			m_sQueueSample.m_nLoopEnd =
+			    SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
+			m_sQueueSample.field_48 = 3.0;
+			m_sQueueSample.m_fSoundIntensity = 40.0;
+			m_sQueueSample.field_56 = 0;
+			m_sQueueSample.field_76 = 3;
+			m_sQueueSample.m_bReverbFlag = 1;
+			m_sQueueSample.m_bRequireReflection = 0;
+			AddSampleToRequestedQueue();
+		}
+	}
+}
+
 WRAPPER
 void cAudioManager::ProcessWaterCannon(int32) { EAXJMP(0x575F30); }
 
@@ -7647,7 +7981,7 @@ cAudioManager::ProcessWeather(int32 id)
 		m_sQueueSample.m_nLoopEnd = -1;
 		m_sQueueSample.m_bReverbFlag = 0;
 		m_sQueueSample.m_bRequireReflection = 0;
-		cAudioManager::AddSampleToRequestedQueue();
+		AddSampleToRequestedQueue();
 	}
 	if(CWeather::Rain > 0.0f && (!CCullZones::CamNoRain() || !CCullZones::PlayerNoRain())) {
 		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_COLLISION_LOOPING_GRASS;
@@ -7669,7 +8003,7 @@ cAudioManager::ProcessWeather(int32 id)
 		m_sQueueSample.m_nLoopEnd =
 		    SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
 		m_sQueueSample.m_bRequireReflection = 0;
-		cAudioManager::AddSampleToRequestedQueue();
+		AddSampleToRequestedQueue();
 	}
 }
 
@@ -7799,18 +8133,68 @@ cAudioManager::ReleaseDigitalHandle() const
 	if(m_bIsInitialised) { SampleManager.ReleaseDigitalHandle(); }
 }
 
-WRAPPER
-int32
-cAudioManager::ReportCollision(CEntity *a2, CEntity *a3, uint8 a4, uint8 a5, float a6, float a7)
+void
+cAudioManager::ReportCollision(CEntity *entity1, CEntity *entity2, uint8 surface1, uint8 surface2,
+                               float collisionPower, float velocity)
 {
-	EAXJMP(0x568410);
+	float dist;
+	CVector v1;
+	CVector v2;
+
+	if(m_bIsInitialised && m_nCollisionEntity >= 0 && !m_bUserPause &&
+	   (velocity >= 0.0016f || collisionPower >= 0.01f)) {
+		if((entity1->m_status & 7) == ENTITY_TYPE_BUILDING) {
+			v1 = v2 = entity2->GetPosition();
+		} else if((entity2->m_status & 7) == ENTITY_TYPE_BUILDING) {
+			v1 = v2 = entity1->GetPosition();
+		} else {
+			v1 = entity1->GetPosition();
+			v2 = entity2->GetPosition();
+		}
+		CVector pos = (v1 + v2) * 0.5f;
+		dist = GetDistanceSquared(&pos);
+		if(dist < 3600.f) {
+			m_sCollisionManager.m_sQueue.m_pEntity1 = entity1;
+			m_sCollisionManager.m_sQueue.m_pEntity2 = entity2;
+			m_sCollisionManager.m_sQueue.m_bSurface1 = surface1;
+			m_sCollisionManager.m_sQueue.m_bSurface2 = surface2;
+			m_sCollisionManager.m_sQueue.m_fIntensity1 = collisionPower;
+			m_sCollisionManager.m_sQueue.m_fIntensity2 = velocity;
+			m_sCollisionManager.m_sQueue.m_vecPosition = pos;
+			m_sCollisionManager.m_sQueue.m_fDistance = dist;
+			m_sCollisionManager.AddCollisionToRequestedQueue();
+		}
+	}
 }
 
-WRAPPER
-int32
-cAudioManager::ReportCrime(eCrimeType crime, const CVector *pos)
+void
+cAudioManager::ReportCrime(int32 type, const CVector *pos)
 {
-	EAXJMP(0x5803D0);
+	int32 lastCrime;
+
+	lastCrime = 10;
+	if(m_bIsInitialised && MusicManager.m_nMusicMode != 2 &&
+	   FindPlayerPed()->m_pWanted->m_nWantedLevel > 0 && (type > 0 || type < 17) &&
+	   m_nTimeOfRecentCrime >= gMinTimeToNextReport[type]) {
+		for(int32 i = 0; i < 10; i++) {
+			if(crimes[i].type) {
+				if(crimes[i].type == type) {
+					crimes[i].position = *pos;
+					crimes[i].timer = 0;
+					return;
+				}
+			} else {
+				lastCrime = i;
+			}
+		}
+
+		if(lastCrime < 10) {
+			crimes[lastCrime].type = type;
+			crimes[lastCrime].position = *pos;
+			crimes[lastCrime].timer = 0;
+			gMinTimeToNextReport[type] = m_nTimeOfRecentCrime + 500;
+		}
+	}
 }
 
 void
@@ -7835,23 +8219,42 @@ cAudioManager::ResetAudioLogicTimers(int32 timer)
 		}
 	}
 	ClearMissionAudio();
-	SampleManager.StopChannel(28);
+	SampleManager.StopChannel(policeChannel);
 }
 
 void
 cAudioManager::ResetPoliceRadio()
 {
 	if(m_bIsInitialised) {
-		if(SampleManager.GetChannelUsedFlag(28)) SampleManager.StopChannel(28);
+		if(SampleManager.GetChannelUsedFlag(policeChannel))
+			SampleManager.StopChannel(policeChannel);
 		InitialisePoliceRadio();
 	}
 }
 
-WRAPPER
 void
-cAudioManager::ResetTimers(uint32 a2)
+cAudioManager::ResetTimers(uint32 time)
 {
-	EAXJMP(0x57A7B0);
+	if(m_bIsInitialised) {
+		m_bTimerJustReset = 1;
+		m_nTimer = time;
+		ClearRequestedQueue();
+		if(m_bActiveSampleQueue) {
+			m_bActiveSampleQueue = 0;
+			ClearRequestedQueue();
+			m_bActiveSampleQueue = 1;
+		} else {
+			m_bActiveSampleQueue = 1;
+			ClearRequestedQueue();
+			m_bActiveSampleQueue = 0;
+		}
+		ClearActiveSamples();
+		ClearMissionAudio();
+		SampleManager.StopChannel(policeChannel);
+		SampleManager.SetEffectsFadeVolume(0);
+		SampleManager.SetMusicFadeVolume(0);
+		MusicManager.ResetMusicAfterReload();
+	}
 }
 
 WRAPPER void
@@ -7861,7 +8264,222 @@ cAudioManager::Service()
 }
 
 WRAPPER
-int8 cAudioManager::SetCurrent3DProvider(uint8) { EAXJMP(0x57A910); }
+void
+cAudioManager::ServiceCollisions()
+{
+	EAXJMP(0x5686D0);
+}
+
+void
+cAudioManager::ServicePoliceRadio()
+{
+	int wantedLevel = 0; // bug?;
+	static uint32 nLastSeen = 300;
+
+	if(m_bIsInitialised) {
+		if(!m_bUserPause) {
+			bool crimeReport = SetupCrimeReport();
+			wantedLevel = FindPlayerPed()->m_pWanted->m_nWantedLevel;
+			if(!crimeReport) {
+				if(wantedLevel) {
+					if(nLastSeen) {
+						--nLastSeen;
+					} else {
+						nLastSeen = m_anRandomTable[1] % 1000u + 2000;
+						SetupSuspectLastSeenReport();
+					}
+				}
+			}
+		}
+		ServicePoliceRadioChannel(wantedLevel);
+	}
+}
+
+void
+cAudioManager::ServicePoliceRadioChannel(int32 wantedLevel)
+{
+
+	bool processed = false;
+	uint32 sample;
+	int32 freq;
+
+	static int cWait = 0;
+	static bool bChannelOpen = 0;
+	static uint8 bMissionAudioPhysicalPlayingStatus = 0;
+	static int32 PoliceChannelFreq = 5500;
+
+	if(m_bIsInitialised) {
+		if(m_bUserPause) {
+			if(SampleManager.GetChannelUsedFlag(policeChannel))
+				SampleManager.StopChannel(policeChannel);
+			if(g_nMissionAudioSfx != TOTAL_AUDIO_SAMPLES &&
+			   bMissionAudioPhysicalPlayingStatus == 1 &&
+			   SampleManager.IsStreamPlaying(1u)) {
+				SampleManager.PauseStream(1, 1u);
+			}
+		} else {
+			if(m_bPreviousUserPause && g_nMissionAudioSfx != TOTAL_AUDIO_SAMPLES &&
+			   bMissionAudioPhysicalPlayingStatus == 1) {
+				SampleManager.PauseStream(0, 1u);
+			}
+			if(!unk2) bChannelOpen = 0;
+			if(cWait) {
+				--cWait;
+				return;
+			}
+			if(g_nMissionAudioSfx != 3032 && !bChannelOpen) {
+				if(g_nMissionAudioPlayingStatus) {
+					if(g_nMissionAudioPlayingStatus == 1 &&
+					   !bMissionAudioPhysicalPlayingStatus &&
+					   SampleManager.IsStreamPlaying(1u)) {
+						bMissionAudioPhysicalPlayingStatus = 1;
+					}
+					if(bMissionAudioPhysicalPlayingStatus == 1) {
+						if(SampleManager.IsStreamPlaying(1u)) {
+							DoPoliceRadioCrackle();
+						} else {
+							bMissionAudioPhysicalPlayingStatus = 2;
+							g_nMissionAudioPlayingStatus = 2;
+							g_nMissionAudioSfx = TOTAL_AUDIO_SAMPLES;
+							cWait = 30;
+						}
+						return;
+					}
+				} else if(!SampleManager.GetChannelUsedFlag(policeChannel)) {
+					SampleManager.PreloadStreamedFile(g_nMissionAudioSfx, 1u);
+					SampleManager.SetStreamedVolumeAndPan(maxVolume, 63u, 1,
+					                                      1u);
+					SampleManager.StartPreloadedStreamedFile(1u);
+					g_nMissionAudioPlayingStatus = 1;
+					bMissionAudioPhysicalPlayingStatus = 0;
+					return;
+				}
+			}
+			if(bChannelOpen) DoPoliceRadioCrackle();
+			if((g_nMissionAudioSfx == TOTAL_AUDIO_SAMPLES ||
+			    g_nMissionAudioPlayingStatus != 1) &&
+			   !SampleManager.GetChannelUsedFlag(policeChannel) && unk2) {
+				if(unk2) {
+					sample = *(uint32 *)&stuff[4 * unk4];
+					--unk2;
+					unk4 = (unk4 + 1) % 60;
+				} else {
+					sample = TOTAL_AUDIO_SAMPLES;
+				}
+				if(!wantedLevel) {
+					if(gSpecialSuspectLastSeenReport) {
+						gSpecialSuspectLastSeenReport = 0;
+					} else if((unsigned int)(sample - 212) <= 2 ||
+					          sample == TOTAL_AUDIO_SAMPLES) {
+						bChannelOpen = 0;
+						processed = 1;
+					}
+				}
+				if(sample == TOTAL_AUDIO_SAMPLES) {
+					if(!processed) cWait = 30;
+				} else {
+					SampleManager.InitialiseChannel(policeChannel, sample, 0);
+					switch(sample) {
+					case AUDIO_SAMPLE_POLICE_SCANNER_SMALL_CRACKLE_1:
+					case AUDIO_SAMPLE_POLICE_SCANNER_SMALL_CRACKLE_2:
+					case AUDIO_SAMPLE_POLICE_SCANNER_SMALL_CRACKLE_3:
+						freq = m_anRandomTable[4] % 2000u + 10025;
+						bChannelOpen = bChannelOpen == 0;
+						break;
+					default:
+						freq = SampleManager.GetSampleBaseFrequency(sample);
+						break;
+					}
+					PoliceChannelFreq = freq;
+					SampleManager.SetChannelFrequency(policeChannel, freq);
+					SampleManager.SetChannelVolume(policeChannel, 100u);
+					SampleManager.SetChannelPan(policeChannel, 63);
+					SampleManager.SetChannelLoopCount(policeChannel, 1);
+					SampleManager.SetChannelLoopPoints(policeChannel, 0, -1);
+					SampleManager.StartChannel(policeChannel);
+				}
+				if(processed) ResetPoliceRadio();
+			}
+		}
+	}
+}
+#if 1
+WRAPPER
+void
+cAudioManager::ServiceSoundEffects()
+{
+
+}
+
+#else
+
+void
+cAudioManager::ServiceSoundEffects()
+{
+	uint32 timeOfRecentCrime;
+	cAudioScriptObject *object;
+
+	timeOfRecentCrime = m_nTimeOfRecentCrime;
+	++m_nTimeOfRecentCrime;
+	if(timeOfRecentCrime % 5)
+		field_2 = 0;
+	else
+		field_2 = 1;
+	if(m_bUserPause && !m_bPreviousUserPause) {
+		for(int32 i = 0; i < 29; i++) SampleManager.StopChannel(i);
+
+		ClearRequestedQueue();
+		if(m_bActiveSampleQueue) {
+			m_bActiveSampleQueue = 0;
+			ClearRequestedQueue();
+			m_bActiveSampleQueue = 1;
+		} else {
+			m_bActiveSampleQueue = 1;
+			ClearRequestedQueue();
+			m_bActiveSampleQueue = 0;
+		}
+		ClearActiveSamples();
+	}
+	m_bActiveSampleQueue = m_bActiveSampleQueue != 1;
+	ProcessReverb();
+	ProcessSpecial();
+	ClearRequestedQueue();
+	InterrogateAudioEntities();
+	m_sPedComments.Process();
+	ServicePoliceRadio();
+	ServiceCollisions();
+	AddReleasingSounds();
+	ProcessMissionAudio();
+	sub_57C2B0();
+	ProcessActiveQueues();
+	for(int32 i = 0; i < m_nScriptObjectEntityTotal; ++i) {
+		object = (cAudioScriptObject *)m_asAudioEntities[m_anScriptObjectEntityIndices[i]]
+		             .m_pEntity;
+		if(object) { delete object; }
+		DestroyEntity(m_anScriptObjectEntityIndices[i]);
+	}
+	m_nScriptObjectEntityTotal = 0;
+}
+#endif
+int8
+cAudioManager::SetCurrent3DProvider(uint8 which)
+{
+	if(!m_bIsInitialised) return -1;
+	for(uint8 i = 0; i < m_bActiveSamples + 1; ++i) SampleManager.StopChannel(i);
+	ClearRequestedQueue();
+	if(m_bActiveSampleQueue)
+		m_bActiveSampleQueue = 0;
+	else
+		m_bActiveSampleQueue = 1;
+	ClearRequestedQueue();
+	ClearActiveSamples();
+	int8 current = SampleManager.SetCurrent3DProvider(which);
+	if(current > 0) {
+		m_bActiveSamples = SampleManager.GetMaximumSupportedChannels();
+		if(m_bActiveSamples > 1u) --m_bActiveSamples;
+	}
+	return current;
+}
 
 void
 cAudioManager::SetDynamicAcousticModelingStatus(bool status)
@@ -7886,7 +8504,54 @@ cAudioManager::SetEntityStatus(int32 id, bool status)
 {
 	if(m_bIsInitialised && id >= 0 && id < totalAudioEntitiesSlots) {
 		if(m_asAudioEntities[id].m_bIsUsed) { m_asAudioEntities[id].m_bStatus = status; }
+    }
+}
+
+uint32
+cAudioManager::SetLoopingCollisionRequestedSfxFreqAndGetVol(cAudioCollision *audioCollision)
+{
+	uint8 surface1 = audioCollision->m_bSurface1;
+	uint8 surface2 = audioCollision->m_bSurface2;
+	int32 vol;
+	float ratio;
+
+	if(surface1 != SURFACE_GRASS && surface2 != SURFACE_GRASS && surface1 != SURFACE_HEDGE &&
+	   surface2 != SURFACE_HEDGE) {
+		if(surface1 != SURFACE_PUDDLE && surface2 != SURFACE_PUDDLE) {
+			if(surface1 != SURFACE_DIRT && surface2 != SURFACE_DIRT &&
+			   surface1 != SURFACE_DIRTTRACK && surface2 != SURFACE_DIRTTRACK &&
+			   surface1 != SURFACE_SAND && surface2 != SURFACE_SAND) {
+				if(surface1 == SURFACE_FLESH || surface2 == SURFACE_FLESH) {
+					return 0;
+				}
+				ratio = GetCollisionRatio(audioCollision->m_fIntensity2, 0.0001f,
+				                          0.09f, 0.0899f);
+				m_sQueueSample.m_nSampleIndex =
+				    AUDIO_SAMPLE_COLLISION_LOOPING_GENERIC;
+				m_sQueueSample.m_nFrequency = 10000.f * ratio + 10000;
+				vol = 40.f * ratio;
+			} else {
+				ratio = GetCollisionRatio(audioCollision->m_fIntensity2, 0.0001f,
+				                          0.09f, 0.0899f);
+				m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_COLLISION_LOOPING_SOFT;
+				m_sQueueSample.m_nFrequency = 6000.f * ratio + 10000;
+				vol = 50.f * ratio;
+			}
+		} else {
+			ratio = GetCollisionRatio(audioCollision->m_fIntensity2, 0.0001f, 0.09f,
+			                          0.0899f);
+			m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_LOOPING_WATER;
+			m_sQueueSample.m_nFrequency = 6050.f * ratio + 16000;
+			vol = 30.f * ratio;
+		}
+	} else {
+		ratio = GetCollisionRatio(audioCollision->m_fIntensity2, 0.0001f, 0.09f, 0.0899f);
+		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_COLLISION_LOOPING_GRASS;
+		m_sQueueSample.m_nFrequency = 13000.f * ratio + 35000;
+		vol = 50.f * ratio;
 	}
+	if(audioCollision->m_nBaseVolume < 2) vol = audioCollision->m_nBaseVolume * vol / 2;
+	return vol;
 }
 
 void
@@ -7926,7 +8591,48 @@ cAudioManager::SetMusicMasterVolume(uint8 volume) const
 void
 cAudioManager::SetSpeakerConfig(int32 conf) const
 {
-	SampleManager.SetSpeakerConfig(conf);
+    SampleManager.SetSpeakerConfig(conf);
+}
+
+void
+cAudioManager::SetUpLoopingCollisionSound(cAudioCollision *col, uint8 counter)
+{
+	if(col->m_fIntensity2 > 0.0016f) {
+		uint8 emittingVol = SetLoopingCollisionRequestedSfxFreqAndGetVol(col);
+		if(emittingVol) {
+			m_sQueueSample.m_fDistance = Sqrt(col->m_fDistance);
+			m_sQueueSample.m_bVolume =
+			    ComputeVolume(emittingVol, 60.f, m_sQueueSample.m_fDistance);
+			if(m_sQueueSample.m_bVolume) {
+				m_sQueueSample.m_counter = counter;
+				m_sQueueSample.m_vecPos = col->m_vecPosition;
+				m_sQueueSample.m_bBankIndex = 0;
+				m_sQueueSample.m_bIsDistant = 0;
+				m_sQueueSample.field_16 = 7;
+				m_sQueueSample.m_nLoopCount = 0;
+				m_sQueueSample.m_bEmittingVolume = emittingVol;
+				m_sQueueSample.m_nLoopStart =
+				    SampleManager.GetSampleLoopStartOffset(
+				        m_sQueueSample.m_nSampleIndex);
+				m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(
+				    m_sQueueSample.m_nSampleIndex);
+				m_sQueueSample.field_48 = 4.0f;
+				m_sQueueSample.m_fSoundIntensity = 60.0f;
+				m_sQueueSample.field_56 = 0;
+				m_sQueueSample.field_76 = 5;
+				m_sQueueSample.m_bReverbFlag = 1;
+				m_sQueueSample.m_bRequireReflection = 0;
+				AddSampleToRequestedQueue();
+			}
+		}
+	}
+}
+
+WRAPPER
+bool
+cAudioManager::SetupCrimeReport()
+{
+	EAXJMP(0x57F5B0);
 }
 
 WRAPPER
@@ -8010,9 +8716,9 @@ cAudioManager::SetupJumboTaxiSound(uint8 vol)
 
 	if(m_sQueueSample.m_fDistance >= 180.f) return 0;
 
-	emittingVol = (vol >> 1) + ((vol >> 1) * m_sQueueSample.m_fDistance * 0.0055556f);
+	emittingVol = (vol + (vol * m_sQueueSample.m_fDistance / 180)) / 2;
 
-	if(m_sQueueSample.m_fDistance * 0.0055556f < 0.7f)
+	if(m_sQueueSample.m_fDistance / 180 < 0.7f)
 		emittingVol -= emittingVol * gJumboVolOffsetPercentage / 100;
 	m_sQueueSample.m_bVolume = ComputeVolume(emittingVol, 180.f, m_sQueueSample.m_fDistance);
 
@@ -8197,6 +8903,13 @@ cAudioManager::SetupPedComments(cPedParams *params, uint32 sound)
 	}
 }
 
+WRAPPER
+void
+cAudioManager::SetupSuspectLastSeenReport()
+{
+	EAXJMP(0x57FCC0);
+}
+
 void
 cAudioManager::Terminate()
 {
@@ -8289,15 +9002,39 @@ cAudioManager::UsesSirenSwitching(int32 model) const
 	}
 }
 
+WRAPPER
+void
+cAudioManager::sub_57C2B0()
+{
+	EAXJMP(0x57C2B0);
+}
+
+int32
+cAudioManager::sub_57C320(uint8 a1, float a2, float a3)
+{
+	float v4;
+	float v5;
+	int32 v6;
+
+	v4 = 0.25f * a2;
+	v5 = a2 - v4;
+	if(a3 <= v5)
+		v6 = a1;
+	else
+		v6 = ((v4 - (a3 - v5)) * (float)a1 / v4);
+	return v6;
+}
+
 STARTPATCHES
 InjectHook(0x57B210, &cAudioManager::AddDetailsToRequestedOrderList, PATCH_JUMP);
 InjectHook(0x56AD30, &cAudioManager::AddPlayerCarSample, PATCH_JUMP);
 InjectHook(0x57B300, &cAudioManager::AddReflectionsToRequestedQueue, PATCH_JUMP);
-// InjectHook(0x57B8D0, &cAudioManager::AddReleasingSounds, PATCH_JUMP);
+InjectHook(0x57B8D0, &cAudioManager::AddReleasingSounds, PATCH_JUMP);
 InjectHook(0x57B070, &cAudioManager::AddSampleToRequestedQueue, PATCH_JUMP);
-// InjectHook(0x580AF0, &cAudioManager::AgeCrimes, PATCH_JUMP);
+InjectHook(0x580AF0, &cAudioManager::AgeCrimes, PATCH_JUMP);
 InjectHook(0x5697A0, &cAudioManager::CalculateDistance, PATCH_JUMP);
 InjectHook(0x57AA10, &cAudioManager::CheckForAnAudioFileOnCD, PATCH_JUMP);
+InjectHook(0x57C160, &cAudioManager::ClearActiveSamples, PATCH_JUMP);
 InjectHook(0x5796A0, &cAudioManager::ClearMissionAudio, PATCH_JUMP);
 InjectHook(0x57C120, &cAudioManager::ClearRequestedQueue, PATCH_JUMP);
 InjectHook(0x57AE00, &cAudioManager::ComputeDopplerEffectedFrequency, PATCH_JUMP);
@@ -8366,6 +9103,8 @@ InjectHook(0x57A8A0, &cAudioManager::GetNum3DProvidersAvailable, PATCH_JUMP);
 InjectHook(0x574FD0, &cAudioManager::GetOJGTalkSfx, PATCH_JUMP);
 InjectHook(0x570960, &cAudioManager::GetPedCommentSfx, PATCH_JUMP);
 InjectHook(0x570DB0, &cAudioManager::GetPhrase, PATCH_JUMP);
+InjectHook(0x56BF80, &cAudioManager::GetVehicleDriveWheelSkidValue, PATCH_JUMP);
+InjectHook(0x56C120, &cAudioManager::GetVehicleNonDriveWheelSkidValue, PATCH_JUMP);
 InjectHook(0x575240, &cAudioManager::GetPimpTalkSfx, PATCH_JUMP);
 InjectHook(0x570E00, &cAudioManager::GetPlayerTalkSfx, PATCH_JUMP);
 InjectHook(0x5737E0, &cAudioManager::GetScumFemaleTalkSfx, PATCH_JUMP);
@@ -8395,6 +9134,7 @@ InjectHook(0x5718D0, &cAudioManager::GetYakuzaTalkSfx, PATCH_JUMP);
 InjectHook(0x5719E0, &cAudioManager::GetYardieTalkSfx, PATCH_JUMP);
 InjectHook(0x56CAB0, &cAudioManager::HasAirBrakes, PATCH_JUMP);
 InjectHook(0x57A0E0, &cAudioManager::Initialise, PATCH_JUMP);
+InjectHook(0x57EEC0, &cAudioManager::InitialisePoliceRadio, PATCH_JUMP);
 // InjectHook(0x57EAC0, &cAudioManager::InitialisePoliceRadioZones, PATCH_JUMP);
 InjectHook(0x57B030, &cAudioManager::InterrogateAudioEntities, PATCH_JUMP);
 InjectHook(0x57AA50, &cAudioManager::IsAudioInitialised, PATCH_JUMP);
@@ -8445,6 +9185,7 @@ InjectHook(0x56F4D0, &cAudioManager::ProcessPedHeadphones, PATCH_JUMP);
 InjectHook(0x5699C0, &cAudioManager::ProcessPhysical, PATCH_JUMP);
 InjectHook(0x56E860, &cAudioManager::ProcessPlane, PATCH_JUMP);
 InjectHook(0x56B0D0, &cAudioManager::ProcessPlayersVehicleEngine, PATCH_JUMP);
+InjectHook(0x578190, &cAudioManager::ProcessPoliceCellBeatingScriptObject, PATCH_JUMP);
 InjectHook(0x577280, &cAudioManager::ProcessPornCinema, PATCH_JUMP);
 InjectHook(0x569CC0, &cAudioManager::ProcessRainOnVehicle, PATCH_JUMP);
 InjectHook(0x569700, &cAudioManager::ProcessReverb, PATCH_JUMP);
@@ -8457,14 +9198,22 @@ InjectHook(0x56DBF0, &cAudioManager::ProcessTrainNoise, PATCH_JUMP);
 InjectHook(0x56C770, &cAudioManager::ProcessVehicleDoors, PATCH_JUMP);
 InjectHook(0x56C640, &cAudioManager::ProcessVehicleReverseWarning, PATCH_JUMP);
 InjectHook(0x56A230, &cAudioManager::ProcessVehicleRoadNoise, PATCH_JUMP);
+InjectHook(0x56BCB0, &cAudioManager::ProcessVehicleSkidding, PATCH_JUMP);
 InjectHook(0x578370, &cAudioManager::ProcessWeather, PATCH_JUMP);
 InjectHook(0x56A440, &cAudioManager::ProcessWetRoadNoise, PATCH_JUMP);
 InjectHook(0x577530, &cAudioManager::ProcessWorkShopScriptObject, PATCH_JUMP);
 InjectHook(0x57AF90, &cAudioManager::RandomDisplacement, PATCH_JUMP);
 InjectHook(0x57A9F0, &cAudioManager::ReacquireDigitalHandle, PATCH_JUMP);
 InjectHook(0x57A9E0, &cAudioManager::ReleaseDigitalHandle, PATCH_JUMP);
+InjectHook(0x568410, &cAudioManager::ReportCollision, PATCH_JUMP);
+InjectHook(0x5803D0, &cAudioManager::ReportCrime, PATCH_JUMP);
 InjectHook(0x569650, &cAudioManager::ResetAudioLogicTimers, PATCH_JUMP);
 InjectHook(0x57EFF0, &cAudioManager::ResetPoliceRadio, PATCH_JUMP);
+InjectHook(0x57A7B0, &cAudioManager::ResetTimers, PATCH_JUMP);
+InjectHook(0x57F110, &cAudioManager::ServicePoliceRadio, PATCH_JUMP);
+InjectHook(0x57F1B0, &cAudioManager::ServicePoliceRadioChannel, PATCH_JUMP);
+//InjectHook(0x57AA60, &cAudioManager::ServiceSoundEffects, PATCH_JUMP);
+InjectHook(0x57A910, &cAudioManager::SetCurrent3DProvider, PATCH_JUMP);
 InjectHook(0x57AA00, &cAudioManager::SetDynamicAcousticModelingStatus, PATCH_JUMP);
 InjectHook(0x57A770, &cAudioManager::SetEffectsFadeVolume, PATCH_JUMP);
 InjectHook(0x57A730, &cAudioManager::SetEffectsMasterVolume, PATCH_JUMP);
@@ -8485,6 +9234,8 @@ InjectHook(0x56AC80, &cAudioManager::UpdateGasPedalAudio, PATCH_JUMP);
 InjectHook(0x56C600, &cAudioManager::UsesReverseWarning, PATCH_JUMP);
 InjectHook(0x56C3C0, &cAudioManager::UsesSiren, PATCH_JUMP);
 InjectHook(0x56C3F0, &cAudioManager::UsesSirenSwitching, PATCH_JUMP);
+InjectHook(0x57C320, &cAudioManager::sub_57C320, PATCH_JUMP);
 InjectHook(0x5755C0, &cPedComments::Add, PATCH_JUMP);
 InjectHook(0x575730, &cPedComments::Process, PATCH_JUMP);
+InjectHook(0x5685E0, &cAudioCollisionManager::AddCollisionToRequestedQueue, PATCH_JUMP);
 ENDPATCHES
diff --git a/src/audio/AudioManager.h b/src/audio/AudioManager.h
index fb462e94..59a92a48 100644
--- a/src/audio/AudioManager.h
+++ b/src/audio/AudioManager.h
@@ -45,7 +45,7 @@ public:
 	uint8 field_82;
 	uint8 field_83;
 	int32 calculatedVolume;
-	uint8 field_88;
+	int8 field_88;
 	uint8 field_89;
 	uint8 field_90;
 	uint8 field_91;
@@ -158,7 +158,8 @@ public:
 	uint8 gap_811;
 	cAudioCollision m_sQueue;
 
-	void AddCollisionToRequestedQueue(); // todo
+	// reversed all methods
+	void AddCollisionToRequestedQueue(); /// ok
 };
 
 static_assert(sizeof(cAudioCollisionManager) == 852, "cAudioCollisionManager: error");
@@ -199,6 +200,8 @@ public:
 	CVector Posn;
 	int32 AudioEntity;
 
+	void Reset(); // todo hook
+
 	static void *operator new(size_t);
 	static void *operator new(size_t, int);
 	static void operator delete(void *, size_t);
@@ -232,6 +235,15 @@ enum AudioEntityHandle {
 	AEHANDLE_ERROR_BADAUDIOTYPE = -1,
 };
 
+struct Crime {
+	int32 type;
+	CVector position;
+	uint16 timer;
+	uint16 b;
+};
+
+static_assert(sizeof(Crime) == 20, "Crime: error ");
+
 class cAudioManager
 {
 public:
@@ -248,10 +260,13 @@ public:
 	uint8 field_13;
 	uint8 field_14;
 	uint8 field_15;
+	// 100
 	int32 m_nTimer;
 	tActiveSample m_sQueueSample;
-	uint8 m_bActiveSampleQueue;
+	// 224
+	bool m_bActiveSampleQueue;
 	uint8 gap_109[3];
+	// 264
 	tActiveSample m_asSamples[2][27];
 	uint8 m_abSampleQueueIndexTable[2][27];
 	uint8 m_bSampleRequestQueuesStatus[2];
@@ -267,7 +282,13 @@ public:
 	int32 m_nFireAudioEntity;
 	int32 m_nWaterCannonEntity;
 	int32 m_nPoliceChannelEntity;
-	uint8 gap45B8[444];
+	uint8 stuff[239];
+	uint8 unk1;
+	uint8 unk2;
+	uint8 unk3;
+	uint8 unk4;
+	uint8 unk5;
+	Crime crimes[10];
 	int32 m_nFrontEndEntity;
 	int32 m_nCollisionEntity;
 	cAudioCollisionManager m_sCollisionManager;
@@ -279,24 +300,25 @@ public:
 	uint8 m_bUserPause;
 	uint8 m_bPreviousUserPause;
 	uint8 field_19195; // time?
-	uint32 m_FrameCounter;
+	uint32 m_nTimeOfRecentCrime;
 
 	// getters
-	uint32 GetFrameCounter() const { return m_FrameCounter; }
+	uint32 GetFrameCounter() const { return m_nTimeOfRecentCrime; }
 	float GetReflectionsDistance(int32 idx) const { return m_afReflectionsDistances[idx]; }
 	int32 GetRandomNumber(int32 idx) const { return m_anRandomTable[idx]; }
 
 	// "Should" be in alphabetic order, except "getXTalkSfx"
-	void AddDetailsToRequestedOrderList(uint8 sample); /// ok
+	void AddDetailsToRequestedOrderList(uint8 sample); /// ok (check once more)
 	void AddPlayerCarSample(uint8 emittingVolume, int32 freq, uint32 sample, uint8 unk1,
 	                        uint8 counter, bool notLooping); /// ok
 	void AddReflectionsToRequestedQueue();                   /// ok (check value)
-	void AddReleasingSounds();                               // todo (difficult)
+	void AddReleasingSounds();                               /// ok (check)
 	void AddSampleToRequestedQueue();                        /// ok
-	void AgeCrimes();                                        // todo
+	void AgeCrimes();                                        /// ok
 
 	void CalculateDistance(bool *ptr, float dist); /// ok
 	bool CheckForAnAudioFileOnCD() const;          /// ok
+	void ClearActiveSamples();                     /// ok
 	void ClearMissionAudio();                      /// ok
 	void ClearRequestedQueue();                    /// ok
 	int32 ComputeDopplerEffectedFrequency(uint32 oldFreq, float position1, float position2,
@@ -395,7 +417,7 @@ public:
 	uint8 GetCDAudioDriveLetter() const;
 	int8 GetCurrent3DProviderIndex() const;                            /// ok
 	float GetCollisionLoopingRatio(uint32 a, uint32 b, float c) const; // not used
-	float GetCollisionOneShotRatio(uint32 a, float b) const;           /// ok
+	float GetCollisionOneShotRatio(int32 a, float b) const;           /// ok
 	float GetCollisionRatio(float a, float b, float c, float d) const; /// ok
 	float GetDistanceSquared(CVector *v) const;                        /// ok
 	int32 GetJumboTaxiFreq() const;                                    /// ok
@@ -404,14 +426,17 @@ public:
 	uint8 GetNum3DProvidersAvailable() const;
 	int32 GetPedCommentSfx(CPed *ped, int32 sound);
 	void GetPhrase(uint32 *phrase, uint32 *prevPhrase, uint32 sample, uint32 maxOffset) const;
-	float GetVehicleDriveWheelSkidValue(uint8 a1, CAutomobile *a2, cTransmission *a3,
-	                                    float a4);                                      // todo
-	int32 GetVehicleNonDriveWheelSkidValue(float a1, int a2, int a3, int a4, float a5); // todo
+	float GetVehicleDriveWheelSkidValue(uint8 wheel, CAutomobile *automobile,
+	                                    cTransmission *transmission,
+	                                    float velocityChange); /// ok
+	float GetVehicleNonDriveWheelSkidValue(uint8 wheel, CAutomobile *automobile,
+	                                       cTransmission *transmission,
+	                                       float velocityChange); /// ok
 
 	bool HasAirBrakes(int32 model) const; /// ok
 
 	void Initialise();                   /// ok
-	void InitialisePoliceRadio();        // todo
+	void InitialisePoliceRadio();        /// ok
 	void InitialisePoliceRadioZones();   // todo
 	void InterrogateAudioEntities();     /// ok
 	bool IsAudioInitialised() const;     /// ok
@@ -464,7 +489,7 @@ public:
 	void ProcessLaunderetteScriptObject(uint8 sound);        /// ok
 	void ProcessLoopingScriptObject(uint8 sound);            /// ok
 	void ProcessMissionAudio();                              /// ok
-	void ProcessModelCarEngine(cVehicleParams *params);      /// ok (check float comparisons)
+	void ProcessModelCarEngine(cVehicleParams *params);      /// ok
 	void ProcessOneShotScriptObject(uint8 sound);            /// ok
 	void ProcessPed(CPhysical *ped);                         /// ok
 	void ProcessPedHeadphones(cPedParams *params);           /// ok
@@ -473,7 +498,7 @@ public:
 	void ProcessPlane(cVehicleParams *params);               /// ok
 	void ProcessPlayersVehicleEngine(cVehicleParams *params,
 	                                 CAutomobile *automobile); /// ok (check float comparisons)
-	void ProcessPoliceCellBeatingScriptObject(uint8 sound);    // todo
+	void ProcessPoliceCellBeatingScriptObject(uint8 sound);    /// ok
 	void ProcessPornCinema(uint8 sound);                       /// ok
 	void ProcessProjectiles();                                 // todo requires CProjectileInfo
 	void ProcessRainOnVehicle(cVehicleParams *params);         /// ok
@@ -486,49 +511,49 @@ public:
 	bool ProcessTrainNoise(cVehicleParams *params);            /// ok
 	void ProcessVehicle(CVehicle *);                           // todo
 	bool ProcessVehicleDoors(cVehicleParams *params);          /// ok
-	//	bool ProcessVehicleEngine(void *);
-	// void ProcessVehicleHorn(cVehicleParams *params);
-	//	void ProcessVehicleOneShots(void *);
+	bool ProcessVehicleEngine(void *);                         // todo
+	void ProcessVehicleHorn(cVehicleParams *params);           // todo
+	void ProcessVehicleOneShots(void *);                       // todo
 	bool ProcessVehicleReverseWarning(cVehicleParams *params); /// ok
 	bool ProcessVehicleRoadNoise(cVehicleParams *params);      /// ok
-	//	void ProcessVehicleSirenOrAlarm(void *);
-	//	void ProcessVehicleSkidding(void *);
-	void ProcessWaterCannon(int32);                   // todo
-	void ProcessWeather(int32 id);                    /// ok
-	bool ProcessWetRoadNoise(cVehicleParams *params); /// ok
-	void ProcessWorkShopScriptObject(uint8 sound);    /// ok
+	void ProcessVehicleSirenOrAlarm(void *);                   // todo
+	void ProcessVehicleSkidding(cVehicleParams *params);       /// ok
+	void ProcessWaterCannon(int32);                            // todo
+	void ProcessWeather(int32 id);                             /// ok
+	bool ProcessWetRoadNoise(cVehicleParams *params);          /// ok
+	void ProcessWorkShopScriptObject(uint8 sound);             /// ok
 
 	int32 RandomDisplacement(uint32 seed) const;
 	void ReacquireDigitalHandle() const;
 	void ReleaseDigitalHandle() const;
-	int32 ReportCollision(CEntity *a2, CEntity *a3, uint8 a4, uint8 a5, float a6,
-	                      float a7);                         // todo
-	int32 ReportCrime(eCrimeType crime, const CVector *pos); // todo
-	void ResetAudioLogicTimers(int32 timer);                 /// ok
-	void ResetPoliceRadio();                                 /// ok
-	void ResetTimers(uint32 a2);                             // todo
+	void ReportCollision(CEntity *entity1, CEntity *entity2, uint8 surface1, uint8 surface2,
+	                     float collisionPower, float intensity2); /// ok
+	void ReportCrime(int32 crime, const CVector *pos);   /// ok
+	void ResetAudioLogicTimers(int32 timer);                  /// ok
+	void ResetPoliceRadio();                                  /// ok
+	void ResetTimers(uint32 time);                            /// ok
 
-	void Service();                         // todo
-	void ServiceCollisions();               // todo
-	void ServicePoliceRadio();              // todo
-	void ServicePoliceRadioChannel(int a2); // todo
-	void ServiceSoundEffects();             // todo
-	int8 SetCurrent3DProvider(uint8);       // todo
+	void Service();                                    // todo
+	void ServiceCollisions();                          // todo
+	void ServicePoliceRadio();                         /// ok
+	void ServicePoliceRadioChannel(int32 wantedLevel); /// ok
+	void ServiceSoundEffects();                        /// ok
+	int8 SetCurrent3DProvider(uint8 which);            /// ok
 	void SetDynamicAcousticModelingStatus(bool status);
 	void SetEffectsFadeVolume(uint8 volume) const;
 	void SetEffectsMasterVolume(uint8 volume) const;
 	void SetEntityStatus(int32 id, bool status);
-	uint32 SetLoopingCollisionRequestedSfxFreqAndGetVol(int32); // todo
+	uint32 SetLoopingCollisionRequestedSfxFreqAndGetVol(cAudioCollision *audioCollision); // todo hook
 	void SetMissionAudioLocation(float x, float y, float z);
 	void SetMissionScriptPoliceAudio(int32 sfx) const;
-	void SetMonoMode(uint8); // todo
+	void SetMonoMode(uint8); // todo (mobile)
 	void SetMusicFadeVolume(uint8 volume) const;
 	void SetMusicMasterVolume(uint8 volume) const;
 	void SetSpeakerConfig(int32 conf) const;
-	void SetUpLoopingCollisionSound(int a2, int a3);          // todo
+	void SetUpLoopingCollisionSound(cAudioCollision *col, uint8 counter);          // todo hook
 	void SetUpOneShotCollisionSound(int a2);                  // todo
-	void SetupCrimeReport();                                  // todo
-	bool SetupJumboEngineSound(uint8, int32);                 // todo
+	bool SetupCrimeReport();                                  // todo
+	bool SetupJumboEngineSound(uint8 a2, int32 a3);           // todo
 	bool SetupJumboFlySound(uint8 emittingVol);               /// ok
 	bool SetupJumboRumbleSound(uint8 emittingVol);            /// ok
 	bool SetupJumboTaxiSound(uint8 vol);                      /// ok
@@ -537,12 +562,15 @@ public:
 	void SetupSuspectLastSeenReport();                        // todo
 
 	void Terminate();
-	void TranslateEntity(CVector *v1, CVector *v2) const; /// ok
+	void TranslateEntity(CVector *v1, CVector *v2) const;
 
-	void UpdateGasPedalAudio(CAutomobile *automobile); // todo hook
+	void UpdateGasPedalAudio(CAutomobile *automobile);
 	bool UsesReverseWarning(int32 model) const;
 	bool UsesSiren(int32 model) const;
 	bool UsesSirenSwitching(int32 model) const;
+
+	void sub_57C2B0();                              // todo (weird) and obtain name
+	int32 sub_57C320(uint8 a1, float a2, float a3); /// ok (get name)
 };
 
 static_assert(sizeof(cAudioManager) == 19220, "cAudioManager: error");
diff --git a/src/audio/DMAudio.cpp b/src/audio/DMAudio.cpp
index 82267858..8b4de961 100644
--- a/src/audio/DMAudio.cpp
+++ b/src/audio/DMAudio.cpp
@@ -26,7 +26,7 @@ cDMAudio::Service(void)
 }
 
 int32
-cDMAudio::CreateEntity(eAudioType type, void *UID)
+cDMAudio::CreateEntity(int32 type, void *UID)
 {
 	return AudioManager.CreateEntity(type, (CPhysical *)UID);
 }
diff --git a/src/audio/DMAudio.h b/src/audio/DMAudio.h
index fe120576..9c551733 100644
--- a/src/audio/DMAudio.h
+++ b/src/audio/DMAudio.h
@@ -180,7 +180,6 @@ enum eSound : int16
 class cAudioScriptObject;
 class CEntity;
 enum eCrimeType;
-enum eAudioType;
 
 class cDMAudio
 {
@@ -192,7 +191,7 @@ public:
 	void Terminate(void);
 	void Service(void);
 	
-	int32 CreateEntity(eAudioType type, void *UID);
+	int32 CreateEntity(int32 type, void *UID);
 	void DestroyEntity(int32 audioEntity);
 	void SetEntityStatus(int32 audioEntity, uint8 status);
 	void PlayOneShot(int32 audioEntity, uint16 oneShot, float volume);
diff --git a/src/audio/MusicManager.cpp b/src/audio/MusicManager.cpp
index 01a21d5d..a14994cd 100644
--- a/src/audio/MusicManager.cpp
+++ b/src/audio/MusicManager.cpp
@@ -239,7 +239,15 @@ WRAPPER void cMusicManager::SetRadioInCar(unsigned int)
 	EAXJMP(0x57D2C0);
 }
 
-WRAPPER void cMusicManager::SetRadioChannelByScript(unsigned char, int)
+WRAPPER void
+cMusicManager::SetRadioChannelByScript(unsigned char, int)
 {
 	EAXJMP(0x57D180);
+}
+
+WRAPPER
+void
+cMusicManager::ResetMusicAfterReload()
+{
+	EAXJMP(0x57CF30);
 }
\ No newline at end of file
diff --git a/src/audio/MusicManager.h b/src/audio/MusicManager.h
index f20424a8..6ced08f7 100644
--- a/src/audio/MusicManager.h
+++ b/src/audio/MusicManager.h
@@ -286,7 +286,7 @@ public:
 	char *Get3DProviderName(char);
 	bool PlayerInCar();
 	void DisplayRadioStationName();
-	
+
 	void PlayAnnouncement(unsigned char);
 	void PlayFrontEndTrack(unsigned char, unsigned char);
 	void PreloadCutSceneMusic(unsigned char);
@@ -295,6 +295,8 @@ public:
 	int32 GetRadioInCar(void);
 	void SetRadioInCar(unsigned int);
 	void SetRadioChannelByScript(unsigned char, int);
+
+	void ResetMusicAfterReload();
 };
 
 static_assert(sizeof(cMusicManager) == 0x95C, "cMusicManager: error");
diff --git a/src/control/PathFind.cpp b/src/control/PathFind.cpp
index 3c16202b..700a89f1 100644
--- a/src/control/PathFind.cpp
+++ b/src/control/PathFind.cpp
@@ -1278,38 +1278,50 @@ CPathFind::DoPathSearch(uint8 type, CVector start, int32 startNodeId, CVector ta
 		targetNode = FindNodeClosestToCoors(target, type, distLimit);
 	else
 		targetNode = forcedTargetNode;
-	if(targetNode < 0)
-		goto fail;
+	if(targetNode < 0) {
+		*pNumNodes = 0;
+		if(pDist) *pDist = 100000.0f;
+		return;
+	}
 
 	// Find start
 	int numPathsToTry;
 	CTreadable *startObj;
-	if(startNodeId < 0){
+	if(startNodeId < 0) {
 		if(vehicle == nil || (startObj = vehicle->m_treadable[type]) == nil)
 			startObj = FindRoadObjectClosestToCoors(start, type);
 		numPathsToTry = 0;
-		for(i = 0; i < 12; i++){
-			if(startObj->m_nodeIndices[type][i] < 0)
-				break;
-			if(m_pathNodes[startObj->m_nodeIndices[type][i]].group == m_pathNodes[targetNode].group)
+		for(i = 0; i < 12; i++) {
+			if(startObj->m_nodeIndices[type][i] < 0) break;
+			if(m_pathNodes[startObj->m_nodeIndices[type][i]].group ==
+			   m_pathNodes[targetNode].group)
 				numPathsToTry++;
 		}
-	}else{
+	} else {
 		numPathsToTry = 1;
 		startObj = m_mapObjects[m_pathNodes[startNodeId].objectIndex];
 	}
-	if(numPathsToTry == 0)
-		goto fail;
-
-	if(startNodeId < 0){
-		// why only check node 0?
-		if(m_pathNodes[startObj->m_nodeIndices[type][0]].group != m_pathNodes[targetNode].group)
-			goto fail;
-	}else{
-		if(m_pathNodes[startNodeId].group != m_pathNodes[targetNode].group)
-			goto fail;
+	if(numPathsToTry == 0) {
+		*pNumNodes = 0;
+		if(pDist) *pDist = 100000.0f;
+		return;
 	}
 
+	if(startNodeId < 0) {
+		// why only check node 0?
+		if(m_pathNodes[startObj->m_nodeIndices[type][0]].group !=
+		   m_pathNodes[targetNode].group) {
+			*pNumNodes = 0;
+			if(pDist) *pDist = 100000.0f;
+			return;
+		}
+	} else {
+		if(m_pathNodes[startNodeId].group != m_pathNodes[targetNode].group) {
+			*pNumNodes = 0;
+			if(pDist) *pDist = 100000.0f;
+			return;
+		}
+	}
 
 	for(i = 0; i < 512; i++)
 		m_searchNodes[i].next = nil;
@@ -1388,11 +1400,6 @@ CPathFind::DoPathSearch(uint8 type, CVector start, int32 startNodeId, CVector ta
 	for(i = 0; i < numNodesToBeCleared; i++)
 		apNodesToBeCleared[i]->distance = MAX_DIST;
 	return;
-
-fail:
-	*pNumNodes = 0;
-	if(pDist)
-		*pDist = 100000.0f;
 }
 
 static CPathNode *pNodeList[32];
diff --git a/src/core/common.h b/src/core/common.h
index 920b7108..0a2e6768 100644
--- a/src/core/common.h
+++ b/src/core/common.h
@@ -121,7 +121,7 @@ public:
 	CRGBA(void) { }
 	CRGBA(uint8 r, uint8 g, uint8 b, uint8 a) : r(r), g(g), b(b), a(a) { }
 	
-	CRGBA &CRGBA::operator =(const CRGBA &right)
+	CRGBA &operator =(const CRGBA &right)
 	{
 		this->r = right.r;
 		this->g = right.g;
@@ -142,7 +142,7 @@ public:
 		return rwRGBA;
 	}
 
-	CRGBA &CRGBA::operator =(const RwRGBA &right)
+	CRGBA &operator =(const RwRGBA &right)
 	{
 		this->r = right.red;
 		this->g = right.green;
@@ -197,8 +197,8 @@ void re3_assert(const char *expr, const char *filename, unsigned int lineno, con
 #define ARRAY_SIZE(array)                (sizeof(array) / sizeof(array[0]))
 #define BIT(num)                         (1<<(num))
 
-#define max(a, b)  (((a) > (b)) ? (a) : (b)) 
-#define min(a, b)  (((a) < (b)) ? (a) : (b))
+auto max = [](auto a, auto b) { return ((a) > (b)) ? (a) : (b); };
+auto min = [](auto a, auto b) { return ((a) < (b)) ? (a) : (b); };
 #define ABS(a)  (((a) < 0) ? (-(a)) : (a))
 #define norm(value, min, max) (((value) < (min)) ? 0 : (((value) > (max)) ? 1 : (((value) - (min)) / ((max) - (min)))))
 

From 003ac856c6e239722241c40358ea91d3c5e64c3a Mon Sep 17 00:00:00 2001
From: Filip Gawin <filip.gawin@zoho.com>
Date: Sat, 21 Sep 2019 22:10:35 +0200
Subject: [PATCH 12/37] More work

---
 .appveyor.yml              |   8 +-
 src/audio/AudioManager.cpp | 192 ++++++++++++++++++++++++++++++-------
 src/audio/AudioManager.h   |  42 ++++----
 src/audio/MusicManager.cpp | 174 ++++++++++++++++-----------------
 src/audio/MusicManager.h   |   5 +
 src/core/common.h          |   4 +-
 6 files changed, 270 insertions(+), 155 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 39352f0e..03045599 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -1,5 +1,5 @@
 version: 1.0.{build}
-image: Visual Studio 2019
+image: Visual Studio 2017
 configuration:
 - Debug
 - Release
@@ -10,7 +10,7 @@ install:
 - cmd: >-
     git submodule update --init --recursive
 
-    premake-vs2019.cmd
+    premake-vs2017.cmd
 build:
   project: build/re3.sln
   verbosity: minimal
@@ -29,12 +29,10 @@ after_build:
 
     $url = "$releases/download/$latestVersion/$name"
 
-
     Start-FileDownload $url -FileName 'C:\Ultimate-ASI-Loader.zip'
 
     7z e c:\Ultimate-ASI-Loader.zip -oc:\Projects\re3\bin\${env:CONFIGURATION}
 
-
     cd "bin\${env:CONFIGURATION}"
 
     copy re3.dll re3.asi
@@ -44,4 +42,4 @@ after_build:
     Get-ChildItem .\*.zip | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name }
 artifacts:
 - path: bin/%CONFIGURATION%/re3.dll
-  name: re3.dll
\ No newline at end of file
+  name: re3.dll
diff --git a/src/audio/AudioManager.cpp b/src/audio/AudioManager.cpp
index ae520684..20542c46 100644
--- a/src/audio/AudioManager.cpp
+++ b/src/audio/AudioManager.cpp
@@ -41,6 +41,7 @@ bool &bPlayerJustEnteredCar = *(bool *)0x6508C4;
 bool &g_bMissionAudioLoadFailed = *(bool *)0x95CD8E;
 uint32 *gMinTimeToNextReport = (uint32 *)0x8E2828;
 uint8 &gSpecialSuspectLastSeenReport = *(uint8 *)0x95CD4D;
+uint32 *gOneShotCol = (uint32 *)0x604BD0;
 
 constexpr int totalAudioEntitiesSlots = 200;
 constexpr int maxVolume = 127;
@@ -3136,9 +3137,9 @@ cAudioManager::Initialise()
 void
 cAudioManager::InitialisePoliceRadio()
 {
-	unk2 = 0;
+	policeChannelTimer = 0;
 	unk3 = 0;
-	unk4 = 0;
+	policeChannelCounterSeconds = 0;
 	for(int32 i = 0; i < 10; i++) { crimes[i].type = 0; }
 
 	SampleManager.SetChannelReverbFlag(28, 0);
@@ -8170,9 +8171,7 @@ cAudioManager::ReportCollision(CEntity *entity1, CEntity *entity2, uint8 surface
 void
 cAudioManager::ReportCrime(int32 type, const CVector *pos)
 {
-	int32 lastCrime;
-
-	lastCrime = 10;
+	int32 lastCrime = 10;
 	if(m_bIsInitialised && MusicManager.m_nMusicMode != 2 &&
 	   FindPlayerPed()->m_pWanted->m_nWantedLevel > 0 && (type > 0 || type < 17) &&
 	   m_nTimeOfRecentCrime >= gMinTimeToNextReport[type]) {
@@ -8257,10 +8256,22 @@ cAudioManager::ResetTimers(uint32 time)
 	}
 }
 
-WRAPPER void
+void
 cAudioManager::Service()
 {
-	EAXJMP(0x57A2A0);
+	GenerateIntegerRandomNumberTable();
+	if(m_bTimerJustReset) {
+		ResetAudioLogicTimers(m_nTimer);
+		MusicManager.ResetTimers(m_nTimer);
+		m_bTimerJustReset = 0;
+	}
+	if(m_bIsInitialised) {
+		m_bPreviousUserPause = m_bUserPause;
+		m_bUserPause = CTimer::GetIsUserPaused();
+		UpdateReflections();
+		ServiceSoundEffects();
+		MusicManager.Service();
+	}
 }
 
 WRAPPER
@@ -8273,7 +8284,7 @@ cAudioManager::ServiceCollisions()
 void
 cAudioManager::ServicePoliceRadio()
 {
-	int wantedLevel = 0; // bug?;
+	int32 wantedLevel = 0; // bug?;
 	static uint32 nLastSeen = 300;
 
 	if(m_bIsInitialised) {
@@ -8298,7 +8309,6 @@ cAudioManager::ServicePoliceRadio()
 void
 cAudioManager::ServicePoliceRadioChannel(int32 wantedLevel)
 {
-
 	bool processed = false;
 	uint32 sample;
 	int32 freq;
@@ -8322,12 +8332,12 @@ cAudioManager::ServicePoliceRadioChannel(int32 wantedLevel)
 			   bMissionAudioPhysicalPlayingStatus == 1) {
 				SampleManager.PauseStream(0, 1u);
 			}
-			if(!unk2) bChannelOpen = 0;
+			if(!policeChannelTimer) bChannelOpen = 0;
 			if(cWait) {
 				--cWait;
 				return;
 			}
-			if(g_nMissionAudioSfx != 3032 && !bChannelOpen) {
+			if(g_nMissionAudioSfx != TOTAL_AUDIO_SAMPLES && !bChannelOpen) {
 				if(g_nMissionAudioPlayingStatus) {
 					if(g_nMissionAudioPlayingStatus == 1 &&
 					   !bMissionAudioPhysicalPlayingStatus &&
@@ -8358,11 +8368,12 @@ cAudioManager::ServicePoliceRadioChannel(int32 wantedLevel)
 			if(bChannelOpen) DoPoliceRadioCrackle();
 			if((g_nMissionAudioSfx == TOTAL_AUDIO_SAMPLES ||
 			    g_nMissionAudioPlayingStatus != 1) &&
-			   !SampleManager.GetChannelUsedFlag(policeChannel) && unk2) {
-				if(unk2) {
-					sample = *(uint32 *)&stuff[4 * unk4];
-					--unk2;
-					unk4 = (unk4 + 1) % 60;
+			   !SampleManager.GetChannelUsedFlag(policeChannel) && policeChannelTimer) {
+				if(policeChannelTimer) {
+					sample = *(uint32 *)&stuff[4 * policeChannelCounterSeconds];
+					--policeChannelTimer;
+					policeChannelCounterSeconds =
+					    (policeChannelCounterSeconds + 1) % 60;
 				} else {
 					sample = TOTAL_AUDIO_SAMPLES;
 				}
@@ -8403,15 +8414,6 @@ cAudioManager::ServicePoliceRadioChannel(int32 wantedLevel)
 		}
 	}
 }
-#if 1
-WRAPPER
-void
-cAudioManager::ServiceSoundEffects()
-{
-
-}
-
-#else
 
 void
 cAudioManager::ServiceSoundEffects()
@@ -8460,7 +8462,7 @@ cAudioManager::ServiceSoundEffects()
 	}
 	m_nScriptObjectEntityTotal = 0;
 }
-#endif
+
 int8
 cAudioManager::SetCurrent3DProvider(uint8 which)
 {
@@ -8502,9 +8504,10 @@ cAudioManager::SetEffectsMasterVolume(uint8 volume) const
 void
 cAudioManager::SetEntityStatus(int32 id, bool status)
 {
-	if(m_bIsInitialised && id >= 0 && id < totalAudioEntitiesSlots) {
-		if(m_asAudioEntities[id].m_bIsUsed) { m_asAudioEntities[id].m_bStatus = status; }
-    }
+	if(m_bIsInitialised && id >= 0 && id < totalAudioEntitiesSlots &&
+	   m_asAudioEntities[id].m_bIsUsed) {
+		m_asAudioEntities[id].m_bStatus = status;
+	}
 }
 
 uint32
@@ -8591,7 +8594,7 @@ cAudioManager::SetMusicMasterVolume(uint8 volume) const
 void
 cAudioManager::SetSpeakerConfig(int32 conf) const
 {
-    SampleManager.SetSpeakerConfig(conf);
+	SampleManager.SetSpeakerConfig(conf);
 }
 
 void
@@ -8628,6 +8631,113 @@ cAudioManager::SetUpLoopingCollisionSound(cAudioCollision *col, uint8 counter)
 	}
 }
 
+void
+cAudioManager::SetUpOneShotCollisionSound(cAudioCollision *col)
+{
+	int16 s1;
+	int16 s2;
+
+	int32 emittingVol;
+	float ratio;
+
+	static uint16 counter = 28;
+
+	for(int32 i = 0; i < 2; i++) {
+		if(i) {
+			s1 = col->m_bSurface2;
+			s2 = col->m_bSurface1;
+		} else {
+			s1 = col->m_bSurface1;
+			s2 = col->m_bSurface2;
+		}
+		ratio = GetCollisionOneShotRatio(s1, col->m_fIntensity1);
+		if(s1 == SURFACE_METAL6 && s2 == SURFACE_FLESH) ratio = 0.25f * ratio;
+		if(s1 == SURFACE_METAL6 && ratio < 0.6f) {
+			s1 = SURFACE_BILLBOARD;
+			ratio = min(1.f, 2.f * ratio);
+		}
+		emittingVol = 40.f * ratio;
+		if(emittingVol) {
+			m_sQueueSample.m_fDistance = Sqrt(col->m_fDistance);
+			m_sQueueSample.m_bVolume =
+			    ComputeVolume(emittingVol, 60.f, m_sQueueSample.m_fDistance);
+			if(m_sQueueSample.m_bVolume) {
+				m_sQueueSample.m_nSampleIndex = gOneShotCol[s1];
+				switch(m_sQueueSample.m_nSampleIndex) {
+				case AUDIO_SAMPLE_COLLISION_PAVEMENT:
+					m_sQueueSample.m_nSampleIndex += m_anRandomTable[3] % 5u;
+					break;
+				case AUDIO_SAMPLE_CAR_DOOR_MOVEMENT_1:
+					m_sQueueSample.m_nSampleIndex += m_anRandomTable[0] % 6u;
+					break;
+				case AUDIO_SAMPLE_COLLISION_METAL_13:
+					m_sQueueSample.m_nSampleIndex += m_anRandomTable[1] & 1;
+					break;
+				case AUDIO_SAMPLE_COLLISION_FENCE:
+					m_sQueueSample.m_nSampleIndex += m_anRandomTable[3] & 3;
+					break;
+				case AUDIO_SAMPLE_COLLISION_FLESH:
+					m_sQueueSample.m_nSampleIndex += m_anRandomTable[4] % 5u;
+					break;
+				case AUDIO_SAMPLE_COLLISION_WOOD:
+					m_sQueueSample.m_nSampleIndex += m_anRandomTable[4] & 3;
+					break;
+				case AUDIO_SAMPLE_COLLISION_WOOD_BOX:
+					m_sQueueSample.m_nSampleIndex += m_anRandomTable[1] & 3;
+					break;
+				case AUDIO_SAMPLE_COLLISION_HEDGE:
+					m_sQueueSample.m_nSampleIndex += m_anRandomTable[2] % 5u;
+					break;
+				case AUDIO_SAMPLE_COLLISION_METAL_28:
+					m_sQueueSample.m_nSampleIndex += m_anRandomTable[2] % 3u;
+					break;
+				case AUDIO_SAMPLE_COLLISION_METAL:
+					m_sQueueSample.m_nSampleIndex += m_anRandomTable[1] % 5u;
+					break;
+				case AUDIO_SAMPLE_COLLISION_LOOSE:
+					m_sQueueSample.m_nSampleIndex += m_anRandomTable[3] & 1;
+					break;
+				default: break;
+				}
+				switch(s1) {
+				case SURFACE_GLASS: m_sQueueSample.m_nFrequency = 13500; break;
+				case SURFACE_METAL15: m_sQueueSample.m_nFrequency = 8819; break;
+				case SURFACE_PUDDLE:
+					m_sQueueSample.m_nFrequency =
+					    2 * SampleManager.GetSampleBaseFrequency(
+					            m_sQueueSample.m_nSampleIndex);
+					break;
+				case SURFACE_TIRE: m_sQueueSample.m_nFrequency = 6000; break;
+				case SURFACE_HARD24: m_sQueueSample.m_nFrequency = 8000; break;
+				default:
+					m_sQueueSample.m_nFrequency =
+					    SampleManager.GetSampleBaseFrequency(
+					        m_sQueueSample.m_nSampleIndex);
+					break;
+				}
+				m_sQueueSample.m_nFrequency +=
+				    RandomDisplacement(m_sQueueSample.m_nFrequency / 16);
+				m_sQueueSample.m_counter = counter++;
+				if(counter >= 255u) counter = 28;
+				m_sQueueSample.m_vecPos = col->m_vecPosition;
+				m_sQueueSample.m_bBankIndex = 0;
+				m_sQueueSample.m_bIsDistant = 0;
+				m_sQueueSample.field_16 = 11;
+				m_sQueueSample.m_nLoopCount = 1;
+				m_sQueueSample.m_bEmittingVolume = emittingVol;
+				m_sQueueSample.m_nLoopStart = 0;
+				m_sQueueSample.m_nLoopEnd = -1;
+				m_sQueueSample.field_48 = 4.0;
+				m_sQueueSample.m_fSoundIntensity = 60.0;
+				m_sQueueSample.field_56 = 1;
+				m_sQueueSample.m_bReverbFlag = 1;
+				m_sQueueSample.m_bRequireReflection = 0;
+				AddSampleToRequestedQueue();
+			}
+		}
+	}
+}
+
 WRAPPER
 bool
 cAudioManager::SetupCrimeReport()
@@ -8641,11 +8751,9 @@ bool cAudioManager::SetupJumboEngineSound(uint8, int32) { EAXJMP(0x56F140); }
 bool
 cAudioManager::SetupJumboFlySound(uint8 emittingVol)
 {
-	int32 vol;
-
 	if(m_sQueueSample.m_fDistance >= 440.0f) return 0;
 
-	vol = ComputeVolume(emittingVol, 440.0f, m_sQueueSample.m_fDistance);
+	int32 vol = ComputeVolume(emittingVol, 440.0f, m_sQueueSample.m_fDistance);
 	m_sQueueSample.m_bVolume = vol;
 	if(m_sQueueSample.m_bVolume) {
 		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_JUMBO_FLY_SOUND;
@@ -8712,11 +8820,9 @@ cAudioManager::SetupJumboRumbleSound(uint8 emittingVol)
 bool
 cAudioManager::SetupJumboTaxiSound(uint8 vol)
 {
-	uint8 emittingVol;
-
 	if(m_sQueueSample.m_fDistance >= 180.f) return 0;
 
-	emittingVol = (vol + (vol * m_sQueueSample.m_fDistance / 180)) / 2;
+	uint8 emittingVol = (vol + (vol * m_sQueueSample.m_fDistance / 180)) / 2;
 
 	if(m_sQueueSample.m_fDistance / 180 < 0.7f)
 		emittingVol -= emittingVol * gJumboVolOffsetPercentage / 100;
@@ -8969,6 +9075,13 @@ cAudioManager::UpdateGasPedalAudio(CAutomobile *automobile)
 	automobile->m_fGasPedalAudio = newGasPedalAudio;
 }
 
+WRAPPER
+void
+cAudioManager::UpdateReflections()
+{
+	EAXJMP(0x57B470);
+}
+
 bool
 cAudioManager::UsesReverseWarning(int32 model) const
 {
@@ -9210,19 +9323,23 @@ InjectHook(0x5803D0, &cAudioManager::ReportCrime, PATCH_JUMP);
 InjectHook(0x569650, &cAudioManager::ResetAudioLogicTimers, PATCH_JUMP);
 InjectHook(0x57EFF0, &cAudioManager::ResetPoliceRadio, PATCH_JUMP);
 InjectHook(0x57A7B0, &cAudioManager::ResetTimers, PATCH_JUMP);
+InjectHook(0x57A2A0, &cAudioManager::Service, PATCH_JUMP);
 InjectHook(0x57F110, &cAudioManager::ServicePoliceRadio, PATCH_JUMP);
 InjectHook(0x57F1B0, &cAudioManager::ServicePoliceRadioChannel, PATCH_JUMP);
-//InjectHook(0x57AA60, &cAudioManager::ServiceSoundEffects, PATCH_JUMP);
+InjectHook(0x57AA60, &cAudioManager::ServiceSoundEffects, PATCH_JUMP);
 InjectHook(0x57A910, &cAudioManager::SetCurrent3DProvider, PATCH_JUMP);
 InjectHook(0x57AA00, &cAudioManager::SetDynamicAcousticModelingStatus, PATCH_JUMP);
 InjectHook(0x57A770, &cAudioManager::SetEffectsFadeVolume, PATCH_JUMP);
 InjectHook(0x57A730, &cAudioManager::SetEffectsMasterVolume, PATCH_JUMP);
 InjectHook(0x57A4C0, &cAudioManager::SetEntityStatus, PATCH_JUMP);
+InjectHook(0x568E20, &cAudioManager::SetLoopingCollisionRequestedSfxFreqAndGetVol, PATCH_JUMP);
 InjectHook(0x5795F0, &cAudioManager::SetMissionAudioLocation, PATCH_JUMP);
 InjectHook(0x57F020, &cAudioManager::SetMissionScriptPoliceAudio, PATCH_JUMP);
 InjectHook(0x57A790, &cAudioManager::SetMusicFadeVolume, PATCH_JUMP);
 InjectHook(0x57A750, &cAudioManager::SetMusicMasterVolume, PATCH_JUMP);
 InjectHook(0x57A9A0, &cAudioManager::SetSpeakerConfig, PATCH_JUMP);
+InjectHook(0x568D30, &cAudioManager::SetUpLoopingCollisionSound, PATCH_JUMP);
+InjectHook(0x5689D0, &cAudioManager::SetUpOneShotCollisionSound, PATCH_JUMP);
 InjectHook(0x56F230, &cAudioManager::SetupJumboFlySound, PATCH_JUMP);
 InjectHook(0x56F310, &cAudioManager::SetupJumboRumbleSound, PATCH_JUMP);
 InjectHook(0x56EF20, &cAudioManager::SetupJumboTaxiSound, PATCH_JUMP);
@@ -9238,4 +9355,5 @@ InjectHook(0x57C320, &cAudioManager::sub_57C320, PATCH_JUMP);
 InjectHook(0x5755C0, &cPedComments::Add, PATCH_JUMP);
 InjectHook(0x575730, &cPedComments::Process, PATCH_JUMP);
 InjectHook(0x5685E0, &cAudioCollisionManager::AddCollisionToRequestedQueue, PATCH_JUMP);
+InjectHook(0x57C430, &cAudioScriptObject::Reset, PATCH_JUMP);
 ENDPATCHES
diff --git a/src/audio/AudioManager.h b/src/audio/AudioManager.h
index 59a92a48..35c6f257 100644
--- a/src/audio/AudioManager.h
+++ b/src/audio/AudioManager.h
@@ -200,7 +200,7 @@ public:
 	CVector Posn;
 	int32 AudioEntity;
 
-	void Reset(); // todo hook
+	void Reset(); /// ok
 
 	static void *operator new(size_t);
 	static void *operator new(size_t, int);
@@ -284,9 +284,9 @@ public:
 	int32 m_nPoliceChannelEntity;
 	uint8 stuff[239];
 	uint8 unk1;
-	uint8 unk2;
+	uint8 policeChannelTimer;
 	uint8 unk3;
-	uint8 unk4;
+	uint8 policeChannelCounterSeconds;
 	uint8 unk5;
 	Crime crimes[10];
 	int32 m_nFrontEndEntity;
@@ -417,7 +417,7 @@ public:
 	uint8 GetCDAudioDriveLetter() const;
 	int8 GetCurrent3DProviderIndex() const;                            /// ok
 	float GetCollisionLoopingRatio(uint32 a, uint32 b, float c) const; // not used
-	float GetCollisionOneShotRatio(int32 a, float b) const;           /// ok
+	float GetCollisionOneShotRatio(int32 a, float b) const;            /// ok
 	float GetCollisionRatio(float a, float b, float c, float d) const; /// ok
 	float GetDistanceSquared(CVector *v) const;                        /// ok
 	int32 GetJumboTaxiFreq() const;                                    /// ok
@@ -528,12 +528,12 @@ public:
 	void ReleaseDigitalHandle() const;
 	void ReportCollision(CEntity *entity1, CEntity *entity2, uint8 surface1, uint8 surface2,
 	                     float collisionPower, float intensity2); /// ok
-	void ReportCrime(int32 crime, const CVector *pos);   /// ok
-	void ResetAudioLogicTimers(int32 timer);                  /// ok
-	void ResetPoliceRadio();                                  /// ok
-	void ResetTimers(uint32 time);                            /// ok
+	void ReportCrime(int32 crime, const CVector *pos);            /// ok
+	void ResetAudioLogicTimers(int32 timer);                      /// ok
+	void ResetPoliceRadio();                                      /// ok
+	void ResetTimers(uint32 time);                                /// ok
 
-	void Service();                                    // todo
+	void Service();                                    /// ok
 	void ServiceCollisions();                          // todo
 	void ServicePoliceRadio();                         /// ok
 	void ServicePoliceRadioChannel(int32 wantedLevel); /// ok
@@ -543,28 +543,30 @@ public:
 	void SetEffectsFadeVolume(uint8 volume) const;
 	void SetEffectsMasterVolume(uint8 volume) const;
 	void SetEntityStatus(int32 id, bool status);
-	uint32 SetLoopingCollisionRequestedSfxFreqAndGetVol(cAudioCollision *audioCollision); // todo hook
+	uint32
+	SetLoopingCollisionRequestedSfxFreqAndGetVol(cAudioCollision *audioCollision); /// ok
 	void SetMissionAudioLocation(float x, float y, float z);
 	void SetMissionScriptPoliceAudio(int32 sfx) const;
 	void SetMonoMode(uint8); // todo (mobile)
 	void SetMusicFadeVolume(uint8 volume) const;
 	void SetMusicMasterVolume(uint8 volume) const;
 	void SetSpeakerConfig(int32 conf) const;
-	void SetUpLoopingCollisionSound(cAudioCollision *col, uint8 counter);          // todo hook
-	void SetUpOneShotCollisionSound(int a2);                  // todo
-	bool SetupCrimeReport();                                  // todo
-	bool SetupJumboEngineSound(uint8 a2, int32 a3);           // todo
-	bool SetupJumboFlySound(uint8 emittingVol);               /// ok
-	bool SetupJumboRumbleSound(uint8 emittingVol);            /// ok
-	bool SetupJumboTaxiSound(uint8 vol);                      /// ok
-	bool SetupJumboWhineSound(uint8 emittingVol, int32 freq); /// ok
-	void SetupPedComments(cPedParams *params, uint32 sound);  /// ok
-	void SetupSuspectLastSeenReport();                        // todo
+	void SetUpLoopingCollisionSound(cAudioCollision *col, uint8 counter); /// ok
+	void SetUpOneShotCollisionSound(cAudioCollision *col);                /// ok
+	bool SetupCrimeReport();                                              // todo
+	bool SetupJumboEngineSound(uint8 a2, int32 a3);                       // todo
+	bool SetupJumboFlySound(uint8 emittingVol);                           /// ok
+	bool SetupJumboRumbleSound(uint8 emittingVol);                        /// ok
+	bool SetupJumboTaxiSound(uint8 vol);                                  /// ok
+	bool SetupJumboWhineSound(uint8 emittingVol, int32 freq);             /// ok
+	void SetupPedComments(cPedParams *params, uint32 sound);              /// ok
+	void SetupSuspectLastSeenReport();                                    // todo
 
 	void Terminate();
 	void TranslateEntity(CVector *v1, CVector *v2) const;
 
 	void UpdateGasPedalAudio(CAutomobile *automobile);
+	void UpdateReflections(); // todo
 	bool UsesReverseWarning(int32 model) const;
 	bool UsesSiren(int32 model) const;
 	bool UsesSirenSwitching(int32 model) const;
diff --git a/src/audio/MusicManager.cpp b/src/audio/MusicManager.cpp
index a14994cd..fa1a9390 100644
--- a/src/audio/MusicManager.cpp
+++ b/src/audio/MusicManager.cpp
@@ -1,34 +1,38 @@
-#include "common.h"
-#include "patcher.h"
 #include "MusicManager.h"
+#include "Camera.h"
 #include "Font.h"
 #include "Hud.h"
+#include "ModelIndices.h"
+#include "Replay.h"
 #include "Text.h"
 #include "Timer.h"
-#include "Camera.h"
 #include "World.h"
-#include "ModelIndices.h"
 #include "sampman.h"
-#include "Replay.h"
+#include "patcher.h"
 
-cMusicManager &MusicManager = *(cMusicManager*)0x8F3964;
-int32 &gNumRetunePresses = *(int32*)0x650B80;
-wchar *pCurrentStation = (wchar*)0x650B9C;
-uint8 &cDisplay = *(uint8*)0x650BA1;
+cMusicManager &MusicManager = *(cMusicManager *)0x8F3964;
+int32 &gNumRetunePresses = *(int32 *)0x650B80;
+wchar *pCurrentStation = (wchar *)0x650B9C;
+uint8 &cDisplay = *(uint8 *)0x650BA1;
 
-WRAPPER char* cMusicManager::Get3DProviderName(char) { EAXJMP(0x57A8C0); }
-
-bool cMusicManager::PlayerInCar()
+WRAPPER char *
+cMusicManager::Get3DProviderName(char)
 {
-	if (!FindPlayerVehicle())
+	EAXJMP(0x57A8C0);
+}
+
+bool
+cMusicManager::PlayerInCar()
+{
+	if(!FindPlayerVehicle())
 		return false;
 	else {
 		int32 State = CWorld::Players[CWorld::PlayerInFocus].m_pPed->m_nPedState;
 
-		if (State == PED_DRAG_FROM_CAR || State == PED_EXIT_CAR || State == PED_ARRESTED)
+		if(State == PED_DRAG_FROM_CAR || State == PED_EXIT_CAR || State == PED_ARRESTED)
 			return false;
 
-		switch (FindPlayerVehicle()->m_modelIndex) {
+		switch(FindPlayerVehicle()->m_modelIndex) {
 		case MI_FIRETRUCK:
 		case MI_AMBULAN:
 		case MI_MRWHOOP:
@@ -36,10 +40,8 @@ bool cMusicManager::PlayerInCar()
 		case MI_TRAIN:
 		case MI_SPEEDER:
 		case MI_REEFER:
-		case MI_GHOST:
-			return false;
-		default:
-			return true;
+		case MI_GHOST: return false;
+		default: return true;
 		}
 	}
 }
@@ -47,56 +49,53 @@ bool cMusicManager::PlayerInCar()
 #if 0
 WRAPPER void cMusicManager::DisplayRadioStationName(void) { EAXJMP(0x57E6D0); }
 #else
-void cMusicManager::DisplayRadioStationName()
+void
+cMusicManager::DisplayRadioStationName()
 {
 	int8 pRetune;
 	int8 gStreamedSound;
 	int8 gRetuneCounter;
 
-	if (!CTimer::GetIsPaused() && !TheCamera.m_WideScreenOn && cMusicManager::PlayerInCar() && !CReplay::IsPlayingBack()) {
-		if (MusicManager.m_bPlayerInCar && !MusicManager.m_bPreviousPlayerInCar)
+	if(!CTimer::GetIsPaused() && !TheCamera.m_WideScreenOn && cMusicManager::PlayerInCar() &&
+	   !CReplay::IsPlayingBack()) {
+		if(MusicManager.m_bPlayerInCar && !MusicManager.m_bPreviousPlayerInCar)
 			pCurrentStation = nil;
 
-		if (SampleManager.IsMP3RadioChannelAvailable()) {
+		if(SampleManager.IsMP3RadioChannelAvailable()) {
 			gStreamedSound = MusicManager.m_nCurrentStreamedSound;
 
-			if (gStreamedSound != STREAMED_SOUND_CITY_AMBIENT && gStreamedSound != STREAMED_SOUND_WATER_AMBIENT) {
-				if (gStreamedSound > STREAMED_SOUND_RADIO_MP3_PLAYER)
-					return;
-			}
-			else {
+			if(gStreamedSound != STREAMED_SOUND_CITY_AMBIENT &&
+			   gStreamedSound != STREAMED_SOUND_WATER_AMBIENT) {
+				if(gStreamedSound > STREAMED_SOUND_RADIO_MP3_PLAYER) return;
+			} else {
 				gStreamedSound = STREAMED_SOUND_RADIO_POLICE;
 			}
 
 			pRetune = gNumRetunePresses + gStreamedSound;
 
-			if (pRetune == POLICE_RADIO) {
+			if(pRetune == POLICE_RADIO) {
 				pRetune = RADIO_OFF;
-			}
-			else if (pRetune > POLICE_RADIO) {
+			} else if(pRetune > POLICE_RADIO) {
 				pRetune = pRetune - 11;
 			}
-		}
-		else {
+		} else {
 			gStreamedSound = MusicManager.m_nCurrentStreamedSound;
 			pRetune = gNumRetunePresses + gStreamedSound;
 
-			if (pRetune >= USERTRACK) {
+			if(pRetune >= USERTRACK) {
 				gRetuneCounter = gNumRetunePresses;
 				pRetune = MusicManager.m_nCurrentStreamedSound;
 
-				if (gStreamedSound == STREAMED_SOUND_WATER_AMBIENT)
+				if(gStreamedSound == STREAMED_SOUND_WATER_AMBIENT)
 					pRetune = RADIO_OFF;
 
-				while (gRetuneCounter) {
-					if (pRetune == RADIO_OFF) {
+				while(gRetuneCounter) {
+					if(pRetune == RADIO_OFF) {
 						pRetune = HEAD_RADIO;
-					}
-					else if (pRetune < USERTRACK) {
+					} else if(pRetune < USERTRACK) {
 						pRetune = pRetune + 1;
 					}
-					if (pRetune == USERTRACK)
-						pRetune = RADIO_OFF;
+					if(pRetune == USERTRACK) pRetune = RADIO_OFF;
 
 					--gRetuneCounter;
 				}
@@ -105,52 +104,29 @@ void cMusicManager::DisplayRadioStationName()
 
 		wchar *string = nil;
 
-		switch (pRetune) {
-		case HEAD_RADIO:
-			string = TheText.Get("FEA_FM0");
-			break;
-		case DOUBLE_CLEF:
-			string = TheText.Get("FEA_FM1");
-			break;
-		case JAH_RADIO:
-			string = TheText.Get("FEA_FM2");
-			break;
-		case RISE_FM:
-			string = TheText.Get("FEA_FM3");
-			break;
-		case LIPS_106:
-			string = TheText.Get("FEA_FM4");
-			break;
-		case GAME_FM:
-			string = TheText.Get("FEA_FM5");
-			break;
-		case MSX_FM:
-			string = TheText.Get("FEA_FM6");
-			break;
-		case FLASHBACK:
-			string = TheText.Get("FEA_FM7");
-			break;
-		case CHATTERBOX:
-			string = TheText.Get("FEA_FM8");
-			break;
-		case USERTRACK:
-			string = TheText.Get("FEA_FM9");
-			break;
-		default:
-			return;
+		switch(pRetune) {
+		case HEAD_RADIO: string = TheText.Get("FEA_FM0"); break;
+		case DOUBLE_CLEF: string = TheText.Get("FEA_FM1"); break;
+		case JAH_RADIO: string = TheText.Get("FEA_FM2"); break;
+		case RISE_FM: string = TheText.Get("FEA_FM3"); break;
+		case LIPS_106: string = TheText.Get("FEA_FM4"); break;
+		case GAME_FM: string = TheText.Get("FEA_FM5"); break;
+		case MSX_FM: string = TheText.Get("FEA_FM6"); break;
+		case FLASHBACK: string = TheText.Get("FEA_FM7"); break;
+		case CHATTERBOX: string = TheText.Get("FEA_FM8"); break;
+		case USERTRACK: string = TheText.Get("FEA_FM9"); break;
+		default: return;
 		};
 
-		if (pRetune > CHATTERBOX && !SampleManager.IsMP3RadioChannelAvailable()) {
-			return;
-		}
+		if(pRetune > CHATTERBOX && !SampleManager.IsMP3RadioChannelAvailable()) { return; }
 
-		if (string && pCurrentStation != string || MusicManager.m_nCurrentStreamedSound == STREAMED_SOUND_RADIO_MP3_PLAYER && MusicManager.m_nPreviousStreamedSound != STREAMED_SOUND_RADIO_MP3_PLAYER) {
+		if(string && pCurrentStation != string ||
+		   MusicManager.m_nCurrentStreamedSound == STREAMED_SOUND_RADIO_MP3_PLAYER &&
+		       MusicManager.m_nPreviousStreamedSound != STREAMED_SOUND_RADIO_MP3_PLAYER) {
 			pCurrentStation = string;
 			cDisplay = 60;
-		}
-		else {
-			if (!cDisplay)
-				return;
+		} else {
+			if(!cDisplay) return;
 			--cDisplay;
 		}
 
@@ -164,7 +140,7 @@ void cMusicManager::DisplayRadioStationName()
 		CFont::SetColor(CRGBA(0, 0, 0, 255));
 		CFont::PrintString(SCREEN_WIDTH / 2 + SCREEN_SCALE_X(2.0f), SCREEN_SCALE_Y(22.0f) + SCREEN_SCALE_Y(2.0f), pCurrentStation);
 
-		if (gNumRetunePresses)
+		if(gNumRetunePresses)
 			CFont::SetColor(CRGBA(102, 133, 143, 255));
 		else
 			CFont::SetColor(CRGBA(147, 196, 211, 255));
@@ -203,38 +179,44 @@ cMusicManager::StopFrontEndTrack()
 	EAXJMP(0x57E3D0);
 }
 
-
-WRAPPER void cMusicManager::PlayAnnouncement(unsigned char)
+WRAPPER void
+cMusicManager::PlayAnnouncement(unsigned char)
 {
 	EAXJMP(0x57E430);
 }
 
-WRAPPER void cMusicManager::PlayFrontEndTrack(unsigned char, unsigned char)
+WRAPPER void
+cMusicManager::PlayFrontEndTrack(unsigned char, unsigned char)
 {
 	EAXJMP(0x57E2E0);
 }
 
-WRAPPER void cMusicManager::PreloadCutSceneMusic(unsigned char)
+WRAPPER void
+cMusicManager::PreloadCutSceneMusic(unsigned char)
 {
 	EAXJMP(0x57E210);
 }
 
-WRAPPER void cMusicManager::PlayPreloadedCutSceneMusic(void)
+WRAPPER void
+cMusicManager::PlayPreloadedCutSceneMusic(void)
 {
 	EAXJMP(0x57E290);
 }
 
-WRAPPER void cMusicManager::StopCutSceneMusic(void)
+WRAPPER void
+cMusicManager::StopCutSceneMusic(void)
 {
 	EAXJMP(0x57E2B0);
 }
 
-WRAPPER int32 cMusicManager::GetRadioInCar(void)
+WRAPPER int32
+cMusicManager::GetRadioInCar(void)
 {
 	EAXJMP(0x57D1D0);
 }
 
-WRAPPER void cMusicManager::SetRadioInCar(unsigned int)
+WRAPPER void
+cMusicManager::SetRadioInCar(unsigned int)
 {
 	EAXJMP(0x57D2C0);
 }
@@ -250,4 +232,14 @@ void
 cMusicManager::ResetMusicAfterReload()
 {
 	EAXJMP(0x57CF30);
+}
+
+WRAPPER
+void cMusicManager::ResetTimers(int32) { EAXJMP(0x57D420); }
+
+WRAPPER
+void
+cMusicManager::Service()
+{
+	EAXJMP(0x57D440);
 }
\ No newline at end of file
diff --git a/src/audio/MusicManager.h b/src/audio/MusicManager.h
index 6ced08f7..47f3ad68 100644
--- a/src/audio/MusicManager.h
+++ b/src/audio/MusicManager.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "common.h"
+
 enum eRadioStation
 {
 	HEAD_RADIO,
@@ -297,6 +299,9 @@ public:
 	void SetRadioChannelByScript(unsigned char, int);
 
 	void ResetMusicAfterReload();
+
+	void ResetTimers(int32);
+	void Service();
 };
 
 static_assert(sizeof(cMusicManager) == 0x95C, "cMusicManager: error");
diff --git a/src/core/common.h b/src/core/common.h
index 0a2e6768..d3d4e049 100644
--- a/src/core/common.h
+++ b/src/core/common.h
@@ -197,8 +197,8 @@ void re3_assert(const char *expr, const char *filename, unsigned int lineno, con
 #define ARRAY_SIZE(array)                (sizeof(array) / sizeof(array[0]))
 #define BIT(num)                         (1<<(num))
 
-auto max = [](auto a, auto b) { return ((a) > (b)) ? (a) : (b); };
-auto min = [](auto a, auto b) { return ((a) < (b)) ? (a) : (b); };
+//auto max = [](auto a, auto b) { return ((a) > (b)) ? (a) : (b); };
+//auto min = [](auto a, auto b) { return ((a) < (b)) ? (a) : (b); };
 #define ABS(a)  (((a) < 0) ? (-(a)) : (a))
 #define norm(value, min, max) (((value) < (min)) ? 0 : (((value) > (max)) ? 1 : (((value) - (min)) / ((max) - (min)))))
 

From d2941b03689575fc0158683daae7883402a92651 Mon Sep 17 00:00:00 2001
From: Filip Gawin <filip.gawin@zoho.com>
Date: Tue, 24 Sep 2019 13:33:16 +0200
Subject: [PATCH 13/37] More audio (to hook and test)

---
 src/audio/AudioManager.cpp       | 542 ++++++++++++++++++++++++++++---
 src/audio/AudioManager.h         |  23 +-
 src/core/AnimViewer.cpp          |   2 +-
 src/core/FileLoader.cpp          |   2 +-
 src/core/Lists.h                 |   2 +
 src/core/World.cpp               |   2 +-
 src/core/main.cpp                |   2 +-
 src/entities/Physical.cpp        |   2 +-
 src/modelinfo/VehicleModelInfo.h |   2 +-
 src/peds/Ped.cpp                 |   8 +-
 src/render/WaterCannon.cpp       |   6 +-
 src/render/WaterCannon.h         |  14 +-
 src/vehicles/Automobile.cpp      |   6 +-
 src/vehicles/Vehicle.h           |   6 +-
 src/weapons/CProjectileInfo.cpp  |  10 +
 src/weapons/CProjectileInfo.h    |  20 ++
 16 files changed, 574 insertions(+), 75 deletions(-)
 create mode 100644 src/weapons/CProjectileInfo.cpp
 create mode 100644 src/weapons/CProjectileInfo.h

diff --git a/src/audio/AudioManager.cpp b/src/audio/AudioManager.cpp
index 20542c46..b88af1ec 100644
--- a/src/audio/AudioManager.cpp
+++ b/src/audio/AudioManager.cpp
@@ -6,16 +6,20 @@
 #include "Automobile.h"
 #include "Boat.h"
 #include "Bridge.h"
+#include "CProjectileInfo.h"
 #include "Camera.h"
 #include "DMAudio.h"
+#include "Entity.h"
 #include "Explosion.h"
 #include "Garages.h"
+#include "HandlingMgr.h"
 #include "Heli.h"
 #include "ModelIndices.h"
 #include "MusicManager.h"
 #include "Pad.h"
 #include "Ped.h"
 #include "Physical.h"
+#include "Placeable.h"
 #include "Plane.h"
 #include "PlayerPed.h"
 #include "Pools.h"
@@ -25,6 +29,7 @@
 #include "Train.h"
 #include "Transmission.h"
 #include "Vehicle.h"
+#include "WaterCannon.h"
 #include "Weather.h"
 #include "World.h"
 #include "ZoneCull.h"
@@ -41,11 +46,16 @@ bool &bPlayerJustEnteredCar = *(bool *)0x6508C4;
 bool &g_bMissionAudioLoadFailed = *(bool *)0x95CD8E;
 uint32 *gMinTimeToNextReport = (uint32 *)0x8E2828;
 uint8 &gSpecialSuspectLastSeenReport = *(uint8 *)0x95CD4D;
-uint32 *gOneShotCol = (uint32 *)0x604BD0;
+//uint32 *gOneShotCol = (uint32 *)0x604BD0;
+bool *somethingWithHorns = (bool *)0x606AB8;
 
 constexpr int totalAudioEntitiesSlots = 200;
 constexpr int maxVolume = 127;
 constexpr int policeChannel = 28;
+constexpr uint8 panTable[64]{
+    0,  3,  8,  12, 16, 19, 22, 24, 26, 28, 30, 31, 33, 34, 36, 37, 39, 40, 41, 42, 44, 45,
+    46, 47, 48, 49, 49, 50, 51, 52, 53, 53, 54, 55, 55, 56, 56, 57, 57, 58, 58, 58, 59, 59,
+    59, 60, 60, 61, 61, 61, 61, 62, 62, 62, 62, 62, 63, 63, 63, 63, 63, 63, 63, 63};
 
 // TODO: where is this used? Is this the right file?
 enum eVehicleModel {
@@ -591,11 +601,13 @@ cAudioManager::ComputeDopplerEffectedFrequency(uint32 oldFreq, float position1,
 	return newFreq;
 }
 
-WRAPPER
 int32
-cAudioManager::ComputePan(float, CVector *)
+cAudioManager::ComputePan(float dist, CVector *vec)
 {
-	EAXJMP(0x57AD20);
+	int32 index = min(63, Abs(vec->x / (dist / 64.f)));
+
+	if(vec->x > 0.f) return max(20, 63 - panTable[index]);
+	return min(107, panTable[index] + 63);
 }
 
 uint32
@@ -654,7 +666,10 @@ cAudioManager::DestroyAllGameCreatedEntities()
 				case AUDIOTYPE_SCRIPTOBJECT:
 					entity =
 					    (cAudioScriptObject *)m_asAudioEntities[i].m_pEntity;
-					if(entity) { delete entity; }
+					if(entity) { 
+						delete entity; 
+						m_asAudioEntities[i].m_pEntity = nil;
+					}
 					DestroyEntity(i);
 					break;
 				default: break;
@@ -3147,11 +3162,94 @@ cAudioManager::InitialisePoliceRadio()
 	for(int32 i = 0; i < 18; i++) { gMinTimeToNextReport[i] = m_nTimeOfRecentCrime; }
 }
 
-WRAPPER
+struct tPoliceRadioZone
+{
+  char m_aName[8];
+  uint32 m_nSampleIndex;
+  int32 field_12;
+};
+
+tPoliceRadioZone* ZoneSfx = (tPoliceRadioZone*)0x880240;
+char* SubZo2Label = (char*)0x6E9918;
+char* SubZo3Label = (char*)0x6E9870;
+
 void
 cAudioManager::InitialisePoliceRadioZones()
 {
-	EAXJMP(0x57EAC0);
+	for(int32 i = 0; i < 36; i++) { ZoneSfx[i].m_aName[0] = 0; }
+
+	strcpy((char *)ZoneSfx, "HOSPI_2");
+	ZoneSfx[0].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_ROCKFORD;
+	strcpy((char *)&ZoneSfx[1], "CONSTRU");
+	ZoneSfx[1].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_FORT_STAUNTON;
+	strcpy((char *)&ZoneSfx[2], "STADIUM");
+	ZoneSfx[2].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_ASPATRIA;
+	strcpy((char *)&ZoneSfx[3], "YAKUSA");
+	ZoneSfx[3].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_TORRINGTON;
+	strcpy((char *)&ZoneSfx[4], "SHOPING");
+	ZoneSfx[4].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_BEDFORD_POINT;
+	strcpy((char *)&ZoneSfx[5], "COM_EAS");
+	ZoneSfx[5].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_NEWPORT;
+	strcpy((char *)&ZoneSfx[6], "PARK");
+	ZoneSfx[6].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_BELLEVILLE;
+	strcpy((char *)&ZoneSfx[7], "UNIVERS");
+	ZoneSfx[7].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_LIBERTY_CAMPUS;
+	strcpy((char *)&ZoneSfx[8], "BIG_DAM");
+	ZoneSfx[8].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_COCHRANE;
+	strcpy((char *)&ZoneSfx[9], "SUB_IND");
+	ZoneSfx[9].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_PIKE_CREEK;
+	strcpy((char *)&ZoneSfx[10], "SWANKS");
+	ZoneSfx[10].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_CEDAR_GROVE;
+	strcpy((char *)&ZoneSfx[11], "PROJECT");
+	ZoneSfx[11].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_WICHITA_GARDEN;
+	strcpy((char *)&ZoneSfx[12], "AIRPORT");
+	ZoneSfx[12].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_FRANCIS_INTNL;
+	strcpy((char *)&ZoneSfx[13], "PORT_W");
+	ZoneSfx[13].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_CALLAHAN_POINT;
+	strcpy((char *)&ZoneSfx[14], "PORT_S");
+	ZoneSfx[14].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_ATLANTIC_QUAYS;
+	strcpy((char *)&ZoneSfx[15], "PORT_E");
+	ZoneSfx[15].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_PORTLAND_HARBOUR;
+	strcpy((char *)&ZoneSfx[16], "PORT_I");
+	ZoneSfx[16].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_TRENTON;
+	strcpy((char *)&ZoneSfx[17], "CHINA");
+	ZoneSfx[17].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_CHINATOWN;
+	strcpy((char *)&ZoneSfx[18], "REDLIGH");
+	ZoneSfx[18].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_REDLIGHT;
+	strcpy((char *)&ZoneSfx[19], "TOWERS");
+	ZoneSfx[19].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_HEPBURN_HEIGHTS;
+	strcpy((char *)&ZoneSfx[20], "LITTLEI");
+	ZoneSfx[20].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_ST_MARKS;
+	strcpy((char *)&ZoneSfx[21], "HARWOOD");
+	ZoneSfx[21].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_HARWOOD;
+	strcpy((char *)&ZoneSfx[22], "EASTBAY");
+	ZoneSfx[22].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_PORTLAND_BEACH;
+	strcpy((char *)&ZoneSfx[23], "S_VIEW");
+	ZoneSfx[23].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_PORTLAND_VIEW;
+	strcpy((char *)&ZoneSfx[24], "CITYZON");
+	ZoneSfx[24].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_LIBERTY_CITY;
+	strcpy((char *)&ZoneSfx[25], "IND_ZON");
+	ZoneSfx[25].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_PORTLAND;
+	strcpy((char *)&ZoneSfx[26], "COM_ZON");
+	ZoneSfx[26].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_STAUNTON;
+	strcpy((char *)&ZoneSfx[27], "SUB_ZON");
+	ZoneSfx[27].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_SHORESIDE;
+	strcpy((char *)&ZoneSfx[28], "SUB_ZO2");
+	ZoneSfx[28].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_SHORESIDE;
+	strcpy((char *)&ZoneSfx[29], "SUB_ZO3");
+	ZoneSfx[29].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_SHORESIDE;
+	strcpy((char *)&ZoneSfx[30], "A");
+	ZoneSfx[30].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_ROCKFORD;
+	strcpy((char *)&ZoneSfx[31], "A");
+	ZoneSfx[31].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_ROCKFORD;
+	strcpy((char *)&ZoneSfx[32], "A");
+	ZoneSfx[32].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_ROCKFORD;
+	strcpy((char *)&ZoneSfx[33], "A");
+	ZoneSfx[33].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_ROCKFORD;
+	strcpy((char *)&ZoneSfx[34], "A");
+	ZoneSfx[34].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_ROCKFORD;
+	strcpy(SubZo2Label, "SUB_ZO2");
+	strcpy(SubZo3Label, "SUB_ZO3");
 }
 
 void
@@ -3221,6 +3319,65 @@ void
 cAudioManager::PlayOneShot(int32 index, int16 sound, float vol)
 {
 	EAXJMP(0x57A500);
+	/*if(m_bIsInitialised) {
+		if (index >= 0 && index < totalAudioEntitiesSlots) {
+			if (m_asAudioEntities[index].m_bIsUsed) {
+				if (sound < SOUND_TOTAL_SOUNDS) {
+					if (m_asAudioEntities[index].m_nType ==
+						AUDIOTYPE_SCRIPTOBJECT) {
+						if (m_nScriptObjectEntityTotal < 40) {
+							m_asAudioEntities[index].m_awAudioEvent[0] =
+								sound;
+							m_asAudioEntities[index].m_Loops = 1;
+							m_anScriptObjectEntityIndices
+								[m_nScriptObjectEntityTotal++] = index;
+						}
+					}
+					else {
+						int32 i = 0;
+						while (1) {
+							if (i >= m_asAudioEntities[index].m_Loops) {
+								if (m_asAudioEntities[index]
+									.m_Loops < 4) {
+									m_asAudioEntities[index / 2]
+										.m_awAudioEvent[i] =
+										sound;
+									m_asAudioEntities[index / 4]
+										.m_afVolume[i] = vol;
+									++m_asAudioEntities[index]
+										.m_Loops;
+								}
+								return;
+							}
+							if (panTable[m_asAudioEntities[index / 2]
+								.m_awAudioEvent[i]] >
+								panTable[sound])
+								break;
+							++i;
+						}
+						if (i < 3) {
+							memmove(
+								&m_asAudioEntities[0]
+								.m_awAudioEvent[i + 1 + index / 2],
+								&m_asAudioEntities[0]
+								.m_awAudioEvent[i + index / 2],
+								2 * (3 - i));
+							memmove(&m_asAudioEntities[0]
+								.m_afVolume[i + 1 + index / 4],
+								&m_asAudioEntities[0]
+								.m_afVolume[i + index / 4],
+								4 * (3 - i));
+						}
+						m_asAudioEntities[index / 2].m_awAudioEvent[i] =
+							sound;
+						m_asAudioEntities[index / 4].m_afVolume[i] = vol;
+						if (m_asAudioEntities[index].m_Loops < 4)
+							++m_asAudioEntities[index].m_Loops;
+					}
+				}
+			}
+		}
+	}*/
 }
 
 WRAPPER
@@ -3390,7 +3547,6 @@ void
 cAudioManager::ProcessAirportScriptObject(uint8 sound)
 {
 	float dist;
-	float distSquared;
 	float maxDist;
 
 	static uint8 counter = 0;
@@ -3406,9 +3562,9 @@ cAudioManager::ProcessAirportScriptObject(uint8 sound)
 			maxDist = 6400.f;
 			m_sQueueSample.m_fSoundIntensity = 80.0f;
 			break;
-		default: break;
+		default: return;
 		}
-		distSquared = GetDistanceSquared(&m_sQueueSample.m_vecPos);
+		float distSquared = GetDistanceSquared(&m_sQueueSample.m_vecPos);
 		if(distSquared < maxDist) {
 			dist = sqrt(distSquared);
 			m_sQueueSample.m_fDistance = dist;
@@ -3827,7 +3983,6 @@ void
 cAudioManager::ProcessCinemaScriptObject(uint8 sound)
 {
 	uint8 rand;
-	float distSquared;
 	float maxDist;
 
 	static uint8 counter = 0;
@@ -3843,9 +3998,9 @@ cAudioManager::ProcessCinemaScriptObject(uint8 sound)
 			maxDist = 6400.f;
 			m_sQueueSample.m_fSoundIntensity = 80.0f;
 			break;
-		default: break;
+		default: return;
 		}
-		distSquared = GetDistanceSquared(&m_sQueueSample.m_vecPos);
+		float distSquared = GetDistanceSquared(&m_sQueueSample.m_vecPos);
 		if(distSquared < maxDist) {
 			m_sQueueSample.m_fDistance = sqrt(distSquared);
 			rand = m_anRandomTable[0] % 90u + 30;
@@ -3904,7 +4059,7 @@ cAudioManager::ProcessDocksScriptObject(uint8 sound)
 			maxDist = 6400.f;
 			m_sQueueSample.m_fSoundIntensity = 80.0f;
 			break;
-		default: break;
+		default: return;
 		}
 		distSquared = GetDistanceSquared(&m_sQueueSample.m_vecPos);
 		if(distSquared < maxDist) {
@@ -4437,7 +4592,7 @@ cAudioManager::ProcessHomeScriptObject(uint8 sound)
 			maxDist = 6400.f;
 			m_sQueueSample.m_fSoundIntensity = 80.0f;
 			break;
-		default: break;
+		default: return;
 		}
 		dist = GetDistanceSquared(&m_sQueueSample.m_vecPos);
 		if(dist < maxDist) {
@@ -4591,7 +4746,6 @@ void
 cAudioManager::ProcessLaunderetteScriptObject(uint8 sound)
 {
 	float maxDist;
-	float distSquared;
 
 	switch(sound) {
 	case SCRIPT_SOUND_LAUNDERETTE_LOOP_S:
@@ -4599,9 +4753,9 @@ cAudioManager::ProcessLaunderetteScriptObject(uint8 sound)
 		maxDist = 900.f;
 		m_sQueueSample.m_fSoundIntensity = 30.0f;
 		break;
-	default: break;
+	default: return;
 	}
-	distSquared = GetDistanceSquared(&m_sQueueSample.m_vecPos);
+	float distSquared = GetDistanceSquared(&m_sQueueSample.m_vecPos);
 	if(distSquared < maxDist) {
 		m_sQueueSample.m_fDistance = sqrt(distSquared);
 		m_sQueueSample.m_bVolume = ComputeVolume(45u, m_sQueueSample.m_fSoundIntensity,
@@ -6855,7 +7009,7 @@ struct tVehicleSampleData {
 };
 
 int32 *CSWTCH_554 = (int32 *)0x606A50;
-tVehicleSampleData *vehicleSampleData = (tVehicleSampleData *)0x606204;
+tVehicleSampleData *CarSounds = (tVehicleSampleData *)0x606204;
 
 void
 cAudioManager::ProcessPlayersVehicleEngine(cVehicleParams *params, CAutomobile *automobile)
@@ -6947,7 +7101,7 @@ cAudioManager::ProcessPlayersVehicleEngine(cVehicleParams *params, CAutomobile *
 	} else {
 		freqModifier = 0;
 	}
-	engineSoundType = vehicleSampleData[params->m_nIndex].m_bEngineSoundType;
+	engineSoundType = CarSounds[params->m_nIndex].m_bEngineSoundType;
 	soundOffset = 3 * (engineSoundType - 1);
 	if(accelerateState <= 0) {
 		if(params->m_fVelocityChange < -0.001f) {
@@ -7163,7 +7317,7 @@ cAudioManager::ProcessPoliceCellBeatingScriptObject(uint8 sound)
 			maxDist = 6400.f;
 			m_sQueueSample.m_fSoundIntensity = 80.0f;
 			break;
-		default: break;
+		default: return;
 		}
 		distSquared = GetDistanceSquared(&m_sQueueSample.m_vecPos);
 		if(distSquared < maxDist) {
@@ -7261,7 +7415,7 @@ cAudioManager::ProcessPornCinema(uint8 sound)
 		m_sQueueSample.m_fSoundIntensity = 80.0f;
 		sample = AUDIO_SAMPLE_PORN_CINEMA_3_SEX_1;
 		break;
-	default: break;
+	default: return;
 	}
 	distSquared = GetDistanceSquared(&m_sQueueSample.m_vecPos);
 	if(distSquared < maxDist) {
@@ -7319,11 +7473,68 @@ cAudioManager::ProcessPornCinema(uint8 sound)
 	}
 }
 
-WRAPPER
 void
 cAudioManager::ProcessProjectiles()
 {
-	EAXJMP(0x578A80);
+	uint8 emittingVol;
+	float maxDist;
+
+	for(int32 i = 0; i < 32; i++) {
+		if(CProjectileInfo::GetProjectileInfo(i)->m_bInUse) {
+			switch(CProjectileInfo::GetProjectileInfo(i)->m_eWeaponType) {
+			case WEAPONTYPE_ROCKETLAUNCHER:
+				emittingVol = maxVolume;
+				maxDist = 8100.f;
+				m_sQueueSample.m_fSoundIntensity = 90.0;
+				m_sQueueSample.m_nSampleIndex = 81;
+				m_sQueueSample.m_bBankIndex = 0;
+				m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(
+				    AUDIO_SAMPLE_WEAPON_ROCKET_PROCESS);
+				m_sQueueSample.field_16 = 3;
+				break;
+			case WEAPONTYPE_MOLOTOV:
+				emittingVol = 50;
+				maxDist = 900.f;
+				m_sQueueSample.m_fSoundIntensity = 30.0;
+				m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_FIRE_PED;
+				m_sQueueSample.m_bBankIndex = 0;
+				m_sQueueSample.m_nFrequency =
+				    32 *
+				    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_FIRE_PED) /
+				    25;
+				m_sQueueSample.field_16 = 7;
+				break;
+			default: return;
+			}
+			m_sQueueSample.field_48 = 4.0;
+			m_sQueueSample.field_76 = 3;
+			m_sQueueSample.m_vecPos =
+			    CProjectileInfo::ms_apProjectile[i].GetPosition();
+			float distSquared = GetDistanceSquared(&m_sQueueSample.m_vecPos);
+			if(distSquared < maxDist) {
+				m_sQueueSample.m_fDistance = Sqrt(distSquared);
+				m_sQueueSample.m_bVolume =
+				    ComputeVolume(emittingVol, m_sQueueSample.m_fSoundIntensity,
+				                  m_sQueueSample.m_fDistance);
+				if(m_sQueueSample.m_bVolume) {
+					m_sQueueSample.m_counter = i;
+					m_sQueueSample.m_bIsDistant = 0;
+					m_sQueueSample.m_nLoopCount = 0;
+					m_sQueueSample.m_bEmittingVolume = emittingVol;
+					m_sQueueSample.m_nLoopStart =
+					    SampleManager.GetSampleLoopStartOffset(
+					        m_sQueueSample.m_nSampleIndex);
+					m_sQueueSample.m_nLoopEnd =
+					    SampleManager.GetSampleLoopEndOffset(
+					        m_sQueueSample.m_nSampleIndex);
+					m_sQueueSample.field_56 = 0;
+					m_sQueueSample.m_bReverbFlag = 1;
+					m_sQueueSample.m_bRequireReflection = 0;
+					AddSampleToRequestedQueue();
+				}
+			}
+		}
+	}
 }
 
 void
@@ -7447,7 +7658,7 @@ cAudioManager::ProcessSawMillScriptObject(uint8 sound)
 		maxDist = 900.f;
 		m_sQueueSample.m_fSoundIntensity = 30.0f;
 		break;
-	default: break;
+	default: return;
 	}
 	distSquared = GetDistanceSquared(&m_sQueueSample.m_vecPos);
 	if(distSquared < maxDist) {
@@ -7527,7 +7738,7 @@ cAudioManager::ProcessShopScriptObject(uint8 sound)
 		maxDist = 900.f;
 		m_sQueueSample.m_fSoundIntensity = 30.0f;
 		break;
-	default: break;
+	default: return;
 	}
 	distSquared = GetDistanceSquared(&m_sQueueSample.m_vecPos);
 	if(distSquared < maxDist) {
@@ -7676,21 +7887,101 @@ cAudioManager::ProcessTrainNoise(cVehicleParams *params)
 	return 1;
 }
 
-#if 1
-WRAPPER
-void
-cAudioManager::ProcessVehicle(CVehicle *)
-{
-	EAXJMP(0x569A00);
-}
 
-#else
 void
-cAudioManager::ProcessVehicle(CVehicle *)
+cAudioManager::ProcessVehicle(CVehicle *veh)
 {
-	EAXJMP(0x569A00);
+	tHandlingData *handling = veh->pHandling;
+	float velChange;
+	cVehicleParams params;
+	m_sQueueSample.m_vecPos = veh->GetPosition();
+
+	params.m_bDistancECalculated = 0;
+	params.m_fDistance = GetDistanceSquared(&m_sQueueSample.m_vecPos);
+	params.m_pVehicle = veh;
+	params.m_pTransmission = nil;
+	params.m_nIndex = 0;
+	params.m_fVelocityChange = 0.0;
+
+	if(handling) params.m_pTransmission = &handling->Transmission;
+
+	params.m_nIndex = veh->m_modelIndex - 90;
+	if(params.m_pVehicle->m_status == STATUS_SIMPLE)
+		velChange = params.m_pVehicle->AutoPilot.m_fMaxTrafficSpeed * 0.02f;
+	else
+		velChange =
+		    DotProduct(params.m_pVehicle->m_vecMoveSpeed, params.m_pVehicle->GetForward());
+	params.m_fVelocityChange = velChange;
+	switch(params.m_pVehicle->m_vehType) {
+	case VEHICLE_TYPE_AUTOMOBILE:
+		UpdateGasPedalAudio((CAutomobile *)veh);
+		if(params.m_nIndex == RCBANDIT) {
+			ProcessModelCarEngine(&params);
+			ProcessVehicleOneShots(&params);
+				((CAutomobile *)veh)->m_fVelocityChangeForAudio =
+				    params.m_fVelocityChange;
+			ProcessRainOnVehicle(&params);
+			break;
+		}
+		if(params.m_nIndex == DODO) {
+			if(!ProcessVehicleRoadNoise(&params)) {
+				ProcessVehicleOneShots(&params);
+				((CAutomobile *)veh)->m_fVelocityChangeForAudio =
+				    params.m_fVelocityChange;
+				ProcessRainOnVehicle(&params);
+				break;
+			}
+			if(CWeather::WetRoads > 0.f) ProcessWetRoadNoise(&params);
+			ProcessVehicleSkidding(&params);
+		} else {
+			if(!ProcessVehicleRoadNoise(&params)) {
+				ProcessVehicleOneShots(&params);
+				((CAutomobile *)veh)->m_fVelocityChangeForAudio =
+				    params.m_fVelocityChange;
+				ProcessRainOnVehicle(&params);
+				break;
+			}
+			ProcessReverseGear(&params);
+			if(CWeather::WetRoads > 0.f) ProcessWetRoadNoise(&params);
+			ProcessVehicleSkidding(&params);
+			ProcessVehicleHorn(&params);
+			ProcessVehicleSirenOrAlarm(&params);
+			if(UsesReverseWarning(params.m_nIndex))
+				ProcessVehicleReverseWarning(&params);
+			if(HasAirBrakes(params.m_nIndex)) ProcessAirBrakes(&params);
+		}
+		ProcessCarBombTick(&params);
+		ProcessVehicleEngine(&params);
+		ProcessEngineDamage(&params);
+		ProcessVehicleDoors(&params);
+		ProcessVehicleOneShots(&params);
+		((CAutomobile *)veh)->m_fVelocityChangeForAudio = params.m_fVelocityChange;
+		ProcessRainOnVehicle(&params);
+		break;
+	case VEHICLE_TYPE_BOAT:
+		ProcessBoatEngine(&params);
+		ProcessBoatMovingOverWater(&params);
+		ProcessVehicleOneShots(&params);
+		ProcessRainOnVehicle(&params);
+		break;
+	case VEHICLE_TYPE_TRAIN:
+		ProcessTrainNoise(&params);
+		ProcessVehicleOneShots(&params);
+		ProcessRainOnVehicle(&params);
+		break;
+	case VEHICLE_TYPE_HELI:
+		ProcessHelicopter(&params);
+		ProcessVehicleOneShots(&params);
+		ProcessRainOnVehicle(&params);
+		break;
+	case VEHICLE_TYPE_PLANE:
+		ProcessPlane(&params);
+		ProcessVehicleOneShots(&params);
+		ProcessRainOnVehicle(&params);
+		break;
+	default: ProcessRainOnVehicle(&params); break;
+	}
 }
-#endif
 
 bool
 cAudioManager::ProcessVehicleDoors(cVehicleParams *params)
@@ -7740,7 +8031,103 @@ cAudioManager::ProcessVehicleDoors(cVehicleParams *params)
 			}
 		}
 	}
-	return 1;
+    return 1;
+}
+
+WRAPPER
+bool cAudioManager::ProcessVehicleEngine(cVehicleParams *params)
+{
+	EAXJMP(0x56A610);
+}
+
+void
+cAudioManager::ProcessVehicleHorn(cVehicleParams *params)
+{
+	CAutomobile *automobile;
+
+	if(params->m_fDistance < 1600.f) {
+		automobile = (CAutomobile *)params->m_pVehicle;
+		if((!automobile->m_bSirenOrAlarm || !UsesSirenSwitching(params->m_nIndex)) &&
+		   automobile->m_modelIndex != MI_MRWHOOP) {
+			if(automobile->m_nCarHornTimer) {
+				if(!params->m_pVehicle->m_status) {
+					CalculateDistance((bool *)params, params->m_fDistance);
+					m_sQueueSample.m_bVolume =
+					    ComputeVolume(80, 40.f, m_sQueueSample.m_fDistance);
+					if(m_sQueueSample.m_bVolume) {
+						m_sQueueSample.m_counter = 4;
+						m_sQueueSample.m_nSampleIndex =
+						    CarSounds[params->m_nIndex].m_nHornSample;
+						m_sQueueSample.m_bBankIndex = 0;
+						m_sQueueSample.m_bIsDistant = 0;
+						m_sQueueSample.field_16 = 2;
+						m_sQueueSample.m_nFrequency =
+						    CarSounds[params->m_nIndex].m_nHornFrequency;
+						m_sQueueSample.m_nLoopCount = 0;
+						m_sQueueSample.m_bEmittingVolume = 80;
+						m_sQueueSample.m_nLoopStart =
+						    SampleManager.GetSampleLoopStartOffset(
+						        m_sQueueSample.m_nSampleIndex);
+						m_sQueueSample.m_nLoopEnd =
+						    SampleManager.GetSampleLoopEndOffset(
+						        m_sQueueSample.m_nSampleIndex);
+						m_sQueueSample.field_48 = 5.0;
+						m_sQueueSample.m_fSoundIntensity = 40.0;
+						m_sQueueSample.field_56 = 0;
+						m_sQueueSample.field_76 = 3;
+						m_sQueueSample.m_bReverbFlag = 1;
+						m_sQueueSample.m_bRequireReflection = 0;
+						AddSampleToRequestedQueue();
+					}
+					return;
+				}
+				if(automobile->m_nCarHornTimer > 44)
+					automobile->m_nCarHornTimer = 44;
+				if(automobile->m_nCarHornTimer == 44)
+					automobile->field_22D =
+					    (LOBYTE(m_nTimeOfRecentCrime) +
+					     LOBYTE(m_sQueueSample.m_nEntityIndex)) &
+					    7;
+				if(somethingWithHorns[44 * automobile->field_22D + 44 -
+				                      automobile->m_nCarHornTimer]) {
+					CalculateDistance((bool *)params, params->m_fDistance);
+					m_sQueueSample.m_bVolume =
+					    ComputeVolume(80, 40.f, m_sQueueSample.m_fDistance);
+					if(m_sQueueSample.m_bVolume) {
+						m_sQueueSample.m_counter = 4;
+						m_sQueueSample.m_nSampleIndex =
+						    CarSounds[params->m_nIndex].m_nHornSample;
+						m_sQueueSample.m_bBankIndex = 0;
+						m_sQueueSample.m_bIsDistant = 0;
+						m_sQueueSample.field_16 = 2;
+						m_sQueueSample.m_nFrequency =
+						    CarSounds[params->m_nIndex].m_nHornFrequency;
+						m_sQueueSample.m_nLoopCount = 0;
+						m_sQueueSample.m_bEmittingVolume = 80;
+						m_sQueueSample.m_nLoopStart =
+						    SampleManager.GetSampleLoopStartOffset(
+						        m_sQueueSample.m_nSampleIndex);
+						m_sQueueSample.m_nLoopEnd =
+						    SampleManager.GetSampleLoopEndOffset(
+						        m_sQueueSample.m_nSampleIndex);
+						m_sQueueSample.field_48 = 5.0;
+						m_sQueueSample.m_fSoundIntensity = 40.0;
+						m_sQueueSample.field_56 = 0;
+						m_sQueueSample.field_76 = 3;
+						m_sQueueSample.m_bReverbFlag = 1;
+						m_sQueueSample.m_bRequireReflection = 0;
+						AddSampleToRequestedQueue();
+					}
+				}
+			}
+		}
+	}
+}
+
+WRAPPER
+void cAudioManager::ProcessVehicleOneShots(void*)
+{
+	EAXJMP(0x56CD40);
 }
 
 bool
@@ -7845,13 +8232,18 @@ cAudioManager::ProcessVehicleRoadNoise(cVehicleParams *params)
 	return 1;
 }
 
+WRAPPER
+void cAudioManager::ProcessVehicleSirenOrAlarm(void*)
+{
+	EAXJMP(0x56C420);
+}
+
 void
 cAudioManager::ProcessVehicleSkidding(cVehicleParams *params)
 {
-
 	CAutomobile *automobile;
 	cTransmission *transmission;
-	signed int emittingVol;
+	int32 emittingVol;
 	float newSkidVal = 0.f;
 	float skidVal = 0.f;
 
@@ -7946,8 +8338,45 @@ cAudioManager::ProcessVehicleSkidding(cVehicleParams *params)
 	}
 }
 
-WRAPPER
-void cAudioManager::ProcessWaterCannon(int32) { EAXJMP(0x575F30); }
+void cAudioManager::ProcessWaterCannon(int32)
+{
+	for(int32 i = 0; i < 3u; i++) {
+		if(aCannons[i].m_nId) {
+			m_sQueueSample.m_vecPos = aCannons[0].m_avecPos[aCannons[i].m_wIndex];
+			float distSquared = GetDistanceSquared(&m_sQueueSample.m_vecPos);
+			if(distSquared < 900.f) {
+				m_sQueueSample.m_fDistance = Sqrt(distSquared);
+				m_sQueueSample.m_bVolume =
+				    ComputeVolume(50, m_sQueueSample.m_fSoundIntensity,
+				                  m_sQueueSample.m_fDistance);
+				if(m_sQueueSample.m_bVolume) {
+					m_sQueueSample.m_fSoundIntensity = 900.0f;
+					m_sQueueSample.m_nSampleIndex =
+					    AUDIO_SAMPLE_JUMBO_TAXI_SOUND;
+					m_sQueueSample.m_bBankIndex = 0;
+					m_sQueueSample.m_nFrequency = 15591;
+					m_sQueueSample.field_16 = 5;
+					m_sQueueSample.m_counter = i;
+					m_sQueueSample.field_48 = 2.0f;
+					m_sQueueSample.field_76 = 8;
+					m_sQueueSample.m_bIsDistant = 0;
+					m_sQueueSample.m_nLoopCount = 0;
+					m_sQueueSample.field_56 = 0;
+					m_sQueueSample.m_bEmittingVolume = 50;
+					m_sQueueSample.m_nLoopStart =
+					    SampleManager.GetSampleLoopStartOffset(
+					        m_sQueueSample.m_nSampleIndex);
+					m_sQueueSample.m_nLoopEnd =
+					    SampleManager.GetSampleLoopEndOffset(
+					        m_sQueueSample.m_nSampleIndex);
+					m_sQueueSample.m_bReverbFlag = 1;
+					m_sQueueSample.m_bRequireReflection = 0;
+					AddSampleToRequestedQueue();
+				}
+			}
+		}
+	}
+}
 
 void
 cAudioManager::ProcessWeather(int32 id)
@@ -8074,7 +8503,7 @@ cAudioManager::ProcessWorkShopScriptObject(uint8 sound)
 		maxDist = 400.f;
 		m_sQueueSample.m_fSoundIntensity = 20.0f;
 		break;
-	default: break;
+	default: return;
 	}
 	distSquared = GetDistanceSquared(&m_sQueueSample.m_vecPos);
 	if(distSquared < maxDist) {
@@ -8634,6 +9063,25 @@ cAudioManager::SetUpLoopingCollisionSound(cAudioCollision *col, uint8 counter)
 void
 cAudioManager::SetUpOneShotCollisionSound(cAudioCollision *col)
 {
+	static constexpr int32 gOneShotCol[] = {
+	    AUDIO_SAMPLE_COLLISION_PAVEMENT,   AUDIO_SAMPLE_COLLISION_PAVEMENT,
+	    AUDIO_SAMPLE_COLLISION_MUFFLED,    AUDIO_SAMPLE_COLLISION_DIRT,
+	    AUDIO_SAMPLE_COLLISION_MUD,        AUDIO_SAMPLE_COLLISION_PAVEMENT,
+	    AUDIO_SAMPLE_COLLISION_METAL,      AUDIO_SAMPLE_COLLISION_MUFFLED,
+	    AUDIO_SAMPLE_COLLISION_HARD,       AUDIO_SAMPLE_COLLISION_METAL_DOOR,
+	    AUDIO_SAMPLE_CAR_DOOR_MOVEMENT_1,  AUDIO_SAMPLE_COLLISION_METAL_11,
+	    AUDIO_SAMPLE_COLLISION_HARD,       AUDIO_SAMPLE_COLLISION_METAL_13,
+	    AUDIO_SAMPLE_COLLISION_METAL_14,   AUDIO_SAMPLE_COLLISION_METAL_14,
+	    AUDIO_SAMPLE_COLLISION_FENCE,      AUDIO_SAMPLE_COLLISION_FLESH,
+	    AUDIO_SAMPLE_COLLISION_SAND,       AUDIO_SAMPLE_COLLISION_WATER,
+	    AUDIO_SAMPLE_COLLISION_WOOD,       AUDIO_SAMPLE_COLLISION_WOOD_BOX,
+	    AUDIO_SAMPLE_COLLISION_WOOD_PLANK, AUDIO_SAMPLE_COLLISION_MUFFLED,
+	    AUDIO_SAMPLE_COLLISION_MUFFLED,    AUDIO_SAMPLE_COLLISION_HEDGE,
+	    AUDIO_SAMPLE_COLLISION_PAVEMENT,   AUDIO_SAMPLE_COLLISION_METAL_27,
+	    AUDIO_SAMPLE_COLLISION_METAL_28,   AUDIO_SAMPLE_COLLISION_RUBBER,
+	    AUDIO_SAMPLE_COLLISION_LOOSE,      AUDIO_SAMPLE_COLLISION_PAVEMENT,
+	    AUDIO_SAMPLE_COLLISION_GATE};
+
 	int16 s1;
 	int16 s2;
 
@@ -9151,6 +9599,7 @@ InjectHook(0x57C160, &cAudioManager::ClearActiveSamples, PATCH_JUMP);
 InjectHook(0x5796A0, &cAudioManager::ClearMissionAudio, PATCH_JUMP);
 InjectHook(0x57C120, &cAudioManager::ClearRequestedQueue, PATCH_JUMP);
 InjectHook(0x57AE00, &cAudioManager::ComputeDopplerEffectedFrequency, PATCH_JUMP);
+InjectHook(0x57AD20, &cAudioManager::ComputePan, PATCH_JUMP);
 InjectHook(0x57ABB0, &cAudioManager::ComputeVolume, PATCH_JUMP);
 InjectHook(0x57A310, &cAudioManager::CreateEntity, PATCH_JUMP);
 InjectHook(0x57A830, &cAudioManager::DestroyAllGameCreatedEntities, PATCH_JUMP);
@@ -9248,7 +9697,7 @@ InjectHook(0x5719E0, &cAudioManager::GetYardieTalkSfx, PATCH_JUMP);
 InjectHook(0x56CAB0, &cAudioManager::HasAirBrakes, PATCH_JUMP);
 InjectHook(0x57A0E0, &cAudioManager::Initialise, PATCH_JUMP);
 InjectHook(0x57EEC0, &cAudioManager::InitialisePoliceRadio, PATCH_JUMP);
-// InjectHook(0x57EAC0, &cAudioManager::InitialisePoliceRadioZones, PATCH_JUMP);
+InjectHook(0x57EAC0, &cAudioManager::InitialisePoliceRadioZones, PATCH_JUMP);
 InjectHook(0x57B030, &cAudioManager::InterrogateAudioEntities, PATCH_JUMP);
 InjectHook(0x57AA50, &cAudioManager::IsAudioInitialised, PATCH_JUMP);
 InjectHook(0x579650, &cAudioManager::IsMissionAudioSampleFinished, PATCH_JUMP);
@@ -9257,6 +9706,7 @@ InjectHook(0x579520, &cAudioManager::MissionScriptAudioUsesPoliceChannel, PATCH_
 InjectHook(0x56AD10, &cAudioManager::PlayerJustGotInCar, PATCH_JUMP);
 InjectHook(0x56AD20, &cAudioManager::PlayerJustLeftCar, PATCH_JUMP);
 InjectHook(0x579620, &cAudioManager::PlayLoadedMissionAudio, PATCH_JUMP);
+//InjectHook(0x57A500, &cAudioManager::PlayOneShot, PATCH_JUMP);
 InjectHook(0x569420, &cAudioManager::PostInitialiseGameSpecificSetup, PATCH_JUMP);
 InjectHook(0x569640, &cAudioManager::PostTerminateGameSpecificShutdown, PATCH_JUMP);
 InjectHook(0x569400, &cAudioManager::PreInitialiseGameSpecificSetup, PATCH_JUMP);
@@ -9300,6 +9750,7 @@ InjectHook(0x56E860, &cAudioManager::ProcessPlane, PATCH_JUMP);
 InjectHook(0x56B0D0, &cAudioManager::ProcessPlayersVehicleEngine, PATCH_JUMP);
 InjectHook(0x578190, &cAudioManager::ProcessPoliceCellBeatingScriptObject, PATCH_JUMP);
 InjectHook(0x577280, &cAudioManager::ProcessPornCinema, PATCH_JUMP);
+InjectHook(0x578A80, &cAudioManager::ProcessProjectiles, PATCH_JUMP);
 InjectHook(0x569CC0, &cAudioManager::ProcessRainOnVehicle, PATCH_JUMP);
 InjectHook(0x569700, &cAudioManager::ProcessReverb, PATCH_JUMP);
 InjectHook(0x569E50, &cAudioManager::ProcessReverseGear, PATCH_JUMP);
@@ -9308,10 +9759,13 @@ InjectHook(0x576070, &cAudioManager::ProcessScriptObject, PATCH_JUMP);
 InjectHook(0x577970, &cAudioManager::ProcessShopScriptObject, PATCH_JUMP);
 InjectHook(0x5697D0, &cAudioManager::ProcessSpecial, PATCH_JUMP);
 InjectHook(0x56DBF0, &cAudioManager::ProcessTrainNoise, PATCH_JUMP);
+InjectHook(0x569A00, &cAudioManager::ProcessVehicle, PATCH_JUMP);
 InjectHook(0x56C770, &cAudioManager::ProcessVehicleDoors, PATCH_JUMP);
+InjectHook(0x56C200, &cAudioManager::ProcessVehicleHorn, PATCH_JUMP);
 InjectHook(0x56C640, &cAudioManager::ProcessVehicleReverseWarning, PATCH_JUMP);
 InjectHook(0x56A230, &cAudioManager::ProcessVehicleRoadNoise, PATCH_JUMP);
 InjectHook(0x56BCB0, &cAudioManager::ProcessVehicleSkidding, PATCH_JUMP);
+InjectHook(0x575F30, &cAudioManager::ProcessWaterCannon, PATCH_JUMP);
 InjectHook(0x578370, &cAudioManager::ProcessWeather, PATCH_JUMP);
 InjectHook(0x56A440, &cAudioManager::ProcessWetRoadNoise, PATCH_JUMP);
 InjectHook(0x577530, &cAudioManager::ProcessWorkShopScriptObject, PATCH_JUMP);
diff --git a/src/audio/AudioManager.h b/src/audio/AudioManager.h
index 35c6f257..0a21f92a 100644
--- a/src/audio/AudioManager.h
+++ b/src/audio/AudioManager.h
@@ -323,7 +323,7 @@ public:
 	void ClearRequestedQueue();                    /// ok
 	int32 ComputeDopplerEffectedFrequency(uint32 oldFreq, float position1, float position2,
 	                                      float speedMultiplier) const; /// ok
-	int32 ComputePan(float, CVector *);                                 // todo
+	int32 ComputePan(float, CVector *);                                 /// ok
 	uint32 ComputeVolume(int emittingVolume, float soundIntensity, float distance) const; /// ok
 	int32 CreateEntity(int32 type, CPhysical *entity);                                    /// ok
 
@@ -437,7 +437,7 @@ public:
 
 	void Initialise();                   /// ok
 	void InitialisePoliceRadio();        /// ok
-	void InitialisePoliceRadioZones();   // todo
+	void InitialisePoliceRadioZones();   /// ok
 	void InterrogateAudioEntities();     /// ok
 	bool IsAudioInitialised() const;     /// ok
 	bool IsMissionAudioSampleFinished(); /// ok
@@ -446,13 +446,13 @@ public:
 	bool MissionScriptAudioUsesPoliceChannel(int32 soundMission) const; /// ok
 
 	void PlayLoadedMissionAudio();                         /// ok
-	void PlayOneShot(int32 index, int16 sound, float vol); // todo
+	void PlayOneShot(int32 index, int16 sound, float vol); // to do (need testing)
 	uint32 PlaySuspectLastSeen(float x, float y, float z); // todo
 	void PlayerJustGotInCar() const;                       /// ok
 	void PlayerJustLeftCar() const;                        /// ok
 	void PostInitialiseGameSpecificSetup();                /// ok
 	void PostTerminateGameSpecificShutdown();              /// ok
-	void PreInitialiseGameSpecificSetup() const;
+	void PreInitialiseGameSpecificSetup() const; //ok
 	void PreloadMissionAudio(char *);        // todo
 	void PreTerminateGameSpecificShutdown(); /// ok
 	/// processX - main logic of adding new sounds
@@ -497,10 +497,10 @@ public:
 	void ProcessPhysical(int32 id);                          /// ok
 	void ProcessPlane(cVehicleParams *params);               /// ok
 	void ProcessPlayersVehicleEngine(cVehicleParams *params,
-	                                 CAutomobile *automobile); /// ok (check float comparisons)
+	                                 CAutomobile *automobile); /// ok
 	void ProcessPoliceCellBeatingScriptObject(uint8 sound);    /// ok
 	void ProcessPornCinema(uint8 sound);                       /// ok
-	void ProcessProjectiles();                                 // todo requires CProjectileInfo
+	void ProcessProjectiles();                                 /// ok
 	void ProcessRainOnVehicle(cVehicleParams *params);         /// ok
 	void ProcessReverb() const;                                /// ok
 	bool ProcessReverseGear(cVehicleParams *a2);               /// ok
@@ -509,16 +509,16 @@ public:
 	void ProcessShopScriptObject(uint8 sound);                 /// ok
 	void ProcessSpecial();                                     /// ok
 	bool ProcessTrainNoise(cVehicleParams *params);            /// ok
-	void ProcessVehicle(CVehicle *);                           // todo
+	void ProcessVehicle(CVehicle *vehicle);                    /// ok
 	bool ProcessVehicleDoors(cVehicleParams *params);          /// ok
-	bool ProcessVehicleEngine(void *);                         // todo
-	void ProcessVehicleHorn(cVehicleParams *params);           // todo
+	bool ProcessVehicleEngine(cVehicleParams *params);         // todo
+	void ProcessVehicleHorn(cVehicleParams *params);           /// ok
 	void ProcessVehicleOneShots(void *);                       // todo
 	bool ProcessVehicleReverseWarning(cVehicleParams *params); /// ok
 	bool ProcessVehicleRoadNoise(cVehicleParams *params);      /// ok
 	void ProcessVehicleSirenOrAlarm(void *);                   // todo
 	void ProcessVehicleSkidding(cVehicleParams *params);       /// ok
-	void ProcessWaterCannon(int32);                            // todo
+	void ProcessWaterCannon(int32);                            /// ok
 	void ProcessWeather(int32 id);                             /// ok
 	bool ProcessWetRoadNoise(cVehicleParams *params);          /// ok
 	void ProcessWorkShopScriptObject(uint8 sound);             /// ok
@@ -543,8 +543,7 @@ public:
 	void SetEffectsFadeVolume(uint8 volume) const;
 	void SetEffectsMasterVolume(uint8 volume) const;
 	void SetEntityStatus(int32 id, bool status);
-	uint32
-	SetLoopingCollisionRequestedSfxFreqAndGetVol(cAudioCollision *audioCollision); /// ok
+	uint32 SetLoopingCollisionRequestedSfxFreqAndGetVol(cAudioCollision *audioCollision); /// ok
 	void SetMissionAudioLocation(float x, float y, float z);
 	void SetMissionScriptPoliceAudio(int32 sfx) const;
 	void SetMonoMode(uint8); // todo (mobile)
diff --git a/src/core/AnimViewer.cpp b/src/core/AnimViewer.cpp
index 86b22ec5..84de3fe8 100644
--- a/src/core/AnimViewer.cpp
+++ b/src/core/AnimViewer.cpp
@@ -255,7 +255,7 @@ CAnimViewer::Update(void)
 			if (modelInfo->m_type == MITYPE_VEHICLE) {
 
 				CVehicleModelInfo* veh = (CVehicleModelInfo*)modelInfo;
-				if (veh->m_vehicleType != VEHICLE_TYPE_CAR) {
+				if (veh->m_vehicleType != VEHICLE_TYPE_AUTOMOBILE) {
 					// Not ready yet
 /*					if (veh->m_vehicleType == VEHICLE_TYPE_BOAT)
 					{
diff --git a/src/core/FileLoader.cpp b/src/core/FileLoader.cpp
index 6f3b0971..f7b69dea 100644
--- a/src/core/FileLoader.cpp
+++ b/src/core/FileLoader.cpp
@@ -738,7 +738,7 @@ CFileLoader::LoadVehicleObject(const char *line)
 	if(strncmp(type, "car", 4) == 0){
 		mi->m_wheelId = misc;
 		mi->m_wheelScale = wheelScale;
-		mi->m_vehicleType = VEHICLE_TYPE_CAR;
+		mi->m_vehicleType = VEHICLE_TYPE_AUTOMOBILE;
 	}else if(strncmp(type, "boat", 5) == 0){
 		mi->m_vehicleType = VEHICLE_TYPE_BOAT;
 	}else if(strncmp(type, "train", 6) == 0){
diff --git a/src/core/Lists.h b/src/core/Lists.h
index 7572e882..ecf24740 100644
--- a/src/core/Lists.h
+++ b/src/core/Lists.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "common.h"
+
 class CPtrNode
 {
 public:
diff --git a/src/core/World.cpp b/src/core/World.cpp
index 5dea09bd..46d36348 100644
--- a/src/core/World.cpp
+++ b/src/core/World.cpp
@@ -793,7 +793,7 @@ CWorld::TestSphereAgainstSectorList(CPtrList &list, CVector spherePos, float rad
 						*eCol, &ms_testSpherePoint, nil, nil);
 
 					if (collidedSpheres != 0 ||
-						(e->IsVehicle() && ((CVehicle*)e)->m_vehType == VEHICLE_TYPE_CAR &&
+						(e->IsVehicle() && ((CVehicle*)e)->m_vehType == VEHICLE_TYPE_AUTOMOBILE &&
 						e->m_modelIndex != MI_DODO && radius + eCol->boundingBox.max.x > distance)) {
 						return e;
 					}
diff --git a/src/core/main.cpp b/src/core/main.cpp
index 8985d56a..3c9556d4 100644
--- a/src/core/main.cpp
+++ b/src/core/main.cpp
@@ -339,7 +339,7 @@ void
 RenderEffects(void)
 {
 	CGlass::Render();
-	CWaterCannons::Render();
+	CWaterCannon::Render();
 	CSpecialFX::Render();
 	CShadows::RenderStaticShadows();
 	CShadows::RenderStoredShadows();
diff --git a/src/entities/Physical.cpp b/src/entities/Physical.cpp
index fbd1322d..98b86fe3 100644
--- a/src/entities/Physical.cpp
+++ b/src/entities/Physical.cpp
@@ -1897,7 +1897,7 @@ CPhysical::ProcessCollision(void)
 		CTimer::SetTimeStep(savedTimeStep);
 		if(IsVehicle()){
 			CVehicle *veh = (CVehicle*)this;
-			if(veh->m_vehType == VEHICLE_TYPE_CAR){
+			if(veh->m_vehType == VEHICLE_TYPE_AUTOMOBILE){
 				CAutomobile *car = (CAutomobile*)this;
 				car->m_aSuspensionSpringRatio[0] = 1.0f;
 				car->m_aSuspensionSpringRatio[1] = 1.0f;
diff --git a/src/modelinfo/VehicleModelInfo.h b/src/modelinfo/VehicleModelInfo.h
index 1a6d6a55..4d18ba21 100644
--- a/src/modelinfo/VehicleModelInfo.h
+++ b/src/modelinfo/VehicleModelInfo.h
@@ -26,7 +26,7 @@ enum {
 };
 
 enum eVehicleType {
-	VEHICLE_TYPE_CAR,
+	VEHICLE_TYPE_AUTOMOBILE,
 	VEHICLE_TYPE_BOAT,
 	VEHICLE_TYPE_TRAIN,
 	VEHICLE_TYPE_HELI,
diff --git a/src/peds/Ped.cpp b/src/peds/Ped.cpp
index 11141b04..f5cec4f4 100644
--- a/src/peds/Ped.cpp
+++ b/src/peds/Ped.cpp
@@ -4388,7 +4388,7 @@ CPed::SetEvasiveStep(CEntity *reason, uint8 animType)
 		neededTurn = 2 * PI - neededTurn;
 
 	CVehicle *veh = (CVehicle*)reason;
-	if (reason->IsVehicle() && veh->m_vehType == VEHICLE_TYPE_CAR) {
+	if (reason->IsVehicle() && veh->m_vehType == VEHICLE_TYPE_AUTOMOBILE) {
 		if (veh->m_nCarHornTimer) {
 			vehPressedHorn = true;
 			if (!IsPlayer())
@@ -4456,7 +4456,7 @@ CPed::SetEvasiveDive(CPhysical *reason, uint8 onlyRandomJump)
 
 	angleToFace = m_fRotationCur;
 	CVehicle *veh = (CVehicle*) reason;
-	if (reason->IsVehicle() && veh->m_vehType == VEHICLE_TYPE_CAR && veh->m_nCarHornTimer && !IsPlayer()) {
+	if (reason->IsVehicle() && veh->m_vehType == VEHICLE_TYPE_AUTOMOBILE && veh->m_nCarHornTimer && !IsPlayer()) {
 		onlyRandomJump = true;
 	}
 
@@ -7245,7 +7245,7 @@ CPed::Seek(void)
 									false, true, false, false, false, false);
 
 				if (obstacle) {
-					if (!obstacle->IsVehicle() || ((CVehicle*)obstacle)->m_vehType == VEHICLE_TYPE_CAR) {
+					if (!obstacle->IsVehicle() || ((CVehicle*)obstacle)->m_vehType == VEHICLE_TYPE_AUTOMOBILE) {
 						distanceToCountItDone = 2.5f;
 					} else {
 						CVehicleModelInfo *vehModel = (CVehicleModelInfo*) CModelInfo::GetModelInfo(obstacle->m_modelIndex);
@@ -8481,7 +8481,7 @@ CPed::KillPedWithCar(CVehicle *car, float impulse)
 					if (damageDir > 3)
 						damageDir = damageDir - 4;
 
-					if (car->m_vehType == VEHICLE_TYPE_CAR) {
+					if (car->m_vehType == VEHICLE_TYPE_AUTOMOBILE) {
 						CObject *bonnet = ((CAutomobile*)car)->RemoveBonnetInPedCollision();
 
 						if (bonnet) {
diff --git a/src/render/WaterCannon.cpp b/src/render/WaterCannon.cpp
index 7f44116b..9763138e 100644
--- a/src/render/WaterCannon.cpp
+++ b/src/render/WaterCannon.cpp
@@ -2,6 +2,8 @@
 #include "patcher.h"
 #include "WaterCannon.h"
 
+extern CWaterCannon* aCannons = (CWaterCannon*)0x8F2CA8;
+
 WRAPPER void CWaterCannons::Update(void) { EAXJMP(0x522510); }
-WRAPPER void CWaterCannons::UpdateOne(uint32 id, CVector *pos, CVector *dir) { EAXJMP(0x522470); }
-WRAPPER void CWaterCannons::Render(void) { EAXJMP(0x522550); }
+WRAPPER void CWaterCannon::UpdateOne(uint32 id, CVector *pos, CVector *dir) { EAXJMP(0x522470); }
+WRAPPER void CWaterCannon::Render(void) { EAXJMP(0x522550); }
diff --git a/src/render/WaterCannon.h b/src/render/WaterCannon.h
index de9d0344..1b2dcee3 100644
--- a/src/render/WaterCannon.h
+++ b/src/render/WaterCannon.h
@@ -1,9 +1,21 @@
 #pragma once
 
-class CWaterCannons
+class CWaterCannon
 {
 public:
+	int32 m_nId;
+	int16 m_wIndex;
+	char gap_6[2];
+	int32 m_nTimeCreated;
+	CVector m_avecPos[16];
+	CVector m_avecVelocity[16];
+	char m_abUsed[16];
+
 	static void Update(void);
 	static void UpdateOne(uint32 id, CVector *pos, CVector *dir);
 	static void Render(void);
 };
+
+static_assert(sizeof(CWaterCannon) == 412, "CWaterCannon: error");
+
+extern CWaterCannon* aCannons;
diff --git a/src/vehicles/Automobile.cpp b/src/vehicles/Automobile.cpp
index 12c9c940..ab213beb 100644
--- a/src/vehicles/Automobile.cpp
+++ b/src/vehicles/Automobile.cpp
@@ -55,7 +55,7 @@ CAutomobile::CAutomobile(int32 id, uint8 CreatedBy)
 {
 	int i;
 
-	m_vehType = VEHICLE_TYPE_CAR;
+	m_vehType = VEHICLE_TYPE_AUTOMOBILE;
 
 	CVehicleModelInfo *mi = (CVehicleModelInfo*)CModelInfo::GetModelInfo(id);
 	m_fFireBlowUpTimer = 0.0f;
@@ -2350,7 +2350,7 @@ CAutomobile::FireTruckControl(void)
 			Sin(m_fCarGunUD));
 		cannonDir = Multiply3x3(GetMatrix(), cannonDir);
 		cannonDir.z += (CGeneral::GetRandomNumber()&0xF)/1000.0f;
-		CWaterCannons::UpdateOne((uintptr)this, &cannonPos, &cannonDir);
+		CWaterCannon::UpdateOne((uintptr)this, &cannonPos, &cannonDir);
 	}else if(m_status == STATUS_PHYSICS){
 		CFire *fire = gFireManager.FindFurthestFire_NeverMindFireMen(GetPosition(), 10.0f, 35.0f);
 		if(fire == nil)
@@ -2385,7 +2385,7 @@ CAutomobile::FireTruckControl(void)
 				Sin(m_fCarGunUD));
 			cannonDir = Multiply3x3(GetMatrix(), cannonDir);
 			cannonDir.z += (CGeneral::GetRandomNumber()&0xF)/1000.0f;
-			CWaterCannons::UpdateOne((uintptr)this, &cannonPos, &cannonDir);
+			CWaterCannon::UpdateOne((uintptr)this, &cannonPos, &cannonDir);
 		}
 	}
 }
diff --git a/src/vehicles/Vehicle.h b/src/vehicles/Vehicle.h
index a30f9842..5c5b328e 100644
--- a/src/vehicles/Vehicle.h
+++ b/src/vehicles/Vehicle.h
@@ -191,7 +191,7 @@ public:
 	uint8 m_bRainAudioCounter;
 	uint8 m_bRainSamplesCounter;
 	uint8 m_nCarHornTimer;
-	int8 field_22D;
+	int8 field_22D; // last horn?
 	bool m_bSirenOrAlarm;
 	int8 m_comedyControlState;
 	CStoredCollPoly m_aCollPolys[2];     // poly which is under front/rear part of car
@@ -230,7 +230,7 @@ public:
 	virtual float GetHeightAboveRoad(void);
 	virtual void PlayCarHorn(void) {}
 
-	bool IsCar(void) { return m_vehType == VEHICLE_TYPE_CAR; }
+	bool IsCar(void) { return m_vehType == VEHICLE_TYPE_AUTOMOBILE; }
 	bool IsBoat(void) { return m_vehType == VEHICLE_TYPE_BOAT; }
 	bool IsTrain(void) { return m_vehType == VEHICLE_TYPE_TRAIN; }
 	bool IsHeli(void) { return m_vehType == VEHICLE_TYPE_HELI; }
@@ -286,7 +286,7 @@ class cTransmission;
 class cVehicleParams
 {
 public:
-	char m_bDistanceCalculated;
+	uint8 m_bDistancECalculated;
 	char gap_1[3];
 	float m_fDistance;
 	CVehicle *m_pVehicle;
diff --git a/src/weapons/CProjectileInfo.cpp b/src/weapons/CProjectileInfo.cpp
new file mode 100644
index 00000000..f3c78ed8
--- /dev/null
+++ b/src/weapons/CProjectileInfo.cpp
@@ -0,0 +1,10 @@
+#include "CProjectileInfo.h"
+
+CProjectileInfo *gaProjectileInfo = (CProjectileInfo *)0x64ED50;
+CProjectileInfo *CProjectileInfo::ms_apProjectile = (CProjectileInfo *)0x87C748;
+
+CProjectileInfo *
+CProjectileInfo::GetProjectileInfo(int32 id)
+{
+	return &gaProjectileInfo[id];
+}
diff --git a/src/weapons/CProjectileInfo.h b/src/weapons/CProjectileInfo.h
new file mode 100644
index 00000000..426d25f1
--- /dev/null
+++ b/src/weapons/CProjectileInfo.h
@@ -0,0 +1,20 @@
+#pragma once
+
+#include "Object.h"
+#include "Weapon.h"
+
+struct CProjectileInfo : public CObject {
+	eWeaponType m_eWeaponType;
+	CEntity *m_pSource;
+	int m_nExplosionTime;
+	char m_bInUse;
+	char field_13;
+	char field_14;
+	char field_15;
+	CVector m_vecPos;
+
+	static CProjectileInfo *GetProjectileInfo(int32 id);
+	static CProjectileInfo *ms_apProjectile;
+};
+
+extern CProjectileInfo *gaProjectileInfo;
\ No newline at end of file

From 47d2cf6c0affcdf4e39a2710ce98ae278649f572 Mon Sep 17 00:00:00 2001
From: Filip Gawin <filip.gawin@zoho.com>
Date: Thu, 26 Sep 2019 20:47:04 +0200
Subject: [PATCH 14/37] More audio windows

---
 src/audio/AudioManager.cpp | 1021 ++++++++++++++++++++++++++++++++++--
 src/audio/AudioManager.h   |   15 +-
 src/render/WaterCannon.cpp |    2 +-
 3 files changed, 987 insertions(+), 51 deletions(-)

diff --git a/src/audio/AudioManager.cpp b/src/audio/AudioManager.cpp
index b88af1ec..a6e1df64 100644
--- a/src/audio/AudioManager.cpp
+++ b/src/audio/AudioManager.cpp
@@ -31,6 +31,7 @@
 #include "Vehicle.h"
 #include "WaterCannon.h"
 #include "Weather.h"
+#include "Zones.h"
 #include "World.h"
 #include "ZoneCull.h"
 #include "sampman.h"
@@ -221,8 +222,7 @@ cPedComments::Process()
 			        AudioManager.m_sQueueSample.m_nSampleIndex) +
 			    AudioManager.RandomDisplacement(750u);
 			if(CTimer::GetIsSlowMotionActive())
-				AudioManager.m_sQueueSample.m_nFrequency =
-				    AudioManager.m_sQueueSample.m_nFrequency >> 1;
+				AudioManager.m_sQueueSample.m_nFrequency /= 2;
 			m_asPedComments[activeBank][indexMap[activeBank][0]].field_25 = -1;
 			AudioManager.AddSampleToRequestedQueue();
 		}
@@ -3153,7 +3153,7 @@ void
 cAudioManager::InitialisePoliceRadio()
 {
 	policeChannelTimer = 0;
-	unk3 = 0;
+	policeChannelTimerSeconds = 0;
 	policeChannelCounterSeconds = 0;
 	for(int32 i = 0; i < 10; i++) { crimes[i].type = 0; }
 
@@ -3314,12 +3314,10 @@ cAudioManager::PlayLoadedMissionAudio()
 	}
 }
 
-WRAPPER
 void
 cAudioManager::PlayOneShot(int32 index, int16 sound, float vol)
 {
-	EAXJMP(0x57A500);
-	/*if(m_bIsInitialised) {
+	if(m_bIsInitialised) {
 		if (index >= 0 && index < totalAudioEntitiesSlots) {
 			if (m_asAudioEntities[index].m_bIsUsed) {
 				if (sound < SOUND_TOTAL_SOUNDS) {
@@ -3339,17 +3337,17 @@ cAudioManager::PlayOneShot(int32 index, int16 sound, float vol)
 							if (i >= m_asAudioEntities[index].m_Loops) {
 								if (m_asAudioEntities[index]
 									.m_Loops < 4) {
-									m_asAudioEntities[index / 2]
+									m_asAudioEntities[index]
 										.m_awAudioEvent[i] =
 										sound;
-									m_asAudioEntities[index / 4]
+									m_asAudioEntities[index]
 										.m_afVolume[i] = vol;
 									++m_asAudioEntities[index]
 										.m_Loops;
 								}
 								return;
 							}
-							if (panTable[m_asAudioEntities[index / 2]
+							if (panTable[m_asAudioEntities[index]
 								.m_awAudioEvent[i]] >
 								panTable[sound])
 								break;
@@ -3357,34 +3355,234 @@ cAudioManager::PlayOneShot(int32 index, int16 sound, float vol)
 						}
 						if (i < 3) {
 							memmove(
-								&m_asAudioEntities[0]
-								.m_awAudioEvent[i + 1 + index / 2],
-								&m_asAudioEntities[0]
-								.m_awAudioEvent[i + index / 2],
-								2 * (3 - i));
-							memmove(&m_asAudioEntities[0]
-								.m_afVolume[i + 1 + index / 4],
-								&m_asAudioEntities[0]
-								.m_afVolume[i + index / 4],
-								4 * (3 - i));
+								&m_asAudioEntities[index]
+								.m_awAudioEvent[i + 1],
+								&m_asAudioEntities[index]
+								.m_awAudioEvent[i],
+								3 - i);
+							memmove(&m_asAudioEntities[index]
+								.m_afVolume[i + 1],
+								&m_asAudioEntities[index]
+								.m_afVolume[i],
+								3 - i);
 						}
-						m_asAudioEntities[index / 2].m_awAudioEvent[i] =
+						m_asAudioEntities[index].m_awAudioEvent[i] =
 							sound;
-						m_asAudioEntities[index / 4].m_afVolume[i] = vol;
+						m_asAudioEntities[index].m_afVolume[i] = vol;
 						if (m_asAudioEntities[index].m_Loops < 4)
 							++m_asAudioEntities[index].m_Loops;
 					}
 				}
 			}
 		}
-	}*/
+	}
 }
 
-WRAPPER
-uint32
+void
 cAudioManager::PlaySuspectLastSeen(float x, float y, float z)
 {
-	EAXJMP(0x580500);
+		cAudioManager* v4; // ebx
+		int16 audioZone; // ax
+		unsigned __int8 i; // dl
+		CZone* zone; // edi
+		int v8; // ecx
+		double v10; // st5
+		double v11; // st7
+		double v12; // st4
+		double v13; // st6
+		double v14; // st5
+		double v15; // st4
+		double v16; // st7
+		double v17; // st6
+		int v18; // eax
+		int32 sample; // [esp+8h] [ebp-30h]
+		char v20; // [esp+Ch] [ebp-2Ch]
+		CVector vec = {x, y, z};
+
+		v4 = this;
+		v20 = 0;
+		if (this->m_bIsInitialised)
+		{
+			if (MusicManager.m_nMusicMode != 2 && 60 - policeChannelTimer > 9u)
+			{
+
+				audioZone = CTheZones::FindAudioZone(&vec);
+				if (audioZone >= 0 && audioZone < 36)
+				{
+					i = 0;
+					zone = &CTheZones::ZoneArray[CTheZones::AudioZoneArray[audioZone]];
+					v8 = 0;
+					while (strcmp(zone->name, ZoneSfx[v8].m_aName) != 0)
+					{
+						++i;
+						++v8;
+						if (i >= 36u)
+							goto LABEL_11;
+					}
+					sample = ZoneSfx[i].m_nSampleIndex;
+				LABEL_11:
+					if (i < 36u)
+					{
+						if (v4->policeChannelTimer != 60)
+						{
+							v4->crimesSamples[v4->policeChannelTimerSeconds] = v4->m_anRandomTable[4] % 3u
+								+ AUDIO_SAMPLE_POLICE_SCANNER_SMALL_CRACKLE_1;
+							++v4->policeChannelTimer;
+							v4->policeChannelTimerSeconds = (v4->policeChannelTimerSeconds + 1) % 60;
+						}
+						if (v4->policeChannelTimer != 60)
+						{
+							v4->crimesSamples[v4->policeChannelTimerSeconds] = AUDIO_SAMPLE_POLICE_SCANNER_SUSPECT;
+							++v4->policeChannelTimer;
+							v4->policeChannelTimerSeconds = (v4->policeChannelTimerSeconds + 1) % 60;
+						}
+						if (v4->policeChannelTimer != 60)
+						{
+							v4->crimesSamples[v4->policeChannelTimerSeconds] = AUDIO_SAMPLE_POLICE_SCANNER_LAST_SEEN;
+							++v4->policeChannelTimer;
+							v4->policeChannelTimerSeconds = (v4->policeChannelTimerSeconds + 1) % 60;
+						}
+						if (v4->policeChannelTimer != 60)
+						{
+							v4->crimesSamples[v4->policeChannelTimerSeconds] = AUDIO_SAMPLE_POLICE_SCANNER_IN;
+							++v4->policeChannelTimer;
+							v4->policeChannelTimerSeconds = (v4->policeChannelTimerSeconds + 1) % 60;
+						}
+						if (sample == AUDIO_SAMPLE_POLICE_SCANNER_ZONE_SHORESIDE
+							&& (strcmp(zone->name, SubZo2Label) == 0
+								|| strcmp(zone->name, SubZo3Label) == 0))
+						{
+							if (v4->policeChannelTimer != 60)
+							{
+								v4->crimesSamples[v4->policeChannelTimerSeconds] = AUDIO_SAMPLE_POLICE_SCANNER_NORTH;
+								++v4->policeChannelTimer;
+								v4->policeChannelTimerSeconds = (v4->policeChannelTimerSeconds + 1) % 60;
+							}
+							if (v4->policeChannelTimer == 60) {
+								if (v4->policeChannelTimer != 60)
+								{
+									v4->crimesSamples[v4->policeChannelTimerSeconds] = sample;
+									++v4->policeChannelTimer;
+									v4->policeChannelTimerSeconds = (v4->policeChannelTimerSeconds + 1) % 60;
+								}
+								v18 = -1431655765 * v4->m_anRandomTable[2];
+								if (v4->policeChannelTimer != 60)
+								{
+									v4->crimesSamples[v4->policeChannelTimerSeconds] = v4->m_anRandomTable[2] % 3u
+										+ AUDIO_SAMPLE_POLICE_SCANNER_SMALL_CRACKLE_1;
+									++v4->policeChannelTimer;
+									v4->policeChannelTimerSeconds = (v4->policeChannelTimerSeconds + 1) % 60;
+								}
+								if (v4->policeChannelTimer != 60)
+								{
+									v4->crimesSamples[v4->policeChannelTimerSeconds] = TOTAL_AUDIO_SAMPLES;
+									++v4->policeChannelTimer;
+									v4->policeChannelTimerSeconds = (v4->policeChannelTimerSeconds + 1) % 60;
+								}
+								gSpecialSuspectLastSeenReport = 1;
+								return;
+							}
+							v4->crimesSamples[v4->policeChannelTimerSeconds] = AUDIO_SAMPLE_POLICE_SCANNER_EAST;
+							goto LABEL_45;
+						}
+						v10 = zone->minx;
+						v11 = zone->maxx - v10;
+						v12 = zone->miny;
+						v13 = zone->maxy - v12;
+						v14 = 0.5f * v11 + v10;
+						v15 = 0.5f * v13 + v12;
+						v16 = 0.25f * v11;
+						v17 = 0.25f * v13;
+						if (v15 + v17 < vec.y)
+						{
+							if (v15 - v17 <= vec.y)
+								goto LABEL_36;
+							if (v4->policeChannelTimer != 60)
+							{
+								v4->crimesSamples[v4->policeChannelTimerSeconds] = AUDIO_SAMPLE_POLICE_SCANNER_SOUTH;
+								++v4->policeChannelTimer;
+								v4->policeChannelTimerSeconds = (v4->policeChannelTimerSeconds + 1) % 60;
+							}
+						}
+						else if (v4->policeChannelTimer != 60)
+						{
+							v4->crimesSamples[v4->policeChannelTimerSeconds] = AUDIO_SAMPLE_POLICE_SCANNER_NORTH;
+							++v4->policeChannelTimer;
+							v4->policeChannelTimerSeconds = (v4->policeChannelTimerSeconds + 1) % 60;
+						}
+						v20 = 1;
+					LABEL_36:
+						if (v14 + v16 < vec.x)
+						{
+							if (v14 - v16 <= vec.x)
+							{
+								if (v20 || v4->policeChannelTimer == 60) {
+									if (v4->policeChannelTimer != 60)
+									{
+										v4->crimesSamples[v4->policeChannelTimerSeconds] = sample;
+										++v4->policeChannelTimer;
+										v4->policeChannelTimerSeconds = (v4->policeChannelTimerSeconds + 1) % 60;
+									}
+									v18 = -1431655765 * v4->m_anRandomTable[2];
+									if (v4->policeChannelTimer != 60)
+									{
+										v4->crimesSamples[v4->policeChannelTimerSeconds] = v4->m_anRandomTable[2] % 3u
+											+ AUDIO_SAMPLE_POLICE_SCANNER_SMALL_CRACKLE_1;
+										++v4->policeChannelTimer;
+										v4->policeChannelTimerSeconds = (v4->policeChannelTimerSeconds + 1) % 60;
+									}
+									if (v4->policeChannelTimer != 60)
+									{
+										v4->crimesSamples[v4->policeChannelTimerSeconds] = TOTAL_AUDIO_SAMPLES;
+										++v4->policeChannelTimer;
+										v4->policeChannelTimerSeconds = (v4->policeChannelTimerSeconds + 1) % 60;
+									}
+									gSpecialSuspectLastSeenReport = 1;
+									return;
+								}
+								v4->crimesSamples[v4->policeChannelTimerSeconds] = AUDIO_SAMPLE_POLICE_SCANNER_CENTRAL;
+								goto LABEL_45;
+							}
+							if (v4->policeChannelTimer != 60)
+							{
+								v4->crimesSamples[v4->policeChannelTimerSeconds] = AUDIO_SAMPLE_POLICE_SCANNER_WEST;
+								goto LABEL_45;
+							}
+						}
+						else if (v4->policeChannelTimer != 60)
+						{
+							v4->crimesSamples[v4->policeChannelTimerSeconds] = AUDIO_SAMPLE_POLICE_SCANNER_EAST;
+						LABEL_45:
+							++v4->policeChannelTimer;
+							v4->policeChannelTimerSeconds = (v4->policeChannelTimerSeconds + 1) % 60;
+						}
+						if (v4->policeChannelTimer != 60)
+						{
+							v4->crimesSamples[v4->policeChannelTimerSeconds] = sample;
+							++v4->policeChannelTimer;
+							v4->policeChannelTimerSeconds = (v4->policeChannelTimerSeconds + 1) % 60;
+						}
+						v18 = -1431655765 * v4->m_anRandomTable[2];
+						if (v4->policeChannelTimer != 60)
+						{
+							v4->crimesSamples[v4->policeChannelTimerSeconds] = v4->m_anRandomTable[2] % 3u
+								+ AUDIO_SAMPLE_POLICE_SCANNER_SMALL_CRACKLE_1;
+							++v4->policeChannelTimer;
+							v4->policeChannelTimerSeconds = (v4->policeChannelTimerSeconds + 1) % 60;
+						}
+						if (v4->policeChannelTimer != 60)
+						{
+							v4->crimesSamples[v4->policeChannelTimerSeconds] = TOTAL_AUDIO_SAMPLES;
+							++v4->policeChannelTimer;
+							v4->policeChannelTimerSeconds = (v4->policeChannelTimerSeconds + 1) % 60;
+						}
+						gSpecialSuspectLastSeenReport = 1;
+						return;
+					}
+				}
+			}
+		}
+	
 }
 
 void
@@ -3488,8 +3686,6 @@ cAudioManager::PreTerminateGameSpecificShutdown()
 	}
 }
 
-#if 1
-
 WRAPPER
 void
 cAudioManager::ProcessActiveQueues()
@@ -3497,10 +3693,6 @@ cAudioManager::ProcessActiveQueues()
 	EAXJMP(0x57BA60);
 }
 
-#else
-
-#endif
-
 bool
 cAudioManager::ProcessAirBrakes(cVehicleParams *params)
 {
@@ -4355,7 +4547,7 @@ cAudioManager::ProcessFrontEnd()
 	for(uint32 i = 0; i < m_asAudioEntities[m_sQueueSample.m_nEntityIndex].m_Loops; i++) {
 		processed = 0;
 		switch(
-		    m_asAudioEntities[0].m_awAudioEvent[i + 20 * m_sQueueSample.m_nEntityIndex]) {
+		    m_asAudioEntities[m_sQueueSample.m_nEntityIndex].m_awAudioEvent[i]) {
 		case SOUND_WEAPON_SNIPER_SHOT_NO_ZOOM:
 			m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_SNIPER_NO_ZOOM;
 			break;
@@ -4461,12 +4653,12 @@ cAudioManager::ProcessFrontEnd()
 		}
 
 		sample =
-		    m_asAudioEntities[0].m_awAudioEvent[i + 20 * m_sQueueSample.m_nEntityIndex];
+		    m_asAudioEntities[m_sQueueSample.m_nEntityIndex].m_awAudioEvent[i];
 		if(sample == AUDIO_SAMPLE_COLLISION_LOOPING_GRASS) {
 			m_sQueueSample.m_nFrequency = 28509;
 		} else if(sample == AUDIO_SAMPLE_PICKUP_NEUTRAL_1) {
 			if(1.f ==
-			   m_asAudioEntities[0].m_afVolume[i + 10 * m_sQueueSample.m_nEntityIndex])
+			   m_asAudioEntities[m_sQueueSample.m_nEntityIndex].m_afVolume[i])
 				m_sQueueSample.m_nFrequency = 32000;
 			else
 				m_sQueueSample.m_nFrequency = 48000;
@@ -8799,7 +8991,7 @@ cAudioManager::ServicePoliceRadioChannel(int32 wantedLevel)
 			    g_nMissionAudioPlayingStatus != 1) &&
 			   !SampleManager.GetChannelUsedFlag(policeChannel) && policeChannelTimer) {
 				if(policeChannelTimer) {
-					sample = *(uint32 *)&stuff[4 * policeChannelCounterSeconds];
+					sample = crimesSamples[policeChannelCounterSeconds];
 					--policeChannelTimer;
 					policeChannelCounterSeconds =
 					    (policeChannelCounterSeconds + 1) % 60;
@@ -9186,15 +9378,224 @@ cAudioManager::SetUpOneShotCollisionSound(cAudioCollision *col)
 	}
 }
 
-WRAPPER
 bool
 cAudioManager::SetupCrimeReport()
 {
-	EAXJMP(0x57F5B0);
+
+		cAudioManager* v1; // ebx
+		unsigned __int8 v3; // dl
+		int v4; // eax
+		__int16 v5; // ax
+		unsigned __int8 v6; // dl
+		CZone* v7; // edi
+		int v8; // ecx
+		int v9; // eax
+		int v10; // eax
+		int32 v11; // edx
+		double v12; // st5
+		double v13; // st7
+		double v14; // st4
+		double v15; // st6
+		double v16; // st5
+		double v17; // st4
+		double v18; // st7
+		double v19; // st6
+		double v20; // st3
+		double v21; // st6
+		int v22; // eax
+		int v23; // [esp+4h] [ebp-24h]
+		int32 v24; // [esp+8h] [ebp-20h]
+		char v25; // [esp+Ch] [ebp-1Ch]
+
+		v1 = this;
+		v25 = 0;
+		if (MusicManager.m_nMusicMode == 2)
+			return 0;
+		if ((unsigned __int8)(60 - this->policeChannelTimer) <= 9u)
+			goto LABEL_65;
+		v3 = 0;
+		v4 = 0;
+		do
+		{
+			if (this->crimes[v4].type)
+				break;
+			++v3;
+			++v4;
+		} while (v3 < 10u);
+		if (v3 == 10)
+			return 0;
+		v23 = v3;
+		v5 = CTheZones::FindAudioZone(&this->crimes[v23].position);
+		if (v5 >= 0 && v5 < 36)
+		{
+			v6 = 0;
+			v7 = &CTheZones::ZoneArray[CTheZones::AudioZoneArray[v5]];
+			v8 = 0;
+			while (strcmp(v7->name, ZoneSfx[v8].m_aName) != 0)
+			{
+				++v6;
+				++v8;
+				if (v6 >= 36u)
+					goto LABEL_16;
+			}
+			v24 = ZoneSfx[v6].m_nSampleIndex;
+		LABEL_16:
+			if (v6 < 36u)
+			{
+				v9 = -1431655765 * v1->m_anRandomTable[4];
+				if (v1->policeChannelTimer != 60)
+				{
+					v1->crimesSamples[v1->policeChannelTimerSeconds] = v1->m_anRandomTable[4] % 3u
+						+ AUDIO_SAMPLE_POLICE_SCANNER_SMALL_CRACKLE_1;
+					++v1->policeChannelTimer;
+					v1->policeChannelTimerSeconds = (v1->policeChannelTimerSeconds + 1) % 60;
+				}
+				v10 = -1431655765 * v1->m_anRandomTable[0];
+				if (v1->policeChannelTimer != 60)
+				{
+					v1->crimesSamples[v1->policeChannelTimerSeconds] = v1->m_anRandomTable[0] % 3u
+						+ AUDIO_SAMPLE_POLICE_SCANNER_WE_GOT_1;
+					++v1->policeChannelTimer;
+					v1->policeChannelTimerSeconds = (v1->policeChannelTimerSeconds + 1) % 60;
+				}
+				if (v1->policeChannelTimer != 60)
+				{
+					v1->crimesSamples[v1->policeChannelTimerSeconds] = (v1->m_anRandomTable[1] & 1)
+						+ AUDIO_SAMPLE_POLICE_SCANNER_TEN_1;
+					++v1->policeChannelTimer;
+					v1->policeChannelTimerSeconds = (v1->policeChannelTimerSeconds + 1) % 60;
+				}
+				v11 = v1->crimes[v23].type;
+				switch (v1->crimes[v23].type)
+				{
+				case CRIME_PED_BURNED:
+					v1->crimes[v23].type = 2;
+					break;
+				case CRIME_COP_BURNED:
+					v1->crimes[v23].type = 3;
+					break;
+				case CRIME_VEHICLE_BURNED:
+					v1->crimes[v23].type = 6;
+					break;
+				case CRIME_DESTROYED_CESSNA:
+					v1->crimes[v23].type = 12;
+					break;
+				default:
+					break;
+				}
+				if (v1->policeChannelTimer != 60)
+				{
+					v1->crimesSamples[v1->policeChannelTimerSeconds] = v1->crimes[v23].type + AUDIO_SAMPLE_POLICE_SCANNER_TEN_2;
+					++v1->policeChannelTimer;
+					v1->policeChannelTimerSeconds = (v1->policeChannelTimerSeconds + 1) % 60;
+				}
+				if (v1->policeChannelTimer != 60)
+				{
+					v1->crimesSamples[v1->policeChannelTimerSeconds] = AUDIO_SAMPLE_POLICE_SCANNER_IN;
+					++v1->policeChannelTimer;
+					v1->policeChannelTimerSeconds = (v1->policeChannelTimerSeconds + 1) % 60;
+				}
+				if (v24 == AUDIO_SAMPLE_POLICE_SCANNER_ZONE_SHORESIDE
+					&& (strcmp(v7->name, SubZo2Label) == 0
+						|| strcmp(v7->name, SubZo3Label) ==0))
+				{
+					if (v1->policeChannelTimer != 60)
+					{
+						v1->crimesSamples[v1->policeChannelTimerSeconds] = AUDIO_SAMPLE_POLICE_SCANNER_NORTH;
+						++v1->policeChannelTimer;
+						v1->policeChannelTimerSeconds = (v1->policeChannelTimerSeconds + 1) % 60;
+					}
+					if (v1->policeChannelTimer == 60)
+						goto LABEL_58;
+					v1->crimesSamples[v1->policeChannelTimerSeconds] = AUDIO_SAMPLE_POLICE_SCANNER_EAST;
+					goto LABEL_57;
+				}
+				v12 = v7->minx;
+				v13 = v7->maxx - v12;
+				v14 = v7->miny;
+				v15 = v7->maxy - v14;
+				v16 = 0.5f * v13 + v12;
+				v17 = 0.5f * v15 + v14;
+				v18 = 0.25f * v13;
+				v19 = 0.25f * v15;
+				v20 = v1->crimes[v23].position.y;
+				if (v17 + v19 < v20)
+				{
+					if (v17 - v19 <= v20)
+						goto LABEL_48;
+					if (v1->policeChannelTimer != 60)
+					{
+						v1->crimesSamples[v1->policeChannelTimerSeconds] = AUDIO_SAMPLE_POLICE_SCANNER_SOUTH;
+						++v1->policeChannelTimer;
+						v1->policeChannelTimerSeconds = (v1->policeChannelTimerSeconds + 1) % 60;
+					}
+				}
+				else if (v1->policeChannelTimer != 60)
+				{
+					v1->crimesSamples[v1->policeChannelTimerSeconds] = AUDIO_SAMPLE_POLICE_SCANNER_NORTH;
+					++v1->policeChannelTimer;
+					v1->policeChannelTimerSeconds = (v1->policeChannelTimerSeconds + 1) % 60;
+				}
+				v25 = 1;
+			LABEL_48:
+				v21 = v1->crimes[v23].position.x;
+				if (v16 + v18 < v21)
+				{
+					if (v16 - v18 <= v21)
+					{
+						if (v25 || v1->policeChannelTimer == 60)
+							goto LABEL_58;
+						v1->crimesSamples[v1->policeChannelTimerSeconds] = AUDIO_SAMPLE_POLICE_SCANNER_CENTRAL;
+						goto LABEL_57;
+					}
+					if (v1->policeChannelTimer != 60)
+					{
+						v1->crimesSamples[v1->policeChannelTimerSeconds] = AUDIO_SAMPLE_POLICE_SCANNER_WEST;
+						goto LABEL_57;
+					}
+				}
+				else if (v1->policeChannelTimer != 60)
+				{
+					v1->crimesSamples[v1->policeChannelTimerSeconds] = AUDIO_SAMPLE_POLICE_SCANNER_EAST;
+				LABEL_57:
+					++v1->policeChannelTimer;
+					v1->policeChannelTimerSeconds = (v1->policeChannelTimerSeconds + 1) % 60;
+					goto LABEL_58;
+				}
+			LABEL_58:
+				if (v1->policeChannelTimer != 60)
+				{
+					v1->crimesSamples[v1->policeChannelTimerSeconds] = v24;
+					++v1->policeChannelTimer;
+					v1->policeChannelTimerSeconds = (v1->policeChannelTimerSeconds + 1) % 60;
+				}
+				v22 = -1431655765 * v1->m_anRandomTable[2];
+				if (v1->policeChannelTimer != 60)
+				{
+					v1->crimesSamples[v1->policeChannelTimerSeconds] = v1->m_anRandomTable[2] % 3u
+						+ AUDIO_SAMPLE_POLICE_SCANNER_SMALL_CRACKLE_1;
+					++v1->policeChannelTimer;
+					v1->policeChannelTimerSeconds = (v1->policeChannelTimerSeconds + 1) % 60;
+				}
+				if (v1->policeChannelTimer != 60)
+				{
+					v1->crimesSamples[v1->policeChannelTimerSeconds] = TOTAL_AUDIO_SAMPLES;
+					++v1->policeChannelTimer;
+					v1->policeChannelTimerSeconds = (v1->policeChannelTimerSeconds + 1) % 60;
+				}
+				goto LABEL_64;
+			}
+		}
+	LABEL_64:
+		v1->crimes[v23].type = 0;
+	LABEL_65:
+		AgeCrimes();
+		return 1;
+	
 }
 
 WRAPPER
-bool cAudioManager::SetupJumboEngineSound(uint8, int32) { EAXJMP(0x56F140); }
+bool cAudioManager::SetupJumboEngineSound(uint8, int32) { EAXJMP(0x56F140) }
 
 bool
 cAudioManager::SetupJumboFlySound(uint8 emittingVol)
@@ -9457,11 +9858,547 @@ cAudioManager::SetupPedComments(cPedParams *params, uint32 sound)
 	}
 }
 
-WRAPPER
+struct ColorSoundForScanner
+{
+	eAudioSamples m_eColor1;
+	eAudioSamples m_eColor2;
+	eAudioSamples m_eColor3;
+};
+
 void
 cAudioManager::SetupSuspectLastSeenReport()
 {
-	EAXJMP(0x57FCC0);
+		cAudioManager* v1; // ebp
+		CAutomobile* v2; // eax
+		uint8 v3; // bl
+		unsigned __int8 v4; // dl
+		int v5; // edx
+		int main_color; // edi
+		int v7; // edx
+		eAudioSamples v8; // esi
+		int v9; // eax
+		int v10; // eax
+		uint8 v11; // cl
+		int v12; // eax
+		int v13; // eax
+		int color_pre_modifier; // [esp+8h] [ebp-18h]
+		int color_post_modifier; // [esp+Ch] [ebp-14h]
+
+		constexpr int32 colors[] =
+{
+  3032,
+  248,
+  3032,
+  3032,
+  249,
+  3032,
+  3032,
+  250,
+  3032,
+  3032,
+  251,
+  3032,
+  258,
+  250,
+  3032,
+  3032,
+  252,
+  3032,
+  3032,
+  253,
+  3032,
+  260,
+  250,
+  3032,
+  259,
+  250,
+  254,
+  259,
+  3032,
+  3032,
+  258,
+  3032,
+  3032,
+  258,
+  3032,
+  3032,
+  258,
+  251,
+  3032,
+  3032,
+  251,
+  3032,
+  3032,
+  251,
+  3032,
+  3032,
+  251,
+  3032,
+  3032,
+  251,
+  3032,
+  3032,
+  251,
+  3032,
+  3032,
+  251,
+  3032,
+  259,
+  3032,
+  3032,
+  258,
+  3032,
+  3032,
+  258,
+  3032,
+  3032,
+  258,
+  3032,
+  3032,
+  3032,
+  255,
+  3032,
+  3032,
+  255,
+  3032,
+  3032,
+  255,
+  3032,
+  3032,
+  255,
+  3032,
+  3032,
+  255,
+  3032,
+  3032,
+  255,
+  3032,
+  259,
+  3032,
+  3032,
+  258,
+  3032,
+  3032,
+  258,
+  3032,
+  3032,
+  258,
+  3032,
+  3032,
+  3032,
+  253,
+  3032,
+  3032,
+  253,
+  3032,
+  3032,
+  253,
+  3032,
+  3032,
+  253,
+  3032,
+  3032,
+  253,
+  3032,
+  3032,
+  253,
+  3032,
+  259,
+  3032,
+  3032,
+  258,
+  3032,
+  3032,
+  258,
+  3032,
+  3032,
+  258,
+  3032,
+  3032,
+  3032,
+  256,
+  3032,
+  3032,
+  256,
+  3032,
+  3032,
+  256,
+  3032,
+  3032,
+  256,
+  3032,
+  3032,
+  256,
+  3032,
+  3032,
+  256,
+  3032,
+  259,
+  3032,
+  3032,
+  258,
+  3032,
+  3032,
+  258,
+  3032,
+  3032,
+  258,
+  3032,
+  3032,
+  3032,
+  250,
+  3032,
+  3032,
+  250,
+  3032,
+  3032,
+  250,
+  3032,
+  3032,
+  250,
+  3032,
+  3032,
+  250,
+  3032,
+  3032,
+  250,
+  3032,
+  259,
+  3032,
+  3032,
+  258,
+  3032,
+  3032,
+  258,
+  3032,
+  3032,
+  258,
+  3032,
+  3032,
+  3032,
+  252,
+  3032,
+  3032,
+  252,
+  3032,
+  3032,
+  252,
+  3032,
+  3032,
+  252,
+  3032,
+  3032,
+  252,
+  3032,
+  3032,
+  252,
+  3032,
+  259,
+  3032,
+  3032,
+  258,
+  3032,
+  3032,
+  258,
+  3032,
+  3032,
+  258,
+  3032,
+  3032,
+  3032,
+  257,
+  3032,
+  3032,
+  257,
+  3032,
+  3032,
+  257,
+  3032,
+  3032,
+  257,
+  3032,
+  3032,
+  257,
+  3032,
+  3032,
+  257,
+  3032,
+  259,
+  3032,
+  3032,
+  259,
+  3032,
+  3032,
+  259,
+  3032,
+  3032,
+  259,
+  3032,
+  3032,
+  259,
+  3032,
+  3032,
+  259,
+  3032,
+  3032,
+  259,
+  3032,
+  3032,
+  259,
+  3032,
+  3032,
+  259,
+  3032,
+  3032,
+  259,
+  3032,
+  3032,
+  259,
+  3032,
+  3032,
+  258,
+  3032,
+  3032,
+  258,
+  3032,
+  3032,
+  258,
+  3032,
+  3032,
+  258,
+  3032,
+  3032,
+  258,
+  3032,
+  3032
+};
+
+		v1 = this;
+		if (MusicManager.m_nMusicMode != 2)
+		{
+			v2 = (CAutomobile*)FindPlayerVehicle();
+			if (v2)
+			{
+				v3 = v1->policeChannelTimer;
+				if (60 - v3 > 9u)
+				{
+					v4 = v2->m_currentColour1;
+					if (v4 >= 95u)
+					{
+						debug("\n *** UNKNOWN CAR COLOUR %d *** ", v4);
+					}
+					else
+					{
+						v5 = 3 * v4;
+						main_color = colors[v5 + 1]; //todo refactor struct
+						color_pre_modifier = colors[v5];
+						color_post_modifier = colors[v5 + 2];
+						v7 = v2->m_modelIndex;
+						switch (v7)
+						{
+						case MI_LANDSTAL:
+						case MI_BLISTA:
+							v8 = AUDIO_SAMPLE_POLICE_SCANNER_CAR_CRUISER;
+							goto LABEL_28;
+						case MI_IDAHO:
+						case MI_STALLION:
+							v8 = AUDIO_SAMPLE_POLICE_SCANNER_CAR_CONVERTIBLE;
+							goto LABEL_28;
+						case MI_STINGER:
+						case MI_INFERNUS:
+						case MI_CHEETAH:
+						case MI_BANSHEE:
+							v8 = AUDIO_SAMPLE_POLICE_SCANNER_CAR_SPORTS_CAR;
+							goto LABEL_28;
+						case MI_PEREN:
+						case MI_SENTINEL:
+						case MI_FBICAR:
+							v8 = AUDIO_SAMPLE_POLICE_SCANNER_CAR_ECONOMY;
+							goto LABEL_28;
+						case MI_PATRIOT:
+						case MI_BOBCAT:
+							v8 = AUDIO_SAMPLE_POLICE_SCANNER_CAR_PICKUP;
+							goto LABEL_28;
+						case MI_FIRETRUCK:
+							v8 = AUDIO_SAMPLE_POLICE_SCANNER_CAR_FIRETRUCK;
+							goto LABEL_28;
+						case MI_TRASH:
+						case MI_BARRACKS:
+							v8 = AUDIO_SAMPLE_POLICE_SCANNER_CAR_TRUCK;
+							goto LABEL_28;
+						case MI_STRETCH:
+							v8 = AUDIO_SAMPLE_POLICE_SCANNER_CAR_LIMO;
+							goto LABEL_28;
+						case MI_MANANA:
+						case MI_ESPERANT:
+							v8 = AUDIO_SAMPLE_POLICE_SCANNER_CAR_COUPE;
+							goto LABEL_28;
+						case MI_PONY:
+						case MI_MULE:
+						case MI_MOONBEAM:
+						case MI_ENFORCER:
+						case MI_SECURICA:
+						case MI_RUMPO:
+							v8 = AUDIO_SAMPLE_POLICE_SCANNER_CAR_VAN;
+							goto LABEL_28;
+						case MI_AMBULAN:
+							v8 = AUDIO_SAMPLE_POLICE_SCANNER_CAR_AMBULANCE;
+							goto LABEL_28;
+						case MI_TAXI:
+						case MI_CABBIE:
+						case MI_BORGNINE:
+							v8 = AUDIO_SAMPLE_POLICE_SCANNER_CAR_TAXI;
+							goto LABEL_28;
+						case MI_MRWHOOP:
+							v8 = AUDIO_SAMPLE_POLICE_SCANNER_CAR_ICE_CREAM_TRUCK;
+							goto LABEL_28;
+						case MI_BFINJECT:
+							v8 = AUDIO_SAMPLE_POLICE_SCANNER_CAR_BUGGY;
+							goto LABEL_28;
+						case MI_POLICE:
+							v8 = AUDIO_SAMPLE_POLICE_SCANNER_CAR_POLICE_CAR;
+							goto LABEL_28;
+						case MI_PREDATOR:
+							v8 = AUDIO_SAMPLE_POLICE_SCANNER_CAR_BOAT;
+							goto LABEL_28;
+						case MI_BUS:
+						case MI_COACH:
+							v8 = AUDIO_SAMPLE_POLICE_SCANNER_CAR_BUS;
+							goto LABEL_28;
+						case MI_RHINO:
+							v8 = AUDIO_SAMPLE_POLICE_SCANNER_CAR_TANK;
+							main_color = TOTAL_AUDIO_SAMPLES;
+							color_post_modifier = TOTAL_AUDIO_SAMPLES;
+							goto LABEL_28;
+						case MI_TRAIN:
+							v8 = AUDIO_SAMPLE_POLICE_SCANNER_CAR_SUBWAY_CAR;
+							main_color = TOTAL_AUDIO_SAMPLES;
+							color_post_modifier = TOTAL_AUDIO_SAMPLES;
+						LABEL_28:
+							v9 = -1431655765 * v1->m_anRandomTable[4];
+							if (v3 != 60)
+							{
+								v1->crimesSamples[v1->policeChannelTimerSeconds] = v1->m_anRandomTable[4] % 3u
+									+ AUDIO_SAMPLE_POLICE_SCANNER_SMALL_CRACKLE_1;
+								++v1->policeChannelTimer;
+								v1->policeChannelTimerSeconds = (v1->policeChannelTimerSeconds + 1) % 60;
+							}
+							if (v1->policeChannelTimer != 60)
+							{
+								v1->crimesSamples[v1->policeChannelTimerSeconds] = AUDIO_SAMPLE_POLICE_SCANNER_SUSPECT;
+								++v1->policeChannelTimer;
+								v1->policeChannelTimerSeconds = (v1->policeChannelTimerSeconds + 1) % 60;
+							}
+							if (v1->m_anRandomTable[3] & 1 && v1->policeChannelTimer != 60)
+							{
+								v1->crimesSamples[v1->policeChannelTimerSeconds] = AUDIO_SAMPLE_POLICE_SCANNER_LAST_SEEN;
+								++v1->policeChannelTimer;
+								v1->policeChannelTimerSeconds = (v1->policeChannelTimerSeconds + 1) % 60;
+							}
+							if (main_color == AUDIO_SAMPLE_POLICE_SCANNER_COLOR_ORANGE)
+							{
+								if (v1->policeChannelTimer != 60)
+								{
+									v1->crimesSamples[v1->policeChannelTimerSeconds] = AUDIO_SAMPLE_POLICE_SCANNER_IN_AN;
+									++v1->policeChannelTimer;
+									v1->policeChannelTimerSeconds = (v1->policeChannelTimerSeconds + 1) % 60;
+								}
+							}
+							else if (v1->policeChannelTimer != 60)
+							{
+								v1->crimesSamples[v1->policeChannelTimerSeconds] = AUDIO_SAMPLE_POLICE_SCANNER_IN_A;
+								++v1->policeChannelTimer;
+								v1->policeChannelTimerSeconds = (v1->policeChannelTimerSeconds + 1) % 60;
+							}
+							if (color_pre_modifier != 3032 && v1->policeChannelTimer != 60)
+							{
+								v1->crimesSamples[v1->policeChannelTimerSeconds] = color_pre_modifier;
+								++v1->policeChannelTimer;
+								v1->policeChannelTimerSeconds = (v1->policeChannelTimerSeconds + 1) % 60;
+							}
+							if (main_color != 3032 && v1->policeChannelTimer != 60)
+							{
+								v1->crimesSamples[v1->policeChannelTimerSeconds] = main_color;
+								++v1->policeChannelTimer;
+								v1->policeChannelTimerSeconds = (v1->policeChannelTimerSeconds + 1) % 60;
+							}
+							if (color_post_modifier != 3032 && v1->policeChannelTimer != 60)
+							{
+								v1->crimesSamples[v1->policeChannelTimerSeconds] = color_post_modifier;
+								++v1->policeChannelTimer;
+								v1->policeChannelTimerSeconds = (v1->policeChannelTimerSeconds + 1) % 60;
+							}
+							if (v1->policeChannelTimer != 60)
+							{
+								v1->crimesSamples[v1->policeChannelTimerSeconds] = v8;
+								++v1->policeChannelTimer;
+								v1->policeChannelTimerSeconds = (v1->policeChannelTimerSeconds + 1) % 60;
+							}
+							v10 = -1431655765 * v1->m_anRandomTable[0];
+							if (v1->policeChannelTimer != 60)
+							{
+								v1->crimesSamples[v1->policeChannelTimerSeconds] = v1->m_anRandomTable[0] % 3u
+									+ AUDIO_SAMPLE_POLICE_SCANNER_SMALL_CRACKLE_1;
+								++v1->policeChannelTimer;
+								v1->policeChannelTimerSeconds = (v1->policeChannelTimerSeconds + 1) % 60;
+							}
+							if (v1->policeChannelTimer != 60)
+							{
+								v1->crimesSamples[v1->policeChannelTimerSeconds] = TOTAL_AUDIO_SAMPLES;
+								++v1->policeChannelTimer;
+								v1->policeChannelTimerSeconds = (v1->policeChannelTimerSeconds + 1) % 60;
+							}
+							break;
+						default:
+							debug("\n *** UNKNOWN CAR MODEL INDEX %d *** ", v7);
+							break;
+						}
+					}
+				}
+			}
+			else
+			{
+				v11 = v1->policeChannelTimer;
+				if (60 - v11 > 4u)
+				{
+					v12 = -1431655765 * v1->m_anRandomTable[4];
+					if (v11 != 60)
+					{
+						v1->crimesSamples[v1->policeChannelTimerSeconds] = v1->m_anRandomTable[4] % 3u
+							+ AUDIO_SAMPLE_POLICE_SCANNER_SMALL_CRACKLE_1;
+						++v1->policeChannelTimer;
+						v1->policeChannelTimerSeconds = (v1->policeChannelTimerSeconds + 1) % 60;
+					}
+					if (v1->policeChannelTimer != 60)
+					{
+						v1->crimesSamples[v1->policeChannelTimerSeconds] = AUDIO_SAMPLE_POLICE_SCANNER_SUSPECT;
+						++v1->policeChannelTimer;
+						v1->policeChannelTimerSeconds = (v1->policeChannelTimerSeconds + 1) % 60;
+					}
+					if (v1->policeChannelTimer != 60)
+					{
+						v1->crimesSamples[v1->policeChannelTimerSeconds] = AUDIO_SAMPLE_POLICE_SCANNER_ON_FOOT;
+						++v1->policeChannelTimer;
+						v1->policeChannelTimerSeconds = (v1->policeChannelTimerSeconds + 1) % 60;
+					}
+					v13 = -1431655765 * v1->m_anRandomTable[0];
+					if (v1->policeChannelTimer != 60)
+					{
+						v1->crimesSamples[v1->policeChannelTimerSeconds] = v1->m_anRandomTable[0] % 3u
+							+ AUDIO_SAMPLE_POLICE_SCANNER_SMALL_CRACKLE_1;
+						++v1->policeChannelTimer;
+						v1->policeChannelTimerSeconds = (v1->policeChannelTimerSeconds + 1) % 60;
+					}
+					if (v1->policeChannelTimer != 60)
+					{
+						v1->crimesSamples[v1->policeChannelTimerSeconds] = TOTAL_AUDIO_SAMPLES;
+						++v1->policeChannelTimer;
+						v1->policeChannelTimerSeconds = (v1->policeChannelTimerSeconds + 1) % 60;
+					}
+				}
+			}
+		}
+	
 }
 
 void
@@ -9527,7 +10464,7 @@ WRAPPER
 void
 cAudioManager::UpdateReflections()
 {
-	EAXJMP(0x57B470);
+	EAXJMP(0x57B470)
 }
 
 bool
@@ -9706,7 +10643,7 @@ InjectHook(0x579520, &cAudioManager::MissionScriptAudioUsesPoliceChannel, PATCH_
 InjectHook(0x56AD10, &cAudioManager::PlayerJustGotInCar, PATCH_JUMP);
 InjectHook(0x56AD20, &cAudioManager::PlayerJustLeftCar, PATCH_JUMP);
 InjectHook(0x579620, &cAudioManager::PlayLoadedMissionAudio, PATCH_JUMP);
-//InjectHook(0x57A500, &cAudioManager::PlayOneShot, PATCH_JUMP);
+InjectHook(0x57A500, &cAudioManager::PlayOneShot, PATCH_JUMP);
 InjectHook(0x569420, &cAudioManager::PostInitialiseGameSpecificSetup, PATCH_JUMP);
 InjectHook(0x569640, &cAudioManager::PostTerminateGameSpecificShutdown, PATCH_JUMP);
 InjectHook(0x569400, &cAudioManager::PreInitialiseGameSpecificSetup, PATCH_JUMP);
diff --git a/src/audio/AudioManager.h b/src/audio/AudioManager.h
index 0a21f92a..a3cbd37d 100644
--- a/src/audio/AudioManager.h
+++ b/src/audio/AudioManager.h
@@ -239,7 +239,7 @@ struct Crime {
 	int32 type;
 	CVector position;
 	uint16 timer;
-	uint16 b;
+	uint16 gap;
 };
 
 static_assert(sizeof(Crime) == 20, "Crime: error ");
@@ -282,12 +282,11 @@ public:
 	int32 m_nFireAudioEntity;
 	int32 m_nWaterCannonEntity;
 	int32 m_nPoliceChannelEntity;
-	uint8 stuff[239];
-	uint8 unk1;
+	int32 crimesSamples[60];
 	uint8 policeChannelTimer;
-	uint8 unk3;
+	uint8 policeChannelTimerSeconds;
 	uint8 policeChannelCounterSeconds;
-	uint8 unk5;
+	uint8 gap30;
 	Crime crimes[10];
 	int32 m_nFrontEndEntity;
 	int32 m_nCollisionEntity;
@@ -447,7 +446,7 @@ public:
 
 	void PlayLoadedMissionAudio();                         /// ok
 	void PlayOneShot(int32 index, int16 sound, float vol); // to do (need testing)
-	uint32 PlaySuspectLastSeen(float x, float y, float z); // todo
+	void PlaySuspectLastSeen(float x, float y, float z); // todo cleanup and hook
 	void PlayerJustGotInCar() const;                       /// ok
 	void PlayerJustLeftCar() const;                        /// ok
 	void PostInitialiseGameSpecificSetup();                /// ok
@@ -552,14 +551,14 @@ public:
 	void SetSpeakerConfig(int32 conf) const;
 	void SetUpLoopingCollisionSound(cAudioCollision *col, uint8 counter); /// ok
 	void SetUpOneShotCollisionSound(cAudioCollision *col);                /// ok
-	bool SetupCrimeReport();                                              // todo
+	bool SetupCrimeReport();                                              // todo cleanup and hook
 	bool SetupJumboEngineSound(uint8 a2, int32 a3);                       // todo
 	bool SetupJumboFlySound(uint8 emittingVol);                           /// ok
 	bool SetupJumboRumbleSound(uint8 emittingVol);                        /// ok
 	bool SetupJumboTaxiSound(uint8 vol);                                  /// ok
 	bool SetupJumboWhineSound(uint8 emittingVol, int32 freq);             /// ok
 	void SetupPedComments(cPedParams *params, uint32 sound);              /// ok
-	void SetupSuspectLastSeenReport();                                    // todo
+	void SetupSuspectLastSeenReport();                                    // todo cleanup and hook
 
 	void Terminate();
 	void TranslateEntity(CVector *v1, CVector *v2) const;
diff --git a/src/render/WaterCannon.cpp b/src/render/WaterCannon.cpp
index 9763138e..e477b3fa 100644
--- a/src/render/WaterCannon.cpp
+++ b/src/render/WaterCannon.cpp
@@ -2,7 +2,7 @@
 #include "patcher.h"
 #include "WaterCannon.h"
 
-extern CWaterCannon* aCannons = (CWaterCannon*)0x8F2CA8;
+CWaterCannon* aCannons = (CWaterCannon*)0x8F2CA8;
 
 WRAPPER void CWaterCannons::Update(void) { EAXJMP(0x522510); }
 WRAPPER void CWaterCannon::UpdateOne(uint32 id, CVector *pos, CVector *dir) { EAXJMP(0x522470); }

From 8c52cdbedd7bdc04dfbde05facc40a8b88622da8 Mon Sep 17 00:00:00 2001
From: Filip Gawin <filip.gawin@zoho.com>
Date: Fri, 27 Sep 2019 23:19:43 +0200
Subject: [PATCH 15/37] Cleanup police radio

---
 src/audio/AudioManager.cpp | 1680 +++++++++++++++---------------------
 src/audio/AudioManager.h   |   17 +-
 2 files changed, 726 insertions(+), 971 deletions(-)

diff --git a/src/audio/AudioManager.cpp b/src/audio/AudioManager.cpp
index a6e1df64..956af34d 100644
--- a/src/audio/AudioManager.cpp
+++ b/src/audio/AudioManager.cpp
@@ -3317,59 +3317,76 @@ cAudioManager::PlayLoadedMissionAudio()
 void
 cAudioManager::PlayOneShot(int32 index, int16 sound, float vol)
 {
+	static constexpr uint8 byte_60ABD0[168] = {
+	3,   3,   3,   3,   3,   3,   3,   3,   3,   3,
+	3,   3,   3,   5,   5,   5,   3,   5,   2,   2,
+	1,   1,   3,   1,   3,   3,   1,   1,   1,   4,
+	4,   3,   1,   1,   1,   1,   1,   1,   1,   1,
+	1,   1,   1,   1,   1,   6,   1,   1,   3,   2,
+	2,   2,   2,   0,   0,   6,   6,   0,   0,   0,
+	0,   0,   0,   0,   0,   0,   0,   0,   1,   2,
+	1,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+	0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+	0,   0,   1,   1,   0,   0,   0,   3,   1,   1,
+	1,   9,   2,   2,   0,   0,   0,   0,   3,   3,
+	5,   1,   1,   1,   1,   3,   4,   7,   6,   6,
+	6,   6,   1,   3,   4,   3,   4,   2,   1,   3,
+	5,   4,   6,   6,   1,   3,   1,   1,   1,   0,
+	0,   0,   0,   0,   0,   3,   1,   0,   0,   0,
+	0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+	0,   0,   0,   0,   0,   0,   0,   0
+	};
+
 	if(m_bIsInitialised) {
-		if (index >= 0 && index < totalAudioEntitiesSlots) {
-			if (m_asAudioEntities[index].m_bIsUsed) {
-				if (sound < SOUND_TOTAL_SOUNDS) {
-					if (m_asAudioEntities[index].m_nType ==
-						AUDIOTYPE_SCRIPTOBJECT) {
-						if (m_nScriptObjectEntityTotal < 40) {
+		if(index >= 0 && index < totalAudioEntitiesSlots) {
+			if(m_asAudioEntities[index].m_bIsUsed) {
+				if(sound < SOUND_TOTAL_SOUNDS) {
+					if(m_asAudioEntities[index].m_nType ==
+					   AUDIOTYPE_SCRIPTOBJECT) {
+						if(m_nScriptObjectEntityTotal < 40) {
 							m_asAudioEntities[index].m_awAudioEvent[0] =
-								sound;
+							    sound;
 							m_asAudioEntities[index].m_Loops = 1;
 							m_anScriptObjectEntityIndices
-								[m_nScriptObjectEntityTotal++] = index;
+							    [m_nScriptObjectEntityTotal++] = index;
 						}
-					}
-					else {
+					} else {
 						int32 i = 0;
-						while (1) {
-							if (i >= m_asAudioEntities[index].m_Loops) {
-								if (m_asAudioEntities[index]
-									.m_Loops < 4) {
+						while(1) {
+							if(i >= m_asAudioEntities[index].m_Loops) {
+								if(m_asAudioEntities[index]
+								       .m_Loops < 4) {
 									m_asAudioEntities[index]
-										.m_awAudioEvent[i] =
-										sound;
+									    .m_awAudioEvent[i] =
+									    sound;
 									m_asAudioEntities[index]
-										.m_afVolume[i] = vol;
+									    .m_afVolume[i] = vol;
 									++m_asAudioEntities[index]
-										.m_Loops;
+									      .m_Loops;
 								}
 								return;
 							}
-							if (panTable[m_asAudioEntities[index]
-								.m_awAudioEvent[i]] >
-								panTable[sound])
+							if(byte_60ABD0[m_asAudioEntities[index]
+							                .m_awAudioEvent[i]] >
+								byte_60ABD0[sound])
 								break;
 							++i;
 						}
-						if (i < 3) {
-							memmove(
-								&m_asAudioEntities[index]
-								.m_awAudioEvent[i + 1],
-								&m_asAudioEntities[index]
-								.m_awAudioEvent[i],
-								3 - i);
+						if(i < 3) {
 							memmove(&m_asAudioEntities[index]
-								.m_afVolume[i + 1],
-								&m_asAudioEntities[index]
-								.m_afVolume[i],
-								3 - i);
+							             .m_awAudioEvent[i + 1],
+							        &m_asAudioEntities[index]
+							             .m_awAudioEvent[i],
+							        3 - i);
+							memmove(
+							    &m_asAudioEntities[index]
+							         .m_afVolume[i + 1],
+							    &m_asAudioEntities[index].m_afVolume[i],
+							    3 - i);
 						}
-						m_asAudioEntities[index].m_awAudioEvent[i] =
-							sound;
+						m_asAudioEntities[index].m_awAudioEvent[i] = sound;
 						m_asAudioEntities[index].m_afVolume[i] = vol;
-						if (m_asAudioEntities[index].m_Loops < 4)
+						if(m_asAudioEntities[index].m_Loops < 4)
 							++m_asAudioEntities[index].m_Loops;
 					}
 				}
@@ -3381,208 +3398,225 @@ cAudioManager::PlayOneShot(int32 index, int16 sound, float vol)
 void
 cAudioManager::PlaySuspectLastSeen(float x, float y, float z)
 {
-		cAudioManager* v4; // ebx
-		int16 audioZone; // ax
-		unsigned __int8 i; // dl
-		CZone* zone; // edi
-		int v8; // ecx
-		double v10; // st5
-		double v11; // st7
-		double v12; // st4
-		double v13; // st6
-		double v14; // st5
-		double v15; // st4
-		double v16; // st7
-		double v17; // st6
-		int v18; // eax
-		int32 sample; // [esp+8h] [ebp-30h]
-		char v20; // [esp+Ch] [ebp-2Ch]
-		CVector vec = {x, y, z};
+	int16 audioZone;
+	CZone *zone;
+	int32 i;
+	float rangeX;
+	float rangeY;
+	float halfX;
+	float halfY;
+	float quarterX;
+	float quarterY;
+	int32 sample;
+	bool processed = false;
+	CVector vec = {x, y, z};
 
-		v4 = this;
-		v20 = 0;
-		if (this->m_bIsInitialised)
-		{
-			if (MusicManager.m_nMusicMode != 2 && 60 - policeChannelTimer > 9u)
-			{
+	if(m_bIsInitialised) {
+		if(MusicManager.m_nMusicMode != 2 && 60 - policeChannelTimer > 9u) {
 
-				audioZone = CTheZones::FindAudioZone(&vec);
-				if (audioZone >= 0 && audioZone < 36)
-				{
-					i = 0;
-					zone = &CTheZones::ZoneArray[CTheZones::AudioZoneArray[audioZone]];
-					v8 = 0;
-					while (strcmp(zone->name, ZoneSfx[v8].m_aName) != 0)
-					{
-						++i;
-						++v8;
-						if (i >= 36u)
-							goto LABEL_11;
+			audioZone = CTheZones::FindAudioZone(&vec);
+			if(audioZone >= 0 && audioZone < 36) {
+				i = 0;
+				zone = &CTheZones::ZoneArray[CTheZones::AudioZoneArray[audioZone]];
+				while(strcmp(zone->name, ZoneSfx[i].m_aName) != 0) {
+					++i;
+					if(i >= 36u) return;
+				}
+				sample = ZoneSfx[i].m_nSampleIndex;
+				if(i < 36u) {
+					if(policeChannelTimer != 60) {
+						crimesSamples[policeChannelTimerSeconds] =
+						    m_anRandomTable[4] % 3u +
+						    AUDIO_SAMPLE_POLICE_SCANNER_SMALL_CRACKLE_1;
+						++policeChannelTimer;
+						policeChannelTimerSeconds =
+						    (policeChannelTimerSeconds + 1) % 60;
 					}
-					sample = ZoneSfx[i].m_nSampleIndex;
-				LABEL_11:
-					if (i < 36u)
-					{
-						if (v4->policeChannelTimer != 60)
-						{
-							v4->crimesSamples[v4->policeChannelTimerSeconds] = v4->m_anRandomTable[4] % 3u
-								+ AUDIO_SAMPLE_POLICE_SCANNER_SMALL_CRACKLE_1;
-							++v4->policeChannelTimer;
-							v4->policeChannelTimerSeconds = (v4->policeChannelTimerSeconds + 1) % 60;
+					if(policeChannelTimer != 60) {
+						crimesSamples[policeChannelTimerSeconds] =
+						    AUDIO_SAMPLE_POLICE_SCANNER_SUSPECT;
+						++policeChannelTimer;
+						policeChannelTimerSeconds =
+						    (policeChannelTimerSeconds + 1) % 60;
+					}
+					if(policeChannelTimer != 60) {
+						crimesSamples[policeChannelTimerSeconds] =
+						    AUDIO_SAMPLE_POLICE_SCANNER_LAST_SEEN;
+						++policeChannelTimer;
+						policeChannelTimerSeconds =
+						    (policeChannelTimerSeconds + 1) % 60;
+					}
+					if(policeChannelTimer != 60) {
+						crimesSamples[policeChannelTimerSeconds] =
+						    AUDIO_SAMPLE_POLICE_SCANNER_IN;
+						++policeChannelTimer;
+						policeChannelTimerSeconds =
+						    (policeChannelTimerSeconds + 1) % 60;
+					}
+					if(sample == AUDIO_SAMPLE_POLICE_SCANNER_ZONE_SHORESIDE &&
+					   (strcmp(zone->name, SubZo2Label) == 0 ||
+					    strcmp(zone->name, SubZo3Label) == 0)) {
+						if(policeChannelTimer != 60) {
+							crimesSamples[policeChannelTimerSeconds] =
+							    AUDIO_SAMPLE_POLICE_SCANNER_NORTH;
+							++policeChannelTimer;
+							policeChannelTimerSeconds =
+							    (policeChannelTimerSeconds + 1) % 60;
 						}
-						if (v4->policeChannelTimer != 60)
-						{
-							v4->crimesSamples[v4->policeChannelTimerSeconds] = AUDIO_SAMPLE_POLICE_SCANNER_SUSPECT;
-							++v4->policeChannelTimer;
-							v4->policeChannelTimerSeconds = (v4->policeChannelTimerSeconds + 1) % 60;
-						}
-						if (v4->policeChannelTimer != 60)
-						{
-							v4->crimesSamples[v4->policeChannelTimerSeconds] = AUDIO_SAMPLE_POLICE_SCANNER_LAST_SEEN;
-							++v4->policeChannelTimer;
-							v4->policeChannelTimerSeconds = (v4->policeChannelTimerSeconds + 1) % 60;
-						}
-						if (v4->policeChannelTimer != 60)
-						{
-							v4->crimesSamples[v4->policeChannelTimerSeconds] = AUDIO_SAMPLE_POLICE_SCANNER_IN;
-							++v4->policeChannelTimer;
-							v4->policeChannelTimerSeconds = (v4->policeChannelTimerSeconds + 1) % 60;
-						}
-						if (sample == AUDIO_SAMPLE_POLICE_SCANNER_ZONE_SHORESIDE
-							&& (strcmp(zone->name, SubZo2Label) == 0
-								|| strcmp(zone->name, SubZo3Label) == 0))
-						{
-							if (v4->policeChannelTimer != 60)
-							{
-								v4->crimesSamples[v4->policeChannelTimerSeconds] = AUDIO_SAMPLE_POLICE_SCANNER_NORTH;
-								++v4->policeChannelTimer;
-								v4->policeChannelTimerSeconds = (v4->policeChannelTimerSeconds + 1) % 60;
+						if(policeChannelTimer == 60) {
+							if(policeChannelTimer != 60) {
+								crimesSamples
+								    [policeChannelTimerSeconds] =
+								        sample;
+								++policeChannelTimer;
+								policeChannelTimerSeconds =
+								    (policeChannelTimerSeconds +
+								     1) %
+								    60;
 							}
-							if (v4->policeChannelTimer == 60) {
-								if (v4->policeChannelTimer != 60)
-								{
-									v4->crimesSamples[v4->policeChannelTimerSeconds] = sample;
-									++v4->policeChannelTimer;
-									v4->policeChannelTimerSeconds = (v4->policeChannelTimerSeconds + 1) % 60;
+							if(policeChannelTimer != 60) {
+								crimesSamples
+								    [policeChannelTimerSeconds] =
+								        m_anRandomTable[2] % 3u +
+								        AUDIO_SAMPLE_POLICE_SCANNER_SMALL_CRACKLE_1;
+								++policeChannelTimer;
+								policeChannelTimerSeconds =
+								    (policeChannelTimerSeconds +
+								     1) %
+								    60;
+							}
+							if(policeChannelTimer != 60) {
+								crimesSamples
+								    [policeChannelTimerSeconds] =
+								        TOTAL_AUDIO_SAMPLES;
+								++policeChannelTimer;
+								policeChannelTimerSeconds =
+								    (policeChannelTimerSeconds +
+								     1) %
+								    60;
+							}
+							gSpecialSuspectLastSeenReport = 1;
+							return;
+						}
+						crimesSamples[policeChannelTimerSeconds] =
+						    AUDIO_SAMPLE_POLICE_SCANNER_EAST;
+						++policeChannelTimer;
+						policeChannelTimerSeconds =
+						    (policeChannelTimerSeconds + 1) % 60;
+					}
+					rangeX = zone->maxx - zone->minx;
+					rangeY = zone->maxy - zone->miny;
+					halfX = 0.5f * rangeX + zone->minx;
+					halfY = 0.5f * rangeY + zone->miny;
+					quarterX = 0.25f * rangeX;
+					quarterY = 0.25f * rangeY;
+					if(halfY + quarterY < vec.y) {
+						if(halfY - quarterY > vec.y) {
+							if(policeChannelTimer != 60) {
+								crimesSamples
+								    [policeChannelTimerSeconds] =
+								        AUDIO_SAMPLE_POLICE_SCANNER_SOUTH;
+								++policeChannelTimer;
+								policeChannelTimerSeconds =
+								    (policeChannelTimerSeconds +
+								     1) %
+								    60;
+								processed = 1;
+							}
+						}
+					} else if(policeChannelTimer != 60) {
+						crimesSamples[policeChannelTimerSeconds] =
+						    AUDIO_SAMPLE_POLICE_SCANNER_NORTH;
+						++policeChannelTimer;
+						policeChannelTimerSeconds =
+						    (policeChannelTimerSeconds + 1) % 60;
+						processed = 1;
+					}
+					if(halfX + quarterX < vec.x) {
+						if(halfX - quarterX <= vec.x) {
+							if(processed || policeChannelTimer == 60) {
+								if(policeChannelTimer != 60) {
+									crimesSamples
+									    [policeChannelTimerSeconds] =
+									        sample;
+									++policeChannelTimer;
+									policeChannelTimerSeconds =
+									    (policeChannelTimerSeconds +
+									     1) %
+									    60;
 								}
-								v18 = -1431655765 * v4->m_anRandomTable[2];
-								if (v4->policeChannelTimer != 60)
-								{
-									v4->crimesSamples[v4->policeChannelTimerSeconds] = v4->m_anRandomTable[2] % 3u
-										+ AUDIO_SAMPLE_POLICE_SCANNER_SMALL_CRACKLE_1;
-									++v4->policeChannelTimer;
-									v4->policeChannelTimerSeconds = (v4->policeChannelTimerSeconds + 1) % 60;
+								if(policeChannelTimer != 60) {
+									crimesSamples
+									    [policeChannelTimerSeconds] =
+									        m_anRandomTable[2] %
+									            3u +
+									        AUDIO_SAMPLE_POLICE_SCANNER_SMALL_CRACKLE_1;
+									++policeChannelTimer;
+									policeChannelTimerSeconds =
+									    (policeChannelTimerSeconds +
+									     1) %
+									    60;
 								}
-								if (v4->policeChannelTimer != 60)
-								{
-									v4->crimesSamples[v4->policeChannelTimerSeconds] = TOTAL_AUDIO_SAMPLES;
-									++v4->policeChannelTimer;
-									v4->policeChannelTimerSeconds = (v4->policeChannelTimerSeconds + 1) % 60;
+								if(policeChannelTimer != 60) {
+									crimesSamples
+									    [policeChannelTimerSeconds] =
+									        TOTAL_AUDIO_SAMPLES;
+									++policeChannelTimer;
+									policeChannelTimerSeconds =
+									    (policeChannelTimerSeconds +
+									     1) %
+									    60;
 								}
 								gSpecialSuspectLastSeenReport = 1;
 								return;
 							}
-							v4->crimesSamples[v4->policeChannelTimerSeconds] = AUDIO_SAMPLE_POLICE_SCANNER_EAST;
-							goto LABEL_45;
+							crimesSamples[policeChannelTimerSeconds] =
+							    AUDIO_SAMPLE_POLICE_SCANNER_CENTRAL;
+							++policeChannelTimer;
+							policeChannelTimerSeconds =
+							    (policeChannelTimerSeconds + 1) % 60;
 						}
-						v10 = zone->minx;
-						v11 = zone->maxx - v10;
-						v12 = zone->miny;
-						v13 = zone->maxy - v12;
-						v14 = 0.5f * v11 + v10;
-						v15 = 0.5f * v13 + v12;
-						v16 = 0.25f * v11;
-						v17 = 0.25f * v13;
-						if (v15 + v17 < vec.y)
-						{
-							if (v15 - v17 <= vec.y)
-								goto LABEL_36;
-							if (v4->policeChannelTimer != 60)
-							{
-								v4->crimesSamples[v4->policeChannelTimerSeconds] = AUDIO_SAMPLE_POLICE_SCANNER_SOUTH;
-								++v4->policeChannelTimer;
-								v4->policeChannelTimerSeconds = (v4->policeChannelTimerSeconds + 1) % 60;
-							}
+						if(policeChannelTimer != 60) {
+							crimesSamples[policeChannelTimerSeconds] =
+							    AUDIO_SAMPLE_POLICE_SCANNER_WEST;
+							++policeChannelTimer;
+							policeChannelTimerSeconds =
+							    (policeChannelTimerSeconds + 1) % 60;
 						}
-						else if (v4->policeChannelTimer != 60)
-						{
-							v4->crimesSamples[v4->policeChannelTimerSeconds] = AUDIO_SAMPLE_POLICE_SCANNER_NORTH;
-							++v4->policeChannelTimer;
-							v4->policeChannelTimerSeconds = (v4->policeChannelTimerSeconds + 1) % 60;
-						}
-						v20 = 1;
-					LABEL_36:
-						if (v14 + v16 < vec.x)
-						{
-							if (v14 - v16 <= vec.x)
-							{
-								if (v20 || v4->policeChannelTimer == 60) {
-									if (v4->policeChannelTimer != 60)
-									{
-										v4->crimesSamples[v4->policeChannelTimerSeconds] = sample;
-										++v4->policeChannelTimer;
-										v4->policeChannelTimerSeconds = (v4->policeChannelTimerSeconds + 1) % 60;
-									}
-									v18 = -1431655765 * v4->m_anRandomTable[2];
-									if (v4->policeChannelTimer != 60)
-									{
-										v4->crimesSamples[v4->policeChannelTimerSeconds] = v4->m_anRandomTable[2] % 3u
-											+ AUDIO_SAMPLE_POLICE_SCANNER_SMALL_CRACKLE_1;
-										++v4->policeChannelTimer;
-										v4->policeChannelTimerSeconds = (v4->policeChannelTimerSeconds + 1) % 60;
-									}
-									if (v4->policeChannelTimer != 60)
-									{
-										v4->crimesSamples[v4->policeChannelTimerSeconds] = TOTAL_AUDIO_SAMPLES;
-										++v4->policeChannelTimer;
-										v4->policeChannelTimerSeconds = (v4->policeChannelTimerSeconds + 1) % 60;
-									}
-									gSpecialSuspectLastSeenReport = 1;
-									return;
-								}
-								v4->crimesSamples[v4->policeChannelTimerSeconds] = AUDIO_SAMPLE_POLICE_SCANNER_CENTRAL;
-								goto LABEL_45;
-							}
-							if (v4->policeChannelTimer != 60)
-							{
-								v4->crimesSamples[v4->policeChannelTimerSeconds] = AUDIO_SAMPLE_POLICE_SCANNER_WEST;
-								goto LABEL_45;
-							}
-						}
-						else if (v4->policeChannelTimer != 60)
-						{
-							v4->crimesSamples[v4->policeChannelTimerSeconds] = AUDIO_SAMPLE_POLICE_SCANNER_EAST;
-						LABEL_45:
-							++v4->policeChannelTimer;
-							v4->policeChannelTimerSeconds = (v4->policeChannelTimerSeconds + 1) % 60;
-						}
-						if (v4->policeChannelTimer != 60)
-						{
-							v4->crimesSamples[v4->policeChannelTimerSeconds] = sample;
-							++v4->policeChannelTimer;
-							v4->policeChannelTimerSeconds = (v4->policeChannelTimerSeconds + 1) % 60;
-						}
-						v18 = -1431655765 * v4->m_anRandomTable[2];
-						if (v4->policeChannelTimer != 60)
-						{
-							v4->crimesSamples[v4->policeChannelTimerSeconds] = v4->m_anRandomTable[2] % 3u
-								+ AUDIO_SAMPLE_POLICE_SCANNER_SMALL_CRACKLE_1;
-							++v4->policeChannelTimer;
-							v4->policeChannelTimerSeconds = (v4->policeChannelTimerSeconds + 1) % 60;
-						}
-						if (v4->policeChannelTimer != 60)
-						{
-							v4->crimesSamples[v4->policeChannelTimerSeconds] = TOTAL_AUDIO_SAMPLES;
-							++v4->policeChannelTimer;
-							v4->policeChannelTimerSeconds = (v4->policeChannelTimerSeconds + 1) % 60;
-						}
-						gSpecialSuspectLastSeenReport = 1;
-						return;
+					} else if(policeChannelTimer != 60) {
+						crimesSamples[policeChannelTimerSeconds] =
+						    AUDIO_SAMPLE_POLICE_SCANNER_EAST;
+						++policeChannelTimer;
+						policeChannelTimerSeconds =
+						    (policeChannelTimerSeconds + 1) % 60;
 					}
+					if(policeChannelTimer != 60) {
+						crimesSamples[policeChannelTimerSeconds] = sample;
+						++policeChannelTimer;
+						policeChannelTimerSeconds =
+						    (policeChannelTimerSeconds + 1) % 60;
+					}
+					if(policeChannelTimer != 60) {
+						crimesSamples[policeChannelTimerSeconds] =
+						    m_anRandomTable[2] % 3u +
+						    AUDIO_SAMPLE_POLICE_SCANNER_SMALL_CRACKLE_1;
+						++policeChannelTimer;
+						policeChannelTimerSeconds =
+						    (policeChannelTimerSeconds + 1) % 60;
+					}
+					if(policeChannelTimer != 60) {
+						crimesSamples[policeChannelTimerSeconds] =
+						    TOTAL_AUDIO_SAMPLES;
+						++policeChannelTimer;
+						policeChannelTimerSeconds =
+						    (policeChannelTimerSeconds + 1) % 60;
+					}
+					gSpecialSuspectLastSeenReport = 1;
+					return;
 				}
 			}
 		}
-	
+	}
 }
 
 void
@@ -4702,12 +4736,9 @@ cAudioManager::ProcessGarages()
 struct tHelicopterSampleData {
 	float m_fMaxDistance;
 	float m_fBaseDistance;
-	char m_bBaseVolume;
-	char gap_9[3];
+	uint8 m_bBaseVolume;
 };
 
-tHelicopterSampleData *gHeliSfxRanges = (tHelicopterSampleData *)0x604784;
-
 bool
 cAudioManager::ProcessHelicopter(cVehicleParams *params)
 {
@@ -4716,6 +4747,7 @@ cAudioManager::ProcessHelicopter(cVehicleParams *params)
 	float dist;
 	float baseDist;
 	int32 emittingVol;
+	static constexpr tHelicopterSampleData gHeliSfxRanges[3] = { {400.f, 380.f, 100}, {100.f, 70.f, maxVolume}, {60.f, 30.f, maxVolume} };
 
 	if(gHeliSfxRanges[0].m_fMaxDistance * gHeliSfxRanges[0].m_fMaxDistance <=
 	   params->m_fDistance)
@@ -9381,221 +9413,226 @@ cAudioManager::SetUpOneShotCollisionSound(cAudioCollision *col)
 bool
 cAudioManager::SetupCrimeReport()
 {
+	int16 audioZoneId;
+	CZone *zone;
+	int j;
+	float rangeX;
+	float rangeY;
+	float halfX;
+	float halfY;
+	float quarterX;
+	float quarterY;
+	int i;
+	int32 sampleIndex;
+	bool processed = false;
 
-		cAudioManager* v1; // ebx
-		unsigned __int8 v3; // dl
-		int v4; // eax
-		__int16 v5; // ax
-		unsigned __int8 v6; // dl
-		CZone* v7; // edi
-		int v8; // ecx
-		int v9; // eax
-		int v10; // eax
-		int32 v11; // edx
-		double v12; // st5
-		double v13; // st7
-		double v14; // st4
-		double v15; // st6
-		double v16; // st5
-		double v17; // st4
-		double v18; // st7
-		double v19; // st6
-		double v20; // st3
-		double v21; // st6
-		int v22; // eax
-		int v23; // [esp+4h] [ebp-24h]
-		int32 v24; // [esp+8h] [ebp-20h]
-		char v25; // [esp+Ch] [ebp-1Ch]
+	if(MusicManager.m_nMusicMode == 2) return 0;
 
-		v1 = this;
-		v25 = 0;
-		if (MusicManager.m_nMusicMode == 2)
-			return 0;
-		if ((unsigned __int8)(60 - this->policeChannelTimer) <= 9u)
-			goto LABEL_65;
-		v3 = 0;
-		v4 = 0;
-		do
-		{
-			if (this->crimes[v4].type)
-				break;
-			++v3;
-			++v4;
-		} while (v3 < 10u);
-		if (v3 == 10)
-			return 0;
-		v23 = v3;
-		v5 = CTheZones::FindAudioZone(&this->crimes[v23].position);
-		if (v5 >= 0 && v5 < 36)
-		{
-			v6 = 0;
-			v7 = &CTheZones::ZoneArray[CTheZones::AudioZoneArray[v5]];
-			v8 = 0;
-			while (strcmp(v7->name, ZoneSfx[v8].m_aName) != 0)
-			{
-				++v6;
-				++v8;
-				if (v6 >= 36u)
-					goto LABEL_16;
-			}
-			v24 = ZoneSfx[v6].m_nSampleIndex;
-		LABEL_16:
-			if (v6 < 36u)
-			{
-				v9 = -1431655765 * v1->m_anRandomTable[4];
-				if (v1->policeChannelTimer != 60)
-				{
-					v1->crimesSamples[v1->policeChannelTimerSeconds] = v1->m_anRandomTable[4] % 3u
-						+ AUDIO_SAMPLE_POLICE_SCANNER_SMALL_CRACKLE_1;
-					++v1->policeChannelTimer;
-					v1->policeChannelTimerSeconds = (v1->policeChannelTimerSeconds + 1) % 60;
-				}
-				v10 = -1431655765 * v1->m_anRandomTable[0];
-				if (v1->policeChannelTimer != 60)
-				{
-					v1->crimesSamples[v1->policeChannelTimerSeconds] = v1->m_anRandomTable[0] % 3u
-						+ AUDIO_SAMPLE_POLICE_SCANNER_WE_GOT_1;
-					++v1->policeChannelTimer;
-					v1->policeChannelTimerSeconds = (v1->policeChannelTimerSeconds + 1) % 60;
-				}
-				if (v1->policeChannelTimer != 60)
-				{
-					v1->crimesSamples[v1->policeChannelTimerSeconds] = (v1->m_anRandomTable[1] & 1)
-						+ AUDIO_SAMPLE_POLICE_SCANNER_TEN_1;
-					++v1->policeChannelTimer;
-					v1->policeChannelTimerSeconds = (v1->policeChannelTimerSeconds + 1) % 60;
-				}
-				v11 = v1->crimes[v23].type;
-				switch (v1->crimes[v23].type)
-				{
-				case CRIME_PED_BURNED:
-					v1->crimes[v23].type = 2;
-					break;
-				case CRIME_COP_BURNED:
-					v1->crimes[v23].type = 3;
-					break;
-				case CRIME_VEHICLE_BURNED:
-					v1->crimes[v23].type = 6;
-					break;
-				case CRIME_DESTROYED_CESSNA:
-					v1->crimes[v23].type = 12;
-					break;
-				default:
-					break;
-				}
-				if (v1->policeChannelTimer != 60)
-				{
-					v1->crimesSamples[v1->policeChannelTimerSeconds] = v1->crimes[v23].type + AUDIO_SAMPLE_POLICE_SCANNER_TEN_2;
-					++v1->policeChannelTimer;
-					v1->policeChannelTimerSeconds = (v1->policeChannelTimerSeconds + 1) % 60;
-				}
-				if (v1->policeChannelTimer != 60)
-				{
-					v1->crimesSamples[v1->policeChannelTimerSeconds] = AUDIO_SAMPLE_POLICE_SCANNER_IN;
-					++v1->policeChannelTimer;
-					v1->policeChannelTimerSeconds = (v1->policeChannelTimerSeconds + 1) % 60;
-				}
-				if (v24 == AUDIO_SAMPLE_POLICE_SCANNER_ZONE_SHORESIDE
-					&& (strcmp(v7->name, SubZo2Label) == 0
-						|| strcmp(v7->name, SubZo3Label) ==0))
-				{
-					if (v1->policeChannelTimer != 60)
-					{
-						v1->crimesSamples[v1->policeChannelTimerSeconds] = AUDIO_SAMPLE_POLICE_SCANNER_NORTH;
-						++v1->policeChannelTimer;
-						v1->policeChannelTimerSeconds = (v1->policeChannelTimerSeconds + 1) % 60;
-					}
-					if (v1->policeChannelTimer == 60)
-						goto LABEL_58;
-					v1->crimesSamples[v1->policeChannelTimerSeconds] = AUDIO_SAMPLE_POLICE_SCANNER_EAST;
-					goto LABEL_57;
-				}
-				v12 = v7->minx;
-				v13 = v7->maxx - v12;
-				v14 = v7->miny;
-				v15 = v7->maxy - v14;
-				v16 = 0.5f * v13 + v12;
-				v17 = 0.5f * v15 + v14;
-				v18 = 0.25f * v13;
-				v19 = 0.25f * v15;
-				v20 = v1->crimes[v23].position.y;
-				if (v17 + v19 < v20)
-				{
-					if (v17 - v19 <= v20)
-						goto LABEL_48;
-					if (v1->policeChannelTimer != 60)
-					{
-						v1->crimesSamples[v1->policeChannelTimerSeconds] = AUDIO_SAMPLE_POLICE_SCANNER_SOUTH;
-						++v1->policeChannelTimer;
-						v1->policeChannelTimerSeconds = (v1->policeChannelTimerSeconds + 1) % 60;
-					}
-				}
-				else if (v1->policeChannelTimer != 60)
-				{
-					v1->crimesSamples[v1->policeChannelTimerSeconds] = AUDIO_SAMPLE_POLICE_SCANNER_NORTH;
-					++v1->policeChannelTimer;
-					v1->policeChannelTimerSeconds = (v1->policeChannelTimerSeconds + 1) % 60;
-				}
-				v25 = 1;
-			LABEL_48:
-				v21 = v1->crimes[v23].position.x;
-				if (v16 + v18 < v21)
-				{
-					if (v16 - v18 <= v21)
-					{
-						if (v25 || v1->policeChannelTimer == 60)
-							goto LABEL_58;
-						v1->crimesSamples[v1->policeChannelTimerSeconds] = AUDIO_SAMPLE_POLICE_SCANNER_CENTRAL;
-						goto LABEL_57;
-					}
-					if (v1->policeChannelTimer != 60)
-					{
-						v1->crimesSamples[v1->policeChannelTimerSeconds] = AUDIO_SAMPLE_POLICE_SCANNER_WEST;
-						goto LABEL_57;
-					}
-				}
-				else if (v1->policeChannelTimer != 60)
-				{
-					v1->crimesSamples[v1->policeChannelTimerSeconds] = AUDIO_SAMPLE_POLICE_SCANNER_EAST;
-				LABEL_57:
-					++v1->policeChannelTimer;
-					v1->policeChannelTimerSeconds = (v1->policeChannelTimerSeconds + 1) % 60;
-					goto LABEL_58;
-				}
-			LABEL_58:
-				if (v1->policeChannelTimer != 60)
-				{
-					v1->crimesSamples[v1->policeChannelTimerSeconds] = v24;
-					++v1->policeChannelTimer;
-					v1->policeChannelTimerSeconds = (v1->policeChannelTimerSeconds + 1) % 60;
-				}
-				v22 = -1431655765 * v1->m_anRandomTable[2];
-				if (v1->policeChannelTimer != 60)
-				{
-					v1->crimesSamples[v1->policeChannelTimerSeconds] = v1->m_anRandomTable[2] % 3u
-						+ AUDIO_SAMPLE_POLICE_SCANNER_SMALL_CRACKLE_1;
-					++v1->policeChannelTimer;
-					v1->policeChannelTimerSeconds = (v1->policeChannelTimerSeconds + 1) % 60;
-				}
-				if (v1->policeChannelTimer != 60)
-				{
-					v1->crimesSamples[v1->policeChannelTimerSeconds] = TOTAL_AUDIO_SAMPLES;
-					++v1->policeChannelTimer;
-					v1->policeChannelTimerSeconds = (v1->policeChannelTimerSeconds + 1) % 60;
-				}
-				goto LABEL_64;
-			}
-		}
-	LABEL_64:
-		v1->crimes[v23].type = 0;
-	LABEL_65:
+	if(60 - policeChannelTimer <= 9) {
 		AgeCrimes();
 		return 1;
-	
+	}
+
+	i = 0;
+	do {
+		if(crimes[i].type) break;
+		++i;
+	} while(i < 10u);
+	if(i == 10) return 0;
+	audioZoneId = CTheZones::FindAudioZone(&crimes[i].position);
+	if(audioZoneId >= 0 && audioZoneId < 36) {
+		j = 0;
+		zone = &CTheZones::ZoneArray[CTheZones::AudioZoneArray[audioZoneId]];
+		while(strcmp(zone->name, ZoneSfx[j].m_aName) != 0) {
+			++j;
+			if(j >= 36u) {
+				crimes[i].type = 0;
+				AgeCrimes();
+				return 1;
+			}
+		}
+		sampleIndex = ZoneSfx[j].m_nSampleIndex;
+
+		if(j < 36u) {
+			if(policeChannelTimer != 60) {
+				crimesSamples[policeChannelTimerSeconds] =
+				    m_anRandomTable[4] % 3u +
+				    AUDIO_SAMPLE_POLICE_SCANNER_SMALL_CRACKLE_1;
+				++policeChannelTimer;
+				policeChannelTimerSeconds = (policeChannelTimerSeconds + 1) % 60;
+			}
+			if(policeChannelTimer != 60) {
+				crimesSamples[policeChannelTimerSeconds] =
+				    m_anRandomTable[0] % 3u + AUDIO_SAMPLE_POLICE_SCANNER_WE_GOT_1;
+				++policeChannelTimer;
+				policeChannelTimerSeconds = (policeChannelTimerSeconds + 1) % 60;
+			}
+			if(policeChannelTimer != 60) {
+				crimesSamples[policeChannelTimerSeconds] =
+				    (m_anRandomTable[1] & 1) + AUDIO_SAMPLE_POLICE_SCANNER_TEN_1;
+				++policeChannelTimer;
+				policeChannelTimerSeconds = (policeChannelTimerSeconds + 1) % 60;
+			}
+			switch(crimes[i].type) {
+			case CRIME_PED_BURNED: crimes[i].type = 2; break;
+			case CRIME_COP_BURNED: crimes[i].type = 3; break;
+			case CRIME_VEHICLE_BURNED: crimes[i].type = 6; break;
+			case CRIME_DESTROYED_CESSNA: crimes[i].type = 12; break;
+			default: break;
+			}
+			if(policeChannelTimer != 60) {
+				crimesSamples[policeChannelTimerSeconds] =
+				    crimes[i].type + AUDIO_SAMPLE_POLICE_SCANNER_TEN_2;
+				++policeChannelTimer;
+				policeChannelTimerSeconds = (policeChannelTimerSeconds + 1) % 60;
+			}
+			if(policeChannelTimer != 60) {
+				crimesSamples[policeChannelTimerSeconds] =
+				    AUDIO_SAMPLE_POLICE_SCANNER_IN;
+				++policeChannelTimer;
+				policeChannelTimerSeconds = (policeChannelTimerSeconds + 1) % 60;
+			}
+			if(sampleIndex == AUDIO_SAMPLE_POLICE_SCANNER_ZONE_SHORESIDE &&
+			   (strcmp(zone->name, SubZo2Label) == 0 ||
+			    strcmp(zone->name, SubZo3Label) == 0)) {
+				if(policeChannelTimer != 60) {
+					crimesSamples[policeChannelTimerSeconds] =
+					    AUDIO_SAMPLE_POLICE_SCANNER_NORTH;
+					++policeChannelTimer;
+					policeChannelTimerSeconds =
+					    (policeChannelTimerSeconds + 1) % 60;
+				}
+				if(policeChannelTimer == 60) {
+					if(policeChannelTimer != 60) {
+						crimesSamples[policeChannelTimerSeconds] =
+						    sampleIndex;
+						++policeChannelTimer;
+						policeChannelTimerSeconds =
+						    (policeChannelTimerSeconds + 1) % 60;
+					}
+					if(policeChannelTimer != 60) {
+						crimesSamples[policeChannelTimerSeconds] =
+						    m_anRandomTable[2] % 3u +
+						    AUDIO_SAMPLE_POLICE_SCANNER_SMALL_CRACKLE_1;
+						++policeChannelTimer;
+						policeChannelTimerSeconds =
+						    (policeChannelTimerSeconds + 1) % 60;
+					}
+					if(policeChannelTimer != 60) {
+						crimesSamples[policeChannelTimerSeconds] =
+						    TOTAL_AUDIO_SAMPLES;
+						++policeChannelTimer;
+						policeChannelTimerSeconds =
+						    (policeChannelTimerSeconds + 1) % 60;
+					}
+					crimes[i].type = 0;
+					AgeCrimes();
+					return 1;
+				}
+				crimesSamples[policeChannelTimerSeconds] =
+				    AUDIO_SAMPLE_POLICE_SCANNER_EAST;
+				++policeChannelTimer;
+				policeChannelTimerSeconds = (policeChannelTimerSeconds + 1) % 60;
+			}
+			rangeX = zone->maxx - zone->minx;
+			rangeY = zone->maxy - zone->miny;
+			halfX = 0.5f * rangeX + zone->minx;
+			halfY = 0.5f * rangeY + zone->miny;
+			quarterX = 0.25f * rangeX;
+			quarterY = 0.25f * rangeY;
+			if(halfY + quarterY < crimes[i].position.y) {
+				if(halfY - quarterY > crimes[i].position.y) {
+					if(policeChannelTimer != 60) {
+						crimesSamples[policeChannelTimerSeconds] =
+						    AUDIO_SAMPLE_POLICE_SCANNER_SOUTH;
+						++policeChannelTimer;
+						policeChannelTimerSeconds =
+						    (policeChannelTimerSeconds + 1) % 60;
+					}
+					processed = 1;
+				}
+			} else if(policeChannelTimer != 60) {
+				crimesSamples[policeChannelTimerSeconds] =
+				    AUDIO_SAMPLE_POLICE_SCANNER_NORTH;
+				++policeChannelTimer;
+				policeChannelTimerSeconds = (policeChannelTimerSeconds + 1) % 60;
+				processed = 1;
+			}
+
+			if(halfX + quarterX < crimes[i].position.x) {
+				if(halfX - quarterX <= crimes[i].position.x) {
+					if(processed || policeChannelTimer == 60) {
+						if(policeChannelTimer != 60) {
+							crimesSamples[policeChannelTimerSeconds] =
+							    sampleIndex;
+							++policeChannelTimer;
+							policeChannelTimerSeconds =
+							    (policeChannelTimerSeconds + 1) % 60;
+						}
+						if(policeChannelTimer != 60) {
+							crimesSamples[policeChannelTimerSeconds] =
+							    m_anRandomTable[2] % 3u +
+							    AUDIO_SAMPLE_POLICE_SCANNER_SMALL_CRACKLE_1;
+							++policeChannelTimer;
+							policeChannelTimerSeconds =
+							    (policeChannelTimerSeconds + 1) % 60;
+						}
+						if(policeChannelTimer != 60) {
+							crimesSamples[policeChannelTimerSeconds] =
+							    TOTAL_AUDIO_SAMPLES;
+							++policeChannelTimer;
+							policeChannelTimerSeconds =
+							    (policeChannelTimerSeconds + 1) % 60;
+						}
+						crimes[i].type = 0;
+						AgeCrimes();
+						return 1;
+					}
+					crimesSamples[policeChannelTimerSeconds] =
+					    AUDIO_SAMPLE_POLICE_SCANNER_CENTRAL;
+					++policeChannelTimer;
+					policeChannelTimerSeconds =
+					    (policeChannelTimerSeconds + 1) % 60;
+				}
+				if(policeChannelTimer != 60) {
+					crimesSamples[policeChannelTimerSeconds] =
+					    AUDIO_SAMPLE_POLICE_SCANNER_WEST;
+					++policeChannelTimer;
+					policeChannelTimerSeconds =
+					    (policeChannelTimerSeconds + 1) % 60;
+				}
+			} else if(policeChannelTimer != 60) {
+				crimesSamples[policeChannelTimerSeconds] =
+				    AUDIO_SAMPLE_POLICE_SCANNER_EAST;
+				++policeChannelTimer;
+				policeChannelTimerSeconds = (policeChannelTimerSeconds + 1) % 60;
+			}
+			if(policeChannelTimer != 60) {
+				crimesSamples[policeChannelTimerSeconds] = sampleIndex;
+				++policeChannelTimer;
+				policeChannelTimerSeconds = (policeChannelTimerSeconds + 1) % 60;
+			}
+			if(policeChannelTimer != 60) {
+				crimesSamples[policeChannelTimerSeconds] =
+				    m_anRandomTable[2] % 3u +
+				    AUDIO_SAMPLE_POLICE_SCANNER_SMALL_CRACKLE_1;
+				++policeChannelTimer;
+				policeChannelTimerSeconds = (policeChannelTimerSeconds + 1) % 60;
+			}
+			if(policeChannelTimer != 60) {
+				crimesSamples[policeChannelTimerSeconds] = TOTAL_AUDIO_SAMPLES;
+				++policeChannelTimer;
+				policeChannelTimerSeconds = (policeChannelTimerSeconds + 1) % 60;
+			}
+		}
+	}
+	crimes[i].type = 0;
+	AgeCrimes();
+	return 1;
 }
 
 WRAPPER
-bool cAudioManager::SetupJumboEngineSound(uint8, int32) { EAXJMP(0x56F140) }
+bool cAudioManager::SetupJumboEngineSound(uint8, int32) { EAXJMP(0x56F140); }
 
 bool
 cAudioManager::SetupJumboFlySound(uint8 emittingVol)
@@ -9858,547 +9895,265 @@ cAudioManager::SetupPedComments(cPedParams *params, uint32 sound)
 	}
 }
 
-struct ColorSoundForScanner
-{
-	eAudioSamples m_eColor1;
-	eAudioSamples m_eColor2;
-	eAudioSamples m_eColor3;
-};
-
 void
 cAudioManager::SetupSuspectLastSeenReport()
 {
-		cAudioManager* v1; // ebp
-		CAutomobile* v2; // eax
-		uint8 v3; // bl
-		unsigned __int8 v4; // dl
-		int v5; // edx
-		int main_color; // edi
-		int v7; // edx
-		eAudioSamples v8; // esi
-		int v9; // eax
-		int v10; // eax
-		uint8 v11; // cl
-		int v12; // eax
-		int v13; // eax
-		int color_pre_modifier; // [esp+8h] [ebp-18h]
-		int color_post_modifier; // [esp+Ch] [ebp-14h]
+	CAutomobile *automobile;
+	uint8 color1;
+	int32 index;
+	int32 main_color;
+	int32 sample;
 
-		constexpr int32 colors[] =
-{
-  3032,
-  248,
-  3032,
-  3032,
-  249,
-  3032,
-  3032,
-  250,
-  3032,
-  3032,
-  251,
-  3032,
-  258,
-  250,
-  3032,
-  3032,
-  252,
-  3032,
-  3032,
-  253,
-  3032,
-  260,
-  250,
-  3032,
-  259,
-  250,
-  254,
-  259,
-  3032,
-  3032,
-  258,
-  3032,
-  3032,
-  258,
-  3032,
-  3032,
-  258,
-  251,
-  3032,
-  3032,
-  251,
-  3032,
-  3032,
-  251,
-  3032,
-  3032,
-  251,
-  3032,
-  3032,
-  251,
-  3032,
-  3032,
-  251,
-  3032,
-  3032,
-  251,
-  3032,
-  259,
-  3032,
-  3032,
-  258,
-  3032,
-  3032,
-  258,
-  3032,
-  3032,
-  258,
-  3032,
-  3032,
-  3032,
-  255,
-  3032,
-  3032,
-  255,
-  3032,
-  3032,
-  255,
-  3032,
-  3032,
-  255,
-  3032,
-  3032,
-  255,
-  3032,
-  3032,
-  255,
-  3032,
-  259,
-  3032,
-  3032,
-  258,
-  3032,
-  3032,
-  258,
-  3032,
-  3032,
-  258,
-  3032,
-  3032,
-  3032,
-  253,
-  3032,
-  3032,
-  253,
-  3032,
-  3032,
-  253,
-  3032,
-  3032,
-  253,
-  3032,
-  3032,
-  253,
-  3032,
-  3032,
-  253,
-  3032,
-  259,
-  3032,
-  3032,
-  258,
-  3032,
-  3032,
-  258,
-  3032,
-  3032,
-  258,
-  3032,
-  3032,
-  3032,
-  256,
-  3032,
-  3032,
-  256,
-  3032,
-  3032,
-  256,
-  3032,
-  3032,
-  256,
-  3032,
-  3032,
-  256,
-  3032,
-  3032,
-  256,
-  3032,
-  259,
-  3032,
-  3032,
-  258,
-  3032,
-  3032,
-  258,
-  3032,
-  3032,
-  258,
-  3032,
-  3032,
-  3032,
-  250,
-  3032,
-  3032,
-  250,
-  3032,
-  3032,
-  250,
-  3032,
-  3032,
-  250,
-  3032,
-  3032,
-  250,
-  3032,
-  3032,
-  250,
-  3032,
-  259,
-  3032,
-  3032,
-  258,
-  3032,
-  3032,
-  258,
-  3032,
-  3032,
-  258,
-  3032,
-  3032,
-  3032,
-  252,
-  3032,
-  3032,
-  252,
-  3032,
-  3032,
-  252,
-  3032,
-  3032,
-  252,
-  3032,
-  3032,
-  252,
-  3032,
-  3032,
-  252,
-  3032,
-  259,
-  3032,
-  3032,
-  258,
-  3032,
-  3032,
-  258,
-  3032,
-  3032,
-  258,
-  3032,
-  3032,
-  3032,
-  257,
-  3032,
-  3032,
-  257,
-  3032,
-  3032,
-  257,
-  3032,
-  3032,
-  257,
-  3032,
-  3032,
-  257,
-  3032,
-  3032,
-  257,
-  3032,
-  259,
-  3032,
-  3032,
-  259,
-  3032,
-  3032,
-  259,
-  3032,
-  3032,
-  259,
-  3032,
-  3032,
-  259,
-  3032,
-  3032,
-  259,
-  3032,
-  3032,
-  259,
-  3032,
-  3032,
-  259,
-  3032,
-  3032,
-  259,
-  3032,
-  3032,
-  259,
-  3032,
-  3032,
-  259,
-  3032,
-  3032,
-  258,
-  3032,
-  3032,
-  258,
-  3032,
-  3032,
-  258,
-  3032,
-  3032,
-  258,
-  3032,
-  3032,
-  258,
-  3032,
-  3032
-};
+	int32 color_pre_modifier;
+	int32 color_post_modifier;
 
-		v1 = this;
-		if (MusicManager.m_nMusicMode != 2)
-		{
-			v2 = (CAutomobile*)FindPlayerVehicle();
-			if (v2)
-			{
-				v3 = v1->policeChannelTimer;
-				if (60 - v3 > 9u)
-				{
-					v4 = v2->m_currentColour1;
-					if (v4 >= 95u)
-					{
-						debug("\n *** UNKNOWN CAR COLOUR %d *** ", v4);
+	constexpr int32 colors[] = {
+	    3032, 248,  3032, 3032, 249,  3032, 3032, 250,  3032, 3032, 251,  3032, 258,  250,
+	    3032, 3032, 252,  3032, 3032, 253,  3032, 260,  250,  3032, 259,  250,  254,  259,
+	    3032, 3032, 258,  3032, 3032, 258,  3032, 3032, 258,  251,  3032, 3032, 251,  3032,
+	    3032, 251,  3032, 3032, 251,  3032, 3032, 251,  3032, 3032, 251,  3032, 3032, 251,
+	    3032, 259,  3032, 3032, 258,  3032, 3032, 258,  3032, 3032, 258,  3032, 3032, 3032,
+	    255,  3032, 3032, 255,  3032, 3032, 255,  3032, 3032, 255,  3032, 3032, 255,  3032,
+	    3032, 255,  3032, 259,  3032, 3032, 258,  3032, 3032, 258,  3032, 3032, 258,  3032,
+	    3032, 3032, 253,  3032, 3032, 253,  3032, 3032, 253,  3032, 3032, 253,  3032, 3032,
+	    253,  3032, 3032, 253,  3032, 259,  3032, 3032, 258,  3032, 3032, 258,  3032, 3032,
+	    258,  3032, 3032, 3032, 256,  3032, 3032, 256,  3032, 3032, 256,  3032, 3032, 256,
+	    3032, 3032, 256,  3032, 3032, 256,  3032, 259,  3032, 3032, 258,  3032, 3032, 258,
+	    3032, 3032, 258,  3032, 3032, 3032, 250,  3032, 3032, 250,  3032, 3032, 250,  3032,
+	    3032, 250,  3032, 3032, 250,  3032, 3032, 250,  3032, 259,  3032, 3032, 258,  3032,
+	    3032, 258,  3032, 3032, 258,  3032, 3032, 3032, 252,  3032, 3032, 252,  3032, 3032,
+	    252,  3032, 3032, 252,  3032, 3032, 252,  3032, 3032, 252,  3032, 259,  3032, 3032,
+	    258,  3032, 3032, 258,  3032, 3032, 258,  3032, 3032, 3032, 257,  3032, 3032, 257,
+	    3032, 3032, 257,  3032, 3032, 257,  3032, 3032, 257,  3032, 3032, 257,  3032, 259,
+	    3032, 3032, 259,  3032, 3032, 259,  3032, 3032, 259,  3032, 3032, 259,  3032, 3032,
+	    259,  3032, 3032, 259,  3032, 3032, 259,  3032, 3032, 259,  3032, 3032, 259,  3032,
+	    3032, 259,  3032, 3032, 258,  3032, 3032, 258,  3032, 3032, 258,  3032, 3032, 258,
+	    3032, 3032, 258,  3032, 3032};
+
+	if(MusicManager.m_nMusicMode != 2) {
+		automobile = (CAutomobile *)FindPlayerVehicle();
+		if(automobile) {
+			if(60 - policeChannelTimer > 9u) {
+				color1 = automobile->m_currentColour1;
+				if(color1 >= 95u) {
+					debug("\n *** UNKNOWN CAR COLOUR %d *** ", color1);
+				} else {
+					index = 3 * color1;
+					main_color = colors[index + 1]; // todo refactor struct
+					color_pre_modifier = colors[index];
+					color_post_modifier = colors[index + 2];
+					switch(automobile->m_modelIndex) {
+					case MI_LANDSTAL:
+					case MI_BLISTA:
+						sample = AUDIO_SAMPLE_POLICE_SCANNER_CAR_CRUISER;
+						break;
+					case MI_IDAHO:
+					case MI_STALLION:
+						sample =
+						    AUDIO_SAMPLE_POLICE_SCANNER_CAR_CONVERTIBLE;
+						break;
+					case MI_STINGER:
+					case MI_INFERNUS:
+					case MI_CHEETAH:
+					case MI_BANSHEE:
+						sample = AUDIO_SAMPLE_POLICE_SCANNER_CAR_SPORTS_CAR;
+						break;
+					case MI_PEREN:
+					case MI_SENTINEL:
+					case MI_FBICAR:
+						sample = AUDIO_SAMPLE_POLICE_SCANNER_CAR_ECONOMY;
+						break;
+					case MI_PATRIOT:
+					case MI_BOBCAT:
+						sample = AUDIO_SAMPLE_POLICE_SCANNER_CAR_PICKUP;
+						break;
+					case MI_FIRETRUCK:
+						sample = AUDIO_SAMPLE_POLICE_SCANNER_CAR_FIRETRUCK;
+						break;
+					case MI_TRASH:
+					case MI_BARRACKS:
+						sample = AUDIO_SAMPLE_POLICE_SCANNER_CAR_TRUCK;
+						break;
+					case MI_STRETCH:
+						sample = AUDIO_SAMPLE_POLICE_SCANNER_CAR_LIMO;
+						break;
+					case MI_MANANA:
+					case MI_ESPERANT:
+						sample = AUDIO_SAMPLE_POLICE_SCANNER_CAR_COUPE;
+						break;
+					case MI_PONY:
+					case MI_MULE:
+					case MI_MOONBEAM:
+					case MI_ENFORCER:
+					case MI_SECURICA:
+					case MI_RUMPO:
+						sample = AUDIO_SAMPLE_POLICE_SCANNER_CAR_VAN;
+						break;
+					case MI_AMBULAN:
+						sample = AUDIO_SAMPLE_POLICE_SCANNER_CAR_AMBULANCE;
+						break;
+					case MI_TAXI:
+					case MI_CABBIE:
+					case MI_BORGNINE:
+						sample = AUDIO_SAMPLE_POLICE_SCANNER_CAR_TAXI;
+						break;
+					case MI_MRWHOOP:
+						sample =
+						    AUDIO_SAMPLE_POLICE_SCANNER_CAR_ICE_CREAM_TRUCK;
+						break;
+					case MI_BFINJECT:
+						sample = AUDIO_SAMPLE_POLICE_SCANNER_CAR_BUGGY;
+						break;
+					case MI_POLICE:
+						sample = AUDIO_SAMPLE_POLICE_SCANNER_CAR_POLICE_CAR;
+						break;
+					case MI_PREDATOR:
+						sample = AUDIO_SAMPLE_POLICE_SCANNER_CAR_BOAT;
+						break;
+					case MI_BUS:
+					case MI_COACH:
+						sample = AUDIO_SAMPLE_POLICE_SCANNER_CAR_BUS;
+						break;
+					case MI_RHINO:
+						sample = AUDIO_SAMPLE_POLICE_SCANNER_CAR_TANK;
+						main_color = TOTAL_AUDIO_SAMPLES;
+						color_post_modifier = TOTAL_AUDIO_SAMPLES;
+						break;
+					case MI_TRAIN:
+						sample = AUDIO_SAMPLE_POLICE_SCANNER_CAR_SUBWAY_CAR;
+						main_color = TOTAL_AUDIO_SAMPLES;
+						color_post_modifier = TOTAL_AUDIO_SAMPLES;
+
+						break;
+					default:
+						debug("\n *** UNKNOWN CAR MODEL INDEX %d *** ",
+						      automobile->m_modelIndex);
+						return;
 					}
-					else
-					{
-						v5 = 3 * v4;
-						main_color = colors[v5 + 1]; //todo refactor struct
-						color_pre_modifier = colors[v5];
-						color_post_modifier = colors[v5 + 2];
-						v7 = v2->m_modelIndex;
-						switch (v7)
-						{
-						case MI_LANDSTAL:
-						case MI_BLISTA:
-							v8 = AUDIO_SAMPLE_POLICE_SCANNER_CAR_CRUISER;
-							goto LABEL_28;
-						case MI_IDAHO:
-						case MI_STALLION:
-							v8 = AUDIO_SAMPLE_POLICE_SCANNER_CAR_CONVERTIBLE;
-							goto LABEL_28;
-						case MI_STINGER:
-						case MI_INFERNUS:
-						case MI_CHEETAH:
-						case MI_BANSHEE:
-							v8 = AUDIO_SAMPLE_POLICE_SCANNER_CAR_SPORTS_CAR;
-							goto LABEL_28;
-						case MI_PEREN:
-						case MI_SENTINEL:
-						case MI_FBICAR:
-							v8 = AUDIO_SAMPLE_POLICE_SCANNER_CAR_ECONOMY;
-							goto LABEL_28;
-						case MI_PATRIOT:
-						case MI_BOBCAT:
-							v8 = AUDIO_SAMPLE_POLICE_SCANNER_CAR_PICKUP;
-							goto LABEL_28;
-						case MI_FIRETRUCK:
-							v8 = AUDIO_SAMPLE_POLICE_SCANNER_CAR_FIRETRUCK;
-							goto LABEL_28;
-						case MI_TRASH:
-						case MI_BARRACKS:
-							v8 = AUDIO_SAMPLE_POLICE_SCANNER_CAR_TRUCK;
-							goto LABEL_28;
-						case MI_STRETCH:
-							v8 = AUDIO_SAMPLE_POLICE_SCANNER_CAR_LIMO;
-							goto LABEL_28;
-						case MI_MANANA:
-						case MI_ESPERANT:
-							v8 = AUDIO_SAMPLE_POLICE_SCANNER_CAR_COUPE;
-							goto LABEL_28;
-						case MI_PONY:
-						case MI_MULE:
-						case MI_MOONBEAM:
-						case MI_ENFORCER:
-						case MI_SECURICA:
-						case MI_RUMPO:
-							v8 = AUDIO_SAMPLE_POLICE_SCANNER_CAR_VAN;
-							goto LABEL_28;
-						case MI_AMBULAN:
-							v8 = AUDIO_SAMPLE_POLICE_SCANNER_CAR_AMBULANCE;
-							goto LABEL_28;
-						case MI_TAXI:
-						case MI_CABBIE:
-						case MI_BORGNINE:
-							v8 = AUDIO_SAMPLE_POLICE_SCANNER_CAR_TAXI;
-							goto LABEL_28;
-						case MI_MRWHOOP:
-							v8 = AUDIO_SAMPLE_POLICE_SCANNER_CAR_ICE_CREAM_TRUCK;
-							goto LABEL_28;
-						case MI_BFINJECT:
-							v8 = AUDIO_SAMPLE_POLICE_SCANNER_CAR_BUGGY;
-							goto LABEL_28;
-						case MI_POLICE:
-							v8 = AUDIO_SAMPLE_POLICE_SCANNER_CAR_POLICE_CAR;
-							goto LABEL_28;
-						case MI_PREDATOR:
-							v8 = AUDIO_SAMPLE_POLICE_SCANNER_CAR_BOAT;
-							goto LABEL_28;
-						case MI_BUS:
-						case MI_COACH:
-							v8 = AUDIO_SAMPLE_POLICE_SCANNER_CAR_BUS;
-							goto LABEL_28;
-						case MI_RHINO:
-							v8 = AUDIO_SAMPLE_POLICE_SCANNER_CAR_TANK;
-							main_color = TOTAL_AUDIO_SAMPLES;
-							color_post_modifier = TOTAL_AUDIO_SAMPLES;
-							goto LABEL_28;
-						case MI_TRAIN:
-							v8 = AUDIO_SAMPLE_POLICE_SCANNER_CAR_SUBWAY_CAR;
-							main_color = TOTAL_AUDIO_SAMPLES;
-							color_post_modifier = TOTAL_AUDIO_SAMPLES;
-						LABEL_28:
-							v9 = -1431655765 * v1->m_anRandomTable[4];
-							if (v3 != 60)
-							{
-								v1->crimesSamples[v1->policeChannelTimerSeconds] = v1->m_anRandomTable[4] % 3u
-									+ AUDIO_SAMPLE_POLICE_SCANNER_SMALL_CRACKLE_1;
-								++v1->policeChannelTimer;
-								v1->policeChannelTimerSeconds = (v1->policeChannelTimerSeconds + 1) % 60;
-							}
-							if (v1->policeChannelTimer != 60)
-							{
-								v1->crimesSamples[v1->policeChannelTimerSeconds] = AUDIO_SAMPLE_POLICE_SCANNER_SUSPECT;
-								++v1->policeChannelTimer;
-								v1->policeChannelTimerSeconds = (v1->policeChannelTimerSeconds + 1) % 60;
-							}
-							if (v1->m_anRandomTable[3] & 1 && v1->policeChannelTimer != 60)
-							{
-								v1->crimesSamples[v1->policeChannelTimerSeconds] = AUDIO_SAMPLE_POLICE_SCANNER_LAST_SEEN;
-								++v1->policeChannelTimer;
-								v1->policeChannelTimerSeconds = (v1->policeChannelTimerSeconds + 1) % 60;
-							}
-							if (main_color == AUDIO_SAMPLE_POLICE_SCANNER_COLOR_ORANGE)
-							{
-								if (v1->policeChannelTimer != 60)
-								{
-									v1->crimesSamples[v1->policeChannelTimerSeconds] = AUDIO_SAMPLE_POLICE_SCANNER_IN_AN;
-									++v1->policeChannelTimer;
-									v1->policeChannelTimerSeconds = (v1->policeChannelTimerSeconds + 1) % 60;
-								}
-							}
-							else if (v1->policeChannelTimer != 60)
-							{
-								v1->crimesSamples[v1->policeChannelTimerSeconds] = AUDIO_SAMPLE_POLICE_SCANNER_IN_A;
-								++v1->policeChannelTimer;
-								v1->policeChannelTimerSeconds = (v1->policeChannelTimerSeconds + 1) % 60;
-							}
-							if (color_pre_modifier != 3032 && v1->policeChannelTimer != 60)
-							{
-								v1->crimesSamples[v1->policeChannelTimerSeconds] = color_pre_modifier;
-								++v1->policeChannelTimer;
-								v1->policeChannelTimerSeconds = (v1->policeChannelTimerSeconds + 1) % 60;
-							}
-							if (main_color != 3032 && v1->policeChannelTimer != 60)
-							{
-								v1->crimesSamples[v1->policeChannelTimerSeconds] = main_color;
-								++v1->policeChannelTimer;
-								v1->policeChannelTimerSeconds = (v1->policeChannelTimerSeconds + 1) % 60;
-							}
-							if (color_post_modifier != 3032 && v1->policeChannelTimer != 60)
-							{
-								v1->crimesSamples[v1->policeChannelTimerSeconds] = color_post_modifier;
-								++v1->policeChannelTimer;
-								v1->policeChannelTimerSeconds = (v1->policeChannelTimerSeconds + 1) % 60;
-							}
-							if (v1->policeChannelTimer != 60)
-							{
-								v1->crimesSamples[v1->policeChannelTimerSeconds] = v8;
-								++v1->policeChannelTimer;
-								v1->policeChannelTimerSeconds = (v1->policeChannelTimerSeconds + 1) % 60;
-							}
-							v10 = -1431655765 * v1->m_anRandomTable[0];
-							if (v1->policeChannelTimer != 60)
-							{
-								v1->crimesSamples[v1->policeChannelTimerSeconds] = v1->m_anRandomTable[0] % 3u
-									+ AUDIO_SAMPLE_POLICE_SCANNER_SMALL_CRACKLE_1;
-								++v1->policeChannelTimer;
-								v1->policeChannelTimerSeconds = (v1->policeChannelTimerSeconds + 1) % 60;
-							}
-							if (v1->policeChannelTimer != 60)
-							{
-								v1->crimesSamples[v1->policeChannelTimerSeconds] = TOTAL_AUDIO_SAMPLES;
-								++v1->policeChannelTimer;
-								v1->policeChannelTimerSeconds = (v1->policeChannelTimerSeconds + 1) % 60;
-							}
-							break;
-						default:
-							debug("\n *** UNKNOWN CAR MODEL INDEX %d *** ", v7);
-							break;
+					if(policeChannelTimer != 60) {
+						crimesSamples[policeChannelTimerSeconds] =
+						    m_anRandomTable[4] % 3u +
+						    AUDIO_SAMPLE_POLICE_SCANNER_SMALL_CRACKLE_1;
+						++policeChannelTimer;
+						policeChannelTimerSeconds =
+						    (policeChannelTimerSeconds + 1) % 60;
+					}
+					if(policeChannelTimer != 60) {
+						crimesSamples[policeChannelTimerSeconds] =
+						    AUDIO_SAMPLE_POLICE_SCANNER_SUSPECT;
+						++policeChannelTimer;
+						policeChannelTimerSeconds =
+						    (policeChannelTimerSeconds + 1) % 60;
+					}
+					if(m_anRandomTable[3] & 1 && policeChannelTimer != 60) {
+						crimesSamples[policeChannelTimerSeconds] =
+						    AUDIO_SAMPLE_POLICE_SCANNER_LAST_SEEN;
+						++policeChannelTimer;
+						policeChannelTimerSeconds =
+						    (policeChannelTimerSeconds + 1) % 60;
+					}
+					if(main_color == AUDIO_SAMPLE_POLICE_SCANNER_COLOR_ORANGE) {
+						if(policeChannelTimer != 60) {
+							crimesSamples[policeChannelTimerSeconds] =
+							    AUDIO_SAMPLE_POLICE_SCANNER_IN_AN;
+							++policeChannelTimer;
+							policeChannelTimerSeconds =
+							    (policeChannelTimerSeconds + 1) % 60;
 						}
+					} else if(policeChannelTimer != 60) {
+						crimesSamples[policeChannelTimerSeconds] =
+						    AUDIO_SAMPLE_POLICE_SCANNER_IN_A;
+						++policeChannelTimer;
+						policeChannelTimerSeconds =
+						    (policeChannelTimerSeconds + 1) % 60;
+					}
+					if(color_pre_modifier != 3032 && policeChannelTimer != 60) {
+						crimesSamples[policeChannelTimerSeconds] =
+						    color_pre_modifier;
+						++policeChannelTimer;
+						policeChannelTimerSeconds =
+						    (policeChannelTimerSeconds + 1) % 60;
+					}
+					if(main_color != 3032 && policeChannelTimer != 60) {
+						crimesSamples[policeChannelTimerSeconds] =
+						    main_color;
+						++policeChannelTimer;
+						policeChannelTimerSeconds =
+						    (policeChannelTimerSeconds + 1) % 60;
+					}
+					if(color_post_modifier != 3032 &&
+					   policeChannelTimer != 60) {
+						crimesSamples[policeChannelTimerSeconds] =
+						    color_post_modifier;
+						++policeChannelTimer;
+						policeChannelTimerSeconds =
+						    (policeChannelTimerSeconds + 1) % 60;
+					}
+					if(policeChannelTimer != 60) {
+						crimesSamples[policeChannelTimerSeconds] = sample;
+						++policeChannelTimer;
+						policeChannelTimerSeconds =
+						    (policeChannelTimerSeconds + 1) % 60;
+					}
+					if(policeChannelTimer != 60) {
+						crimesSamples[policeChannelTimerSeconds] =
+						    m_anRandomTable[0] % 3u +
+						    AUDIO_SAMPLE_POLICE_SCANNER_SMALL_CRACKLE_1;
+						++policeChannelTimer;
+						policeChannelTimerSeconds =
+						    (policeChannelTimerSeconds + 1) % 60;
+					}
+					if(policeChannelTimer != 60) {
+						crimesSamples[policeChannelTimerSeconds] =
+						    TOTAL_AUDIO_SAMPLES;
+						++policeChannelTimer;
+						policeChannelTimerSeconds =
+						    (policeChannelTimerSeconds + 1) % 60;
 					}
 				}
 			}
-			else
-			{
-				v11 = v1->policeChannelTimer;
-				if (60 - v11 > 4u)
-				{
-					v12 = -1431655765 * v1->m_anRandomTable[4];
-					if (v11 != 60)
-					{
-						v1->crimesSamples[v1->policeChannelTimerSeconds] = v1->m_anRandomTable[4] % 3u
-							+ AUDIO_SAMPLE_POLICE_SCANNER_SMALL_CRACKLE_1;
-						++v1->policeChannelTimer;
-						v1->policeChannelTimerSeconds = (v1->policeChannelTimerSeconds + 1) % 60;
-					}
-					if (v1->policeChannelTimer != 60)
-					{
-						v1->crimesSamples[v1->policeChannelTimerSeconds] = AUDIO_SAMPLE_POLICE_SCANNER_SUSPECT;
-						++v1->policeChannelTimer;
-						v1->policeChannelTimerSeconds = (v1->policeChannelTimerSeconds + 1) % 60;
-					}
-					if (v1->policeChannelTimer != 60)
-					{
-						v1->crimesSamples[v1->policeChannelTimerSeconds] = AUDIO_SAMPLE_POLICE_SCANNER_ON_FOOT;
-						++v1->policeChannelTimer;
-						v1->policeChannelTimerSeconds = (v1->policeChannelTimerSeconds + 1) % 60;
-					}
-					v13 = -1431655765 * v1->m_anRandomTable[0];
-					if (v1->policeChannelTimer != 60)
-					{
-						v1->crimesSamples[v1->policeChannelTimerSeconds] = v1->m_anRandomTable[0] % 3u
-							+ AUDIO_SAMPLE_POLICE_SCANNER_SMALL_CRACKLE_1;
-						++v1->policeChannelTimer;
-						v1->policeChannelTimerSeconds = (v1->policeChannelTimerSeconds + 1) % 60;
-					}
-					if (v1->policeChannelTimer != 60)
-					{
-						v1->crimesSamples[v1->policeChannelTimerSeconds] = TOTAL_AUDIO_SAMPLES;
-						++v1->policeChannelTimer;
-						v1->policeChannelTimerSeconds = (v1->policeChannelTimerSeconds + 1) % 60;
-					}
+		} else {
+			if(60 - policeChannelTimer > 4u) {
+				if(policeChannelTimer != 60) {
+					crimesSamples[policeChannelTimerSeconds] =
+					    m_anRandomTable[4] % 3u +
+					    AUDIO_SAMPLE_POLICE_SCANNER_SMALL_CRACKLE_1;
+					++policeChannelTimer;
+					policeChannelTimerSeconds =
+					    (policeChannelTimerSeconds + 1) % 60;
+				}
+				if(policeChannelTimer != 60) {
+					crimesSamples[policeChannelTimerSeconds] =
+					    AUDIO_SAMPLE_POLICE_SCANNER_SUSPECT;
+					++policeChannelTimer;
+					policeChannelTimerSeconds =
+					    (policeChannelTimerSeconds + 1) % 60;
+				}
+				if(policeChannelTimer != 60) {
+					crimesSamples[policeChannelTimerSeconds] =
+					    AUDIO_SAMPLE_POLICE_SCANNER_ON_FOOT;
+					++policeChannelTimer;
+					policeChannelTimerSeconds =
+					    (policeChannelTimerSeconds + 1) % 60;
+				}
+				if(policeChannelTimer != 60) {
+					crimesSamples[policeChannelTimerSeconds] =
+					    m_anRandomTable[0] % 3u +
+					    AUDIO_SAMPLE_POLICE_SCANNER_SMALL_CRACKLE_1;
+					++policeChannelTimer;
+					policeChannelTimerSeconds =
+					    (policeChannelTimerSeconds + 1) % 60;
+				}
+				if(policeChannelTimer != 60) {
+					crimesSamples[policeChannelTimerSeconds] =
+					    TOTAL_AUDIO_SAMPLES;
+					++policeChannelTimer;
+					policeChannelTimerSeconds =
+					    (policeChannelTimerSeconds + 1) % 60;
 				}
 			}
 		}
-	
+	}
 }
 
 void
@@ -10464,7 +10219,7 @@ WRAPPER
 void
 cAudioManager::UpdateReflections()
 {
-	EAXJMP(0x57B470)
+	EAXJMP(0x57B470);
 }
 
 bool
@@ -10644,6 +10399,7 @@ InjectHook(0x56AD10, &cAudioManager::PlayerJustGotInCar, PATCH_JUMP);
 InjectHook(0x56AD20, &cAudioManager::PlayerJustLeftCar, PATCH_JUMP);
 InjectHook(0x579620, &cAudioManager::PlayLoadedMissionAudio, PATCH_JUMP);
 InjectHook(0x57A500, &cAudioManager::PlayOneShot, PATCH_JUMP);
+InjectHook(0x580500, &cAudioManager::PlaySuspectLastSeen, PATCH_JUMP);
 InjectHook(0x569420, &cAudioManager::PostInitialiseGameSpecificSetup, PATCH_JUMP);
 InjectHook(0x569640, &cAudioManager::PostTerminateGameSpecificShutdown, PATCH_JUMP);
 InjectHook(0x569400, &cAudioManager::PreInitialiseGameSpecificSetup, PATCH_JUMP);
@@ -10731,11 +10487,13 @@ InjectHook(0x57A750, &cAudioManager::SetMusicMasterVolume, PATCH_JUMP);
 InjectHook(0x57A9A0, &cAudioManager::SetSpeakerConfig, PATCH_JUMP);
 InjectHook(0x568D30, &cAudioManager::SetUpLoopingCollisionSound, PATCH_JUMP);
 InjectHook(0x5689D0, &cAudioManager::SetUpOneShotCollisionSound, PATCH_JUMP);
+InjectHook(0x57F5B0, &cAudioManager::SetupCrimeReport, PATCH_JUMP);
 InjectHook(0x56F230, &cAudioManager::SetupJumboFlySound, PATCH_JUMP);
 InjectHook(0x56F310, &cAudioManager::SetupJumboRumbleSound, PATCH_JUMP);
 InjectHook(0x56EF20, &cAudioManager::SetupJumboTaxiSound, PATCH_JUMP);
 InjectHook(0x56F070, &cAudioManager::SetupJumboWhineSound, PATCH_JUMP);
 InjectHook(0x570690, &cAudioManager::SetupPedComments, PATCH_JUMP);
+InjectHook(0x57FCC0, &cAudioManager::SetupSuspectLastSeenReport, PATCH_JUMP);
 InjectHook(0x57A150, &cAudioManager::Terminate, PATCH_JUMP);
 InjectHook(0x57AC60, &cAudioManager::TranslateEntity, PATCH_JUMP);
 InjectHook(0x56AC80, &cAudioManager::UpdateGasPedalAudio, PATCH_JUMP);
diff --git a/src/audio/AudioManager.h b/src/audio/AudioManager.h
index a3cbd37d..6adab9b1 100644
--- a/src/audio/AudioManager.h
+++ b/src/audio/AudioManager.h
@@ -4,9 +4,8 @@
 #include "DMAudio.h"
 #include "common.h"
 
-class tActiveSample
+struct tActiveSample
 {
-public:
 	int32 m_nEntityIndex;
 	int32 m_counter;
 	int32 m_nSampleIndex;
@@ -76,9 +75,8 @@ enum eAudioType : int32 {
 class CPhysical;
 class CAutomobile;
 
-class tAudioEntity
+struct tAudioEntity
 {
-public:
 	eAudioType m_nType;
 	void *m_pEntity;
 	bool m_bIsUsed;
@@ -94,9 +92,8 @@ public:
 
 static_assert(sizeof(tAudioEntity) == 40, "tAudioEntity: error");
 
-class tPedComment
+struct tPedComment
 {
-public:
 	int32 m_nSampleIndex;
 	int32 m_entityIndex;
 	CVector m_vecPos;
@@ -445,8 +442,8 @@ public:
 	bool MissionScriptAudioUsesPoliceChannel(int32 soundMission) const; /// ok
 
 	void PlayLoadedMissionAudio();                         /// ok
-	void PlayOneShot(int32 index, int16 sound, float vol); // to do (need testing)
-	void PlaySuspectLastSeen(float x, float y, float z); // todo cleanup and hook
+	void PlayOneShot(int32 index, int16 sound, float vol); /// ok
+	void PlaySuspectLastSeen(float x, float y, float z);   /// ok
 	void PlayerJustGotInCar() const;                       /// ok
 	void PlayerJustLeftCar() const;                        /// ok
 	void PostInitialiseGameSpecificSetup();                /// ok
@@ -551,14 +548,14 @@ public:
 	void SetSpeakerConfig(int32 conf) const;
 	void SetUpLoopingCollisionSound(cAudioCollision *col, uint8 counter); /// ok
 	void SetUpOneShotCollisionSound(cAudioCollision *col);                /// ok
-	bool SetupCrimeReport();                                              // todo cleanup and hook
+	bool SetupCrimeReport();                                              /// ok
 	bool SetupJumboEngineSound(uint8 a2, int32 a3);                       // todo
 	bool SetupJumboFlySound(uint8 emittingVol);                           /// ok
 	bool SetupJumboRumbleSound(uint8 emittingVol);                        /// ok
 	bool SetupJumboTaxiSound(uint8 vol);                                  /// ok
 	bool SetupJumboWhineSound(uint8 emittingVol, int32 freq);             /// ok
 	void SetupPedComments(cPedParams *params, uint32 sound);              /// ok
-	void SetupSuspectLastSeenReport();                                    // todo cleanup and hook
+	void SetupSuspectLastSeenReport();                                    /// ok
 
 	void Terminate();
 	void TranslateEntity(CVector *v1, CVector *v2) const;

From c27dbcfe6d3693eb7c147c76c68deda7b5e93ffa Mon Sep 17 00:00:00 2001
From: Filip Gawin <filip.gawin@zoho.com>
Date: Sat, 12 Oct 2019 22:21:44 +0200
Subject: [PATCH 16/37] Cleanup audio

---
 src/audio/AudioManager.cpp | 88 ++++++++++++++++----------------------
 src/audio/AudioManager.h   | 19 ++++----
 2 files changed, 44 insertions(+), 63 deletions(-)

diff --git a/src/audio/AudioManager.cpp b/src/audio/AudioManager.cpp
index 956af34d..867e53c4 100644
--- a/src/audio/AudioManager.cpp
+++ b/src/audio/AudioManager.cpp
@@ -31,9 +31,9 @@
 #include "Vehicle.h"
 #include "WaterCannon.h"
 #include "Weather.h"
-#include "Zones.h"
 #include "World.h"
 #include "ZoneCull.h"
+#include "Zones.h"
 #include "sampman.h"
 
 cAudioManager &AudioManager = *(cAudioManager *)0x880FC0;
@@ -47,16 +47,15 @@ bool &bPlayerJustEnteredCar = *(bool *)0x6508C4;
 bool &g_bMissionAudioLoadFailed = *(bool *)0x95CD8E;
 uint32 *gMinTimeToNextReport = (uint32 *)0x8E2828;
 uint8 &gSpecialSuspectLastSeenReport = *(uint8 *)0x95CD4D;
-//uint32 *gOneShotCol = (uint32 *)0x604BD0;
 bool *somethingWithHorns = (bool *)0x606AB8;
 
 constexpr int totalAudioEntitiesSlots = 200;
 constexpr int maxVolume = 127;
 constexpr int policeChannel = 28;
-constexpr uint8 panTable[64]{
-    0,  3,  8,  12, 16, 19, 22, 24, 26, 28, 30, 31, 33, 34, 36, 37, 39, 40, 41, 42, 44, 45,
-    46, 47, 48, 49, 49, 50, 51, 52, 53, 53, 54, 55, 55, 56, 56, 57, 57, 58, 58, 58, 59, 59,
-    59, 60, 60, 61, 61, 61, 61, 62, 62, 62, 62, 62, 63, 63, 63, 63, 63, 63, 63, 63};
+constexpr uint8 panTable[64]{0,  3,  8,  12, 16, 19, 22, 24, 26, 28, 30, 31, 33, 34, 36, 37,
+                             39, 40, 41, 42, 44, 45, 46, 47, 48, 49, 49, 50, 51, 52, 53, 53,
+                             54, 55, 55, 56, 56, 57, 57, 58, 58, 58, 59, 59, 59, 60, 60, 61,
+                             61, 61, 61, 62, 62, 62, 62, 62, 63, 63, 63, 63, 63, 63, 63, 63};
 
 // TODO: where is this used? Is this the right file?
 enum eVehicleModel {
@@ -666,8 +665,8 @@ cAudioManager::DestroyAllGameCreatedEntities()
 				case AUDIOTYPE_SCRIPTOBJECT:
 					entity =
 					    (cAudioScriptObject *)m_asAudioEntities[i].m_pEntity;
-					if(entity) { 
-						delete entity; 
+					if(entity) {
+						delete entity;
 						m_asAudioEntities[i].m_pEntity = nil;
 					}
 					DestroyEntity(i);
@@ -3162,16 +3161,15 @@ cAudioManager::InitialisePoliceRadio()
 	for(int32 i = 0; i < 18; i++) { gMinTimeToNextReport[i] = m_nTimeOfRecentCrime; }
 }
 
-struct tPoliceRadioZone
-{
-  char m_aName[8];
-  uint32 m_nSampleIndex;
-  int32 field_12;
+struct tPoliceRadioZone {
+	char m_aName[8];
+	uint32 m_nSampleIndex;
+	int32 field_12;
 };
 
-tPoliceRadioZone* ZoneSfx = (tPoliceRadioZone*)0x880240;
-char* SubZo2Label = (char*)0x6E9918;
-char* SubZo3Label = (char*)0x6E9870;
+tPoliceRadioZone *ZoneSfx = (tPoliceRadioZone *)0x880240;
+char *SubZo2Label = (char *)0x6E9918;
+char *SubZo3Label = (char *)0x6E9870;
 
 void
 cAudioManager::InitialisePoliceRadioZones()
@@ -3318,24 +3316,12 @@ void
 cAudioManager::PlayOneShot(int32 index, int16 sound, float vol)
 {
 	static constexpr uint8 byte_60ABD0[168] = {
-	3,   3,   3,   3,   3,   3,   3,   3,   3,   3,
-	3,   3,   3,   5,   5,   5,   3,   5,   2,   2,
-	1,   1,   3,   1,   3,   3,   1,   1,   1,   4,
-	4,   3,   1,   1,   1,   1,   1,   1,   1,   1,
-	1,   1,   1,   1,   1,   6,   1,   1,   3,   2,
-	2,   2,   2,   0,   0,   6,   6,   0,   0,   0,
-	0,   0,   0,   0,   0,   0,   0,   0,   1,   2,
-	1,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-	0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-	0,   0,   1,   1,   0,   0,   0,   3,   1,   1,
-	1,   9,   2,   2,   0,   0,   0,   0,   3,   3,
-	5,   1,   1,   1,   1,   3,   4,   7,   6,   6,
-	6,   6,   1,   3,   4,   3,   4,   2,   1,   3,
-	5,   4,   6,   6,   1,   3,   1,   1,   1,   0,
-	0,   0,   0,   0,   0,   3,   1,   0,   0,   0,
-	0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-	0,   0,   0,   0,   0,   0,   0,   0
-	};
+	    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 5, 5, 5, 3, 5, 2, 2, 1, 1, 3, 1, 3, 3, 1, 1,
+	    1, 4, 4, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 6, 1, 1, 3, 2, 2, 2, 2, 0, 0, 6,
+	    6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	    0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 3, 1, 1, 1, 9, 2, 2, 0, 0, 0, 0, 3, 3, 5, 1,
+	    1, 1, 1, 3, 4, 7, 6, 6, 6, 6, 1, 3, 4, 3, 4, 2, 1, 3, 5, 4, 6, 6, 1, 3, 1, 1, 1, 0,
+	    0, 0, 0, 0, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
 
 	if(m_bIsInitialised) {
 		if(index >= 0 && index < totalAudioEntitiesSlots) {
@@ -3367,8 +3353,8 @@ cAudioManager::PlayOneShot(int32 index, int16 sound, float vol)
 								return;
 							}
 							if(byte_60ABD0[m_asAudioEntities[index]
-							                .m_awAudioEvent[i]] >
-								byte_60ABD0[sound])
+							                   .m_awAudioEvent[i]] >
+							   byte_60ABD0[sound])
 								break;
 							++i;
 						}
@@ -4580,8 +4566,7 @@ cAudioManager::ProcessFrontEnd()
 
 	for(uint32 i = 0; i < m_asAudioEntities[m_sQueueSample.m_nEntityIndex].m_Loops; i++) {
 		processed = 0;
-		switch(
-		    m_asAudioEntities[m_sQueueSample.m_nEntityIndex].m_awAudioEvent[i]) {
+		switch(m_asAudioEntities[m_sQueueSample.m_nEntityIndex].m_awAudioEvent[i]) {
 		case SOUND_WEAPON_SNIPER_SHOT_NO_ZOOM:
 			m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_SNIPER_NO_ZOOM;
 			break;
@@ -4686,13 +4671,11 @@ cAudioManager::ProcessFrontEnd()
 		default: continue;
 		}
 
-		sample =
-		    m_asAudioEntities[m_sQueueSample.m_nEntityIndex].m_awAudioEvent[i];
+		sample = m_asAudioEntities[m_sQueueSample.m_nEntityIndex].m_awAudioEvent[i];
 		if(sample == AUDIO_SAMPLE_COLLISION_LOOPING_GRASS) {
 			m_sQueueSample.m_nFrequency = 28509;
 		} else if(sample == AUDIO_SAMPLE_PICKUP_NEUTRAL_1) {
-			if(1.f ==
-			   m_asAudioEntities[m_sQueueSample.m_nEntityIndex].m_afVolume[i])
+			if(1.f == m_asAudioEntities[m_sQueueSample.m_nEntityIndex].m_afVolume[i])
 				m_sQueueSample.m_nFrequency = 32000;
 			else
 				m_sQueueSample.m_nFrequency = 48000;
@@ -4747,7 +4730,8 @@ cAudioManager::ProcessHelicopter(cVehicleParams *params)
 	float dist;
 	float baseDist;
 	int32 emittingVol;
-	static constexpr tHelicopterSampleData gHeliSfxRanges[3] = { {400.f, 380.f, 100}, {100.f, 70.f, maxVolume}, {60.f, 30.f, maxVolume} };
+	static constexpr tHelicopterSampleData gHeliSfxRanges[3] = {
+	    {400.f, 380.f, 100}, {100.f, 70.f, maxVolume}, {60.f, 30.f, maxVolume}};
 
 	if(gHeliSfxRanges[0].m_fMaxDistance * gHeliSfxRanges[0].m_fMaxDistance <=
 	   params->m_fDistance)
@@ -7732,8 +7716,7 @@ cAudioManager::ProcessProjectiles()
 			}
 			m_sQueueSample.field_48 = 4.0;
 			m_sQueueSample.field_76 = 3;
-			m_sQueueSample.m_vecPos =
-			    CProjectileInfo::ms_apProjectile[i].GetPosition();
+			m_sQueueSample.m_vecPos = CProjectileInfo::ms_apProjectile[i].GetPosition();
 			float distSquared = GetDistanceSquared(&m_sQueueSample.m_vecPos);
 			if(distSquared < maxDist) {
 				m_sQueueSample.m_fDistance = Sqrt(distSquared);
@@ -8111,7 +8094,6 @@ cAudioManager::ProcessTrainNoise(cVehicleParams *params)
 	return 1;
 }
 
-
 void
 cAudioManager::ProcessVehicle(CVehicle *veh)
 {
@@ -8142,8 +8124,7 @@ cAudioManager::ProcessVehicle(CVehicle *veh)
 		if(params.m_nIndex == RCBANDIT) {
 			ProcessModelCarEngine(&params);
 			ProcessVehicleOneShots(&params);
-				((CAutomobile *)veh)->m_fVelocityChangeForAudio =
-				    params.m_fVelocityChange;
+			((CAutomobile *)veh)->m_fVelocityChangeForAudio = params.m_fVelocityChange;
 			ProcessRainOnVehicle(&params);
 			break;
 		}
@@ -8255,11 +8236,12 @@ cAudioManager::ProcessVehicleDoors(cVehicleParams *params)
 			}
 		}
 	}
-    return 1;
+	return 1;
 }
 
 WRAPPER
-bool cAudioManager::ProcessVehicleEngine(cVehicleParams *params)
+bool
+cAudioManager::ProcessVehicleEngine(cVehicleParams *params)
 {
 	EAXJMP(0x56A610);
 }
@@ -8349,7 +8331,8 @@ cAudioManager::ProcessVehicleHorn(cVehicleParams *params)
 }
 
 WRAPPER
-void cAudioManager::ProcessVehicleOneShots(void*)
+void
+cAudioManager::ProcessVehicleOneShots(void *)
 {
 	EAXJMP(0x56CD40);
 }
@@ -8457,7 +8440,8 @@ cAudioManager::ProcessVehicleRoadNoise(cVehicleParams *params)
 }
 
 WRAPPER
-void cAudioManager::ProcessVehicleSirenOrAlarm(void*)
+void
+cAudioManager::ProcessVehicleSirenOrAlarm(void *)
 {
 	EAXJMP(0x56C420);
 }
diff --git a/src/audio/AudioManager.h b/src/audio/AudioManager.h
index 6adab9b1..84062e0a 100644
--- a/src/audio/AudioManager.h
+++ b/src/audio/AudioManager.h
@@ -4,8 +4,7 @@
 #include "DMAudio.h"
 #include "common.h"
 
-struct tActiveSample
-{
+struct tActiveSample {
 	int32 m_nEntityIndex;
 	int32 m_counter;
 	int32 m_nSampleIndex;
@@ -75,8 +74,7 @@ enum eAudioType : int32 {
 class CPhysical;
 class CAutomobile;
 
-struct tAudioEntity
-{
+struct tAudioEntity {
 	eAudioType m_nType;
 	void *m_pEntity;
 	bool m_bIsUsed;
@@ -92,8 +90,7 @@ struct tAudioEntity
 
 static_assert(sizeof(tAudioEntity) == 40, "tAudioEntity: error");
 
-struct tPedComment
-{
+struct tPedComment {
 	int32 m_nSampleIndex;
 	int32 m_entityIndex;
 	CVector m_vecPos;
@@ -318,8 +315,8 @@ public:
 	void ClearMissionAudio();                      /// ok
 	void ClearRequestedQueue();                    /// ok
 	int32 ComputeDopplerEffectedFrequency(uint32 oldFreq, float position1, float position2,
-	                                      float speedMultiplier) const; /// ok
-	int32 ComputePan(float, CVector *);                                 /// ok
+	                                      float speedMultiplier) const;                   /// ok
+	int32 ComputePan(float, CVector *);                                                   /// ok
 	uint32 ComputeVolume(int emittingVolume, float soundIntensity, float distance) const; /// ok
 	int32 CreateEntity(int32 type, CPhysical *entity);                                    /// ok
 
@@ -448,9 +445,9 @@ public:
 	void PlayerJustLeftCar() const;                        /// ok
 	void PostInitialiseGameSpecificSetup();                /// ok
 	void PostTerminateGameSpecificShutdown();              /// ok
-	void PreInitialiseGameSpecificSetup() const; //ok
-	void PreloadMissionAudio(char *);        // todo
-	void PreTerminateGameSpecificShutdown(); /// ok
+	void PreInitialiseGameSpecificSetup() const;           // ok
+	void PreloadMissionAudio(char *);                      // todo
+	void PreTerminateGameSpecificShutdown();               /// ok
 	/// processX - main logic of adding new sounds
 	void ProcessActiveQueues();                              // todo
 	bool ProcessAirBrakes(cVehicleParams *params);           /// ok

From 43866a4f7033fbb2ea1d515c037f291e0f377165 Mon Sep 17 00:00:00 2001
From: Filip Gawin <filip.gawin@zoho.com>
Date: Sat, 12 Oct 2019 22:36:45 +0200
Subject: [PATCH 17/37] Fix rebasing

---
 src/control/CarAI.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/control/CarAI.cpp b/src/control/CarAI.cpp
index b4dd8777..c2f2bb43 100644
--- a/src/control/CarAI.cpp
+++ b/src/control/CarAI.cpp
@@ -592,7 +592,7 @@ void CCarAI::MakeWayForCarWithSiren(CVehicle *pVehicle)
 		CVehicle* vehicle = CPools::GetVehiclePool()->GetSlot(i);
 		if (!vehicle)
 			continue;
-		if (vehicle->m_vehType != VEHICLE_TYPE_CAR && vehicle->m_vehType != VEHICLE_TYPE_BIKE)
+		if (vehicle->m_vehType != VEHICLE_TYPE_AUTOMOBILE && vehicle->m_vehType != VEHICLE_TYPE_BIKE)
 			continue;
 		if (vehicle->m_status != STATUS_SIMPLE && vehicle->m_status != STATUS_PHYSICS)
 			continue;

From d822417cfce5ce0120481bd37271ebde6117b14c Mon Sep 17 00:00:00 2001
From: Filip Gawin <filip.gawin@zoho.com>
Date: Sun, 13 Oct 2019 00:35:01 +0200
Subject: [PATCH 18/37] Fixes for nitpicks

---
 .appveyor.yml               |   4 +-
 src/audio/AudioManager.cpp  | 161 ++++++++++++++++++------------------
 src/control/PathFind.cpp    |  53 ++++++------
 src/core/common.h           |  18 ++--
 src/core/main.cpp           |   2 +-
 src/render/WaterCannon.cpp  |   4 +-
 src/render/WaterCannon.h    |  14 ++--
 src/vehicles/Automobile.cpp |   4 +-
 8 files changed, 129 insertions(+), 131 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 03045599..a5b44461 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -1,5 +1,5 @@
 version: 1.0.{build}
-image: Visual Studio 2017
+image: Visual Studio 2019
 configuration:
 - Debug
 - Release
@@ -10,7 +10,7 @@ install:
 - cmd: >-
     git submodule update --init --recursive
 
-    premake-vs2017.cmd
+    premake-vs2019.cmd
 build:
   project: build/re3.sln
   verbosity: minimal
diff --git a/src/audio/AudioManager.cpp b/src/audio/AudioManager.cpp
index 867e53c4..edcf4255 100644
--- a/src/audio/AudioManager.cpp
+++ b/src/audio/AudioManager.cpp
@@ -283,7 +283,7 @@ cAudioScriptObject::Reset()
 {
 	AudioId = 125;
 	Posn = {0.0f, 0.0f, 0.0f};
-	AudioEntity = -5;
+	AudioEntity = AEHANDLE_NONE;
 }
 
 void *
@@ -409,7 +409,7 @@ cAudioManager::AddReleasingSounds()
 		if(!m_asSamples[!m_bActiveSampleQueue]
 		               [m_abSampleQueueIndexTable[!m_bActiveSampleQueue][i]]
 		                   .m_bLoopEnded) {
-			toProcess[i] = 0;
+			toProcess[i] = false;
 			for(int32 j = 0; j < m_bSampleRequestQueuesStatus[m_bActiveSampleQueue];
 			    j++) {
 				if(sample.m_nEntityIndex ==
@@ -422,7 +422,7 @@ cAudioManager::AddReleasingSounds()
 				                  [m_abSampleQueueIndexTable[m_bActiveSampleQueue]
 				                                            [j]]
 				                      .m_counter) {
-					toProcess[i] = 1;
+					toProcess[i] = true;
 					break;
 				}
 			}
@@ -526,7 +526,7 @@ void
 cAudioManager::ClearActiveSamples()
 {
 	for(int32 i = 0; i < m_bActiveSamples; i++) {
-		m_asActiveSamples[i].m_nEntityIndex = -5;
+		m_asActiveSamples[i].m_nEntityIndex = AEHANDLE_NONE;
 		m_asActiveSamples[i].m_counter = 0;
 		m_asActiveSamples[i].m_nSampleIndex = NO_SAMPLE;
 		m_asActiveSamples[i].m_bBankIndex = 3;
@@ -3070,7 +3070,7 @@ float
 cAudioManager::GetVehicleDriveWheelSkidValue(uint8 wheel, CAutomobile *automobile,
                                              cTransmission *transmission, float velocityChange)
 {
-	int wheelState;
+	tWheelState wheelState;
 	float relativeVelChange;
 	float gasPedalAudio = automobile->m_fGasPedalAudio;
 	float modificator;
@@ -3078,12 +3078,12 @@ cAudioManager::GetVehicleDriveWheelSkidValue(uint8 wheel, CAutomobile *automobil
 	float relativeVel;
 
 	wheelState = automobile->m_aWheelState[wheel];
-	if(wheelState == 1 && gasPedalAudio > 0.4f) {
-		relativeVelChange = (gasPedalAudio + -0.4f) * 1.25f;
+	if(wheelState == WHEEL_STATE_SPINNING && gasPedalAudio > 0.4f) {
+		relativeVelChange = (gasPedalAudio - 0.4f) * 1.25f;
 
-	} else if(wheelState == 2) {
+	} else if(wheelState == WHEEL_STATE_SKIDDING) {
 		relativeVelChange = min(1.0f, Abs(velocityChange) / transmission->fMaxVelocity);
-	} else if(wheelState == 3) {
+	} else if(wheelState == WHEEL_STATE_FIXED) {
 		modificator = 0.4f;
 		relativeVelChange = gasPedalAudio;
 		if(relativeVelChange > 0.4f) {
@@ -3174,77 +3174,79 @@ char *SubZo3Label = (char *)0x6E9870;
 void
 cAudioManager::InitialisePoliceRadioZones()
 {
-	for(int32 i = 0; i < 36; i++) { ZoneSfx[i].m_aName[0] = 0; }
+	for(int32 i = 0; i < 36; i++) {
+		for(int32 j = 0; j < 8; j++) { ZoneSfx[i].m_aName[j] = 0; }
+	}
 
-	strcpy((char *)ZoneSfx, "HOSPI_2");
+	strcpy(ZoneSfx[0].m_aName, "HOSPI_2");
 	ZoneSfx[0].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_ROCKFORD;
-	strcpy((char *)&ZoneSfx[1], "CONSTRU");
+	strcpy(ZoneSfx[1].m_aName, "CONSTRU");
 	ZoneSfx[1].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_FORT_STAUNTON;
-	strcpy((char *)&ZoneSfx[2], "STADIUM");
+	strcpy(ZoneSfx[2].m_aName, "STADIUM");
 	ZoneSfx[2].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_ASPATRIA;
-	strcpy((char *)&ZoneSfx[3], "YAKUSA");
+	strcpy(ZoneSfx[3].m_aName, "YAKUSA");
 	ZoneSfx[3].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_TORRINGTON;
-	strcpy((char *)&ZoneSfx[4], "SHOPING");
+	strcpy(ZoneSfx[4].m_aName, "SHOPING");
 	ZoneSfx[4].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_BEDFORD_POINT;
-	strcpy((char *)&ZoneSfx[5], "COM_EAS");
+	strcpy(ZoneSfx[5].m_aName, "COM_EAS");
 	ZoneSfx[5].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_NEWPORT;
-	strcpy((char *)&ZoneSfx[6], "PARK");
+	strcpy(ZoneSfx[6].m_aName, "PARK");
 	ZoneSfx[6].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_BELLEVILLE;
-	strcpy((char *)&ZoneSfx[7], "UNIVERS");
+	strcpy(ZoneSfx[7].m_aName, "UNIVERS");
 	ZoneSfx[7].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_LIBERTY_CAMPUS;
-	strcpy((char *)&ZoneSfx[8], "BIG_DAM");
+	strcpy(ZoneSfx[8].m_aName, "BIG_DAM");
 	ZoneSfx[8].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_COCHRANE;
-	strcpy((char *)&ZoneSfx[9], "SUB_IND");
+	strcpy(ZoneSfx[9].m_aName, "SUB_IND");
 	ZoneSfx[9].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_PIKE_CREEK;
-	strcpy((char *)&ZoneSfx[10], "SWANKS");
+	strcpy(ZoneSfx[10].m_aName, "SWANKS");
 	ZoneSfx[10].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_CEDAR_GROVE;
-	strcpy((char *)&ZoneSfx[11], "PROJECT");
+	strcpy(ZoneSfx[11].m_aName, "PROJECT");
 	ZoneSfx[11].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_WICHITA_GARDEN;
-	strcpy((char *)&ZoneSfx[12], "AIRPORT");
+	strcpy(ZoneSfx[12].m_aName, "AIRPORT");
 	ZoneSfx[12].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_FRANCIS_INTNL;
-	strcpy((char *)&ZoneSfx[13], "PORT_W");
+	strcpy(ZoneSfx[13].m_aName, "PORT_W");
 	ZoneSfx[13].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_CALLAHAN_POINT;
-	strcpy((char *)&ZoneSfx[14], "PORT_S");
+	strcpy(ZoneSfx[14].m_aName, "PORT_S");
 	ZoneSfx[14].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_ATLANTIC_QUAYS;
-	strcpy((char *)&ZoneSfx[15], "PORT_E");
+	strcpy(ZoneSfx[15].m_aName, "PORT_E");
 	ZoneSfx[15].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_PORTLAND_HARBOUR;
-	strcpy((char *)&ZoneSfx[16], "PORT_I");
+	strcpy(ZoneSfx[16].m_aName, "PORT_I");
 	ZoneSfx[16].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_TRENTON;
-	strcpy((char *)&ZoneSfx[17], "CHINA");
+	strcpy(ZoneSfx[17].m_aName, "CHINA");
 	ZoneSfx[17].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_CHINATOWN;
-	strcpy((char *)&ZoneSfx[18], "REDLIGH");
+	strcpy(ZoneSfx[18].m_aName, "REDLIGH");
 	ZoneSfx[18].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_REDLIGHT;
-	strcpy((char *)&ZoneSfx[19], "TOWERS");
+	strcpy(ZoneSfx[19].m_aName, "TOWERS");
 	ZoneSfx[19].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_HEPBURN_HEIGHTS;
-	strcpy((char *)&ZoneSfx[20], "LITTLEI");
+	strcpy(ZoneSfx[20].m_aName, "LITTLEI");
 	ZoneSfx[20].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_ST_MARKS;
-	strcpy((char *)&ZoneSfx[21], "HARWOOD");
+	strcpy(ZoneSfx[21].m_aName, "HARWOOD");
 	ZoneSfx[21].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_HARWOOD;
-	strcpy((char *)&ZoneSfx[22], "EASTBAY");
+	strcpy(ZoneSfx[22].m_aName, "EASTBAY");
 	ZoneSfx[22].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_PORTLAND_BEACH;
-	strcpy((char *)&ZoneSfx[23], "S_VIEW");
+	strcpy(ZoneSfx[23].m_aName, "S_VIEW");
 	ZoneSfx[23].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_PORTLAND_VIEW;
-	strcpy((char *)&ZoneSfx[24], "CITYZON");
+	strcpy(ZoneSfx[24].m_aName, "CITYZON");
 	ZoneSfx[24].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_LIBERTY_CITY;
-	strcpy((char *)&ZoneSfx[25], "IND_ZON");
+	strcpy(ZoneSfx[25].m_aName, "IND_ZON");
 	ZoneSfx[25].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_PORTLAND;
-	strcpy((char *)&ZoneSfx[26], "COM_ZON");
+	strcpy(ZoneSfx[26].m_aName, "COM_ZON");
 	ZoneSfx[26].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_STAUNTON;
-	strcpy((char *)&ZoneSfx[27], "SUB_ZON");
+	strcpy(ZoneSfx[27].m_aName, "SUB_ZON");
 	ZoneSfx[27].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_SHORESIDE;
-	strcpy((char *)&ZoneSfx[28], "SUB_ZO2");
+	strcpy(ZoneSfx[28].m_aName, "SUB_ZO2");
 	ZoneSfx[28].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_SHORESIDE;
-	strcpy((char *)&ZoneSfx[29], "SUB_ZO3");
+	strcpy(ZoneSfx[29].m_aName, "SUB_ZO3");
 	ZoneSfx[29].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_SHORESIDE;
-	strcpy((char *)&ZoneSfx[30], "A");
+	strcpy(ZoneSfx[30].m_aName, "A");
 	ZoneSfx[30].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_ROCKFORD;
-	strcpy((char *)&ZoneSfx[31], "A");
+	strcpy(ZoneSfx[31].m_aName, "A");
 	ZoneSfx[31].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_ROCKFORD;
-	strcpy((char *)&ZoneSfx[32], "A");
+	strcpy(ZoneSfx[32].m_aName, "A");
 	ZoneSfx[32].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_ROCKFORD;
-	strcpy((char *)&ZoneSfx[33], "A");
+	strcpy(ZoneSfx[33].m_aName, "A");
 	ZoneSfx[33].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_ROCKFORD;
-	strcpy((char *)&ZoneSfx[34], "A");
+	strcpy(ZoneSfx[34].m_aName, "A");
 	ZoneSfx[34].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_ROCKFORD;
 	strcpy(SubZo2Label, "SUB_ZO2");
 	strcpy(SubZo3Label, "SUB_ZO3");
@@ -3315,7 +3317,7 @@ cAudioManager::PlayLoadedMissionAudio()
 void
 cAudioManager::PlayOneShot(int32 index, int16 sound, float vol)
 {
-	static constexpr uint8 byte_60ABD0[168] = {
+	static constexpr uint8 byte_60ABD0[] = {
 	    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 5, 5, 5, 3, 5, 2, 2, 1, 1, 3, 1, 3, 3, 1, 1,
 	    1, 4, 4, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 6, 1, 1, 3, 2, 2, 2, 2, 0, 0, 6,
 	    6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -3678,31 +3680,31 @@ cAudioManager::PreTerminateGameSpecificShutdown()
 {
 	if(m_nBridgeEntity >= 0) {
 		DestroyEntity(m_nBridgeEntity);
-		m_nBridgeEntity = -5;
+		m_nBridgeEntity = AEHANDLE_NONE;
 	}
 	if(m_nPoliceChannelEntity >= 0) {
 		DestroyEntity(m_nPoliceChannelEntity);
-		m_nPoliceChannelEntity = -5;
+		m_nPoliceChannelEntity = AEHANDLE_NONE;
 	}
 	if(m_nWaterCannonEntity >= 0) {
 		DestroyEntity(m_nWaterCannonEntity);
-		m_nWaterCannonEntity = -5;
+		m_nWaterCannonEntity = AEHANDLE_NONE;
 	}
 	if(m_nFireAudioEntity >= 0) {
 		DestroyEntity(m_nFireAudioEntity);
-		m_nFireAudioEntity = -5;
+		m_nFireAudioEntity = AEHANDLE_NONE;
 	}
 	if(m_nCollisionEntity >= 0) {
 		DestroyEntity(m_nCollisionEntity);
-		m_nCollisionEntity = -5;
+		m_nCollisionEntity = AEHANDLE_NONE;
 	}
 	if(m_nFrontEndEntity >= 0) {
 		DestroyEntity(m_nFrontEndEntity);
-		m_nFrontEndEntity = -5;
+		m_nFrontEndEntity = AEHANDLE_NONE;
 	}
 	if(m_nProjectileEntity >= 0) {
 		DestroyEntity(m_nProjectileEntity);
-		m_nProjectileEntity = -5;
+		m_nProjectileEntity = AEHANDLE_NONE;
 	}
 }
 
@@ -3981,7 +3983,7 @@ cAudioManager::ProcessBoatMovingOverWater(cVehicleParams *params)
 	if(velocityChange <= 0.0005f && params->m_pVehicle->GetPosition().y) return 1;
 
 	velocityChange = min(0.75f, velocityChange);
-	multiplier = (velocityChange - 0.0005f) * 4 / 3;
+	multiplier = (velocityChange - 0.0005f) * 1.3342f;
 	CalculateDistance((bool *)params, params->m_fDistance);
 	vol = (30.f * multiplier);
 	m_sQueueSample.m_bVolume = ComputeVolume(vol, 50.f, m_sQueueSample.m_fDistance);
@@ -8354,7 +8356,7 @@ cAudioManager::ProcessVehicleReverseWarning(cVehicleParams *params)
 			m_sQueueSample.m_bIsDistant = 0;
 			m_sQueueSample.field_16 = 2;
 			m_sQueueSample.m_nFrequency =
-			    (100 * m_sQueueSample.m_nEntityIndex & 0x3FF) +
+			    (100 * m_sQueueSample.m_nEntityIndex & 1023) +
 			    SampleManager.GetSampleBaseFrequency(
 			        AUDIO_SAMPLE_VEHICLE_REVERSE_WARNING);
 			m_sQueueSample.m_nLoopCount = 0;
@@ -8779,29 +8781,30 @@ cAudioManager::ReportCollision(CEntity *entity1, CEntity *entity2, uint8 surface
 	CVector v1;
 	CVector v2;
 
-	if(m_bIsInitialised && m_nCollisionEntity >= 0 && !m_bUserPause &&
-	   (velocity >= 0.0016f || collisionPower >= 0.01f)) {
-		if((entity1->m_status & 7) == ENTITY_TYPE_BUILDING) {
-			v1 = v2 = entity2->GetPosition();
-		} else if((entity2->m_status & 7) == ENTITY_TYPE_BUILDING) {
-			v1 = v2 = entity1->GetPosition();
-		} else {
-			v1 = entity1->GetPosition();
-			v2 = entity2->GetPosition();
-		}
-		CVector pos = (v1 + v2) * 0.5f;
-		dist = GetDistanceSquared(&pos);
-		if(dist < 3600.f) {
-			m_sCollisionManager.m_sQueue.m_pEntity1 = entity1;
-			m_sCollisionManager.m_sQueue.m_pEntity2 = entity2;
-			m_sCollisionManager.m_sQueue.m_bSurface1 = surface1;
-			m_sCollisionManager.m_sQueue.m_bSurface2 = surface2;
-			m_sCollisionManager.m_sQueue.m_fIntensity1 = collisionPower;
-			m_sCollisionManager.m_sQueue.m_fIntensity2 = velocity;
-			m_sCollisionManager.m_sQueue.m_vecPosition = pos;
-			m_sCollisionManager.m_sQueue.m_fDistance = dist;
-			m_sCollisionManager.AddCollisionToRequestedQueue();
-		}
+	if(!m_bIsInitialised || m_nCollisionEntity < 0 || m_bUserPause ||
+	   (velocity < 0.0016f && collisionPower < 0.01f))
+		return;
+
+	if(entity1->IsBuilding()) {
+		v1 = v2 = entity2->GetPosition();
+	} else if(entity2->IsBuilding()) {
+		v1 = v2 = entity1->GetPosition();
+	} else {
+		v1 = entity1->GetPosition();
+		v2 = entity2->GetPosition();
+	}
+	CVector pos = (v1 + v2) * 0.5f;
+	dist = GetDistanceSquared(&pos);
+	if(dist < SQR(60.f)) {
+		m_sCollisionManager.m_sQueue.m_pEntity1 = entity1;
+		m_sCollisionManager.m_sQueue.m_pEntity2 = entity2;
+		m_sCollisionManager.m_sQueue.m_bSurface1 = surface1;
+		m_sCollisionManager.m_sQueue.m_bSurface2 = surface2;
+		m_sCollisionManager.m_sQueue.m_fIntensity1 = collisionPower;
+		m_sCollisionManager.m_sQueue.m_fIntensity2 = velocity;
+		m_sCollisionManager.m_sQueue.m_vecPosition = pos;
+		m_sCollisionManager.m_sQueue.m_fDistance = dist;
+		m_sCollisionManager.AddCollisionToRequestedQueue();
 	}
 }
 
@@ -9692,7 +9695,7 @@ cAudioManager::SetupJumboTaxiSound(uint8 vol)
 {
 	if(m_sQueueSample.m_fDistance >= 180.f) return 0;
 
-	uint8 emittingVol = (vol + (vol * m_sQueueSample.m_fDistance / 180)) / 2;
+	uint8 emittingVol = (vol >> 1) + ((vol >> 1) * m_sQueueSample.m_fDistance / 180);
 
 	if(m_sQueueSample.m_fDistance / 180 < 0.7f)
 		emittingVol -= emittingVol * gJumboVolOffsetPercentage / 100;
diff --git a/src/control/PathFind.cpp b/src/control/PathFind.cpp
index 700a89f1..3c16202b 100644
--- a/src/control/PathFind.cpp
+++ b/src/control/PathFind.cpp
@@ -1278,50 +1278,38 @@ CPathFind::DoPathSearch(uint8 type, CVector start, int32 startNodeId, CVector ta
 		targetNode = FindNodeClosestToCoors(target, type, distLimit);
 	else
 		targetNode = forcedTargetNode;
-	if(targetNode < 0) {
-		*pNumNodes = 0;
-		if(pDist) *pDist = 100000.0f;
-		return;
-	}
+	if(targetNode < 0)
+		goto fail;
 
 	// Find start
 	int numPathsToTry;
 	CTreadable *startObj;
-	if(startNodeId < 0) {
+	if(startNodeId < 0){
 		if(vehicle == nil || (startObj = vehicle->m_treadable[type]) == nil)
 			startObj = FindRoadObjectClosestToCoors(start, type);
 		numPathsToTry = 0;
-		for(i = 0; i < 12; i++) {
-			if(startObj->m_nodeIndices[type][i] < 0) break;
-			if(m_pathNodes[startObj->m_nodeIndices[type][i]].group ==
-			   m_pathNodes[targetNode].group)
+		for(i = 0; i < 12; i++){
+			if(startObj->m_nodeIndices[type][i] < 0)
+				break;
+			if(m_pathNodes[startObj->m_nodeIndices[type][i]].group == m_pathNodes[targetNode].group)
 				numPathsToTry++;
 		}
-	} else {
+	}else{
 		numPathsToTry = 1;
 		startObj = m_mapObjects[m_pathNodes[startNodeId].objectIndex];
 	}
-	if(numPathsToTry == 0) {
-		*pNumNodes = 0;
-		if(pDist) *pDist = 100000.0f;
-		return;
+	if(numPathsToTry == 0)
+		goto fail;
+
+	if(startNodeId < 0){
+		// why only check node 0?
+		if(m_pathNodes[startObj->m_nodeIndices[type][0]].group != m_pathNodes[targetNode].group)
+			goto fail;
+	}else{
+		if(m_pathNodes[startNodeId].group != m_pathNodes[targetNode].group)
+			goto fail;
 	}
 
-	if(startNodeId < 0) {
-		// why only check node 0?
-		if(m_pathNodes[startObj->m_nodeIndices[type][0]].group !=
-		   m_pathNodes[targetNode].group) {
-			*pNumNodes = 0;
-			if(pDist) *pDist = 100000.0f;
-			return;
-		}
-	} else {
-		if(m_pathNodes[startNodeId].group != m_pathNodes[targetNode].group) {
-			*pNumNodes = 0;
-			if(pDist) *pDist = 100000.0f;
-			return;
-		}
-	}
 
 	for(i = 0; i < 512; i++)
 		m_searchNodes[i].next = nil;
@@ -1400,6 +1388,11 @@ CPathFind::DoPathSearch(uint8 type, CVector start, int32 startNodeId, CVector ta
 	for(i = 0; i < numNodesToBeCleared; i++)
 		apNodesToBeCleared[i]->distance = MAX_DIST;
 	return;
+
+fail:
+	*pNumNodes = 0;
+	if(pDist)
+		*pDist = 100000.0f;
 }
 
 static CPathNode *pNodeList[32];
diff --git a/src/core/common.h b/src/core/common.h
index d3d4e049..a538ddb6 100644
--- a/src/core/common.h
+++ b/src/core/common.h
@@ -197,8 +197,6 @@ void re3_assert(const char *expr, const char *filename, unsigned int lineno, con
 #define ARRAY_SIZE(array)                (sizeof(array) / sizeof(array[0]))
 #define BIT(num)                         (1<<(num))
 
-//auto max = [](auto a, auto b) { return ((a) > (b)) ? (a) : (b); };
-//auto min = [](auto a, auto b) { return ((a) < (b)) ? (a) : (b); };
 #define ABS(a)  (((a) < 0) ? (-(a)) : (a))
 #define norm(value, min, max) (((value) < (min)) ? 0 : (((value) > (max)) ? 1 : (((value) - (min)) / ((max) - (min)))))
 
@@ -337,7 +335,7 @@ inline void SkipSaveBuf(uint8 *&buf, int32 skip)
 
 template<typename T>
 inline const T ReadSaveBuf(uint8 *&buf)
-{
+{
 	T &value = *(T*)buf;
 	SkipSaveBuf(buf, sizeof(T));
 	return value;
@@ -345,8 +343,8 @@ inline const T ReadSaveBuf(uint8 *&buf)
 
 template<typename T>
 inline T *WriteSaveBuf(uint8 *&buf, const T &value)
-{
-	T *p = (T*)buf;
+{
+	T *p = (T*)buf;
 	*p = value;
 	SkipSaveBuf(buf, sizeof(T));
 	return p;
@@ -355,11 +353,11 @@ inline T *WriteSaveBuf(uint8 *&buf, const T &value)
 
 #define SAVE_HEADER_SIZE (4*sizeof(char)+sizeof(uint32))
 
-#define WriteSaveHeader(buf,a,b,c,d,size) \
-	WriteSaveBuf(buf, a);\
-	WriteSaveBuf(buf, b);\
-	WriteSaveBuf(buf, c);\
-	WriteSaveBuf(buf, d);\
+#define WriteSaveHeader(buf,a,b,c,d,size) \
+	WriteSaveBuf(buf, a);\
+	WriteSaveBuf(buf, b);\
+	WriteSaveBuf(buf, c);\
+	WriteSaveBuf(buf, d);\
 	WriteSaveBuf(buf, size);
 
 #define CheckSaveHeader(buf,a,b,c,d,size)\
diff --git a/src/core/main.cpp b/src/core/main.cpp
index 3c9556d4..8985d56a 100644
--- a/src/core/main.cpp
+++ b/src/core/main.cpp
@@ -339,7 +339,7 @@ void
 RenderEffects(void)
 {
 	CGlass::Render();
-	CWaterCannon::Render();
+	CWaterCannons::Render();
 	CSpecialFX::Render();
 	CShadows::RenderStaticShadows();
 	CShadows::RenderStoredShadows();
diff --git a/src/render/WaterCannon.cpp b/src/render/WaterCannon.cpp
index e477b3fa..c2af73f0 100644
--- a/src/render/WaterCannon.cpp
+++ b/src/render/WaterCannon.cpp
@@ -5,5 +5,5 @@
 CWaterCannon* aCannons = (CWaterCannon*)0x8F2CA8;
 
 WRAPPER void CWaterCannons::Update(void) { EAXJMP(0x522510); }
-WRAPPER void CWaterCannon::UpdateOne(uint32 id, CVector *pos, CVector *dir) { EAXJMP(0x522470); }
-WRAPPER void CWaterCannon::Render(void) { EAXJMP(0x522550); }
+WRAPPER void CWaterCannons::UpdateOne(uint32 id, CVector *pos, CVector *dir) { EAXJMP(0x522470); }
+WRAPPER void CWaterCannons::Render(void) { EAXJMP(0x522550); }
diff --git a/src/render/WaterCannon.h b/src/render/WaterCannon.h
index 1b2dcee3..16df63db 100644
--- a/src/render/WaterCannon.h
+++ b/src/render/WaterCannon.h
@@ -10,12 +10,16 @@ public:
 	CVector m_avecPos[16];
 	CVector m_avecVelocity[16];
 	char m_abUsed[16];
-
-	static void Update(void);
-	static void UpdateOne(uint32 id, CVector *pos, CVector *dir);
-	static void Render(void);
 };
 
 static_assert(sizeof(CWaterCannon) == 412, "CWaterCannon: error");
 
-extern CWaterCannon* aCannons;
+class CWaterCannons
+{
+public:
+	static void Update();
+	static void UpdateOne(uint32 id, CVector *pos, CVector *dir);
+	static void Render(void);
+};
+
+extern CWaterCannon *aCannons;
diff --git a/src/vehicles/Automobile.cpp b/src/vehicles/Automobile.cpp
index ab213beb..c0b3dd7c 100644
--- a/src/vehicles/Automobile.cpp
+++ b/src/vehicles/Automobile.cpp
@@ -2350,7 +2350,7 @@ CAutomobile::FireTruckControl(void)
 			Sin(m_fCarGunUD));
 		cannonDir = Multiply3x3(GetMatrix(), cannonDir);
 		cannonDir.z += (CGeneral::GetRandomNumber()&0xF)/1000.0f;
-		CWaterCannon::UpdateOne((uintptr)this, &cannonPos, &cannonDir);
+		CWaterCannons::UpdateOne((uintptr)this, &cannonPos, &cannonDir);
 	}else if(m_status == STATUS_PHYSICS){
 		CFire *fire = gFireManager.FindFurthestFire_NeverMindFireMen(GetPosition(), 10.0f, 35.0f);
 		if(fire == nil)
@@ -2385,7 +2385,7 @@ CAutomobile::FireTruckControl(void)
 				Sin(m_fCarGunUD));
 			cannonDir = Multiply3x3(GetMatrix(), cannonDir);
 			cannonDir.z += (CGeneral::GetRandomNumber()&0xF)/1000.0f;
-			CWaterCannon::UpdateOne((uintptr)this, &cannonPos, &cannonDir);
+			CWaterCannons::UpdateOne((uintptr)this, &cannonPos, &cannonDir);
 		}
 	}
 }

From fef3b5f978856c5ebabcdc27340de163173f3883 Mon Sep 17 00:00:00 2001
From: Filip Gawin <filip.gawin@zoho.com>
Date: Sat, 19 Oct 2019 13:21:35 +0200
Subject: [PATCH 19/37] Audio fixes from Serg

---
 src/audio/AudioManager.cpp | 42 +++++++++++++++++++++++---------------
 src/audio/AudioManager.h   | 24 ++++++++++++++--------
 2 files changed, 40 insertions(+), 26 deletions(-)

diff --git a/src/audio/AudioManager.cpp b/src/audio/AudioManager.cpp
index edcf4255..c51d53d5 100644
--- a/src/audio/AudioManager.cpp
+++ b/src/audio/AudioManager.cpp
@@ -9092,7 +9092,7 @@ cAudioManager::ServiceSoundEffects()
 	ServiceCollisions();
 	AddReleasingSounds();
 	ProcessMissionAudio();
-	sub_57C2B0();
+	AdjustSamplesVolume();
 	ProcessActiveQueues();
 	for(int32 i = 0; i < m_nScriptObjectEntityTotal; ++i) {
 		object = (cAudioScriptObject *)m_asAudioEntities[m_anScriptObjectEntityIndices[i]]
@@ -10242,27 +10242,31 @@ cAudioManager::UsesSirenSwitching(int32 model) const
 	}
 }
 
-WRAPPER
 void
-cAudioManager::sub_57C2B0()
+cAudioManager::AdjustSamplesVolume()
 {
-	EAXJMP(0x57C2B0);
+	for(int i = 0; i < m_bSampleRequestQueuesStatus[m_bActiveSampleQueue];
+	    i++) {
+		tActiveSample *pSample =
+		    &m_asSamples[i][(int32)m_abSampleQueueIndexTable[i] + 1];
+
+		if(!pSample->m_bBankIndex) // all non-speech sounds on PC
+			pSample->m_bEmittingVolume = ComputeEmittingVolume(
+			    pSample->m_bEmittingVolume,
+			    pSample->m_fSoundIntensity, pSample->m_fDistance);
+	}
 }
 
 int32
-cAudioManager::sub_57C320(uint8 a1, float a2, float a3)
+cAudioManager::ComputeEmittingVolume(uint8 emittingVolume, float intensity,
+                                     float dist)
 {
-	float v4;
-	float v5;
-	int32 v6;
-
-	v4 = 0.25f * a2;
-	v5 = a2 - v4;
-	if(a3 <= v5)
-		v6 = a1;
-	else
-		v6 = ((v4 - (a3 - v5)) * (float)a1 / v4);
-	return v6;
+	float quatIntensity = intensity / 4.0f;
+	float diffIntensity = intensity - quatIntensity;
+	if(dist > diffIntensity)
+		return (quatIntensity - (dist - diffIntensity)) *
+		       (float)emittingVolume / quatIntensity;
+	return emittingVolume;
 }
 
 STARTPATCHES
@@ -10487,7 +10491,11 @@ InjectHook(0x56AC80, &cAudioManager::UpdateGasPedalAudio, PATCH_JUMP);
 InjectHook(0x56C600, &cAudioManager::UsesReverseWarning, PATCH_JUMP);
 InjectHook(0x56C3C0, &cAudioManager::UsesSiren, PATCH_JUMP);
 InjectHook(0x56C3F0, &cAudioManager::UsesSirenSwitching, PATCH_JUMP);
-InjectHook(0x57C320, &cAudioManager::sub_57C320, PATCH_JUMP);
+
+InjectHook(0x57C2B0, &cAudioManager::AdjustSamplesVolume, PATCH_JUMP);
+InjectHook(0x57C320, &cAudioManager::ComputeEmittingVolume, PATCH_JUMP);
+
+
 InjectHook(0x5755C0, &cPedComments::Add, PATCH_JUMP);
 InjectHook(0x575730, &cPedComments::Process, PATCH_JUMP);
 InjectHook(0x5685E0, &cAudioCollisionManager::AddCollisionToRequestedQueue, PATCH_JUMP);
diff --git a/src/audio/AudioManager.h b/src/audio/AudioManager.h
index 84062e0a..d9224ced 100644
--- a/src/audio/AudioManager.h
+++ b/src/audio/AudioManager.h
@@ -4,7 +4,9 @@
 #include "DMAudio.h"
 #include "common.h"
 
-struct tActiveSample {
+class tActiveSample
+{
+public:
 	int32 m_nEntityIndex;
 	int32 m_counter;
 	int32 m_nSampleIndex;
@@ -53,7 +55,8 @@ struct tActiveSample {
 
 static_assert(sizeof(tActiveSample) == 92, "tActiveSample: error");
 
-enum eAudioType : int32 {
+enum eAudioType : int32
+{
 	AUDIOTYPE_PHYSICAL = 0,
 	AUDIOTYPE_EXPLOSION = 1,
 	AUDIOTYPE_FIRE = 2,
@@ -74,7 +77,9 @@ enum eAudioType : int32 {
 class CPhysical;
 class CAutomobile;
 
-struct tAudioEntity {
+class tAudioEntity
+{
+public:
 	eAudioType m_nType;
 	void *m_pEntity;
 	bool m_bIsUsed;
@@ -90,7 +95,9 @@ struct tAudioEntity {
 
 static_assert(sizeof(tAudioEntity) == 40, "tAudioEntity: error");
 
-struct tPedComment {
+class tPedComment
+{
+public:
 	int32 m_nSampleIndex;
 	int32 m_entityIndex;
 	CVector m_vecPos;
@@ -254,13 +261,10 @@ public:
 	uint8 field_13;
 	uint8 field_14;
 	uint8 field_15;
-	// 100
 	int32 m_nTimer;
 	tActiveSample m_sQueueSample;
-	// 224
 	bool m_bActiveSampleQueue;
 	uint8 gap_109[3];
-	// 264
 	tActiveSample m_asSamples[2][27];
 	uint8 m_abSampleQueueIndexTable[2][27];
 	uint8 m_bSampleRequestQueuesStatus[2];
@@ -563,8 +567,10 @@ public:
 	bool UsesSiren(int32 model) const;
 	bool UsesSirenSwitching(int32 model) const;
 
-	void sub_57C2B0();                              // todo (weird) and obtain name
-	int32 sub_57C320(uint8 a1, float a2, float a3); /// ok (get name)
+	// only used in pc
+	void AdjustSamplesVolume(); /// ok
+	int32 ComputeEmittingVolume(uint8 emittingVolume, float intensity,
+	                            float dist); /// ok
 };
 
 static_assert(sizeof(cAudioManager) == 19220, "cAudioManager: error");

From 8808e6fdfe5604022a64e72df3ee60d8ed10e9d6 Mon Sep 17 00:00:00 2001
From: Filip Gawin <filip.gawin@zoho.com>
Date: Fri, 25 Oct 2019 18:39:26 +0200
Subject: [PATCH 20/37] Fixes for aap review (audio8)

---
 src/audio/AudioManager.cpp       | 3532 +++++++++++-------------------
 src/audio/MusicManager.cpp       |   13 +-
 src/control/CarAI.cpp            |    2 +-
 src/core/AnimViewer.cpp          |    2 +-
 src/core/FileLoader.cpp          |    2 +-
 src/core/World.cpp               |    2 +-
 src/entities/Physical.cpp        |    2 +-
 src/modelinfo/VehicleModelInfo.h |    2 +-
 src/peds/Ped.cpp                 |    8 +-
 src/vehicles/Automobile.cpp      |    2 +-
 src/vehicles/Vehicle.h           |    2 +-
 11 files changed, 1247 insertions(+), 2322 deletions(-)

diff --git a/src/audio/AudioManager.cpp b/src/audio/AudioManager.cpp
index c51d53d5..1428bb9f 100644
--- a/src/audio/AudioManager.cpp
+++ b/src/audio/AudioManager.cpp
@@ -47,15 +47,14 @@ bool &bPlayerJustEnteredCar = *(bool *)0x6508C4;
 bool &g_bMissionAudioLoadFailed = *(bool *)0x95CD8E;
 uint32 *gMinTimeToNextReport = (uint32 *)0x8E2828;
 uint8 &gSpecialSuspectLastSeenReport = *(uint8 *)0x95CD4D;
-bool *somethingWithHorns = (bool *)0x606AB8;
+bool **hornPatternsArray = (bool **)0x606AB8;
 
 constexpr int totalAudioEntitiesSlots = 200;
 constexpr int maxVolume = 127;
 constexpr int policeChannel = 28;
-constexpr uint8 panTable[64]{0,  3,  8,  12, 16, 19, 22, 24, 26, 28, 30, 31, 33, 34, 36, 37,
-                             39, 40, 41, 42, 44, 45, 46, 47, 48, 49, 49, 50, 51, 52, 53, 53,
-                             54, 55, 55, 56, 56, 57, 57, 58, 58, 58, 59, 59, 59, 60, 60, 61,
-                             61, 61, 61, 62, 62, 62, 62, 62, 63, 63, 63, 63, 63, 63, 63, 63};
+constexpr uint8 panTable[64]{0,  3,  8,  12, 16, 19, 22, 24, 26, 28, 30, 31, 33, 34, 36, 37, 39, 40, 41, 42, 44, 45,
+                             46, 47, 48, 49, 49, 50, 51, 52, 53, 53, 54, 55, 55, 56, 56, 57, 57, 58, 58, 58, 59, 59,
+                             59, 60, 60, 61, 61, 61, 61, 62, 62, 62, 62, 62, 63, 63, 63, 63, 63, 63, 63, 63};
 
 // TODO: where is this used? Is this the right file?
 enum eVehicleModel {
@@ -136,7 +135,7 @@ cPedComments::Add(tPedComment *com)
 {
 	uint8 index;
 
-	if(nrOfCommentsInBank[activeBank] >= 20u) {
+	if(nrOfCommentsInBank[activeBank] >= 20) {
 		index = indexMap[activeBank][19];
 		if(m_asPedComments[activeBank][index].m_bVolume > com->m_bVolume) return;
 	} else {
@@ -158,8 +157,7 @@ cPedComments::Add(tPedComment *com)
 			}
 		}
 
-		if(i < index)
-			memmove(&indexMap[activeBank][i + 1], &indexMap[activeBank][i], 19 - i);
+		if(i < index) memmove(&indexMap[activeBank][i + 1], &indexMap[activeBank][i], 19 - i);
 	}
 
 	indexMap[activeBank][i] = index;
@@ -174,10 +172,8 @@ cPedComments::Process()
 
 	if(!AudioManager.m_bUserPause) {
 		if(nrOfCommentsInBank[activeBank]) {
-			sampleIndex =
-			    m_asPedComments[activeBank][indexMap[activeBank][0]].m_nSampleIndex;
-			if(!SampleManager.IsPedCommentLoaded(sampleIndex))
-				SampleManager.LoadPedComment(sampleIndex);
+			sampleIndex = m_asPedComments[activeBank][indexMap[activeBank][0]].m_nSampleIndex;
+			if(!SampleManager.IsPedCommentLoaded(sampleIndex)) SampleManager.LoadPedComment(sampleIndex);
 
 			AudioManager.m_sQueueSample.m_nEntityIndex =
 			    m_asPedComments[activeBank][indexMap[activeBank][0]].m_entityIndex;
@@ -217,11 +213,9 @@ cPedComments::Process()
 
 			AudioManager.m_sQueueSample.m_bIsDistant = 0;
 			AudioManager.m_sQueueSample.m_nFrequency =
-			    SampleManager.GetSampleBaseFrequency(
-			        AudioManager.m_sQueueSample.m_nSampleIndex) +
-			    AudioManager.RandomDisplacement(750u);
-			if(CTimer::GetIsSlowMotionActive())
-				AudioManager.m_sQueueSample.m_nFrequency /= 2;
+			    SampleManager.GetSampleBaseFrequency(AudioManager.m_sQueueSample.m_nSampleIndex) +
+			    AudioManager.RandomDisplacement(750);
+			if(CTimer::GetIsSlowMotionActive()) AudioManager.m_sQueueSample.m_nFrequency /= 2;
 			m_asPedComments[activeBank][indexMap[activeBank][0]].field_25 = -1;
 			AudioManager.AddSampleToRequestedQueue();
 		}
@@ -236,10 +230,8 @@ cPedComments::Process()
 		}
 		comment = m_asPedComments[actualUsedBank];
 		for(uint32 i = 0; i < nrOfCommentsInBank[actualUsedBank]; i++) {
-			if(m_asPedComments[actualUsedBank][indexMap[actualUsedBank][i]].field_25 >
-			   0) {
-				--m_asPedComments[actualUsedBank][indexMap[actualUsedBank][i]]
-				      .field_25;
+			if(m_asPedComments[actualUsedBank][indexMap[actualUsedBank][i]].field_25 > 0) {
+				--m_asPedComments[actualUsedBank][indexMap[actualUsedBank][i]].field_25;
 				Add(&comment[indexMap[actualUsedBank][i]]);
 			}
 		}
@@ -255,7 +247,7 @@ cAudioCollisionManager::AddCollisionToRequestedQueue()
 	int32 collisionsIndex;
 	int32 i;
 
-	if(m_bCollisionsInQueue >= 10u) {
+	if(m_bCollisionsInQueue >= 10) {
 		collisionsIndex = m_bIndicesTable[9];
 		if(m_sQueue.m_fDistance >= m_asCollisions1[collisionsIndex].m_fDistance) return;
 	} else {
@@ -266,8 +258,7 @@ cAudioCollisionManager::AddCollisionToRequestedQueue()
 
 	i = 0;
 	if(collisionsIndex) {
-		while(m_asCollisions1[m_bIndicesTable[i]].m_fDistance <=
-		      m_asCollisions1[collisionsIndex].m_fDistance) {
+		while(m_asCollisions1[m_bIndicesTable[i]].m_fDistance <= m_asCollisions1[collisionsIndex].m_fDistance) {
 			if(++i >= collisionsIndex) {
 				m_bIndicesTable[i] = collisionsIndex;
 				return;
@@ -313,24 +304,21 @@ cAudioManager::AddDetailsToRequestedOrderList(uint8 sample)
 	uint32 i = 0;
 	if(sample != 0) {
 		for(; i < sample; i++) {
-			if(m_asSamples[m_bActiveSampleQueue]
-			              [m_abSampleQueueIndexTable[m_bActiveSampleQueue][i]]
-			                  .calculatedVolume >
-			   m_asSamples[m_bActiveSampleQueue][sample].calculatedVolume)
+			if(m_asSamples[m_bActiveSampleQueue][m_abSampleQueueIndexTable[m_bActiveSampleQueue][i]]
+			       .calculatedVolume > m_asSamples[m_bActiveSampleQueue][sample].calculatedVolume)
 				break;
 		}
 		if(i < sample) {
 			memmove(&m_abSampleQueueIndexTable[m_bActiveSampleQueue][i + 1],
-			        &m_abSampleQueueIndexTable[m_bActiveSampleQueue][i],
-			        m_bActiveSamples - i - 1);
+			        &m_abSampleQueueIndexTable[m_bActiveSampleQueue][i], m_bActiveSamples - i - 1);
 		}
 	}
 	m_abSampleQueueIndexTable[m_bActiveSampleQueue][i] = sample;
 }
 
 void
-cAudioManager::AddPlayerCarSample(uint8 emittingVolume, int32 freq, uint32 sample, uint8 unk1,
-                                  uint8 counter, bool notLooping)
+cAudioManager::AddPlayerCarSample(uint8 emittingVolume, int32 freq, uint32 sample, uint8 unk1, uint8 counter,
+                                  bool notLooping)
 {
 	m_sQueueSample.m_bVolume = ComputeVolume(emittingVolume, 50.f, m_sQueueSample.m_fDistance);
 	if(m_sQueueSample.m_bVolume) {
@@ -347,10 +335,8 @@ cAudioManager::AddPlayerCarSample(uint8 emittingVolume, int32 freq, uint32 sampl
 			m_sQueueSample.m_nLoopCount = 1;
 		}
 		m_sQueueSample.m_bEmittingVolume = emittingVolume;
-		m_sQueueSample.m_nLoopStart =
-		    SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
-		m_sQueueSample.m_nLoopEnd =
-		    SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
+		m_sQueueSample.m_nLoopStart = SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
+		m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
 		m_sQueueSample.field_48 = 6.0f;
 		m_sQueueSample.m_fSoundIntensity = 50.0f;
 		m_sQueueSample.field_56 = 0;
@@ -367,22 +353,20 @@ cAudioManager::AddReflectionsToRequestedQueue()
 	int32 noise;
 	uint8 emittingVolume = (m_sQueueSample.m_bVolume >> 1) + (m_sQueueSample.m_bVolume >> 3);
 
-	for(uint32 i = 0; i < 5u; i++) {
+	for(uint32 i = 0; i < 5; i++) {
 		reflectionDistance = m_afReflectionsDistances[i];
 		if(reflectionDistance > 0.0f && reflectionDistance < 100.f &&
 		   reflectionDistance < m_sQueueSample.m_fSoundIntensity) {
 			m_sQueueSample.m_bLoopsRemaining = (reflectionDistance * 500.f / 1029.f);
-			if(m_sQueueSample.m_bLoopsRemaining > 5u) {
+			if(m_sQueueSample.m_bLoopsRemaining > 5) {
 				m_sQueueSample.m_fDistance = m_afReflectionsDistances[i];
 				m_sQueueSample.m_bEmittingVolume = emittingVolume;
-				m_sQueueSample.m_bVolume =
-				    ComputeVolume(emittingVolume, m_sQueueSample.m_fSoundIntensity,
-				                  m_sQueueSample.m_fDistance);
+				m_sQueueSample.m_bVolume = ComputeVolume(
+				    emittingVolume, m_sQueueSample.m_fSoundIntensity, m_sQueueSample.m_fDistance);
 				if(m_sQueueSample.m_bVolume > emittingVolume >> 4) {
 					m_sQueueSample.m_counter += ((i + 1) << 8);
 					if(m_sQueueSample.m_nLoopCount) {
-						noise = RandomDisplacement(
-						    m_sQueueSample.m_nFrequency >> 5);
+						noise = RandomDisplacement(m_sQueueSample.m_nFrequency >> 5);
 						if(noise <= 0)
 							m_sQueueSample.m_nFrequency += noise;
 						else
@@ -404,24 +388,18 @@ cAudioManager::AddReleasingSounds()
 
 	for(int32 i = 0; i < m_bSampleRequestQueuesStatus[m_bActiveSampleQueue]; i++) {
 		tActiveSample &sample =
-		    m_asSamples[!m_bActiveSampleQueue]
-		               [m_abSampleQueueIndexTable[!m_bActiveSampleQueue][i]];
-		if(!m_asSamples[!m_bActiveSampleQueue]
-		               [m_abSampleQueueIndexTable[!m_bActiveSampleQueue][i]]
-		                   .m_bLoopEnded) {
+		    m_asSamples[!m_bActiveSampleQueue][m_abSampleQueueIndexTable[!m_bActiveSampleQueue][i]];
+		if(!m_asSamples[!m_bActiveSampleQueue][m_abSampleQueueIndexTable[!m_bActiveSampleQueue][i]]
+		        .m_bLoopEnded) {
 			toProcess[i] = false;
-			for(int32 j = 0; j < m_bSampleRequestQueuesStatus[m_bActiveSampleQueue];
-			    j++) {
+			for(int32 j = 0; j < m_bSampleRequestQueuesStatus[m_bActiveSampleQueue]; j++) {
 				if(sample.m_nEntityIndex ==
 				       m_asSamples[m_bActiveSampleQueue]
-				                  [m_abSampleQueueIndexTable[m_bActiveSampleQueue]
-				                                            [j]]
+				                  [m_abSampleQueueIndexTable[m_bActiveSampleQueue][j]]
 				                      .m_nEntityIndex &&
-				   sample.m_counter ==
-				       m_asSamples[m_bActiveSampleQueue]
-				                  [m_abSampleQueueIndexTable[m_bActiveSampleQueue]
-				                                            [j]]
-				                      .m_counter) {
+				   sample.m_counter == m_asSamples[m_bActiveSampleQueue]
+				                                  [m_abSampleQueueIndexTable[m_bActiveSampleQueue][j]]
+				                                      .m_counter) {
 					toProcess[i] = true;
 					break;
 				}
@@ -431,10 +409,8 @@ cAudioManager::AddReleasingSounds()
 					if(!sample.field_76) continue;
 					if(!sample.m_nLoopCount) {
 						if(sample.field_88 == -1) {
-							sample.field_88 =
-							    sample.m_bVolume / sample.field_76;
-							if(sample.field_88 <= 0)
-								sample.field_88 = 1;
+							sample.field_88 = sample.m_bVolume / sample.field_76;
+							if(sample.field_88 <= 0) sample.field_88 = 1;
 						}
 						if(sample.m_bVolume <= sample.field_88) {
 							sample.field_76 = 0;
@@ -444,7 +420,7 @@ cAudioManager::AddReleasingSounds()
 					}
 					--sample.field_76;
 					if(field_2) {
-						if(sample.field_16 < 20u) ++sample.field_16;
+						if(sample.field_16 < 20) ++sample.field_16;
 					}
 					sample.field_56 = 0;
 				}
@@ -466,11 +442,8 @@ cAudioManager::AddSampleToRequestedQueue()
 		calculatedVolume = m_sQueueSample.field_16 * (maxVolume - m_sQueueSample.m_bVolume);
 		sampleIndex = m_bSampleRequestQueuesStatus[m_bActiveSampleQueue];
 		if(sampleIndex >= m_bActiveSamples) {
-			sampleIndex =
-			    m_abSampleQueueIndexTable[m_bActiveSampleQueue][m_bActiveSamples - 1];
-			if(m_asSamples[m_bActiveSampleQueue][sampleIndex].calculatedVolume <=
-			   calculatedVolume)
-				return;
+			sampleIndex = m_abSampleQueueIndexTable[m_bActiveSampleQueue][m_bActiveSamples - 1];
+			if(m_asSamples[m_bActiveSampleQueue][sampleIndex].calculatedVolume <= calculatedVolume) return;
 		} else {
 			++m_bSampleRequestQueuesStatus[m_bActiveSampleQueue];
 		}
@@ -502,7 +475,7 @@ cAudioManager::AgeCrimes()
 {
 	for(uint8 i = 0; i < 10; i++) {
 		if(crimes[i].type) {
-			if(++crimes[i].timer > 1500u) crimes[i].type = 0;
+			if(++crimes[i].timer > 1500) crimes[i].type = 0;
 		}
 	}
 }
@@ -617,8 +590,7 @@ cAudioManager::ComputeVolume(int emittingVolume, float soundIntensity, float dis
 	if((soundIntensity * 0.2f) <= distance) {
 		newSoundIntensity = soundIntensity * 0.2f;
 		emittingVolume =
-		    sq((soundIntensity - distance) / (soundIntensity - newSoundIntensity)) *
-		    emittingVolume;
+		    sq((soundIntensity - distance) / (soundIntensity - newSoundIntensity)) * emittingVolume;
 	}
 	return emittingVolume;
 }
@@ -663,8 +635,7 @@ cAudioManager::DestroyAllGameCreatedEntities()
 				case AUDIOTYPE_GARAGE:
 				case AUDIOTYPE_FIREHYDRANT: DestroyEntity(i); break;
 				case AUDIOTYPE_SCRIPTOBJECT:
-					entity =
-					    (cAudioScriptObject *)m_asAudioEntities[i].m_pEntity;
+					entity = (cAudioScriptObject *)m_asAudioEntities[i].m_pEntity;
 					if(entity) {
 						delete entity;
 						m_asAudioEntities[i].m_pEntity = nil;
@@ -682,17 +653,14 @@ cAudioManager::DestroyAllGameCreatedEntities()
 void
 cAudioManager::DestroyEntity(int32 id)
 {
-	if(m_bIsInitialised && id >= 0 && id < totalAudioEntitiesSlots &&
-	   m_asAudioEntities[id].m_bIsUsed) {
+	if(m_bIsInitialised && id >= 0 && id < totalAudioEntitiesSlots && m_asAudioEntities[id].m_bIsUsed) {
 		m_asAudioEntities[id].m_bIsUsed = 0;
 		for(int32 i = 0; i < m_nAudioEntitiesTotal; ++i) {
 			if(id == m_anAudioEntityIndices[i]) {
 				if(i < totalAudioEntitiesSlots - 1)
-					memmove(&m_anAudioEntityIndices[i],
-					        &m_anAudioEntityIndices[i + 1],
+					memmove(&m_anAudioEntityIndices[i], &m_anAudioEntityIndices[i + 1],
 					        4 * (m_nAudioEntitiesTotal - (i + 1)));
-				m_anAudioEntityIndices[--m_nAudioEntitiesTotal] =
-				    totalAudioEntitiesSlots;
+				m_anAudioEntityIndices[--m_nAudioEntitiesTotal] = totalAudioEntitiesSlots;
 				return;
 			}
 		}
@@ -702,8 +670,7 @@ cAudioManager::DestroyEntity(int32 id)
 void
 cAudioManager::DoJumboVolOffset() const
 {
-	if(!(m_nTimeOfRecentCrime % (m_anRandomTable[0] % 6u + 3)))
-		jumboVolOffset = m_anRandomTable[1] % 60u;
+	if(!(m_nTimeOfRecentCrime % (m_anRandomTable[0] % 6 + 3))) jumboVolOffset = m_anRandomTable[1] % 60;
 }
 
 void
@@ -715,9 +682,8 @@ cAudioManager::DoPoliceRadioCrackle()
 	m_sQueueSample.m_bBankIndex = 0;
 	m_sQueueSample.m_bIsDistant = 1;
 	m_sQueueSample.field_16 = 10;
-	m_sQueueSample.m_nFrequency =
-	    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_POLICE_SCANNER_CRACKLE);
-	m_sQueueSample.m_bVolume = m_anRandomTable[2] % 20u + 15;
+	m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_POLICE_SCANNER_CRACKLE);
+	m_sQueueSample.m_bVolume = m_anRandomTable[2] % 20 + 15;
 	m_sQueueSample.m_nLoopCount = 0;
 	m_sQueueSample.m_bEmittingVolume = m_sQueueSample.m_bVolume;
 	m_sQueueSample.m_nLoopStart = SampleManager.GetSampleLoopStartOffset(188);
@@ -737,14 +703,9 @@ cAudioManager::GetPlayerTalkSfx(int16 sound)
 	static uint32 lastSfx = NO_SAMPLE;
 
 	switch(sound) {
-	case SOUND_PED_DAMAGE:
-		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_LAND: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_FALL_REACTION_1, 6u); break;
-
+	case SOUND_PED_DAMAGE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_DAMAGE_REACTION_1, 11); break;
+	case SOUND_PED_HIT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_HIT_REACTION_1, 10); break;
+	case SOUND_PED_LAND: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_FALL_REACTION_1, 6); break;
 	default: sfx = NO_SAMPLE; break;
 	}
 	return sfx;
@@ -758,14 +719,13 @@ 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, 6);
 	} else {
 		if(sound != SOUND_PED_PURSUIT_COP) { return GetGenericMaleTalkSfx(sound); }
 
 		pedState = FindPlayerPed()->m_nPedState;
-		if(pedState == PED_ARRESTED || pedState == PED_DEAD || pedState == PED_DIE)
-			return NO_SAMPLE;
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_POLICE_COP_1_PURSUIT_1, 7u);
+		if(pedState == PED_ARRESTED || pedState == PED_DEAD || pedState == PED_DIE) return NO_SAMPLE;
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_POLICE_COP_1_PURSUIT_1, 7);
 	}
 
 	return 13 * (m_sQueueSample.m_nEntityIndex % 5) + sfx;
@@ -779,14 +739,13 @@ 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, 6);
 	} else {
 		if(sound != SOUND_PED_PURSUIT_SWAT) { return GetGenericMaleTalkSfx(sound); }
 
 		pedState = FindPlayerPed()->m_nPedState;
-		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);
+		if(pedState == PED_ARRESTED || pedState == PED_DEAD || pedState == PED_DIE) return NO_SAMPLE;
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_POLICE_SWAT_1_PURSUIT_ARREST_1, 6);
 	}
 
 	return 6 * (m_sQueueSample.m_nEntityIndex % 3) + sfx;
@@ -800,14 +759,13 @@ 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, 6);
 	} else {
 		if(sound != SOUND_PED_PURSUIT_FBI) { return GetGenericMaleTalkSfx(sound); }
 
 		pedState = FindPlayerPed()->m_nPedState;
-		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);
+		if(pedState == PED_ARRESTED || pedState == PED_DEAD || pedState == PED_DIE) return NO_SAMPLE;
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_POLICE_FBI_1_PURSUIT_ARREST_1, 6);
 	}
 
 	return 6 * (m_sQueueSample.m_nEntityIndex % 3) + sfx;
@@ -823,9 +781,8 @@ cAudioManager::GetArmyTalkSfx(int16 sound)
 	if(sound != SOUND_PED_PURSUIT_ARMY) { return GetGenericMaleTalkSfx(sound); }
 
 	pedState = FindPlayerPed()->m_nPedState;
-	if(pedState == PED_ARRESTED || pedState == PED_DEAD || pedState == PED_DIE)
-		return NO_SAMPLE;
-	GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_POLICE_ARMY_1_PURSUIT_1, 15u);
+	if(pedState == PED_ARRESTED || pedState == PED_DEAD || pedState == PED_DIE) return NO_SAMPLE;
+	GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_POLICE_ARMY_1_PURSUIT_1, 15);
 
 	return 15 * (m_sQueueSample.m_nEntityIndex % 1) + sfx;
 }
@@ -837,21 +794,11 @@ cAudioManager::GetMedicTalkSfx(int16 sound)
 	static uint32 lastSfx = NO_SAMPLE;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_COWER:
-		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);
-		break;
-	case SOUND_PED_HEALING:
-		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);
-		break;
-	case SOUND_PED_FLEE_RUN:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MEDIC_1_FLEE_RUN_1, 6u);
-		break;
+	case SOUND_PED_HANDS_COWER: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MEDIC_1_HANDS_COWER_1, 5); break;
+	case SOUND_PED_CAR_JACKED: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MEDIC_1_CAR_JACKED_1, 5); break;
+	case SOUND_PED_HEALING: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MEDIC_1_HEALING_1, 12); break;
+	case SOUND_PED_LEAVE_VEHICLE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MEDIC_1_LEAVE_VEHICLE_1, 9); break;
+	case SOUND_PED_FLEE_RUN: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MEDIC_1_FLEE_RUN_1, 6); break;
 	default: return GetGenericMaleTalkSfx(sound);
 	}
 	return 37 * (m_sQueueSample.m_nEntityIndex & 1) + sfx;
@@ -870,30 +817,16 @@ cAudioManager::GetNormalMaleTalkSfx(int16 sound)
 	static uint32 lastSfx = NO_SAMPLE;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_COWER:
-		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);
-		break;
-	case SOUND_PED_EVADE:
-		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);
-		break;
+	case SOUND_PED_HANDS_COWER: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_NORMAL_MALE_HANDS_COWER_1, 7); break;
+	case SOUND_PED_CAR_JACKED: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_NORMAL_MALE_CAR_JACKED_1, 7); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_NORMAL_MALE_EVADE_1, 9); break;
+	case SOUND_PED_FLEE_RUN: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_NORMAL_MALE_FLEE_RUN_1, 5); break;
 	case SOUND_PED_CAR_COLLISION:
-		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);
-		break;
-	case SOUND_PED_CHAT_EVENT:
-		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_CAR_COLLISION_1, 12);
 		break;
+	case SOUND_PED_CHAT_SEXY: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_NORMAL_MALE_CHAT_SEXY_1, 8); break;
+	case SOUND_PED_CHAT_EVENT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_NORMAL_MALE_CHAT_EVENT_1, 10); break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_NORMAL_MALE_CHAT_1, 25); break;
 	default: return GetGenericMaleTalkSfx(sound);
 	}
 	return sfx;
@@ -906,10 +839,10 @@ 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, 7);
 	} else {
 		if(sound != SOUND_PED_CAR_COLLISION) return 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, 6);
 	}
 	return 13 * (m_sQueueSample.m_nEntityIndex & 1) + sfx;
 }
@@ -921,21 +854,13 @@ cAudioManager::GetPimpTalkSfx(int16 sound)
 	static uint32 lastSfx = NO_SAMPLE;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_UP:
-		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); break;
-	case SOUND_PED_CAR_COLLISION:
-		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); break;
+	case SOUND_PED_HANDS_UP: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_PIMP_HANDS_UP_1, 7); break;
+	case SOUND_PED_CAR_JACKED: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_PIMP_CAR_JACKED_1, 4); break;
+	case SOUND_PED_DEFEND: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_PIMP_DEFEND_1, 9); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_PIMP_EVADE_1, 6); break;
+	case SOUND_PED_CAR_COLLISION: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_PIMP_CAR_COLLISION_1, 5); break;
+	case SOUND_PED_CHAT_EVENT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_PIMP_CHAT_EVENT_1, 2); break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_PIMP_CHAT_1, 17); break;
 	default: return GetGenericMaleTalkSfx(sound);
 	}
 	return sfx;
@@ -948,25 +873,13 @@ cAudioManager::GetMafiaTalkSfx(int16 sound)
 	static uint32 lastSfx = NO_SAMPLE;
 
 	switch(sound) {
-	case SOUND_PED_CAR_JACKING:
-		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);
-		break;
-	case SOUND_PED_ATTACK:
-		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);
-		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); break;
+	case SOUND_PED_CAR_JACKING: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MAFIA_1_CAR_JACKING_1, 2); break;
+	case SOUND_PED_CAR_JACKED: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MAFIA_1_CAR_JACKED_1, 2); break;
+	case SOUND_PED_ATTACK: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MAFIA_1_ATTACK_1, 5); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MAFIA_1_EVADE_1, 5); break;
+	case SOUND_PED_CAR_COLLISION: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MAFIA_1_CAR_COLLISION_1, 6); break;
+	case SOUND_PED_CHAT_SEXY: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MAFIA_1_CHAT_SEXY_1, 3); break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MAFIA_1_CHAT_1, 7); break;
 	default: return GetGenericMaleTalkSfx(sound);
 	}
 	return 30 * (m_sQueueSample.m_nEntityIndex % 3) + sfx;
@@ -979,28 +892,14 @@ cAudioManager::GetTriadTalkSfx(int16 sound)
 	static uint32 lastSfx = NO_SAMPLE;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_UP:
-		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);
-		break;
-	case SOUND_PED_CAR_JACKED:
-		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);
-		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);
-		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); break;
+	case SOUND_PED_HANDS_UP: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_TRIAD_1_HANDS_UP_1, 3); break;
+	case SOUND_PED_CAR_JACKING: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_TRIAD_1_CAR_JACKING_1, 2); break;
+	case SOUND_PED_CAR_JACKED: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_TRIAD_1_CAR_JACKED_1, 2); break;
+	case SOUND_PED_ATTACK: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_TRIAD_1_ATTACK_1, 5); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_TRIAD_1_EVADE_1, 4); break;
+	case SOUND_PED_CAR_COLLISION: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_TRIAD_1_CAR_COLLISION_1, 7); break;
+	case SOUND_PED_CHAT_SEXY: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_TRIAD_1_CHAT_SEXY_1, 3); break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_TRIAD_1_CHAT_1, 8); break;
 	default: return GetGenericMaleTalkSfx(sound);
 	}
 	return sfx;
@@ -1013,32 +912,18 @@ cAudioManager::GetDiabloTalkSfx(int16 sound)
 	static uint32 lastSfx = NO_SAMPLE;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_UP:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_DIABLO_1_HANDS_UP_1, 4u);
-		break;
+	case SOUND_PED_HANDS_UP: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_DIABLO_1_HANDS_UP_1, 4); break;
 	case SOUND_PED_HANDS_COWER:
 		sound = SOUND_PED_FLEE_SPRINT;
 		return GetGenericMaleTalkSfx(sound);
 		break;
-	case SOUND_PED_CAR_JACKING:
-		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);
-		break;
-	case SOUND_PED_ATTACK:
-		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);
-		break;
-	case SOUND_PED_CAR_COLLISION:
-		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); break;
+	case SOUND_PED_CAR_JACKING: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_DIABLO_1_CAR_JACKING_1, 2); break;
+	case SOUND_PED_CAR_JACKED: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_DIABLO_1_CAR_JACKED_1, 2); break;
+	case SOUND_PED_ATTACK: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_DIABLO_1_ATTACK_1, 4); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_DIABLO_1_EVADE_1, 4); break;
+	case SOUND_PED_CAR_COLLISION: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_DIABLO_1_CAR_COLLISION_1, 5); break;
+	case SOUND_PED_CHAT_SEXY: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_DIABLO_1_CHAT_SEXY_1, 4); break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_DIABLO_1_CHAT_1, 5); break;
 	default: return GetGenericMaleTalkSfx(sound);
 	}
 	return 30 * (m_sQueueSample.m_nEntityIndex & 1) + sfx;
@@ -1051,22 +936,12 @@ cAudioManager::GetYakuzaTalkSfx(int16 sound)
 	static uint32 lastSfx = NO_SAMPLE;
 
 	switch(sound) {
-	case SOUND_PED_CAR_JACKING:
-		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);
-		break;
-	case SOUND_PED_ATTACK:
-		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);
-		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); break;
+	case SOUND_PED_CAR_JACKING: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_YAKUZA_1_CAR_JACKING_1, 2); break;
+	case SOUND_PED_CAR_JACKED: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_YAKUZA_1_CAR_JACKED_1, 2); break;
+	case SOUND_PED_ATTACK: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_YAKUZA_1_ATTACK_1, 5); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_YAKUZA_1_EVADE_1, 4); break;
+	case SOUND_PED_CAR_COLLISION: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_YAKUZA_1_CAR_COLLISION_1, 6); break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_YAKUZA_1_CHAT_1, 5); break;
 	default: return GetGenericMaleTalkSfx(sound);
 	}
 	return 24 * (m_sQueueSample.m_nEntityIndex & 1) + sfx;
@@ -1080,23 +955,13 @@ cAudioManager::GetYardieTalkSfx(int16 sound)
 
 	switch(sound) {
 	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_JACKING: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_YARDIE_1_CAR_JACKING_1, 2); 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);
-		break;
-	case SOUND_PED_EVADE:
-		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);
-		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); break;
+	case SOUND_PED_ATTACK: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_YARDIE_1_ATTACK_1, 6); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_YARDIE_1_EVADE_1, 5); break;
+	case SOUND_PED_CAR_COLLISION: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_YARDIE_1_CAR_COLLISION_1, 6); break;
+	case SOUND_PED_CHAT_SEXY: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_YARDIE_1_CHAT_SEXY_1, 2); break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_YARDIE_1_CHAT_1, 8); break;
 	default: return GetGenericMaleTalkSfx(sound);
 	}
 	return 31 * (m_sQueueSample.m_nEntityIndex & 1) + sfx;
@@ -1109,25 +974,13 @@ cAudioManager::GetColumbianTalkSfx(int16 sound)
 	static uint32 lastSfx = NO_SAMPLE;
 
 	switch(sound) {
-	case SOUND_PED_CAR_JACKING:
-		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);
-		break;
-	case SOUND_PED_ATTACK:
-		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);
-		break;
-	case SOUND_PED_CAR_COLLISION:
-		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); break;
+	case SOUND_PED_CAR_JACKING: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_COLUMB_1_CAR_JACKING_1, 2); break;
+	case SOUND_PED_CAR_JACKED: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_COLUMB_1_CAR_JACKED_1, 2); break;
+	case SOUND_PED_ATTACK: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_COLUMB_1_ATTACK_1, 5); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_COLUMB_1_EVADE_1, 5); break;
+	case SOUND_PED_CAR_COLLISION: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_COLUMB_1_CAR_COLLISION_1, 6); break;
+	case SOUND_PED_CHAT_SEXY: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_COLUMB_1_CHAT_SEXY_1, 2); break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_COLUMB_1_CHAT_1, 5); break;
 	default: return GetGenericMaleTalkSfx(sound);
 	}
 	return 27 * (m_sQueueSample.m_nEntityIndex & 1) + sfx;
@@ -1140,28 +993,14 @@ cAudioManager::GetHoodTalkSfx(int16 sound)
 	static uint32 lastSfx = NO_SAMPLE;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_UP:
-		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);
-		break;
-	case SOUND_PED_CAR_JACKED:
-		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);
-		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);
-		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); break;
+	case SOUND_PED_HANDS_UP: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_HOODS_1_HANDS_UP_1, 5); break;
+	case SOUND_PED_CAR_JACKING: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_HOODS_1_CAR_JACKING_1, 2); break;
+	case SOUND_PED_CAR_JACKED: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_HOODS_1_CAR_JACKED_1, 2); break;
+	case SOUND_PED_ATTACK: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_HOODS_1_ATTACK_1, 6); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_HOODS_1_EVADE_1, 5); break;
+	case SOUND_PED_CAR_COLLISION: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_HOODS_1_CAR_COLLISION_1, 7); break;
+	case SOUND_PED_CHAT_SEXY: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_HOODS_1_CHAT_SEXY_1, 2); break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_HOODS_1_CHAT_1, 6); break;
 
 	default: return GetGenericMaleTalkSfx(sound); break;
 	}
@@ -1175,21 +1014,13 @@ cAudioManager::GetBlackCriminalTalkSfx(int16 sound)
 	static uint32 lastSfx = NO_SAMPLE;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_UP:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_CRIMINAL_1_HANDS_UP_1, 4u);
-		break;
+	case SOUND_PED_HANDS_UP: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_CRIMINAL_1_HANDS_UP_1, 4); 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);
-		break;
-	case SOUND_PED_ATTACK:
-		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);
-		break;
+	case SOUND_PED_MUGGING: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_CRIMINAL_1_MUGGING_1, 2); break;
+	case SOUND_PED_ATTACK: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_CRIMINAL_1_ATTACK_1, 5); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_CRIMINAL_1_EVADE_1, 6); 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, 5);
 		break;
 	default: return GetGenericMaleTalkSfx(sound); break;
 	}
@@ -1203,21 +1034,13 @@ cAudioManager::GetWhiteCriminalTalkSfx(int16 sound)
 	static uint32 lastSfx = NO_SAMPLE;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_UP:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_CRIMINAL_1_HANDS_UP_1, 3u);
-		break;
+	case SOUND_PED_HANDS_UP: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_CRIMINAL_1_HANDS_UP_1, 3); 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);
-		break;
-	case SOUND_PED_ATTACK:
-		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);
-		break;
+	case SOUND_PED_MUGGING: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_CRIMINAL_1_MUGGING_1, 2); break;
+	case SOUND_PED_ATTACK: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_CRIMINAL_1_ATTACK_1, 4); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_CRIMINAL_1_EVADE_1, 5); 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, 4);
 		break;
 	default: return GetGenericMaleTalkSfx(sound); break;
 	}
@@ -1231,27 +1054,13 @@ cAudioManager::GetMaleNo2TalkSfx(int16 sound)
 	static uint32 lastSfx = NO_SAMPLE;
 
 	switch(sound) {
-	case SOUND_PED_CAR_JACKED:
-		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);
-		break;
-	case SOUND_PED_ATTACK:
-		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);
-		break;
-	case SOUND_PED_CAR_COLLISION:
-		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);
-		break;
-	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MALE_NO_2_CHAT_1, 7u);
-		break;
+	case SOUND_PED_CAR_JACKED: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MALE_NO_2_CAR_JACKED_1, 3); break;
+	case SOUND_PED_ROBBED: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MALE_NO_2_ROBBED_1, 4); break;
+	case SOUND_PED_ATTACK: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MALE_NO_2_ATTACK_1, 4); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MALE_NO_2_EVADE_1, 4); break;
+	case SOUND_PED_CAR_COLLISION: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MALE_NO_2_CAR_COLLISION_1, 7); break;
+	case SOUND_PED_CHAT_SEXY: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MALE_NO_2_CHAT_SEXY_1, 5); break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MALE_NO_2_CHAT_1, 7); break;
 	default: return GetGenericMaleTalkSfx(sound);
 	}
 	return sfx;
@@ -1264,30 +1073,20 @@ cAudioManager::GetBlackProjectMaleTalkSfx(int16 sound, int32 model)
 	static uint32 lastSfx = NO_SAMPLE;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_UP:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_1_HANDS_UP_1, 3u);
-		break;
+	case SOUND_PED_HANDS_UP: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_1_HANDS_UP_1, 3); break;
 	case SOUND_PED_CAR_JACKED:
-		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);
-		break;
-	case SOUND_PED_ATTACK:
-		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_CAR_JACKED_1, 2);
 		break;
+	case SOUND_PED_ROBBED: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_1_ROBBED_1, 2); break;
+	case SOUND_PED_ATTACK: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_1_ATTACK_1, 6); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_1_EVADE_1, 5); break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_1_CAR_COLLISION_1,
-		          7u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_1_CAR_COLLISION_1, 7);
 		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, 3);
 		break;
-	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_1_CHAT_1, 6u);
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_1_CHAT_1, 6);
 	default: return GetGenericMaleTalkSfx(sound);
 	}
 
@@ -1302,23 +1101,16 @@ cAudioManager::GetWhiteFatMaleTalkSfx(int16 sound)
 	static uint32 lastSfx = NO_SAMPLE;
 
 	switch(sound) {
-	case SOUND_PED_CAR_JACKED:
-		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);
-		break;
-	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_FAT_MALE_1_EVADE_1, 9u);
-		break;
+	case SOUND_PED_CAR_JACKED: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_FAT_MALE_1_CAR_JACKED_1, 3); break;
+	case SOUND_PED_ROBBED: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_FAT_MALE_1_ROBBED_1, 3); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_FAT_MALE_1_EVADE_1, 9); 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, 9);
 		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, 2);
 		break;
-	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_FAT_MALE_1_CHAT_1, 9u);
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_FAT_MALE_1_CHAT_1, 9);
 	default: return GetGenericMaleTalkSfx(sound);
 	}
 	return sfx;
@@ -1331,24 +1123,16 @@ cAudioManager::GetBlackFatMaleTalkSfx(int16 sound)
 	static uint32 lastSfx = NO_SAMPLE;
 
 	switch(sound) {
-	case SOUND_PED_CAR_JACKED:
-		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);
-		break;
-	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_FAT_MALE_1_EVADE_1, 7u);
-		break;
+	case SOUND_PED_CAR_JACKED: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_FAT_MALE_1_CAR_JACKED_1, 4); break;
+	case SOUND_PED_ROBBED: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_FAT_MALE_1_ROBBED_1, 3); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_FAT_MALE_1_EVADE_1, 7); 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, 6);
 		break;
 	case SOUND_PED_WAIT_DOUBLEBACK:
-		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_WAIT_DOUBLEBACK_1, 3);
 		break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_FAT_MALE_1_CHAT_1, 8); break;
 	default: return GetGenericMaleTalkSfx(sound);
 	}
 	return sfx;
@@ -1362,30 +1146,23 @@ 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, 2);
 		break;
 	case SOUND_PED_CAR_JACKED:
-		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);
-		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_CAR_JACKED_1, 2);
 		break;
+	case SOUND_PED_ROBBED: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_CASUAL_FEMALE_1_ROBBED_1, 3); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_CASUAL_FEMALE_1_EVADE_1, 6); 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, 2);
 		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, 7);
 		break;
 	case SOUND_PED_CHAT_EVENT:
-		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_EVENT_1, 4);
 		break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_CASUAL_FEMALE_1_CHAT_1, 8); break;
 	default: return GetGenericFemaleTalkSfx(sound);
 	}
 	return sfx;
@@ -1399,28 +1176,23 @@ 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, 2);
 		break;
 	case SOUND_PED_CAR_JACKED:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_CASUAL_FEMALE_1_CAR_JACKED_1, 2u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_CASUAL_FEMALE_1_CAR_JACKED_1, 2);
 		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);
-		break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_CASUAL_FEMALE_1_EVADE_1, 3); 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, 2);
 		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, 8);
 		break;
 	case SOUND_PED_CHAT_EVENT:
-		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_EVENT_1, 2);
 		break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_CASUAL_FEMALE_1_CHAT_1, 4); break;
 	default: return GetGenericFemaleTalkSfx(sound);
 	}
 	return sfx;
@@ -1433,30 +1205,16 @@ cAudioManager::GetFemaleNo3TalkSfx(int16 sound)
 	static uint32 lastSfx = NO_SAMPLE;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_COWER:
-		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);
-		break;
-	case SOUND_PED_ROBBED:
-		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);
-		break;
-	case SOUND_PED_FLEE_RUN:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_FEMALE_NO_3_FLEE_RUN_1, 4u);
-		break;
+	case SOUND_PED_HANDS_COWER: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_FEMALE_NO_3_HANDS_COWER_1, 5); break;
+	case SOUND_PED_CAR_JACKED: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_FEMALE_NO_3_CAR_JACKED_1, 3); break;
+	case SOUND_PED_ROBBED: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_FEMALE_NO_3_ROBBED_1, 3); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_FEMALE_NO_3_EVADE_1, 6); break;
+	case SOUND_PED_FLEE_RUN: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_FEMALE_NO_3_FLEE_RUN_1, 4); break;
 	case SOUND_PED_CAR_COLLISION:
-		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);
-		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_CAR_COLLISION_1, 6);
 		break;
+	case SOUND_PED_CHAT_EVENT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_FEMALE_NO_3_CHAT_EVENT_1, 4); break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_FEMALE_NO_3_CHAT_1, 5); break;
 	default: return GetGenericFemaleTalkSfx(sound);
 	}
 	return sfx;
@@ -1470,26 +1228,20 @@ 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, 4);
 		break;
 	case SOUND_PED_CAR_JACKED:
-		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);
-		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_CAR_JACKED_1, 2);
 		break;
+	case SOUND_PED_ROBBED: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_FAT_FEMALE_1_ROBBED_1, 2); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_FAT_FEMALE_1_EVADE_1, 5); 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, 6);
 		break;
 	case SOUND_PED_CHAT_EVENT:
-		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_EVENT_1, 5);
 		break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_FAT_FEMALE_1_CHAT_1, 7); break;
 	default: return GetGenericFemaleTalkSfx(sound);
 	}
 	return sfx;
@@ -1503,27 +1255,20 @@ 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);
-		break;
-	case SOUND_PED_ROBBED:
-		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_CAR_JACKED_1, 2);
 		break;
+	case SOUND_PED_ROBBED: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_FAT_FEMALE_1_ROBBED_1, 2); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_FAT_FEMALE_1_EVADE_1, 6); 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, 8);
 		break;
 	case SOUND_PED_WAIT_DOUBLEBACK:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_FAT_FEMALE_1_WAIT_DOUBLEBACK_1,
-		          2u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_FAT_FEMALE_1_WAIT_DOUBLEBACK_1, 2);
 		break;
 	case SOUND_PED_CHAT_EVENT:
-		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_EVENT_1, 4);
 		break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_FAT_FEMALE_1_CHAT_1, 8); break;
 	default: return GetGenericFemaleTalkSfx(sound);
 	}
 	return sfx;
@@ -1537,26 +1282,20 @@ cAudioManager::GetBlackFemaleProstituteTalkSfx(int16 sound)
 
 	switch(sound) {
 	case SOUND_PED_HANDS_UP:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_FEMALE_PROSTITUTE_1_HANDS_UP_1,
-		          4u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_FEMALE_PROSTITUTE_1_HANDS_UP_1, 4);
 		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);
-		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_ATTACK_1, 4);
 		break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_FEMALE_PROSTITUTE_1_EVADE_1, 3); 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, 4);
 		break;
 	case SOUND_PED_SOLICIT:
-		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_SOLICIT_1, 8);
 		break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_FEMALE_PROSTITUTE_1_CHAT_1, 4); break;
 	default: return GetGenericFemaleTalkSfx(sound);
 	}
 	return 28 * (m_sQueueSample.m_nEntityIndex & 1) + sfx;
@@ -1570,24 +1309,19 @@ 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, 2);
 		break;
 	case SOUND_PED_ATTACK:
-		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_ATTACK_1, 4);
 		break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_FEMALE_PROSTITUTE_1_EVADE_1, 3); 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, 4);
 		break;
 	case SOUND_PED_SOLICIT:
-		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_SOLICIT_1, 8);
 		break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_FEMALE_PROSTITUTE_1_CHAT_1, 4); break;
 	default: return GetGenericFemaleTalkSfx(sound);
 	}
 	return 25 * (m_sQueueSample.m_nEntityIndex & 1) + sfx;
@@ -1601,30 +1335,24 @@ 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, 6);
 		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, 2);
 		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, 10);
 		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, 6);
 		break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_OLD_1_CAR_COLLISION_1, 7u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_OLD_1_CAR_COLLISION_1, 7);
 		break;
 	case SOUND_PED_CHAT_EVENT:
-		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_EVENT_1, 2);
 		break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_OLD_1_CHAT_1, 10); break;
 	default: return GetGenericFemaleTalkSfx(sound);
 	}
 	return sfx;
@@ -1638,31 +1366,22 @@ cAudioManager::GetBlackProjectFemaleYoungTalkSfx(int16 sound)
 
 	switch(sound) {
 	case SOUND_PED_HANDS_COWER:
-		GetPhrase(&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;
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_YOUNG_1_HANDS_COWER_1, 4);
 		break;
+	case SOUND_PED_CAR_JACKED: 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, 2);
 		break;
 	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_YOUNG_1_EVADE_1,
-		          5u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_YOUNG_1_EVADE_1, 5);
 		break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx,
-		          AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_YOUNG_1_CAR_COLLISION_1, 6u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_YOUNG_1_CAR_COLLISION_1, 6);
 		break;
 	case SOUND_PED_CHAT_EVENT:
-		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_EVENT_1, 5);
 		break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_YOUNG_1_CHAT_1, 7); break;
 	default: return GetGenericFemaleTalkSfx(sound);
 	}
 	return sfx;
@@ -1676,26 +1395,18 @@ 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, 3);
 		break;
 	case SOUND_PED_CAR_JACKED:
-		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);
-		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_CAR_JACKED_1, 2);
 		break;
+	case SOUND_PED_ATTACK: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_CHINATOWN_MALE_OLD_ATTACK_1, 5); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_CHINATOWN_MALE_OLD_EVADE_1, 6); break;
 	case SOUND_PED_CAR_COLLISION:
-		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);
-		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_CAR_COLLISION_1, 6);
 		break;
+	case SOUND_PED_CHAT_SEXY: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_CHINATOWN_MALE_OLD_CHAT_SEXY_1, 3); break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_CHINATOWN_MALE_OLD_CHAT_1, 7); break;
 	default: return GetGenericMaleTalkSfx(sound);
 	}
 	return sfx;
@@ -1709,27 +1420,20 @@ 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, 2);
 		break;
 	case SOUND_PED_CAR_JACKED:
-		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);
-		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_CAR_JACKED_1, 2);
 		break;
+	case SOUND_PED_ATTACK: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_CHINATOWN_MALE_YOUNG_ATTACK_1, 6); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_CHINATOWN_MALE_YOUNG_EVADE_1, 5); break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_CHINATOWN_MALE_YOUNG_CAR_COLLISION_1,
-		          6u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_CHINATOWN_MALE_YOUNG_CAR_COLLISION_1, 6);
 		break;
 	case SOUND_PED_CHAT_SEXY:
-		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_SEXY_1, 3);
 		break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_CHINATOWN_MALE_YOUNG_CHAT_1, 6); break;
 	default: return GetGenericMaleTalkSfx(sound);
 	}
 	return sfx;
@@ -1743,22 +1447,15 @@ cAudioManager::GetChinatownFemaleOldTalkSfx(int16 sound)
 
 	switch(sound) {
 	case SOUND_PED_HANDS_COWER:
-		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);
-		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_HANDS_COWER_1, 3);
 		break;
+	case SOUND_PED_ROBBED: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_CHINATOWN_FEMALE_OLD_ROBBED_1, 2); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_CHINATOWN_FEMALE_OLD_EVADE_1, 5); break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_CHINATOWN_FEMALE_OLD_CAR_COLLISION_1,
-		          5u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_CHINATOWN_FEMALE_OLD_CAR_COLLISION_1, 5);
 		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);
-		break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_CHINATOWN_FEMALE_OLD_CHAT_1, 6); break;
 	default: return GetGenericFemaleTalkSfx(sound);
 	}
 	return sfx;
@@ -1772,24 +1469,17 @@ cAudioManager::GetChinatownFemaleYoungTalkSfx(int16 sound)
 
 	switch(sound) {
 	case SOUND_PED_CAR_JACKED:
-		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);
-		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_CAR_JACKED_1, 2);
 		break;
+	case SOUND_PED_ROBBED: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_CHINATOWN_FEMALE_YOUNG_ROBBED_1, 2); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_CHINATOWN_FEMALE_YOUNG_EVADE_1, 6); 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, 7);
 		break;
 	case SOUND_PED_CHAT_EVENT:
-		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_EVENT_1, 4);
 		break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_CHINATOWN_FEMALE_YOUNG_CHAT_1, 7); break;
 	default: return GetGenericFemaleTalkSfx(sound);
 	}
 	return sfx;
@@ -1803,26 +1493,18 @@ 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, 3);
 		break;
 	case SOUND_PED_CAR_JACKED:
-		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);
-		break;
-	case SOUND_PED_ATTACK:
-		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_CAR_JACKED_1, 2);
 		break;
+	case SOUND_PED_ROBBED: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_LITTLE_ITALY_MALE_1_ROBBED_1, 2); break;
+	case SOUND_PED_ATTACK: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_LITTLE_ITALY_MALE_1_ATTACK_1, 5); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_LITTLE_ITALY_MALE_1_EVADE_1, 5); break;
 	case SOUND_PED_CAR_COLLISION:
-		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_CAR_COLLISION_1, 7);
 		break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_LITTLE_ITALY_MALE_1_CHAT_1, 6); break;
 	default: return GetGenericMaleTalkSfx(sound);
 	}
 	return 30 * (m_sQueueSample.m_nEntityIndex & 1) + sfx;
@@ -1836,26 +1518,17 @@ cAudioManager::GetLittleItalyFemaleOldTalkSfx(int16 sound)
 
 	switch(sound) {
 	case SOUND_PED_CAR_JACKED:
-		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);
-		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_CAR_JACKED_1, 2);
 		break;
+	case SOUND_PED_ROBBED: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_OLD_ROBBED_1, 2); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_OLD_EVADE_1, 6); 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, 7);
 		break;
 	case SOUND_PED_CHAT_EVENT:
-		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_EVENT_1, 4);
 		break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_OLD_CHAT_1, 7); break;
 	default: return GetGenericFemaleTalkSfx(sound);
 	}
 	return sfx;
@@ -1869,26 +1542,19 @@ 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, 2);
 		break;
 	case SOUND_PED_ROBBED:
-		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_ROBBED_1, 2);
 		break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_YOUNG_EVADE_1, 7); 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, 6);
 		break;
 	case SOUND_PED_CHAT_EVENT:
-		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_EVENT_1, 4);
 		break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_YOUNG_CHAT_1, 6); break;
 	default: return GetGenericFemaleTalkSfx(sound);
 	}
 	return sfx;
@@ -1902,23 +1568,15 @@ cAudioManager::GetWhiteDockerMaleTalkSfx(int16 sound)
 
 	switch(sound) {
 	case SOUND_PED_HANDS_COWER:
-		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);
-		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_HANDS_COWER_1, 2);
 		break;
+	case SOUND_PED_ATTACK: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_DOCKER_MALE_ATTACK_1, 3); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_DOCKER_MALE_EVADE_1, 4); break;
 	case SOUND_PED_CAR_COLLISION:
-		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);
-		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_CAR_COLLISION_1, 4);
 		break;
+	case SOUND_PED_CHAT_SEXY: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_DOCKER_MALE_CHAT_SEXY_1, 3); break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_DOCKER_MALE_CHAT_1, 5); break;
 	default: return GetGenericMaleTalkSfx(sound);
 	}
 	return sfx;
@@ -1932,23 +1590,15 @@ cAudioManager::GetBlackDockerMaleTalkSfx(int16 sound)
 
 	switch(sound) {
 	case SOUND_PED_HANDS_COWER:
-		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);
-		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_HANDS_COWER_1, 3);
 		break;
+	case SOUND_PED_ATTACK: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_DOCKER_MALE_ATTACK_1, 5); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_DOCKER_MALE_EVADE_1, 5); break;
 	case SOUND_PED_CAR_COLLISION:
-		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);
-		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_CAR_COLLISION_1, 6);
 		break;
+	case SOUND_PED_CHAT_SEXY: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_DOCKER_MALE_CHAT_SEXY_1, 3); break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_DOCKER_MALE_CHAT_1, 5); break;
 	default: return GetGenericMaleTalkSfx(sound);
 	}
 	return sfx;
@@ -1961,28 +1611,16 @@ cAudioManager::GetScumMaleTalkSfx(int16 sound)
 	static uint32 lastSfx = NO_SAMPLE;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_COWER:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SCUM_MALE_HANDS_COWER_1, 5u);
-		break;
+	case SOUND_PED_HANDS_COWER: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SCUM_MALE_HANDS_COWER_1, 5); 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);
-		break;
-	case SOUND_PED_EVADE:
-		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);
-		break;
+	case SOUND_PED_ATTACK: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SCUM_MALE_ATTACK_1, 0xA); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SCUM_MALE_EVADE_1, 5); break;
+	case SOUND_PED_CAR_COLLISION: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SCUM_MALE_CAR_COLLISION_1, 6); break;
 	case SOUND_PED_WAIT_DOUBLEBACK:
-		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);
-		break;
-	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SCUM_MALE_CHAT_1, 9u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SCUM_MALE_WAIT_DOUBLEBACK_1, 3);
 		break;
+	case SOUND_PED_CHAT_SEXY: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SCUM_MALE_CHAT_SEXY_1, 5); break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SCUM_MALE_CHAT_1, 9); break;
 	default: return GetGenericMaleTalkSfx(sound);
 	}
 	return sfx;
@@ -1995,24 +1633,14 @@ cAudioManager::GetScumFemaleTalkSfx(int16 sound)
 	static uint32 lastSfx = NO_SAMPLE;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_COWER:
-		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);
-		break;
-	case SOUND_PED_ATTACK:
-		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);
-		break;
+	case SOUND_PED_HANDS_COWER: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SCUM_FEMALE_HANDS_COWER_1, 4); break;
+	case SOUND_PED_ROBBED: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SCUM_FEMALE_ROBBED_1, 2); break;
+	case SOUND_PED_ATTACK: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SCUM_FEMALE_ATTACK_1, 4); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SCUM_FEMALE_EVADE_1, 8); break;
 	case SOUND_PED_CAR_COLLISION:
-		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_CAR_COLLISION_1, 5);
 		break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SCUM_FEMALE_CHAT_1, 13); break;
 	default: return GetGenericFemaleTalkSfx(sound);
 	}
 	return sfx;
@@ -2026,23 +1654,15 @@ cAudioManager::GetWhiteWorkerMaleTalkSfx(int16 sound)
 
 	switch(sound) {
 	case SOUND_PED_HANDS_COWER:
-		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);
-		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_HANDS_COWER_1, 3);
 		break;
+	case SOUND_PED_ATTACK: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_WORKER_MALE_ATTACK_1, 3); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_WORKER_MALE_EVADE_1, 4); break;
 	case SOUND_PED_CAR_COLLISION:
-		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);
-		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_CAR_COLLISION_1, 6);
 		break;
+	case SOUND_PED_CHAT_SEXY: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_WORKER_MALE_CHAT_SEXY_1, 2); break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_WORKER_MALE_CHAT_1, 6); break;
 	default: return GetGenericMaleTalkSfx(sound);
 	}
 	return sfx;
@@ -2056,24 +1676,15 @@ cAudioManager::GetBlackWorkerMaleTalkSfx(int16 sound)
 
 	switch(sound) {
 	case SOUND_PED_HANDS_COWER:
-		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);
-		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_HANDS_COWER_1, 4);
 		break;
+	case SOUND_PED_ATTACK: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_WORKER_MALE_ATTACK_1, 3); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_WORKER_MALE_EVADE_1, 3); break;
 	case SOUND_PED_CAR_COLLISION:
-		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);
-		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_CAR_COLLISION_1, 4);
 		break;
+	case SOUND_PED_CHAT_SEXY: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_WORKER_MALE_CHAT_SEXY_1, 3); break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_WORKER_MALE_CHAT_1, 4); break;
 	default: return GetGenericMaleTalkSfx(sound);
 	}
 	return sfx;
@@ -2087,30 +1698,21 @@ 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, 3);
 		break;
 	case SOUND_PED_CAR_JACKED:
-		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);
-		break;
-	case SOUND_PED_ATTACK:
-		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_CAR_JACKED_1, 2);
 		break;
+	case SOUND_PED_ROBBED: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BUSINESS_MALE_YOUNG_1_ROBBED_1, 2); break;
+	case SOUND_PED_ATTACK: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BUSINESS_MALE_YOUNG_1_ATTACK_1, 4); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BUSINESS_MALE_YOUNG_1_EVADE_1, 4); 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, 5);
 		break;
 	case SOUND_PED_CAR_COLLISION:
-		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_CAR_COLLISION_1, 6);
 		break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BUSINESS_MALE_YOUNG_1_CHAT_1, 6); break;
 	default: return GetGenericMaleTalkSfx(sound);
 	}
 
@@ -2126,30 +1728,19 @@ 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, 3);
 		break;
 	case SOUND_PED_CAR_JACKED:
-		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);
-		break;
-	case SOUND_PED_ATTACK:
-		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);
-		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_CAR_JACKED_1, 2);
 		break;
+	case SOUND_PED_ROBBED: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BUSINESS_MALE_OLD_1_ROBBED_1, 2); break;
+	case SOUND_PED_ATTACK: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BUSINESS_MALE_OLD_1_ATTACK_1, 5); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BUSINESS_MALE_OLD_1_EVADE_1, 4); break;
+	case SOUND_PED_FLEE_RUN: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BUSINESS_MALE_OLD_1_FLEE_RUN_1, 5); break;
 	case SOUND_PED_CAR_COLLISION:
-		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_CAR_COLLISION_1, 5);
 		break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BUSINESS_MALE_OLD_1_CHAT_1, 5); break;
 	default: return GetGenericMaleTalkSfx(sound);
 	}
 	return sfx;
@@ -2163,29 +1754,17 @@ 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);
-		break;
-	case SOUND_PED_CAR_JACKED:
-		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);
-		break;
-	case SOUND_PED_EVADE:
-		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_HANDS_COWER_1, 4);
 		break;
+	case SOUND_PED_CAR_JACKED: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BUSINESS_WOMAN_1_CAR_JACKED_1, 2); break;
+	case SOUND_PED_ROBBED: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BUSINESS_WOMAN_1_ROBBED_1, 2); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BUSINESS_WOMAN_1_EVADE_1, 6); break;
+	case SOUND_PED_FLEE_RUN: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BUSINESS_WOMAN_1_FLEE_RUN_1, 4); break;
 	case SOUND_PED_CAR_COLLISION:
-		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);
-		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_CAR_COLLISION_1, 5);
 		break;
+	case SOUND_PED_CHAT_EVENT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BUSINESS_WOMAN_1_CHAT_EVENT_1, 4); break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BUSINESS_WOMAN_1_CHAT_1, 7); break;
 	default: return GetGenericFemaleTalkSfx(sound);
 	}
 
@@ -2201,31 +1780,23 @@ 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, 5);
 		break;
 	case SOUND_PED_CAR_JACKED:
-		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);
-		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_CAR_JACKED_1, 4);
 		break;
+	case SOUND_PED_ROBBED: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_BUSINESS_FEMALE_ROBBED_1, 3); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_BUSINESS_FEMALE_EVADE_1, 6); 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, 6);
 		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, 7);
 		break;
 	case SOUND_PED_CHAT_EVENT:
-		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_EVENT_1, 4);
 		break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_BUSINESS_FEMALE_CHAT_1, 7); break;
 	default: return GetGenericFemaleTalkSfx(sound);
 	}
 	return sfx;
@@ -2238,28 +1809,15 @@ cAudioManager::GetSupermodelMaleTalkSfx(int16 sound)
 	static uint32 lastSfx = NO_SAMPLE;
 
 	switch(sound) {
-	case SOUND_PED_CAR_JACKED:
-		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);
-		break;
-	case SOUND_PED_ATTACK:
-		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);
-		break;
+	case SOUND_PED_CAR_JACKED: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SUPERMODEL_MALE_CAR_JACKED_1, 2); break;
+	case SOUND_PED_ROBBED: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SUPERMODEL_MALE_ROBBED_1, 2); break;
+	case SOUND_PED_ATTACK: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SUPERMODEL_MALE_ATTACK_1, 5); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SUPERMODEL_MALE_EVADE_1, 6); break;
 	case SOUND_PED_CAR_COLLISION:
-		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);
-		break;
-	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SUPERMODEL_MALE_CHAT_1, 6u);
-
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SUPERMODEL_MALE_CAR_COLLISION_1, 6);
 		break;
+	case SOUND_PED_CHAT_SEXY: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SUPERMODEL_MALE_CHAT_SEXY_1, 3); break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SUPERMODEL_MALE_CHAT_1, 6); break;
 	default: return GetGenericMaleTalkSfx(sound);
 	}
 	return sfx;
@@ -2273,24 +1831,17 @@ cAudioManager::GetSupermodelFemaleTalkSfx(int16 sound)
 
 	switch(sound) {
 	case SOUND_PED_HANDS_COWER:
-		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);
-		break;
-	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SUPERMODEL_FEMALE_EVADE_1, 4u);
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SUPERMODEL_FEMALE_HANDS_COWER_1, 4);
 		break;
+	case SOUND_PED_ROBBED: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SUPERMODEL_FEMALE_ROBBED_1, 3); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SUPERMODEL_FEMALE_EVADE_1, 4); 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, 7);
 		break;
 	case SOUND_PED_CHAT_EVENT:
-		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_EVENT_1, 5);
 		break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SUPERMODEL_FEMALE_CHAT_1, 8); break;
 	default: return GetGenericFemaleTalkSfx(sound);
 	}
 	return sfx;
@@ -2303,22 +1854,13 @@ cAudioManager::GetStewardMaleTalkSfx(int16 sound)
 	static uint32 lastSfx = NO_SAMPLE;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_COWER:
-		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);
-		break;
-	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_STEWARD_MALE_EVADE_1, 3u);
-		break;
+	case SOUND_PED_HANDS_COWER: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_STEWARD_MALE_HANDS_COWER_1, 3); break;
+	case SOUND_PED_ATTACK: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_STEWARD_MALE_ATTACK_1, 4); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_STEWARD_MALE_EVADE_1, 3); break;
 	case SOUND_PED_CAR_COLLISION:
-		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_CAR_COLLISION_1, 5);
 		break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_STEWARD_MALE_CHAT_1, 4); break;
 	default: return GetGenericMaleTalkSfx(sound);
 	}
 	return sfx;
@@ -2332,17 +1874,13 @@ cAudioManager::GetStewardFemaleTalkSfx(int16 sound)
 
 	switch(sound) {
 	case SOUND_PED_HANDS_COWER:
-		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_HANDS_COWER_1, 3);
 		break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_STEWARD_FEMALE_1_EVADE_1, 5); break;
 	case SOUND_PED_CAR_COLLISION:
-		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_CAR_COLLISION_1, 5);
 		break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_STEWARD_FEMALE_1_CHAT_1, 5); break;
 	default: return GetGenericFemaleTalkSfx(sound);
 	}
 	return 18 * (m_sQueueSample.m_nEntityIndex & 1) + sfx;
@@ -2355,21 +1893,11 @@ cAudioManager::GetFanMaleTalkSfx(int16 sound, int32 model)
 	static uint32 lastSfx = NO_SAMPLE;
 
 	switch(sound) {
-	case SOUND_PED_ATTACK:
-		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);
-		break;
-	case SOUND_PED_CAR_COLLISION:
-		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);
-		break;
-	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_FAN_MALE_1_CHAT_1, 6u);
-		break;
+	case SOUND_PED_ATTACK: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_FAN_MALE_1_ATTACK_1, 3); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_FAN_MALE_1_EVADE_1, 4); break;
+	case SOUND_PED_CAR_COLLISION: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_FAN_MALE_1_CAR_COLLISION_1, 5); break;
+	case SOUND_PED_CHAT_EVENT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_FAN_MALE_1_CHAT_EVENT_1, 2); break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_FAN_MALE_1_CHAT_1, 6); break;
 	default: return GetGenericMaleTalkSfx(sound);
 	}
 
@@ -2385,18 +1913,12 @@ cAudioManager::GetFanFemaleTalkSfx(int16 sound)
 
 	switch(sound) {
 	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);
-		break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_FAN_FEMALE_1_EVADE_1, 4); break;
 	case SOUND_PED_CAR_COLLISION:
-		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);
-		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_CAR_COLLISION_1, 5);
 		break;
+	case SOUND_PED_CHAT_EVENT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_FAN_FEMALE_1_CHAT_EVENT_1, 2); break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_FAN_FEMALE_1_CHAT_1, 6); break;
 	default: return GetGenericFemaleTalkSfx(sound);
 	}
 	return 18 * (m_sQueueSample.m_nEntityIndex & 1) + sfx;
@@ -2409,21 +1931,13 @@ cAudioManager::GetHospitalMaleTalkSfx(int16 sound)
 	static uint32 lastSfx = NO_SAMPLE;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_COWER:
-		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);
-		break;
-	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_HOSPITAL_MALE_EVADE_1, 4u);
-		break;
+	case SOUND_PED_HANDS_COWER: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_HOSPITAL_MALE_HANDS_COWER_1, 4); break;
+	case SOUND_PED_ATTACK: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_HOSPITAL_MALE_ATTACK_1, 4); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_HOSPITAL_MALE_EVADE_1, 4); break;
 	case SOUND_PED_CAR_COLLISION:
-		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_CAR_COLLISION_1, 5);
 		break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_HOSPITAL_MALE_CHAT_1, 5); break;
 	default: return GetGenericMaleTalkSfx(sound);
 	}
 	return sfx;
@@ -2436,16 +1950,11 @@ cAudioManager::GetHospitalFemaleTalkSfx(int16 sound)
 	static uint32 lastSfx = NO_SAMPLE;
 
 	switch(sound) {
-	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_HOSPITAL_FEMALE_EVADE_1, 5u);
-		break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_HOSPITAL_FEMALE_EVADE_1, 5); break;
 	case SOUND_PED_CAR_COLLISION:
-		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_CAR_COLLISION_1, 6);
 		break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_HOSPITAL_FEMALE_CHAT_1, 6); break;
 	default: return GetGenericFemaleTalkSfx(sound);
 	}
 	return sfx;
@@ -2459,29 +1968,20 @@ cAudioManager::GetWhiteConstructionWorkerTalkSfx(int16 sound)
 
 	switch(sound) {
 	case SOUND_PED_HANDS_COWER:
-		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;
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_CONSTRUCTION_WORKER_HANDS_COWER_1, 3);
 		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);
-		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_ATTACK_1, 5);
 		break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_CONSTRUCTION_WORKER_EVADE_1, 5); 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, 4);
 		break;
 	case SOUND_PED_CHAT_SEXY:
-		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_SEXY_1, 3);
 		break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_CONSTRUCTION_WORKER_CHAT_1, 7); break;
 	default: return GetGenericMaleTalkSfx(sound);
 	}
 	return sfx;
@@ -2495,30 +1995,22 @@ 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, 3);
 		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, 2);
 		break;
 	case SOUND_PED_ATTACK:
-		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_ATTACK_1, 5);
 		break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_CONSTRUCTION_WORKER_EVADE_1, 5); 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, 5);
 		break;
 	case SOUND_PED_CHAT_SEXY:
-		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_SEXY_1, 4);
 		break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_CONSTRUCTION_WORKER_CHAT_1, 4); break;
 	default: return GetGenericMaleTalkSfx(sound);
 	}
 	return sfx;
@@ -2531,24 +2023,14 @@ cAudioManager::GetShopperFemaleTalkSfx(int16 sound, int32 model)
 	static uint32 lastSfx = NO_SAMPLE;
 
 	switch(sound) {
-	case SOUND_PED_CAR_JACKED:
-		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);
-		break;
-	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SHOPPER_FEMALE_1_EVADE_1, 6u);
-		break;
+	case SOUND_PED_CAR_JACKED: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SHOPPER_FEMALE_1_CAR_JACKED_1, 2); break;
+	case SOUND_PED_ROBBED: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SHOPPER_FEMALE_1_ROBBED_1, 2); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SHOPPER_FEMALE_1_EVADE_1, 6); break;
 	case SOUND_PED_CAR_COLLISION:
-		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);
-		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_CAR_COLLISION_1, 7);
 		break;
+	case SOUND_PED_CHAT_EVENT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SHOPPER_FEMALE_1_CHAT_EVENT_1, 4); break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SHOPPER_FEMALE_1_CHAT_1, 7); break;
 	default: return GetGenericFemaleTalkSfx(sound);
 	}
 
@@ -2567,28 +2049,15 @@ cAudioManager::GetStudentMaleTalkSfx(int16 sound)
 	static uint32 lastSfx = NO_SAMPLE;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_COWER:
-		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);
-		break;
-	case SOUND_PED_ATTACK:
-		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);
-		break;
+	case SOUND_PED_HANDS_COWER: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_STUDENT_MALE_HANDS_COWER_1, 2); break;
+	case SOUND_PED_ROBBED: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_STUDENT_MALE_ROBBED_1, 2); break;
+	case SOUND_PED_ATTACK: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_STUDENT_MALE_ATTACK_1, 4); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_STUDENT_MALE_EVADE_1, 4); break;
 	case SOUND_PED_CAR_COLLISION:
-		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);
-		break;
-	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_STUDENT_MALE_CHAT_1, 5u);
-
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_STUDENT_MALE_CAR_COLLISION_1, 4);
 		break;
+	case SOUND_PED_CHAT_EVENT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_STUDENT_MALE_CHAT_EVENT_1, 3); break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_STUDENT_MALE_CHAT_1, 5); break;
 	default: return GetGenericMaleTalkSfx(sound);
 	}
 	return sfx;
@@ -2601,28 +2070,15 @@ cAudioManager::GetStudentFemaleTalkSfx(int16 sound)
 	static uint32 lastSfx = NO_SAMPLE;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_COWER:
-		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);
-		break;
-	case SOUND_PED_ATTACK:
-		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);
-		break;
+	case SOUND_PED_HANDS_COWER: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_STUDENT_FEMALE_HANDS_COWER_1, 4); break;
+	case SOUND_PED_ROBBED: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_STUDENT_FEMALE_ROBBED_1, 2); break;
+	case SOUND_PED_ATTACK: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_STUDENT_FEMALE_ATTACK_1, 4); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_STUDENT_FEMALE_EVADE_1, 4); break;
 	case SOUND_PED_CAR_COLLISION:
-		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);
-		break;
-	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_STUDENT_FEMALE_CHAT_1, 4u);
-
+		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_STUDENT_FEMALE_CAR_COLLISION_1, 4);
 		break;
+	case SOUND_PED_CHAT_EVENT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_STUDENT_FEMALE_CHAT_EVENT_1, 2); break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_STUDENT_FEMALE_CHAT_1, 4); break;
 	default: return GetGenericFemaleTalkSfx(sound);
 	}
 	return sfx;
@@ -2638,14 +2094,10 @@ uint32
 cAudioManager::GetSpecialCharacterTalkSfx(int32 modelIndex, int32 sound)
 {
 	char *modelName = CModelInfo::GetModelInfo(modelIndex)->GetName();
-	if(strcmp(modelName, "eight") == 0 || strcmp(modelName, "eight2") == 0) {
-		return GetEightTalkSfx(sound);
-	}
+	if(strcmp(modelName, "eight") == 0 || strcmp(modelName, "eight2") == 0) { return GetEightTalkSfx(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) {
-		return GetOJGTalkSfx(sound);
-	}
+	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); }
@@ -2662,16 +2114,10 @@ cAudioManager::GetEightTalkSfx(int16 sound)
 	static uint32 lastSfx = NO_SAMPLE;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_UP:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_EIGHT_HANDS_UP_1, 2u);
-		break;
-	case SOUND_PED_ROBBED:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_EIGHT_ROBBED_1, 2u);
-		break;
-	case SOUND_PED_ATTACK:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_EIGHT_ATTACK_1, 6u);
-		break;
-	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_EIGHT_EVADE_1, 7u); break;
+	case SOUND_PED_HANDS_UP: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_EIGHT_HANDS_UP_1, 2); break;
+	case SOUND_PED_ROBBED: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_EIGHT_ROBBED_1, 2); break;
+	case SOUND_PED_ATTACK: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_EIGHT_ATTACK_1, 6); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_EIGHT_EVADE_1, 7); break;
 	default: return GetGenericMaleTalkSfx(sound);
 	}
 	return sfx;
@@ -2684,18 +2130,10 @@ cAudioManager::GetFrankieTalkSfx(int16 sound)
 	static uint32 lastSfx = NO_SAMPLE;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_UP:
-		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);
-		break;
-	case SOUND_PED_ATTACK:
-		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);
-		break;
+	case SOUND_PED_HANDS_UP: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_FRANKIE_HANDS_UP_1, 4); break;
+	case SOUND_PED_ROBBED: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_FRANKIE_ROBBED_1, 2); break;
+	case SOUND_PED_ATTACK: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_FRANKIE_ATTACK_1, 6); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_FRANKIE_EVADE_1, 3); break;
 	default: return GetGenericMaleTalkSfx(sound);
 	}
 	return sfx;
@@ -2708,19 +2146,11 @@ cAudioManager::GetMistyTalkSfx(int16 sound)
 	static uint32 lastSfx = NO_SAMPLE;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_UP:
-		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);
-		break;
-	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_TAXI_CALL:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MISTY_THUMB_LIFT_1, 4u);
-		break;
+	case SOUND_PED_HANDS_UP: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MISTY_HANDS_UP_1, 5); break;
+	case SOUND_PED_ROBBED: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MISTY_ROBBED_1, 2); break;
+	case SOUND_PED_ATTACK: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MISTY_ATTACK_1, 4); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MISTY_EVADE_1, 5); break;
+	case SOUND_PED_TAXI_CALL: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MISTY_THUMB_LIFT_1, 4); break;
 	default: return GetGenericFemaleTalkSfx(sound); break;
 	}
 	return sfx;
@@ -2746,7 +2176,7 @@ cAudioManager::GetBomberTalkSfx(int16 sound)
 
 	if(sound != SOUND_PED_BOMBER) return GetGenericMaleTalkSfx(sound);
 
-	GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BOMBER_THREAT_1, 7u);
+	GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BOMBER_THREAT_1, 7);
 	return sfx;
 }
 
@@ -2757,20 +2187,12 @@ cAudioManager::GetSecurityGuardTalkSfx(int16 sound)
 	static uint32 lastSfx = NO_SAMPLE;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_UP:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SECURITY_GUARD_HANDS_UP_1, 2u);
-		break;
+	case SOUND_PED_HANDS_UP: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SECURITY_GUARD_HANDS_UP_1, 2); 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);
-		break;
-	case SOUND_PED_ATTACK:
-		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);
-		break;
+	case SOUND_PED_CAR_COLLISION: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SECURITY_GUARD_CAR_EVENT_1, 6); break;
+	case SOUND_PED_ATTACK: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SECURITY_GUARD_ATTACK_1, 2); break;
+	case SOUND_PED_FLEE_RUN: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SECURITY_GUARD_CAR_EVENT_1, 12); break;
 	default: return GetGenericMaleTalkSfx(sound);
 	}
 	return sfx;
@@ -2786,7 +2208,7 @@ cAudioManager::GetChunkyTalkSfx(int16 sound)
 
 	if(sound != SOUND_PED_FLEE_RUN) return GetGenericMaleTalkSfx(sound);
 
-	GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_CHUNKY_FLEE_RUN_1, 5u);
+	GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_CHUNKY_FLEE_RUN_1, 5);
 	return sfx;
 }
 
@@ -2797,17 +2219,11 @@ 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, 8); break;
 	case SOUND_PED_BULLET_HIT:
-	case SOUND_PED_DEFEND:
-		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);
-		break;
+	case SOUND_PED_DEFEND: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_INJURED_PED_MALE_OUCH_1, 15); break;
+	case SOUND_PED_BURNING: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MALE_BURNING_1, 8); break;
+	case SOUND_PED_FLEE_SPRINT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MALE_FLEE_SPRINT_1, 6); break;
 	default: return NO_SAMPLE;
 	}
 	return sfx;
@@ -2820,19 +2236,11 @@ cAudioManager::GetGenericFemaleTalkSfx(int16 sound)
 	static uint32 lastSfx = NO_SAMPLE;
 
 	switch(sound) {
-	case SOUND_PED_DEATH:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_FEMALE_DEATH_1, 10u);
-		break;
+	case SOUND_PED_DEATH: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_FEMALE_DEATH_1, 10); break;
 	case SOUND_PED_BULLET_HIT:
-	case SOUND_PED_DEFEND:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_INJURED_PED_FEMALE_OUCH_1, 11u);
-		break;
-	case SOUND_PED_BURNING:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_FEMALE_BURNING_1, 9u);
-		break;
-	case SOUND_PED_FLEE_SPRINT:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_FEMALE_FLEE_SPRINT_1, 8u);
-		break;
+	case SOUND_PED_DEFEND: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_INJURED_PED_FEMALE_OUCH_1, 11); break;
+	case SOUND_PED_BURNING: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_FEMALE_BURNING_1, 9); break;
+	case SOUND_PED_FLEE_SPRINT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_FEMALE_FLEE_SPRINT_1, 8); break;
 	default: return NO_SAMPLE;
 	}
 	return sfx;
@@ -3067,8 +2475,8 @@ cAudioManager::GetPhrase(uint32 *phrase, uint32 *prevPhrase, uint32 sample, uint
 }
 
 float
-cAudioManager::GetVehicleDriveWheelSkidValue(uint8 wheel, CAutomobile *automobile,
-                                             cTransmission *transmission, float velocityChange)
+cAudioManager::GetVehicleDriveWheelSkidValue(uint8 wheel, CAutomobile *automobile, cTransmission *transmission,
+                                             float velocityChange)
 {
 	tWheelState wheelState;
 	float relativeVelChange;
@@ -3088,7 +2496,7 @@ cAudioManager::GetVehicleDriveWheelSkidValue(uint8 wheel, CAutomobile *automobil
 		relativeVelChange = gasPedalAudio;
 		if(relativeVelChange > 0.4f) {
 			relativeVelChange = relativeVelChange - 0.4f;
-			modificator = 1.6667f;
+			modificator = 5.f / 3.f;
 		}
 		velChange = Abs(velocityChange);
 		if(relativeVelChange > 0.4f) relativeVelChange = relativeVelChange * modificator;
@@ -3106,8 +2514,8 @@ cAudioManager::GetVehicleDriveWheelSkidValue(uint8 wheel, CAutomobile *automobil
 }
 
 float
-cAudioManager::GetVehicleNonDriveWheelSkidValue(uint8 wheel, CAutomobile *automobile,
-                                                cTransmission *transmission, float velocityChange)
+cAudioManager::GetVehicleNonDriveWheelSkidValue(uint8 wheel, CAutomobile *automobile, cTransmission *transmission,
+                                                float velocityChange)
 {
 	float relativeVelChange;
 
@@ -3123,8 +2531,7 @@ cAudioManager::GetVehicleNonDriveWheelSkidValue(uint8 wheel, CAutomobile *automo
 bool
 cAudioManager::HasAirBrakes(int32 model) const
 {
-	return model == LINERUN || model == FIRETRUK || model == TRASH || model == BUS ||
-	       model == COACH;
+	return model == LINERUN || model == FIRETRUK || model == TRASH || model == BUS || model == COACH;
 }
 
 void
@@ -3135,7 +2542,7 @@ cAudioManager::Initialise()
 		m_bIsInitialised = SampleManager.Initialise();
 		if(m_bIsInitialised) {
 			m_bActiveSamples = SampleManager.GetMaximumSupportedChannels();
-			if(m_bActiveSamples <= 1u) {
+			if(m_bActiveSamples <= 1) {
 				Terminate();
 			} else {
 				--m_bActiveSamples;
@@ -3308,8 +2715,8 @@ cAudioManager::MissionScriptAudioUsesPoliceChannel(int32 soundMission) const
 void
 cAudioManager::PlayLoadedMissionAudio()
 {
-	if(m_bIsInitialised && m_sMissionAudio.m_nSampleIndex != NO_SAMPLE &&
-	   m_sMissionAudio.m_bLoadingStatus == 1 && !m_sMissionAudio.m_bPlayStatus) {
+	if(m_bIsInitialised && m_sMissionAudio.m_nSampleIndex != NO_SAMPLE && m_sMissionAudio.m_bLoadingStatus == 1 &&
+	   !m_sMissionAudio.m_bPlayStatus) {
 		m_sMissionAudio.m_bIsPlayed = true;
 	}
 }
@@ -3318,59 +2725,45 @@ void
 cAudioManager::PlayOneShot(int32 index, int16 sound, float vol)
 {
 	static constexpr uint8 byte_60ABD0[] = {
-	    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 5, 5, 5, 3, 5, 2, 2, 1, 1, 3, 1, 3, 3, 1, 1,
-	    1, 4, 4, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 6, 1, 1, 3, 2, 2, 2, 2, 0, 0, 6,
-	    6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	    0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 3, 1, 1, 1, 9, 2, 2, 0, 0, 0, 0, 3, 3, 5, 1,
-	    1, 1, 1, 3, 4, 7, 6, 6, 6, 6, 1, 3, 4, 3, 4, 2, 1, 3, 5, 4, 6, 6, 1, 3, 1, 1, 1, 0,
-	    0, 0, 0, 0, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+	    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 5, 5, 5, 3, 5, 2, 2, 1, 1, 3, 1, 3, 3, 1, 1, 1, 4, 4, 3, 1, 1,
+	    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 6, 1, 1, 3, 2, 2, 2, 2, 0, 0, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	    1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 3, 1, 1, 1, 9,
+	    2, 2, 0, 0, 0, 0, 3, 3, 5, 1, 1, 1, 1, 3, 4, 7, 6, 6, 6, 6, 1, 3, 4, 3, 4, 2, 1, 3, 5, 4, 6, 6, 1, 3,
+	    1, 1, 1, 0, 0, 0, 0, 0, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
 
 	if(m_bIsInitialised) {
 		if(index >= 0 && index < totalAudioEntitiesSlots) {
 			if(m_asAudioEntities[index].m_bIsUsed) {
 				if(sound < SOUND_TOTAL_SOUNDS) {
-					if(m_asAudioEntities[index].m_nType ==
-					   AUDIOTYPE_SCRIPTOBJECT) {
+					if(m_asAudioEntities[index].m_nType == AUDIOTYPE_SCRIPTOBJECT) {
 						if(m_nScriptObjectEntityTotal < 40) {
-							m_asAudioEntities[index].m_awAudioEvent[0] =
-							    sound;
+							m_asAudioEntities[index].m_awAudioEvent[0] = sound;
 							m_asAudioEntities[index].m_Loops = 1;
-							m_anScriptObjectEntityIndices
-							    [m_nScriptObjectEntityTotal++] = index;
+							m_anScriptObjectEntityIndices[m_nScriptObjectEntityTotal++] =
+							    index;
 						}
 					} else {
 						int32 i = 0;
 						while(1) {
 							if(i >= m_asAudioEntities[index].m_Loops) {
-								if(m_asAudioEntities[index]
-								       .m_Loops < 4) {
-									m_asAudioEntities[index]
-									    .m_awAudioEvent[i] =
+								if(m_asAudioEntities[index].m_Loops < 4) {
+									m_asAudioEntities[index].m_awAudioEvent[i] =
 									    sound;
-									m_asAudioEntities[index]
-									    .m_afVolume[i] = vol;
-									++m_asAudioEntities[index]
-									      .m_Loops;
+									m_asAudioEntities[index].m_afVolume[i] = vol;
+									++m_asAudioEntities[index].m_Loops;
 								}
 								return;
 							}
-							if(byte_60ABD0[m_asAudioEntities[index]
-							                   .m_awAudioEvent[i]] >
+							if(byte_60ABD0[m_asAudioEntities[index].m_awAudioEvent[i]] >
 							   byte_60ABD0[sound])
 								break;
 							++i;
 						}
 						if(i < 3) {
-							memmove(&m_asAudioEntities[index]
-							             .m_awAudioEvent[i + 1],
-							        &m_asAudioEntities[index]
-							             .m_awAudioEvent[i],
-							        3 - i);
-							memmove(
-							    &m_asAudioEntities[index]
-							         .m_afVolume[i + 1],
-							    &m_asAudioEntities[index].m_afVolume[i],
-							    3 - i);
+							memmove(&m_asAudioEntities[index].m_awAudioEvent[i + 1],
+							        &m_asAudioEntities[index].m_awAudioEvent[i], 3 - i);
+							memmove(&m_asAudioEntities[index].m_afVolume[i + 1],
+							        &m_asAudioEntities[index].m_afVolume[i], 3 - i);
 						}
 						m_asAudioEntities[index].m_awAudioEvent[i] = sound;
 						m_asAudioEntities[index].m_afVolume[i] = vol;
@@ -3400,7 +2793,7 @@ cAudioManager::PlaySuspectLastSeen(float x, float y, float z)
 	CVector vec = {x, y, z};
 
 	if(m_bIsInitialised) {
-		if(MusicManager.m_nMusicMode != 2 && 60 - policeChannelTimer > 9u) {
+		if(MusicManager.m_nMusicMode != 2 && 60 - policeChannelTimer > 9) {
 
 			audioZone = CTheZones::FindAudioZone(&vec);
 			if(audioZone >= 0 && audioZone < 36) {
@@ -3408,38 +2801,34 @@ cAudioManager::PlaySuspectLastSeen(float x, float y, float z)
 				zone = &CTheZones::ZoneArray[CTheZones::AudioZoneArray[audioZone]];
 				while(strcmp(zone->name, ZoneSfx[i].m_aName) != 0) {
 					++i;
-					if(i >= 36u) return;
+					if(i >= 36) return;
 				}
 				sample = ZoneSfx[i].m_nSampleIndex;
-				if(i < 36u) {
+				if(i < 36) {
 					if(policeChannelTimer != 60) {
 						crimesSamples[policeChannelTimerSeconds] =
-						    m_anRandomTable[4] % 3u +
+						    m_anRandomTable[4] % 3 +
 						    AUDIO_SAMPLE_POLICE_SCANNER_SMALL_CRACKLE_1;
 						++policeChannelTimer;
-						policeChannelTimerSeconds =
-						    (policeChannelTimerSeconds + 1) % 60;
+						policeChannelTimerSeconds = (policeChannelTimerSeconds + 1) % 60;
 					}
 					if(policeChannelTimer != 60) {
 						crimesSamples[policeChannelTimerSeconds] =
 						    AUDIO_SAMPLE_POLICE_SCANNER_SUSPECT;
 						++policeChannelTimer;
-						policeChannelTimerSeconds =
-						    (policeChannelTimerSeconds + 1) % 60;
+						policeChannelTimerSeconds = (policeChannelTimerSeconds + 1) % 60;
 					}
 					if(policeChannelTimer != 60) {
 						crimesSamples[policeChannelTimerSeconds] =
 						    AUDIO_SAMPLE_POLICE_SCANNER_LAST_SEEN;
 						++policeChannelTimer;
-						policeChannelTimerSeconds =
-						    (policeChannelTimerSeconds + 1) % 60;
+						policeChannelTimerSeconds = (policeChannelTimerSeconds + 1) % 60;
 					}
 					if(policeChannelTimer != 60) {
 						crimesSamples[policeChannelTimerSeconds] =
 						    AUDIO_SAMPLE_POLICE_SCANNER_IN;
 						++policeChannelTimer;
-						policeChannelTimerSeconds =
-						    (policeChannelTimerSeconds + 1) % 60;
+						policeChannelTimerSeconds = (policeChannelTimerSeconds + 1) % 60;
 					}
 					if(sample == AUDIO_SAMPLE_POLICE_SCANNER_ZONE_SHORESIDE &&
 					   (strcmp(zone->name, SubZo2Label) == 0 ||
@@ -3453,35 +2842,25 @@ cAudioManager::PlaySuspectLastSeen(float x, float y, float z)
 						}
 						if(policeChannelTimer == 60) {
 							if(policeChannelTimer != 60) {
-								crimesSamples
-								    [policeChannelTimerSeconds] =
-								        sample;
+								crimesSamples[policeChannelTimerSeconds] = sample;
 								++policeChannelTimer;
 								policeChannelTimerSeconds =
-								    (policeChannelTimerSeconds +
-								     1) %
-								    60;
+								    (policeChannelTimerSeconds + 1) % 60;
 							}
 							if(policeChannelTimer != 60) {
-								crimesSamples
-								    [policeChannelTimerSeconds] =
-								        m_anRandomTable[2] % 3u +
-								        AUDIO_SAMPLE_POLICE_SCANNER_SMALL_CRACKLE_1;
+								crimesSamples[policeChannelTimerSeconds] =
+								    m_anRandomTable[2] % 3 +
+								    AUDIO_SAMPLE_POLICE_SCANNER_SMALL_CRACKLE_1;
 								++policeChannelTimer;
 								policeChannelTimerSeconds =
-								    (policeChannelTimerSeconds +
-								     1) %
-								    60;
+								    (policeChannelTimerSeconds + 1) % 60;
 							}
 							if(policeChannelTimer != 60) {
-								crimesSamples
-								    [policeChannelTimerSeconds] =
-								        TOTAL_AUDIO_SAMPLES;
+								crimesSamples[policeChannelTimerSeconds] =
+								    TOTAL_AUDIO_SAMPLES;
 								++policeChannelTimer;
 								policeChannelTimerSeconds =
-								    (policeChannelTimerSeconds +
-								     1) %
-								    60;
+								    (policeChannelTimerSeconds + 1) % 60;
 							}
 							gSpecialSuspectLastSeenReport = 1;
 							return;
@@ -3489,8 +2868,7 @@ cAudioManager::PlaySuspectLastSeen(float x, float y, float z)
 						crimesSamples[policeChannelTimerSeconds] =
 						    AUDIO_SAMPLE_POLICE_SCANNER_EAST;
 						++policeChannelTimer;
-						policeChannelTimerSeconds =
-						    (policeChannelTimerSeconds + 1) % 60;
+						policeChannelTimerSeconds = (policeChannelTimerSeconds + 1) % 60;
 					}
 					rangeX = zone->maxx - zone->minx;
 					rangeY = zone->maxy - zone->miny;
@@ -3501,14 +2879,11 @@ cAudioManager::PlaySuspectLastSeen(float x, float y, float z)
 					if(halfY + quarterY < vec.y) {
 						if(halfY - quarterY > vec.y) {
 							if(policeChannelTimer != 60) {
-								crimesSamples
-								    [policeChannelTimerSeconds] =
-								        AUDIO_SAMPLE_POLICE_SCANNER_SOUTH;
+								crimesSamples[policeChannelTimerSeconds] =
+								    AUDIO_SAMPLE_POLICE_SCANNER_SOUTH;
 								++policeChannelTimer;
 								policeChannelTimerSeconds =
-								    (policeChannelTimerSeconds +
-								     1) %
-								    60;
+								    (policeChannelTimerSeconds + 1) % 60;
 								processed = 1;
 							}
 						}
@@ -3516,44 +2891,33 @@ cAudioManager::PlaySuspectLastSeen(float x, float y, float z)
 						crimesSamples[policeChannelTimerSeconds] =
 						    AUDIO_SAMPLE_POLICE_SCANNER_NORTH;
 						++policeChannelTimer;
-						policeChannelTimerSeconds =
-						    (policeChannelTimerSeconds + 1) % 60;
+						policeChannelTimerSeconds = (policeChannelTimerSeconds + 1) % 60;
 						processed = 1;
 					}
 					if(halfX + quarterX < vec.x) {
 						if(halfX - quarterX <= vec.x) {
 							if(processed || policeChannelTimer == 60) {
 								if(policeChannelTimer != 60) {
-									crimesSamples
-									    [policeChannelTimerSeconds] =
-									        sample;
+									crimesSamples[policeChannelTimerSeconds] =
+									    sample;
 									++policeChannelTimer;
 									policeChannelTimerSeconds =
-									    (policeChannelTimerSeconds +
-									     1) %
-									    60;
+									    (policeChannelTimerSeconds + 1) % 60;
 								}
 								if(policeChannelTimer != 60) {
-									crimesSamples
-									    [policeChannelTimerSeconds] =
-									        m_anRandomTable[2] %
-									            3u +
-									        AUDIO_SAMPLE_POLICE_SCANNER_SMALL_CRACKLE_1;
+									crimesSamples[policeChannelTimerSeconds] =
+									    m_anRandomTable[2] % 3 +
+									    AUDIO_SAMPLE_POLICE_SCANNER_SMALL_CRACKLE_1;
 									++policeChannelTimer;
 									policeChannelTimerSeconds =
-									    (policeChannelTimerSeconds +
-									     1) %
-									    60;
+									    (policeChannelTimerSeconds + 1) % 60;
 								}
 								if(policeChannelTimer != 60) {
-									crimesSamples
-									    [policeChannelTimerSeconds] =
-									        TOTAL_AUDIO_SAMPLES;
+									crimesSamples[policeChannelTimerSeconds] =
+									    TOTAL_AUDIO_SAMPLES;
 									++policeChannelTimer;
 									policeChannelTimerSeconds =
-									    (policeChannelTimerSeconds +
-									     1) %
-									    60;
+									    (policeChannelTimerSeconds + 1) % 60;
 								}
 								gSpecialSuspectLastSeenReport = 1;
 								return;
@@ -3575,29 +2939,24 @@ cAudioManager::PlaySuspectLastSeen(float x, float y, float z)
 						crimesSamples[policeChannelTimerSeconds] =
 						    AUDIO_SAMPLE_POLICE_SCANNER_EAST;
 						++policeChannelTimer;
-						policeChannelTimerSeconds =
-						    (policeChannelTimerSeconds + 1) % 60;
+						policeChannelTimerSeconds = (policeChannelTimerSeconds + 1) % 60;
 					}
 					if(policeChannelTimer != 60) {
 						crimesSamples[policeChannelTimerSeconds] = sample;
 						++policeChannelTimer;
-						policeChannelTimerSeconds =
-						    (policeChannelTimerSeconds + 1) % 60;
+						policeChannelTimerSeconds = (policeChannelTimerSeconds + 1) % 60;
 					}
 					if(policeChannelTimer != 60) {
 						crimesSamples[policeChannelTimerSeconds] =
-						    m_anRandomTable[2] % 3u +
+						    m_anRandomTable[2] % 3 +
 						    AUDIO_SAMPLE_POLICE_SCANNER_SMALL_CRACKLE_1;
 						++policeChannelTimer;
-						policeChannelTimerSeconds =
-						    (policeChannelTimerSeconds + 1) % 60;
+						policeChannelTimerSeconds = (policeChannelTimerSeconds + 1) % 60;
 					}
 					if(policeChannelTimer != 60) {
-						crimesSamples[policeChannelTimerSeconds] =
-						    TOTAL_AUDIO_SAMPLES;
+						crimesSamples[policeChannelTimerSeconds] = TOTAL_AUDIO_SAMPLES;
 						++policeChannelTimer;
-						policeChannelTimerSeconds =
-						    (policeChannelTimerSeconds + 1) % 60;
+						policeChannelTimerSeconds = (policeChannelTimerSeconds + 1) % 60;
 					}
 					gSpecialSuspectLastSeenReport = 1;
 					return;
@@ -3622,9 +2981,8 @@ cAudioManager::PlayerJustLeftCar(void) const
 void
 cAudioManager::PostInitialiseGameSpecificSetup()
 {
-	m_nFireAudioEntity =
-	    CreateEntity(AUDIOTYPE_FIRE,
-	                 (CPhysical *)0x8F31D0); // last is addr of firemanager @todo change
+	m_nFireAudioEntity = CreateEntity(AUDIOTYPE_FIRE,
+	                                  (CPhysical *)0x8F31D0); // last is addr of firemanager @todo change
 	if(m_nFireAudioEntity >= 0) SetEntityStatus(m_nFireAudioEntity, 1);
 
 	m_nCollisionEntity = CreateEntity(AUDIOTYPE_COLLISION, (CPhysical *)1);
@@ -3725,19 +3083,17 @@ cAudioManager::ProcessAirBrakes(cVehicleParams *params)
 	automobile = (CAutomobile *)params->m_pVehicle;
 	if(!automobile->bEngineOn) return 1;
 
-	if((automobile->m_fVelocityChangeForAudio < 0.025f ||
-	    params->m_fVelocityChange >= 0.025f) &&
+	if((automobile->m_fVelocityChangeForAudio < 0.025f || params->m_fVelocityChange >= 0.025f) &&
 	   (automobile->m_fVelocityChangeForAudio > -0.025f || params->m_fVelocityChange <= 0.025f))
 		return 1;
 
 	CalculateDistance((bool *)params, params->m_fDistance);
-	rand = m_anRandomTable[0] % 10u + 70;
+	rand = m_anRandomTable[0] % 10 + 70;
 	m_sQueueSample.m_bVolume = ComputeVolume(rand, 30.0f, m_sQueueSample.m_fDistance);
 	if(m_sQueueSample.m_bVolume) {
 		m_sQueueSample.m_counter = 13;
 		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_VEHICLE_AIR_BRAKES;
-		m_sQueueSample.m_nFrequency =
-		    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_VEHICLE_AIR_BRAKES);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_VEHICLE_AIR_BRAKES);
 		m_sQueueSample.m_nFrequency += RandomDisplacement(m_sQueueSample.m_nFrequency >> 4);
 		m_sQueueSample.m_bBankIndex = 0;
 		m_sQueueSample.m_bIsDistant = 0;
@@ -3782,14 +3138,13 @@ cAudioManager::ProcessAirportScriptObject(uint8 sound)
 		if(distSquared < maxDist) {
 			dist = sqrt(distSquared);
 			m_sQueueSample.m_fDistance = dist;
-			m_sQueueSample.m_bVolume = ComputeVolume(
-			    110u, m_sQueueSample.m_fSoundIntensity, m_sQueueSample.m_fDistance);
+			m_sQueueSample.m_bVolume =
+			    ComputeVolume(110, m_sQueueSample.m_fSoundIntensity, m_sQueueSample.m_fDistance);
 			if(m_sQueueSample.m_bVolume) {
-				m_sQueueSample.m_nSampleIndex =
-				    (m_anRandomTable[1] & 3) + AUDIO_SAMPLE_AIRPORT_1;
+				m_sQueueSample.m_nSampleIndex = (m_anRandomTable[1] & 3) + AUDIO_SAMPLE_AIRPORT_1;
 				m_sQueueSample.m_bBankIndex = 0;
-				m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(
-				    m_sQueueSample.m_nSampleIndex);
+				m_sQueueSample.m_nFrequency =
+				    SampleManager.GetSampleBaseFrequency(m_sQueueSample.m_nSampleIndex);
 				m_sQueueSample.m_counter = counter++;
 				m_sQueueSample.m_bIsDistant = 0;
 				m_sQueueSample.m_nLoopCount = 1;
@@ -3802,7 +3157,7 @@ cAudioManager::ProcessAirportScriptObject(uint8 sound)
 				m_sQueueSample.m_bReverbFlag = 1;
 				m_sQueueSample.m_bRequireReflection = 0;
 				AddSampleToRequestedQueue();
-				audioLogicTimers[3] = time + 10000 + m_anRandomTable[3] % 20000u;
+				audioLogicTimers[3] = time + 10000 + m_anRandomTable[3] % 20000;
 			}
 		}
 	}
@@ -3825,24 +3180,21 @@ cAudioManager::ProcessBoatEngine(cVehicleParams *params)
 		boat = (CBoat *)params->m_pVehicle;
 		if(params->m_nIndex == REEFER) {
 			CalculateDistance((bool *)params, params->m_fDistance);
-			m_sQueueSample.m_bVolume =
-			    ComputeVolume(80u, 50.f, m_sQueueSample.m_fDistance);
+			m_sQueueSample.m_bVolume = ComputeVolume(80, 50.f, m_sQueueSample.m_fDistance);
 			if(m_sQueueSample.m_bVolume) {
 				m_sQueueSample.m_counter = 39;
 				m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_MOTOR;
 				m_sQueueSample.m_nFrequency = 10386;
-				m_sQueueSample.m_nFrequency +=
-				    (m_sQueueSample.m_nEntityIndex << 16) % 1000;
+				m_sQueueSample.m_nFrequency += (m_sQueueSample.m_nEntityIndex << 16) % 1000;
 				m_sQueueSample.m_bBankIndex = 0;
 				m_sQueueSample.m_bIsDistant = 0;
 				m_sQueueSample.field_16 = 3;
 				m_sQueueSample.m_nLoopCount = 0;
 				m_sQueueSample.m_bEmittingVolume = 80;
 				m_sQueueSample.m_nLoopStart =
-				    SampleManager.GetSampleLoopStartOffset(
-				        m_sQueueSample.m_nSampleIndex);
-				m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(
-				    m_sQueueSample.m_nSampleIndex);
+				    SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
+				m_sQueueSample.m_nLoopEnd =
+				    SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
 				m_sQueueSample.field_48 = 2.0f;
 				m_sQueueSample.m_fSoundIntensity = 50.0f;
 				m_sQueueSample.field_56 = 0;
@@ -3860,8 +3212,7 @@ cAudioManager::ProcessBoatEngine(cVehicleParams *params)
 				emittingVol = (100.f * padRelativeAccerate) + 15;
 				m_sQueueSample.m_nFrequency = (3000.f * padRelativeAccerate) + 6000;
 				if(!boat->m_bIsAnchored)
-					m_sQueueSample.m_nFrequency =
-					    11 * m_sQueueSample.m_nFrequency / 10u;
+					m_sQueueSample.m_nFrequency = 11 * m_sQueueSample.m_nFrequency / 10;
 			} else {
 				gasPedal = Abs(boat->m_fGasPedal);
 				if(gasPedal > 0.0f) {
@@ -3871,12 +3222,10 @@ cAudioManager::ProcessBoatEngine(cVehicleParams *params)
 					emittingVol = (100.f * gasPedal) + 15;
 					m_sQueueSample.m_nFrequency = (3000.f * gasPedal) + 6000;
 					if(!boat->m_bIsAnchored)
-						m_sQueueSample.m_nFrequency =
-						    11 * m_sQueueSample.m_nFrequency / 10u;
+						m_sQueueSample.m_nFrequency = 11 * m_sQueueSample.m_nFrequency / 10;
 				}
 			}
-			m_sQueueSample.m_bVolume =
-			    ComputeVolume(emittingVol, 50.f, m_sQueueSample.m_fDistance);
+			m_sQueueSample.m_bVolume = ComputeVolume(emittingVol, 50.f, m_sQueueSample.m_fDistance);
 			if(!m_sQueueSample.m_bVolume) return 1;
 			m_sQueueSample.m_counter = 40;
 			m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_BOAT_ENGINE;
@@ -3888,8 +3237,7 @@ cAudioManager::ProcessBoatEngine(cVehicleParams *params)
 			m_sQueueSample.m_bEmittingVolume = emittingVol;
 			m_sQueueSample.m_nLoopStart =
 			    SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
-			m_sQueueSample.m_nLoopEnd =
-			    SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
+			m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
 			m_sQueueSample.field_48 = 2.0f;
 			m_sQueueSample.m_fSoundIntensity = 50.0f;
 			m_sQueueSample.field_56 = 0;
@@ -3906,20 +3254,16 @@ cAudioManager::ProcessBoatEngine(cVehicleParams *params)
 					emittingVol = 45 - 45 * padAccelerate / 40;
 					m_sQueueSample.m_nFrequency = 100 * padAccelerate + 11025;
 					m_sQueueSample.m_counter = 39;
-					m_sQueueSample.m_nSampleIndex =
-					    AUDIO_SAMPLE_BOAT_ENGINE_IDLE;
+					m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_BOAT_ENGINE_IDLE;
 					if(LastAccel > 20) {
 						oneShotVol = LastVol;
-						PlayOneShot(m_sQueueSample.m_nEntityIndex, SOUND_17,
-						            oneShotVol);
+						PlayOneShot(m_sQueueSample.m_nEntityIndex, SOUND_17, oneShotVol);
 					}
 				} else {
 					emittingVol = 105 * padAccelerate / 255 + 15;
-					m_sQueueSample.m_nFrequency =
-					    4000 * padAccelerate / 255 + 8000;
+					m_sQueueSample.m_nFrequency = 4000 * padAccelerate / 255 + 8000;
 					if(!boat->m_bIsAnchored)
-						m_sQueueSample.m_nFrequency =
-						    11 * m_sQueueSample.m_nFrequency / 10u;
+						m_sQueueSample.m_nFrequency = 11 * m_sQueueSample.m_nFrequency / 10;
 					m_sQueueSample.m_counter = 40;
 					m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_BOAT_ENGINE;
 				}
@@ -3931,21 +3275,18 @@ cAudioManager::ProcessBoatEngine(cVehicleParams *params)
 					m_sQueueSample.m_nFrequency = 11025;
 					emittingVol = 45;
 					m_sQueueSample.m_counter = 39;
-					m_sQueueSample.m_nSampleIndex =
-					    AUDIO_SAMPLE_BOAT_ENGINE_IDLE;
+					m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_BOAT_ENGINE_IDLE;
 				} else {
 					emittingVol = (105.f * gasPedal) + 15;
 					m_sQueueSample.m_nFrequency = (4000.f * gasPedal) + 8000;
 					if(!boat->m_bIsAnchored)
-						m_sQueueSample.m_nFrequency =
-						    11 * m_sQueueSample.m_nFrequency / 10u;
+						m_sQueueSample.m_nFrequency = 11 * m_sQueueSample.m_nFrequency / 10;
 					m_sQueueSample.m_counter = 40;
 					m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_BOAT_ENGINE;
 				}
 			}
 			CalculateDistance((bool *)params, params->m_fDistance);
-			m_sQueueSample.m_bVolume =
-			    ComputeVolume(emittingVol, 50.f, m_sQueueSample.m_fDistance);
+			m_sQueueSample.m_bVolume = ComputeVolume(emittingVol, 50.f, m_sQueueSample.m_fDistance);
 			if(!m_sQueueSample.m_bVolume) return 1;
 			m_sQueueSample.m_nFrequency += (m_sQueueSample.m_nEntityIndex << 16) % 1000;
 			m_sQueueSample.m_bBankIndex = 0;
@@ -3955,8 +3296,7 @@ cAudioManager::ProcessBoatEngine(cVehicleParams *params)
 			m_sQueueSample.m_bEmittingVolume = emittingVol;
 			m_sQueueSample.m_nLoopStart =
 			    SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
-			m_sQueueSample.m_nLoopEnd =
-			    SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
+			m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
 			m_sQueueSample.field_48 = 2.0f;
 			m_sQueueSample.m_fSoundIntensity = 50.0f;
 			m_sQueueSample.field_56 = 0;
@@ -3996,10 +3336,8 @@ cAudioManager::ProcessBoatMovingOverWater(cVehicleParams *params)
 		m_sQueueSample.m_nFrequency = (6050.f * multiplier) + 16000;
 		m_sQueueSample.m_nLoopCount = 0;
 		m_sQueueSample.m_bEmittingVolume = vol;
-		m_sQueueSample.m_nLoopStart =
-		    SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
-		m_sQueueSample.m_nLoopEnd =
-		    SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
+		m_sQueueSample.m_nLoopStart = SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
+		m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
 		m_sQueueSample.field_48 = 2.0f;
 		m_sQueueSample.m_fSoundIntensity = 50.0f;
 		m_sQueueSample.field_56 = 0;
@@ -4043,8 +3381,7 @@ void
 cAudioManager::ProcessBridgeMotor()
 {
 	if(m_sQueueSample.m_fDistance < 400.f) {
-		m_sQueueSample.m_bVolume =
-		    ComputeVolume(maxVolume, 400.f, m_sQueueSample.m_fDistance);
+		m_sQueueSample.m_bVolume = ComputeVolume(maxVolume, 400.f, m_sQueueSample.m_fDistance);
 		if(m_sQueueSample.m_bVolume) {
 			m_sQueueSample.m_counter = 1;
 			m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_MOTOR;
@@ -4056,8 +3393,7 @@ cAudioManager::ProcessBridgeMotor()
 			m_sQueueSample.m_bEmittingVolume = maxVolume;
 			m_sQueueSample.m_nLoopStart =
 			    SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
-			m_sQueueSample.m_nLoopEnd =
-			    SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
+			m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
 			m_sQueueSample.field_48 = 2.0f;
 			m_sQueueSample.m_fSoundIntensity = 400.0f;
 			m_sQueueSample.field_56 = 0;
@@ -4073,32 +3409,30 @@ cAudioManager::ProcessBridgeOneShots()
 {
 	float maxDist;
 
-	if(CBridge::State != STATE_LIFT_PART_IS_UP ||
-	   CBridge::OldState != STATE_LIFT_PART_MOVING_UP) {
-		if(CBridge::State != STATE_LIFT_PART_IS_DOWN ||
-		   CBridge::OldState != STATE_LIFT_PART_MOVING_DOWN) {
-			if(CBridge::State != STATE_LIFT_PART_MOVING_UP ||
-			   CBridge::OldState != STATE_LIFT_PART_ABOUT_TO_MOVE_UP) {
-				if(CBridge::State != STATE_LIFT_PART_MOVING_DOWN ||
-				   CBridge::OldState != STATE_LIFT_PART_IS_UP)
-					return;
+	if(CBridge::State == STATE_LIFT_PART_IS_UP && CBridge::OldState == STATE_LIFT_PART_MOVING_UP) {
+		maxDist = 400.f;
+		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_COLLISION_METAL_27;
+	} else {
+		if(CBridge::State == STATE_LIFT_PART_IS_DOWN && CBridge::OldState == STATE_LIFT_PART_MOVING_DOWN) {
+			maxDist = 400.f;
+			m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_COLLISION_METAL_27;
+		} else {
+			if(CBridge::State == STATE_LIFT_PART_MOVING_UP &&
+			   CBridge::OldState == STATE_LIFT_PART_ABOUT_TO_MOVE_UP) {
 				maxDist = 400.f;
 				m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_COLLISION_METAL_27;
 			} else {
-				maxDist = 400.f;
-				m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_COLLISION_METAL_27;
+				if(CBridge::State == STATE_LIFT_PART_MOVING_DOWN &&
+				   CBridge::OldState == STATE_LIFT_PART_IS_UP) {
+					maxDist = 400.f;
+					m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_COLLISION_METAL_27;
+				} else
+					return;
 			}
-		} else {
-			maxDist = 400.f;
-			m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_COLLISION_METAL_27;
 		}
-	} else {
-		maxDist = 400.f;
-		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_COLLISION_METAL_27;
 	}
 	if(m_sQueueSample.m_fDistance < maxDist) {
-		m_sQueueSample.m_bVolume =
-		    ComputeVolume(maxVolume, maxDist, m_sQueueSample.m_fDistance);
+		m_sQueueSample.m_bVolume = ComputeVolume(maxVolume, maxDist, m_sQueueSample.m_fDistance);
 		if(m_sQueueSample.m_bVolume) {
 			m_sQueueSample.m_counter = 2;
 			m_sQueueSample.m_bBankIndex = 0;
@@ -4124,21 +3458,19 @@ void
 cAudioManager::ProcessBridgeWarning()
 {
 	if(CStats::CommercialPassed && m_sQueueSample.m_fDistance < 450.f) {
-		m_sQueueSample.m_bVolume = ComputeVolume(100u, 450.f, m_sQueueSample.m_fDistance);
+		m_sQueueSample.m_bVolume = ComputeVolume(100, 450.f, m_sQueueSample.m_fDistance);
 		if(m_sQueueSample.m_bVolume) {
 			m_sQueueSample.m_counter = 0;
 			m_sQueueSample.m_nSampleIndex = 457;
 			m_sQueueSample.m_bBankIndex = 0;
 			m_sQueueSample.m_bIsDistant = 0;
 			m_sQueueSample.field_16 = 1;
-			m_sQueueSample.m_nFrequency =
-			    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_BRIDGE_WARNING);
+			m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_BRIDGE_WARNING);
 			m_sQueueSample.m_nLoopCount = 0;
 			m_sQueueSample.m_bEmittingVolume = 100;
 			m_sQueueSample.m_nLoopStart =
 			    SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
-			m_sQueueSample.m_nLoopEnd =
-			    SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
+			m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
 			m_sQueueSample.field_48 = 2.0f;
 			m_sQueueSample.m_fSoundIntensity = 450.0f;
 			m_sQueueSample.field_56 = 0;
@@ -4159,21 +3491,19 @@ cAudioManager::ProcessCarBombTick(cVehicleParams *params)
 	automobile = (CAutomobile *)params->m_pVehicle;
 	if(automobile->bEngineOn && automobile->m_bombType == CARBOMB_TIMEDACTIVE) {
 		CalculateDistance((bool *)params, params->m_fDistance);
-		m_sQueueSample.m_bVolume = ComputeVolume(60u, 40.f, m_sQueueSample.m_fDistance);
+		m_sQueueSample.m_bVolume = ComputeVolume(60, 40.f, m_sQueueSample.m_fDistance);
 		if(m_sQueueSample.m_bVolume) {
 			m_sQueueSample.m_counter = 35;
 			m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_CAR_BOMB_TICK;
 			m_sQueueSample.m_bBankIndex = 0;
 			m_sQueueSample.m_bIsDistant = 0;
 			m_sQueueSample.field_16 = 0;
-			m_sQueueSample.m_nFrequency =
-			    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_CAR_BOMB_TICK);
+			m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_CAR_BOMB_TICK);
 			m_sQueueSample.m_nLoopCount = 0;
 			m_sQueueSample.m_bEmittingVolume = 60;
 			m_sQueueSample.m_nLoopStart =
 			    SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
-			m_sQueueSample.m_nLoopEnd =
-			    SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
+			m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
 			m_sQueueSample.field_48 = 2.0f;
 			m_sQueueSample.m_fSoundIntensity = 40.0f;
 			m_sQueueSample.field_56 = 0;
@@ -4217,16 +3547,15 @@ cAudioManager::ProcessCinemaScriptObject(uint8 sound)
 		float distSquared = GetDistanceSquared(&m_sQueueSample.m_vecPos);
 		if(distSquared < maxDist) {
 			m_sQueueSample.m_fDistance = sqrt(distSquared);
-			rand = m_anRandomTable[0] % 90u + 30;
-			m_sQueueSample.m_bVolume = ComputeVolume(
-			    rand, m_sQueueSample.m_fSoundIntensity, m_sQueueSample.m_fDistance);
+			rand = m_anRandomTable[0] % 90 + 30;
+			m_sQueueSample.m_bVolume =
+			    ComputeVolume(rand, m_sQueueSample.m_fSoundIntensity, m_sQueueSample.m_fDistance);
 			if(m_sQueueSample.m_bVolume) {
 				m_sQueueSample.m_nSampleIndex = counter % 3 + AUDIO_SAMPLE_CINEMA_1;
 				m_sQueueSample.m_bBankIndex = 0;
-				m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(
-				    m_sQueueSample.m_nSampleIndex);
-				m_sQueueSample.m_nFrequency +=
-				    RandomDisplacement(m_sQueueSample.m_nFrequency / 4);
+				m_sQueueSample.m_nFrequency =
+				    SampleManager.GetSampleBaseFrequency(m_sQueueSample.m_nSampleIndex);
+				m_sQueueSample.m_nFrequency += RandomDisplacement(m_sQueueSample.m_nFrequency / 4);
 				m_sQueueSample.m_counter = counter++;
 				m_sQueueSample.m_bIsDistant = 0;
 				m_sQueueSample.m_nLoopCount = 1;
@@ -4239,7 +3568,7 @@ cAudioManager::ProcessCinemaScriptObject(uint8 sound)
 				m_sQueueSample.m_bReverbFlag = 1;
 				m_sQueueSample.m_bRequireReflection = 0;
 				AddSampleToRequestedQueue();
-				audioLogicTimers[4] = time + 1000 + m_anRandomTable[3] % 4000u;
+				audioLogicTimers[4] = time + 1000 + m_anRandomTable[3] % 4000;
 			}
 		}
 	}
@@ -4278,16 +3607,14 @@ cAudioManager::ProcessDocksScriptObject(uint8 sound)
 		distSquared = GetDistanceSquared(&m_sQueueSample.m_vecPos);
 		if(distSquared < maxDist) {
 			m_sQueueSample.m_fDistance = sqrt(distSquared);
-			rand = m_anRandomTable[0] % 60u + 40;
-			m_sQueueSample.m_bVolume = ComputeVolume(
-			    rand, m_sQueueSample.m_fSoundIntensity, m_sQueueSample.m_fDistance);
+			rand = m_anRandomTable[0] % 60 + 40;
+			m_sQueueSample.m_bVolume =
+			    ComputeVolume(rand, m_sQueueSample.m_fSoundIntensity, m_sQueueSample.m_fDistance);
 			if(m_sQueueSample.m_bVolume) {
 				m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_DOCKS;
 				m_sQueueSample.m_bBankIndex = 0;
-				m_sQueueSample.m_nFrequency =
-				    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_DOCKS);
-				m_sQueueSample.m_nFrequency +=
-				    RandomDisplacement(m_sQueueSample.m_nFrequency >> 3);
+				m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_DOCKS);
+				m_sQueueSample.m_nFrequency += RandomDisplacement(m_sQueueSample.m_nFrequency >> 3);
 				m_sQueueSample.m_counter = counter++;
 				m_sQueueSample.m_bIsDistant = 0;
 				m_sQueueSample.m_nLoopCount = 1;
@@ -4300,7 +3627,7 @@ cAudioManager::ProcessDocksScriptObject(uint8 sound)
 				m_sQueueSample.m_bReverbFlag = 1;
 				m_sQueueSample.m_bRequireReflection = 0;
 				AddSampleToRequestedQueue();
-				audioLogicTimers[5] = time + 10000 + m_anRandomTable[3] % 40000u;
+				audioLogicTimers[5] = time + 10000 + m_anRandomTable[3] % 40000;
 			}
 		}
 	}
@@ -4317,8 +3644,8 @@ cAudioManager::ProcessEngineDamage(cVehicleParams *params)
 	veh = (CAutomobile *)params->m_pVehicle;
 	if(veh->bEngineOn) {
 		engineStatus = veh->Damage.GetEngineStatus();
-		if(engineStatus > 250u || engineStatus < 100u) return 1;
-		if(engineStatus < 225u) {
+		if(engineStatus > 250u || engineStatus < 100) return 1;
+		if(engineStatus < 225) {
 			m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_JUMBO_TAXI_SOUND;
 			emittingVolume = 6;
 			m_sQueueSample.field_16 = 7;
@@ -4327,12 +3654,10 @@ cAudioManager::ProcessEngineDamage(cVehicleParams *params)
 			emittingVolume = 60;
 			m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_FIRE_ENTITY;
 			m_sQueueSample.field_16 = 7;
-			m_sQueueSample.m_nFrequency =
-			    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_FIRE_ENTITY);
+			m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_FIRE_ENTITY);
 		}
 		CalculateDistance((bool *)params, params->m_fDistance);
-		m_sQueueSample.m_bVolume =
-		    ComputeVolume(emittingVolume, 40.f, m_sQueueSample.m_fDistance);
+		m_sQueueSample.m_bVolume = ComputeVolume(emittingVolume, 40.f, m_sQueueSample.m_fDistance);
 		if(m_sQueueSample.m_bVolume) {
 			m_sQueueSample.m_counter = 28;
 			m_sQueueSample.m_bBankIndex = 0;
@@ -4341,8 +3666,7 @@ cAudioManager::ProcessEngineDamage(cVehicleParams *params)
 			m_sQueueSample.m_bEmittingVolume = emittingVolume;
 			m_sQueueSample.m_nLoopStart =
 			    SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
-			m_sQueueSample.m_nLoopEnd =
-			    SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
+			m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
 			m_sQueueSample.field_48 = 2.0f;
 			m_sQueueSample.m_fSoundIntensity = 40.0f;
 			m_sQueueSample.field_56 = 0;
@@ -4441,7 +3765,7 @@ cAudioManager::ProcessExplosions(int32 explosion)
 	float maxDist;
 	float distSquared;
 
-	for(uint8 i = 0; i < 48u; i++) {
+	for(uint8 i = 0; i < 48; i++) {
 		if(CExplosion::GetExplosionActiveCounter(i) == 1) {
 			CExplosion::ResetExplosionActiveCounter(i);
 			type = CExplosion::GetExplosionType(i);
@@ -4452,18 +3776,16 @@ cAudioManager::ProcessExplosions(int32 explosion)
 			case EXPLOSION_TANK_GRENADE:
 				maxDist = 160000.f;
 				m_sQueueSample.m_fSoundIntensity = 400.0f;
-				m_sQueueSample.m_nSampleIndex =
-				    AUDIO_SAMPLE_WEAPON_GRENADE_EXPLOSION;
-				m_sQueueSample.m_nFrequency = RandomDisplacement(2000u) + 38000;
+				m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_WEAPON_GRENADE_EXPLOSION;
+				m_sQueueSample.m_nFrequency = RandomDisplacement(2000) + 38000;
 				m_sQueueSample.field_16 = 0;
 				m_sQueueSample.m_bBankIndex = 0;
 				break;
 			case EXPLOSION_MOLOTOV:
 				maxDist = 40000.f;
 				m_sQueueSample.m_fSoundIntensity = 200.0f;
-				m_sQueueSample.m_nSampleIndex =
-				    AUDIO_SAMPLE_WEAPON_MOLOTOV_EXPLOSION;
-				m_sQueueSample.m_nFrequency = RandomDisplacement(1000u) + 19000;
+				m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_WEAPON_MOLOTOV_EXPLOSION;
+				m_sQueueSample.m_nFrequency = RandomDisplacement(1000) + 19000;
 				m_sQueueSample.field_16 = 0;
 				m_sQueueSample.m_bBankIndex = 0;
 				break;
@@ -4472,7 +3794,7 @@ cAudioManager::ProcessExplosions(int32 explosion)
 				maxDist = 90000.f;
 				m_sQueueSample.m_fSoundIntensity = 300.0f;
 				m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_WEAPON_ROCKET_SHOT;
-				m_sQueueSample.m_nFrequency = RandomDisplacement(1000u) + 12347;
+				m_sQueueSample.m_nFrequency = RandomDisplacement(1000) + 12347;
 				m_sQueueSample.field_16 = 0;
 				m_sQueueSample.m_bBankIndex = 0;
 				break;
@@ -4480,10 +3802,9 @@ cAudioManager::ProcessExplosions(int32 explosion)
 				maxDist = 160000.f;
 				m_sQueueSample.m_fSoundIntensity = 400.0f;
 				m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_EXPLOSION_CAR;
-				m_sQueueSample.m_nFrequency = RandomDisplacement(2000u) + 38000;
+				m_sQueueSample.m_nFrequency = RandomDisplacement(2000) + 38000;
 				if(type == EXPLOSION_HELI)
-					m_sQueueSample.m_nFrequency =
-					    8 * m_sQueueSample.m_nFrequency / 10u;
+					m_sQueueSample.m_nFrequency = 8 * m_sQueueSample.m_nFrequency / 10;
 				m_sQueueSample.field_16 = 0;
 				m_sQueueSample.m_bBankIndex = 0;
 				break;
@@ -4493,9 +3814,8 @@ cAudioManager::ProcessExplosions(int32 explosion)
 			distSquared = GetDistanceSquared(&m_sQueueSample.m_vecPos);
 			if(distSquared < maxDist) {
 				m_sQueueSample.m_fDistance = Sqrt(distSquared);
-				m_sQueueSample.m_bVolume =
-				    ComputeVolume(maxVolume, m_sQueueSample.m_fSoundIntensity,
-				                  m_sQueueSample.m_fDistance);
+				m_sQueueSample.m_bVolume = ComputeVolume(maxVolume, m_sQueueSample.m_fSoundIntensity,
+				                                         m_sQueueSample.m_fDistance);
 				if(m_sQueueSample.m_bVolume) {
 					m_sQueueSample.m_counter = i;
 					m_sQueueSample.field_48 = 2.0f;
@@ -4521,12 +3841,11 @@ cAudioManager::ProcessFireHydrant()
 	float distSquared;
 	bool something = false;
 
-	m_sQueueSample.m_vecPos =
-	    *(CVector *)((size_t)m_asAudioEntities[m_sQueueSample.m_nEntityIndex].m_pEntity + 52);
+	m_sQueueSample.m_vecPos = *(CVector *)((size_t)m_asAudioEntities[m_sQueueSample.m_nEntityIndex].m_pEntity + 52);
 	distSquared = GetDistanceSquared(&m_sQueueSample.m_vecPos);
 	if(distSquared < 1225.f) {
 		CalculateDistance(&something, distSquared);
-		m_sQueueSample.m_bVolume = ComputeVolume(40u, 35.f, m_sQueueSample.m_fDistance);
+		m_sQueueSample.m_bVolume = ComputeVolume(40, 35.f, m_sQueueSample.m_fDistance);
 		if(m_sQueueSample.m_bVolume) {
 			m_sQueueSample.m_counter = 0;
 			m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_JUMBO_TAXI_SOUND;
@@ -4538,8 +3857,7 @@ cAudioManager::ProcessFireHydrant()
 			m_sQueueSample.m_bEmittingVolume = 40;
 			m_sQueueSample.m_nLoopStart =
 			    SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
-			m_sQueueSample.m_nLoopEnd =
-			    SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
+			m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
 			m_sQueueSample.field_48 = 2.0f;
 			m_sQueueSample.m_fSoundIntensity = 35.0f;
 			m_sQueueSample.field_56 = 0;
@@ -4619,16 +3937,12 @@ cAudioManager::ProcessFrontEnd()
 		case SOUND_RACE_START_3:
 		case SOUND_RACE_START_2:
 		case SOUND_RACE_START_1:
-		case SOUND_CLOCK_TICK:
-			m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_FRONTEND_CLOCK_TICK;
-			break;
+		case SOUND_CLOCK_TICK: m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_FRONTEND_CLOCK_TICK; break;
 		case SOUND_RACE_START_GO:
-			m_sQueueSample.m_nSampleIndex =
-			    AUDIO_SAMPLE_FRONTEND_PART_MISSION_COMPLETED;
+			m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_FRONTEND_PART_MISSION_COMPLETED;
 			break;
 		case SOUND_PART_MISSION_COMPLETE:
-			m_sQueueSample.m_nSampleIndex =
-			    AUDIO_SAMPLE_FRONTEND_PART_MISSION_COMPLETED;
+			m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_FRONTEND_PART_MISSION_COMPLETED;
 			break;
 		case SOUND_FRONTEND_MENU_STARTING:
 			processed = 1;
@@ -4657,7 +3971,7 @@ cAudioManager::ProcessFrontEnd()
 		case SOUND_9B: m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_382; break;
 		case SOUND_FRONTEND_AUDIO_TEST:
 			m_sQueueSample.m_nSampleIndex =
-			    m_anRandomTable[0] % 3u + AUDIO_SAMPLE_FRONTEND_MENU_AUDIO_TEST_1;
+			    m_anRandomTable[0] % 3 + AUDIO_SAMPLE_FRONTEND_MENU_AUDIO_TEST_1;
 			break;
 		case SOUND_FRONTEND_FAIL:
 			processed = 1;
@@ -4667,9 +3981,7 @@ cAudioManager::ProcessFrontEnd()
 		case SOUND_FRONTEND_RADIO_CHANGE:
 			m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_FRONTEND_GAMEPLAY_FAIL;
 			break;
-		case SOUND_A0:
-			m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_FRONTEND_GAMEPLAY_SUCCESS;
-			break;
+		case SOUND_A0: m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_FRONTEND_GAMEPLAY_SUCCESS; break;
 		default: continue;
 		}
 
@@ -4735,9 +4047,7 @@ cAudioManager::ProcessHelicopter(cVehicleParams *params)
 	static constexpr tHelicopterSampleData gHeliSfxRanges[3] = {
 	    {400.f, 380.f, 100}, {100.f, 70.f, maxVolume}, {60.f, 30.f, maxVolume}};
 
-	if(gHeliSfxRanges[0].m_fMaxDistance * gHeliSfxRanges[0].m_fMaxDistance <=
-	   params->m_fDistance)
-		return 0;
+	if(gHeliSfxRanges[0].m_fMaxDistance * gHeliSfxRanges[0].m_fMaxDistance <= params->m_fDistance) return 0;
 
 	CalculateDistance((bool *)params, params->m_fDistance);
 	heli = (CHeli *)params->m_pVehicle;
@@ -4747,28 +4057,25 @@ cAudioManager::ProcessHelicopter(cVehicleParams *params)
 		if(dist >= MaxDist) return 1;
 		baseDist = gHeliSfxRanges[i].m_fBaseDistance;
 		if(dist < baseDist)
-			emittingVol = (gHeliSfxRanges[i].m_bBaseVolume *
-			               ((MaxDist - dist) / (MaxDist - baseDist)));
+			emittingVol = (gHeliSfxRanges[i].m_bBaseVolume * ((MaxDist - dist) / (MaxDist - baseDist)));
 		else
 			emittingVol = gHeliSfxRanges[i].m_bBaseVolume;
 
-		m_sQueueSample.m_bVolume = ComputeVolume(
-		    emittingVol, gHeliSfxRanges[i].m_fMaxDistance, m_sQueueSample.m_fDistance);
+		m_sQueueSample.m_bVolume =
+		    ComputeVolume(emittingVol, gHeliSfxRanges[i].m_fMaxDistance, m_sQueueSample.m_fDistance);
 		if(m_sQueueSample.m_bVolume) {
 			m_sQueueSample.m_counter = i + 65;
 			m_sQueueSample.m_nSampleIndex = i + AUDIO_SAMPLE_HELI_FAR;
 			m_sQueueSample.m_bBankIndex = 0;
 			m_sQueueSample.m_bIsDistant = 0;
 			m_sQueueSample.field_16 = 0;
-			m_sQueueSample.m_nFrequency =
-			    1200 * heli->m_nHeliId +
-			    SampleManager.GetSampleBaseFrequency(m_sQueueSample.m_nSampleIndex);
+			m_sQueueSample.m_nFrequency = 1200 * heli->m_nHeliId + SampleManager.GetSampleBaseFrequency(
+			                                                           m_sQueueSample.m_nSampleIndex);
 			m_sQueueSample.m_nLoopCount = 0;
 			m_sQueueSample.m_bEmittingVolume = emittingVol;
 			m_sQueueSample.m_nLoopStart =
 			    SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
-			m_sQueueSample.m_nLoopEnd =
-			    SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
+			m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
 			m_sQueueSample.field_48 = 6.0f;
 			m_sQueueSample.m_fSoundIntensity = gHeliSfxRanges[i].m_fMaxDistance;
 			m_sQueueSample.field_56 = 0;
@@ -4807,17 +4114,15 @@ cAudioManager::ProcessHomeScriptObject(uint8 sound)
 		dist = GetDistanceSquared(&m_sQueueSample.m_vecPos);
 		if(dist < maxDist) {
 			m_sQueueSample.m_fDistance = sqrt(dist);
-			rand = m_anRandomTable[0] % 30u + 40;
-			m_sQueueSample.m_bVolume = ComputeVolume(
-			    rand, m_sQueueSample.m_fSoundIntensity, m_sQueueSample.m_fDistance);
+			rand = m_anRandomTable[0] % 30 + 40;
+			m_sQueueSample.m_bVolume =
+			    ComputeVolume(rand, m_sQueueSample.m_fSoundIntensity, m_sQueueSample.m_fDistance);
 			if(m_sQueueSample.m_bVolume) {
-				m_sQueueSample.m_nSampleIndex =
-				    m_anRandomTable[0] % 5u + AUDIO_SAMPLE_HOME_1;
+				m_sQueueSample.m_nSampleIndex = m_anRandomTable[0] % 5 + AUDIO_SAMPLE_HOME_1;
 				m_sQueueSample.m_bBankIndex = 0;
-				m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(
-				    m_sQueueSample.m_nSampleIndex);
-				m_sQueueSample.m_nFrequency +=
-				    RandomDisplacement(m_sQueueSample.m_nFrequency / 16);
+				m_sQueueSample.m_nFrequency =
+				    SampleManager.GetSampleBaseFrequency(m_sQueueSample.m_nSampleIndex);
+				m_sQueueSample.m_nFrequency += RandomDisplacement(m_sQueueSample.m_nFrequency / 16);
 				m_sQueueSample.m_counter = counter++;
 				m_sQueueSample.m_bIsDistant = 0;
 				m_sQueueSample.m_nLoopCount = 1;
@@ -4830,7 +4135,7 @@ cAudioManager::ProcessHomeScriptObject(uint8 sound)
 				m_sQueueSample.m_bReverbFlag = 1;
 				m_sQueueSample.m_bRequireReflection = 1;
 				AddSampleToRequestedQueue();
-				audioLogicTimers[6] = time + 1000 + m_anRandomTable[3] % 4000u;
+				audioLogicTimers[6] = time + 1000 + m_anRandomTable[3] % 4000;
 			}
 		}
 	}
@@ -4880,11 +4185,10 @@ cAudioManager::ProcessJumboAccel(CPlane *plane)
 	float whineSoundFreq;
 	float modificator;
 
-	if(SetupJumboFlySound(20u)) {
+	if(SetupJumboFlySound(20)) {
 		modificator = (plane->m_fSpeed - 0.10334f) * 1.676f;
 		if(modificator > 1.0f) modificator = 1.0f;
-		if(SetupJumboRumbleSound(maxVolume * modificator) &&
-		   SetupJumboTaxiSound((1.0f - modificator) * 75.f)) {
+		if(SetupJumboRumbleSound(maxVolume * modificator) && SetupJumboTaxiSound((1.0f - modificator) * 75.f)) {
 			if(modificator < 0.2f) {
 				whineSoundFreq = modificator * 5.f * 14600.0f + 29500;
 				vol = modificator * 5.f * maxVolume;
@@ -4895,7 +4199,7 @@ cAudioManager::ProcessJumboAccel(CPlane *plane)
 				vol = maxVolume;
 			}
 			SetupJumboEngineSound(vol, engineFreq);
-			SetupJumboWhineSound(18u, whineSoundFreq);
+			SetupJumboWhineSound(18, whineSoundFreq);
 		}
 	}
 }
@@ -4905,18 +4209,18 @@ cAudioManager::ProcessJumboDecel(CPlane *plane)
 {
 	float modificator;
 
-	if(SetupJumboFlySound(20u) && SetupJumboTaxiSound(75u)) {
+	if(SetupJumboFlySound(20) && SetupJumboTaxiSound(75)) {
 		modificator = (plane->m_fSpeed - 0.10334f) * 1.676f;
 		if(modificator > 1.0f) modificator = 1.0f;
 		SetupJumboEngineSound(maxVolume * modificator, 6050.f * modificator + 16000);
-		SetupJumboWhineSound(18u, 29500);
+		SetupJumboWhineSound(18, 29500);
 	}
 }
 
 void
 cAudioManager::ProcessJumboFlying()
 {
-	if(SetupJumboFlySound(maxVolume)) SetupJumboEngineSound(63u, 22050);
+	if(SetupJumboFlySound(maxVolume)) SetupJumboEngineSound(63, 22050);
 }
 
 void
@@ -4926,8 +4230,7 @@ cAudioManager::ProcessJumboLanding(CPlane *plane)
 	if(SetupJumboFlySound(107.f * modificator + 20)) {
 		if(SetupJumboTaxiSound(75.f * (1.f - modificator))) {
 			SetupJumboEngineSound(maxVolume, 22050);
-			SetupJumboWhineSound(18.f * (1.f - modificator),
-			                     14600.f * modificator + 29500);
+			SetupJumboWhineSound(18.f * (1.f - modificator), 14600.f * modificator + 29500);
 		}
 	}
 }
@@ -4937,18 +4240,16 @@ cAudioManager::ProcessJumboTakeOff(CPlane *plane)
 {
 	float modificator = (PlanePathPosition[plane->m_nPlaneId] - TakeOffPoint) / 300.f;
 
-	if(SetupJumboFlySound((107.f * modificator) + 20) &&
-	   SetupJumboRumbleSound(maxVolume * (1.f - modificator))) {
-		if(SetupJumboEngineSound(maxVolume, 22050))
-			SetupJumboWhineSound(18.f * (1.f - modificator), 44100);
+	if(SetupJumboFlySound((107.f * modificator) + 20) && SetupJumboRumbleSound(maxVolume * (1.f - modificator))) {
+		if(SetupJumboEngineSound(maxVolume, 22050)) SetupJumboWhineSound(18.f * (1.f - modificator), 44100);
 	}
 }
 
 void
 cAudioManager::ProcessJumboTaxi()
 {
-	if(SetupJumboFlySound(20u)) {
-		if(SetupJumboTaxiSound(75u)) SetupJumboWhineSound(18u, 29500);
+	if(SetupJumboFlySound(20)) {
+		if(SetupJumboTaxiSound(75)) SetupJumboWhineSound(18, 29500);
 	}
 }
 
@@ -4968,13 +4269,12 @@ cAudioManager::ProcessLaunderetteScriptObject(uint8 sound)
 	float distSquared = GetDistanceSquared(&m_sQueueSample.m_vecPos);
 	if(distSquared < maxDist) {
 		m_sQueueSample.m_fDistance = sqrt(distSquared);
-		m_sQueueSample.m_bVolume = ComputeVolume(45u, m_sQueueSample.m_fSoundIntensity,
-		                                         m_sQueueSample.m_fDistance);
+		m_sQueueSample.m_bVolume =
+		    ComputeVolume(45, m_sQueueSample.m_fSoundIntensity, m_sQueueSample.m_fDistance);
 		if(m_sQueueSample.m_bVolume) {
 			m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_LAUNDERETTE_1;
 			m_sQueueSample.m_bBankIndex = 0;
-			m_sQueueSample.m_nFrequency =
-			    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_LAUNDERETTE_1);
+			m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_LAUNDERETTE_1);
 			m_sQueueSample.m_counter = 0;
 			m_sQueueSample.m_bIsDistant = 0;
 			m_sQueueSample.m_nLoopCount = 0;
@@ -4984,19 +4284,17 @@ cAudioManager::ProcessLaunderetteScriptObject(uint8 sound)
 			m_sQueueSample.m_bEmittingVolume = 45;
 			m_sQueueSample.m_nLoopStart =
 			    SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
-			m_sQueueSample.m_nLoopEnd =
-			    SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
+			m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
 			m_sQueueSample.m_bReverbFlag = 1;
 			m_sQueueSample.m_bRequireReflection = 0;
 			AddSampleToRequestedQueue();
 		}
-		m_sQueueSample.m_bVolume = ComputeVolume(110u, m_sQueueSample.m_fSoundIntensity,
-		                                         m_sQueueSample.m_fDistance);
+		m_sQueueSample.m_bVolume =
+		    ComputeVolume(110, m_sQueueSample.m_fSoundIntensity, m_sQueueSample.m_fDistance);
 		if(m_sQueueSample.m_bVolume) {
 			m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_LAUNDERETTE_2;
 			m_sQueueSample.m_bBankIndex = 0;
-			m_sQueueSample.m_nFrequency =
-			    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_LAUNDERETTE_2);
+			m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_LAUNDERETTE_2);
 			m_sQueueSample.m_counter = 1;
 			m_sQueueSample.m_bIsDistant = 0;
 			m_sQueueSample.m_nLoopCount = 0;
@@ -5006,8 +4304,7 @@ cAudioManager::ProcessLaunderetteScriptObject(uint8 sound)
 			m_sQueueSample.m_bEmittingVolume = 110;
 			m_sQueueSample.m_nLoopStart =
 			    SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
-			m_sQueueSample.m_nLoopEnd =
-			    SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
+			m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
 			m_sQueueSample.m_bReverbFlag = 1;
 			m_sQueueSample.m_bRequireReflection = 0;
 			AddSampleToRequestedQueue();
@@ -5029,8 +4326,7 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_PARTY_1;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = maxVolume;
-		m_sQueueSample.m_nFrequency =
-		    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_PARTY_1);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_PARTY_1);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -5041,8 +4337,7 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_PARTY_1;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = maxVolume;
-		m_sQueueSample.m_nFrequency =
-		    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_PARTY_1);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_PARTY_1);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -5053,8 +4348,7 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_PARTY_2;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = maxVolume;
-		m_sQueueSample.m_nFrequency =
-		    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_PARTY_2);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_PARTY_2);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -5065,8 +4359,7 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_PARTY_2;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = maxVolume;
-		m_sQueueSample.m_nFrequency =
-		    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_PARTY_2);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_PARTY_2);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -5077,8 +4370,7 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_PARTY_3;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = maxVolume;
-		m_sQueueSample.m_nFrequency =
-		    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_PARTY_3);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_PARTY_3);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -5089,8 +4381,7 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_PARTY_3;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = maxVolume;
-		m_sQueueSample.m_nFrequency =
-		    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_PARTY_3);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_PARTY_3);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -5101,8 +4392,7 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_PARTY_4;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = maxVolume;
-		m_sQueueSample.m_nFrequency =
-		    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_PARTY_4);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_PARTY_4);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -5113,8 +4403,7 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_PARTY_4;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = maxVolume;
-		m_sQueueSample.m_nFrequency =
-		    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_PARTY_4);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_PARTY_4);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -5125,8 +4414,7 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_PARTY_5;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = maxVolume;
-		m_sQueueSample.m_nFrequency =
-		    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_PARTY_5);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_PARTY_5);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -5137,8 +4425,7 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_PARTY_5;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = maxVolume;
-		m_sQueueSample.m_nFrequency =
-		    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_PARTY_5);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_PARTY_5);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -5149,8 +4436,7 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_PARTY_6;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = maxVolume;
-		m_sQueueSample.m_nFrequency =
-		    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_PARTY_6);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_PARTY_6);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -5161,8 +4447,7 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_PARTY_6;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = maxVolume;
-		m_sQueueSample.m_nFrequency =
-		    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_PARTY_6);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_PARTY_6);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -5173,8 +4458,7 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_PARTY_7;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = maxVolume;
-		m_sQueueSample.m_nFrequency =
-		    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_PARTY_7);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_PARTY_7);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -5185,8 +4469,7 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_PARTY_7;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = maxVolume;
-		m_sQueueSample.m_nFrequency =
-		    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_PARTY_7);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_PARTY_7);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -5197,8 +4480,7 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_PARTY_8;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = maxVolume;
-		m_sQueueSample.m_nFrequency =
-		    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_PARTY_8);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_PARTY_8);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -5209,8 +4491,7 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_PARTY_8;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = maxVolume;
-		m_sQueueSample.m_nFrequency =
-		    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_PARTY_8);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_PARTY_8);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -5221,8 +4502,7 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_PARTY_9;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = maxVolume;
-		m_sQueueSample.m_nFrequency =
-		    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_PARTY_9);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_PARTY_9);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -5233,8 +4513,7 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_PARTY_9;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = maxVolume;
-		m_sQueueSample.m_nFrequency =
-		    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_PARTY_9);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_PARTY_9);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -5245,8 +4524,7 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_PARTY_10;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = maxVolume;
-		m_sQueueSample.m_nFrequency =
-		    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_PARTY_10);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_PARTY_10);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -5257,8 +4535,7 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_PARTY_10;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = maxVolume;
-		m_sQueueSample.m_nFrequency =
-		    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_PARTY_10);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_PARTY_10);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -5269,8 +4546,7 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_PARTY_11;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = maxVolume;
-		m_sQueueSample.m_nFrequency =
-		    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_PARTY_11);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_PARTY_11);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -5281,8 +4557,7 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_PARTY_11;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = maxVolume;
-		m_sQueueSample.m_nFrequency =
-		    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_PARTY_11);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_PARTY_11);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -5293,8 +4568,7 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_PARTY_12;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = maxVolume;
-		m_sQueueSample.m_nFrequency =
-		    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_PARTY_12);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_PARTY_12);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -5305,8 +4579,7 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_PARTY_12;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = maxVolume;
-		m_sQueueSample.m_nFrequency =
-		    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_PARTY_12);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_PARTY_12);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -5317,8 +4590,7 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_PARTY_13;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = maxVolume;
-		m_sQueueSample.m_nFrequency =
-		    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_PARTY_13);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_PARTY_13);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -5329,8 +4601,7 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_PARTY_13;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = maxVolume;
-		m_sQueueSample.m_nFrequency =
-		    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_PARTY_13);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_PARTY_13);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -5341,8 +4612,7 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_STRIP_CLUB_1;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = maxVolume;
-		m_sQueueSample.m_nFrequency =
-		    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_STRIP_CLUB_1);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_STRIP_CLUB_1);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -5353,8 +4623,7 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_STRIP_CLUB_1;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = maxVolume;
-		m_sQueueSample.m_nFrequency =
-		    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_STRIP_CLUB_1);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_STRIP_CLUB_1);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -5365,8 +4634,7 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_STRIP_CLUB_2;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = maxVolume;
-		m_sQueueSample.m_nFrequency =
-		    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_STRIP_CLUB_2);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_STRIP_CLUB_2);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -5377,8 +4645,7 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_STRIP_CLUB_2;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = maxVolume;
-		m_sQueueSample.m_nFrequency =
-		    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_STRIP_CLUB_2);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_STRIP_CLUB_2);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -5393,8 +4660,7 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_409;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = 110;
-		m_sQueueSample.m_nFrequency =
-		    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_409);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_409);
 		m_sQueueSample.field_16 = 6;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -5405,8 +4671,7 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_409;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = 110;
-		m_sQueueSample.m_nFrequency =
-		    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_409);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_409);
 		m_sQueueSample.field_16 = 6;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -5419,8 +4684,7 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_CHINATOWN_RESTAURANT;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = 110;
-		m_sQueueSample.m_nFrequency =
-		    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_CHINATOWN_RESTAURANT);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_CHINATOWN_RESTAURANT);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -5431,8 +4695,7 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_CHINATOWN_RESTAURANT;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = 110;
-		m_sQueueSample.m_nFrequency =
-		    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_CHINATOWN_RESTAURANT);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_CHINATOWN_RESTAURANT);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -5443,8 +4706,7 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_CIPRIANI_RESTAURANT;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = 110;
-		m_sQueueSample.m_nFrequency =
-		    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_CIPRIANI_RESTAURANT);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_CIPRIANI_RESTAURANT);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -5455,8 +4717,7 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_CIPRIANI_RESTAURANT;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = 110;
-		m_sQueueSample.m_nFrequency =
-		    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_CIPRIANI_RESTAURANT);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_CIPRIANI_RESTAURANT);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -5467,8 +4728,7 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_414;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = 110;
-		m_sQueueSample.m_nFrequency =
-		    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_414);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_414);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -5479,8 +4739,7 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_414;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = 110;
-		m_sQueueSample.m_nFrequency =
-		    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_414);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_414);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -5491,8 +4750,7 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_MARCO_BISTRO;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = 110;
-		m_sQueueSample.m_nFrequency =
-		    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_MARCO_BISTRO);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_MARCO_BISTRO);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -5503,8 +4761,7 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_MARCO_BISTRO;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = 110;
-		m_sQueueSample.m_nFrequency =
-		    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_MARCO_BISTRO);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_MARCO_BISTRO);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -5525,8 +4782,7 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_FRANKIE_PIANO;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = maxVolume;
-		m_sQueueSample.m_nFrequency =
-		    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_FRANKIE_PIANO);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_FRANKIE_PIANO);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -5537,8 +4793,7 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_PARTY_1;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = maxVolume;
-		m_sQueueSample.m_nFrequency =
-		    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_PARTY_1);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_PARTY_1);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -5557,8 +4812,7 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_BANK_ALARM;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = 90;
-		m_sQueueSample.m_nFrequency =
-		    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_BANK_ALARM);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_BANK_ALARM);
 		m_sQueueSample.field_16 = 2;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -5569,8 +4823,7 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_BANK_ALARM;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = 90;
-		m_sQueueSample.m_nFrequency =
-		    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_BANK_ALARM);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_BANK_ALARM);
 		m_sQueueSample.field_16 = 2;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -5581,8 +4834,7 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_POLICE_BALL;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = maxVolume;
-		m_sQueueSample.m_nFrequency =
-		    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_POLICE_BALL);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_POLICE_BALL);
 		m_sQueueSample.field_16 = 2;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -5593,8 +4845,7 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_POLICE_BALL;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = maxVolume;
-		m_sQueueSample.m_nFrequency =
-		    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_POLICE_BALL);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_POLICE_BALL);
 		m_sQueueSample.field_16 = 2;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -5605,8 +4856,7 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_RAVE_INDUSTRIAL;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = maxVolume;
-		m_sQueueSample.m_nFrequency =
-		    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_RAVE_INDUSTRIAL);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_RAVE_INDUSTRIAL);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -5617,16 +4867,13 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_RAVE_INDUSTRIAL;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = maxVolume;
-		m_sQueueSample.m_nFrequency =
-		    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_RAVE_INDUSTRIAL);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_RAVE_INDUSTRIAL);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
 		break;
 	case SCRIPT_SOUND_POLICE_CELL_BEATING_LOOP_S:
-	case SCRIPT_SOUND_POLICE_CELL_BEATING_LOOP_L:
-		ProcessPoliceCellBeatingScriptObject(sound);
-		return;
+	case SCRIPT_SOUND_POLICE_CELL_BEATING_LOOP_L: ProcessPoliceCellBeatingScriptObject(sound); return;
 	case SCRIPT_SOUND_RAVE_1_LOOP_S:
 	case SCRIPT_SOUND_RAVE_2_LOOP_S:
 		maxDist = 900.f;
@@ -5634,8 +4881,7 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_RAVE_1;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = maxVolume;
-		m_sQueueSample.m_nFrequency =
-		    SampleManager.GetSampleBaseFrequency(m_sQueueSample.m_nSampleIndex);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(m_sQueueSample.m_nSampleIndex);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -5647,8 +4893,7 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_RAVE_1;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = maxVolume;
-		m_sQueueSample.m_nFrequency =
-		    SampleManager.GetSampleBaseFrequency(m_sQueueSample.m_nSampleIndex);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(m_sQueueSample.m_nSampleIndex);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -5659,8 +4904,7 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_RAVE_2;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = maxVolume;
-		m_sQueueSample.m_nFrequency =
-		    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_RAVE_2);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_RAVE_2);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -5671,8 +4915,7 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_RAVE_2;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = maxVolume;
-		m_sQueueSample.m_nFrequency =
-		    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_RAVE_2);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_RAVE_2);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -5683,8 +4926,7 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_FIRE_ENTITY;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = 80;
-		m_sQueueSample.m_nFrequency =
-		    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_FIRE_ENTITY);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_FIRE_ENTITY);
 		m_sQueueSample.field_16 = 8;
 		m_sQueueSample.field_76 = 10;
 		m_sQueueSample.field_48 = 2.0f;
@@ -5695,8 +4937,8 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 	distSquared = GetDistanceSquared(&m_sQueueSample.m_vecPos);
 	if(distSquared < maxDist) {
 		m_sQueueSample.m_fDistance = Sqrt(distSquared);
-		m_sQueueSample.m_bVolume = ComputeVolume(
-		    emittingVolume, m_sQueueSample.m_fSoundIntensity, m_sQueueSample.m_fDistance);
+		m_sQueueSample.m_bVolume =
+		    ComputeVolume(emittingVolume, m_sQueueSample.m_fSoundIntensity, m_sQueueSample.m_fDistance);
 		if(m_sQueueSample.m_bVolume) {
 			m_sQueueSample.m_counter = 0;
 			m_sQueueSample.m_bIsDistant = 0;
@@ -5706,8 +4948,7 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 			m_sQueueSample.m_bEmittingVolume = emittingVolume;
 			m_sQueueSample.m_nLoopStart =
 			    SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
-			m_sQueueSample.m_nLoopEnd =
-			    SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
+			m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
 			m_sQueueSample.m_bRequireReflection = 0;
 			AddSampleToRequestedQueue();
 		}
@@ -5731,8 +4972,7 @@ cAudioManager::ProcessMissionAudio()
 		if(m_sMissionAudio.m_nSampleIndex != 3033) {
 			switch(m_sMissionAudio.m_bLoadingStatus) {
 			case 0:
-				SampleManager.PreloadStreamedFile(m_sMissionAudio.m_nSampleIndex,
-				                                  1u);
+				SampleManager.PreloadStreamedFile(m_sMissionAudio.m_nSampleIndex, 1);
 				m_sMissionAudio.m_bLoadingStatus = 1;
 				nFramesUntilFailedLoad = 0;
 				return;
@@ -5741,12 +4981,12 @@ cAudioManager::ProcessMissionAudio()
 				if(g_bMissionAudioLoadFailed) {
 					if(m_bTimerJustReset) {
 						ClearMissionAudio();
-						SampleManager.StopStreamedFile(1u);
+						SampleManager.StopStreamedFile(1);
 						nFramesForPretendPlaying = 0;
 						nCheckPlayingDelay = 0;
 						nFramesUntilFailedLoad = 0;
 					} else if(!m_bUserPause) {
-						if(++nFramesForPretendPlaying < 120u) {
+						if(++nFramesForPretendPlaying < 120) {
 							m_sMissionAudio.m_bPlayStatus = 1;
 						} else {
 							m_sMissionAudio.m_bPlayStatus = 2;
@@ -5758,7 +4998,7 @@ cAudioManager::ProcessMissionAudio()
 						if(m_sMissionAudio.m_bPlayStatus != 1) return;
 						if(m_bTimerJustReset) {
 							ClearMissionAudio();
-							SampleManager.StopStreamedFile(1u);
+							SampleManager.StopStreamedFile(1);
 							return;
 						}
 						if(MissionScriptAudioUsesPoliceChannel(
@@ -5766,42 +5006,32 @@ cAudioManager::ProcessMissionAudio()
 							if(!m_bUserPause) {
 								if(nCheckPlayingDelay) {
 									--nCheckPlayingDelay;
-								} else if(
-								    GetMissionScriptPoliceAudioPlayingStatus() ==
-								        2 ||
-								    --m_sMissionAudio.field_24) {
-									m_sMissionAudio
-									    .m_bPlayStatus = 2;
-									m_sMissionAudio
-									    .m_nSampleIndex = 3033;
-									SampleManager
-									    .StopStreamedFile(1u);
-									m_sMissionAudio.field_24 =
-									    0;
+								} else if(GetMissionScriptPoliceAudioPlayingStatus() ==
+								              2 ||
+								          --m_sMissionAudio.field_24) {
+									m_sMissionAudio.m_bPlayStatus = 2;
+									m_sMissionAudio.m_nSampleIndex = 3033;
+									SampleManager.StopStreamedFile(1);
+									m_sMissionAudio.field_24 = 0;
 								}
 							}
 						} else if(m_sMissionAudio.field_22) {
-							if(SampleManager.IsStreamPlaying(1u) ||
-							   m_bUserPause || m_bPreviousUserPause) {
+							if(SampleManager.IsStreamPlaying(1) || m_bUserPause ||
+							   m_bPreviousUserPause) {
 								if(m_bUserPause)
-									SampleManager.PauseStream(
-									    1, 1u);
+									SampleManager.PauseStream(1, 1);
 								else
-									SampleManager.PauseStream(
-									    0, 1u);
+									SampleManager.PauseStream(0, 1);
 							} else {
 								m_sMissionAudio.m_bPlayStatus = 2;
-								m_sMissionAudio.m_nSampleIndex =
-								    3033;
-								SampleManager.StopStreamedFile(1u);
+								m_sMissionAudio.m_nSampleIndex = 3033;
+								SampleManager.StopStreamedFile(1);
 								m_sMissionAudio.field_24 = 0;
 							}
 						} else {
 							if(m_bUserPause) return;
 							if(nCheckPlayingDelay--) {
-								if(!SampleManager.IsStreamPlaying(
-								       1u))
-									return;
+								if(!SampleManager.IsStreamPlaying(1)) return;
 								nCheckPlayingDelay = 0;
 							}
 							m_sMissionAudio.field_22 = 1;
@@ -5809,38 +5039,28 @@ cAudioManager::ProcessMissionAudio()
 					} else {
 						if(MissionScriptAudioUsesPoliceChannel(
 						       m_sMissionAudio.m_nSampleIndex)) {
-							SetMissionScriptPoliceAudio(
-							    m_sMissionAudio.m_nSampleIndex);
+							SetMissionScriptPoliceAudio(m_sMissionAudio.m_nSampleIndex);
 						} else {
-							if(m_bUserPause)
-								SampleManager.PauseStream(1, 1u);
+							if(m_bUserPause) SampleManager.PauseStream(1, 1);
 							if(m_sMissionAudio.field_12) {
-								SampleManager
-								    .SetStreamedVolumeAndPan(
-								        80u, 63u, 1, 1u);
+								SampleManager.SetStreamedVolumeAndPan(80, 63, 1, 1);
 							} else {
-								distSquared = GetDistanceSquared(
-								    &m_sMissionAudio.m_vecPos);
+								distSquared =
+								    GetDistanceSquared(&m_sMissionAudio.m_vecPos);
 								if(distSquared >= 2500.f) {
 									emittingVol = 0;
 									pan = 63;
 								} else {
 									dist = Sqrt(distSquared);
-									emittingVol = ComputeVolume(
-									    80u, 50.0f, dist);
-									TranslateEntity(
-									    &m_sMissionAudio
-									         .m_vecPos,
-									    &vec);
-									pan =
-									    ComputePan(50.f, &vec);
+									emittingVol = ComputeVolume(80, 50.0f, dist);
+									TranslateEntity(&m_sMissionAudio.m_vecPos,
+									                &vec);
+									pan = ComputePan(50.f, &vec);
 								}
-								SampleManager
-								    .SetStreamedVolumeAndPan(
-								        emittingVol, pan, 1, 1u);
+								SampleManager.SetStreamedVolumeAndPan(emittingVol, pan,
+								                                      1, 1);
 							}
-							SampleManager.StartPreloadedStreamedFile(
-							    1u);
+							SampleManager.StartPreloadedStreamedFile(1);
 						}
 						m_sMissionAudio.m_bPlayStatus = 1;
 						nCheckPlayingDelay = 30;
@@ -5848,7 +5068,7 @@ cAudioManager::ProcessMissionAudio()
 				}
 				break;
 			case 2:
-				if(++nFramesUntilFailedLoad >= 90u) {
+				if(++nFramesUntilFailedLoad >= 90) {
 					nFramesForPretendPlaying = 0;
 					g_bMissionAudioLoadFailed = 1;
 					nFramesUntilFailedLoad = 0;
@@ -5878,10 +5098,8 @@ cAudioManager::ProcessModelCarEngine(cVehicleParams *params)
 				velocityChange = Abs(params->m_fVelocityChange);
 			} else {
 				if(automobile->m_nDriveWheelsOnGround)
-					automobile->m_fGasPedalAudio =
-					    automobile->m_fGasPedalAudio * 0.4f;
-				velocityChange = automobile->m_fGasPedalAudio *
-				                 params->m_pTransmission->fMaxVelocity;
+					automobile->m_fGasPedalAudio = automobile->m_fGasPedalAudio * 0.4f;
+				velocityChange = automobile->m_fGasPedalAudio * params->m_pTransmission->fMaxVelocity;
 			}
 			if(velocityChange > 0.001f) {
 				allowedVelocity = 0.5f * params->m_pTransmission->fMaxVelocity;
@@ -5891,27 +5109,23 @@ cAudioManager::ProcessModelCarEngine(cVehicleParams *params)
 					emittingVol = 90;
 				if(emittingVol) {
 					CalculateDistance((bool *)params, params->m_fDistance);
-					m_sQueueSample.m_bVolume = ComputeVolume(
-					    emittingVol, 30.f, m_sQueueSample.m_fDistance);
+					m_sQueueSample.m_bVolume =
+					    ComputeVolume(emittingVol, 30.f, m_sQueueSample.m_fDistance);
 					if(m_sQueueSample.m_bVolume) {
 						m_sQueueSample.m_counter = 2;
-						m_sQueueSample.m_nSampleIndex =
-						    AUDIO_SAMPLE_MODEL_VEHICLE_ACCELERATING;
+						m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_MODEL_VEHICLE_ACCELERATING;
 						m_sQueueSample.m_bBankIndex = 0;
 						m_sQueueSample.m_bIsDistant = 0;
 						m_sQueueSample.field_16 = 1;
 						m_sQueueSample.m_nFrequency =
-						    (11025.f * velocityChange /
-						         params->m_pTransmission->fMaxVelocity +
+						    (11025.f * velocityChange / params->m_pTransmission->fMaxVelocity +
 						     11025.f);
 						m_sQueueSample.m_nLoopCount = 0;
 						m_sQueueSample.m_bEmittingVolume = emittingVol;
-						m_sQueueSample.m_nLoopStart =
-						    SampleManager.GetSampleLoopStartOffset(
-						        m_sQueueSample.m_nSampleIndex);
+						m_sQueueSample.m_nLoopStart = SampleManager.GetSampleLoopStartOffset(
+						    m_sQueueSample.m_nSampleIndex);
 						m_sQueueSample.m_nLoopEnd =
-						    SampleManager.GetSampleLoopEndOffset(
-						        m_sQueueSample.m_nSampleIndex);
+						    SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
 						m_sQueueSample.field_48 = 3.0f;
 						m_sQueueSample.m_fSoundIntensity = 30.0f;
 						m_sQueueSample.field_56 = 0;
@@ -5968,18 +5182,16 @@ cAudioManager::ProcessOneShotScriptObject(uint8 sound)
 		m_sQueueSample.field_48 = 0.0f;
 		m_sQueueSample.m_bIsDistant = 0;
 		m_sQueueSample.m_bRequireReflection = 1;
-		emittingVolume = RandomDisplacement(10u) + 50;
+		emittingVolume = RandomDisplacement(10) + 50;
 		break;
 	case SCRIPT_SOUND_BULLET_HIT_GROUND_1:
 	case SCRIPT_SOUND_BULLET_HIT_GROUND_2:
 	case SCRIPT_SOUND_BULLET_HIT_GROUND_3:
 		maxDist = 2500.f;
 		m_sQueueSample.m_fSoundIntensity = 50.0f;
-		m_sQueueSample.m_nSampleIndex =
-		    m_anRandomTable[iSound % 5] % 3u + AUDIO_SAMPLE_BULLET_HIT_GROUND_1;
+		m_sQueueSample.m_nSampleIndex = m_anRandomTable[iSound % 5] % 3 + AUDIO_SAMPLE_BULLET_HIT_GROUND_1;
 		m_sQueueSample.m_bBankIndex = 0;
-		m_sQueueSample.m_nFrequency =
-		    SampleManager.GetSampleBaseFrequency(m_sQueueSample.m_nSampleIndex);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(m_sQueueSample.m_nSampleIndex);
 		m_sQueueSample.m_nFrequency += RandomDisplacement(m_sQueueSample.m_nFrequency >> 5);
 		m_sQueueSample.field_16 = 9;
 		m_sQueueSample.field_48 = 0.0f;
@@ -5994,8 +5206,7 @@ cAudioManager::ProcessOneShotScriptObject(uint8 sound)
 		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_389;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = maxVolume;
-		m_sQueueSample.m_nFrequency =
-		    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_389);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_389);
 		m_sQueueSample.field_16 = 0;
 		m_sQueueSample.field_48 = 2.0f;
 		m_sQueueSample.m_bIsDistant = 0;
@@ -6006,8 +5217,7 @@ cAudioManager::ProcessOneShotScriptObject(uint8 sound)
 		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_PAYPHONE_RINGING;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = 80;
-		m_sQueueSample.m_nFrequency =
-		    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_PAYPHONE_RINGING);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_PAYPHONE_RINGING);
 		m_sQueueSample.field_16 = 1;
 		m_sQueueSample.field_48 = 2.0f;
 		m_sQueueSample.m_bIsDistant = 0;
@@ -6019,8 +5229,7 @@ cAudioManager::ProcessOneShotScriptObject(uint8 sound)
 		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_GLASS_GENERIC_BREAK;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = 70;
-		m_sQueueSample.m_nFrequency =
-		    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_GLASS_GENERIC_BREAK);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_GLASS_GENERIC_BREAK);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_48 = 0.0f;
 		m_sQueueSample.m_bIsDistant = 0;
@@ -6031,8 +5240,7 @@ cAudioManager::ProcessOneShotScriptObject(uint8 sound)
 		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_GLASS_GENERIC_BREAK;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = 60;
-		m_sQueueSample.m_nFrequency =
-		    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_GLASS_GENERIC_BREAK);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_GLASS_GENERIC_BREAK);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_48 = 0.0f;
 		m_sQueueSample.m_bIsDistant = 0;
@@ -6043,8 +5251,7 @@ cAudioManager::ProcessOneShotScriptObject(uint8 sound)
 		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_GLASS_WINDSHIELD_CRACK;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = 70;
-		m_sQueueSample.m_nFrequency =
-		    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_GLASS_WINDSHIELD_CRACK);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_GLASS_WINDSHIELD_CRACK);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_48 = 0.0f;
 		m_sQueueSample.m_bIsDistant = 0;
@@ -6053,21 +5260,20 @@ cAudioManager::ProcessOneShotScriptObject(uint8 sound)
 	case SCRIPT_SOUND_GLASS_LIGHT_BREAK:
 		maxDist = 3025.f;
 		m_sQueueSample.m_fSoundIntensity = 55.0f;
-		m_sQueueSample.m_nSampleIndex =
-		    (m_anRandomTable[4] & 3) + AUDIO_SAMPLE_GLASS_LIGHT_BREAK_1;
+		m_sQueueSample.m_nSampleIndex = (m_anRandomTable[4] & 3) + AUDIO_SAMPLE_GLASS_LIGHT_BREAK_1;
 		m_sQueueSample.m_bBankIndex = 0;
-		m_sQueueSample.m_nFrequency = RandomDisplacement(2000u) + 19000;
+		m_sQueueSample.m_nFrequency = RandomDisplacement(2000) + 19000;
 		m_sQueueSample.field_16 = 9;
 		m_sQueueSample.field_48 = 0.0f;
 		m_sQueueSample.m_bIsDistant = 0;
-		emittingVolume = RandomDisplacement(11u) + 25;
+		emittingVolume = RandomDisplacement(11) + 25;
 		break;
 	case SCRIPT_SOUND_BOX_DESTROYED_1:
 		maxDist = 3600.f;
 		m_sQueueSample.m_fSoundIntensity = 60.0f;
 		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_BOX_DESTROYED_1;
 		m_sQueueSample.m_bBankIndex = 0;
-		m_sQueueSample.m_nFrequency = RandomDisplacement(1500u) + 18600;
+		m_sQueueSample.m_nFrequency = RandomDisplacement(1500) + 18600;
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_48 = 0.0f;
 		m_sQueueSample.m_bIsDistant = 0;
@@ -6079,7 +5285,7 @@ cAudioManager::ProcessOneShotScriptObject(uint8 sound)
 		m_sQueueSample.m_fSoundIntensity = 60.0f;
 		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_BOX_DESTROYED_2;
 		m_sQueueSample.m_bBankIndex = 0;
-		m_sQueueSample.m_nFrequency = RandomDisplacement(1500u) + 18600;
+		m_sQueueSample.m_nFrequency = RandomDisplacement(1500) + 18600;
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_48 = 0.0f;
 		m_sQueueSample.m_bIsDistant = 0;
@@ -6089,11 +5295,9 @@ cAudioManager::ProcessOneShotScriptObject(uint8 sound)
 	case SCRIPT_SOUND_METAL_COLLISION:
 		maxDist = 3600.f;
 		m_sQueueSample.m_fSoundIntensity = 60.0f;
-		m_sQueueSample.m_nSampleIndex =
-		    m_anRandomTable[3] % 5u + AUDIO_SAMPLE_COLLISION_METAL;
+		m_sQueueSample.m_nSampleIndex = m_anRandomTable[3] % 5 + AUDIO_SAMPLE_COLLISION_METAL;
 		m_sQueueSample.m_bBankIndex = 0;
-		m_sQueueSample.m_nFrequency =
-		    SampleManager.GetSampleBaseFrequency(m_sQueueSample.m_nSampleIndex);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(m_sQueueSample.m_nSampleIndex);
 		m_sQueueSample.m_nFrequency += RandomDisplacement(m_sQueueSample.m_nFrequency >> 4);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_48 = 0.0f;
@@ -6106,8 +5310,7 @@ cAudioManager::ProcessOneShotScriptObject(uint8 sound)
 		m_sQueueSample.m_fSoundIntensity = 60.0f;
 		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_COLLISION_RUBBER;
 		m_sQueueSample.m_bBankIndex = 0;
-		m_sQueueSample.m_nFrequency =
-		    SampleManager.GetSampleBaseFrequency(m_sQueueSample.m_nSampleIndex);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(m_sQueueSample.m_nSampleIndex);
 		m_sQueueSample.m_nFrequency += RandomDisplacement(m_sQueueSample.m_nFrequency >> 4);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_48 = 0.0f;
@@ -6127,9 +5330,8 @@ cAudioManager::ProcessOneShotScriptObject(uint8 sound)
 			case SURFACE_SAND:
 			case SURFACE_TIRE:
 			case SURFACE_HEDGE:
-				m_sQueueSample.m_nSampleIndex =
-				    AUDIO_SAMPLE_BULLET_GUNSHELL_SOFT_DROP;
-				m_sQueueSample.m_nFrequency = RandomDisplacement(500u) + 11000;
+				m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_BULLET_GUNSHELL_SOFT_DROP;
+				m_sQueueSample.m_nFrequency = RandomDisplacement(500) + 11000;
 				m_sQueueSample.field_16 = 18;
 				maxDist = 400.f;
 				m_sQueueSample.m_fSoundIntensity = 20.0f;
@@ -6140,9 +5342,9 @@ cAudioManager::ProcessOneShotScriptObject(uint8 sound)
 				distSquared = GetDistanceSquared(&m_sQueueSample.m_vecPos);
 				if(distSquared < maxDist) {
 					m_sQueueSample.m_fDistance = Sqrt(distSquared);
-					m_sQueueSample.m_bVolume = ComputeVolume(
-					    emittingVolume, m_sQueueSample.m_fSoundIntensity,
-					    m_sQueueSample.m_fDistance);
+					m_sQueueSample.m_bVolume =
+					    ComputeVolume(emittingVolume, m_sQueueSample.m_fSoundIntensity,
+					                  m_sQueueSample.m_fDistance);
 					if(m_sQueueSample.m_bVolume) {
 						m_sQueueSample.m_counter = iSound++;
 						m_sQueueSample.m_nLoopCount = 1;
@@ -6160,7 +5362,7 @@ cAudioManager::ProcessOneShotScriptObject(uint8 sound)
 			}
 		}
 		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_BULLET_GUNSHELL_HARD_DROP;
-		m_sQueueSample.m_nFrequency = RandomDisplacement(750u) + 18000;
+		m_sQueueSample.m_nFrequency = RandomDisplacement(750) + 18000;
 		m_sQueueSample.field_16 = 15;
 		maxDist = 400.f;
 		m_sQueueSample.m_fSoundIntensity = 20.0f;
@@ -6171,7 +5373,7 @@ cAudioManager::ProcessOneShotScriptObject(uint8 sound)
 		break;
 	case SCRIPT_SOUND_GUNSHELL_DROP_SOFT:
 		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_BULLET_GUNSHELL_SOFT_DROP;
-		m_sQueueSample.m_nFrequency = RandomDisplacement(500u) + 11000;
+		m_sQueueSample.m_nFrequency = RandomDisplacement(500) + 11000;
 		m_sQueueSample.field_16 = 18;
 		maxDist = 400.f;
 		m_sQueueSample.m_fSoundIntensity = 20.0f;
@@ -6186,8 +5388,8 @@ cAudioManager::ProcessOneShotScriptObject(uint8 sound)
 	distSquared = GetDistanceSquared(&m_sQueueSample.m_vecPos);
 	if(distSquared < maxDist) {
 		m_sQueueSample.m_fDistance = Sqrt(distSquared);
-		m_sQueueSample.m_bVolume = ComputeVolume(
-		    emittingVolume, m_sQueueSample.m_fSoundIntensity, m_sQueueSample.m_fDistance);
+		m_sQueueSample.m_bVolume =
+		    ComputeVolume(emittingVolume, m_sQueueSample.m_fSoundIntensity, m_sQueueSample.m_fDistance);
 		if(m_sQueueSample.m_bVolume) {
 			m_sQueueSample.m_counter = iSound++;
 			m_sQueueSample.m_nLoopCount = 1;
@@ -6235,8 +5437,7 @@ cAudioManager::ProcessPedHeadphones(cPedParams *params)
 				veh = ped->m_pMyVehicle;
 				if(veh && veh->m_type == 0) {
 					for(int32 i = 2; i < 6; i++) {
-						if(!veh->IsDoorClosed((eDoors)i) ||
-						   veh->IsDoorMissing((eDoors)i)) {
+						if(!veh->IsDoorClosed((eDoors)i) || veh->IsDoorMissing((eDoors)i)) {
 							emittingVol = 42;
 							break;
 						}
@@ -6246,23 +5447,21 @@ cAudioManager::ProcessPedHeadphones(cPedParams *params)
 				emittingVol = 42;
 			}
 
-			m_sQueueSample.m_bVolume =
-			    ComputeVolume(emittingVol, 7.f, m_sQueueSample.m_fDistance);
+			m_sQueueSample.m_bVolume = ComputeVolume(emittingVol, 7.f, m_sQueueSample.m_fDistance);
 			if(m_sQueueSample.m_bVolume) {
 				m_sQueueSample.m_counter = 64;
 				m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_PED_HEADPHONES;
 				m_sQueueSample.m_bBankIndex = 0;
 				m_sQueueSample.m_bIsDistant = 0;
 				m_sQueueSample.field_16 = 5;
-				m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(
-				    AUDIO_SAMPLE_PED_HEADPHONES);
+				m_sQueueSample.m_nFrequency =
+				    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_PED_HEADPHONES);
 				m_sQueueSample.m_nLoopCount = 0;
 				m_sQueueSample.m_bEmittingVolume = emittingVol;
 				m_sQueueSample.m_nLoopStart =
-				    SampleManager.GetSampleLoopStartOffset(
-				        m_sQueueSample.m_nSampleIndex);
-				m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(
-				    m_sQueueSample.m_nSampleIndex);
+				    SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
+				m_sQueueSample.m_nLoopEnd =
+				    SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
 				m_sQueueSample.field_48 = 4.0f;
 				m_sQueueSample.m_fSoundIntensity = 7.0f;
 				m_sQueueSample.field_56 = 0;
@@ -6310,20 +5509,17 @@ cAudioManager::ProcessPedOneShots(cPedParams *params)
 		case SOUND_STEP_START:
 		case SOUND_STEP_END:
 			if(!params->m_pPed->bIsLooking) {
-				emittingVol = m_anRandomTable[3] % 15u + 45;
-				if(FindPlayerPed() !=
-				   m_asAudioEntities[m_sQueueSample.m_nEntityIndex].m_pEntity)
+				emittingVol = m_anRandomTable[3] % 15 + 45;
+				if(FindPlayerPed() != m_asAudioEntities[m_sQueueSample.m_nEntityIndex].m_pEntity)
 					emittingVol >>= 1;
 				maxDist = 400.f;
 				switch(params->m_pPed->m_nSurfaceTouched) {
 				case SURFACE_GRASS:
-					sampleIndex =
-					    m_anRandomTable[1] % 5u + AUDIO_SAMPLE_PED_FALL_GRASS_1;
+					sampleIndex = m_anRandomTable[1] % 5 + AUDIO_SAMPLE_PED_FALL_GRASS_1;
 					break;
 				case SURFACE_DIRT:
 				case SURFACE_DIRTTRACK:
-					sampleIndex =
-					    m_anRandomTable[4] % 5u + AUDIO_SAMPLE_PED_FALL_DIRT_1;
+					sampleIndex = m_anRandomTable[4] % 5 + AUDIO_SAMPLE_PED_FALL_DIRT_1;
 					break;
 				case SURFACE_METAL6:
 				case SURFACE_METAL_DOOR:
@@ -6336,57 +5532,43 @@ cAudioManager::ProcessPedOneShots(cPedParams *params)
 				case SURFACE_METAL_FENCE:
 				case SURFACE_METAL27:
 				case SURFACE_METAL28:
-					sampleIndex =
-					    m_anRandomTable[0] % 5u + AUDIO_SAMPLE_PED_FALL_METAL_1;
+					sampleIndex = m_anRandomTable[0] % 5 + AUDIO_SAMPLE_PED_FALL_METAL_1;
 					break;
 				case SURFACE_SAND:
-					sampleIndex =
-					    (m_anRandomTable[4] & 3) + AUDIO_SAMPLE_PED_FALL_SAND_1;
+					sampleIndex = (m_anRandomTable[4] & 3) + AUDIO_SAMPLE_PED_FALL_SAND_1;
 					break;
 				case SURFACE_PUDDLE:
-					sampleIndex = (m_anRandomTable[3] & 3) +
-					              AUDIO_SAMPLE_PED_FALL_IN_WATER_1;
+					sampleIndex = (m_anRandomTable[3] & 3) + AUDIO_SAMPLE_PED_FALL_IN_WATER_1;
 					break;
 				case SURFACE_WOOD:
 				case SURFACE_WOOD_BOX:
 				case SURFACE_WOOD_PLANK:
-					sampleIndex =
-					    m_anRandomTable[2] % 5u + AUDIO_SAMPLE_PED_FALL_WOOD_1;
+					sampleIndex = m_anRandomTable[2] % 5 + AUDIO_SAMPLE_PED_FALL_WOOD_1;
 					break;
 				case SURFACE_HEDGE:
-					sampleIndex =
-					    m_anRandomTable[2] % 5u + AUDIO_SAMPLE_COLLISION_HEDGE;
+					sampleIndex = m_anRandomTable[2] % 5 + AUDIO_SAMPLE_COLLISION_HEDGE;
 					break;
 				default:
-					sampleIndex = m_anRandomTable[2] % 5u +
-					              AUDIO_SAMPLE_PED_FALL_PAVEMENT_1;
+					sampleIndex = m_anRandomTable[2] % 5 + AUDIO_SAMPLE_PED_FALL_PAVEMENT_1;
 					break;
 				}
 				m_sQueueSample.m_nSampleIndex = sampleIndex;
 				m_sQueueSample.m_bBankIndex = 0;
 				m_sQueueSample.m_counter =
-				    m_asAudioEntities[m_sQueueSample.m_nEntityIndex]
-				        .m_awAudioEvent[i] -
-				    28;
-				m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(
-				    m_sQueueSample.m_nSampleIndex);
-				m_sQueueSample.m_nFrequency +=
-				    RandomDisplacement(m_sQueueSample.m_nFrequency / 17u);
+				    m_asAudioEntities[m_sQueueSample.m_nEntityIndex].m_awAudioEvent[i] - 28;
+				m_sQueueSample.m_nFrequency =
+				    SampleManager.GetSampleBaseFrequency(m_sQueueSample.m_nSampleIndex);
+				m_sQueueSample.m_nFrequency += RandomDisplacement(m_sQueueSample.m_nFrequency / 17);
 				switch(params->m_pPed->m_nMoveState) {
 				case 2:
 					emittingVol >>= 2;
-					m_sQueueSample.m_nFrequency =
-					    9 * m_sQueueSample.m_nFrequency / 10u;
+					m_sQueueSample.m_nFrequency = 9 * m_sQueueSample.m_nFrequency / 10;
 					break;
 				case 3:
 					emittingVol >>= 1;
-					m_sQueueSample.m_nFrequency =
-					    11 * m_sQueueSample.m_nFrequency / 10u;
-					break;
-				case 4:
-					m_sQueueSample.m_nFrequency =
-					    12 * m_sQueueSample.m_nFrequency / 10u;
+					m_sQueueSample.m_nFrequency = 11 * m_sQueueSample.m_nFrequency / 10;
 					break;
+				case 4: m_sQueueSample.m_nFrequency = 12 * m_sQueueSample.m_nFrequency / 10; break;
 				default: break;
 				}
 				m_sQueueSample.field_16 = 5;
@@ -6408,20 +5590,17 @@ cAudioManager::ProcessPedOneShots(cPedParams *params)
 				emittingVol = m_anRandomTable[3] % 20 + 80;
 				if(ped->m_nSurfaceTouched == SURFACE_PUDDLE) {
 					m_sQueueSample.m_nSampleIndex =
-					    (m_anRandomTable[3] & 3) +
-					    AUDIO_SAMPLE_PED_FALL_IN_WATER_1;
+					    (m_anRandomTable[3] & 3) + AUDIO_SAMPLE_PED_FALL_IN_WATER_1;
 				} else if(sound == SOUND_FALL_LAND) {
 					m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_PED_FALL_LAND;
 				} else {
-					m_sQueueSample.m_nSampleIndex =
-					    AUDIO_SAMPLE_PED_FALL_COLLAPSE;
+					m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_PED_FALL_COLLAPSE;
 				}
 				m_sQueueSample.m_bBankIndex = 0;
 				m_sQueueSample.m_counter = 1;
-				m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(
-				    m_sQueueSample.m_nSampleIndex);
-				m_sQueueSample.m_nFrequency +=
-				    RandomDisplacement(m_sQueueSample.m_nFrequency / 17u);
+				m_sQueueSample.m_nFrequency =
+				    SampleManager.GetSampleBaseFrequency(m_sQueueSample.m_nSampleIndex);
+				m_sQueueSample.m_nFrequency += RandomDisplacement(m_sQueueSample.m_nFrequency / 17);
 				m_sQueueSample.field_16 = 2;
 				m_sQueueSample.field_48 = 0.0f;
 				m_sQueueSample.m_fSoundIntensity = 30.0f;
@@ -6680,7 +5859,7 @@ cAudioManager::ProcessPedOneShots(cPedParams *params)
 			m_sQueueSample.m_bBankIndex = 0;
 			m_sQueueSample.m_counter = iSound++;
 			processed = 1;
-			m_sQueueSample.m_nFrequency = RandomDisplacement(2000u) + 22000;
+			m_sQueueSample.m_nFrequency = RandomDisplacement(2000) + 22000;
 			m_sQueueSample.field_16 = 3;
 			m_sQueueSample.field_48 = 0.0f;
 			m_sQueueSample.m_fSoundIntensity = 30.0f;
@@ -6705,10 +5884,9 @@ cAudioManager::ProcessPedOneShots(cPedParams *params)
 				m_sQueueSample.m_bBankIndex = 0;
 				m_sQueueSample.m_counter = iSound++;
 				processed = 1;
-				m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(
-				    AUDIO_SAMPLE_WEAPON_PISTOL_SHOT);
-				m_sQueueSample.m_nFrequency +=
-				    RandomDisplacement(m_sQueueSample.m_nFrequency >> 5);
+				m_sQueueSample.m_nFrequency =
+				    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_WEAPON_PISTOL_SHOT);
+				m_sQueueSample.m_nFrequency += RandomDisplacement(m_sQueueSample.m_nFrequency >> 5);
 				m_sQueueSample.field_16 = 3;
 				m_sQueueSample.field_48 = 0.0f;
 				m_sQueueSample.m_fSoundIntensity = 50.0f;
@@ -6730,10 +5908,9 @@ cAudioManager::ProcessPedOneShots(cPedParams *params)
 				m_sQueueSample.m_bBankIndex = 0;
 				m_sQueueSample.m_counter = iSound++;
 				processed = 1;
-				m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(
-				    AUDIO_SAMPLE_WEAPON_UZI_SHOT);
-				m_sQueueSample.m_nFrequency +=
-				    RandomDisplacement(m_sQueueSample.m_nFrequency >> 5);
+				m_sQueueSample.m_nFrequency =
+				    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_WEAPON_UZI_SHOT);
+				m_sQueueSample.m_nFrequency += RandomDisplacement(m_sQueueSample.m_nFrequency >> 5);
 				m_sQueueSample.field_16 = 3;
 				m_sQueueSample.field_48 = 0.0f;
 				m_sQueueSample.m_fSoundIntensity = 80.0f;
@@ -6751,10 +5928,9 @@ cAudioManager::ProcessPedOneShots(cPedParams *params)
 				m_sQueueSample.m_bBankIndex = 0;
 				m_sQueueSample.m_counter = iSound++;
 				processed = 1;
-				m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(
-				    AUDIO_SAMPLE_WEAPON_SHOTGUN_SHOT);
-				m_sQueueSample.m_nFrequency +=
-				    RandomDisplacement(m_sQueueSample.m_nFrequency >> 5);
+				m_sQueueSample.m_nFrequency =
+				    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_WEAPON_SHOTGUN_SHOT);
+				m_sQueueSample.m_nFrequency += RandomDisplacement(m_sQueueSample.m_nFrequency >> 5);
 				m_sQueueSample.field_16 = 3;
 				m_sQueueSample.field_48 = 0.0f;
 				m_sQueueSample.m_fSoundIntensity = 60.0f;
@@ -6776,10 +5952,9 @@ cAudioManager::ProcessPedOneShots(cPedParams *params)
 				m_sQueueSample.m_bBankIndex = 0;
 				m_sQueueSample.m_counter = iSound++;
 				processed = 1;
-				m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(
-				    AUDIO_SAMPLE_WEAPON_CHAINGUN_SHOT);
-				m_sQueueSample.m_nFrequency +=
-				    RandomDisplacement(m_sQueueSample.m_nFrequency >> 5);
+				m_sQueueSample.m_nFrequency =
+				    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_WEAPON_CHAINGUN_SHOT);
+				m_sQueueSample.m_nFrequency += RandomDisplacement(m_sQueueSample.m_nFrequency >> 5);
 				m_sQueueSample.field_16 = 3;
 				m_sQueueSample.field_48 = 0.0f;
 				m_sQueueSample.m_fSoundIntensity = 80.0f;
@@ -6797,10 +5972,9 @@ cAudioManager::ProcessPedOneShots(cPedParams *params)
 				m_sQueueSample.m_bBankIndex = 0;
 				m_sQueueSample.m_counter = iSound++;
 				processed = 1;
-				m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(
-				    AUDIO_SAMPLE_WEAPON_M16_SHOT);
-				m_sQueueSample.m_nFrequency +=
-				    RandomDisplacement(m_sQueueSample.m_nFrequency >> 5);
+				m_sQueueSample.m_nFrequency =
+				    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_WEAPON_M16_SHOT);
+				m_sQueueSample.m_nFrequency += RandomDisplacement(m_sQueueSample.m_nFrequency >> 5);
 				m_sQueueSample.field_16 = 3;
 				m_sQueueSample.field_48 = 0.0f;
 				m_sQueueSample.m_fSoundIntensity = 80.0f;
@@ -6818,10 +5992,9 @@ cAudioManager::ProcessPedOneShots(cPedParams *params)
 				m_sQueueSample.m_bBankIndex = 0;
 				m_sQueueSample.m_counter = iSound++;
 				processed = 1;
-				m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(
-				    AUDIO_SAMPLE_WEAPON_SNIPER_SHOT);
-				m_sQueueSample.m_nFrequency +=
-				    RandomDisplacement(m_sQueueSample.m_nFrequency >> 5);
+				m_sQueueSample.m_nFrequency =
+				    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_WEAPON_SNIPER_SHOT);
+				m_sQueueSample.m_nFrequency += RandomDisplacement(m_sQueueSample.m_nFrequency >> 5);
 				m_sQueueSample.field_16 = 3;
 				m_sQueueSample.field_48 = 0.0f;
 				m_sQueueSample.m_fSoundIntensity = 60.0f;
@@ -6843,10 +6016,9 @@ cAudioManager::ProcessPedOneShots(cPedParams *params)
 				m_sQueueSample.m_bBankIndex = 0;
 				m_sQueueSample.m_counter = iSound++;
 				processed = 1;
-				m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(
-				    AUDIO_SAMPLE_WEAPON_ROCKET_SHOT);
-				m_sQueueSample.m_nFrequency +=
-				    RandomDisplacement(m_sQueueSample.m_nFrequency >> 5);
+				m_sQueueSample.m_nFrequency =
+				    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_WEAPON_ROCKET_SHOT);
+				m_sQueueSample.m_nFrequency += RandomDisplacement(m_sQueueSample.m_nFrequency >> 5);
 				m_sQueueSample.field_16 = 1;
 				m_sQueueSample.field_48 = 0.0f;
 				m_sQueueSample.m_fSoundIntensity = 90.0f;
@@ -6864,25 +6036,22 @@ cAudioManager::ProcessPedOneShots(cPedParams *params)
 					noReflection = 1;
 				break;
 			case WEAPONTYPE_FLAMETHROWER:
-				m_sQueueSample.m_nSampleIndex =
-				    AUDIO_SAMPLE_WEAPON_FLAMETHROWER_SHOT;
+				m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_WEAPON_FLAMETHROWER_SHOT;
 				m_sQueueSample.m_bBankIndex = 0;
 				m_sQueueSample.m_counter = 9;
 				emittingVol = 90;
 				m_sQueueSample.m_nFrequency =
 				    (10 * m_sQueueSample.m_nEntityIndex & 2047) +
-				    SampleManager.GetSampleBaseFrequency(
-				        AUDIO_SAMPLE_WEAPON_FLAMETHROWER_SHOT);
+				    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_WEAPON_FLAMETHROWER_SHOT);
 				m_sQueueSample.field_16 = 3;
 				m_sQueueSample.field_48 = 4.0f;
 				m_sQueueSample.m_fSoundIntensity = 60.0f;
 				maxDist = 3600.f;
 				m_sQueueSample.m_nLoopCount = 0;
 				m_sQueueSample.m_nLoopStart =
-				    SampleManager.GetSampleLoopStartOffset(
-				        m_sQueueSample.m_nSampleIndex);
-				m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(
-				    m_sQueueSample.m_nSampleIndex);
+				    SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
+				m_sQueueSample.m_nLoopEnd =
+				    SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
 				m_sQueueSample.m_bEmittingVolume = 90;
 				m_sQueueSample.m_bIsDistant = 0;
 				m_sQueueSample.field_56 = 0;
@@ -6905,10 +6074,9 @@ cAudioManager::ProcessPedOneShots(cPedParams *params)
 				m_sQueueSample.m_counter = iSound++;
 				processed = 1;
 				m_sQueueSample.m_nFrequency =
-				    SampleManager.GetSampleBaseFrequency(
-				        AUDIO_SAMPLE_WEAPON_PISTOL_RELOAD) +
-				    RandomDisplacement(300u);
-				m_sQueueSample.m_nFrequency += RandomDisplacement(300u);
+				    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_WEAPON_PISTOL_RELOAD) +
+				    RandomDisplacement(300);
+				m_sQueueSample.m_nFrequency += RandomDisplacement(300);
 				m_sQueueSample.m_bBankIndex = 0;
 				m_sQueueSample.field_16 = 5;
 				m_sQueueSample.field_48 = 0.0f;
@@ -6928,7 +6096,7 @@ cAudioManager::ProcessPedOneShots(cPedParams *params)
 				m_sQueueSample.m_counter = iSound++;
 				processed = 1;
 				m_sQueueSample.m_nFrequency = 39243;
-				m_sQueueSample.m_nFrequency += RandomDisplacement(300u);
+				m_sQueueSample.m_nFrequency += RandomDisplacement(300);
 				m_sQueueSample.m_bBankIndex = 0;
 				m_sQueueSample.field_16 = 5;
 				m_sQueueSample.field_48 = 0.0f;
@@ -6948,7 +6116,7 @@ cAudioManager::ProcessPedOneShots(cPedParams *params)
 				m_sQueueSample.m_counter = iSound++;
 				processed = 1;
 				m_sQueueSample.m_nFrequency = 30290;
-				m_sQueueSample.m_nFrequency += RandomDisplacement(300u);
+				m_sQueueSample.m_nFrequency += RandomDisplacement(300);
 				m_sQueueSample.m_bBankIndex = 0;
 				m_sQueueSample.field_16 = 5;
 				m_sQueueSample.field_48 = 0.0f;
@@ -6967,9 +6135,9 @@ cAudioManager::ProcessPedOneShots(cPedParams *params)
 				emittingVol = 75;
 				m_sQueueSample.m_counter = iSound++;
 				processed = 1;
-				m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(
-				    AUDIO_SAMPLE_WEAPON_CHAINGUN_RELOAD);
-				m_sQueueSample.m_nFrequency += RandomDisplacement(300u);
+				m_sQueueSample.m_nFrequency =
+				    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_WEAPON_CHAINGUN_RELOAD);
+				m_sQueueSample.m_nFrequency += RandomDisplacement(300);
 				m_sQueueSample.m_bBankIndex = 0;
 				m_sQueueSample.field_16 = 5;
 				m_sQueueSample.field_48 = 0.0f;
@@ -6988,9 +6156,9 @@ cAudioManager::ProcessPedOneShots(cPedParams *params)
 				emittingVol = 75;
 				m_sQueueSample.m_counter = iSound++;
 				processed = 1;
-				m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(
-				    AUDIO_SAMPLE_WEAPON_UZI_RELOAD);
-				m_sQueueSample.m_nFrequency += RandomDisplacement(300u);
+				m_sQueueSample.m_nFrequency =
+				    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_WEAPON_UZI_RELOAD);
+				m_sQueueSample.m_nFrequency += RandomDisplacement(300);
 				m_sQueueSample.m_bBankIndex = 0;
 				m_sQueueSample.field_16 = 5;
 				m_sQueueSample.field_48 = 0.0f;
@@ -7009,9 +6177,9 @@ cAudioManager::ProcessPedOneShots(cPedParams *params)
 				emittingVol = 75;
 				m_sQueueSample.m_counter = iSound++;
 				processed = 1;
-				m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(
-				    AUDIO_SAMPLE_WEAPON_SNIPER_RELOAD);
-				m_sQueueSample.m_nFrequency += RandomDisplacement(300u);
+				m_sQueueSample.m_nFrequency =
+				    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_WEAPON_SNIPER_RELOAD);
+				m_sQueueSample.m_nFrequency += RandomDisplacement(300);
 				m_sQueueSample.m_bBankIndex = 0;
 				m_sQueueSample.field_16 = 5;
 				m_sQueueSample.field_48 = 0.0f;
@@ -7030,9 +6198,9 @@ cAudioManager::ProcessPedOneShots(cPedParams *params)
 				emittingVol = 75;
 				m_sQueueSample.m_counter = iSound++;
 				processed = 1;
-				m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(
-				    AUDIO_SAMPLE_WEAPON_ROCKET_RELOAD);
-				m_sQueueSample.m_nFrequency += RandomDisplacement(300u);
+				m_sQueueSample.m_nFrequency =
+				    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_WEAPON_ROCKET_RELOAD);
+				m_sQueueSample.m_nFrequency += RandomDisplacement(300);
 				m_sQueueSample.m_bBankIndex = 0;
 				m_sQueueSample.field_16 = 5;
 				m_sQueueSample.field_48 = 0.0f;
@@ -7056,10 +6224,8 @@ cAudioManager::ProcessPedOneShots(cPedParams *params)
 			m_sQueueSample.m_bBankIndex = 0;
 			m_sQueueSample.m_counter = iSound++;
 			processed = 1;
-			m_sQueueSample.m_nFrequency =
-			    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_75);
-			m_sQueueSample.m_nFrequency +=
-			    RandomDisplacement(m_sQueueSample.m_nFrequency >> 4);
+			m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_75);
+			m_sQueueSample.m_nFrequency += RandomDisplacement(m_sQueueSample.m_nFrequency >> 4);
 			m_sQueueSample.field_16 = 3;
 			m_sQueueSample.field_48 = 0.0f;
 			m_sQueueSample.m_fSoundIntensity = 80.0f;
@@ -7080,10 +6246,9 @@ cAudioManager::ProcessPedOneShots(cPedParams *params)
 			m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_WEAPON_FLAMETHROWER_FIRE;
 			m_sQueueSample.m_bBankIndex = 0;
 			m_sQueueSample.m_counter = iSound++;
-			m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(
-			    AUDIO_SAMPLE_WEAPON_FLAMETHROWER_FIRE);
-			m_sQueueSample.m_nFrequency +=
-			    RandomDisplacement(m_sQueueSample.m_nFrequency >> 4);
+			m_sQueueSample.m_nFrequency =
+			    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_WEAPON_FLAMETHROWER_FIRE);
+			m_sQueueSample.m_nFrequency += RandomDisplacement(m_sQueueSample.m_nFrequency >> 4);
 			m_sQueueSample.field_16 = 3;
 			m_sQueueSample.field_48 = 4.0f;
 			m_sQueueSample.m_fSoundIntensity = 60.0f;
@@ -7101,10 +6266,8 @@ cAudioManager::ProcessPedOneShots(cPedParams *params)
 			m_sQueueSample.m_bBankIndex = 0;
 			m_sQueueSample.m_counter = iSound++;
 			processed = 1;
-			m_sQueueSample.m_nFrequency =
-			    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_BULLET_HIT_PED);
-			m_sQueueSample.m_nFrequency +=
-			    RandomDisplacement(m_sQueueSample.m_nFrequency >> 3);
+			m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_BULLET_HIT_PED);
+			m_sQueueSample.m_nFrequency += RandomDisplacement(m_sQueueSample.m_nFrequency >> 3);
 			m_sQueueSample.field_16 = 7;
 			m_sQueueSample.field_48 = 0.0f;
 			m_sQueueSample.m_fSoundIntensity = 30.0f;
@@ -7122,7 +6285,7 @@ cAudioManager::ProcessPedOneShots(cPedParams *params)
 			m_sQueueSample.m_bBankIndex = 0;
 			m_sQueueSample.m_counter = iSound++;
 			processed = 1;
-			m_sQueueSample.m_nFrequency = RandomDisplacement(1400u) + 20000;
+			m_sQueueSample.m_nFrequency = RandomDisplacement(1400) + 20000;
 			m_sQueueSample.field_16 = 1;
 			m_sQueueSample.field_48 = 0.0f;
 			m_sQueueSample.m_fSoundIntensity = 40.0f;
@@ -7140,12 +6303,11 @@ cAudioManager::ProcessPedOneShots(cPedParams *params)
 			SetupPedComments(params, sound);
 			continue;
 
-			if(processed && iSound > 60u) iSound = 21;
+			if(processed && iSound > 60) iSound = 21;
 			if(params->m_fDistance < maxDist) {
 				CalculateDistance((bool *)params, params->m_fDistance);
-				m_sQueueSample.m_bVolume =
-				    ComputeVolume(emittingVol, m_sQueueSample.m_fSoundIntensity,
-				                  m_sQueueSample.m_fDistance);
+				m_sQueueSample.m_bVolume = ComputeVolume(emittingVol, m_sQueueSample.m_fSoundIntensity,
+				                                         m_sQueueSample.m_fDistance);
 				if(m_sQueueSample.m_bVolume) {
 					if(noReflection) {
 						if(0.2f * m_sQueueSample.m_fSoundIntensity >
@@ -7161,12 +6323,11 @@ cAudioManager::ProcessPedOneShots(cPedParams *params)
 					if(noReflection) {
 						m_sQueueSample.m_bOffset = 127;
 						++m_sQueueSample.m_nSampleIndex;
-						if(m_asAudioEntities[m_sQueueSample.m_nEntityIndex]
-						           .m_awAudioEvent[i] != 47 ||
-						   weapon->m_eWeaponType !=
-						       WEAPONTYPE_FLAMETHROWER) {
+						if(m_asAudioEntities[m_sQueueSample.m_nEntityIndex].m_awAudioEvent[i] !=
+						       47 ||
+						   weapon->m_eWeaponType != WEAPONTYPE_FLAMETHROWER) {
 							m_sQueueSample.m_counter = iSound++;
-							if(iSound > 60u) iSound = 21;
+							if(iSound > 60) iSound = 21;
 						} else {
 							++m_sQueueSample.m_counter;
 						}
@@ -7185,12 +6346,8 @@ cAudioManager::ProcessPhysical(int32 id)
 	CPhysical *entity = (CPhysical *)m_asAudioEntities[id].m_pEntity;
 	if(entity) {
 		switch(entity->m_type & 7) {
-		case ENTITY_TYPE_VEHICLE:
-			ProcessVehicle((CVehicle *)m_asAudioEntities[id].m_pEntity);
-			break;
-		case ENTITY_TYPE_PED:
-			ProcessPed((CPhysical *)m_asAudioEntities[id].m_pEntity);
-			break;
+		case ENTITY_TYPE_VEHICLE: ProcessVehicle((CVehicle *)m_asAudioEntities[id].m_pEntity); break;
+		case ENTITY_TYPE_PED: ProcessPed((CPhysical *)m_asAudioEntities[id].m_pEntity); break;
 		default: return;
 		}
 	}
@@ -7289,15 +6446,14 @@ cAudioManager::ProcessPlayersVehicleEngine(cVehicleParams *params, CAutomobile *
 		do {
 			if(automobile->m_aWheelState[i]) ++wheelInUseCounter;
 			++i;
-		} while(i < 4u);
-		if(wheelInUseCounter > 2u) lostTraction = 1;
+		} while(i < 4);
+		if(wheelInUseCounter > 2) lostTraction = 1;
 	} else if(transmission->nDriveType == 'F') {
 		if((automobile->m_aWheelState[0] || automobile->m_aWheelState[2]) &&
 		   (automobile->m_aWheelState[1] || automobile->m_aWheelState[3])) {
 			lostTraction = 1;
 		}
-	} else if(transmission->nDriveType == 'R' &&
-	          (automobile->m_aWheelState[1] || automobile->m_aWheelState[3])) {
+	} else if(transmission->nDriveType == 'R' && (automobile->m_aWheelState[1] || automobile->m_aWheelState[3])) {
 		lostTraction = 1;
 	}
 	if(0.0f != velocityChange) {
@@ -7319,13 +6475,11 @@ cAudioManager::ProcessPlayersVehicleEngine(cVehicleParams *params, CAutomobile *
 				SampleManager.StopChannel(m_bActiveSamples);
 				bAccelSampleStopped = 1;
 			}
-			if(!automobile->m_nWheelsOnGround || automobile->bIsHandbrakeOn ||
-			   lostTraction) {
+			if(!automobile->m_nWheelsOnGround || automobile->bIsHandbrakeOn || lostTraction) {
 				gasPedalAudio = automobile->m_fGasPedalAudio;
 			} else {
 				gasPedalAudio =
-				    min(1.0f, params->m_fVelocityChange /
-				                  params->m_pTransmission->fMaxReverseVelocity);
+				    min(1.0f, params->m_fVelocityChange / params->m_pTransmission->fMaxReverseVelocity);
 			}
 			gasPedalAudio = max(0.0f, gasPedalAudio);
 			automobile->m_fGasPedalAudio = gasPedalAudio;
@@ -7335,27 +6489,23 @@ cAudioManager::ProcessPlayersVehicleEngine(cVehicleParams *params, CAutomobile *
 				bAccelSampleStopped = 1;
 			}
 			nCruising = 0;
-			if(!automobile->m_nWheelsOnGround || automobile->bIsHandbrakeOn ||
-			   lostTraction ||
-			   params->m_fVelocityChange >= 0.01f &&
-			       automobile->m_fGasPedalAudio > 0.2f) {
+			if(!automobile->m_nWheelsOnGround || automobile->bIsHandbrakeOn || lostTraction ||
+			   params->m_fVelocityChange >= 0.01f && automobile->m_fGasPedalAudio > 0.2f) {
 				automobile->m_fGasPedalAudio = automobile->m_fGasPedalAudio * 0.6f;
 				gasPedalAudio = automobile->m_fGasPedalAudio;
 			}
 			if(gasPedalAudio > 0.05f) {
 				freq = (5000.f * (gasPedalAudio - 0.05f) * 20.f / 19) + 19000;
 				if(engineSoundType == 6) freq >>= 1;
-				AddPlayerCarSample(
-				    (25.f * (gasPedalAudio - 0.05f) * 20.f / 19) + 40, freq,
-				    (soundOffset + AUDIO_SAMPLE_VEHICLE_ENGINE_STOPPING_GENERIC),
-				    engineSoundType, 63u, 0);
+				AddPlayerCarSample((25.f * (gasPedalAudio - 0.05f) * 20.f / 19) + 40, freq,
+				                   (soundOffset + AUDIO_SAMPLE_VEHICLE_ENGINE_STOPPING_GENERIC),
+				                   engineSoundType, 63, 0);
 			}
 		}
 		freq = (10000.f * gasPedalAudio) + 22050;
 		if(engineSoundType == 6) freq >>= 1;
 		AddPlayerCarSample(110 - (40.f * gasPedalAudio), freq,
-		                   (engineSoundType + AUDIO_SAMPLE_VEHICLE_ENGINE_IDLE_NONE), 0,
-		                   52u, 1);
+		                   (engineSoundType + AUDIO_SAMPLE_VEHICLE_ENGINE_IDLE_NONE), 0, 52, 1);
 
 		CurrentPretendGear = max(1, currentGear);
 		LastAccel = accelerateState;
@@ -7365,19 +6515,15 @@ cAudioManager::ProcessPlayersVehicleEngine(cVehicleParams *params, CAutomobile *
 		return;
 	}
 	if(!nCruising) {
-		if(accelerateState < 150 || !automobile->m_nWheelsOnGround ||
-		   automobile->bIsHandbrakeOn || lostTraction ||
-		   currentGear < 2u &&
-		       velocityChange - automobile->m_fVelocityChangeForAudio >= 0.01f) {
-			if(!automobile->m_nWheelsOnGround || automobile->bIsHandbrakeOn ||
-			   lostTraction) {
-				if(!automobile->m_nWheelsOnGround &&
-				       automobile->m_nDriveWheelsOnGround ||
+		if(accelerateState < 150 || !automobile->m_nWheelsOnGround || automobile->bIsHandbrakeOn ||
+		   lostTraction ||
+		   currentGear < 2u && velocityChange - automobile->m_fVelocityChangeForAudio >= 0.01f) {
+			if(!automobile->m_nWheelsOnGround || automobile->bIsHandbrakeOn || lostTraction) {
+				if(!automobile->m_nWheelsOnGround && automobile->m_nDriveWheelsOnGround ||
 				   (automobile->bIsHandbrakeOn && !bHandbrakeOnLastFrame ||
 				    lostTraction && !bLostTractionLastFrame) &&
 				       automobile->m_nWheelsOnGround) {
-					automobile->m_fGasPedalAudio =
-					    automobile->m_fGasPedalAudio * 0.6f;
+					automobile->m_fGasPedalAudio = automobile->m_fGasPedalAudio * 0.6f;
 				}
 				freqModifier = 0;
 				baseFreq = (15000.f * automobile->m_fGasPedalAudio) + 14000;
@@ -7393,8 +6539,7 @@ cAudioManager::ProcessPlayersVehicleEngine(cVehicleParams *params, CAutomobile *
 				SampleManager.StopChannel(m_bActiveSamples);
 				bAccelSampleStopped = 1;
 			}
-			AddPlayerCarSample(
-			    vol, freq, (engineSoundType + AUDIO_SAMPLE_PAYPHONE_RINGING), 0, 2u, 1);
+			AddPlayerCarSample(vol, freq, (engineSoundType + AUDIO_SAMPLE_PAYPHONE_RINGING), 0, 2, 1);
 			LastAccel = accelerateState;
 
 			bHandbrakeOnLastFrame = automobile->bIsHandbrakeOn;
@@ -7412,7 +6557,7 @@ cAudioManager::ProcessPlayersVehicleEngine(cVehicleParams *params, CAutomobile *
 			bAccelSampleStopped = 0;
 		}
 		if(channelUsed) {
-			SampleManager.SetChannelEmittingVolume(m_bActiveSamples, 85u);
+			SampleManager.SetChannelEmittingVolume(m_bActiveSamples, 85);
 			SampleManager.SetChannel3DPosition(m_bActiveSamples, pos.x, pos.y, pos.z);
 			SampleManager.SetChannel3DDistances(m_bActiveSamples, 50.f, 12.5f);
 			if(engineSoundType == 6)
@@ -7421,8 +6566,8 @@ cAudioManager::ProcessPlayersVehicleEngine(cVehicleParams *params, CAutomobile *
 				freq = CSWTCH_554[CurrentPretendGear] + freqModifier + 22050;
 			SampleManager.SetChannelFrequency(m_bActiveSamples, freq);
 			if(!channelUsed) {
-				SampleManager.SetChannelReverbFlag(
-				    m_bActiveSamples, m_bDynamicAcousticModelingStatus != 0);
+				SampleManager.SetChannelReverbFlag(m_bActiveSamples,
+				                                   m_bDynamicAcousticModelingStatus != 0);
 				SampleManager.StartChannel(m_bActiveSamples);
 			}
 			LastAccel = accelerateState;
@@ -7432,11 +6577,10 @@ cAudioManager::ProcessPlayersVehicleEngine(cVehicleParams *params, CAutomobile *
 			return;
 		}
 		if(processedAccelSampleStopped) {
-			if(!SampleManager.InitialiseChannel(m_bActiveSamples, soundOffset + 345, 0))
-				return;
+			if(!SampleManager.InitialiseChannel(m_bActiveSamples, soundOffset + 345, 0)) return;
 			SampleManager.SetChannelLoopCount(m_bActiveSamples, 1);
 			SampleManager.SetChannelLoopPoints(m_bActiveSamples, 0, -1);
-			SampleManager.SetChannelEmittingVolume(m_bActiveSamples, 85u);
+			SampleManager.SetChannelEmittingVolume(m_bActiveSamples, 85);
 			SampleManager.SetChannel3DPosition(m_bActiveSamples, pos.x, pos.y, pos.z);
 			SampleManager.SetChannel3DDistances(m_bActiveSamples, 50.f, 12.5f);
 			if(engineSoundType == 6)
@@ -7445,8 +6589,8 @@ cAudioManager::ProcessPlayersVehicleEngine(cVehicleParams *params, CAutomobile *
 				freq = CSWTCH_554[CurrentPretendGear] + freqModifier + 22050;
 			SampleManager.SetChannelFrequency(m_bActiveSamples, freq);
 			if(!channelUsed) {
-				SampleManager.SetChannelReverbFlag(
-				    m_bActiveSamples, m_bDynamicAcousticModelingStatus != 0);
+				SampleManager.SetChannelReverbFlag(m_bActiveSamples,
+				                                   m_bDynamicAcousticModelingStatus != 0);
 				SampleManager.StartChannel(m_bActiveSamples);
 			}
 			LastAccel = accelerateState;
@@ -7457,11 +6601,10 @@ cAudioManager::ProcessPlayersVehicleEngine(cVehicleParams *params, CAutomobile *
 		}
 		if(CurrentPretendGear < params->m_pTransmission->nNumberOfGears - 1) {
 			++CurrentPretendGear;
-			if(!SampleManager.InitialiseChannel(m_bActiveSamples, soundOffset + 345, 0))
-				return;
+			if(!SampleManager.InitialiseChannel(m_bActiveSamples, soundOffset + 345, 0)) return;
 			SampleManager.SetChannelLoopCount(m_bActiveSamples, 1);
 			SampleManager.SetChannelLoopPoints(m_bActiveSamples, 0, -1);
-			SampleManager.SetChannelEmittingVolume(m_bActiveSamples, 85u);
+			SampleManager.SetChannelEmittingVolume(m_bActiveSamples, 85);
 			SampleManager.SetChannel3DPosition(m_bActiveSamples, pos.x, pos.y, pos.z);
 			SampleManager.SetChannel3DDistances(m_bActiveSamples, 50.f, 12.5f);
 			freq = CSWTCH_554[CurrentPretendGear] + freqModifier + 22050;
@@ -7470,8 +6613,8 @@ cAudioManager::ProcessPlayersVehicleEngine(cVehicleParams *params, CAutomobile *
 
 			SampleManager.SetChannelFrequency(m_bActiveSamples, freq);
 			if(!channelUsed) {
-				SampleManager.SetChannelReverbFlag(
-				    m_bActiveSamples, m_bDynamicAcousticModelingStatus != 0);
+				SampleManager.SetChannelReverbFlag(m_bActiveSamples,
+				                                   m_bDynamicAcousticModelingStatus != 0);
 				SampleManager.StartChannel(m_bActiveSamples);
 			}
 			LastAccel = accelerateState;
@@ -7483,8 +6626,8 @@ cAudioManager::ProcessPlayersVehicleEngine(cVehicleParams *params, CAutomobile *
 		nCruising = 1;
 	}
 	bAccelSampleStopped = 1;
-	if(accelerateState < 150 || !automobile->m_nWheelsOnGround || automobile->bIsHandbrakeOn ||
-	   lostTraction || currentGear < params->m_pTransmission->nNumberOfGears - 1) {
+	if(accelerateState < 150 || !automobile->m_nWheelsOnGround || automobile->bIsHandbrakeOn || lostTraction ||
+	   currentGear < params->m_pTransmission->nNumberOfGears - 1) {
 		nCruising = 0;
 	} else {
 		if(accelerateState >= 220 &&
@@ -7495,9 +6638,8 @@ cAudioManager::ProcessPlayersVehicleEngine(cVehicleParams *params, CAutomobile *
 		}
 		freq = 27 * nCruising + freqModifier + 22050;
 		if(engineSoundType == 6) freq >>= 1;
-		AddPlayerCarSample(85u, freq,
-		                   (soundOffset + AUDIO_SAMPLE_VEHICLE_ENGINE_CHANGE_GEAR_GENERIC),
-		                   engineSoundType, 64u, 1);
+		AddPlayerCarSample(85, freq, (soundOffset + AUDIO_SAMPLE_VEHICLE_ENGINE_CHANGE_GEAR_GENERIC),
+		                   engineSoundType, 64, 1);
 	}
 	LastAccel = accelerateState;
 
@@ -7535,19 +6677,16 @@ cAudioManager::ProcessPoliceCellBeatingScriptObject(uint8 sound)
 			if(m_nTimeOfRecentCrime & 1)
 				sampleIndex = (m_anRandomTable[1] & 3) + AUDIO_SAMPLE_PED_HIT_1;
 			else
-				sampleIndex =
-				    (m_anRandomTable[3] & 1) + AUDIO_SAMPLE_PED_HIT_BY_BAT;
+				sampleIndex = (m_anRandomTable[3] & 1) + AUDIO_SAMPLE_PED_HIT_BY_BAT;
 			m_sQueueSample.m_nSampleIndex = sampleIndex;
-			emittingVol = m_anRandomTable[0] % 50u + 55;
+			emittingVol = m_anRandomTable[0] % 50 + 55;
 			m_sQueueSample.m_bVolume =
-			    ComputeVolume(emittingVol, m_sQueueSample.m_fSoundIntensity,
-			                  m_sQueueSample.m_fDistance);
+			    ComputeVolume(emittingVol, m_sQueueSample.m_fSoundIntensity, m_sQueueSample.m_fDistance);
 			if(m_sQueueSample.m_bVolume) {
 				m_sQueueSample.m_bBankIndex = 0;
-				m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(
-				    m_sQueueSample.m_nSampleIndex);
-				m_sQueueSample.m_nFrequency +=
-				    RandomDisplacement(m_sQueueSample.m_nFrequency / 16);
+				m_sQueueSample.m_nFrequency =
+				    SampleManager.GetSampleBaseFrequency(m_sQueueSample.m_nSampleIndex);
+				m_sQueueSample.m_nFrequency += RandomDisplacement(m_sQueueSample.m_nFrequency / 16);
 				m_sQueueSample.m_counter = counter++;
 				m_sQueueSample.m_bIsDistant = 0;
 				m_sQueueSample.m_nLoopCount = 1;
@@ -7565,7 +6704,7 @@ cAudioManager::ProcessPoliceCellBeatingScriptObject(uint8 sound)
 				params.m_pPed = 0;
 				SetupPedComments(&params, SOUND_8A);
 			}
-			audioLogicTimers[7] = time + 500 + m_anRandomTable[3] % 1500u;
+			audioLogicTimers[7] = time + 500 + m_anRandomTable[3] % 1500;
 		}
 	}
 }
@@ -7632,11 +6771,10 @@ cAudioManager::ProcessPornCinema(uint8 sound)
 		m_sQueueSample.m_fDistance = sqrt(distSquared);
 		if(sound != SCRIPT_SOUND_MISTY_SEX_S && sound != SCRIPT_SOUND_MISTY_SEX_L) {
 			m_sQueueSample.m_bVolume =
-			    ComputeVolume(maxVolume, m_sQueueSample.m_fSoundIntensity,
-			                  m_sQueueSample.m_fDistance);
+			    ComputeVolume(maxVolume, m_sQueueSample.m_fSoundIntensity, m_sQueueSample.m_fDistance);
 			if(m_sQueueSample.m_bVolume) {
-				m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(
-				    m_sQueueSample.m_nSampleIndex);
+				m_sQueueSample.m_nFrequency =
+				    SampleManager.GetSampleBaseFrequency(m_sQueueSample.m_nSampleIndex);
 				m_sQueueSample.m_counter = 0;
 				m_sQueueSample.m_bIsDistant = 0;
 				m_sQueueSample.m_nLoopCount = 0;
@@ -7645,10 +6783,9 @@ cAudioManager::ProcessPornCinema(uint8 sound)
 				m_sQueueSample.field_48 = 2.0f;
 				m_sQueueSample.m_bEmittingVolume = maxVolume;
 				m_sQueueSample.m_nLoopStart =
-				    SampleManager.GetSampleLoopStartOffset(
-				        m_sQueueSample.m_nSampleIndex);
-				m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(
-				    m_sQueueSample.m_nSampleIndex);
+				    SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
+				m_sQueueSample.m_nLoopEnd =
+				    SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
 				m_sQueueSample.m_bReverbFlag = 1;
 				m_sQueueSample.m_bRequireReflection = 0;
 				AddSampleToRequestedQueue();
@@ -7657,15 +6794,14 @@ cAudioManager::ProcessPornCinema(uint8 sound)
 
 		time = CTimer::GetTimeInMilliseconds();
 		if(time > audioLogicTimers[0]) {
-			m_sQueueSample.m_bVolume = ComputeVolume(
-			    90u, m_sQueueSample.m_fSoundIntensity, m_sQueueSample.m_fDistance);
+			m_sQueueSample.m_bVolume =
+			    ComputeVolume(90, m_sQueueSample.m_fSoundIntensity, m_sQueueSample.m_fDistance);
 			if(m_sQueueSample.m_bVolume) {
 				rand = m_anRandomTable[1] & 1;
 				m_sQueueSample.m_nSampleIndex = rand + sample;
-				m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(
-				    m_sQueueSample.m_nSampleIndex);
-				m_sQueueSample.m_nFrequency +=
-				    RandomDisplacement(m_sQueueSample.m_nFrequency >> 4);
+				m_sQueueSample.m_nFrequency =
+				    SampleManager.GetSampleBaseFrequency(m_sQueueSample.m_nSampleIndex);
+				m_sQueueSample.m_nFrequency += RandomDisplacement(m_sQueueSample.m_nFrequency >> 4);
 				m_sQueueSample.m_counter = rand + 1;
 				m_sQueueSample.m_bIsDistant = 0;
 				m_sQueueSample.m_nLoopCount = 1;
@@ -7677,7 +6813,7 @@ cAudioManager::ProcessPornCinema(uint8 sound)
 				m_sQueueSample.m_bReverbFlag = 1;
 				m_sQueueSample.m_bRequireReflection = 0;
 				AddSampleToRequestedQueue();
-				audioLogicTimers[0] = time + 2000 + m_anRandomTable[3] % 6000u;
+				audioLogicTimers[0] = time + 2000 + m_anRandomTable[3] % 6000;
 			}
 		}
 	}
@@ -7698,8 +6834,8 @@ cAudioManager::ProcessProjectiles()
 				m_sQueueSample.m_fSoundIntensity = 90.0;
 				m_sQueueSample.m_nSampleIndex = 81;
 				m_sQueueSample.m_bBankIndex = 0;
-				m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(
-				    AUDIO_SAMPLE_WEAPON_ROCKET_PROCESS);
+				m_sQueueSample.m_nFrequency =
+				    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_WEAPON_ROCKET_PROCESS);
 				m_sQueueSample.field_16 = 3;
 				break;
 			case WEAPONTYPE_MOLOTOV:
@@ -7709,9 +6845,7 @@ cAudioManager::ProcessProjectiles()
 				m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_FIRE_PED;
 				m_sQueueSample.m_bBankIndex = 0;
 				m_sQueueSample.m_nFrequency =
-				    32 *
-				    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_FIRE_PED) /
-				    25;
+				    32 * SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_FIRE_PED) / 25;
 				m_sQueueSample.field_16 = 7;
 				break;
 			default: return;
@@ -7722,20 +6856,17 @@ cAudioManager::ProcessProjectiles()
 			float distSquared = GetDistanceSquared(&m_sQueueSample.m_vecPos);
 			if(distSquared < maxDist) {
 				m_sQueueSample.m_fDistance = Sqrt(distSquared);
-				m_sQueueSample.m_bVolume =
-				    ComputeVolume(emittingVol, m_sQueueSample.m_fSoundIntensity,
-				                  m_sQueueSample.m_fDistance);
+				m_sQueueSample.m_bVolume = ComputeVolume(emittingVol, m_sQueueSample.m_fSoundIntensity,
+				                                         m_sQueueSample.m_fDistance);
 				if(m_sQueueSample.m_bVolume) {
 					m_sQueueSample.m_counter = i;
 					m_sQueueSample.m_bIsDistant = 0;
 					m_sQueueSample.m_nLoopCount = 0;
 					m_sQueueSample.m_bEmittingVolume = emittingVol;
 					m_sQueueSample.m_nLoopStart =
-					    SampleManager.GetSampleLoopStartOffset(
-					        m_sQueueSample.m_nSampleIndex);
+					    SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
 					m_sQueueSample.m_nLoopEnd =
-					    SampleManager.GetSampleLoopEndOffset(
-					        m_sQueueSample.m_nSampleIndex);
+					    SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
 					m_sQueueSample.field_56 = 0;
 					m_sQueueSample.m_bReverbFlag = 1;
 					m_sQueueSample.m_bRequireReflection = 0;
@@ -7756,22 +6887,21 @@ cAudioManager::ProcessRainOnVehicle(cVehicleParams *params)
 	   (!CCullZones::CamNoRain() || !CCullZones::PlayerNoRain())) {
 		++params->m_pVehicle->m_bRainAudioCounter;
 		veh = params->m_pVehicle;
-		if(veh->m_bRainAudioCounter >= 2u) {
+		if(veh->m_bRainAudioCounter >= 2) {
 			veh->m_bRainAudioCounter = 0;
 			CalculateDistance((bool *)params, params->m_fDistance);
 			emittingVol = 30.f * CWeather::Rain;
-			m_sQueueSample.m_bVolume =
-			    ComputeVolume(emittingVol, 22.f, m_sQueueSample.m_fDistance);
+			m_sQueueSample.m_bVolume = ComputeVolume(emittingVol, 22.f, m_sQueueSample.m_fDistance);
 			if(m_sQueueSample.m_bVolume) {
 				m_sQueueSample.m_counter = veh->m_bRainSamplesCounter++;
 				veh = params->m_pVehicle;
-				if(veh->m_bRainSamplesCounter > 4u) veh->m_bRainSamplesCounter = 68;
+				if(veh->m_bRainSamplesCounter > 4) veh->m_bRainSamplesCounter = 68;
 				m_sQueueSample.m_nSampleIndex =
 				    (m_anRandomTable[1] & 3) + AUDIO_SAMPLE_RAIN_ON_VEHICLE_1;
 				m_sQueueSample.m_bBankIndex = 0;
 				m_sQueueSample.m_bIsDistant = 0;
 				m_sQueueSample.field_16 = 9;
-				m_sQueueSample.m_nFrequency = m_anRandomTable[1] % 4000u + 28000;
+				m_sQueueSample.m_nFrequency = m_anRandomTable[1] % 4000 + 28000;
 				m_sQueueSample.m_nLoopCount = 1;
 				m_sQueueSample.m_bEmittingVolume = (uint8)emittingVol;
 				m_sQueueSample.m_nLoopStart = 0;
@@ -7792,8 +6922,7 @@ cAudioManager::ProcessReverb() const
 {
 	if(SampleManager.UpdateReverb() && m_bDynamicAcousticModelingStatus) {
 		for(uint32 i = 0; i < 28; i++) {
-			if(m_asActiveSamples[i].m_bReverbFlag)
-				SampleManager.SetChannelReverbFlag(i, 1);
+			if(m_asActiveSamples[i].m_bReverbFlag) SampleManager.SetChannelReverbFlag(i, 1);
 		}
 	}
 }
@@ -7812,8 +6941,7 @@ cAudioManager::ProcessReverseGear(cVehicleParams *params)
 		CalculateDistance((bool *)params, params->m_fDistance);
 		automobile = (CAutomobile *)params->m_pVehicle;
 		if(automobile->m_nWheelsOnGround) {
-			modificator = params->m_fVelocityChange /
-			              params->m_pTransmission->fMaxReverseVelocity;
+			modificator = params->m_fVelocityChange / params->m_pTransmission->fMaxReverseVelocity;
 		} else {
 			if(automobile->m_nDriveWheelsOnGround)
 				automobile->m_fGasPedalAudio = automobile->m_fGasPedalAudio * 0.4f;
@@ -7821,16 +6949,14 @@ cAudioManager::ProcessReverseGear(cVehicleParams *params)
 		}
 		modificator = Abs(modificator);
 		emittingVol = (24.f * modificator);
-		m_sQueueSample.m_bVolume =
-		    ComputeVolume(emittingVol, 30.f, m_sQueueSample.m_fDistance);
+		m_sQueueSample.m_bVolume = ComputeVolume(emittingVol, 30.f, m_sQueueSample.m_fDistance);
 		if(m_sQueueSample.m_bVolume) {
 			if(params->m_pVehicle->m_fGasPedal >= 0.0f) {
 				m_sQueueSample.m_counter = 62;
 				m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_REVERSE_GEAR_CONSTANT;
 			} else {
 				m_sQueueSample.m_counter = 61;
-				m_sQueueSample.m_nSampleIndex =
-				    AUDIO_SAMPLE_REVERSE_GEAR_ACCELERATING;
+				m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_REVERSE_GEAR_ACCELERATING;
 			}
 			m_sQueueSample.m_bBankIndex = 0;
 			m_sQueueSample.m_bIsDistant = 0;
@@ -7840,8 +6966,7 @@ cAudioManager::ProcessReverseGear(cVehicleParams *params)
 			m_sQueueSample.m_bEmittingVolume = emittingVol;
 			m_sQueueSample.m_nLoopStart =
 			    SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
-			m_sQueueSample.m_nLoopEnd =
-			    SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
+			m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
 			m_sQueueSample.field_48 = 3.0f;
 			m_sQueueSample.m_fSoundIntensity = 30.0f;
 			m_sQueueSample.field_56 = 0;
@@ -7872,13 +6997,12 @@ cAudioManager::ProcessSawMillScriptObject(uint8 sound)
 	distSquared = GetDistanceSquared(&m_sQueueSample.m_vecPos);
 	if(distSquared < maxDist) {
 		m_sQueueSample.m_fDistance = sqrt(distSquared);
-		m_sQueueSample.m_bVolume = ComputeVolume(30u, m_sQueueSample.m_fSoundIntensity,
-		                                         m_sQueueSample.m_fDistance);
+		m_sQueueSample.m_bVolume =
+		    ComputeVolume(30, m_sQueueSample.m_fSoundIntensity, m_sQueueSample.m_fDistance);
 		if(m_sQueueSample.m_bVolume) {
 			m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_SAWMILL_1;
 			m_sQueueSample.m_bBankIndex = 0;
-			m_sQueueSample.m_nFrequency =
-			    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_SAWMILL_1);
+			m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_SAWMILL_1);
 			m_sQueueSample.m_counter = 0;
 			m_sQueueSample.m_bIsDistant = 0;
 			m_sQueueSample.m_nLoopCount = 0;
@@ -7888,21 +7012,20 @@ cAudioManager::ProcessSawMillScriptObject(uint8 sound)
 			m_sQueueSample.m_bEmittingVolume = 30;
 			m_sQueueSample.m_nLoopStart =
 			    SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
-			m_sQueueSample.m_nLoopEnd =
-			    SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
+			m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
 			m_sQueueSample.m_bReverbFlag = 1;
 			m_sQueueSample.m_bRequireReflection = 0;
 			AddSampleToRequestedQueue();
 		}
 		time = CTimer::GetTimeInMilliseconds();
 		if(time > audioLogicTimers[1]) {
-			m_sQueueSample.m_bVolume = ComputeVolume(
-			    70u, m_sQueueSample.m_fSoundIntensity, m_sQueueSample.m_fDistance);
+			m_sQueueSample.m_bVolume =
+			    ComputeVolume(70, m_sQueueSample.m_fSoundIntensity, m_sQueueSample.m_fDistance);
 			if(m_sQueueSample.m_bVolume) {
 				m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_SAWMILL_2;
 				m_sQueueSample.m_bBankIndex = 0;
-				m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(
-				    m_sQueueSample.m_nSampleIndex);
+				m_sQueueSample.m_nFrequency =
+				    SampleManager.GetSampleBaseFrequency(m_sQueueSample.m_nSampleIndex);
 				m_sQueueSample.m_counter = 1;
 				m_sQueueSample.m_bIsDistant = 0;
 				m_sQueueSample.m_nLoopCount = 1;
@@ -7914,7 +7037,7 @@ cAudioManager::ProcessSawMillScriptObject(uint8 sound)
 				m_sQueueSample.m_bReverbFlag = 1;
 				m_sQueueSample.m_bRequireReflection = 0;
 				AddSampleToRequestedQueue();
-				audioLogicTimers[1] = time + 2000 + m_anRandomTable[3] % 4000u;
+				audioLogicTimers[1] = time + 2000 + m_anRandomTable[3] % 4000;
 			}
 		}
 	}
@@ -7952,13 +7075,12 @@ cAudioManager::ProcessShopScriptObject(uint8 sound)
 	distSquared = GetDistanceSquared(&m_sQueueSample.m_vecPos);
 	if(distSquared < maxDist) {
 		m_sQueueSample.m_fDistance = sqrt(distSquared);
-		m_sQueueSample.m_bVolume = ComputeVolume(30u, m_sQueueSample.m_fSoundIntensity,
-		                                         m_sQueueSample.m_fDistance);
+		m_sQueueSample.m_bVolume =
+		    ComputeVolume(30, m_sQueueSample.m_fSoundIntensity, m_sQueueSample.m_fDistance);
 		if(m_sQueueSample.m_bVolume) {
 			m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_SHOP_1;
 			m_sQueueSample.m_bBankIndex = 0;
-			m_sQueueSample.m_nFrequency =
-			    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_SHOP_1);
+			m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_SHOP_1);
 			m_sQueueSample.m_counter = 0;
 			m_sQueueSample.m_bIsDistant = 0;
 			m_sQueueSample.m_nLoopCount = 0;
@@ -7968,22 +7090,21 @@ cAudioManager::ProcessShopScriptObject(uint8 sound)
 			m_sQueueSample.m_bEmittingVolume = 30;
 			m_sQueueSample.m_nLoopStart =
 			    SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
-			m_sQueueSample.m_nLoopEnd =
-			    SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
+			m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
 			m_sQueueSample.m_bReverbFlag = 1;
 			m_sQueueSample.m_bRequireReflection = 0;
 			AddSampleToRequestedQueue();
 		}
 		time = CTimer::GetTimeInMilliseconds();
 		if(time > audioLogicTimers[2]) {
-			m_sQueueSample.m_bVolume = ComputeVolume(
-			    70u, m_sQueueSample.m_fSoundIntensity, m_sQueueSample.m_fDistance);
+			m_sQueueSample.m_bVolume =
+			    ComputeVolume(70, m_sQueueSample.m_fSoundIntensity, m_sQueueSample.m_fDistance);
 			if(m_sQueueSample.m_bVolume) {
 				rand = m_anRandomTable[1] & 1;
 				m_sQueueSample.m_nSampleIndex = rand + AUDIO_SAMPLE_SHOP_2;
 				m_sQueueSample.m_bBankIndex = 0;
-				m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(
-				    m_sQueueSample.m_nSampleIndex);
+				m_sQueueSample.m_nFrequency =
+				    SampleManager.GetSampleBaseFrequency(m_sQueueSample.m_nSampleIndex);
 				m_sQueueSample.m_counter = rand + 1;
 				m_sQueueSample.m_bIsDistant = 0;
 				m_sQueueSample.m_nLoopCount = 1;
@@ -7996,7 +7117,7 @@ cAudioManager::ProcessShopScriptObject(uint8 sound)
 				m_sQueueSample.m_bReverbFlag = 1;
 				m_sQueueSample.m_bRequireReflection = 0;
 				AddSampleToRequestedQueue();
-				audioLogicTimers[2] = time + 3000 + m_anRandomTable[3] % 7000u;
+				audioLogicTimers[2] = time + 3000 + m_anRandomTable[3] % 7000;
 			}
 		}
 	}
@@ -8014,13 +7135,12 @@ cAudioManager::ProcessSpecial()
 	} else {
 		if(m_bPreviousUserPause) {
 			MusicManager.StopFrontEndTrack();
-			MusicManager.ChangeMusicMode(1u);
+			MusicManager.ChangeMusicMode(1);
 		}
 		CPlayerPed *playerPed = FindPlayerPed();
 		if(playerPed) {
 			const PedState &state = playerPed->m_nPedState;
-			if(state != PED_ENTER_CAR && state != PED_STEAL_CAR &&
-			   !playerPed->bInVehicle)
+			if(state != PED_ENTER_CAR && state != PED_STEAL_CAR && !playerPed->bInVehicle)
 				SampleManager.StopChannel(m_bActiveSamples);
 		}
 	}
@@ -8041,8 +7161,7 @@ cAudioManager::ProcessTrainNoise(cVehicleParams *params)
 		speedMultipler = min(1.0f, train->m_fSpeed * 250.f / 51.f);
 		emittingVol = (75.f * speedMultipler);
 		if(train->m_fWagonPosition == 0.0f) {
-			m_sQueueSample.m_bVolume =
-			    ComputeVolume(emittingVol, 300.f, m_sQueueSample.m_fDistance);
+			m_sQueueSample.m_bVolume = ComputeVolume(emittingVol, 300.f, m_sQueueSample.m_fDistance);
 			if(m_sQueueSample.m_bVolume) {
 				m_sQueueSample.m_counter = 32;
 				m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_TRAIN_FAR;
@@ -8054,10 +7173,9 @@ cAudioManager::ProcessTrainNoise(cVehicleParams *params)
 				m_sQueueSample.m_nLoopCount = 0;
 				m_sQueueSample.m_bEmittingVolume = emittingVol;
 				m_sQueueSample.m_nLoopStart =
-				    SampleManager.GetSampleLoopStartOffset(
-				        m_sQueueSample.m_nSampleIndex);
-				m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(
-				    m_sQueueSample.m_nSampleIndex);
+				    SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
+				m_sQueueSample.m_nLoopEnd =
+				    SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
 				m_sQueueSample.field_48 = 3.0f;
 				m_sQueueSample.m_fSoundIntensity = 300.0f;
 				m_sQueueSample.field_56 = 0;
@@ -8068,8 +7186,7 @@ cAudioManager::ProcessTrainNoise(cVehicleParams *params)
 			}
 		}
 		if(params->m_fDistance < 4900.f) {
-			m_sQueueSample.m_bVolume =
-			    ComputeVolume(emittingVol, 70.f, m_sQueueSample.m_fDistance);
+			m_sQueueSample.m_bVolume = ComputeVolume(emittingVol, 70.f, m_sQueueSample.m_fDistance);
 			if(m_sQueueSample.m_bVolume) {
 				m_sQueueSample.m_counter = 33;
 				m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_TRAIN_CLOSE;
@@ -8117,11 +7234,10 @@ cAudioManager::ProcessVehicle(CVehicle *veh)
 	if(params.m_pVehicle->m_status == STATUS_SIMPLE)
 		velChange = params.m_pVehicle->AutoPilot.m_fMaxTrafficSpeed * 0.02f;
 	else
-		velChange =
-		    DotProduct(params.m_pVehicle->m_vecMoveSpeed, params.m_pVehicle->GetForward());
+		velChange = DotProduct(params.m_pVehicle->m_vecMoveSpeed, params.m_pVehicle->GetForward());
 	params.m_fVelocityChange = velChange;
 	switch(params.m_pVehicle->m_vehType) {
-	case VEHICLE_TYPE_AUTOMOBILE:
+	case VEHICLE_TYPE_CAR:
 		UpdateGasPedalAudio((CAutomobile *)veh);
 		if(params.m_nIndex == RCBANDIT) {
 			ProcessModelCarEngine(&params);
@@ -8133,8 +7249,7 @@ cAudioManager::ProcessVehicle(CVehicle *veh)
 		if(params.m_nIndex == DODO) {
 			if(!ProcessVehicleRoadNoise(&params)) {
 				ProcessVehicleOneShots(&params);
-				((CAutomobile *)veh)->m_fVelocityChangeForAudio =
-				    params.m_fVelocityChange;
+				((CAutomobile *)veh)->m_fVelocityChangeForAudio = params.m_fVelocityChange;
 				ProcessRainOnVehicle(&params);
 				break;
 			}
@@ -8143,8 +7258,7 @@ cAudioManager::ProcessVehicle(CVehicle *veh)
 		} else {
 			if(!ProcessVehicleRoadNoise(&params)) {
 				ProcessVehicleOneShots(&params);
-				((CAutomobile *)veh)->m_fVelocityChangeForAudio =
-				    params.m_fVelocityChange;
+				((CAutomobile *)veh)->m_fVelocityChangeForAudio = params.m_fVelocityChange;
 				ProcessRainOnVehicle(&params);
 				break;
 			}
@@ -8153,8 +7267,7 @@ cAudioManager::ProcessVehicle(CVehicle *veh)
 			ProcessVehicleSkidding(&params);
 			ProcessVehicleHorn(&params);
 			ProcessVehicleSirenOrAlarm(&params);
-			if(UsesReverseWarning(params.m_nIndex))
-				ProcessVehicleReverseWarning(&params);
+			if(UsesReverseWarning(params.m_nIndex)) ProcessVehicleReverseWarning(&params);
 			if(HasAirBrakes(params.m_nIndex)) ProcessAirBrakes(&params);
 		}
 		ProcessCarBombTick(&params);
@@ -8209,17 +7322,15 @@ cAudioManager::ProcessVehicleDoors(cVehicleParams *params)
 				velocity = min(0.3f, Abs(automobile->Doors[i].m_fAngVel));
 				if(velocity > 0.0035f) {
 					emittingVol = (100.f * velocity * 10.f / 3.f);
-					m_sQueueSample.m_bVolume = ComputeVolume(
-					    emittingVol, 40.f, m_sQueueSample.m_fDistance);
+					m_sQueueSample.m_bVolume =
+					    ComputeVolume(emittingVol, 40.f, m_sQueueSample.m_fDistance);
 					if(m_sQueueSample.m_bVolume) {
 						m_sQueueSample.m_counter = i + 6;
 						m_sQueueSample.m_nSampleIndex =
-						    m_anRandomTable[1] % 6u +
-						    AUDIO_SAMPLE_CAR_DOOR_MOVEMENT_1;
-						m_sQueueSample.m_nFrequency =
-						    SampleManager.GetSampleBaseFrequency(
-						        m_sQueueSample.m_nSampleIndex) +
-						    RandomDisplacement(1000u);
+						    m_anRandomTable[1] % 6 + AUDIO_SAMPLE_CAR_DOOR_MOVEMENT_1;
+						m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(
+						                                  m_sQueueSample.m_nSampleIndex) +
+						                              RandomDisplacement(1000);
 						m_sQueueSample.m_bBankIndex = 0;
 						m_sQueueSample.m_bIsDistant = 0;
 						m_sQueueSample.field_16 = 10;
@@ -8260,8 +7371,7 @@ cAudioManager::ProcessVehicleHorn(cVehicleParams *params)
 			if(automobile->m_nCarHornTimer) {
 				if(!params->m_pVehicle->m_status) {
 					CalculateDistance((bool *)params, params->m_fDistance);
-					m_sQueueSample.m_bVolume =
-					    ComputeVolume(80, 40.f, m_sQueueSample.m_fDistance);
+					m_sQueueSample.m_bVolume = ComputeVolume(80, 40.f, m_sQueueSample.m_fDistance);
 					if(m_sQueueSample.m_bVolume) {
 						m_sQueueSample.m_counter = 4;
 						m_sQueueSample.m_nSampleIndex =
@@ -8273,12 +7383,10 @@ cAudioManager::ProcessVehicleHorn(cVehicleParams *params)
 						    CarSounds[params->m_nIndex].m_nHornFrequency;
 						m_sQueueSample.m_nLoopCount = 0;
 						m_sQueueSample.m_bEmittingVolume = 80;
-						m_sQueueSample.m_nLoopStart =
-						    SampleManager.GetSampleLoopStartOffset(
-						        m_sQueueSample.m_nSampleIndex);
+						m_sQueueSample.m_nLoopStart = SampleManager.GetSampleLoopStartOffset(
+						    m_sQueueSample.m_nSampleIndex);
 						m_sQueueSample.m_nLoopEnd =
-						    SampleManager.GetSampleLoopEndOffset(
-						        m_sQueueSample.m_nSampleIndex);
+						    SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
 						m_sQueueSample.field_48 = 5.0;
 						m_sQueueSample.m_fSoundIntensity = 40.0;
 						m_sQueueSample.field_56 = 0;
@@ -8289,18 +7397,13 @@ cAudioManager::ProcessVehicleHorn(cVehicleParams *params)
 					}
 					return;
 				}
-				if(automobile->m_nCarHornTimer > 44)
-					automobile->m_nCarHornTimer = 44;
+				if(automobile->m_nCarHornTimer > 44) automobile->m_nCarHornTimer = 44;
 				if(automobile->m_nCarHornTimer == 44)
 					automobile->field_22D =
-					    (LOBYTE(m_nTimeOfRecentCrime) +
-					     LOBYTE(m_sQueueSample.m_nEntityIndex)) &
-					    7;
-				if(somethingWithHorns[44 * automobile->field_22D + 44 -
-				                      automobile->m_nCarHornTimer]) {
+					    (LOBYTE(m_nTimeOfRecentCrime) + LOBYTE(m_sQueueSample.m_nEntityIndex)) & 7;
+				if(hornPatternsArray[automobile->field_22D][44 - automobile->m_nCarHornTimer]) {
 					CalculateDistance((bool *)params, params->m_fDistance);
-					m_sQueueSample.m_bVolume =
-					    ComputeVolume(80, 40.f, m_sQueueSample.m_fDistance);
+					m_sQueueSample.m_bVolume = ComputeVolume(80, 40.f, m_sQueueSample.m_fDistance);
 					if(m_sQueueSample.m_bVolume) {
 						m_sQueueSample.m_counter = 4;
 						m_sQueueSample.m_nSampleIndex =
@@ -8312,12 +7415,10 @@ cAudioManager::ProcessVehicleHorn(cVehicleParams *params)
 						    CarSounds[params->m_nIndex].m_nHornFrequency;
 						m_sQueueSample.m_nLoopCount = 0;
 						m_sQueueSample.m_bEmittingVolume = 80;
-						m_sQueueSample.m_nLoopStart =
-						    SampleManager.GetSampleLoopStartOffset(
-						        m_sQueueSample.m_nSampleIndex);
+						m_sQueueSample.m_nLoopStart = SampleManager.GetSampleLoopStartOffset(
+						    m_sQueueSample.m_nSampleIndex);
 						m_sQueueSample.m_nLoopEnd =
-						    SampleManager.GetSampleLoopEndOffset(
-						        m_sQueueSample.m_nSampleIndex);
+						    SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
 						m_sQueueSample.field_48 = 5.0;
 						m_sQueueSample.m_fSoundIntensity = 40.0;
 						m_sQueueSample.field_56 = 0;
@@ -8348,7 +7449,7 @@ cAudioManager::ProcessVehicleReverseWarning(cVehicleParams *params)
 
 	if(veh->bEngineOn && veh->m_fGasPedal < 0.0f) {
 		CalculateDistance((bool *)params, params->m_fDistance);
-		m_sQueueSample.m_bVolume = ComputeVolume(60u, 50.f, m_sQueueSample.m_fDistance);
+		m_sQueueSample.m_bVolume = ComputeVolume(60, 50.f, m_sQueueSample.m_fDistance);
 		if(m_sQueueSample.m_bVolume) {
 			m_sQueueSample.m_counter = 12;
 			m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_VEHICLE_REVERSE_WARNING;
@@ -8357,14 +7458,12 @@ cAudioManager::ProcessVehicleReverseWarning(cVehicleParams *params)
 			m_sQueueSample.field_16 = 2;
 			m_sQueueSample.m_nFrequency =
 			    (100 * m_sQueueSample.m_nEntityIndex & 1023) +
-			    SampleManager.GetSampleBaseFrequency(
-			        AUDIO_SAMPLE_VEHICLE_REVERSE_WARNING);
+			    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_VEHICLE_REVERSE_WARNING);
 			m_sQueueSample.m_nLoopCount = 0;
 			m_sQueueSample.m_bEmittingVolume = 60;
 			m_sQueueSample.m_nLoopStart =
 			    SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
-			m_sQueueSample.m_nLoopEnd =
-			    SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
+			m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
 			m_sQueueSample.field_48 = 3.0f;
 			m_sQueueSample.m_fSoundIntensity = 50.0f;
 			m_sQueueSample.field_56 = 0;
@@ -8393,40 +7492,30 @@ cAudioManager::ProcessVehicleRoadNoise(cVehicleParams *params)
 			if(velocity > 0.0f) {
 				CalculateDistance((bool *)params, params->m_fDistance);
 				emittingVol =
-				    30.f *
-				    min(1.f,
-				        velocity / (0.5f * params->m_pTransmission->fMaxVelocity));
-				m_sQueueSample.m_bVolume =
-				    ComputeVolume(emittingVol, 95.f, m_sQueueSample.m_fDistance);
+				    30.f * min(1.f, velocity / (0.5f * params->m_pTransmission->fMaxVelocity));
+				m_sQueueSample.m_bVolume = ComputeVolume(emittingVol, 95.f, m_sQueueSample.m_fDistance);
 				if(m_sQueueSample.m_bVolume) {
 					m_sQueueSample.m_counter = 0;
 					m_sQueueSample.m_bBankIndex = 0;
 					m_sQueueSample.m_bIsDistant = 0;
 					m_sQueueSample.field_16 = 3;
-					if(params->m_pVehicle->m_nSurfaceTouched ==
-					   SURFACE_PUDDLE) {
-						m_sQueueSample.m_nSampleIndex =
-						    AUDIO_SAMPLE_LOOPING_WATER;
+					if(params->m_pVehicle->m_nSurfaceTouched == SURFACE_PUDDLE) {
+						m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_LOOPING_WATER;
 						freq = 6050 * emittingVol / 30 + 16000;
 					} else {
-						m_sQueueSample.m_nSampleIndex =
-						    AUDIO_SAMPLE_VEHICLE_ROAD_NOISE;
-						modificator =
-						    m_sQueueSample.m_fDistance * 1.f / 95.f * 0.5f;
+						m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_VEHICLE_ROAD_NOISE;
+						modificator = m_sQueueSample.m_fDistance * 1.f / 95.f * 0.5f;
 						sampleFreq = SampleManager.GetSampleBaseFrequency(
 						    AUDIO_SAMPLE_VEHICLE_ROAD_NOISE);
-						freq = (sampleFreq * modificator) +
-						       ((3 * sampleFreq) >> 2);
+						freq = (sampleFreq * modificator) + ((3 * sampleFreq) >> 2);
 					}
 					m_sQueueSample.m_nFrequency = freq;
 					m_sQueueSample.m_nLoopCount = 0;
 					m_sQueueSample.m_bEmittingVolume = emittingVol;
 					m_sQueueSample.m_nLoopStart =
-					    SampleManager.GetSampleLoopStartOffset(
-					        m_sQueueSample.m_nSampleIndex);
+					    SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
 					m_sQueueSample.m_nLoopEnd =
-					    SampleManager.GetSampleLoopEndOffset(
-					        m_sQueueSample.m_nSampleIndex);
+					    SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
 					m_sQueueSample.field_48 = 6.0f;
 					m_sQueueSample.m_fSoundIntensity = 95.0f;
 					m_sQueueSample.field_56 = 0;
@@ -8462,12 +7551,12 @@ cAudioManager::ProcessVehicleSkidding(cVehicleParams *params)
 	if(!automobile->m_nWheelsOnGround) return;
 	CalculateDistance((bool *)params, params->m_fDistance);
 	for(int32 i = 0; i < 4; i++) {
-		if(!automobile->m_aWheelState[i] || automobile->Damage.GetWheelStatus(i) == 2)
+		if(!automobile->m_aWheelState[i] || automobile->Damage.GetWheelStatus(i) == WHEEL_STATUS_MISSING)
 			continue;
 		transmission = params->m_pTransmission;
 		if(transmission->nDriveType == '4') {
-			newSkidVal = GetVehicleDriveWheelSkidValue(i, automobile, transmission,
-			                                           params->m_fVelocityChange);
+			newSkidVal =
+			    GetVehicleDriveWheelSkidValue(i, automobile, transmission, params->m_fVelocityChange);
 			if(newSkidVal > skidVal) skidVal = newSkidVal;
 			continue;
 		}
@@ -8477,41 +7566,37 @@ cAudioManager::ProcessVehicleSkidding(cVehicleParams *params)
 				continue;
 			}
 			if(i != 1 && i != 3) {
-				newSkidVal = GetVehicleNonDriveWheelSkidValue(
-				    i, automobile, transmission, params->m_fVelocityChange);
+				newSkidVal = GetVehicleNonDriveWheelSkidValue(i, automobile, transmission,
+				                                              params->m_fVelocityChange);
 				if(newSkidVal > skidVal) skidVal = newSkidVal;
 				continue;
 			}
-			newSkidVal = GetVehicleDriveWheelSkidValue(i, automobile, transmission,
-			                                           params->m_fVelocityChange);
+			newSkidVal =
+			    GetVehicleDriveWheelSkidValue(i, automobile, transmission, params->m_fVelocityChange);
 			if(newSkidVal > skidVal) skidVal = newSkidVal;
 			continue;
 		}
-		if(!i || i == 2) {
-			newSkidVal = GetVehicleDriveWheelSkidValue(i, automobile, transmission,
-			                                           params->m_fVelocityChange);
+		if(i == 0 || i == 2) {
+			newSkidVal =
+			    GetVehicleDriveWheelSkidValue(i, automobile, transmission, params->m_fVelocityChange);
 			if(newSkidVal > skidVal) skidVal = newSkidVal;
 			continue;
 		}
-		newSkidVal = GetVehicleNonDriveWheelSkidValue(i, automobile, transmission,
-		                                              params->m_fVelocityChange);
+		newSkidVal = GetVehicleNonDriveWheelSkidValue(i, automobile, transmission, params->m_fVelocityChange);
 		if(newSkidVal > skidVal) skidVal = newSkidVal;
 	}
 
 	if(skidVal > 0.0f) {
 		emittingVol = 50.f * skidVal;
-		m_sQueueSample.m_bVolume =
-		    ComputeVolume(emittingVol, 40.f, m_sQueueSample.m_fDistance);
+		m_sQueueSample.m_bVolume = ComputeVolume(emittingVol, 40.f, m_sQueueSample.m_fDistance);
 		if(m_sQueueSample.m_bVolume) {
 			m_sQueueSample.m_counter = 3;
 			switch(params->m_pVehicle->m_nSurfaceTouched) {
 			case SURFACE_GRASS:
 			case SURFACE_HEDGE:
-				m_sQueueSample.m_nSampleIndex =
-				    AUDIO_SAMPLE_COLLISION_LOOPING_GRASS;
+				m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_COLLISION_LOOPING_GRASS;
 				emittingVol /= 4;
-				m_sQueueSample.m_nFrequency =
-				    (signed __int64)(13000.f * skidVal + 35000.f);
+				m_sQueueSample.m_nFrequency = (signed __int64)(13000.f * skidVal + 35000.f);
 				m_sQueueSample.m_bVolume /= 4;
 				break;
 			case SURFACE_DIRT:
@@ -8535,8 +7620,7 @@ cAudioManager::ProcessVehicleSkidding(cVehicleParams *params)
 			m_sQueueSample.m_bEmittingVolume = emittingVol;
 			m_sQueueSample.m_nLoopStart =
 			    SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
-			m_sQueueSample.m_nLoopEnd =
-			    SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
+			m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
 			m_sQueueSample.field_48 = 3.0;
 			m_sQueueSample.m_fSoundIntensity = 40.0;
 			m_sQueueSample.field_56 = 0;
@@ -8550,19 +7634,17 @@ cAudioManager::ProcessVehicleSkidding(cVehicleParams *params)
 
 void cAudioManager::ProcessWaterCannon(int32)
 {
-	for(int32 i = 0; i < 3u; i++) {
+	for(int32 i = 0; i < 3; i++) {
 		if(aCannons[i].m_nId) {
 			m_sQueueSample.m_vecPos = aCannons[0].m_avecPos[aCannons[i].m_wIndex];
 			float distSquared = GetDistanceSquared(&m_sQueueSample.m_vecPos);
 			if(distSquared < 900.f) {
 				m_sQueueSample.m_fDistance = Sqrt(distSquared);
 				m_sQueueSample.m_bVolume =
-				    ComputeVolume(50, m_sQueueSample.m_fSoundIntensity,
-				                  m_sQueueSample.m_fDistance);
+				    ComputeVolume(50, m_sQueueSample.m_fSoundIntensity, m_sQueueSample.m_fDistance);
 				if(m_sQueueSample.m_bVolume) {
 					m_sQueueSample.m_fSoundIntensity = 900.0f;
-					m_sQueueSample.m_nSampleIndex =
-					    AUDIO_SAMPLE_JUMBO_TAXI_SOUND;
+					m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_JUMBO_TAXI_SOUND;
 					m_sQueueSample.m_bBankIndex = 0;
 					m_sQueueSample.m_nFrequency = 15591;
 					m_sQueueSample.field_16 = 5;
@@ -8574,11 +7656,9 @@ void cAudioManager::ProcessWaterCannon(int32)
 					m_sQueueSample.field_56 = 0;
 					m_sQueueSample.m_bEmittingVolume = 50;
 					m_sQueueSample.m_nLoopStart =
-					    SampleManager.GetSampleLoopStartOffset(
-					        m_sQueueSample.m_nSampleIndex);
+					    SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
 					m_sQueueSample.m_nLoopEnd =
-					    SampleManager.GetSampleLoopEndOffset(
-					        m_sQueueSample.m_nSampleIndex);
+					    SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
 					m_sQueueSample.m_bReverbFlag = 1;
 					m_sQueueSample.m_bRequireReflection = 0;
 					AddSampleToRequestedQueue();
@@ -8594,17 +7674,16 @@ cAudioManager::ProcessWeather(int32 id)
 	uint8 vol;
 	static uint8 counter = 0;
 
-	if(m_asAudioEntities[id].m_Loops &&
-	   m_asAudioEntities[id].m_awAudioEvent[0] == SOUND_LIGHTNING) {
+	if(m_asAudioEntities[id].m_Loops && m_asAudioEntities[id].m_awAudioEvent[0] == SOUND_LIGHTNING) {
 		if(m_asAudioEntities[id].m_afVolume[0] >= 10.f) {
 			m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_EXPLOSION_CAR;
 			m_sQueueSample.m_bBankIndex = 0;
-			m_sQueueSample.m_nFrequency = RandomDisplacement(500u) + 4000;
+			m_sQueueSample.m_nFrequency = RandomDisplacement(500) + 4000;
 			vol = (m_asAudioEntities[id].m_afVolume[0] - 10.f) + 40;
 		} else {
 			m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_WEAPON_GRENADE_EXPLOSION;
 			m_sQueueSample.m_bBankIndex = 0;
-			m_sQueueSample.m_nFrequency = RandomDisplacement(500u) + 4000;
+			m_sQueueSample.m_nFrequency = RandomDisplacement(500) + 4000;
 			vol = (m_asAudioEntities[id].m_afVolume[0]) + 35;
 		}
 		m_sQueueSample.m_bVolume = vol;
@@ -8638,10 +7717,8 @@ cAudioManager::ProcessWeather(int32 id)
 		m_sQueueSample.field_76 = 30;
 		m_sQueueSample.m_bReverbFlag = 0;
 		m_sQueueSample.m_bEmittingVolume = m_sQueueSample.m_bVolume;
-		m_sQueueSample.m_nLoopStart =
-		    SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
-		m_sQueueSample.m_nLoopEnd =
-		    SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
+		m_sQueueSample.m_nLoopStart = SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
+		m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
 		m_sQueueSample.m_bRequireReflection = 0;
 		AddSampleToRequestedQueue();
 	}
@@ -8663,30 +7740,24 @@ cAudioManager::ProcessWetRoadNoise(cVehicleParams *params)
 			if(velChange > 0.f) {
 				CalculateDistance((bool *)params, params->m_fDistance);
 				relativeVelocity =
-				    min(1.0f,
-				        velChange / (0.5f * params->m_pTransmission->fMaxVelocity));
+				    min(1.0f, velChange / (0.5f * params->m_pTransmission->fMaxVelocity));
 				emittingVol = 23.0f * relativeVelocity * CWeather::WetRoads;
-				m_sQueueSample.m_bVolume =
-				    ComputeVolume(emittingVol, 30.f, m_sQueueSample.m_fDistance);
+				m_sQueueSample.m_bVolume = ComputeVolume(emittingVol, 30.f, m_sQueueSample.m_fDistance);
 				if(m_sQueueSample.m_bVolume) {
 					m_sQueueSample.m_counter = 1;
-					m_sQueueSample.m_nSampleIndex =
-					    AUDIO_SAMPLE_VEHICLE_ROAD_NOISE;
+					m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_VEHICLE_ROAD_NOISE;
 					m_sQueueSample.m_bBankIndex = 0;
 					m_sQueueSample.m_bIsDistant = 0;
 					m_sQueueSample.field_16 = 3;
 					modificator = m_sQueueSample.m_fDistance * 1.f / 3.f * 0.5f;
-					freq = SampleManager.GetSampleBaseFrequency(
-					    AUDIO_SAMPLE_VEHICLE_ROAD_NOISE);
+					freq = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_VEHICLE_ROAD_NOISE);
 					m_sQueueSample.m_nFrequency = freq + freq * modificator;
 					m_sQueueSample.m_nLoopCount = 0;
 					m_sQueueSample.m_bEmittingVolume = emittingVol;
 					m_sQueueSample.m_nLoopStart =
-					    SampleManager.GetSampleLoopStartOffset(
-					        m_sQueueSample.m_nSampleIndex);
+					    SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
 					m_sQueueSample.m_nLoopEnd =
-					    SampleManager.GetSampleLoopEndOffset(
-					        m_sQueueSample.m_nSampleIndex);
+					    SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
 					m_sQueueSample.field_48 = 6.0f;
 					m_sQueueSample.m_fSoundIntensity = 30.0f;
 					m_sQueueSample.field_56 = 0;
@@ -8718,13 +7789,12 @@ cAudioManager::ProcessWorkShopScriptObject(uint8 sound)
 	distSquared = GetDistanceSquared(&m_sQueueSample.m_vecPos);
 	if(distSquared < maxDist) {
 		m_sQueueSample.m_fDistance = sqrt(distSquared);
-		m_sQueueSample.m_bVolume = ComputeVolume(30u, m_sQueueSample.m_fSoundIntensity,
-		                                         m_sQueueSample.m_fDistance);
+		m_sQueueSample.m_bVolume =
+		    ComputeVolume(30, m_sQueueSample.m_fSoundIntensity, m_sQueueSample.m_fDistance);
 		if(m_sQueueSample.m_bVolume) {
 			m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_WORK_SHOP;
 			m_sQueueSample.m_bBankIndex = 0;
-			m_sQueueSample.m_nFrequency =
-			    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_WORK_SHOP);
+			m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_WORK_SHOP);
 			m_sQueueSample.m_counter = 0;
 			m_sQueueSample.m_bIsDistant = 0;
 			m_sQueueSample.m_nLoopCount = 0;
@@ -8734,8 +7804,7 @@ cAudioManager::ProcessWorkShopScriptObject(uint8 sound)
 			m_sQueueSample.m_bEmittingVolume = 30;
 			m_sQueueSample.m_nLoopStart =
 			    SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
-			m_sQueueSample.m_nLoopEnd =
-			    SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
+			m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
 			m_sQueueSample.m_bReverbFlag = 1;
 			m_sQueueSample.m_bRequireReflection = 0;
 			AddSampleToRequestedQueue();
@@ -8774,8 +7843,8 @@ cAudioManager::ReleaseDigitalHandle() const
 }
 
 void
-cAudioManager::ReportCollision(CEntity *entity1, CEntity *entity2, uint8 surface1, uint8 surface2,
-                               float collisionPower, float velocity)
+cAudioManager::ReportCollision(CEntity *entity1, CEntity *entity2, uint8 surface1, uint8 surface2, float collisionPower,
+                               float velocity)
 {
 	float dist;
 	CVector v1;
@@ -8812,9 +7881,8 @@ void
 cAudioManager::ReportCrime(int32 type, const CVector *pos)
 {
 	int32 lastCrime = 10;
-	if(m_bIsInitialised && MusicManager.m_nMusicMode != 2 &&
-	   FindPlayerPed()->m_pWanted->m_nWantedLevel > 0 && (type > 0 || type < 17) &&
-	   m_nTimeOfRecentCrime >= gMinTimeToNextReport[type]) {
+	if(m_bIsInitialised && MusicManager.m_nMusicMode != 2 && FindPlayerPed()->m_pWanted->m_nWantedLevel > 0 &&
+	   (type > 0 || type < 17) && m_nTimeOfRecentCrime >= gMinTimeToNextReport[type]) {
 		for(int32 i = 0; i < 10; i++) {
 			if(crimes[i].type) {
 				if(crimes[i].type == type) {
@@ -8853,7 +7921,7 @@ cAudioManager::ResetAudioLogicTimers(int32 timer)
 			CPed *ped = (CPed *)m_asAudioEntities[m_anAudioEntityIndices[i]].m_pEntity;
 			if(ped->IsPed()) {
 				ped->m_lastSoundStart = timer;
-				ped->m_soundStart = timer + m_anRandomTable[0] % 3000u;
+				ped->m_soundStart = timer + m_anRandomTable[0] % 3000;
 			}
 		}
 	}
@@ -8865,8 +7933,7 @@ void
 cAudioManager::ResetPoliceRadio()
 {
 	if(m_bIsInitialised) {
-		if(SampleManager.GetChannelUsedFlag(policeChannel))
-			SampleManager.StopChannel(policeChannel);
+		if(SampleManager.GetChannelUsedFlag(policeChannel)) SampleManager.StopChannel(policeChannel);
 		InitialisePoliceRadio();
 	}
 }
@@ -8936,7 +8003,7 @@ cAudioManager::ServicePoliceRadio()
 					if(nLastSeen) {
 						--nLastSeen;
 					} else {
-						nLastSeen = m_anRandomTable[1] % 1000u + 2000;
+						nLastSeen = m_anRandomTable[1] % 1000 + 2000;
 						SetupSuspectLastSeenReport();
 					}
 				}
@@ -8960,17 +8027,15 @@ cAudioManager::ServicePoliceRadioChannel(int32 wantedLevel)
 
 	if(m_bIsInitialised) {
 		if(m_bUserPause) {
-			if(SampleManager.GetChannelUsedFlag(policeChannel))
-				SampleManager.StopChannel(policeChannel);
-			if(g_nMissionAudioSfx != TOTAL_AUDIO_SAMPLES &&
-			   bMissionAudioPhysicalPlayingStatus == 1 &&
-			   SampleManager.IsStreamPlaying(1u)) {
-				SampleManager.PauseStream(1, 1u);
+			if(SampleManager.GetChannelUsedFlag(policeChannel)) SampleManager.StopChannel(policeChannel);
+			if(g_nMissionAudioSfx != TOTAL_AUDIO_SAMPLES && bMissionAudioPhysicalPlayingStatus == 1 &&
+			   SampleManager.IsStreamPlaying(1)) {
+				SampleManager.PauseStream(1, 1);
 			}
 		} else {
 			if(m_bPreviousUserPause && g_nMissionAudioSfx != TOTAL_AUDIO_SAMPLES &&
 			   bMissionAudioPhysicalPlayingStatus == 1) {
-				SampleManager.PauseStream(0, 1u);
+				SampleManager.PauseStream(0, 1);
 			}
 			if(!policeChannelTimer) bChannelOpen = 0;
 			if(cWait) {
@@ -8979,13 +8044,12 @@ cAudioManager::ServicePoliceRadioChannel(int32 wantedLevel)
 			}
 			if(g_nMissionAudioSfx != TOTAL_AUDIO_SAMPLES && !bChannelOpen) {
 				if(g_nMissionAudioPlayingStatus) {
-					if(g_nMissionAudioPlayingStatus == 1 &&
-					   !bMissionAudioPhysicalPlayingStatus &&
-					   SampleManager.IsStreamPlaying(1u)) {
+					if(g_nMissionAudioPlayingStatus == 1 && !bMissionAudioPhysicalPlayingStatus &&
+					   SampleManager.IsStreamPlaying(1)) {
 						bMissionAudioPhysicalPlayingStatus = 1;
 					}
 					if(bMissionAudioPhysicalPlayingStatus == 1) {
-						if(SampleManager.IsStreamPlaying(1u)) {
+						if(SampleManager.IsStreamPlaying(1)) {
 							DoPoliceRadioCrackle();
 						} else {
 							bMissionAudioPhysicalPlayingStatus = 2;
@@ -8996,32 +8060,28 @@ cAudioManager::ServicePoliceRadioChannel(int32 wantedLevel)
 						return;
 					}
 				} else if(!SampleManager.GetChannelUsedFlag(policeChannel)) {
-					SampleManager.PreloadStreamedFile(g_nMissionAudioSfx, 1u);
-					SampleManager.SetStreamedVolumeAndPan(maxVolume, 63u, 1,
-					                                      1u);
-					SampleManager.StartPreloadedStreamedFile(1u);
+					SampleManager.PreloadStreamedFile(g_nMissionAudioSfx, 1);
+					SampleManager.SetStreamedVolumeAndPan(maxVolume, 63, 1, 1);
+					SampleManager.StartPreloadedStreamedFile(1);
 					g_nMissionAudioPlayingStatus = 1;
 					bMissionAudioPhysicalPlayingStatus = 0;
 					return;
 				}
 			}
 			if(bChannelOpen) DoPoliceRadioCrackle();
-			if((g_nMissionAudioSfx == TOTAL_AUDIO_SAMPLES ||
-			    g_nMissionAudioPlayingStatus != 1) &&
+			if((g_nMissionAudioSfx == TOTAL_AUDIO_SAMPLES || g_nMissionAudioPlayingStatus != 1) &&
 			   !SampleManager.GetChannelUsedFlag(policeChannel) && policeChannelTimer) {
 				if(policeChannelTimer) {
 					sample = crimesSamples[policeChannelCounterSeconds];
 					--policeChannelTimer;
-					policeChannelCounterSeconds =
-					    (policeChannelCounterSeconds + 1) % 60;
+					policeChannelCounterSeconds = (policeChannelCounterSeconds + 1) % 60;
 				} else {
 					sample = TOTAL_AUDIO_SAMPLES;
 				}
 				if(!wantedLevel) {
 					if(gSpecialSuspectLastSeenReport) {
 						gSpecialSuspectLastSeenReport = 0;
-					} else if((unsigned int)(sample - 212) <= 2 ||
-					          sample == TOTAL_AUDIO_SAMPLES) {
+					} else if((unsigned int)(sample - 212) <= 2 || sample == TOTAL_AUDIO_SAMPLES) {
 						bChannelOpen = 0;
 						processed = 1;
 					}
@@ -9034,16 +8094,14 @@ cAudioManager::ServicePoliceRadioChannel(int32 wantedLevel)
 					case AUDIO_SAMPLE_POLICE_SCANNER_SMALL_CRACKLE_1:
 					case AUDIO_SAMPLE_POLICE_SCANNER_SMALL_CRACKLE_2:
 					case AUDIO_SAMPLE_POLICE_SCANNER_SMALL_CRACKLE_3:
-						freq = m_anRandomTable[4] % 2000u + 10025;
+						freq = m_anRandomTable[4] % 2000 + 10025;
 						bChannelOpen = bChannelOpen == 0;
 						break;
-					default:
-						freq = SampleManager.GetSampleBaseFrequency(sample);
-						break;
+					default: freq = SampleManager.GetSampleBaseFrequency(sample); break;
 					}
 					PoliceChannelFreq = freq;
 					SampleManager.SetChannelFrequency(policeChannel, freq);
-					SampleManager.SetChannelVolume(policeChannel, 100u);
+					SampleManager.SetChannelVolume(policeChannel, 100);
 					SampleManager.SetChannelPan(policeChannel, 63);
 					SampleManager.SetChannelLoopCount(policeChannel, 1);
 					SampleManager.SetChannelLoopPoints(policeChannel, 0, -1);
@@ -9095,8 +8153,7 @@ cAudioManager::ServiceSoundEffects()
 	AdjustSamplesVolume();
 	ProcessActiveQueues();
 	for(int32 i = 0; i < m_nScriptObjectEntityTotal; ++i) {
-		object = (cAudioScriptObject *)m_asAudioEntities[m_anScriptObjectEntityIndices[i]]
-		             .m_pEntity;
+		object = (cAudioScriptObject *)m_asAudioEntities[m_anScriptObjectEntityIndices[i]].m_pEntity;
 		if(object) { delete object; }
 		DestroyEntity(m_anScriptObjectEntityIndices[i]);
 	}
@@ -9118,7 +8175,7 @@ cAudioManager::SetCurrent3DProvider(uint8 which)
 	int8 current = SampleManager.SetCurrent3DProvider(which);
 	if(current > 0) {
 		m_bActiveSamples = SampleManager.GetMaximumSupportedChannels();
-		if(m_bActiveSamples > 1u) --m_bActiveSamples;
+		if(m_bActiveSamples > 1) --m_bActiveSamples;
 	}
 	return current;
 }
@@ -9144,8 +8201,7 @@ cAudioManager::SetEffectsMasterVolume(uint8 volume) const
 void
 cAudioManager::SetEntityStatus(int32 id, bool status)
 {
-	if(m_bIsInitialised && id >= 0 && id < totalAudioEntitiesSlots &&
-	   m_asAudioEntities[id].m_bIsUsed) {
+	if(m_bIsInitialised && id >= 0 && id < totalAudioEntitiesSlots && m_asAudioEntities[id].m_bIsUsed) {
 		m_asAudioEntities[id].m_bStatus = status;
 	}
 }
@@ -9158,40 +8214,34 @@ cAudioManager::SetLoopingCollisionRequestedSfxFreqAndGetVol(cAudioCollision *aud
 	int32 vol;
 	float ratio;
 
-	if(surface1 != SURFACE_GRASS && surface2 != SURFACE_GRASS && surface1 != SURFACE_HEDGE &&
-	   surface2 != SURFACE_HEDGE) {
-		if(surface1 != SURFACE_PUDDLE && surface2 != SURFACE_PUDDLE) {
-			if(surface1 != SURFACE_DIRT && surface2 != SURFACE_DIRT &&
-			   surface1 != SURFACE_DIRTTRACK && surface2 != SURFACE_DIRTTRACK &&
-			   surface1 != SURFACE_SAND && surface2 != SURFACE_SAND) {
-				if(surface1 == SURFACE_FLESH || surface2 == SURFACE_FLESH) {
-					return 0;
-				}
-				ratio = GetCollisionRatio(audioCollision->m_fIntensity2, 0.0001f,
-				                          0.09f, 0.0899f);
-				m_sQueueSample.m_nSampleIndex =
-				    AUDIO_SAMPLE_COLLISION_LOOPING_GENERIC;
-				m_sQueueSample.m_nFrequency = 10000.f * ratio + 10000;
-				vol = 40.f * ratio;
-			} else {
-				ratio = GetCollisionRatio(audioCollision->m_fIntensity2, 0.0001f,
-				                          0.09f, 0.0899f);
-				m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_COLLISION_LOOPING_SOFT;
-				m_sQueueSample.m_nFrequency = 6000.f * ratio + 10000;
-				vol = 50.f * ratio;
-			}
-		} else {
-			ratio = GetCollisionRatio(audioCollision->m_fIntensity2, 0.0001f, 0.09f,
-			                          0.0899f);
-			m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_LOOPING_WATER;
-			m_sQueueSample.m_nFrequency = 6050.f * ratio + 16000;
-			vol = 30.f * ratio;
-		}
-	} else {
+	if(surface1 == SURFACE_GRASS || surface2 == SURFACE_GRASS || surface1 == SURFACE_HEDGE ||
+	   surface2 == SURFACE_HEDGE) {
 		ratio = GetCollisionRatio(audioCollision->m_fIntensity2, 0.0001f, 0.09f, 0.0899f);
 		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_COLLISION_LOOPING_GRASS;
 		m_sQueueSample.m_nFrequency = 13000.f * ratio + 35000;
 		vol = 50.f * ratio;
+	} else {
+		if(surface1 == SURFACE_PUDDLE || surface2 == SURFACE_PUDDLE) {
+			ratio = GetCollisionRatio(audioCollision->m_fIntensity2, 0.0001f, 0.09f, 0.0899f);
+			m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_LOOPING_WATER;
+			m_sQueueSample.m_nFrequency = 6050.f * ratio + 16000;
+			vol = 30.f * ratio;
+
+		} else {
+			if(surface1 == SURFACE_DIRT || surface2 == SURFACE_DIRT || surface1 == SURFACE_DIRTTRACK ||
+			   surface2 == SURFACE_DIRTTRACK || surface1 == SURFACE_SAND || surface2 == SURFACE_SAND) {
+				ratio = GetCollisionRatio(audioCollision->m_fIntensity2, 0.0001f, 0.09f, 0.0899f);
+				m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_COLLISION_LOOPING_SOFT;
+				m_sQueueSample.m_nFrequency = 6000.f * ratio + 10000;
+				vol = 50.f * ratio;
+			} else {
+				if(surface1 == SURFACE_FLESH || surface2 == SURFACE_FLESH) { return 0; }
+				ratio = GetCollisionRatio(audioCollision->m_fIntensity2, 0.0001f, 0.09f, 0.0899f);
+				m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_COLLISION_LOOPING_GENERIC;
+				m_sQueueSample.m_nFrequency = 10000.f * ratio + 10000;
+				vol = 40.f * ratio;
+			}
+		}
 	}
 	if(audioCollision->m_nBaseVolume < 2) vol = audioCollision->m_nBaseVolume * vol / 2;
 	return vol;
@@ -9202,9 +8252,7 @@ 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;
+		m_sMissionAudio.m_vecPos = {x, y, z};
 	}
 }
 
@@ -9244,8 +8292,7 @@ cAudioManager::SetUpLoopingCollisionSound(cAudioCollision *col, uint8 counter)
 		uint8 emittingVol = SetLoopingCollisionRequestedSfxFreqAndGetVol(col);
 		if(emittingVol) {
 			m_sQueueSample.m_fDistance = Sqrt(col->m_fDistance);
-			m_sQueueSample.m_bVolume =
-			    ComputeVolume(emittingVol, 60.f, m_sQueueSample.m_fDistance);
+			m_sQueueSample.m_bVolume = ComputeVolume(emittingVol, 60.f, m_sQueueSample.m_fDistance);
 			if(m_sQueueSample.m_bVolume) {
 				m_sQueueSample.m_counter = counter;
 				m_sQueueSample.m_vecPos = col->m_vecPosition;
@@ -9255,10 +8302,9 @@ cAudioManager::SetUpLoopingCollisionSound(cAudioCollision *col, uint8 counter)
 				m_sQueueSample.m_nLoopCount = 0;
 				m_sQueueSample.m_bEmittingVolume = emittingVol;
 				m_sQueueSample.m_nLoopStart =
-				    SampleManager.GetSampleLoopStartOffset(
-				        m_sQueueSample.m_nSampleIndex);
-				m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(
-				    m_sQueueSample.m_nSampleIndex);
+				    SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
+				m_sQueueSample.m_nLoopEnd =
+				    SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
 				m_sQueueSample.field_48 = 4.0f;
 				m_sQueueSample.m_fSoundIntensity = 60.0f;
 				m_sQueueSample.field_56 = 0;
@@ -9275,23 +8321,17 @@ void
 cAudioManager::SetUpOneShotCollisionSound(cAudioCollision *col)
 {
 	static constexpr int32 gOneShotCol[] = {
-	    AUDIO_SAMPLE_COLLISION_PAVEMENT,   AUDIO_SAMPLE_COLLISION_PAVEMENT,
-	    AUDIO_SAMPLE_COLLISION_MUFFLED,    AUDIO_SAMPLE_COLLISION_DIRT,
-	    AUDIO_SAMPLE_COLLISION_MUD,        AUDIO_SAMPLE_COLLISION_PAVEMENT,
-	    AUDIO_SAMPLE_COLLISION_METAL,      AUDIO_SAMPLE_COLLISION_MUFFLED,
-	    AUDIO_SAMPLE_COLLISION_HARD,       AUDIO_SAMPLE_COLLISION_METAL_DOOR,
-	    AUDIO_SAMPLE_CAR_DOOR_MOVEMENT_1,  AUDIO_SAMPLE_COLLISION_METAL_11,
-	    AUDIO_SAMPLE_COLLISION_HARD,       AUDIO_SAMPLE_COLLISION_METAL_13,
-	    AUDIO_SAMPLE_COLLISION_METAL_14,   AUDIO_SAMPLE_COLLISION_METAL_14,
-	    AUDIO_SAMPLE_COLLISION_FENCE,      AUDIO_SAMPLE_COLLISION_FLESH,
-	    AUDIO_SAMPLE_COLLISION_SAND,       AUDIO_SAMPLE_COLLISION_WATER,
-	    AUDIO_SAMPLE_COLLISION_WOOD,       AUDIO_SAMPLE_COLLISION_WOOD_BOX,
-	    AUDIO_SAMPLE_COLLISION_WOOD_PLANK, AUDIO_SAMPLE_COLLISION_MUFFLED,
-	    AUDIO_SAMPLE_COLLISION_MUFFLED,    AUDIO_SAMPLE_COLLISION_HEDGE,
-	    AUDIO_SAMPLE_COLLISION_PAVEMENT,   AUDIO_SAMPLE_COLLISION_METAL_27,
-	    AUDIO_SAMPLE_COLLISION_METAL_28,   AUDIO_SAMPLE_COLLISION_RUBBER,
-	    AUDIO_SAMPLE_COLLISION_LOOSE,      AUDIO_SAMPLE_COLLISION_PAVEMENT,
-	    AUDIO_SAMPLE_COLLISION_GATE};
+	    AUDIO_SAMPLE_COLLISION_PAVEMENT,   AUDIO_SAMPLE_COLLISION_PAVEMENT,   AUDIO_SAMPLE_COLLISION_MUFFLED,
+	    AUDIO_SAMPLE_COLLISION_DIRT,       AUDIO_SAMPLE_COLLISION_MUD,        AUDIO_SAMPLE_COLLISION_PAVEMENT,
+	    AUDIO_SAMPLE_COLLISION_METAL,      AUDIO_SAMPLE_COLLISION_MUFFLED,    AUDIO_SAMPLE_COLLISION_HARD,
+	    AUDIO_SAMPLE_COLLISION_METAL_DOOR, AUDIO_SAMPLE_CAR_DOOR_MOVEMENT_1,  AUDIO_SAMPLE_COLLISION_METAL_11,
+	    AUDIO_SAMPLE_COLLISION_HARD,       AUDIO_SAMPLE_COLLISION_METAL_13,   AUDIO_SAMPLE_COLLISION_METAL_14,
+	    AUDIO_SAMPLE_COLLISION_METAL_14,   AUDIO_SAMPLE_COLLISION_FENCE,      AUDIO_SAMPLE_COLLISION_FLESH,
+	    AUDIO_SAMPLE_COLLISION_SAND,       AUDIO_SAMPLE_COLLISION_WATER,      AUDIO_SAMPLE_COLLISION_WOOD,
+	    AUDIO_SAMPLE_COLLISION_WOOD_BOX,   AUDIO_SAMPLE_COLLISION_WOOD_PLANK, AUDIO_SAMPLE_COLLISION_MUFFLED,
+	    AUDIO_SAMPLE_COLLISION_MUFFLED,    AUDIO_SAMPLE_COLLISION_HEDGE,      AUDIO_SAMPLE_COLLISION_PAVEMENT,
+	    AUDIO_SAMPLE_COLLISION_METAL_27,   AUDIO_SAMPLE_COLLISION_METAL_28,   AUDIO_SAMPLE_COLLISION_RUBBER,
+	    AUDIO_SAMPLE_COLLISION_LOOSE,      AUDIO_SAMPLE_COLLISION_PAVEMENT,   AUDIO_SAMPLE_COLLISION_GATE};
 
 	int16 s1;
 	int16 s2;
@@ -9318,16 +8358,15 @@ cAudioManager::SetUpOneShotCollisionSound(cAudioCollision *col)
 		emittingVol = 40.f * ratio;
 		if(emittingVol) {
 			m_sQueueSample.m_fDistance = Sqrt(col->m_fDistance);
-			m_sQueueSample.m_bVolume =
-			    ComputeVolume(emittingVol, 60.f, m_sQueueSample.m_fDistance);
+			m_sQueueSample.m_bVolume = ComputeVolume(emittingVol, 60.f, m_sQueueSample.m_fDistance);
 			if(m_sQueueSample.m_bVolume) {
 				m_sQueueSample.m_nSampleIndex = gOneShotCol[s1];
 				switch(m_sQueueSample.m_nSampleIndex) {
 				case AUDIO_SAMPLE_COLLISION_PAVEMENT:
-					m_sQueueSample.m_nSampleIndex += m_anRandomTable[3] % 5u;
+					m_sQueueSample.m_nSampleIndex += m_anRandomTable[3] % 5;
 					break;
 				case AUDIO_SAMPLE_CAR_DOOR_MOVEMENT_1:
-					m_sQueueSample.m_nSampleIndex += m_anRandomTable[0] % 6u;
+					m_sQueueSample.m_nSampleIndex += m_anRandomTable[0] % 6;
 					break;
 				case AUDIO_SAMPLE_COLLISION_METAL_13:
 					m_sQueueSample.m_nSampleIndex += m_anRandomTable[1] & 1;
@@ -9336,7 +8375,7 @@ cAudioManager::SetUpOneShotCollisionSound(cAudioCollision *col)
 					m_sQueueSample.m_nSampleIndex += m_anRandomTable[3] & 3;
 					break;
 				case AUDIO_SAMPLE_COLLISION_FLESH:
-					m_sQueueSample.m_nSampleIndex += m_anRandomTable[4] % 5u;
+					m_sQueueSample.m_nSampleIndex += m_anRandomTable[4] % 5;
 					break;
 				case AUDIO_SAMPLE_COLLISION_WOOD:
 					m_sQueueSample.m_nSampleIndex += m_anRandomTable[4] & 3;
@@ -9345,13 +8384,13 @@ cAudioManager::SetUpOneShotCollisionSound(cAudioCollision *col)
 					m_sQueueSample.m_nSampleIndex += m_anRandomTable[1] & 3;
 					break;
 				case AUDIO_SAMPLE_COLLISION_HEDGE:
-					m_sQueueSample.m_nSampleIndex += m_anRandomTable[2] % 5u;
+					m_sQueueSample.m_nSampleIndex += m_anRandomTable[2] % 5;
 					break;
 				case AUDIO_SAMPLE_COLLISION_METAL_28:
-					m_sQueueSample.m_nSampleIndex += m_anRandomTable[2] % 3u;
+					m_sQueueSample.m_nSampleIndex += m_anRandomTable[2] % 3;
 					break;
 				case AUDIO_SAMPLE_COLLISION_METAL:
-					m_sQueueSample.m_nSampleIndex += m_anRandomTable[1] % 5u;
+					m_sQueueSample.m_nSampleIndex += m_anRandomTable[1] % 5;
 					break;
 				case AUDIO_SAMPLE_COLLISION_LOOSE:
 					m_sQueueSample.m_nSampleIndex += m_anRandomTable[3] & 1;
@@ -9363,21 +8402,18 @@ cAudioManager::SetUpOneShotCollisionSound(cAudioCollision *col)
 				case SURFACE_METAL15: m_sQueueSample.m_nFrequency = 8819; break;
 				case SURFACE_PUDDLE:
 					m_sQueueSample.m_nFrequency =
-					    2 * SampleManager.GetSampleBaseFrequency(
-					            m_sQueueSample.m_nSampleIndex);
+					    2 * SampleManager.GetSampleBaseFrequency(m_sQueueSample.m_nSampleIndex);
 					break;
 				case SURFACE_TIRE: m_sQueueSample.m_nFrequency = 6000; break;
 				case SURFACE_HARD24: m_sQueueSample.m_nFrequency = 8000; break;
 				default:
 					m_sQueueSample.m_nFrequency =
-					    SampleManager.GetSampleBaseFrequency(
-					        m_sQueueSample.m_nSampleIndex);
+					    SampleManager.GetSampleBaseFrequency(m_sQueueSample.m_nSampleIndex);
 					break;
 				}
-				m_sQueueSample.m_nFrequency +=
-				    RandomDisplacement(m_sQueueSample.m_nFrequency / 16);
+				m_sQueueSample.m_nFrequency += RandomDisplacement(m_sQueueSample.m_nFrequency / 16);
 				m_sQueueSample.m_counter = counter++;
-				if(counter >= 255u) counter = 28;
+				if(counter >= 255) counter = 28;
 				m_sQueueSample.m_vecPos = col->m_vecPosition;
 				m_sQueueSample.m_bBankIndex = 0;
 				m_sQueueSample.m_bIsDistant = 0;
@@ -9420,11 +8456,10 @@ cAudioManager::SetupCrimeReport()
 		return 1;
 	}
 
-	i = 0;
-	do {
+	for(i = 0; i < 10; i++) {
 		if(crimes[i].type) break;
-		++i;
-	} while(i < 10u);
+	}
+
 	if(i == 10) return 0;
 	audioZoneId = CTheZones::FindAudioZone(&crimes[i].position);
 	if(audioZoneId >= 0 && audioZoneId < 36) {
@@ -9432,7 +8467,7 @@ cAudioManager::SetupCrimeReport()
 		zone = &CTheZones::ZoneArray[CTheZones::AudioZoneArray[audioZoneId]];
 		while(strcmp(zone->name, ZoneSfx[j].m_aName) != 0) {
 			++j;
-			if(j >= 36u) {
+			if(j >= 36) {
 				crimes[i].type = 0;
 				AgeCrimes();
 				return 1;
@@ -9440,17 +8475,16 @@ cAudioManager::SetupCrimeReport()
 		}
 		sampleIndex = ZoneSfx[j].m_nSampleIndex;
 
-		if(j < 36u) {
+		if(j < 36) {
 			if(policeChannelTimer != 60) {
 				crimesSamples[policeChannelTimerSeconds] =
-				    m_anRandomTable[4] % 3u +
-				    AUDIO_SAMPLE_POLICE_SCANNER_SMALL_CRACKLE_1;
+				    m_anRandomTable[4] % 3 + AUDIO_SAMPLE_POLICE_SCANNER_SMALL_CRACKLE_1;
 				++policeChannelTimer;
 				policeChannelTimerSeconds = (policeChannelTimerSeconds + 1) % 60;
 			}
 			if(policeChannelTimer != 60) {
 				crimesSamples[policeChannelTimerSeconds] =
-				    m_anRandomTable[0] % 3u + AUDIO_SAMPLE_POLICE_SCANNER_WE_GOT_1;
+				    m_anRandomTable[0] % 3 + AUDIO_SAMPLE_POLICE_SCANNER_WE_GOT_1;
 				++policeChannelTimer;
 				policeChannelTimerSeconds = (policeChannelTimerSeconds + 1) % 60;
 			}
@@ -9474,50 +8508,40 @@ cAudioManager::SetupCrimeReport()
 				policeChannelTimerSeconds = (policeChannelTimerSeconds + 1) % 60;
 			}
 			if(policeChannelTimer != 60) {
-				crimesSamples[policeChannelTimerSeconds] =
-				    AUDIO_SAMPLE_POLICE_SCANNER_IN;
+				crimesSamples[policeChannelTimerSeconds] = AUDIO_SAMPLE_POLICE_SCANNER_IN;
 				++policeChannelTimer;
 				policeChannelTimerSeconds = (policeChannelTimerSeconds + 1) % 60;
 			}
 			if(sampleIndex == AUDIO_SAMPLE_POLICE_SCANNER_ZONE_SHORESIDE &&
-			   (strcmp(zone->name, SubZo2Label) == 0 ||
-			    strcmp(zone->name, SubZo3Label) == 0)) {
+			   (strcmp(zone->name, SubZo2Label) == 0 || strcmp(zone->name, SubZo3Label) == 0)) {
 				if(policeChannelTimer != 60) {
-					crimesSamples[policeChannelTimerSeconds] =
-					    AUDIO_SAMPLE_POLICE_SCANNER_NORTH;
+					crimesSamples[policeChannelTimerSeconds] = AUDIO_SAMPLE_POLICE_SCANNER_NORTH;
 					++policeChannelTimer;
-					policeChannelTimerSeconds =
-					    (policeChannelTimerSeconds + 1) % 60;
+					policeChannelTimerSeconds = (policeChannelTimerSeconds + 1) % 60;
 				}
 				if(policeChannelTimer == 60) {
 					if(policeChannelTimer != 60) {
-						crimesSamples[policeChannelTimerSeconds] =
-						    sampleIndex;
+						crimesSamples[policeChannelTimerSeconds] = sampleIndex;
 						++policeChannelTimer;
-						policeChannelTimerSeconds =
-						    (policeChannelTimerSeconds + 1) % 60;
+						policeChannelTimerSeconds = (policeChannelTimerSeconds + 1) % 60;
 					}
 					if(policeChannelTimer != 60) {
 						crimesSamples[policeChannelTimerSeconds] =
-						    m_anRandomTable[2] % 3u +
+						    m_anRandomTable[2] % 3 +
 						    AUDIO_SAMPLE_POLICE_SCANNER_SMALL_CRACKLE_1;
 						++policeChannelTimer;
-						policeChannelTimerSeconds =
-						    (policeChannelTimerSeconds + 1) % 60;
+						policeChannelTimerSeconds = (policeChannelTimerSeconds + 1) % 60;
 					}
 					if(policeChannelTimer != 60) {
-						crimesSamples[policeChannelTimerSeconds] =
-						    TOTAL_AUDIO_SAMPLES;
+						crimesSamples[policeChannelTimerSeconds] = TOTAL_AUDIO_SAMPLES;
 						++policeChannelTimer;
-						policeChannelTimerSeconds =
-						    (policeChannelTimerSeconds + 1) % 60;
+						policeChannelTimerSeconds = (policeChannelTimerSeconds + 1) % 60;
 					}
 					crimes[i].type = 0;
 					AgeCrimes();
 					return 1;
 				}
-				crimesSamples[policeChannelTimerSeconds] =
-				    AUDIO_SAMPLE_POLICE_SCANNER_EAST;
+				crimesSamples[policeChannelTimerSeconds] = AUDIO_SAMPLE_POLICE_SCANNER_EAST;
 				++policeChannelTimer;
 				policeChannelTimerSeconds = (policeChannelTimerSeconds + 1) % 60;
 			}
@@ -9533,14 +8557,12 @@ cAudioManager::SetupCrimeReport()
 						crimesSamples[policeChannelTimerSeconds] =
 						    AUDIO_SAMPLE_POLICE_SCANNER_SOUTH;
 						++policeChannelTimer;
-						policeChannelTimerSeconds =
-						    (policeChannelTimerSeconds + 1) % 60;
+						policeChannelTimerSeconds = (policeChannelTimerSeconds + 1) % 60;
 					}
 					processed = 1;
 				}
 			} else if(policeChannelTimer != 60) {
-				crimesSamples[policeChannelTimerSeconds] =
-				    AUDIO_SAMPLE_POLICE_SCANNER_NORTH;
+				crimesSamples[policeChannelTimerSeconds] = AUDIO_SAMPLE_POLICE_SCANNER_NORTH;
 				++policeChannelTimer;
 				policeChannelTimerSeconds = (policeChannelTimerSeconds + 1) % 60;
 				processed = 1;
@@ -9550,23 +8572,21 @@ cAudioManager::SetupCrimeReport()
 				if(halfX - quarterX <= crimes[i].position.x) {
 					if(processed || policeChannelTimer == 60) {
 						if(policeChannelTimer != 60) {
-							crimesSamples[policeChannelTimerSeconds] =
-							    sampleIndex;
+							crimesSamples[policeChannelTimerSeconds] = sampleIndex;
 							++policeChannelTimer;
 							policeChannelTimerSeconds =
 							    (policeChannelTimerSeconds + 1) % 60;
 						}
 						if(policeChannelTimer != 60) {
 							crimesSamples[policeChannelTimerSeconds] =
-							    m_anRandomTable[2] % 3u +
+							    m_anRandomTable[2] % 3 +
 							    AUDIO_SAMPLE_POLICE_SCANNER_SMALL_CRACKLE_1;
 							++policeChannelTimer;
 							policeChannelTimerSeconds =
 							    (policeChannelTimerSeconds + 1) % 60;
 						}
 						if(policeChannelTimer != 60) {
-							crimesSamples[policeChannelTimerSeconds] =
-							    TOTAL_AUDIO_SAMPLES;
+							crimesSamples[policeChannelTimerSeconds] = TOTAL_AUDIO_SAMPLES;
 							++policeChannelTimer;
 							policeChannelTimerSeconds =
 							    (policeChannelTimerSeconds + 1) % 60;
@@ -9575,22 +8595,17 @@ cAudioManager::SetupCrimeReport()
 						AgeCrimes();
 						return 1;
 					}
-					crimesSamples[policeChannelTimerSeconds] =
-					    AUDIO_SAMPLE_POLICE_SCANNER_CENTRAL;
+					crimesSamples[policeChannelTimerSeconds] = AUDIO_SAMPLE_POLICE_SCANNER_CENTRAL;
 					++policeChannelTimer;
-					policeChannelTimerSeconds =
-					    (policeChannelTimerSeconds + 1) % 60;
+					policeChannelTimerSeconds = (policeChannelTimerSeconds + 1) % 60;
 				}
 				if(policeChannelTimer != 60) {
-					crimesSamples[policeChannelTimerSeconds] =
-					    AUDIO_SAMPLE_POLICE_SCANNER_WEST;
+					crimesSamples[policeChannelTimerSeconds] = AUDIO_SAMPLE_POLICE_SCANNER_WEST;
 					++policeChannelTimer;
-					policeChannelTimerSeconds =
-					    (policeChannelTimerSeconds + 1) % 60;
+					policeChannelTimerSeconds = (policeChannelTimerSeconds + 1) % 60;
 				}
 			} else if(policeChannelTimer != 60) {
-				crimesSamples[policeChannelTimerSeconds] =
-				    AUDIO_SAMPLE_POLICE_SCANNER_EAST;
+				crimesSamples[policeChannelTimerSeconds] = AUDIO_SAMPLE_POLICE_SCANNER_EAST;
 				++policeChannelTimer;
 				policeChannelTimerSeconds = (policeChannelTimerSeconds + 1) % 60;
 			}
@@ -9601,8 +8616,7 @@ cAudioManager::SetupCrimeReport()
 			}
 			if(policeChannelTimer != 60) {
 				crimesSamples[policeChannelTimerSeconds] =
-				    m_anRandomTable[2] % 3u +
-				    AUDIO_SAMPLE_POLICE_SCANNER_SMALL_CRACKLE_1;
+				    m_anRandomTable[2] % 3 + AUDIO_SAMPLE_POLICE_SCANNER_SMALL_CRACKLE_1;
 				++policeChannelTimer;
 				policeChannelTimerSeconds = (policeChannelTimerSeconds + 1) % 60;
 			}
@@ -9636,17 +8650,14 @@ cAudioManager::SetupJumboFlySound(uint8 emittingVol)
 		m_sQueueSample.field_16 = 1;
 		m_sQueueSample.m_bEmittingVolume = emittingVol;
 		m_sQueueSample.m_nLoopCount = 0;
-		m_sQueueSample.m_nFrequency =
-		    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_JUMBO_FLY_SOUND);
-		m_sQueueSample.m_nLoopStart =
-		    SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_JUMBO_FLY_SOUND);
+		m_sQueueSample.m_nLoopStart = SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
 		m_sQueueSample.m_fSoundIntensity = 440.0f;
 		m_sQueueSample.field_56 = 0;
 		m_sQueueSample.field_48 = 4.0f;
 		m_sQueueSample.m_bReverbFlag = 1;
 		m_sQueueSample.field_76 = 5;
-		m_sQueueSample.m_nLoopEnd =
-		    SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
+		m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
 		AddSampleToRequestedQueue();
 	}
 	return 1;
@@ -9665,14 +8676,11 @@ cAudioManager::SetupJumboRumbleSound(uint8 emittingVol)
 		m_sQueueSample.m_bBankIndex = 0;
 		m_sQueueSample.m_bIsDistant = 1;
 		m_sQueueSample.field_16 = 1;
-		m_sQueueSample.m_nFrequency =
-		    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_JUMBO_RUMBLE_SOUND);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_JUMBO_RUMBLE_SOUND);
 		m_sQueueSample.m_nLoopCount = 0;
 		m_sQueueSample.m_bEmittingVolume = emittingVol;
-		m_sQueueSample.m_nLoopStart =
-		    SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
-		m_sQueueSample.m_nLoopEnd =
-		    SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
+		m_sQueueSample.m_nLoopStart = SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
+		m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
 		m_sQueueSample.field_48 = 4.0f;
 		m_sQueueSample.m_fSoundIntensity = 240.0f;
 		m_sQueueSample.field_56 = 0;
@@ -9697,8 +8705,7 @@ cAudioManager::SetupJumboTaxiSound(uint8 vol)
 
 	uint8 emittingVol = (vol >> 1) + ((vol >> 1) * m_sQueueSample.m_fDistance / 180);
 
-	if(m_sQueueSample.m_fDistance / 180 < 0.7f)
-		emittingVol -= emittingVol * gJumboVolOffsetPercentage / 100;
+	if(m_sQueueSample.m_fDistance / 180 < 0.7f) emittingVol -= emittingVol * gJumboVolOffsetPercentage / 100;
 	m_sQueueSample.m_bVolume = ComputeVolume(emittingVol, 180.f, m_sQueueSample.m_fDistance);
 
 	if(m_sQueueSample.m_bVolume) {
@@ -9710,10 +8717,8 @@ cAudioManager::SetupJumboTaxiSound(uint8 vol)
 		m_sQueueSample.m_nFrequency = GetJumboTaxiFreq();
 		m_sQueueSample.m_nLoopCount = 0;
 		m_sQueueSample.m_bEmittingVolume = emittingVol;
-		m_sQueueSample.m_nLoopStart =
-		    SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
-		m_sQueueSample.m_nLoopEnd =
-		    SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
+		m_sQueueSample.m_nLoopStart = SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
+		m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
 		m_sQueueSample.field_48 = 4.0f;
 		m_sQueueSample.m_fSoundIntensity = 180.0f;
 		m_sQueueSample.field_56 = 0;
@@ -9741,10 +8746,8 @@ cAudioManager::SetupJumboWhineSound(uint8 emittingVol, int32 freq)
 		m_sQueueSample.m_nFrequency = freq;
 		m_sQueueSample.m_nLoopCount = 0;
 		m_sQueueSample.m_bEmittingVolume = emittingVol;
-		m_sQueueSample.m_nLoopStart =
-		    SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
-		m_sQueueSample.m_nLoopEnd =
-		    SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
+		m_sQueueSample.m_nLoopStart = SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
+		m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
 		m_sQueueSample.field_48 = 4.0f;
 		m_sQueueSample.m_fSoundIntensity = 170.0f;
 		m_sQueueSample.field_56 = 0;
@@ -9767,15 +8770,9 @@ cAudioManager::SetupPedComments(cPedParams *params, uint32 sound)
 
 	if(ped) {
 		switch(sound) {
-		case SOUND_AMMUNATION_WELCOME_1:
-			pedComment.m_nSampleIndex = AUDIO_SAMPLE_AMMUNATION_WELCOME_1;
-			break;
-		case SOUND_AMMUNATION_WELCOME_2:
-			pedComment.m_nSampleIndex = AUDIO_SAMPLE_AMMUNATION_WELCOME_2;
-			break;
-		case SOUND_AMMUNATION_WELCOME_3:
-			pedComment.m_nSampleIndex = AUDIO_SAMPLE_AMMUNATION_WELCOME_3;
-			break;
+		case SOUND_AMMUNATION_WELCOME_1: pedComment.m_nSampleIndex = AUDIO_SAMPLE_AMMUNATION_WELCOME_1; break;
+		case SOUND_AMMUNATION_WELCOME_2: pedComment.m_nSampleIndex = AUDIO_SAMPLE_AMMUNATION_WELCOME_2; break;
+		case SOUND_AMMUNATION_WELCOME_3: pedComment.m_nSampleIndex = AUDIO_SAMPLE_AMMUNATION_WELCOME_3; break;
 		default:
 			pedComment.m_nSampleIndex = GetPedCommentSfx(ped, sound);
 			if(pedComment.m_nSampleIndex == NO_SAMPLE) return;
@@ -9793,17 +8790,17 @@ cAudioManager::SetupPedComments(cPedParams *params, uint32 sound)
 				case SOUND_AMMUNATION_WELCOME_2:
 				case SOUND_AMMUNATION_WELCOME_3: emittingVol = maxVolume; break;
 				default:
-					if(CWorld::GetIsLineOfSightClear(
-					       TheCamera.GetGameCamPosition(),
-					       m_sQueueSample.m_vecPos, 1, 0, 0, 0, 0, 0, 0)) {
+					if(CWorld::GetIsLineOfSightClear(TheCamera.GetGameCamPosition(),
+					                                 m_sQueueSample.m_vecPos, 1, 0, 0, 0, 0, 0,
+					                                 0)) {
 						emittingVol = maxVolume;
 					} else {
 						emittingVol = 31;
 					}
 					break;
 				}
-				m_sQueueSample.m_bVolume = ComputeVolume(
-				    emittingVol, soundIntensity, m_sQueueSample.m_fDistance);
+				m_sQueueSample.m_bVolume =
+				    ComputeVolume(emittingVol, soundIntensity, m_sQueueSample.m_fDistance);
 				pedComment.field_25 = 10;
 				if(m_sQueueSample.m_bVolume) {
 					pedComment.m_entityIndex = m_sQueueSample.m_nEntityIndex;
@@ -9819,9 +8816,8 @@ cAudioManager::SetupPedComments(cPedParams *params, uint32 sound)
 		case SOUND_PED_HELI_PLAYER_FOUND:
 			maxDist = 160000.f;
 			soundIntensity = 400.f;
-			pedComment.m_nSampleIndex =
-			    m_anRandomTable[m_sQueueSample.m_nEntityIndex & 3] % 29u +
-			    AUDIO_SAMPLE_POLICE_HELI_FOUND_PLAYER_1;
+			pedComment.m_nSampleIndex = m_anRandomTable[m_sQueueSample.m_nEntityIndex & 3] % 29 +
+			                            AUDIO_SAMPLE_POLICE_HELI_FOUND_PLAYER_1;
 			break;
 		case SOUND_PED_BODYCAST_HIT:
 			if(CTimer::GetTimeInMilliseconds() <= audioLogicTimers[8]) return;
@@ -9829,23 +8825,20 @@ cAudioManager::SetupPedComments(cPedParams *params, uint32 sound)
 			soundIntensity = 50.f;
 			audioLogicTimers[8] = CTimer::GetTimeInMilliseconds() + 500;
 			pedComment.m_nSampleIndex =
-			    (m_anRandomTable[m_sQueueSample.m_nEntityIndex & 3] & 3) +
-			    AUDIO_SAMPLE_PED_BODYCAST_HIT_1;
+			    (m_anRandomTable[m_sQueueSample.m_nEntityIndex & 3] & 3) + AUDIO_SAMPLE_PED_BODYCAST_HIT_1;
 			break;
 		case SOUND_INJURED_PED_MALE_OUCH:
 		case SOUND_8A:
 			maxDist = 2500.f;
 			soundIntensity = 50.f;
-			pedComment.m_nSampleIndex =
-			    m_anRandomTable[m_sQueueSample.m_nEntityIndex & 3] % 15u +
-			    AUDIO_SAMPLE_INJURED_PED_MALE_OUCH_1;
+			pedComment.m_nSampleIndex = m_anRandomTable[m_sQueueSample.m_nEntityIndex & 3] % 15 +
+			                            AUDIO_SAMPLE_INJURED_PED_MALE_OUCH_1;
 			break;
 		case SOUND_INJURED_PED_FEMALE:
 			maxDist = 2500.f;
 			soundIntensity = 50.f;
-			pedComment.m_nSampleIndex =
-			    m_anRandomTable[m_sQueueSample.m_nEntityIndex & 3] % 11u +
-			    AUDIO_SAMPLE_INJURED_PED_FEMALE_OUCH_1;
+			pedComment.m_nSampleIndex = m_anRandomTable[m_sQueueSample.m_nEntityIndex & 3] % 11 +
+			                            AUDIO_SAMPLE_INJURED_PED_FEMALE_OUCH_1;
 			break;
 		default: return;
 		}
@@ -9858,17 +8851,17 @@ cAudioManager::SetupPedComments(cPedParams *params, uint32 sound)
 				case SOUND_AMMUNATION_WELCOME_2:
 				case SOUND_AMMUNATION_WELCOME_3: emittingVol = maxVolume; break;
 				default:
-					if(CWorld::GetIsLineOfSightClear(
-					       TheCamera.GetGameCamPosition(),
-					       m_sQueueSample.m_vecPos, 1, 0, 0, 0, 0, 0, 0)) {
+					if(CWorld::GetIsLineOfSightClear(TheCamera.GetGameCamPosition(),
+					                                 m_sQueueSample.m_vecPos, 1, 0, 0, 0, 0, 0,
+					                                 0)) {
 						emittingVol = maxVolume;
 					} else {
 						emittingVol = 31;
 					}
 					break;
 				}
-				m_sQueueSample.m_bVolume = ComputeVolume(
-				    emittingVol, soundIntensity, m_sQueueSample.m_fDistance);
+				m_sQueueSample.m_bVolume =
+				    ComputeVolume(emittingVol, soundIntensity, m_sQueueSample.m_fDistance);
 				pedComment.field_25 = 10;
 				if(m_sQueueSample.m_bVolume) {
 					pedComment.m_entityIndex = m_sQueueSample.m_nEntityIndex;
@@ -9895,34 +8888,29 @@ cAudioManager::SetupSuspectLastSeenReport()
 	int32 color_post_modifier;
 
 	constexpr int32 colors[] = {
-	    3032, 248,  3032, 3032, 249,  3032, 3032, 250,  3032, 3032, 251,  3032, 258,  250,
-	    3032, 3032, 252,  3032, 3032, 253,  3032, 260,  250,  3032, 259,  250,  254,  259,
-	    3032, 3032, 258,  3032, 3032, 258,  3032, 3032, 258,  251,  3032, 3032, 251,  3032,
-	    3032, 251,  3032, 3032, 251,  3032, 3032, 251,  3032, 3032, 251,  3032, 3032, 251,
-	    3032, 259,  3032, 3032, 258,  3032, 3032, 258,  3032, 3032, 258,  3032, 3032, 3032,
-	    255,  3032, 3032, 255,  3032, 3032, 255,  3032, 3032, 255,  3032, 3032, 255,  3032,
-	    3032, 255,  3032, 259,  3032, 3032, 258,  3032, 3032, 258,  3032, 3032, 258,  3032,
-	    3032, 3032, 253,  3032, 3032, 253,  3032, 3032, 253,  3032, 3032, 253,  3032, 3032,
-	    253,  3032, 3032, 253,  3032, 259,  3032, 3032, 258,  3032, 3032, 258,  3032, 3032,
-	    258,  3032, 3032, 3032, 256,  3032, 3032, 256,  3032, 3032, 256,  3032, 3032, 256,
-	    3032, 3032, 256,  3032, 3032, 256,  3032, 259,  3032, 3032, 258,  3032, 3032, 258,
-	    3032, 3032, 258,  3032, 3032, 3032, 250,  3032, 3032, 250,  3032, 3032, 250,  3032,
-	    3032, 250,  3032, 3032, 250,  3032, 3032, 250,  3032, 259,  3032, 3032, 258,  3032,
-	    3032, 258,  3032, 3032, 258,  3032, 3032, 3032, 252,  3032, 3032, 252,  3032, 3032,
-	    252,  3032, 3032, 252,  3032, 3032, 252,  3032, 3032, 252,  3032, 259,  3032, 3032,
-	    258,  3032, 3032, 258,  3032, 3032, 258,  3032, 3032, 3032, 257,  3032, 3032, 257,
-	    3032, 3032, 257,  3032, 3032, 257,  3032, 3032, 257,  3032, 3032, 257,  3032, 259,
-	    3032, 3032, 259,  3032, 3032, 259,  3032, 3032, 259,  3032, 3032, 259,  3032, 3032,
-	    259,  3032, 3032, 259,  3032, 3032, 259,  3032, 3032, 259,  3032, 3032, 259,  3032,
-	    3032, 259,  3032, 3032, 258,  3032, 3032, 258,  3032, 3032, 258,  3032, 3032, 258,
-	    3032, 3032, 258,  3032, 3032};
+	    3032, 248,  3032, 3032, 249,  3032, 3032, 250,  3032, 3032, 251,  3032, 258,  250,  3032, 3032, 252,  3032,
+	    3032, 253,  3032, 260,  250,  3032, 259,  250,  254,  259,  3032, 3032, 258,  3032, 3032, 258,  3032, 3032,
+	    258,  251,  3032, 3032, 251,  3032, 3032, 251,  3032, 3032, 251,  3032, 3032, 251,  3032, 3032, 251,  3032,
+	    3032, 251,  3032, 259,  3032, 3032, 258,  3032, 3032, 258,  3032, 3032, 258,  3032, 3032, 3032, 255,  3032,
+	    3032, 255,  3032, 3032, 255,  3032, 3032, 255,  3032, 3032, 255,  3032, 3032, 255,  3032, 259,  3032, 3032,
+	    258,  3032, 3032, 258,  3032, 3032, 258,  3032, 3032, 3032, 253,  3032, 3032, 253,  3032, 3032, 253,  3032,
+	    3032, 253,  3032, 3032, 253,  3032, 3032, 253,  3032, 259,  3032, 3032, 258,  3032, 3032, 258,  3032, 3032,
+	    258,  3032, 3032, 3032, 256,  3032, 3032, 256,  3032, 3032, 256,  3032, 3032, 256,  3032, 3032, 256,  3032,
+	    3032, 256,  3032, 259,  3032, 3032, 258,  3032, 3032, 258,  3032, 3032, 258,  3032, 3032, 3032, 250,  3032,
+	    3032, 250,  3032, 3032, 250,  3032, 3032, 250,  3032, 3032, 250,  3032, 3032, 250,  3032, 259,  3032, 3032,
+	    258,  3032, 3032, 258,  3032, 3032, 258,  3032, 3032, 3032, 252,  3032, 3032, 252,  3032, 3032, 252,  3032,
+	    3032, 252,  3032, 3032, 252,  3032, 3032, 252,  3032, 259,  3032, 3032, 258,  3032, 3032, 258,  3032, 3032,
+	    258,  3032, 3032, 3032, 257,  3032, 3032, 257,  3032, 3032, 257,  3032, 3032, 257,  3032, 3032, 257,  3032,
+	    3032, 257,  3032, 259,  3032, 3032, 259,  3032, 3032, 259,  3032, 3032, 259,  3032, 3032, 259,  3032, 3032,
+	    259,  3032, 3032, 259,  3032, 3032, 259,  3032, 3032, 259,  3032, 3032, 259,  3032, 3032, 259,  3032, 3032,
+	    258,  3032, 3032, 258,  3032, 3032, 258,  3032, 3032, 258,  3032, 3032, 258,  3032, 3032};
 
 	if(MusicManager.m_nMusicMode != 2) {
 		automobile = (CAutomobile *)FindPlayerVehicle();
 		if(automobile) {
-			if(60 - policeChannelTimer > 9u) {
+			if(60 - policeChannelTimer > 9) {
 				color1 = automobile->m_currentColour1;
-				if(color1 >= 95u) {
+				if(color1 >= 95) {
 					debug("\n *** UNKNOWN CAR COLOUR %d *** ", color1);
 				} else {
 					index = 3 * color1;
@@ -9931,76 +8919,42 @@ cAudioManager::SetupSuspectLastSeenReport()
 					color_post_modifier = colors[index + 2];
 					switch(automobile->m_modelIndex) {
 					case MI_LANDSTAL:
-					case MI_BLISTA:
-						sample = AUDIO_SAMPLE_POLICE_SCANNER_CAR_CRUISER;
-						break;
+					case MI_BLISTA: sample = AUDIO_SAMPLE_POLICE_SCANNER_CAR_CRUISER; break;
 					case MI_IDAHO:
-					case MI_STALLION:
-						sample =
-						    AUDIO_SAMPLE_POLICE_SCANNER_CAR_CONVERTIBLE;
-						break;
+					case MI_STALLION: sample = AUDIO_SAMPLE_POLICE_SCANNER_CAR_CONVERTIBLE; break;
 					case MI_STINGER:
 					case MI_INFERNUS:
 					case MI_CHEETAH:
-					case MI_BANSHEE:
-						sample = AUDIO_SAMPLE_POLICE_SCANNER_CAR_SPORTS_CAR;
-						break;
+					case MI_BANSHEE: sample = AUDIO_SAMPLE_POLICE_SCANNER_CAR_SPORTS_CAR; break;
 					case MI_PEREN:
 					case MI_SENTINEL:
-					case MI_FBICAR:
-						sample = AUDIO_SAMPLE_POLICE_SCANNER_CAR_ECONOMY;
-						break;
+					case MI_FBICAR: sample = AUDIO_SAMPLE_POLICE_SCANNER_CAR_ECONOMY; break;
 					case MI_PATRIOT:
-					case MI_BOBCAT:
-						sample = AUDIO_SAMPLE_POLICE_SCANNER_CAR_PICKUP;
-						break;
-					case MI_FIRETRUCK:
-						sample = AUDIO_SAMPLE_POLICE_SCANNER_CAR_FIRETRUCK;
-						break;
+					case MI_BOBCAT: sample = AUDIO_SAMPLE_POLICE_SCANNER_CAR_PICKUP; break;
+					case MI_FIRETRUCK: sample = AUDIO_SAMPLE_POLICE_SCANNER_CAR_FIRETRUCK; break;
 					case MI_TRASH:
-					case MI_BARRACKS:
-						sample = AUDIO_SAMPLE_POLICE_SCANNER_CAR_TRUCK;
-						break;
-					case MI_STRETCH:
-						sample = AUDIO_SAMPLE_POLICE_SCANNER_CAR_LIMO;
-						break;
+					case MI_BARRACKS: sample = AUDIO_SAMPLE_POLICE_SCANNER_CAR_TRUCK; break;
+					case MI_STRETCH: sample = AUDIO_SAMPLE_POLICE_SCANNER_CAR_LIMO; break;
 					case MI_MANANA:
-					case MI_ESPERANT:
-						sample = AUDIO_SAMPLE_POLICE_SCANNER_CAR_COUPE;
-						break;
+					case MI_ESPERANT: sample = AUDIO_SAMPLE_POLICE_SCANNER_CAR_COUPE; break;
 					case MI_PONY:
 					case MI_MULE:
 					case MI_MOONBEAM:
 					case MI_ENFORCER:
 					case MI_SECURICA:
-					case MI_RUMPO:
-						sample = AUDIO_SAMPLE_POLICE_SCANNER_CAR_VAN;
-						break;
-					case MI_AMBULAN:
-						sample = AUDIO_SAMPLE_POLICE_SCANNER_CAR_AMBULANCE;
-						break;
+					case MI_RUMPO: sample = AUDIO_SAMPLE_POLICE_SCANNER_CAR_VAN; break;
+					case MI_AMBULAN: sample = AUDIO_SAMPLE_POLICE_SCANNER_CAR_AMBULANCE; break;
 					case MI_TAXI:
 					case MI_CABBIE:
-					case MI_BORGNINE:
-						sample = AUDIO_SAMPLE_POLICE_SCANNER_CAR_TAXI;
-						break;
+					case MI_BORGNINE: sample = AUDIO_SAMPLE_POLICE_SCANNER_CAR_TAXI; break;
 					case MI_MRWHOOP:
-						sample =
-						    AUDIO_SAMPLE_POLICE_SCANNER_CAR_ICE_CREAM_TRUCK;
-						break;
-					case MI_BFINJECT:
-						sample = AUDIO_SAMPLE_POLICE_SCANNER_CAR_BUGGY;
-						break;
-					case MI_POLICE:
-						sample = AUDIO_SAMPLE_POLICE_SCANNER_CAR_POLICE_CAR;
-						break;
-					case MI_PREDATOR:
-						sample = AUDIO_SAMPLE_POLICE_SCANNER_CAR_BOAT;
+						sample = AUDIO_SAMPLE_POLICE_SCANNER_CAR_ICE_CREAM_TRUCK;
 						break;
+					case MI_BFINJECT: sample = AUDIO_SAMPLE_POLICE_SCANNER_CAR_BUGGY; break;
+					case MI_POLICE: sample = AUDIO_SAMPLE_POLICE_SCANNER_CAR_POLICE_CAR; break;
+					case MI_PREDATOR: sample = AUDIO_SAMPLE_POLICE_SCANNER_CAR_BOAT; break;
 					case MI_BUS:
-					case MI_COACH:
-						sample = AUDIO_SAMPLE_POLICE_SCANNER_CAR_BUS;
-						break;
+					case MI_COACH: sample = AUDIO_SAMPLE_POLICE_SCANNER_CAR_BUS; break;
 					case MI_RHINO:
 						sample = AUDIO_SAMPLE_POLICE_SCANNER_CAR_TANK;
 						main_color = TOTAL_AUDIO_SAMPLES;
@@ -10019,25 +8973,22 @@ cAudioManager::SetupSuspectLastSeenReport()
 					}
 					if(policeChannelTimer != 60) {
 						crimesSamples[policeChannelTimerSeconds] =
-						    m_anRandomTable[4] % 3u +
+						    m_anRandomTable[4] % 3 +
 						    AUDIO_SAMPLE_POLICE_SCANNER_SMALL_CRACKLE_1;
 						++policeChannelTimer;
-						policeChannelTimerSeconds =
-						    (policeChannelTimerSeconds + 1) % 60;
+						policeChannelTimerSeconds = (policeChannelTimerSeconds + 1) % 60;
 					}
 					if(policeChannelTimer != 60) {
 						crimesSamples[policeChannelTimerSeconds] =
 						    AUDIO_SAMPLE_POLICE_SCANNER_SUSPECT;
 						++policeChannelTimer;
-						policeChannelTimerSeconds =
-						    (policeChannelTimerSeconds + 1) % 60;
+						policeChannelTimerSeconds = (policeChannelTimerSeconds + 1) % 60;
 					}
 					if(m_anRandomTable[3] & 1 && policeChannelTimer != 60) {
 						crimesSamples[policeChannelTimerSeconds] =
 						    AUDIO_SAMPLE_POLICE_SCANNER_LAST_SEEN;
 						++policeChannelTimer;
-						policeChannelTimerSeconds =
-						    (policeChannelTimerSeconds + 1) % 60;
+						policeChannelTimerSeconds = (policeChannelTimerSeconds + 1) % 60;
 					}
 					if(main_color == AUDIO_SAMPLE_POLICE_SCANNER_COLOR_ORANGE) {
 						if(policeChannelTimer != 60) {
@@ -10051,92 +9002,70 @@ cAudioManager::SetupSuspectLastSeenReport()
 						crimesSamples[policeChannelTimerSeconds] =
 						    AUDIO_SAMPLE_POLICE_SCANNER_IN_A;
 						++policeChannelTimer;
-						policeChannelTimerSeconds =
-						    (policeChannelTimerSeconds + 1) % 60;
+						policeChannelTimerSeconds = (policeChannelTimerSeconds + 1) % 60;
 					}
 					if(color_pre_modifier != 3032 && policeChannelTimer != 60) {
-						crimesSamples[policeChannelTimerSeconds] =
-						    color_pre_modifier;
+						crimesSamples[policeChannelTimerSeconds] = color_pre_modifier;
 						++policeChannelTimer;
-						policeChannelTimerSeconds =
-						    (policeChannelTimerSeconds + 1) % 60;
+						policeChannelTimerSeconds = (policeChannelTimerSeconds + 1) % 60;
 					}
 					if(main_color != 3032 && policeChannelTimer != 60) {
-						crimesSamples[policeChannelTimerSeconds] =
-						    main_color;
+						crimesSamples[policeChannelTimerSeconds] = main_color;
 						++policeChannelTimer;
-						policeChannelTimerSeconds =
-						    (policeChannelTimerSeconds + 1) % 60;
+						policeChannelTimerSeconds = (policeChannelTimerSeconds + 1) % 60;
 					}
-					if(color_post_modifier != 3032 &&
-					   policeChannelTimer != 60) {
-						crimesSamples[policeChannelTimerSeconds] =
-						    color_post_modifier;
+					if(color_post_modifier != 3032 && policeChannelTimer != 60) {
+						crimesSamples[policeChannelTimerSeconds] = color_post_modifier;
 						++policeChannelTimer;
-						policeChannelTimerSeconds =
-						    (policeChannelTimerSeconds + 1) % 60;
+						policeChannelTimerSeconds = (policeChannelTimerSeconds + 1) % 60;
 					}
 					if(policeChannelTimer != 60) {
 						crimesSamples[policeChannelTimerSeconds] = sample;
 						++policeChannelTimer;
-						policeChannelTimerSeconds =
-						    (policeChannelTimerSeconds + 1) % 60;
+						policeChannelTimerSeconds = (policeChannelTimerSeconds + 1) % 60;
 					}
 					if(policeChannelTimer != 60) {
 						crimesSamples[policeChannelTimerSeconds] =
-						    m_anRandomTable[0] % 3u +
+						    m_anRandomTable[0] % 3 +
 						    AUDIO_SAMPLE_POLICE_SCANNER_SMALL_CRACKLE_1;
 						++policeChannelTimer;
-						policeChannelTimerSeconds =
-						    (policeChannelTimerSeconds + 1) % 60;
+						policeChannelTimerSeconds = (policeChannelTimerSeconds + 1) % 60;
 					}
 					if(policeChannelTimer != 60) {
-						crimesSamples[policeChannelTimerSeconds] =
-						    TOTAL_AUDIO_SAMPLES;
+						crimesSamples[policeChannelTimerSeconds] = TOTAL_AUDIO_SAMPLES;
 						++policeChannelTimer;
-						policeChannelTimerSeconds =
-						    (policeChannelTimerSeconds + 1) % 60;
+						policeChannelTimerSeconds = (policeChannelTimerSeconds + 1) % 60;
 					}
 				}
 			}
 		} else {
-			if(60 - policeChannelTimer > 4u) {
+			if(60 - policeChannelTimer > 4) {
 				if(policeChannelTimer != 60) {
 					crimesSamples[policeChannelTimerSeconds] =
-					    m_anRandomTable[4] % 3u +
-					    AUDIO_SAMPLE_POLICE_SCANNER_SMALL_CRACKLE_1;
+					    m_anRandomTable[4] % 3 + AUDIO_SAMPLE_POLICE_SCANNER_SMALL_CRACKLE_1;
 					++policeChannelTimer;
-					policeChannelTimerSeconds =
-					    (policeChannelTimerSeconds + 1) % 60;
+					policeChannelTimerSeconds = (policeChannelTimerSeconds + 1) % 60;
+				}
+				if(policeChannelTimer != 60) {
+					crimesSamples[policeChannelTimerSeconds] = AUDIO_SAMPLE_POLICE_SCANNER_SUSPECT;
+					++policeChannelTimer;
+					policeChannelTimerSeconds = (policeChannelTimerSeconds + 1) % 60;
+				}
+				if(policeChannelTimer != 60) {
+					crimesSamples[policeChannelTimerSeconds] = AUDIO_SAMPLE_POLICE_SCANNER_ON_FOOT;
+					++policeChannelTimer;
+					policeChannelTimerSeconds = (policeChannelTimerSeconds + 1) % 60;
 				}
 				if(policeChannelTimer != 60) {
 					crimesSamples[policeChannelTimerSeconds] =
-					    AUDIO_SAMPLE_POLICE_SCANNER_SUSPECT;
+					    m_anRandomTable[0] % 3 + AUDIO_SAMPLE_POLICE_SCANNER_SMALL_CRACKLE_1;
 					++policeChannelTimer;
-					policeChannelTimerSeconds =
-					    (policeChannelTimerSeconds + 1) % 60;
+					policeChannelTimerSeconds = (policeChannelTimerSeconds + 1) % 60;
 				}
 				if(policeChannelTimer != 60) {
-					crimesSamples[policeChannelTimerSeconds] =
-					    AUDIO_SAMPLE_POLICE_SCANNER_ON_FOOT;
+					crimesSamples[policeChannelTimerSeconds] = TOTAL_AUDIO_SAMPLES;
 					++policeChannelTimer;
-					policeChannelTimerSeconds =
-					    (policeChannelTimerSeconds + 1) % 60;
-				}
-				if(policeChannelTimer != 60) {
-					crimesSamples[policeChannelTimerSeconds] =
-					    m_anRandomTable[0] % 3u +
-					    AUDIO_SAMPLE_POLICE_SCANNER_SMALL_CRACKLE_1;
-					++policeChannelTimer;
-					policeChannelTimerSeconds =
-					    (policeChannelTimerSeconds + 1) % 60;
-				}
-				if(policeChannelTimer != 60) {
-					crimesSamples[policeChannelTimerSeconds] =
-					    TOTAL_AUDIO_SAMPLES;
-					++policeChannelTimer;
-					policeChannelTimerSeconds =
-					    (policeChannelTimerSeconds + 1) % 60;
+					policeChannelTimerSeconds = (policeChannelTimerSeconds + 1) % 60;
 				}
 			}
 		}
@@ -10212,8 +9141,7 @@ cAudioManager::UpdateReflections()
 bool
 cAudioManager::UsesReverseWarning(int32 model) const
 {
-	return model == LINERUN || model == FIRETRUK || model == TRASH || model == BUS ||
-	       model == COACH;
+	return model == LINERUN || model == FIRETRUK || model == TRASH || model == BUS || model == COACH;
 }
 
 bool
@@ -10245,27 +9173,22 @@ cAudioManager::UsesSirenSwitching(int32 model) const
 void
 cAudioManager::AdjustSamplesVolume()
 {
-	for(int i = 0; i < m_bSampleRequestQueuesStatus[m_bActiveSampleQueue];
-	    i++) {
-		tActiveSample *pSample =
-		    &m_asSamples[i][(int32)m_abSampleQueueIndexTable[i] + 1];
+	for(int i = 0; i < m_bSampleRequestQueuesStatus[m_bActiveSampleQueue]; i++) {
+		tActiveSample *pSample = &m_asSamples[i][(int32)m_abSampleQueueIndexTable[i] + 1];
 
 		if(!pSample->m_bBankIndex) // all non-speech sounds on PC
 			pSample->m_bEmittingVolume = ComputeEmittingVolume(
-			    pSample->m_bEmittingVolume,
-			    pSample->m_fSoundIntensity, pSample->m_fDistance);
+			    pSample->m_bEmittingVolume, pSample->m_fSoundIntensity, pSample->m_fDistance);
 	}
 }
 
 int32
-cAudioManager::ComputeEmittingVolume(uint8 emittingVolume, float intensity,
-                                     float dist)
+cAudioManager::ComputeEmittingVolume(uint8 emittingVolume, float intensity, float dist)
 {
 	float quatIntensity = intensity / 4.0f;
 	float diffIntensity = intensity - quatIntensity;
 	if(dist > diffIntensity)
-		return (quatIntensity - (dist - diffIntensity)) *
-		       (float)emittingVolume / quatIntensity;
+		return (quatIntensity - (dist - diffIntensity)) * (float)emittingVolume / quatIntensity;
 	return emittingVolume;
 }
 
@@ -10495,7 +9418,6 @@ InjectHook(0x56C3F0, &cAudioManager::UsesSirenSwitching, PATCH_JUMP);
 InjectHook(0x57C2B0, &cAudioManager::AdjustSamplesVolume, PATCH_JUMP);
 InjectHook(0x57C320, &cAudioManager::ComputeEmittingVolume, PATCH_JUMP);
 
-
 InjectHook(0x5755C0, &cPedComments::Add, PATCH_JUMP);
 InjectHook(0x575730, &cPedComments::Process, PATCH_JUMP);
 InjectHook(0x5685E0, &cAudioCollisionManager::AddCollisionToRequestedQueue, PATCH_JUMP);
diff --git a/src/audio/MusicManager.cpp b/src/audio/MusicManager.cpp
index fa1a9390..de4d0489 100644
--- a/src/audio/MusicManager.cpp
+++ b/src/audio/MusicManager.cpp
@@ -64,11 +64,14 @@ cMusicManager::DisplayRadioStationName()
 		if(SampleManager.IsMP3RadioChannelAvailable()) {
 			gStreamedSound = MusicManager.m_nCurrentStreamedSound;
 
-			if(gStreamedSound != STREAMED_SOUND_CITY_AMBIENT &&
-			   gStreamedSound != STREAMED_SOUND_WATER_AMBIENT) {
-				if(gStreamedSound > STREAMED_SOUND_RADIO_MP3_PLAYER) return;
-			} else {
+			if(gStreamedSound == STREAMED_SOUND_CITY_AMBIENT ||
+			   gStreamedSound == STREAMED_SOUND_WATER_AMBIENT) {
 				gStreamedSound = STREAMED_SOUND_RADIO_POLICE;
+			} else {
+
+				if(gStreamedSound >
+				   STREAMED_SOUND_RADIO_MP3_PLAYER)
+					return;
 			}
 
 			pRetune = gNumRetunePresses + gStreamedSound;
@@ -242,4 +245,4 @@ void
 cMusicManager::Service()
 {
 	EAXJMP(0x57D440);
-}
\ No newline at end of file
+}
diff --git a/src/control/CarAI.cpp b/src/control/CarAI.cpp
index c2f2bb43..b4dd8777 100644
--- a/src/control/CarAI.cpp
+++ b/src/control/CarAI.cpp
@@ -592,7 +592,7 @@ void CCarAI::MakeWayForCarWithSiren(CVehicle *pVehicle)
 		CVehicle* vehicle = CPools::GetVehiclePool()->GetSlot(i);
 		if (!vehicle)
 			continue;
-		if (vehicle->m_vehType != VEHICLE_TYPE_AUTOMOBILE && vehicle->m_vehType != VEHICLE_TYPE_BIKE)
+		if (vehicle->m_vehType != VEHICLE_TYPE_CAR && vehicle->m_vehType != VEHICLE_TYPE_BIKE)
 			continue;
 		if (vehicle->m_status != STATUS_SIMPLE && vehicle->m_status != STATUS_PHYSICS)
 			continue;
diff --git a/src/core/AnimViewer.cpp b/src/core/AnimViewer.cpp
index 84de3fe8..86b22ec5 100644
--- a/src/core/AnimViewer.cpp
+++ b/src/core/AnimViewer.cpp
@@ -255,7 +255,7 @@ CAnimViewer::Update(void)
 			if (modelInfo->m_type == MITYPE_VEHICLE) {
 
 				CVehicleModelInfo* veh = (CVehicleModelInfo*)modelInfo;
-				if (veh->m_vehicleType != VEHICLE_TYPE_AUTOMOBILE) {
+				if (veh->m_vehicleType != VEHICLE_TYPE_CAR) {
 					// Not ready yet
 /*					if (veh->m_vehicleType == VEHICLE_TYPE_BOAT)
 					{
diff --git a/src/core/FileLoader.cpp b/src/core/FileLoader.cpp
index f7b69dea..6f3b0971 100644
--- a/src/core/FileLoader.cpp
+++ b/src/core/FileLoader.cpp
@@ -738,7 +738,7 @@ CFileLoader::LoadVehicleObject(const char *line)
 	if(strncmp(type, "car", 4) == 0){
 		mi->m_wheelId = misc;
 		mi->m_wheelScale = wheelScale;
-		mi->m_vehicleType = VEHICLE_TYPE_AUTOMOBILE;
+		mi->m_vehicleType = VEHICLE_TYPE_CAR;
 	}else if(strncmp(type, "boat", 5) == 0){
 		mi->m_vehicleType = VEHICLE_TYPE_BOAT;
 	}else if(strncmp(type, "train", 6) == 0){
diff --git a/src/core/World.cpp b/src/core/World.cpp
index 46d36348..5dea09bd 100644
--- a/src/core/World.cpp
+++ b/src/core/World.cpp
@@ -793,7 +793,7 @@ CWorld::TestSphereAgainstSectorList(CPtrList &list, CVector spherePos, float rad
 						*eCol, &ms_testSpherePoint, nil, nil);
 
 					if (collidedSpheres != 0 ||
-						(e->IsVehicle() && ((CVehicle*)e)->m_vehType == VEHICLE_TYPE_AUTOMOBILE &&
+						(e->IsVehicle() && ((CVehicle*)e)->m_vehType == VEHICLE_TYPE_CAR &&
 						e->m_modelIndex != MI_DODO && radius + eCol->boundingBox.max.x > distance)) {
 						return e;
 					}
diff --git a/src/entities/Physical.cpp b/src/entities/Physical.cpp
index 98b86fe3..fbd1322d 100644
--- a/src/entities/Physical.cpp
+++ b/src/entities/Physical.cpp
@@ -1897,7 +1897,7 @@ CPhysical::ProcessCollision(void)
 		CTimer::SetTimeStep(savedTimeStep);
 		if(IsVehicle()){
 			CVehicle *veh = (CVehicle*)this;
-			if(veh->m_vehType == VEHICLE_TYPE_AUTOMOBILE){
+			if(veh->m_vehType == VEHICLE_TYPE_CAR){
 				CAutomobile *car = (CAutomobile*)this;
 				car->m_aSuspensionSpringRatio[0] = 1.0f;
 				car->m_aSuspensionSpringRatio[1] = 1.0f;
diff --git a/src/modelinfo/VehicleModelInfo.h b/src/modelinfo/VehicleModelInfo.h
index 4d18ba21..1a6d6a55 100644
--- a/src/modelinfo/VehicleModelInfo.h
+++ b/src/modelinfo/VehicleModelInfo.h
@@ -26,7 +26,7 @@ enum {
 };
 
 enum eVehicleType {
-	VEHICLE_TYPE_AUTOMOBILE,
+	VEHICLE_TYPE_CAR,
 	VEHICLE_TYPE_BOAT,
 	VEHICLE_TYPE_TRAIN,
 	VEHICLE_TYPE_HELI,
diff --git a/src/peds/Ped.cpp b/src/peds/Ped.cpp
index f5cec4f4..11141b04 100644
--- a/src/peds/Ped.cpp
+++ b/src/peds/Ped.cpp
@@ -4388,7 +4388,7 @@ CPed::SetEvasiveStep(CEntity *reason, uint8 animType)
 		neededTurn = 2 * PI - neededTurn;
 
 	CVehicle *veh = (CVehicle*)reason;
-	if (reason->IsVehicle() && veh->m_vehType == VEHICLE_TYPE_AUTOMOBILE) {
+	if (reason->IsVehicle() && veh->m_vehType == VEHICLE_TYPE_CAR) {
 		if (veh->m_nCarHornTimer) {
 			vehPressedHorn = true;
 			if (!IsPlayer())
@@ -4456,7 +4456,7 @@ CPed::SetEvasiveDive(CPhysical *reason, uint8 onlyRandomJump)
 
 	angleToFace = m_fRotationCur;
 	CVehicle *veh = (CVehicle*) reason;
-	if (reason->IsVehicle() && veh->m_vehType == VEHICLE_TYPE_AUTOMOBILE && veh->m_nCarHornTimer && !IsPlayer()) {
+	if (reason->IsVehicle() && veh->m_vehType == VEHICLE_TYPE_CAR && veh->m_nCarHornTimer && !IsPlayer()) {
 		onlyRandomJump = true;
 	}
 
@@ -7245,7 +7245,7 @@ CPed::Seek(void)
 									false, true, false, false, false, false);
 
 				if (obstacle) {
-					if (!obstacle->IsVehicle() || ((CVehicle*)obstacle)->m_vehType == VEHICLE_TYPE_AUTOMOBILE) {
+					if (!obstacle->IsVehicle() || ((CVehicle*)obstacle)->m_vehType == VEHICLE_TYPE_CAR) {
 						distanceToCountItDone = 2.5f;
 					} else {
 						CVehicleModelInfo *vehModel = (CVehicleModelInfo*) CModelInfo::GetModelInfo(obstacle->m_modelIndex);
@@ -8481,7 +8481,7 @@ CPed::KillPedWithCar(CVehicle *car, float impulse)
 					if (damageDir > 3)
 						damageDir = damageDir - 4;
 
-					if (car->m_vehType == VEHICLE_TYPE_AUTOMOBILE) {
+					if (car->m_vehType == VEHICLE_TYPE_CAR) {
 						CObject *bonnet = ((CAutomobile*)car)->RemoveBonnetInPedCollision();
 
 						if (bonnet) {
diff --git a/src/vehicles/Automobile.cpp b/src/vehicles/Automobile.cpp
index c0b3dd7c..12c9c940 100644
--- a/src/vehicles/Automobile.cpp
+++ b/src/vehicles/Automobile.cpp
@@ -55,7 +55,7 @@ CAutomobile::CAutomobile(int32 id, uint8 CreatedBy)
 {
 	int i;
 
-	m_vehType = VEHICLE_TYPE_AUTOMOBILE;
+	m_vehType = VEHICLE_TYPE_CAR;
 
 	CVehicleModelInfo *mi = (CVehicleModelInfo*)CModelInfo::GetModelInfo(id);
 	m_fFireBlowUpTimer = 0.0f;
diff --git a/src/vehicles/Vehicle.h b/src/vehicles/Vehicle.h
index 5c5b328e..3046a58f 100644
--- a/src/vehicles/Vehicle.h
+++ b/src/vehicles/Vehicle.h
@@ -230,7 +230,7 @@ public:
 	virtual float GetHeightAboveRoad(void);
 	virtual void PlayCarHorn(void) {}
 
-	bool IsCar(void) { return m_vehType == VEHICLE_TYPE_AUTOMOBILE; }
+	bool IsCar(void) { return m_vehType == VEHICLE_TYPE_CAR; }
 	bool IsBoat(void) { return m_vehType == VEHICLE_TYPE_BOAT; }
 	bool IsTrain(void) { return m_vehType == VEHICLE_TYPE_TRAIN; }
 	bool IsHeli(void) { return m_vehType == VEHICLE_TYPE_HELI; }

From 4af82584e26d9f640fdaf1698b4d0609a5dcda51 Mon Sep 17 00:00:00 2001
From: Sergeanur <s.anureev@yandex.ua>
Date: Sat, 26 Oct 2019 14:09:50 +0300
Subject: [PATCH 21/37] Fixed markers rotation speed

---
 src/render/SpecialFX.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/render/SpecialFX.h b/src/render/SpecialFX.h
index a747d1c9..10b22a77 100644
--- a/src/render/SpecialFX.h
+++ b/src/render/SpecialFX.h
@@ -60,7 +60,7 @@ public:
 	uint32 m_nIdentifier;
 	RwRGBA m_Color;
 	uint16 m_nPulsePeriod;
-	uint16 m_nRotateRate;
+	int16 m_nRotateRate;
 	uint32 m_nStartTime;
 	float m_fPulseFraction;
 	float m_fStdSize;

From d9fb2cc56f942ca1738f26e0a5a8fec80fbcf374 Mon Sep 17 00:00:00 2001
From: Sergeanur <s.anureev@yandex.ua>
Date: Sat, 26 Oct 2019 14:12:24 +0300
Subject: [PATCH 22/37] VisibilityPlugins callbacks and fixes

---
 src/render/VisibilityPlugins.cpp | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/render/VisibilityPlugins.cpp b/src/render/VisibilityPlugins.cpp
index 2107813b..6a2f77a1 100644
--- a/src/render/VisibilityPlugins.cpp
+++ b/src/render/VisibilityPlugins.cpp
@@ -7,6 +7,7 @@
 #include "Renderer.h"
 #include "Camera.h"
 #include "VisibilityPlugins.h"
+#include "World.h"
 
 #define FADE_DISTANCE 20.0f
 
@@ -43,7 +44,7 @@ CVisibilityPlugins::Initialise(void)
 	m_alphaList.Init(20);
 	m_alphaList.head.item.sort = 0.0f;
 	m_alphaList.tail.item.sort = 100000000.0f;
-	m_alphaEntityList.Init(350);	// TODO: set back to 150 when things are fixed
+	m_alphaEntityList.Init(150);
 	m_alphaEntityList.head.item.sort = 0.0f;
 	m_alphaEntityList.tail.item.sort = 100000000.0f;
 }
@@ -498,14 +499,11 @@ CVisibilityPlugins::RenderTrainHiDetailAlphaCB(RpAtomic *atomic)
 	return atomic;
 }
 
-// TODO: this is part of a struct
-static RwTexture *&playerskin = *(RwTexture**)0x941428;
-
 RpAtomic*
 CVisibilityPlugins::RenderPlayerCB(RpAtomic *atomic)
 {
-	if(playerskin)
-		RpGeometryForAllMaterials(RpAtomicGetGeometry(atomic), SetTextureCB, playerskin);
+	if(CWorld::Players[0].m_pSkinTexture)
+		RpGeometryForAllMaterials(RpAtomicGetGeometry(atomic), SetTextureCB, CWorld::Players[0].m_pSkinTexture);
 	AtomicDefaultRenderCallBack(atomic);
 	return atomic;
 }
@@ -607,22 +605,30 @@ CVisibilityPlugins::DefaultVisibilityCB(RpClump *clump)
 bool
 CVisibilityPlugins::FrustumSphereCB(RpClump *clump)
 {
-	// TODO, but unused
-	return true;
+	RwSphere sphere;
+	RwFrame *frame = RpClumpGetFrame(clump);
+
+	CClumpModelInfo *modelInfo = (CClumpModelInfo*)GetFrameHierarchyId(frame);
+	sphere.radius = modelInfo->GetColModel()->boundingSphere.radius;
+	sphere.center.x = modelInfo->GetColModel()->boundingSphere.center.x;
+	sphere.center.y = modelInfo->GetColModel()->boundingSphere.center.y;
+	sphere.center.z = modelInfo->GetColModel()->boundingSphere.center.z;
+	RwV3dTransformPoints(&sphere.center, &sphere.center, 1, RwFrameGetLTM(frame));
+	return RwCameraFrustumTestSphere(ms_pCamera, &sphere) != rwSPHEREOUTSIDE;
 }
 
 bool
 CVisibilityPlugins::VehicleVisibilityCB(RpClump *clump)
 {
-	// TODO, but unused
-	return true;
+	if (GetDistanceSquaredFromCamera(RpClumpGetFrame(clump)) <= ms_vehicleLod1Dist)
+		return FrustumSphereCB(clump);
+	return false;
 }
 
 bool
 CVisibilityPlugins::VehicleVisibilityCB_BigVehicle(RpClump *clump)
 {
-	// TODO, but unused
-	return true;
+	return FrustumSphereCB(clump);
 }
 
 

From f62555c28ef41eeb663cab2ad4616b3bdc3d0726 Mon Sep 17 00:00:00 2001
From: Sergeanur <s.anureev@yandex.ua>
Date: Sat, 26 Oct 2019 14:13:00 +0300
Subject: [PATCH 23/37] CPedIK limb movement info reversed

---
 src/peds/PedIK.cpp | 10 +++++-----
 src/peds/PedIK.h   |  9 +++++----
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/peds/PedIK.cpp b/src/peds/PedIK.cpp
index 4912da97..86f1bf1e 100644
--- a/src/peds/PedIK.cpp
+++ b/src/peds/PedIK.cpp
@@ -10,11 +10,11 @@ WRAPPER void CPedIK::ExtractYawAndPitchLocal(RwMatrixTag*, float*, float*) { EAX
 WRAPPER void CPedIK::ExtractYawAndPitchWorld(RwMatrixTag*, float*, float*) { EAXJMP(0x4ED140); }
 WRAPPER bool CPedIK::RestoreLookAt(void) { EAXJMP(0x4ED810); }
 
-// TODO: These are hardcoded into exe, reverse it.
-LimbMovementInfo &CPedIK::ms_torsoInfo = *(LimbMovementInfo*)0x5F9F8C;
-LimbMovementInfo &CPedIK::ms_headInfo = *(LimbMovementInfo*)0x5F9F5C;
-LimbMovementInfo &CPedIK::ms_upperArmInfo = *(LimbMovementInfo*)0x5F9FA4;
-LimbMovementInfo &CPedIK::ms_lowerArmInfo = *(LimbMovementInfo*)0x5F9FBC;
+LimbMovementInfo CPedIK::ms_torsoInfo = { DEGTORAD(50.0f), DEGTORAD(-50.0f), DEGTORAD(15.0f), DEGTORAD(45.0f), DEGTORAD(-45.0f), DEGTORAD(7.0f) };
+LimbMovementInfo CPedIK::ms_headInfo = { DEGTORAD(90.0f), DEGTORAD(-90.0f), DEGTORAD(10.0f), DEGTORAD(45.0f), DEGTORAD(-45.0f), DEGTORAD(5.0f) };
+LimbMovementInfo CPedIK::ms_headRestoreInfo = { DEGTORAD(90.0f), DEGTORAD(-90.0f), DEGTORAD(10.0f), DEGTORAD(45.0f), DEGTORAD(-45.0f), DEGTORAD(5.0f) };
+LimbMovementInfo CPedIK::ms_upperArmInfo = { DEGTORAD(20.0f), DEGTORAD(-100.0f), DEGTORAD(20.0f), DEGTORAD(70.0f), DEGTORAD(-70.0f), DEGTORAD(10.0f) };
+LimbMovementInfo CPedIK::ms_lowerArmInfo = { DEGTORAD(80.0f), DEGTORAD(0.0f), DEGTORAD(20.0f), DEGTORAD(90.0f), DEGTORAD(-90.0f), DEGTORAD(5.0f) };
 
 CPedIK::CPedIK(CPed *ped)
 {
diff --git a/src/peds/PedIK.h b/src/peds/PedIK.h
index c1600ebb..be063003 100644
--- a/src/peds/PedIK.h
+++ b/src/peds/PedIK.h
@@ -42,10 +42,11 @@ public:
 	LimbOrientation m_lowerArmOrient;
 	int32 m_flags;
 
-	static LimbMovementInfo &ms_torsoInfo;
-	static LimbMovementInfo &ms_headInfo;
-	static LimbMovementInfo &ms_upperArmInfo;
-	static LimbMovementInfo &ms_lowerArmInfo;
+	static LimbMovementInfo ms_torsoInfo;
+	static LimbMovementInfo ms_headInfo;
+	static LimbMovementInfo ms_headRestoreInfo;
+	static LimbMovementInfo ms_upperArmInfo;
+	static LimbMovementInfo ms_lowerArmInfo;
 
 	CPedIK(CPed *ped);
 	bool PointGunInDirection(float phi, float theta);

From b6cb716452eaf9cdffed3055c032ca443e179f57 Mon Sep 17 00:00:00 2001
From: Sergeanur <s.anureev@yandex.ua>
Date: Sat, 26 Oct 2019 14:35:45 +0300
Subject: [PATCH 24/37] Fixed CGameLogic::PassTime types

---
 src/control/GameLogic.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/control/GameLogic.cpp b/src/control/GameLogic.cpp
index ed101cad..0ed5d5cf 100644
--- a/src/control/GameLogic.cpp
+++ b/src/control/GameLogic.cpp
@@ -30,7 +30,7 @@ CGameLogic::InitAtStartOfGame()
 void
 CGameLogic::PassTime(uint32 time)
 {
-	uint8 minutes, hours, days;
+	int32 minutes, hours, days;
 
 	minutes = time + CClock::GetMinutes();
 	hours = CClock::GetHours();

From 832572664c594e060813c46860fc71b0a2ac1710 Mon Sep 17 00:00:00 2001
From: Sergeanur <s.anureev@yandex.ua>
Date: Sat, 26 Oct 2019 14:40:52 +0300
Subject: [PATCH 25/37] Added timing to RwTextureGtaStreamRead

---
 src/core/RwTexRead.cpp | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/core/RwTexRead.cpp b/src/core/RwTexRead.cpp
index a1a7050a..6b717b34 100644
--- a/src/core/RwTexRead.cpp
+++ b/src/core/RwTexRead.cpp
@@ -1,5 +1,15 @@
+#pragma warning( push )
+#pragma warning( disable : 4005)
+#define DIRECTINPUT_VERSION 0x0800
+#include <dinput.h>
+#pragma warning( pop )
 #include "common.h"
+#include "win.h"
 #include "patcher.h"
+#include "Timer.h"
+
+float &texLoadTime = *(float*)0x8F1B50;
+int32 &texNumLoaded = *(int32*)0x8F252C;
 
 RwTexture*
 RwTextureGtaStreamRead(RwStream *stream)
@@ -10,11 +20,15 @@ RwTextureGtaStreamRead(RwStream *stream)
 	if(!RwStreamFindChunk(stream, rwID_TEXTURENATIVE, &size, &version))
 		return nil;
 
-	// TODO: unused timing
+	float preloadTime = (float)CTimer::GetCurrentTimeInCycles() / (float)CTimer::GetCyclesPerMillisecond();
 
 	if(!RWSRCGLOBAL(stdFunc[rwSTANDARDNATIVETEXTUREREAD](stream, &tex, size)))
 		return nil;
- 
+
+	if (gGameState == GS_INIT_PLAYING_GAME) {
+		texLoadTime = (texNumLoaded * texLoadTime + (float)CTimer::GetCurrentTimeInCycles() / (float)CTimer::GetCyclesPerMillisecond() - preloadTime) / (float)(texNumLoaded+1);
+		texNumLoaded++;
+	}
 	return tex;
 }
 

From d5a72fa597e7d0885f7a398e204c4085aff5c241 Mon Sep 17 00:00:00 2001
From: Sergeanur <s.anureev@yandex.ua>
Date: Sat, 26 Oct 2019 15:20:12 +0300
Subject: [PATCH 26/37] Audio stuff moved around, removed MusicManager
 dependencies, eMusicMode used for ChangeMusicMode

---
 src/audio/AudioManager.cpp |   4 +-
 src/audio/AudioManager.h   | 131 +++++++++++++++++++-
 src/audio/AudioSamples.h   | 127 -------------------
 src/audio/DMAudio.h        |   1 +
 src/audio/MusicManager.cpp |  17 +--
 src/audio/MusicManager.h   | 242 ++-----------------------------------
 src/audio/audio.h          | 228 ++++++++++++++++++++++++++++++++++
 src/control/Replay.cpp     |   6 +-
 src/core/CutsceneMgr.cpp   |   5 +-
 src/core/Frontend.cpp      |   3 +-
 src/peds/Ped.cpp           |   1 -
 src/skel/win/win.cpp       |   4 +-
 src/skel/win/win.h         |   1 +
 src/vehicles/Vehicle.cpp   |   1 -
 14 files changed, 382 insertions(+), 389 deletions(-)
 create mode 100644 src/audio/audio.h

diff --git a/src/audio/AudioManager.cpp b/src/audio/AudioManager.cpp
index 1428bb9f..19c994e3 100644
--- a/src/audio/AudioManager.cpp
+++ b/src/audio/AudioManager.cpp
@@ -582,8 +582,8 @@ cAudioManager::ComputePan(float dist, CVector *vec)
 	return min(107, panTable[index] + 63);
 }
 
-uint32
-cAudioManager::ComputeVolume(int emittingVolume, float soundIntensity, float distance) const
+uint8
+cAudioManager::ComputeVolume(uint8 emittingVolume, float soundIntensity, float distance) const
 {
 	float newSoundIntensity;
 	if(soundIntensity <= 0.0f) return 0;
diff --git a/src/audio/AudioManager.h b/src/audio/AudioManager.h
index d9224ced..6ac6dda7 100644
--- a/src/audio/AudioManager.h
+++ b/src/audio/AudioManager.h
@@ -1,9 +1,136 @@
 #pragma once
 
-#include "AudioSamples.h"
 #include "DMAudio.h"
 #include "common.h"
 
+enum eScriptSounds : int16
+{
+	SCRIPT_SOUND_0 = 0,
+	SCRIPT_SOUND_1 = 1,
+	SCRIPT_SOUND_2 = 2,
+	SCRIPT_SOUND_3 = 3,
+	SCRIPT_SOUND_PARTY_1_LOOP_S = 4,
+	SCRIPT_SOUND_PARTY_1_LOOP_L = 5,
+	SCRIPT_SOUND_PARTY_2_LOOP_S = 6,
+	SCRIPT_SOUND_PARTY_2_LOOP_L = 7,
+	SCRIPT_SOUND_PARTY_3_LOOP_S = 8,
+	SCRIPT_SOUND_PARTY_3_LOOP_L = 9,
+	SCRIPT_SOUND_PARTY_4_LOOP_S = 10,
+	SCRIPT_SOUND_PARTY_4_LOOP_L = 11,
+	SCRIPT_SOUND_PARTY_5_LOOP_S = 12,
+	SCRIPT_SOUND_PARTY_5_LOOP_L = 13,
+	SCRIPT_SOUND_PARTY_6_LOOP_S = 14,
+	SCRIPT_SOUND_PARTY_6_LOOP_L = 15,
+	SCRIPT_SOUND_PARTY_7_LOOP_S = 16,
+	SCRIPT_SOUND_PARTY_7_LOOP_L = 17,
+	SCRIPT_SOUND_PARTY_8_LOOP_S = 18,
+	SCRIPT_SOUND_PARTY_8_LOOP_L = 19,
+	SCRIPT_SOUND_PARTY_9_LOOP_S = 20,
+	SCRIPT_SOUND_PARTY_9_LOOP_L = 21,
+	SCRIPT_SOUND_PARTY_10_LOOP_S = 22,
+	SCRIPT_SOUND_PARTY_10_LOOP_L = 23,
+	SCRIPT_SOUND_PARTY_11_LOOP_S = 24,
+	SCRIPT_SOUND_PARTY_11_LOOP_L = 25,
+	SCRIPT_SOUND_PARTY_12_LOOP_S = 26,
+	SCRIPT_SOUND_PARTY_12_LOOP_L = 27,
+	SCRIPT_SOUND_PARTY_13_LOOP_S = 28,
+	SCRIPT_SOUND_PARTY_13_LOOP_L = 29,
+	SCRIPT_SOUND_STRIP_CLUB_LOOP_1_S = 30,
+	SCRIPT_SOUND_STRIP_CLUB_LOOP_1_L = 31,
+	SCRIPT_SOUND_STRIP_CLUB_LOOP_2_S = 32,
+	SCRIPT_SOUND_STRIP_CLUB_LOOP_2_L = 33,
+	SCRIPT_SOUND_WORK_SHOP_LOOP_S = 34,
+	SCRIPT_SOUND_WORK_SHOP_LOOP_L = 35,
+	SCRIPT_SOUND_SAWMILL_LOOP_S = 36,
+	SCRIPT_SOUND_SAWMILL_LOOP_L = 37,
+	SCRIPT_SOUND_38 = 38,
+	SCRIPT_SOUND_39 = 39,
+	SCRIPT_SOUND_LAUNDERETTE_LOOP_S = 40,
+	SCRIPT_SOUND_LAUNDERETTE_LOOP_L = 41,
+	SCRIPT_SOUND_CHINATOWN_RESTAURANT_S = 42,
+	SCRIPT_SOUND_CHINATOWN_RESTAURANT_L = 43,
+	SCRIPT_SOUND_CIPRIANI_RESAURANT_S = 44,
+	SCRIPT_SOUND_CIPRIANI_RESAURANT_L = 45,
+	SCRIPT_SOUND_46 = 46,
+	SCRIPT_SOUND_47 = 47,
+	SCRIPT_SOUND_MARCO_BISTRO_S = 48,
+	SCRIPT_SOUND_MARCO_BISTRO_L = 49,
+	SCRIPT_SOUND_AIRPORT_LOOP_S = 50,
+	SCRIPT_SOUND_AIRPORT_LOOP_L = 51,
+	SCRIPT_SOUND_SHOP_LOOP_S = 52,
+	SCRIPT_SOUND_SHOP_LOOP_L = 53,
+	SCRIPT_SOUND_CINEMA_LOOP_S = 54,
+	SCRIPT_SOUND_CINEMA_LOOP_L = 55,
+	SCRIPT_SOUND_DOCKS_LOOP_S = 56,
+	SCRIPT_SOUND_DOCKS_LOOP_L = 57,
+	SCRIPT_SOUND_HOME_LOOP_S = 58,
+	SCRIPT_SOUND_HOME_LOOP_L = 59,
+	SCRIPT_SOUND_FRANKIE_PIANO = 60,
+	SCRIPT_SOUND_PARTY_1_LOOP = 61,
+	SCRIPT_SOUND_PORN_CINEMA_1_S = 62,
+	SCRIPT_SOUND_PORN_CINEMA_1_L = 63,
+	SCRIPT_SOUND_PORN_CINEMA_2_S = 64,
+	SCRIPT_SOUND_PORN_CINEMA_2_L = 65,
+	SCRIPT_SOUND_PORN_CINEMA_3_S = 66,
+	SCRIPT_SOUND_PORN_CINEMA_3_L = 67,
+	SCRIPT_SOUND_BANK_ALARM_LOOP_S = 68,
+	SCRIPT_SOUND_BANK_ALARM_LOOP_L = 69,
+	SCRIPT_SOUND_POLICE_BALL_LOOP_S = 70,
+	SCRIPT_SOUND_POLICE_BALL_LOOP_L = 71,
+	SCRIPT_SOUND_RAVE_LOOP_INDUSTRIAL_S = 72,
+	SCRIPT_SOUND_RAVE_LOOP_INDUSTRIAL_L = 73,
+	SCRIPT_SOUND_74 = 74,
+	SCRIPT_SOUND_75 = 75,
+	SCRIPT_SOUND_POLICE_CELL_BEATING_LOOP_S = 76,
+	SCRIPT_SOUND_POLICE_CELL_BEATING_LOOP_L = 77,
+	SCRIPT_SOUND_INJURED_PED_MALE_OUCH_S = 78,
+	SCRIPT_SOUND_INJURED_PED_MALE_OUCH_L = 79,
+	SCRIPT_SOUND_INJURED_PED_FEMALE_OUCH_S = 80,
+	SCRIPT_SOUND_INJURED_PED_FEMALE_OUCH_L = 81,
+	SCRIPT_SOUND_EVIDENCE_PICKUP = 82,
+	SCRIPT_SOUND_UNLOAD_GOLD = 83,
+	SCRIPT_SOUND_RAVE_1_LOOP_S = 84,
+	SCRIPT_SOUND_RAVE_1_LOOP_L = 85,
+	SCRIPT_SOUND_RAVE_2_LOOP_S = 86,
+	SCRIPT_SOUND_RAVE_2_LOOP_L = 87,
+	SCRIPT_SOUND_RAVE_3_LOOP_S = 88,
+	SCRIPT_SOUND_RAVE_3_LOOP_L = 89,
+	SCRIPT_SOUND_MISTY_SEX_S = 90,
+	SCRIPT_SOUND_MISTY_SEX_L = 91,
+	SCRIPT_SOUND_GATE_START_CLUNK = 92,
+	SCRIPT_SOUND_GATE_STOP_CLUNK = 93,
+	SCRIPT_SOUND_PART_MISSION_COMPLETE = 94,
+	SCRIPT_SOUND_CHUNKY_RUN_SHOUT = 95,
+	SCRIPT_SOUND_SECURITY_GUARD_AWAY_SHOUT = 96,
+	SCRIPT_SOUND_RACE_START_3 = 97,
+	SCRIPT_SOUND_RACE_START_2 = 98,
+	SCRIPT_SOUND_RACE_START_1 = 99,
+	SCRIPT_SOUND_RACE_START_GO = 100,
+	SCRIPT_SOUND_SWAT_PED_SHOUT = 101,
+	SCRIPT_SOUND_PRETEND_FIRE_LOOP = 102,
+	SCRIPT_SOUND_AMMUNATION_CHAT_1 = 103,
+	SCRIPT_SOUND_AMMUNATION_CHAT_2 = 104,
+	SCRIPT_SOUND_AMMUNATION_CHAT_3 = 105,
+	SCRIPT_SOUND_BULLET_HIT_GROUND_1 = 106,
+	SCRIPT_SOUND_BULLET_HIT_GROUND_2 = 107,
+	SCRIPT_SOUND_BULLET_HIT_GROUND_3 = 108,
+	SCRIPT_SOUND_109 = 109,
+	SCRIPT_SOUND_110 = 110,
+	SCRIPT_SOUND_111 = 111,
+	SCRIPT_SOUND_PAYPHONE_RINGING = 112,
+	SCRIPT_SOUND_113 = 113,
+	SCRIPT_SOUND_GLASS_BREAK_L = 114,
+	SCRIPT_SOUND_GLASS_BREAK_S = 115,
+	SCRIPT_SOUND_GLASS_CRACK = 116,
+	SCRIPT_SOUND_GLASS_LIGHT_BREAK = 117,
+	SCRIPT_SOUND_BOX_DESTROYED_1 = 118,
+	SCRIPT_SOUND_BOX_DESTROYED_2 = 119,
+	SCRIPT_SOUND_METAL_COLLISION = 120,
+	SCRIPT_SOUND_TIRE_COLLISION = 121,
+	SCRIPT_SOUND_GUNSHELL_DROP = 122,
+	SCRIPT_SOUND_GUNSHELL_DROP_SOFT = 123,
+};
+
 class tActiveSample
 {
 public:
@@ -321,7 +448,7 @@ public:
 	int32 ComputeDopplerEffectedFrequency(uint32 oldFreq, float position1, float position2,
 	                                      float speedMultiplier) const;                   /// ok
 	int32 ComputePan(float, CVector *);                                                   /// ok
-	uint32 ComputeVolume(int emittingVolume, float soundIntensity, float distance) const; /// ok
+	uint8 ComputeVolume(uint8 emittingVolume, float soundIntensity, float distance) const; /// ok
 	int32 CreateEntity(int32 type, CPhysical *entity);                                    /// ok
 
 	void DestroyAllGameCreatedEntities(); /// ok
diff --git a/src/audio/AudioSamples.h b/src/audio/AudioSamples.h
index 7d71be54..2c4f8df8 100644
--- a/src/audio/AudioSamples.h
+++ b/src/audio/AudioSamples.h
@@ -3047,130 +3047,3 @@ enum eAudioSamples : uint32 {
 	SAMPLEBANK_PED_MAX   = AUDIO_SAMPLE_AMMUNATION_WELCOME_3+1,
 };
 
-enum eScriptSounds : int16
-{
-  SCRIPT_SOUND_0 = 0,
-  SCRIPT_SOUND_1 = 1,
-  SCRIPT_SOUND_2 = 2,
-  SCRIPT_SOUND_3 = 3,
-  SCRIPT_SOUND_PARTY_1_LOOP_S = 4,
-  SCRIPT_SOUND_PARTY_1_LOOP_L = 5,
-  SCRIPT_SOUND_PARTY_2_LOOP_S = 6,
-  SCRIPT_SOUND_PARTY_2_LOOP_L = 7,
-  SCRIPT_SOUND_PARTY_3_LOOP_S = 8,
-  SCRIPT_SOUND_PARTY_3_LOOP_L = 9,
-  SCRIPT_SOUND_PARTY_4_LOOP_S = 10,
-  SCRIPT_SOUND_PARTY_4_LOOP_L = 11,
-  SCRIPT_SOUND_PARTY_5_LOOP_S = 12,
-  SCRIPT_SOUND_PARTY_5_LOOP_L = 13,
-  SCRIPT_SOUND_PARTY_6_LOOP_S = 14,
-  SCRIPT_SOUND_PARTY_6_LOOP_L = 15,
-  SCRIPT_SOUND_PARTY_7_LOOP_S = 16,
-  SCRIPT_SOUND_PARTY_7_LOOP_L = 17,
-  SCRIPT_SOUND_PARTY_8_LOOP_S = 18,
-  SCRIPT_SOUND_PARTY_8_LOOP_L = 19,
-  SCRIPT_SOUND_PARTY_9_LOOP_S = 20,
-  SCRIPT_SOUND_PARTY_9_LOOP_L = 21,
-  SCRIPT_SOUND_PARTY_10_LOOP_S = 22,
-  SCRIPT_SOUND_PARTY_10_LOOP_L = 23,
-  SCRIPT_SOUND_PARTY_11_LOOP_S = 24,
-  SCRIPT_SOUND_PARTY_11_LOOP_L = 25,
-  SCRIPT_SOUND_PARTY_12_LOOP_S = 26,
-  SCRIPT_SOUND_PARTY_12_LOOP_L = 27,
-  SCRIPT_SOUND_PARTY_13_LOOP_S = 28,
-  SCRIPT_SOUND_PARTY_13_LOOP_L = 29,
-  SCRIPT_SOUND_STRIP_CLUB_LOOP_1_S = 30,
-  SCRIPT_SOUND_STRIP_CLUB_LOOP_1_L = 31,
-  SCRIPT_SOUND_STRIP_CLUB_LOOP_2_S = 32,
-  SCRIPT_SOUND_STRIP_CLUB_LOOP_2_L = 33,
-  SCRIPT_SOUND_WORK_SHOP_LOOP_S = 34,
-  SCRIPT_SOUND_WORK_SHOP_LOOP_L = 35,
-  SCRIPT_SOUND_SAWMILL_LOOP_S = 36,
-  SCRIPT_SOUND_SAWMILL_LOOP_L = 37,
-  SCRIPT_SOUND_38 = 38,
-  SCRIPT_SOUND_39 = 39,
-  SCRIPT_SOUND_LAUNDERETTE_LOOP_S = 40,
-  SCRIPT_SOUND_LAUNDERETTE_LOOP_L = 41,
-  SCRIPT_SOUND_CHINATOWN_RESTAURANT_S = 42,
-  SCRIPT_SOUND_CHINATOWN_RESTAURANT_L = 43,
-  SCRIPT_SOUND_CIPRIANI_RESAURANT_S = 44,
-  SCRIPT_SOUND_CIPRIANI_RESAURANT_L = 45,
-  SCRIPT_SOUND_46 = 46,
-  SCRIPT_SOUND_47 = 47,
-  SCRIPT_SOUND_MARCO_BISTRO_S = 48,
-  SCRIPT_SOUND_MARCO_BISTRO_L = 49,
-  SCRIPT_SOUND_AIRPORT_LOOP_S = 50,
-  SCRIPT_SOUND_AIRPORT_LOOP_L = 51,
-  SCRIPT_SOUND_SHOP_LOOP_S = 52,
-  SCRIPT_SOUND_SHOP_LOOP_L = 53,
-  SCRIPT_SOUND_CINEMA_LOOP_S = 54,
-  SCRIPT_SOUND_CINEMA_LOOP_L = 55,
-  SCRIPT_SOUND_DOCKS_LOOP_S = 56,
-  SCRIPT_SOUND_DOCKS_LOOP_L = 57,
-  SCRIPT_SOUND_HOME_LOOP_S = 58,
-  SCRIPT_SOUND_HOME_LOOP_L = 59,
-  SCRIPT_SOUND_FRANKIE_PIANO = 60,
-  SCRIPT_SOUND_PARTY_1_LOOP = 61,
-  SCRIPT_SOUND_PORN_CINEMA_1_S = 62,
-  SCRIPT_SOUND_PORN_CINEMA_1_L = 63,
-  SCRIPT_SOUND_PORN_CINEMA_2_S = 64,
-  SCRIPT_SOUND_PORN_CINEMA_2_L = 65,
-  SCRIPT_SOUND_PORN_CINEMA_3_S = 66,
-  SCRIPT_SOUND_PORN_CINEMA_3_L = 67,
-  SCRIPT_SOUND_BANK_ALARM_LOOP_S = 68,
-  SCRIPT_SOUND_BANK_ALARM_LOOP_L = 69,
-  SCRIPT_SOUND_POLICE_BALL_LOOP_S = 70,
-  SCRIPT_SOUND_POLICE_BALL_LOOP_L = 71,
-  SCRIPT_SOUND_RAVE_LOOP_INDUSTRIAL_S = 72,
-  SCRIPT_SOUND_RAVE_LOOP_INDUSTRIAL_L = 73,
-  SCRIPT_SOUND_74 = 74,
-  SCRIPT_SOUND_75 = 75,
-  SCRIPT_SOUND_POLICE_CELL_BEATING_LOOP_S = 76,
-  SCRIPT_SOUND_POLICE_CELL_BEATING_LOOP_L = 77,
-  SCRIPT_SOUND_INJURED_PED_MALE_OUCH_S = 78,
-  SCRIPT_SOUND_INJURED_PED_MALE_OUCH_L = 79,
-  SCRIPT_SOUND_INJURED_PED_FEMALE_OUCH_S = 80,
-  SCRIPT_SOUND_INJURED_PED_FEMALE_OUCH_L = 81,
-  SCRIPT_SOUND_EVIDENCE_PICKUP = 82,
-  SCRIPT_SOUND_UNLOAD_GOLD = 83,
-  SCRIPT_SOUND_RAVE_1_LOOP_S = 84,
-  SCRIPT_SOUND_RAVE_1_LOOP_L = 85,
-  SCRIPT_SOUND_RAVE_2_LOOP_S = 86,
-  SCRIPT_SOUND_RAVE_2_LOOP_L = 87,
-  SCRIPT_SOUND_RAVE_3_LOOP_S = 88,
-  SCRIPT_SOUND_RAVE_3_LOOP_L = 89,
-  SCRIPT_SOUND_MISTY_SEX_S = 90,
-  SCRIPT_SOUND_MISTY_SEX_L = 91,
-  SCRIPT_SOUND_GATE_START_CLUNK = 92,
-  SCRIPT_SOUND_GATE_STOP_CLUNK = 93,
-  SCRIPT_SOUND_PART_MISSION_COMPLETE = 94,
-  SCRIPT_SOUND_CHUNKY_RUN_SHOUT = 95,
-  SCRIPT_SOUND_SECURITY_GUARD_AWAY_SHOUT = 96,
-  SCRIPT_SOUND_RACE_START_3 = 97,
-  SCRIPT_SOUND_RACE_START_2 = 98,
-  SCRIPT_SOUND_RACE_START_1 = 99,
-  SCRIPT_SOUND_RACE_START_GO = 100,
-  SCRIPT_SOUND_SWAT_PED_SHOUT = 101,
-  SCRIPT_SOUND_PRETEND_FIRE_LOOP = 102,
-  SCRIPT_SOUND_AMMUNATION_CHAT_1 = 103,
-  SCRIPT_SOUND_AMMUNATION_CHAT_2 = 104,
-  SCRIPT_SOUND_AMMUNATION_CHAT_3 = 105,
-  SCRIPT_SOUND_BULLET_HIT_GROUND_1 = 106,
-  SCRIPT_SOUND_BULLET_HIT_GROUND_2 = 107,
-  SCRIPT_SOUND_BULLET_HIT_GROUND_3 = 108,
-  SCRIPT_SOUND_109 = 109,
-  SCRIPT_SOUND_110 = 110,
-  SCRIPT_SOUND_111 = 111,
-  SCRIPT_SOUND_PAYPHONE_RINGING = 112,
-  SCRIPT_SOUND_113 = 113,
-  SCRIPT_SOUND_GLASS_BREAK_L = 114,
-  SCRIPT_SOUND_GLASS_BREAK_S = 115,
-  SCRIPT_SOUND_GLASS_CRACK = 116,
-  SCRIPT_SOUND_GLASS_LIGHT_BREAK = 117,
-  SCRIPT_SOUND_BOX_DESTROYED_1 = 118,
-  SCRIPT_SOUND_BOX_DESTROYED_2 = 119,
-  SCRIPT_SOUND_METAL_COLLISION = 120,
-  SCRIPT_SOUND_TIRE_COLLISION = 121,
-  SCRIPT_SOUND_GUNSHELL_DROP = 122,
-  SCRIPT_SOUND_GUNSHELL_DROP_SOFT = 123,
-};
diff --git a/src/audio/DMAudio.h b/src/audio/DMAudio.h
index 9c551733..4111f64f 100644
--- a/src/audio/DMAudio.h
+++ b/src/audio/DMAudio.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "audio.h"
 #include "Wanted.h"
 
 enum eSound : int16
diff --git a/src/audio/MusicManager.cpp b/src/audio/MusicManager.cpp
index de4d0489..1d059a46 100644
--- a/src/audio/MusicManager.cpp
+++ b/src/audio/MusicManager.cpp
@@ -1,3 +1,4 @@
+#include "common.h"
 #include "MusicManager.h"
 #include "Camera.h"
 #include "Font.h"
@@ -15,12 +16,6 @@ int32 &gNumRetunePresses = *(int32 *)0x650B80;
 wchar *pCurrentStation = (wchar *)0x650B9C;
 uint8 &cDisplay = *(uint8 *)0x650BA1;
 
-WRAPPER char *
-cMusicManager::Get3DProviderName(char)
-{
-	EAXJMP(0x57A8C0);
-}
-
 bool
 cMusicManager::PlayerInCar()
 {
@@ -183,19 +178,19 @@ cMusicManager::StopFrontEndTrack()
 }
 
 WRAPPER void
-cMusicManager::PlayAnnouncement(unsigned char)
+cMusicManager::PlayAnnouncement(uint8)
 {
 	EAXJMP(0x57E430);
 }
 
 WRAPPER void
-cMusicManager::PlayFrontEndTrack(unsigned char, unsigned char)
+cMusicManager::PlayFrontEndTrack(uint8, uint8)
 {
 	EAXJMP(0x57E2E0);
 }
 
 WRAPPER void
-cMusicManager::PreloadCutSceneMusic(unsigned char)
+cMusicManager::PreloadCutSceneMusic(uint8)
 {
 	EAXJMP(0x57E210);
 }
@@ -219,13 +214,13 @@ cMusicManager::GetRadioInCar(void)
 }
 
 WRAPPER void
-cMusicManager::SetRadioInCar(unsigned int)
+cMusicManager::SetRadioInCar(uint32)
 {
 	EAXJMP(0x57D2C0);
 }
 
 WRAPPER void
-cMusicManager::SetRadioChannelByScript(unsigned char, int)
+cMusicManager::SetRadioChannelByScript(uint8, int32)
 {
 	EAXJMP(0x57D180);
 }
diff --git a/src/audio/MusicManager.h b/src/audio/MusicManager.h
index 47f3ad68..7753d638 100644
--- a/src/audio/MusicManager.h
+++ b/src/audio/MusicManager.h
@@ -1,233 +1,6 @@
 #pragma once
 
-#include "common.h"
-
-enum eRadioStation
-{
-	HEAD_RADIO,
-	DOUBLE_CLEF,
-	JAH_RADIO,
-	RISE_FM,
-	LIPS_106,
-	GAME_FM,
-	MSX_FM,
-	FLASHBACK,
-	CHATTERBOX,
-	USERTRACK,
-	POLICE_RADIO,
-	RADIO_OFF,
-};
-
-enum eMusicMode
-{
-	MUSICMODE_FRONTEND = 0,
-	MUSICMODE_GAME,
-	MUSICMODE_CUTSCENE,
-	MUSICMODE_OFF,
-	MUSICMODE_4,
-};
-
-enum eStreamedSounds
-{
-	STREAMED_SOUND_RADIO_HEAD = 0,
-	STREAMED_SOUND_RADIO_CLASSIC = 1,
-	STREAMED_SOUND_RADIO_KJAH = 2,
-	STREAMED_SOUND_RADIO_RISE = 3,
-	STREAMED_SOUND_RADIO_LIPS = 4,
-	STREAMED_SOUND_RADIO_GAME = 5,
-	STREAMED_SOUND_RADIO_MSX = 6,
-	STREAMED_SOUND_RADIO_FLASH = 7,
-	STREAMED_SOUND_RADIO_CHAT = 8,
-	STREAMED_SOUND_RADIO_MP3_PLAYER = 9,
-	STREAMED_SOUND_RADIO_POLICE = 10,
-	STREAMED_SOUND_CITY_AMBIENT = 11,
-	STREAMED_SOUND_WATER_AMBIENT = 12,
-	STREAMED_SOUND_ANNOUNCE_COMMERCIAL_OPEN = 13,
-	STREAMED_SOUND_ANNOUNCE_SUBURBAN_OPEN = 14,
-	STREAMED_SOUND_NEWS_INTRO = 15,
-	STREAMED_SOUND_BANK_INTRO = 16,
-	STREAMED_SOUND_CUTSCENE_LUIGI1_LG = 17,
-	STREAMED_SOUND_CUTSCENE_LUIGI2_DSB = 18,
-	STREAMED_SOUND_CUTSCENE_LUIGI3_DM = 19,
-	STREAMED_SOUND_CUTSCENE_LUIGI4_PAP = 20,
-	STREAMED_SOUND_CUTSCENE_LUIGI5_TFB = 21,
-	STREAMED_SOUND_CUTSCENE_JOEY0_DM2 = 22,
-	STREAMED_SOUND_CUTSCENE_JOEY1_LFL = 23,
-	STREAMED_SOUND_CUTSCENE_JOEY2_KCL = 24,
-	STREAMED_SOUND_CUTSCENE_JOEY3_VH = 25,
-	STREAMED_SOUND_CUTSCENE_JOEY4_ETH = 26,
-	STREAMED_SOUND_CUTSCENE_JOEY5_DST = 27,
-	STREAMED_SOUND_CUTSCENE_JOEY6_TBJ = 28,
-	STREAMED_SOUND_CUTSCENE_TONI1_TOL = 29,
-	STREAMED_SOUND_CUTSCENE_TONI2_TPU = 30,
-	STREAMED_SOUND_CUTSCENE_TONI3_MAS = 31,
-	STREAMED_SOUND_CUTSCENE_TONI4_TAT = 32,
-	STREAMED_SOUND_CUTSCENE_TONI5_BF = 33,
-	STREAMED_SOUND_CUTSCENE_SAL0_MAS = 34,
-	STREAMED_SOUND_CUTSCENE_SAL1_PF = 35,
-	STREAMED_SOUND_CUTSCENE_SAL2_CTG = 36,
-	STREAMED_SOUND_CUTSCENE_SAL3_RTC = 37,
-	STREAMED_SOUND_CUTSCENE_SAL5_LRQ = 38,
-	STREAMED_SOUND_CUTSCENE_SAL4_BDBA = 39,
-	STREAMED_SOUND_CUTSCENE_SAL4_BDBB = 40,
-	STREAMED_SOUND_CUTSCENE_SAL2_CTG2 = 41,
-	STREAMED_SOUND_CUTSCENE_SAL4_BDBD = 42,
-	STREAMED_SOUND_CUTSCENE_SAL5_LRQB = 43,
-	STREAMED_SOUND_CUTSCENE_SAL5_LRQC = 44,
-	STREAMED_SOUND_CUTSCENE_ASUKA_1_SSO = 45,
-	STREAMED_SOUND_CUTSCENE_ASUKA_2_PP = 46,
-	STREAMED_SOUND_CUTSCENE_ASUKA_3_SS = 47,
-	STREAMED_SOUND_CUTSCENE_ASUKA_4_PDR = 48,
-	STREAMED_SOUND_CUTSCENE_ASUKA_5_K2FT = 49,
-	STREAMED_SOUND_CUTSCENE_KENJI1_KBO = 50,
-	STREAMED_SOUND_CUTSCENE_KENJI2_GIS = 51,
-	STREAMED_SOUND_CUTSCENE_KENJI3_DS = 52,
-	STREAMED_SOUND_CUTSCENE_KENJI4_SHI = 53,
-	STREAMED_SOUND_CUTSCENE_KENJI5_SD = 54,
-	STREAMED_SOUND_CUTSCENE_RAY0_PDR2 = 55,
-	STREAMED_SOUND_CUTSCENE_RAY1_SW = 56,
-	STREAMED_SOUND_CUTSCENE_RAY2_AP = 57,
-	STREAMED_SOUND_CUTSCENE_RAY3_ED = 58,
-	STREAMED_SOUND_CUTSCENE_RAY4_GF = 59,
-	STREAMED_SOUND_CUTSCENE_RAY5_PB = 60,
-	STREAMED_SOUND_CUTSCENE_RAY6_MM = 61,
-	STREAMED_SOUND_CUTSCENE_DONALD1_STOG = 62,
-	STREAMED_SOUND_CUTSCENE_DONALD2_KK = 63,
-	STREAMED_SOUND_CUTSCENE_DONALD3_ADO = 64,
-	STREAMED_SOUND_CUTSCENE_DONALD5_ES = 65,
-	STREAMED_SOUND_CUTSCENE_DONALD7_MLD = 66,
-	STREAMED_SOUND_CUTSCENE_DONALD4_GTA = 67,
-	STREAMED_SOUND_CUTSCENE_DONALD4_GTA2 = 68,
-	STREAMED_SOUND_CUTSCENE_DONALD6_STS = 69,
-	STREAMED_SOUND_CUTSCENE_ASUKA6_BAIT = 70,
-	STREAMED_SOUND_CUTSCENE_ASUKA7_ETG = 71,
-	STREAMED_SOUND_CUTSCENE_ASUKA8_PS = 72,
-	STREAMED_SOUND_CUTSCENE_ASUKA9_ASD = 73,
-	STREAMED_SOUND_CUTSCENE_KENJI4_SHI2 = 74,
-	STREAMED_SOUND_CUTSCENE_CATALINA1_TEX = 75,
-	STREAMED_SOUND_CUTSCENE_ELBURRO1_PH1 = 76,
-	STREAMED_SOUND_CUTSCENE_ELBURRO2_PH2 = 77,
-	STREAMED_SOUND_CUTSCENE_ELBURRO3_PH3 = 78,
-	STREAMED_SOUND_CUTSCENE_ELBURRO4_PH4 = 79,
-	STREAMED_SOUND_CUTSCENE_YARDIE_PH1 = 80,
-	STREAMED_SOUND_CUTSCENE_YARDIE_PH2 = 81,
-	STREAMED_SOUND_CUTSCENE_YARDIE_PH3 = 82,
-	STREAMED_SOUND_CUTSCENE_YARDIE_PH4 = 83,
-	STREAMED_SOUND_CUTSCENE_HOODS_PH1 = 84,
-	STREAMED_SOUND_CUTSCENE_HOODS_PH2 = 85,
-	STREAMED_SOUND_CUTSCENE_HOODS_PH3 = 86,
-	STREAMED_SOUND_CUTSCENE_HOODS_PH4 = 87,
-	STREAMED_SOUND_CUTSCENE_HOODS_PH5 = 88,
-	STREAMED_SOUND_CUTSCENE_MARTY_PH1 = 89,
-	STREAMED_SOUND_CUTSCENE_MARTY_PH2 = 90,
-	STREAMED_SOUND_CUTSCENE_MARTY_PH3 = 91,
-	STREAMED_SOUND_CUTSCENE_MARTY_PH4 = 92,
-	STREAMED_SOUND_MISSION_COMPLETED = 93,
-	STREAMED_SOUND_GAME_COMPLETED = 94,
-	STREAMED_SOUND_MISSION_LIB_A1 = 95,
-	STREAMED_SOUND_MISSION_LIB_A2 = 96,
-	STREAMED_SOUND_MISSION_LIB_A = 97,
-	STREAMED_SOUND_MISSION_LIB_B = 98,
-	STREAMED_SOUND_MISSION_LIB_C = 99,
-	STREAMED_SOUND_MISSION_LIB_D = 100,
-	STREAMED_SOUND_MISSION_L2_A = 101,
-	STREAMED_SOUND_MISSION_J4T_1 = 102,
-	STREAMED_SOUND_MISSION_J4T_2 = 103,
-	STREAMED_SOUND_MISSION_J4T_3 = 104,
-	STREAMED_SOUND_MISSION_J4T_4 = 105,
-	STREAMED_SOUND_MISSION_J4_A = 106,
-	STREAMED_SOUND_MISSION_J4_B = 107,
-	STREAMED_SOUND_MISSION_J4_C = 108,
-	STREAMED_SOUND_MISSION_J4_D = 109,
-	STREAMED_SOUND_MISSION_J4_E = 110,
-	STREAMED_SOUND_MISSION_J4_F = 111,
-	STREAMED_SOUND_MISSION_J6_1 = 112,
-	STREAMED_SOUND_MISSION_J6_A = 113,
-	STREAMED_SOUND_MISSION_J6_B = 114,
-	STREAMED_SOUND_MISSION_J6_C = 115,
-	STREAMED_SOUND_MISSION_J6_D = 116,
-	STREAMED_SOUND_MISSION_T4_A = 117,
-	STREAMED_SOUND_MISSION_S1_A = 118,
-	STREAMED_SOUND_MISSION_S1_A1 = 119,
-	STREAMED_SOUND_MISSION_S1_B = 120,
-	STREAMED_SOUND_MISSION_S1_C = 121,
-	STREAMED_SOUND_MISSION_S1_C1 = 122,
-	STREAMED_SOUND_MISSION_S1_D = 123,
-	STREAMED_SOUND_MISSION_S1_E = 124,
-	STREAMED_SOUND_MISSION_S1_F = 125,
-	STREAMED_SOUND_MISSION_S1_G = 126,
-	STREAMED_SOUND_MISSION_S1_H = 127,
-	STREAMED_SOUND_MISSION_S1_I = 128,
-	STREAMED_SOUND_MISSION_S1_J = 129,
-	STREAMED_SOUND_MISSION_S1_K = 130,
-	STREAMED_SOUND_MISSION_S1_L = 131,
-	STREAMED_SOUND_MISSION_S3_A = 132,
-	STREAMED_SOUND_MISSION_S3_B = 133,
-	STREAMED_SOUND_MISSION_EL3_A = 134,
-	STREAMED_SOUND_MISSION_MF1_A = 135,
-	STREAMED_SOUND_MISSION_MF2_A = 136,
-	STREAMED_SOUND_MISSION_MF3_A = 137,
-	STREAMED_SOUND_MISSION_MF3_B = 138,
-	STREAMED_SOUND_MISSION_MF3_B1 = 139,
-	STREAMED_SOUND_MISSION_MF3_C = 140,
-	STREAMED_SOUND_MISSION_MF4_A = 141,
-	STREAMED_SOUND_MISSION_MF4_B = 142,
-	STREAMED_SOUND_MISSION_MF4_C = 143,
-	STREAMED_SOUND_MISSION_A1_A = 144,
-	STREAMED_SOUND_MISSION_A3_A = 145,
-	STREAMED_SOUND_MISSION_A5_A = 146,
-	STREAMED_SOUND_MISSION_A4_A = 147,
-	STREAMED_SOUND_MISSION_A4_B = 148,
-	STREAMED_SOUND_MISSION_A4_C = 149,
-	STREAMED_SOUND_MISSION_A4_D = 150,
-	STREAMED_SOUND_MISSION_K1_A = 151,
-	STREAMED_SOUND_MISSION_K3_A = 152,
-	STREAMED_SOUND_MISSION_R1_A = 153,
-	STREAMED_SOUND_MISSION_R2_A = 154,
-	STREAMED_SOUND_MISSION_R2_B = 155,
-	STREAMED_SOUND_MISSION_R2_C = 156,
-	STREAMED_SOUND_MISSION_R2_D = 157,
-	STREAMED_SOUND_MISSION_R2_E = 158,
-	STREAMED_SOUND_MISSION_R2_F = 159,
-	STREAMED_SOUND_MISSION_R2_G = 160,
-	STREAMED_SOUND_MISSION_R2_H = 161,
-	STREAMED_SOUND_MISSION_R5_A = 162,
-	STREAMED_SOUND_MISSION_R6_A = 163,
-	STREAMED_SOUND_MISSION_R6_A1 = 164,
-	STREAMED_SOUND_MISSION_R6_B = 165,
-	STREAMED_SOUND_MISSION_LO2_A = 166,
-	STREAMED_SOUND_MISSION_LO6_A = 167,
-	STREAMED_SOUND_MISSION_YD2_A = 168,
-	STREAMED_SOUND_MISSION_YD2_B = 169,
-	STREAMED_SOUND_MISSION_YD2_C = 170,
-	STREAMED_SOUND_MISSION_YD2_C1 = 171,
-	STREAMED_SOUND_MISSION_YD2_D = 172,
-	STREAMED_SOUND_MISSION_YD2_E = 173,
-	STREAMED_SOUND_MISSION_YD2_F = 174,
-	STREAMED_SOUND_MISSION_YD2_G = 175,
-	STREAMED_SOUND_MISSION_YD2_H = 176,
-	STREAMED_SOUND_MISSION_YD2_ASS = 177,
-	STREAMED_SOUND_MISSION_YD2_OK = 178,
-	STREAMED_SOUND_MISSION_H5_A = 179,
-	STREAMED_SOUND_MISSION_H5_B = 180,
-	STREAMED_SOUND_MISSION_H5_C = 181,
-	STREAMED_SOUND_MISSION_AMMU_A = 182,
-	STREAMED_SOUND_MISSION_AMMU_B = 183,
-	STREAMED_SOUND_MISSION_AMMU_C = 184,
-	STREAMED_SOUND_MISSION_DOOR_1 = 185,
-	STREAMED_SOUND_MISSION_DOOR_2 = 186,
-	STREAMED_SOUND_MISSION_DOOR_3 = 187,
-	STREAMED_SOUND_MISSION_DOOR_4 = 188,
-	STREAMED_SOUND_MISSION_DOOR_5 = 189,
-	STREAMED_SOUND_MISSION_DOOR_6 = 190,
-	STREAMED_SOUND_MISSION_T3_A = 191,
-	STREAMED_SOUND_MISSION_T3_B = 192,
-	STREAMED_SOUND_MISSION_T3_C = 193,
-	STREAMED_SOUND_MISSION_K1_B = 194,
-	STREAMED_SOUND_MISSION_CAT1 = 195,
-	TOTAL_STREAMED_SOUNDS = 196,
-	NO_STREAMED_SOUND = 197,
-};
+#include "audio.h"
 
 class tMP3Sample
 {
@@ -252,7 +25,7 @@ public:
 	bool m_bPreviousPlayerInCar;
 	bool m_bPlayerInCar;
 	bool m_bAnnouncementInProgress;
-	tMP3Sample m_asMP3Samples[196];
+	tMP3Sample m_asMP3Samples[TOTAL_STREAMED_SOUNDS];
 	uint8 field_2364;
 	uint8 field_2365;
 	uint8 field_2366;
@@ -285,18 +58,17 @@ public:
 	void ChangeMusicMode(int32 mode);
 	void StopFrontEndTrack();
 
-	char *Get3DProviderName(char);
 	bool PlayerInCar();
 	void DisplayRadioStationName();
 
-	void PlayAnnouncement(unsigned char);
-	void PlayFrontEndTrack(unsigned char, unsigned char);
-	void PreloadCutSceneMusic(unsigned char);
+	void PlayAnnouncement(uint8);
+	void PlayFrontEndTrack(uint8, uint8);
+	void PreloadCutSceneMusic(uint8);
 	void PlayPreloadedCutSceneMusic(void);
 	void StopCutSceneMusic(void);
 	int32 GetRadioInCar(void);
-	void SetRadioInCar(unsigned int);
-	void SetRadioChannelByScript(unsigned char, int);
+	void SetRadioInCar(uint32);
+	void SetRadioChannelByScript(uint8, int32);
 
 	void ResetMusicAfterReload();
 
diff --git a/src/audio/audio.h b/src/audio/audio.h
new file mode 100644
index 00000000..55bc5b70
--- /dev/null
+++ b/src/audio/audio.h
@@ -0,0 +1,228 @@
+#pragma once
+
+enum eRadioStation
+{
+	HEAD_RADIO,
+	DOUBLE_CLEF,
+	JAH_RADIO,
+	RISE_FM,
+	LIPS_106,
+	GAME_FM,
+	MSX_FM,
+	FLASHBACK,
+	CHATTERBOX,
+	USERTRACK,
+	POLICE_RADIO,
+	RADIO_OFF,
+};
+
+enum eMusicMode
+{
+	MUSICMODE_FRONTEND = 0,
+	MUSICMODE_GAME,
+	MUSICMODE_CUTSCENE,
+	MUSICMODE_OFF,
+	MUSICMODE_4,
+};
+
+enum eStreamedSounds
+{
+	STREAMED_SOUND_RADIO_HEAD = 0,
+	STREAMED_SOUND_RADIO_CLASSIC = 1,
+	STREAMED_SOUND_RADIO_KJAH = 2,
+	STREAMED_SOUND_RADIO_RISE = 3,
+	STREAMED_SOUND_RADIO_LIPS = 4,
+	STREAMED_SOUND_RADIO_GAME = 5,
+	STREAMED_SOUND_RADIO_MSX = 6,
+	STREAMED_SOUND_RADIO_FLASH = 7,
+	STREAMED_SOUND_RADIO_CHAT = 8,
+	STREAMED_SOUND_RADIO_MP3_PLAYER = 9,
+	STREAMED_SOUND_RADIO_POLICE = 10,
+	STREAMED_SOUND_CITY_AMBIENT = 11,
+	STREAMED_SOUND_WATER_AMBIENT = 12,
+	STREAMED_SOUND_ANNOUNCE_COMMERCIAL_OPEN = 13,
+	STREAMED_SOUND_ANNOUNCE_SUBURBAN_OPEN = 14,
+	STREAMED_SOUND_NEWS_INTRO = 15,
+	STREAMED_SOUND_BANK_INTRO = 16,
+	STREAMED_SOUND_CUTSCENE_LUIGI1_LG = 17,
+	STREAMED_SOUND_CUTSCENE_LUIGI2_DSB = 18,
+	STREAMED_SOUND_CUTSCENE_LUIGI3_DM = 19,
+	STREAMED_SOUND_CUTSCENE_LUIGI4_PAP = 20,
+	STREAMED_SOUND_CUTSCENE_LUIGI5_TFB = 21,
+	STREAMED_SOUND_CUTSCENE_JOEY0_DM2 = 22,
+	STREAMED_SOUND_CUTSCENE_JOEY1_LFL = 23,
+	STREAMED_SOUND_CUTSCENE_JOEY2_KCL = 24,
+	STREAMED_SOUND_CUTSCENE_JOEY3_VH = 25,
+	STREAMED_SOUND_CUTSCENE_JOEY4_ETH = 26,
+	STREAMED_SOUND_CUTSCENE_JOEY5_DST = 27,
+	STREAMED_SOUND_CUTSCENE_JOEY6_TBJ = 28,
+	STREAMED_SOUND_CUTSCENE_TONI1_TOL = 29,
+	STREAMED_SOUND_CUTSCENE_TONI2_TPU = 30,
+	STREAMED_SOUND_CUTSCENE_TONI3_MAS = 31,
+	STREAMED_SOUND_CUTSCENE_TONI4_TAT = 32,
+	STREAMED_SOUND_CUTSCENE_TONI5_BF = 33,
+	STREAMED_SOUND_CUTSCENE_SAL0_MAS = 34,
+	STREAMED_SOUND_CUTSCENE_SAL1_PF = 35,
+	STREAMED_SOUND_CUTSCENE_SAL2_CTG = 36,
+	STREAMED_SOUND_CUTSCENE_SAL3_RTC = 37,
+	STREAMED_SOUND_CUTSCENE_SAL5_LRQ = 38,
+	STREAMED_SOUND_CUTSCENE_SAL4_BDBA = 39,
+	STREAMED_SOUND_CUTSCENE_SAL4_BDBB = 40,
+	STREAMED_SOUND_CUTSCENE_SAL2_CTG2 = 41,
+	STREAMED_SOUND_CUTSCENE_SAL4_BDBD = 42,
+	STREAMED_SOUND_CUTSCENE_SAL5_LRQB = 43,
+	STREAMED_SOUND_CUTSCENE_SAL5_LRQC = 44,
+	STREAMED_SOUND_CUTSCENE_ASUKA_1_SSO = 45,
+	STREAMED_SOUND_CUTSCENE_ASUKA_2_PP = 46,
+	STREAMED_SOUND_CUTSCENE_ASUKA_3_SS = 47,
+	STREAMED_SOUND_CUTSCENE_ASUKA_4_PDR = 48,
+	STREAMED_SOUND_CUTSCENE_ASUKA_5_K2FT = 49,
+	STREAMED_SOUND_CUTSCENE_KENJI1_KBO = 50,
+	STREAMED_SOUND_CUTSCENE_KENJI2_GIS = 51,
+	STREAMED_SOUND_CUTSCENE_KENJI3_DS = 52,
+	STREAMED_SOUND_CUTSCENE_KENJI4_SHI = 53,
+	STREAMED_SOUND_CUTSCENE_KENJI5_SD = 54,
+	STREAMED_SOUND_CUTSCENE_RAY0_PDR2 = 55,
+	STREAMED_SOUND_CUTSCENE_RAY1_SW = 56,
+	STREAMED_SOUND_CUTSCENE_RAY2_AP = 57,
+	STREAMED_SOUND_CUTSCENE_RAY3_ED = 58,
+	STREAMED_SOUND_CUTSCENE_RAY4_GF = 59,
+	STREAMED_SOUND_CUTSCENE_RAY5_PB = 60,
+	STREAMED_SOUND_CUTSCENE_RAY6_MM = 61,
+	STREAMED_SOUND_CUTSCENE_DONALD1_STOG = 62,
+	STREAMED_SOUND_CUTSCENE_DONALD2_KK = 63,
+	STREAMED_SOUND_CUTSCENE_DONALD3_ADO = 64,
+	STREAMED_SOUND_CUTSCENE_DONALD5_ES = 65,
+	STREAMED_SOUND_CUTSCENE_DONALD7_MLD = 66,
+	STREAMED_SOUND_CUTSCENE_DONALD4_GTA = 67,
+	STREAMED_SOUND_CUTSCENE_DONALD4_GTA2 = 68,
+	STREAMED_SOUND_CUTSCENE_DONALD6_STS = 69,
+	STREAMED_SOUND_CUTSCENE_ASUKA6_BAIT = 70,
+	STREAMED_SOUND_CUTSCENE_ASUKA7_ETG = 71,
+	STREAMED_SOUND_CUTSCENE_ASUKA8_PS = 72,
+	STREAMED_SOUND_CUTSCENE_ASUKA9_ASD = 73,
+	STREAMED_SOUND_CUTSCENE_KENJI4_SHI2 = 74,
+	STREAMED_SOUND_CUTSCENE_CATALINA1_TEX = 75,
+	STREAMED_SOUND_CUTSCENE_ELBURRO1_PH1 = 76,
+	STREAMED_SOUND_CUTSCENE_ELBURRO2_PH2 = 77,
+	STREAMED_SOUND_CUTSCENE_ELBURRO3_PH3 = 78,
+	STREAMED_SOUND_CUTSCENE_ELBURRO4_PH4 = 79,
+	STREAMED_SOUND_CUTSCENE_YARDIE_PH1 = 80,
+	STREAMED_SOUND_CUTSCENE_YARDIE_PH2 = 81,
+	STREAMED_SOUND_CUTSCENE_YARDIE_PH3 = 82,
+	STREAMED_SOUND_CUTSCENE_YARDIE_PH4 = 83,
+	STREAMED_SOUND_CUTSCENE_HOODS_PH1 = 84,
+	STREAMED_SOUND_CUTSCENE_HOODS_PH2 = 85,
+	STREAMED_SOUND_CUTSCENE_HOODS_PH3 = 86,
+	STREAMED_SOUND_CUTSCENE_HOODS_PH4 = 87,
+	STREAMED_SOUND_CUTSCENE_HOODS_PH5 = 88,
+	STREAMED_SOUND_CUTSCENE_MARTY_PH1 = 89,
+	STREAMED_SOUND_CUTSCENE_MARTY_PH2 = 90,
+	STREAMED_SOUND_CUTSCENE_MARTY_PH3 = 91,
+	STREAMED_SOUND_CUTSCENE_MARTY_PH4 = 92,
+	STREAMED_SOUND_MISSION_COMPLETED = 93,
+	STREAMED_SOUND_GAME_COMPLETED = 94,
+	STREAMED_SOUND_MISSION_LIB_A1 = 95,
+	STREAMED_SOUND_MISSION_LIB_A2 = 96,
+	STREAMED_SOUND_MISSION_LIB_A = 97,
+	STREAMED_SOUND_MISSION_LIB_B = 98,
+	STREAMED_SOUND_MISSION_LIB_C = 99,
+	STREAMED_SOUND_MISSION_LIB_D = 100,
+	STREAMED_SOUND_MISSION_L2_A = 101,
+	STREAMED_SOUND_MISSION_J4T_1 = 102,
+	STREAMED_SOUND_MISSION_J4T_2 = 103,
+	STREAMED_SOUND_MISSION_J4T_3 = 104,
+	STREAMED_SOUND_MISSION_J4T_4 = 105,
+	STREAMED_SOUND_MISSION_J4_A = 106,
+	STREAMED_SOUND_MISSION_J4_B = 107,
+	STREAMED_SOUND_MISSION_J4_C = 108,
+	STREAMED_SOUND_MISSION_J4_D = 109,
+	STREAMED_SOUND_MISSION_J4_E = 110,
+	STREAMED_SOUND_MISSION_J4_F = 111,
+	STREAMED_SOUND_MISSION_J6_1 = 112,
+	STREAMED_SOUND_MISSION_J6_A = 113,
+	STREAMED_SOUND_MISSION_J6_B = 114,
+	STREAMED_SOUND_MISSION_J6_C = 115,
+	STREAMED_SOUND_MISSION_J6_D = 116,
+	STREAMED_SOUND_MISSION_T4_A = 117,
+	STREAMED_SOUND_MISSION_S1_A = 118,
+	STREAMED_SOUND_MISSION_S1_A1 = 119,
+	STREAMED_SOUND_MISSION_S1_B = 120,
+	STREAMED_SOUND_MISSION_S1_C = 121,
+	STREAMED_SOUND_MISSION_S1_C1 = 122,
+	STREAMED_SOUND_MISSION_S1_D = 123,
+	STREAMED_SOUND_MISSION_S1_E = 124,
+	STREAMED_SOUND_MISSION_S1_F = 125,
+	STREAMED_SOUND_MISSION_S1_G = 126,
+	STREAMED_SOUND_MISSION_S1_H = 127,
+	STREAMED_SOUND_MISSION_S1_I = 128,
+	STREAMED_SOUND_MISSION_S1_J = 129,
+	STREAMED_SOUND_MISSION_S1_K = 130,
+	STREAMED_SOUND_MISSION_S1_L = 131,
+	STREAMED_SOUND_MISSION_S3_A = 132,
+	STREAMED_SOUND_MISSION_S3_B = 133,
+	STREAMED_SOUND_MISSION_EL3_A = 134,
+	STREAMED_SOUND_MISSION_MF1_A = 135,
+	STREAMED_SOUND_MISSION_MF2_A = 136,
+	STREAMED_SOUND_MISSION_MF3_A = 137,
+	STREAMED_SOUND_MISSION_MF3_B = 138,
+	STREAMED_SOUND_MISSION_MF3_B1 = 139,
+	STREAMED_SOUND_MISSION_MF3_C = 140,
+	STREAMED_SOUND_MISSION_MF4_A = 141,
+	STREAMED_SOUND_MISSION_MF4_B = 142,
+	STREAMED_SOUND_MISSION_MF4_C = 143,
+	STREAMED_SOUND_MISSION_A1_A = 144,
+	STREAMED_SOUND_MISSION_A3_A = 145,
+	STREAMED_SOUND_MISSION_A5_A = 146,
+	STREAMED_SOUND_MISSION_A4_A = 147,
+	STREAMED_SOUND_MISSION_A4_B = 148,
+	STREAMED_SOUND_MISSION_A4_C = 149,
+	STREAMED_SOUND_MISSION_A4_D = 150,
+	STREAMED_SOUND_MISSION_K1_A = 151,
+	STREAMED_SOUND_MISSION_K3_A = 152,
+	STREAMED_SOUND_MISSION_R1_A = 153,
+	STREAMED_SOUND_MISSION_R2_A = 154,
+	STREAMED_SOUND_MISSION_R2_B = 155,
+	STREAMED_SOUND_MISSION_R2_C = 156,
+	STREAMED_SOUND_MISSION_R2_D = 157,
+	STREAMED_SOUND_MISSION_R2_E = 158,
+	STREAMED_SOUND_MISSION_R2_F = 159,
+	STREAMED_SOUND_MISSION_R2_G = 160,
+	STREAMED_SOUND_MISSION_R2_H = 161,
+	STREAMED_SOUND_MISSION_R5_A = 162,
+	STREAMED_SOUND_MISSION_R6_A = 163,
+	STREAMED_SOUND_MISSION_R6_A1 = 164,
+	STREAMED_SOUND_MISSION_R6_B = 165,
+	STREAMED_SOUND_MISSION_LO2_A = 166,
+	STREAMED_SOUND_MISSION_LO6_A = 167,
+	STREAMED_SOUND_MISSION_YD2_A = 168,
+	STREAMED_SOUND_MISSION_YD2_B = 169,
+	STREAMED_SOUND_MISSION_YD2_C = 170,
+	STREAMED_SOUND_MISSION_YD2_C1 = 171,
+	STREAMED_SOUND_MISSION_YD2_D = 172,
+	STREAMED_SOUND_MISSION_YD2_E = 173,
+	STREAMED_SOUND_MISSION_YD2_F = 174,
+	STREAMED_SOUND_MISSION_YD2_G = 175,
+	STREAMED_SOUND_MISSION_YD2_H = 176,
+	STREAMED_SOUND_MISSION_YD2_ASS = 177,
+	STREAMED_SOUND_MISSION_YD2_OK = 178,
+	STREAMED_SOUND_MISSION_H5_A = 179,
+	STREAMED_SOUND_MISSION_H5_B = 180,
+	STREAMED_SOUND_MISSION_H5_C = 181,
+	STREAMED_SOUND_MISSION_AMMU_A = 182,
+	STREAMED_SOUND_MISSION_AMMU_B = 183,
+	STREAMED_SOUND_MISSION_AMMU_C = 184,
+	STREAMED_SOUND_MISSION_DOOR_1 = 185,
+	STREAMED_SOUND_MISSION_DOOR_2 = 186,
+	STREAMED_SOUND_MISSION_DOOR_3 = 187,
+	STREAMED_SOUND_MISSION_DOOR_4 = 188,
+	STREAMED_SOUND_MISSION_DOOR_5 = 189,
+	STREAMED_SOUND_MISSION_DOOR_6 = 190,
+	STREAMED_SOUND_MISSION_T3_A = 191,
+	STREAMED_SOUND_MISSION_T3_B = 192,
+	STREAMED_SOUND_MISSION_T3_C = 193,
+	STREAMED_SOUND_MISSION_K1_B = 194,
+	STREAMED_SOUND_MISSION_CAT1 = 195,
+	TOTAL_STREAMED_SOUNDS = 196,
+	NO_STREAMED_SOUND = 197,
+};
\ No newline at end of file
diff --git a/src/control/Replay.cpp b/src/control/Replay.cpp
index 473b13d3..1bd1bf4b 100644
--- a/src/control/Replay.cpp
+++ b/src/control/Replay.cpp
@@ -1036,7 +1036,7 @@ void CReplay::TriggerPlayback(uint8 cam_mode, float cam_x, float cam_y, float ca
 	bAllowLookAroundCam = true;
 	bPlayingBackFromFile = false;
 	OldRadioStation = DMAudio.GetRadioInCar();
-	DMAudio.ChangeMusicMode(0);
+	DMAudio.ChangeMusicMode(MUSICMODE_FRONTEND);
 	DMAudio.SetEffectsFadeVol(0);
 	DMAudio.SetMusicFadeVol(0);
 	int current;
@@ -1282,9 +1282,9 @@ void CReplay::RestoreStuffFromMem(void)
 	}
 	delete[] pPedAnims;
 	pPedAnims = nil;
-	DMAudio.ChangeMusicMode(0);
+	DMAudio.ChangeMusicMode(MUSICMODE_FRONTEND);
 	DMAudio.SetRadioInCar(OldRadioStation);
-	DMAudio.ChangeMusicMode(1);
+	DMAudio.ChangeMusicMode(MUSICMODE_GAME);
 }
 #endif
 
diff --git a/src/core/CutsceneMgr.cpp b/src/core/CutsceneMgr.cpp
index 95abfcc9..f147e8c9 100644
--- a/src/core/CutsceneMgr.cpp
+++ b/src/core/CutsceneMgr.cpp
@@ -17,7 +17,6 @@
 #include "RpAnimBlend.h"
 #include "ModelIndices.h"
 #include "TempColModels.h"
-#include "MusicManager.h"
 
 const struct {
 	const char *szTrackName;
@@ -209,7 +208,7 @@ CCutsceneMgr::LoadCutsceneData(const char *szCutsceneName)
 	CFileMgr::CloseFile(file);
 
 	if (strcmpi(ms_cutsceneName, "end")) {
-		DMAudio.ChangeMusicMode(2);
+		DMAudio.ChangeMusicMode(MUSICMODE_CUTSCENE);
 		int trackId = FindCutsceneAudioTrackId(szCutsceneName);
 		if (trackId != -1) {
 			printf("Start preload audio %s\n", szCutsceneName);
@@ -368,7 +367,7 @@ CCutsceneMgr::DeleteCutsceneData(void)
 	if (strcmpi(ms_cutsceneName, "end")) {
 		DMAudio.StopCutSceneMusic();
 		if (strcmpi(ms_cutsceneName, "bet"))
-			DMAudio.ChangeMusicMode(1);
+			DMAudio.ChangeMusicMode(MUSICMODE_GAME);
 	}
 	CTimer::Stop();
 	//TheCamera.GetScreenFadeStatus() == 2; // what for??
diff --git a/src/core/Frontend.cpp b/src/core/Frontend.cpp
index 0be25e8a..6ba6d5c8 100644
--- a/src/core/Frontend.cpp
+++ b/src/core/Frontend.cpp
@@ -11,7 +11,6 @@
 #include "Timer.h"
 #include "Game.h"
 #include "DMAudio.h"
-#include "MusicManager.h"
 #include "FileMgr.h"
 #include "Streaming.h"
 #include "TxdStore.h"
@@ -535,7 +534,7 @@ void CMenuManager::Draw()
 				if (m_nPrefsAudio3DProviderIndex == -1)
 					textToPrint[MENUCOLUMN_RIGHT] = TheText.Get("FEA_NAH");
 				else {
-					char *provider = MusicManager.Get3DProviderName(m_nPrefsAudio3DProviderIndex);
+					char *provider = DMAudio.Get3DProviderName(m_nPrefsAudio3DProviderIndex);
 					AsciiToUnicode(provider, gUString);
 					textToPrint[MENUCOLUMN_RIGHT] = gUString;
 				}
diff --git a/src/peds/Ped.cpp b/src/peds/Ped.cpp
index 11141b04..17c79209 100644
--- a/src/peds/Ped.cpp
+++ b/src/peds/Ped.cpp
@@ -45,7 +45,6 @@
 #include "CarAI.h"
 #include "Zones.h"
 #include "Cranes.h"
-#include "MusicManager.h"
 #include "Timecycle.h"
 #include "ParticleObject.h"
 #include "Floater.h"
diff --git a/src/skel/win/win.cpp b/src/skel/win/win.cpp
index fc82e51e..4da63fe6 100644
--- a/src/skel/win/win.cpp
+++ b/src/skel/win/win.cpp
@@ -2162,7 +2162,7 @@ _WinMain(HINSTANCE instance,
 		CPad::ResetCheats();
 		CPad::StopPadsShaking();
 		
-		DMAudio.ChangeMusicMode(_TODOCONST(3));
+		DMAudio.ChangeMusicMode(MUSICMODE_OFF);
 		
 		CTimer::Stop();
 		
@@ -2170,7 +2170,7 @@ _WinMain(HINSTANCE instance,
 		{
 			CGame::ShutDownForRestart();
 			CGame::InitialiseWhenRestarting();
-			DMAudio.ChangeMusicMode(_TODOCONST(1));
+			DMAudio.ChangeMusicMode(MUSICMODE_GAME);
 			LoadSplash(GetLevelSplashScreen(CGame::currLevel));
 			FrontEndMenuManager.m_bLoadingSavedGame = false;
 		}
diff --git a/src/skel/win/win.h b/src/skel/win/win.h
index 8c32e57d..ae2c7eec 100644
--- a/src/skel/win/win.h
+++ b/src/skel/win/win.h
@@ -90,4 +90,5 @@ void HandleExit();
 #endif                          /* __cplusplus */
 
 
+extern DWORD &_dwOperatingSystemVersion;
 #endif /* (!defined(_PLATFORM_WIN_H)) */
diff --git a/src/vehicles/Vehicle.cpp b/src/vehicles/Vehicle.cpp
index 7229992d..3d02dd25 100644
--- a/src/vehicles/Vehicle.cpp
+++ b/src/vehicles/Vehicle.cpp
@@ -15,7 +15,6 @@
 #include "PointLights.h"
 #include "Renderer.h"
 #include "DMAudio.h"
-#include "MusicManager.h"
 #include "Radar.h"
 
 bool &CVehicle::bWheelsOnlyCheat = *(bool *)0x95CD78;

From 8fb71e2555f2f1744f00f85e1fdb8f54503712f0 Mon Sep 17 00:00:00 2001
From: Sergeanur <s.anureev@yandex.ua>
Date: Sat, 26 Oct 2019 15:39:10 +0300
Subject: [PATCH 27/37] audio.h -> audio_enums.h

---
 src/audio/DMAudio.h                  | 2 +-
 src/audio/MusicManager.h             | 2 +-
 src/audio/{audio.h => audio_enums.h} | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename src/audio/{audio.h => audio_enums.h} (100%)

diff --git a/src/audio/DMAudio.h b/src/audio/DMAudio.h
index 4111f64f..a6910b58 100644
--- a/src/audio/DMAudio.h
+++ b/src/audio/DMAudio.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "audio.h"
+#include "audio_enums.h"
 #include "Wanted.h"
 
 enum eSound : int16
diff --git a/src/audio/MusicManager.h b/src/audio/MusicManager.h
index 7753d638..709fe56a 100644
--- a/src/audio/MusicManager.h
+++ b/src/audio/MusicManager.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "audio.h"
+#include "audio_enums.h"
 
 class tMP3Sample
 {
diff --git a/src/audio/audio.h b/src/audio/audio_enums.h
similarity index 100%
rename from src/audio/audio.h
rename to src/audio/audio_enums.h

From 428b407ad5e420dedc7211227de73490a2503d23 Mon Sep 17 00:00:00 2001
From: Sergeanur <s.anureev@yandex.ua>
Date: Sat, 26 Oct 2019 16:02:59 +0300
Subject: [PATCH 28/37] A bit more enums for ChangeMusicMode

---
 src/audio/AudioManager.cpp | 5 +++--
 src/core/Frontend.cpp      | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/audio/AudioManager.cpp b/src/audio/AudioManager.cpp
index 19c994e3..4dc97fae 100644
--- a/src/audio/AudioManager.cpp
+++ b/src/audio/AudioManager.cpp
@@ -1,5 +1,6 @@
 #include "common.h"
 #include "patcher.h"
+#include "audio_enums.h"
 
 #include "AudioManager.h"
 
@@ -7128,14 +7129,14 @@ cAudioManager::ProcessSpecial()
 {
 	if(m_bUserPause) {
 		if(!m_bPreviousUserPause) {
-			MusicManager.ChangeMusicMode(0);
+			MusicManager.ChangeMusicMode(MUSICMODE_FRONTEND);
 			SampleManager.SetEffectsFadeVolume(maxVolume);
 			SampleManager.SetMusicFadeVolume(maxVolume);
 		}
 	} else {
 		if(m_bPreviousUserPause) {
 			MusicManager.StopFrontEndTrack();
-			MusicManager.ChangeMusicMode(1);
+			MusicManager.ChangeMusicMode(MUSICMODE_GAME);
 		}
 		CPlayerPed *playerPed = FindPlayerPed();
 		if(playerPed) {
diff --git a/src/core/Frontend.cpp b/src/core/Frontend.cpp
index 6ba6d5c8..5f87049a 100644
--- a/src/core/Frontend.cpp
+++ b/src/core/Frontend.cpp
@@ -1085,7 +1085,7 @@ void CMenuManager::LoadAllTextures()
 {
 	if (!m_bSpritesLoaded) {
 		CMenuManager::CentreMousePointer();
-		DMAudio.ChangeMusicMode(0);
+		DMAudio.ChangeMusicMode(MUSICMODE_FRONTEND);
 		DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_STARTING, 0);
 		m_nCurrOption = 0;
 		m_PrefsRadioStation = DMAudio.GetRadioInCar();
@@ -2132,7 +2132,7 @@ WRAPPER void CMenuManager::RequestFrontEndShutdown() { EAXJMP(0x488750); }
 void CMenuManager::RequestFrontEndShutdown()
 {
 	m_bShutDownFrontEndRequested = true;
-	DMAudio.ChangeMusicMode(1);
+	DMAudio.ChangeMusicMode(MUSICMODE_GAME);
 }
 #endif
 

From 28bb221f7e44c03ae30b69a96a56bc467319a8ef Mon Sep 17 00:00:00 2001
From: Sergeanur <s.anureev@yandex.ua>
Date: Sat, 26 Oct 2019 16:20:36 +0300
Subject: [PATCH 29/37] Fix audio bug

---
 src/audio/AudioManager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/audio/AudioManager.cpp b/src/audio/AudioManager.cpp
index 1428bb9f..c8e2656a 100644
--- a/src/audio/AudioManager.cpp
+++ b/src/audio/AudioManager.cpp
@@ -9174,7 +9174,7 @@ void
 cAudioManager::AdjustSamplesVolume()
 {
 	for(int i = 0; i < m_bSampleRequestQueuesStatus[m_bActiveSampleQueue]; i++) {
-		tActiveSample *pSample = &m_asSamples[i][(int32)m_abSampleQueueIndexTable[i] + 1];
+		tActiveSample* pSample = &m_asSamples[m_bActiveSampleQueue][m_abSampleQueueIndexTable[m_bActiveSampleQueue][i] + 1];
 
 		if(!pSample->m_bBankIndex) // all non-speech sounds on PC
 			pSample->m_bEmittingVolume = ComputeEmittingVolume(

From 35bd3f514d2a673cf17db78103b17c169d2027e1 Mon Sep 17 00:00:00 2001
From: Sergeanur <s.anureev@yandex.ua>
Date: Sat, 26 Oct 2019 17:08:13 +0300
Subject: [PATCH 30/37] Fix hornPatternsArray

---
 src/audio/AudioManager.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/audio/AudioManager.cpp b/src/audio/AudioManager.cpp
index 36713dbc..e3ae9068 100644
--- a/src/audio/AudioManager.cpp
+++ b/src/audio/AudioManager.cpp
@@ -48,7 +48,16 @@ bool &bPlayerJustEnteredCar = *(bool *)0x6508C4;
 bool &g_bMissionAudioLoadFailed = *(bool *)0x95CD8E;
 uint32 *gMinTimeToNextReport = (uint32 *)0x8E2828;
 uint8 &gSpecialSuspectLastSeenReport = *(uint8 *)0x95CD4D;
-bool **hornPatternsArray = (bool **)0x606AB8;
+bool hornPatternsArray[8][44] = {
+	{false, false, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, false, false, false, false, false, false, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, false, false, false, false},
+	{false, false, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, false, false},
+	{false, false, true, true, true, true, true, true, true, true, true, true, false, false, false, false, true, true, true, true, true, false, false, false, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, false},
+	{false, false, true, true, true, true, true, false, false, true, true, true, true, true, false, false, false, true, true, true, true, true, true, true, true, true, true, false, false, false, true, true, true, true, true, true, true, true, true, true, true, true, true, false},
+	{false, false, true, true, true, true, true, true, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},
+	{false, false, true, true, true, false, false, false, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},
+	{false, false, true, true, true, true, false, false, false, false, true, true, true, false, false, true, true, true, false, false, true, true, true, true, true, true, false, false, false, false, false, true, true, true, true, true, true, true, true, true, true, true, false, false},
+	{false, false, true, true, true, true, false, false, true, true, true, true, true, false, false, false, true, true, true, true, true, true, false, false, false, false, true, true, true, true, true, true, true, true, true, true, true, true, true, false, false, false, false, false},
+};
 
 constexpr int totalAudioEntitiesSlots = 200;
 constexpr int maxVolume = 127;

From 5fa56e417373d3d58956b075e70838f36d8c0099 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?eray=20or=C3=A7unus?= <erayorcunus@gmail.com>
Date: Sat, 26 Oct 2019 18:41:04 +0300
Subject: [PATCH 31/37] Gang attack fix & SeekCar

---
 src/peds/Ped.cpp | 183 ++++++++++++++++++++++++++++++++++++++++++++---
 src/peds/Ped.h   |   6 +-
 2 files changed, 178 insertions(+), 11 deletions(-)

diff --git a/src/peds/Ped.cpp b/src/peds/Ped.cpp
index 17c79209..7ad79e32 100644
--- a/src/peds/Ped.cpp
+++ b/src/peds/Ped.cpp
@@ -56,12 +56,13 @@ WRAPPER void CPed::StartFightDefend(uint8, uint8, uint8) { EAXJMP(0x4E7780); }
 WRAPPER void CPed::ServiceTalking(void) { EAXJMP(0x4E5870); }
 WRAPPER void CPed::UpdatePosition(void) { EAXJMP(0x4C7A00); }
 WRAPPER void CPed::WanderPath(void) { EAXJMP(0x4D28D0); }
-WRAPPER void CPed::SeekCar(void) { EAXJMP(0x4D3F90); }
 WRAPPER void CPed::UpdateFromLeader(void) {	EAXJMP(0x4D8F30); }
 WRAPPER void CPed::SetEnterCar_AllClear(CVehicle*, uint32, uint32) { EAXJMP(0x4E0A40); }
 WRAPPER bool CPed::WarpPedToNearEntityOffScreen(CEntity*) { EAXJMP(0x4E5570); }
 WRAPPER void CPed::SetObjective(eObjective, CVector) { EAXJMP(0x4D8A90); }
 WRAPPER void CPed::SetObjective(eObjective, CVector, float) { EAXJMP(0x4D8770); }
+WRAPPER void CPed::WarpPedIntoCar(CVehicle*) { EAXJMP(0x4D7D20); }
+WRAPPER void CPed::SetCarJack(CVehicle*) { EAXJMP(0x4E0220); }
 
 #define FEET_OFFSET 1.04f
 
@@ -469,9 +470,9 @@ CPed::CPed(uint32 pedType) : m_pedIK(this)
 	bIsLanding = false;
 	bIsRunning = false;
 	bHitSomethingLastFrame = false;
-	m_ped_flagB80 = false;
+	bVehEnterDoorIsBlocked = false;
 
-	m_ped_flagC1 = false;
+	bCanPedEnterSeekedCar = false;
 	bRespondsToThreats = true;
 	bRenderPedInCar = true;
 	bChangedSeat = false;
@@ -8569,11 +8570,15 @@ CPed::KillPedWithCar(CVehicle *car, float impulse)
 		Say(SOUND_PED_DEFEND);
 	}
 
-#if defined FIX_BUGS || defined VC_PED_PORTS
+#ifdef VC_PED_PORTS
 	// Killing gang members with car wasn't triggering a fight, until now... Taken from VC.
 	if (IsGangMember()) {
 		CPed *driver = car->pDriver;
-		if (driver && driver->IsPlayer()) {
+		if (driver && driver->IsPlayer()
+#ifdef FIX_BUGS
+			&& (CharCreatedBy != MISSION_CHAR || bRespondsToThreats) && (!m_leader || m_leader != driver)
+#endif
+			) {
 			RegisterThreatWithGangPeds(driver);
 		}
 	}
@@ -9509,7 +9514,7 @@ CPed::ProcessControl(void)
 								|| m_objective == OBJECTIVE_ENTER_CAR_AS_DRIVER)) {
 
 							if (collidingVeh != m_pCurrentPhysSurface || IsPlayer()) {
-								if (!m_ped_flagB80) {
+								if (!bVehEnterDoorIsBlocked) {
 									if (collidingVeh->m_status != STATUS_PLAYER || CharCreatedBy == MISSION_CHAR) {
 
 										// VC calls SetDirectionToWalkAroundVehicle instead if ped is in PED_SEEK_CAR.
@@ -9695,7 +9700,7 @@ CPed::ProcessControl(void)
 								}
 							}
 
-						} else if (!m_ped_flagB80) {
+						} else if (!bVehEnterDoorIsBlocked) {
 							if (collidingVeh->m_status != STATUS_PLAYER || CharCreatedBy == MISSION_CHAR) {
 
 								SetDirectionToWalkAroundObject(collidingVeh);
@@ -12161,7 +12166,7 @@ CPed::PossiblyFindBetterPosToSeekCar(CVector *pos, CVehicle *veh)
 
 		// ?!? I think it's absurd to use this unless another function like SeekCar finds next pos. with it and we're trying to simulate it's behaviour.
 		// On every run it returns another pos. for ped, with same distance to the veh.
-		// Sequence of positions are not guarenteed, it depends on global pos. (So sometimes it returns positions to make ped draw circle, sometimes don't)
+		// Sequence of positions are not guaranteed, it depends on global pos. (So sometimes it returns positions to make ped draw circle, sometimes don't)
 		helperPos = veh->GetMatrix() * helperPos;
 
 		float vehForwardHeading = veh->GetForward().Heading();
@@ -13027,7 +13032,7 @@ CPed::ProcessObjective(void)
 						} else {
 							SetSeekBoatPosition(m_carInObjective);
 						}
-						if (m_nMoveState == PEDMOVE_STILL && !m_ped_flagB80)
+						if (m_nMoveState == PEDMOVE_STILL && !bVehEnterDoorIsBlocked)
 							SetMoveState(PEDMOVE_RUN);
 
 						if (m_carInObjective && m_carInObjective->m_fHealth > 0.0f) {
@@ -15574,6 +15579,165 @@ CPed::ScanForThreats(void)
 	}
 }
 
+void
+CPed::SeekCar(void)
+{
+	CVehicle *vehToSeek = m_carInObjective;
+	CVector dest(0.0f, 0.0f, 0.0f);
+	if (!vehToSeek) {
+		RestorePreviousState();
+		return;
+	}
+
+	if (m_objective != OBJECTIVE_ENTER_CAR_AS_PASSENGER) {
+		if (m_vehEnterType && m_objective != OBJECTIVE_ENTER_CAR_AS_DRIVER) {
+			if (IsRoomToBeCarJacked()) {
+				dest = GetPositionToOpenCarDoor(vehToSeek, m_vehEnterType);
+			} else if (m_nPedType == PEDTYPE_COP) {
+				dest = GetPositionToOpenCarDoor(vehToSeek, CAR_DOOR_RF);
+			} else {
+				SetMoveState(PEDMOVE_STILL);
+			}
+		} else
+			GetNearestDoor(vehToSeek, dest);
+	} else {
+		if (m_hitRecoverTimer > CTimer::GetTimeInMilliseconds()) {
+			SetMoveState(PEDMOVE_STILL);
+			return;
+		}
+		if (vehToSeek->m_modelIndex == MI_COACH) {
+			GetNearestDoor(vehToSeek, dest);
+		} else {
+			if (vehToSeek->IsTrain()) {
+				if (vehToSeek->m_status != STATUS_TRAIN_NOT_MOVING) {
+					RestorePreviousObjective();
+					RestorePreviousState();
+					return;
+				}
+				if (!GetNearestTrainDoor(vehToSeek, dest)) {
+					RestorePreviousObjective();
+					RestorePreviousState();
+					return;
+				}
+			} else {
+				if (!GetNearestPassengerDoor(vehToSeek, dest)) {
+					if (vehToSeek->m_nNumPassengers == vehToSeek->m_nNumMaxPassengers) {
+						RestorePreviousObjective();
+						RestorePreviousState();
+					} else {
+						SetMoveState(PEDMOVE_STILL);
+					}
+					bVehEnterDoorIsBlocked = true;
+					return;
+				}
+				bVehEnterDoorIsBlocked = false;
+			}
+		}
+	}
+
+	if (dest.x == 0.0f && dest.y == 0.0f) {
+		if ((!IsPlayer() && CharCreatedBy != MISSION_CHAR) || vehToSeek->VehicleCreatedBy != MISSION_VEHICLE || vehToSeek->pDriver) {
+			RestorePreviousState();
+			if (IsPlayer()) {
+				ClearObjective();
+			} else if (CharCreatedBy == RANDOM_CHAR) {
+				m_hitRecoverTimer = CTimer::GetTimeInMilliseconds() + 30000;
+			}
+			SetMoveState(PEDMOVE_STILL);
+			TheCamera.ClearPlayerWeaponMode();
+			CCarCtrl::RemoveFromInterestingVehicleList(vehToSeek);
+			return;
+		}
+		dest = vehToSeek->GetPosition();
+		if (bCollidedWithMyVehicle) {
+			WarpPedIntoCar(m_pMyVehicle);
+			return;
+		}
+	}
+	bool foundBetterPosToSeek = PossiblyFindBetterPosToSeekCar(&dest, vehToSeek);
+	m_vecSeekPos = dest;
+	float distToDest = (m_vecSeekPos - GetPosition()).MagnitudeSqr();
+#ifndef VC_PED_PORTS
+	if (bIsRunning)
+		SetMoveState(PEDMOVE_RUN);
+#else
+	if (bIsRunning ||
+		vehToSeek->pDriver && distToDest > 4.0f && (Abs(vehToSeek->m_vecMoveSpeed.x) > 0.01f || Abs(vehToSeek->m_vecMoveSpeed.y) > 0.01f))
+		SetMoveState(PEDMOVE_RUN);
+#endif
+	else if (distToDest < 4.0f)
+		SetMoveState(PEDMOVE_WALK);
+
+	if (distToDest >= 1.0f)
+		bCanPedEnterSeekedCar = false;
+	else if (2.0f * vehToSeek->GetColModel()->boundingBox.max.x > distToDest)
+		bCanPedEnterSeekedCar = true;
+
+	if (vehToSeek->m_nGettingInFlags & GetCarDoorFlag(m_vehEnterType))
+		bVehEnterDoorIsBlocked = true;
+	else
+		bVehEnterDoorIsBlocked = false;
+
+	if (Seek()) {
+		if (!foundBetterPosToSeek) {
+			if (1.5f + GetPosition().z > dest.z && GetPosition().z - 0.5f < dest.z) {
+				if (vehToSeek->IsTrain()) {
+					SetEnterTrain(vehToSeek, m_vehEnterType);
+				} else {
+					m_fRotationCur = m_fRotationDest;
+					if (!bVehEnterDoorIsBlocked) {
+						vehToSeek->bIsStatic = false;
+						if (m_objective == OBJECTIVE_SOLICIT) {
+							SetSolicit(1000);
+						} else if (m_objective == OBJECTIVE_BUY_ICE_CREAM) {
+							SetBuyIceCream();
+						} else if (vehToSeek->m_nNumGettingIn < vehToSeek->m_nNumMaxPassengers + 1
+							&& vehToSeek->CanPedEnterCar()) {
+
+							switch (vehToSeek->m_status) {
+								case STATUS_PLAYER:
+								case STATUS_SIMPLE:
+								case STATUS_PHYSICS:
+								case STATUS_PLAYER_DISABLED:
+									if (!vehToSeek->bIsBus && (!m_leader || m_leader != vehToSeek->pDriver) &&
+										(m_vehEnterType == CAR_DOOR_LF && vehToSeek->pDriver || m_vehEnterType == CAR_DOOR_RF && vehToSeek->pPassengers[0] || m_vehEnterType == CAR_DOOR_LR && vehToSeek->pPassengers[1] || m_vehEnterType == CAR_DOOR_RR && vehToSeek->pPassengers[2])) {
+										SetCarJack(vehToSeek);
+										if (m_objective == OBJECTIVE_ENTER_CAR_AS_DRIVER && m_vehEnterType != CAR_DOOR_LF)
+											vehToSeek->pDriver->bFleeAfterExitingCar = true;
+									} else {
+										SetEnterCar(vehToSeek, m_vehEnterType);
+									}
+									break;
+								case STATUS_ABANDONED:
+									if (m_vehEnterType == CAR_DOOR_RF && vehToSeek->pPassengers[0]) {
+										if (vehToSeek->pPassengers[0]->m_ped_flagF4) {
+											if (IsPlayer())
+												CPed::SetEnterCar(vehToSeek, m_vehEnterType);
+										} else {
+											SetCarJack(vehToSeek);
+										}
+									} else {
+										SetEnterCar(vehToSeek, m_vehEnterType);
+									}
+									break;
+								case STATUS_WRECKED:
+									SetIdle();
+									break;
+								default:
+									return;
+							}
+						} else {
+							RestorePreviousState();
+						}
+					} else {
+						SetMoveState(PEDMOVE_STILL);
+					}
+				}
+			}
+		}
+	}
+}
+
 class CPed_ : public CPed
 {
 public:
@@ -15791,4 +15955,5 @@ STARTPATCHES
 	InjectHook(0x4E1010, &CPed::SetExitCar, PATCH_JUMP);
 	InjectHook(0x4C5FE0, &CPed::ScanForThreats, PATCH_JUMP);
 	InjectHook(0x4C6C10, &CPed::ScanForInterestingStuff, PATCH_JUMP);
+	InjectHook(0x4D3F90, &CPed::SeekCar, PATCH_JUMP);
 ENDPATCHES
\ No newline at end of file
diff --git a/src/peds/Ped.h b/src/peds/Ped.h
index b3d0f145..b8d2f5dd 100644
--- a/src/peds/Ped.h
+++ b/src/peds/Ped.h
@@ -294,9 +294,9 @@ public:
 	uint8 bIsLanding : 1;
 	uint8 bIsRunning : 1; // on some conditions
 	uint8 bHitSomethingLastFrame : 1;
-	uint8 m_ped_flagB80 : 1; // bIsNearCar? it's sure that it's related with cars and used for deciding whether we should move
+	uint8 bVehEnterDoorIsBlocked : 1; // because someone else enters/exits from there
 
-	uint8 m_ped_flagC1 : 1;	// bCanPedEnterSeekedCar?
+	uint8 bCanPedEnterSeekedCar : 1;
 	uint8 bRespondsToThreats : 1;
 	uint8 bRenderPedInCar : 1;
 	uint8 bChangedSeat : 1;
@@ -679,6 +679,8 @@ public:
 	void SetEnterCar_AllClear(CVehicle*, uint32, uint32);
 	void SetSolicit(uint32 time);
 	void ScanForInterestingStuff(void);
+	void WarpPedIntoCar(CVehicle*);
+	void SetCarJack(CVehicle*);
 
 	// Static methods
 	static CVector GetLocalPositionToOpenCarDoor(CVehicle *veh, uint32 component, float offset);

From 998adfab9046b224f9b6c975a1b2b6d0dad7095f Mon Sep 17 00:00:00 2001
From: Sergeanur <s.anureev@yandex.ua>
Date: Sat, 26 Oct 2019 21:24:26 +0300
Subject: [PATCH 32/37] Fixed use of boolean type for in CGameLogic

---
 src/control/GameLogic.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/control/GameLogic.cpp b/src/control/GameLogic.cpp
index 0ed5d5cf..ccba05c9 100644
--- a/src/control/GameLogic.cpp
+++ b/src/control/GameLogic.cpp
@@ -112,8 +112,8 @@ CGameLogic::Update()
 			CCarCtrl::ClearInterestingVehicleList();
 			CWorld::ClearExcitingStuffFromArea(pPlayerInfo.GetPos(), 4000.0f, 1);
 			CRestart::FindClosestHospitalRestartPoint(pPlayerInfo.GetPos(), &vecRestartPos, &fRestartFloat);
-			CRestart::OverrideHospitalLevel = false;
-			CRestart::OverridePoliceStationLevel = false;
+			CRestart::OverrideHospitalLevel = LEVEL_NONE;
+			CRestart::OverridePoliceStationLevel = LEVEL_NONE;
 			PassTime(720);
 			RestorePlayerStuffDuringResurrection(pPlayerInfo.m_pPed, vecRestartPos, fRestartFloat);
 			SortOutStreamingAndMemory(pPlayerInfo.GetPos());
@@ -183,8 +183,8 @@ CGameLogic::Update()
 			CCarCtrl::ClearInterestingVehicleList();
 			CWorld::ClearExcitingStuffFromArea(pPlayerInfo.GetPos(), 4000.0f, 1);
 			CRestart::FindClosestPoliceRestartPoint(pPlayerInfo.GetPos(), &vecRestartPos, &fRestartFloat);
-			CRestart::OverrideHospitalLevel = false;
-			CRestart::OverridePoliceStationLevel = false;
+			CRestart::OverrideHospitalLevel = LEVEL_NONE;
+			CRestart::OverridePoliceStationLevel = LEVEL_NONE;
 			PassTime(720);
 			RestorePlayerStuffDuringResurrection(pPlayerInfo.m_pPed, vecRestartPos, fRestartFloat);
 			pPlayerInfo.m_pPed->ClearWeapons();
@@ -224,8 +224,8 @@ CGameLogic::Update()
 			CCarCtrl::ClearInterestingVehicleList();
 			CWorld::ClearExcitingStuffFromArea(pPlayerInfo.GetPos(), 4000.0f, 1);
 			CRestart::FindClosestPoliceRestartPoint(pPlayerInfo.GetPos(), &vecRestartPos, &fRestartFloat);
-			CRestart::OverridePoliceStationLevel = false;
-			CRestart::OverrideHospitalLevel = false;
+			CRestart::OverridePoliceStationLevel = LEVEL_NONE;
+			CRestart::OverrideHospitalLevel = LEVEL_NONE;
 			RestorePlayerStuffDuringResurrection(pPlayerInfo.m_pPed, vecRestartPos, fRestartFloat);
 			SortOutStreamingAndMemory(pPlayerInfo.GetPos());
 			TheCamera.m_fCamShakeForce = 0.0f;

From af8ffaeeaebd99236b6076c9e342ff65f4786466 Mon Sep 17 00:00:00 2001
From: Sergeanur <s.anureev@yandex.ua>
Date: Sat, 26 Oct 2019 21:25:45 +0300
Subject: [PATCH 33/37] Removed redundant check in IsPickupModel,
 TestModelIndices added

---
 src/modelinfo/ModelIndices.cpp | 6 ++++++
 src/modelinfo/ModelIndices.h   | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/modelinfo/ModelIndices.cpp b/src/modelinfo/ModelIndices.cpp
index 9a8aaead..bf6b3905 100644
--- a/src/modelinfo/ModelIndices.cpp
+++ b/src/modelinfo/ModelIndices.cpp
@@ -26,6 +26,12 @@ MatchModelString(const char *modelname, int16 id)
 #undef X
 }
 
+void
+TestModelIndices(void)
+{
+	;
+}
+
 STARTPATCHES
 	InjectHook(0x48EB60, InitModelIndices, PATCH_JUMP);
 	InjectHook(0x48F030, MatchModelString, PATCH_JUMP);
diff --git a/src/modelinfo/ModelIndices.h b/src/modelinfo/ModelIndices.h
index 4a6e80d0..20d1b7f3 100644
--- a/src/modelinfo/ModelIndices.h
+++ b/src/modelinfo/ModelIndices.h
@@ -365,6 +365,7 @@ enum{
 
 void InitModelIndices(void);
 void MatchModelString(const char *name, int16 id);
+void TestModelIndices(void);
 
 inline bool
 IsGlass(int16 id)
@@ -462,7 +463,6 @@ IsPickupModel(int16 id)
 		id == MI_UZI ||
 		id == MI_M16 ||
 		id == MI_FLAMETHROWER ||
-		id >= MI_M16 && id <= MI_FLAMETHROWER ||
 		id == MI_PICKUP_ADRENALINE ||
 		id == MI_PICKUP_BODYARMOUR ||
 		id == MI_PICKUP_INFO ||

From c3c6c5100346c8c56e7aa7ea7efd3250b8c5a1a3 Mon Sep 17 00:00:00 2001
From: Sergeanur <s.anureev@yandex.ua>
Date: Sat, 26 Oct 2019 22:48:54 +0300
Subject: [PATCH 34/37] Revert m_alphaEntityList capacity

---
 src/render/VisibilityPlugins.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/render/VisibilityPlugins.cpp b/src/render/VisibilityPlugins.cpp
index 6a2f77a1..e42c9df0 100644
--- a/src/render/VisibilityPlugins.cpp
+++ b/src/render/VisibilityPlugins.cpp
@@ -44,7 +44,7 @@ CVisibilityPlugins::Initialise(void)
 	m_alphaList.Init(20);
 	m_alphaList.head.item.sort = 0.0f;
 	m_alphaList.tail.item.sort = 100000000.0f;
-	m_alphaEntityList.Init(150);
+	m_alphaEntityList.Init(350);	// TODO: set back to 150 when things are fixed
 	m_alphaEntityList.head.item.sort = 0.0f;
 	m_alphaEntityList.tail.item.sort = 100000000.0f;
 }

From fcfdaa9534c67bc0affee73af80b12ffc82dfd05 Mon Sep 17 00:00:00 2001
From: Sergeanur <s.anureev@yandex.ua>
Date: Sun, 27 Oct 2019 01:46:48 +0300
Subject: [PATCH 35/37] cAudioManager::TranslateEntity cleanup

---
 src/audio/AudioManager.cpp | 13 ++-----------
 src/math/Matrix.h          | 10 +++++++++-
 src/math/math.cpp          | 10 ----------
 3 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/src/audio/AudioManager.cpp b/src/audio/AudioManager.cpp
index e3ae9068..f8d42aec 100644
--- a/src/audio/AudioManager.cpp
+++ b/src/audio/AudioManager.cpp
@@ -9109,18 +9109,9 @@ cAudioManager::Terminate()
 }
 
 void
-cAudioManager::TranslateEntity(CVector *v1, CVector *v2) const
+cAudioManager::TranslateEntity(CVector *in, CVector *out) const
 {
-	const RwMatrix &cM = TheCamera.GetMatrix().m_matrix;
-	const CVector &cV = TheCamera.GetPosition();
-
-	float a = v1->z - cV.z;
-	float b = v1->y - cV.y;
-	float c = v1->x - cV.x;
-
-	v2->x = cM.right.y * b + cM.right.x * c + cM.right.z * a;
-	v2->y = cM.up.y * b + cM.up.x * c + cM.up.z * a;
-	v2->z = cM.at.y * b + cM.at.x * c + cM.at.z * a;
+	*out = MultiplyInverse(TheCamera.GetMatrix(), *in);
 }
 
 void
diff --git a/src/math/Matrix.h b/src/math/Matrix.h
index 96f56a0f..da38cb1d 100644
--- a/src/math/Matrix.h
+++ b/src/math/Matrix.h
@@ -249,7 +249,15 @@ public:
 CMatrix &Invert(const CMatrix &src, CMatrix &dst);
 CVector operator*(const CMatrix &mat, const CVector &vec);
 CMatrix operator*(const CMatrix &m1, const CMatrix &m2);
-CVector MultiplyInverse(const CMatrix &mat, const CVector &vec);
+inline CVector MultiplyInverse(const CMatrix &mat, const CVector &vec)
+{
+	CVector v(vec.x - mat.m_matrix.pos.x, vec.y - mat.m_matrix.pos.y, vec.z - mat.m_matrix.pos.z);
+	return CVector(
+		mat.m_matrix.right.x * v.x + mat.m_matrix.right.y * v.y + mat.m_matrix.right.z * v.z,
+		mat.m_matrix.up.x * v.x + mat.m_matrix.up.y * v.y + mat.m_matrix.up.z * v.z,
+		mat.m_matrix.at.x * v.x + mat.m_matrix.at.y * v.y + mat.m_matrix.at.z * v.z);
+}
+
 const CVector Multiply3x3(const CMatrix &mat, const CVector &vec);
 const CVector Multiply3x3(const CVector &vec, const CMatrix &mat);
 
diff --git a/src/math/math.cpp b/src/math/math.cpp
index 6201cee6..4f74fac9 100644
--- a/src/math/math.cpp
+++ b/src/math/math.cpp
@@ -126,16 +126,6 @@ operator*(const CMatrix &m1, const CMatrix &m2)
 	return out;
 }
 
-CVector
-MultiplyInverse(const CMatrix &mat, const CVector &vec)
-{
-	CVector v(vec.x - mat.m_matrix.pos.x, vec.y - mat.m_matrix.pos.y, vec.z - mat.m_matrix.pos.z);
-	return CVector(
-		mat.m_matrix.right.x * v.x + mat.m_matrix.right.y * v.y + mat.m_matrix.right.z * v.z,
-		mat.m_matrix.up.x * v.x + mat.m_matrix.up.y * v.y + mat.m_matrix.up.z * v.z,
-		mat.m_matrix.at.x * v.x + mat.m_matrix.at.y * v.y + mat.m_matrix.at.z * v.z);
-}
-
 const CVector
 Multiply3x3(const CMatrix &mat, const CVector &vec)
 {

From 405b83ca0fa2b35cd7b1c3f99edb429f05a8c8a2 Mon Sep 17 00:00:00 2001
From: Filip Gawin <filip.gawin@zoho.com>
Date: Sat, 26 Oct 2019 16:47:57 +0200
Subject: [PATCH 36/37] Audio9 (fixes)

---
 src/audio/AudioManager.cpp | 142 ++++++++++++++++---------------------
 src/audio/AudioManager.h   |   2 +-
 2 files changed, 63 insertions(+), 81 deletions(-)

diff --git a/src/audio/AudioManager.cpp b/src/audio/AudioManager.cpp
index f8d42aec..f63a7144 100644
--- a/src/audio/AudioManager.cpp
+++ b/src/audio/AudioManager.cpp
@@ -48,20 +48,40 @@ bool &bPlayerJustEnteredCar = *(bool *)0x6508C4;
 bool &g_bMissionAudioLoadFailed = *(bool *)0x95CD8E;
 uint32 *gMinTimeToNextReport = (uint32 *)0x8E2828;
 uint8 &gSpecialSuspectLastSeenReport = *(uint8 *)0x95CD4D;
-bool hornPatternsArray[8][44] = {
-	{false, false, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, false, false, false, false, false, false, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, false, false, false, false},
-	{false, false, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, false, false},
-	{false, false, true, true, true, true, true, true, true, true, true, true, false, false, false, false, true, true, true, true, true, false, false, false, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, false},
-	{false, false, true, true, true, true, true, false, false, true, true, true, true, true, false, false, false, true, true, true, true, true, true, true, true, true, true, false, false, false, true, true, true, true, true, true, true, true, true, true, true, true, true, false},
-	{false, false, true, true, true, true, true, true, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},
-	{false, false, true, true, true, false, false, false, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},
-	{false, false, true, true, true, true, false, false, false, false, true, true, true, false, false, true, true, true, false, false, true, true, true, true, true, true, false, false, false, false, false, true, true, true, true, true, true, true, true, true, true, true, false, false},
-	{false, false, true, true, true, true, false, false, true, true, true, true, true, false, false, false, true, true, true, true, true, true, false, false, false, false, true, true, true, true, true, true, true, true, true, true, true, true, true, false, false, false, false, false},
+
+constexpr bool hornPatternsArray[8][44] = {
+    {false, false, true,  true,  true,  true,  true,  true,  true, true, true,  true,  true,  true, true,
+     true,  true,  false, false, false, false, false, false, true, true, true,  true,  true,  true, true,
+     true,  true,  true,  true,  true,  true,  true,  true,  true, true, false, false, false, false},
+    {false, false, true, true, true, true, true, true, true, true, true, true, true,  true, true,
+     true,  true,  true, true, true, true, true, true, true, true, true, true, true,  true, true,
+     true,  true,  true, true, true, true, true, true, true, true, true, true, false, false},
+    {false, false, true, true, true, true, true,  true,  true,  true, true, true, false, false, false,
+     false, true,  true, true, true, true, false, false, false, true, true, true, true,  true,  true,
+     true,  true,  true, true, true, true, true,  true,  true,  true, true, true, true,  false},
+    {false, false, true, true, true, true, true, false, false, true, true, true, true,  true,  false,
+     false, false, true, true, true, true, true, true,  true,  true, true, true, false, false, false,
+     true,  true,  true, true, true, true, true, true,  true,  true, true, true, true,  false},
+    {false, false, true,  true,  true,  true,  true,  true,  true,  true,  true,  false, false, false, false,
+     false, false, false, false, false, false, false, false, false, false, false, false, false, false, false,
+     false, false, false, false, false, false, false, false, false, false, false, false, false, false},
+    {false, false, true,  true,  true,  false, false, false, true,  true,  true,  false, false, false, false,
+     false, false, false, false, false, false, false, false, false, false, false, false, false, false, false,
+     false, false, false, false, false, false, false, false, false, false, false, false, false, false},
+    {false, false, true, true,  true,  true, false, false, false, false, true, true,  true,  false, false,
+     true,  true,  true, false, false, true, true,  true,  true,  true,  true, false, false, false, false,
+     false, true,  true, true,  true,  true, true,  true,  true,  true,  true, true,  false, false},
+    {false, false, true, true, true, true, false, false, true,  true,  true,  true,  true,  false, false,
+     false, true,  true, true, true, true, true,  false, false, false, false, true,  true,  true,  true,
+     true,  true,  true, true, true, true, true,  true,  true,  false, false, false, false, false},
 };
 
 constexpr int totalAudioEntitiesSlots = 200;
 constexpr int maxVolume = 127;
-constexpr int policeChannel = 28;
+constexpr int channels = ARRAY_SIZE(cAudioManager::m_asActiveSamples);
+constexpr int policeChannel = channels + 1;
+constexpr int allChannels = channels + 2;
+
 constexpr uint8 panTable[64]{0,  3,  8,  12, 16, 19, 22, 24, 26, 28, 30, 31, 33, 34, 36, 37, 39, 40, 41, 42, 44, 45,
                              46, 47, 48, 49, 49, 50, 51, 52, 53, 53, 54, 55, 55, 56, 56, 57, 57, 58, 58, 58, 59, 59,
                              59, 60, 60, 61, 61, 61, 61, 62, 62, 62, 62, 62, 63, 63, 63, 63, 63, 63, 63, 63};
@@ -621,7 +641,7 @@ cAudioManager::CreateEntity(int32 type, CPhysical *entity)
 			m_asAudioEntities[i].m_awAudioEvent[1] = SOUND_TOTAL_PED_SOUNDS;
 			m_asAudioEntities[i].m_awAudioEvent[2] = SOUND_TOTAL_PED_SOUNDS;
 			m_asAudioEntities[i].m_awAudioEvent[3] = SOUND_TOTAL_PED_SOUNDS;
-			m_asAudioEntities[i].m_Loops = 0;
+			m_asAudioEntities[i].m_AudioEvents = 0;
 			m_anAudioEntityIndices[m_nAudioEntitiesTotal++] = i;
 			return i;
 		}
@@ -2571,9 +2591,9 @@ cAudioManager::InitialisePoliceRadio()
 	policeChannelTimer = 0;
 	policeChannelTimerSeconds = 0;
 	policeChannelCounterSeconds = 0;
-	for(int32 i = 0; i < 10; i++) { crimes[i].type = 0; }
+	for(int32 i = 0; i < ARRAY_SIZE(crimes); i++) { crimes[i].type = 0; }
 
-	SampleManager.SetChannelReverbFlag(28, 0);
+	SampleManager.SetChannelReverbFlag(policeChannel, 0);
 	gSpecialSuspectLastSeenReport = 0;
 	for(int32 i = 0; i < 18; i++) { gMinTimeToNextReport[i] = m_nTimeOfRecentCrime; }
 }
@@ -2674,7 +2694,7 @@ cAudioManager::InterrogateAudioEntities()
 {
 	for(int32 i = 0; i < m_nAudioEntitiesTotal; i++) {
 		ProcessEntity(m_anAudioEntityIndices[i]);
-		m_asAudioEntities[m_anAudioEntityIndices[i]].m_Loops = 0;
+		m_asAudioEntities[m_anAudioEntityIndices[i]].m_AudioEvents = 0;
 	}
 }
 
@@ -2734,7 +2754,7 @@ cAudioManager::PlayLoadedMissionAudio()
 void
 cAudioManager::PlayOneShot(int32 index, int16 sound, float vol)
 {
-	static constexpr uint8 byte_60ABD0[] = {
+	static constexpr uint8 OneShotPriority[] = {
 	    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 5, 5, 5, 3, 5, 2, 2, 1, 1, 3, 1, 3, 3, 1, 1, 1, 4, 4, 3, 1, 1,
 	    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 6, 1, 1, 3, 2, 2, 2, 2, 0, 0, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	    1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 3, 1, 1, 1, 9,
@@ -2743,42 +2763,41 @@ cAudioManager::PlayOneShot(int32 index, int16 sound, float vol)
 
 	if(m_bIsInitialised) {
 		if(index >= 0 && index < totalAudioEntitiesSlots) {
-			if(m_asAudioEntities[index].m_bIsUsed) {
+			tAudioEntity &entity = m_asAudioEntities[index];
+			if(entity.m_bIsUsed) {
 				if(sound < SOUND_TOTAL_SOUNDS) {
-					if(m_asAudioEntities[index].m_nType == AUDIOTYPE_SCRIPTOBJECT) {
+					if(entity.m_nType == AUDIOTYPE_SCRIPTOBJECT) {
 						if(m_nScriptObjectEntityTotal < 40) {
-							m_asAudioEntities[index].m_awAudioEvent[0] = sound;
-							m_asAudioEntities[index].m_Loops = 1;
+							entity.m_awAudioEvent[0] = sound;
+							entity.m_AudioEvents = 1;
 							m_anScriptObjectEntityIndices[m_nScriptObjectEntityTotal++] =
 							    index;
 						}
 					} else {
 						int32 i = 0;
-						while(1) {
-							if(i >= m_asAudioEntities[index].m_Loops) {
-								if(m_asAudioEntities[index].m_Loops < 4) {
-									m_asAudioEntities[index].m_awAudioEvent[i] =
-									    sound;
-									m_asAudioEntities[index].m_afVolume[i] = vol;
-									++m_asAudioEntities[index].m_Loops;
+						while(true) {
+							if(i >= entity.m_AudioEvents) {
+								if(entity.m_AudioEvents < 4) {
+									entity.m_awAudioEvent[i] = sound;
+									entity.m_afVolume[i] = vol;
+									++entity.m_AudioEvents;
 								}
 								return;
 							}
-							if(byte_60ABD0[m_asAudioEntities[index].m_awAudioEvent[i]] >
-							   byte_60ABD0[sound])
+							if(OneShotPriority[entity.m_awAudioEvent[i]] >
+							   OneShotPriority[sound])
 								break;
 							++i;
 						}
 						if(i < 3) {
-							memmove(&m_asAudioEntities[index].m_awAudioEvent[i + 1],
-							        &m_asAudioEntities[index].m_awAudioEvent[i], 3 - i);
-							memmove(&m_asAudioEntities[index].m_afVolume[i + 1],
-							        &m_asAudioEntities[index].m_afVolume[i], 3 - i);
+							memmove(&entity.m_awAudioEvent[i + 1],
+							        &entity.m_awAudioEvent[i], (3 - i) * 2);
+							memmove(&entity.m_afVolume[i + 1], &entity.m_afVolume[i],
+							        (3 - i) * 4);
 						}
-						m_asAudioEntities[index].m_awAudioEvent[i] = sound;
-						m_asAudioEntities[index].m_afVolume[i] = vol;
-						if(m_asAudioEntities[index].m_Loops < 4)
-							++m_asAudioEntities[index].m_Loops;
+						entity.m_awAudioEvent[i] = sound;
+						entity.m_afVolume[i] = vol;
+						if(entity.m_AudioEvents < 4) ++entity.m_AudioEvents;
 					}
 				}
 			}
@@ -2851,27 +2870,6 @@ cAudioManager::PlaySuspectLastSeen(float x, float y, float z)
 							    (policeChannelTimerSeconds + 1) % 60;
 						}
 						if(policeChannelTimer == 60) {
-							if(policeChannelTimer != 60) {
-								crimesSamples[policeChannelTimerSeconds] = sample;
-								++policeChannelTimer;
-								policeChannelTimerSeconds =
-								    (policeChannelTimerSeconds + 1) % 60;
-							}
-							if(policeChannelTimer != 60) {
-								crimesSamples[policeChannelTimerSeconds] =
-								    m_anRandomTable[2] % 3 +
-								    AUDIO_SAMPLE_POLICE_SCANNER_SMALL_CRACKLE_1;
-								++policeChannelTimer;
-								policeChannelTimerSeconds =
-								    (policeChannelTimerSeconds + 1) % 60;
-							}
-							if(policeChannelTimer != 60) {
-								crimesSamples[policeChannelTimerSeconds] =
-								    TOTAL_AUDIO_SAMPLES;
-								++policeChannelTimer;
-								policeChannelTimerSeconds =
-								    (policeChannelTimerSeconds + 1) % 60;
-							}
 							gSpecialSuspectLastSeenReport = 1;
 							return;
 						}
@@ -3894,7 +3892,7 @@ cAudioManager::ProcessFrontEnd()
 
 	static uint32 counter = 0;
 
-	for(uint32 i = 0; i < m_asAudioEntities[m_sQueueSample.m_nEntityIndex].m_Loops; i++) {
+	for(uint32 i = 0; i < m_asAudioEntities[m_sQueueSample.m_nEntityIndex].m_AudioEvents; i++) {
 		processed = 0;
 		switch(m_asAudioEntities[m_sQueueSample.m_nEntityIndex].m_awAudioEvent[i]) {
 		case SOUND_WEAPON_SNIPER_SHOT_NO_ZOOM:
@@ -6931,7 +6929,7 @@ void
 cAudioManager::ProcessReverb() const
 {
 	if(SampleManager.UpdateReverb() && m_bDynamicAcousticModelingStatus) {
-		for(uint32 i = 0; i < 28; i++) {
+		for(uint32 i = 0; i < channels; i++) { // bug? 
 			if(m_asActiveSamples[i].m_bReverbFlag) SampleManager.SetChannelReverbFlag(i, 1);
 		}
 	}
@@ -7059,7 +7057,7 @@ cAudioManager::ProcessScriptObject(int32 id)
 	cAudioScriptObject *entity = (cAudioScriptObject *)m_asAudioEntities[id].m_pEntity;
 	if(entity) {
 		m_sQueueSample.m_vecPos = entity->Posn;
-		if(m_asAudioEntities[id].m_Loops == 1)
+		if(m_asAudioEntities[id].m_AudioEvents == 1)
 			ProcessOneShotScriptObject(m_asAudioEntities[id].m_awAudioEvent[0]);
 		else
 			ProcessLoopingScriptObject(entity->AudioId);
@@ -7684,7 +7682,7 @@ cAudioManager::ProcessWeather(int32 id)
 	uint8 vol;
 	static uint8 counter = 0;
 
-	if(m_asAudioEntities[id].m_Loops && m_asAudioEntities[id].m_awAudioEvent[0] == SOUND_LIGHTNING) {
+	if(m_asAudioEntities[id].m_AudioEvents && m_asAudioEntities[id].m_awAudioEvent[0] == SOUND_LIGHTNING) {
 		if(m_asAudioEntities[id].m_afVolume[0] >= 10.f) {
 			m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_EXPLOSION_CAR;
 			m_sQueueSample.m_bBankIndex = 0;
@@ -8136,7 +8134,7 @@ cAudioManager::ServiceSoundEffects()
 	else
 		field_2 = 1;
 	if(m_bUserPause && !m_bPreviousUserPause) {
-		for(int32 i = 0; i < 29; i++) SampleManager.StopChannel(i);
+		for(int32 i = 0; i < allChannels; i++) SampleManager.StopChannel(i);
 
 		ClearRequestedQueue();
 		if(m_bActiveSampleQueue) {
@@ -8164,7 +8162,8 @@ cAudioManager::ServiceSoundEffects()
 	ProcessActiveQueues();
 	for(int32 i = 0; i < m_nScriptObjectEntityTotal; ++i) {
 		object = (cAudioScriptObject *)m_asAudioEntities[m_anScriptObjectEntityIndices[i]].m_pEntity;
-		if(object) { delete object; }
+		delete object;
+		m_asAudioEntities[m_anScriptObjectEntityIndices[i]].m_pEntity = nil;
 		DestroyEntity(m_anScriptObjectEntityIndices[i]);
 	}
 	m_nScriptObjectEntityTotal = 0;
@@ -8530,23 +8529,6 @@ cAudioManager::SetupCrimeReport()
 					policeChannelTimerSeconds = (policeChannelTimerSeconds + 1) % 60;
 				}
 				if(policeChannelTimer == 60) {
-					if(policeChannelTimer != 60) {
-						crimesSamples[policeChannelTimerSeconds] = sampleIndex;
-						++policeChannelTimer;
-						policeChannelTimerSeconds = (policeChannelTimerSeconds + 1) % 60;
-					}
-					if(policeChannelTimer != 60) {
-						crimesSamples[policeChannelTimerSeconds] =
-						    m_anRandomTable[2] % 3 +
-						    AUDIO_SAMPLE_POLICE_SCANNER_SMALL_CRACKLE_1;
-						++policeChannelTimer;
-						policeChannelTimerSeconds = (policeChannelTimerSeconds + 1) % 60;
-					}
-					if(policeChannelTimer != 60) {
-						crimesSamples[policeChannelTimerSeconds] = TOTAL_AUDIO_SAMPLES;
-						++policeChannelTimer;
-						policeChannelTimerSeconds = (policeChannelTimerSeconds + 1) % 60;
-					}
 					crimes[i].type = 0;
 					AgeCrimes();
 					return 1;
diff --git a/src/audio/AudioManager.h b/src/audio/AudioManager.h
index 6ac6dda7..ef7900e2 100644
--- a/src/audio/AudioManager.h
+++ b/src/audio/AudioManager.h
@@ -214,7 +214,7 @@ public:
 	int16 m_awAudioEvent[4];
 	uint8 gap_18[2];
 	float m_afVolume[4];
-	uint8 m_Loops;
+	uint8 m_AudioEvents;
 	uint8 field_25[3];
 
 	// no methods

From 9d0757eebee4cb86ec46db8e63ea484cb23f2bb3 Mon Sep 17 00:00:00 2001
From: Sergeanur <s.anureev@yandex.ua>
Date: Sun, 27 Oct 2019 02:06:10 +0300
Subject: [PATCH 37/37] SfxEnum

---
 src/audio/AudioManager.cpp | 1709 +++++-----
 src/audio/AudioSamples.h   | 6103 ++++++++++++++++++------------------
 2 files changed, 3913 insertions(+), 3899 deletions(-)

diff --git a/src/audio/AudioManager.cpp b/src/audio/AudioManager.cpp
index f63a7144..3bfcb3a8 100644
--- a/src/audio/AudioManager.cpp
+++ b/src/audio/AudioManager.cpp
@@ -221,9 +221,9 @@ cPedComments::Process()
 			AudioManager.m_sQueueSample.m_bEmittingVolume = maxVolume;
 			AudioManager.m_sQueueSample.field_48 = 3.0f;
 			switch(sampleIndex) {
-			case AUDIO_SAMPLE_POLICE_HELI_FOUND_PLAYER_1:
-			case AUDIO_SAMPLE_POLICE_HELI_FOUND_PLAYER_2:
-			case AUDIO_SAMPLE_POLICE_HELI_FOUND_PLAYER_3:
+			case SFX_POLICE_HELI_1:
+			case SFX_POLICE_HELI_2:
+			case SFX_POLICE_HELI_3:
 				AudioManager.m_sQueueSample.m_fSoundIntensity = 400.0f;
 				break;
 			default: AudioManager.m_sQueueSample.m_fSoundIntensity = 50.0f; break;
@@ -232,13 +232,12 @@ cPedComments::Process()
 			AudioManager.m_sQueueSample.m_vecPos =
 			    m_asPedComments[activeBank][indexMap[activeBank][0]].m_vecPos;
 
-			if((sampleIndex - AUDIO_SAMPLE_AMMUNATION_WELCOME_1) > 1 &&
-			   sampleIndex != AUDIO_SAMPLE_AMMUNATION_WELCOME_3) {
-				AudioManager.m_sQueueSample.m_bReverbFlag = 1;
-				AudioManager.m_sQueueSample.m_bRequireReflection = 1;
-			} else {
+			if(sampleIndex >= SFX_AMMU_D && sampleIndex <= SFX_AMMU_F) {
 				AudioManager.m_sQueueSample.m_bReverbFlag = 0;
 				AudioManager.m_sQueueSample.m_bRequireReflection = 0;
+			} else {
+				AudioManager.m_sQueueSample.m_bReverbFlag = 1;
+				AudioManager.m_sQueueSample.m_bRequireReflection = 1;
 			}
 
 			AudioManager.m_sQueueSample.m_bIsDistant = 0;
@@ -708,11 +707,11 @@ cAudioManager::DoPoliceRadioCrackle()
 {
 	m_sQueueSample.m_nEntityIndex = m_nPoliceChannelEntity;
 	m_sQueueSample.m_counter = 0;
-	m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_CRACKLE;
+	m_sQueueSample.m_nSampleIndex = SFX_POLICE_RADIO_CRACKLE;
 	m_sQueueSample.m_bBankIndex = 0;
 	m_sQueueSample.m_bIsDistant = 1;
 	m_sQueueSample.field_16 = 10;
-	m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_POLICE_SCANNER_CRACKLE);
+	m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_POLICE_RADIO_CRACKLE);
 	m_sQueueSample.m_bVolume = m_anRandomTable[2] % 20 + 15;
 	m_sQueueSample.m_nLoopCount = 0;
 	m_sQueueSample.m_bEmittingVolume = m_sQueueSample.m_bVolume;
@@ -733,9 +732,9 @@ cAudioManager::GetPlayerTalkSfx(int16 sound)
 	static uint32 lastSfx = NO_SAMPLE;
 
 	switch(sound) {
-	case SOUND_PED_DAMAGE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_DAMAGE_REACTION_1, 11); break;
-	case SOUND_PED_HIT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_HIT_REACTION_1, 10); break;
-	case SOUND_PED_LAND: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_FALL_REACTION_1, 6); break;
+	case SOUND_PED_DAMAGE: GetPhrase(&sfx, &lastSfx, SFX_CLAUDE_HIGH_DAMAGE_GRUNT_1, 11); break;
+	case SOUND_PED_HIT: GetPhrase(&sfx, &lastSfx, SFX_CLAUDE_LOW_DAMAGE_GRUNT_1, 10); break;
+	case SOUND_PED_LAND: GetPhrase(&sfx, &lastSfx, SFX_CLAUDE_HIT_GROUND_GRUNT_1, 6); break;
 	default: sfx = NO_SAMPLE; break;
 	}
 	return sfx;
@@ -749,13 +748,13 @@ 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, 6);
+		GetPhrase(&sfx, &lastSfx, SFX_COP_VOICE_1_ARREST_1, 6);
 	} else {
 		if(sound != SOUND_PED_PURSUIT_COP) { return GetGenericMaleTalkSfx(sound); }
 
 		pedState = FindPlayerPed()->m_nPedState;
 		if(pedState == PED_ARRESTED || pedState == PED_DEAD || pedState == PED_DIE) return NO_SAMPLE;
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_POLICE_COP_1_PURSUIT_1, 7);
+		GetPhrase(&sfx, &lastSfx, SFX_COP_VOICE_1_CHASE_1, 7);
 	}
 
 	return 13 * (m_sQueueSample.m_nEntityIndex % 5) + sfx;
@@ -769,13 +768,13 @@ 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, 6);
+		GetPhrase(&sfx, &lastSfx, SFX_SWAT_VOICE_1_CHASE_1, 6);
 	} else {
 		if(sound != SOUND_PED_PURSUIT_SWAT) { return GetGenericMaleTalkSfx(sound); }
 
 		pedState = FindPlayerPed()->m_nPedState;
 		if(pedState == PED_ARRESTED || pedState == PED_DEAD || pedState == PED_DIE) return NO_SAMPLE;
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_POLICE_SWAT_1_PURSUIT_ARREST_1, 6);
+		GetPhrase(&sfx, &lastSfx, SFX_SWAT_VOICE_1_CHASE_1, 6);
 	}
 
 	return 6 * (m_sQueueSample.m_nEntityIndex % 3) + sfx;
@@ -789,13 +788,13 @@ 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, 6);
+		GetPhrase(&sfx, &lastSfx, SFX_FBI_VOICE_1_CHASE_1, 6);
 	} else {
 		if(sound != SOUND_PED_PURSUIT_FBI) { return GetGenericMaleTalkSfx(sound); }
 
 		pedState = FindPlayerPed()->m_nPedState;
 		if(pedState == PED_ARRESTED || pedState == PED_DEAD || pedState == PED_DIE) return NO_SAMPLE;
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_POLICE_FBI_1_PURSUIT_ARREST_1, 6);
+		GetPhrase(&sfx, &lastSfx, SFX_FBI_VOICE_1_CHASE_1, 6);
 	}
 
 	return 6 * (m_sQueueSample.m_nEntityIndex % 3) + sfx;
@@ -812,7 +811,7 @@ cAudioManager::GetArmyTalkSfx(int16 sound)
 
 	pedState = FindPlayerPed()->m_nPedState;
 	if(pedState == PED_ARRESTED || pedState == PED_DEAD || pedState == PED_DIE) return NO_SAMPLE;
-	GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_POLICE_ARMY_1_PURSUIT_1, 15);
+	GetPhrase(&sfx, &lastSfx, SFX_ARMY_VOICE_1_CHASE_1, 15);
 
 	return 15 * (m_sQueueSample.m_nEntityIndex % 1) + sfx;
 }
@@ -824,11 +823,11 @@ cAudioManager::GetMedicTalkSfx(int16 sound)
 	static uint32 lastSfx = NO_SAMPLE;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_COWER: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MEDIC_1_HANDS_COWER_1, 5); break;
-	case SOUND_PED_CAR_JACKED: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MEDIC_1_CAR_JACKED_1, 5); break;
-	case SOUND_PED_HEALING: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MEDIC_1_HEALING_1, 12); break;
-	case SOUND_PED_LEAVE_VEHICLE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MEDIC_1_LEAVE_VEHICLE_1, 9); break;
-	case SOUND_PED_FLEE_RUN: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MEDIC_1_FLEE_RUN_1, 6); break;
+	case SOUND_PED_HANDS_COWER: GetPhrase(&sfx, &lastSfx, SFX_MEDIC_VOICE_1_GUN_PANIC_1, 5); break;
+	case SOUND_PED_CAR_JACKED: GetPhrase(&sfx, &lastSfx, SFX_MEDIC_VOICE_1_CARJACKED_1, 5); break;
+	case SOUND_PED_HEALING: GetPhrase(&sfx, &lastSfx, SFX_MEDIC_VOICE_1_AT_VICTIM_1, 12); break;
+	case SOUND_PED_LEAVE_VEHICLE: GetPhrase(&sfx, &lastSfx, SFX_MEDIC_VOICE_1_GET_OUT_VAN_CHAT_1, 9); break;
+	case SOUND_PED_FLEE_RUN: GetPhrase(&sfx, &lastSfx, SFX_MEDIC_VOICE_1_RUN_FROM_FIGHT_1, 6); break;
 	default: return GetGenericMaleTalkSfx(sound);
 	}
 	return 37 * (m_sQueueSample.m_nEntityIndex & 1) + sfx;
@@ -847,16 +846,16 @@ cAudioManager::GetNormalMaleTalkSfx(int16 sound)
 	static uint32 lastSfx = NO_SAMPLE;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_COWER: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_NORMAL_MALE_HANDS_COWER_1, 7); break;
-	case SOUND_PED_CAR_JACKED: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_NORMAL_MALE_CAR_JACKED_1, 7); break;
-	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_NORMAL_MALE_EVADE_1, 9); break;
-	case SOUND_PED_FLEE_RUN: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_NORMAL_MALE_FLEE_RUN_1, 5); break;
+	case SOUND_PED_HANDS_COWER: GetPhrase(&sfx, &lastSfx, SFX_NORMAL_MALE_GUN_PANIC_1, 7); break;
+	case SOUND_PED_CAR_JACKED: GetPhrase(&sfx, &lastSfx, SFX_NORMAL_MALE_CARJACKED_1, 7); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, SFX_NORMAL_MALE_DODGE_1, 9); break;
+	case SOUND_PED_FLEE_RUN: GetPhrase(&sfx, &lastSfx, SFX_NORMAL_MALE_RUN_FROM_FIGHT_1, 5); break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_NORMAL_MALE_CAR_COLLISION_1, 12);
+		GetPhrase(&sfx, &lastSfx, SFX_NORMAL_MALE_DRIVER_ABUSE_1, 12);
 		break;
-	case SOUND_PED_CHAT_SEXY: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_NORMAL_MALE_CHAT_SEXY_1, 8); break;
-	case SOUND_PED_CHAT_EVENT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_NORMAL_MALE_CHAT_EVENT_1, 10); break;
-	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_NORMAL_MALE_CHAT_1, 25); break;
+	case SOUND_PED_CHAT_SEXY: GetPhrase(&sfx, &lastSfx, SFX_NORMAL_MALE_EYING_1, 8); break;
+	case SOUND_PED_CHAT_EVENT: GetPhrase(&sfx, &lastSfx, SFX_NORMAL_MALE_SHOCKED_1, 10); break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, SFX_NORMAL_MALE_CHAT_1, 25); break;
 	default: return GetGenericMaleTalkSfx(sound);
 	}
 	return sfx;
@@ -869,10 +868,10 @@ 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, 7);
+		GetPhrase(&sfx, &lastSfx, SFX_ASIAN_TAXI_DRIVER_VOICE_1_CARJACKED_1, 7);
 	} else {
 		if(sound != SOUND_PED_CAR_COLLISION) return GetGenericMaleTalkSfx(sound);
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_TAXI_DRIVER_1_CAR_COLLISION_1, 6);
+		GetPhrase(&sfx, &lastSfx, SFX_ASIAN_TAXI_DRIVER_VOICE_1_DRIVER_ABUSE_1, 6);
 	}
 	return 13 * (m_sQueueSample.m_nEntityIndex & 1) + sfx;
 }
@@ -884,13 +883,13 @@ cAudioManager::GetPimpTalkSfx(int16 sound)
 	static uint32 lastSfx = NO_SAMPLE;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_UP: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_PIMP_HANDS_UP_1, 7); break;
-	case SOUND_PED_CAR_JACKED: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_PIMP_CAR_JACKED_1, 4); break;
-	case SOUND_PED_DEFEND: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_PIMP_DEFEND_1, 9); break;
-	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_PIMP_EVADE_1, 6); break;
-	case SOUND_PED_CAR_COLLISION: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_PIMP_CAR_COLLISION_1, 5); break;
-	case SOUND_PED_CHAT_EVENT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_PIMP_CHAT_EVENT_1, 2); break;
-	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_PIMP_CHAT_1, 17); break;
+	case SOUND_PED_HANDS_UP: GetPhrase(&sfx, &lastSfx, SFX_PIMP_GUN_COOL_1, 7); break;
+	case SOUND_PED_CAR_JACKED: GetPhrase(&sfx, &lastSfx, SFX_PIMP_CARJACKED_1, 4); break;
+	case SOUND_PED_DEFEND: GetPhrase(&sfx, &lastSfx, SFX_PIMP_FIGHT_1, 9); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, SFX_PIMP_DODGE_1, 6); break;
+	case SOUND_PED_CAR_COLLISION: GetPhrase(&sfx, &lastSfx, SFX_PIMP_DRIVER_ABUSE_1, 5); break;
+	case SOUND_PED_CHAT_EVENT: GetPhrase(&sfx, &lastSfx, SFX_PIMP_SHOCKED_1, 2); break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, SFX_PIMP_CHAT_1, 17); break;
 	default: return GetGenericMaleTalkSfx(sound);
 	}
 	return sfx;
@@ -903,13 +902,13 @@ cAudioManager::GetMafiaTalkSfx(int16 sound)
 	static uint32 lastSfx = NO_SAMPLE;
 
 	switch(sound) {
-	case SOUND_PED_CAR_JACKING: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MAFIA_1_CAR_JACKING_1, 2); break;
-	case SOUND_PED_CAR_JACKED: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MAFIA_1_CAR_JACKED_1, 2); break;
-	case SOUND_PED_ATTACK: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MAFIA_1_ATTACK_1, 5); break;
-	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MAFIA_1_EVADE_1, 5); break;
-	case SOUND_PED_CAR_COLLISION: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MAFIA_1_CAR_COLLISION_1, 6); break;
-	case SOUND_PED_CHAT_SEXY: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MAFIA_1_CHAT_SEXY_1, 3); break;
-	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MAFIA_1_CHAT_1, 7); break;
+	case SOUND_PED_CAR_JACKING: GetPhrase(&sfx, &lastSfx, SFX_MAFIA_MALE_VOICE_1_CARJACKING_1, 2); break;
+	case SOUND_PED_CAR_JACKED: GetPhrase(&sfx, &lastSfx, SFX_MAFIA_MALE_VOICE_1_CARJACKED_1, 2); break;
+	case SOUND_PED_ATTACK: GetPhrase(&sfx, &lastSfx, SFX_MAFIA_MALE_VOICE_1_FIGHT_1, 5); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, SFX_MAFIA_MALE_VOICE_1_DODGE_1, 5); break;
+	case SOUND_PED_CAR_COLLISION: GetPhrase(&sfx, &lastSfx, SFX_MAFIA_MALE_VOICE_1_DRIVER_ABUSE_1, 6); break;
+	case SOUND_PED_CHAT_SEXY: GetPhrase(&sfx, &lastSfx, SFX_MAFIA_MALE_VOICE_1_EYING_1, 3); break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, SFX_MAFIA_MALE_VOICE_1_CHAT_1, 7); break;
 	default: return GetGenericMaleTalkSfx(sound);
 	}
 	return 30 * (m_sQueueSample.m_nEntityIndex % 3) + sfx;
@@ -922,14 +921,14 @@ cAudioManager::GetTriadTalkSfx(int16 sound)
 	static uint32 lastSfx = NO_SAMPLE;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_UP: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_TRIAD_1_HANDS_UP_1, 3); break;
-	case SOUND_PED_CAR_JACKING: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_TRIAD_1_CAR_JACKING_1, 2); break;
-	case SOUND_PED_CAR_JACKED: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_TRIAD_1_CAR_JACKED_1, 2); break;
-	case SOUND_PED_ATTACK: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_TRIAD_1_ATTACK_1, 5); break;
-	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_TRIAD_1_EVADE_1, 4); break;
-	case SOUND_PED_CAR_COLLISION: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_TRIAD_1_CAR_COLLISION_1, 7); break;
-	case SOUND_PED_CHAT_SEXY: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_TRIAD_1_CHAT_SEXY_1, 3); break;
-	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_TRIAD_1_CHAT_1, 8); break;
+	case SOUND_PED_HANDS_UP: GetPhrase(&sfx, &lastSfx, SFX_TRIAD_MALE_VOICE_1_GUN_COOL_1, 3); break;
+	case SOUND_PED_CAR_JACKING: GetPhrase(&sfx, &lastSfx, SFX_TRIAD_MALE_VOICE_1_CARJACKING_1, 2); break;
+	case SOUND_PED_CAR_JACKED: GetPhrase(&sfx, &lastSfx, SFX_TRIAD_MALE_VOICE_1_CARJACKED_1, 2); break;
+	case SOUND_PED_ATTACK: GetPhrase(&sfx, &lastSfx, SFX_TRIAD_MALE_VOICE_1_FIGHT_1, 5); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, SFX_TRIAD_MALE_VOICE_1_DODGE_1, 4); break;
+	case SOUND_PED_CAR_COLLISION: GetPhrase(&sfx, &lastSfx, SFX_TRIAD_MALE_VOICE_1_DRIVER_ABUSE_1, 7); break;
+	case SOUND_PED_CHAT_SEXY: GetPhrase(&sfx, &lastSfx, SFX_TRIAD_MALE_VOICE_1_EYING_1, 3); break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, SFX_TRIAD_MALE_VOICE_1_CHAT_1, 8); break;
 	default: return GetGenericMaleTalkSfx(sound);
 	}
 	return sfx;
@@ -942,18 +941,18 @@ cAudioManager::GetDiabloTalkSfx(int16 sound)
 	static uint32 lastSfx = NO_SAMPLE;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_UP: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_DIABLO_1_HANDS_UP_1, 4); break;
+	case SOUND_PED_HANDS_UP: GetPhrase(&sfx, &lastSfx, SFX_DIABLO_MALE_VOICE_1_GUN_COOL_1, 4); break;
 	case SOUND_PED_HANDS_COWER:
 		sound = SOUND_PED_FLEE_SPRINT;
 		return GetGenericMaleTalkSfx(sound);
 		break;
-	case SOUND_PED_CAR_JACKING: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_DIABLO_1_CAR_JACKING_1, 2); break;
-	case SOUND_PED_CAR_JACKED: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_DIABLO_1_CAR_JACKED_1, 2); break;
-	case SOUND_PED_ATTACK: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_DIABLO_1_ATTACK_1, 4); break;
-	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_DIABLO_1_EVADE_1, 4); break;
-	case SOUND_PED_CAR_COLLISION: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_DIABLO_1_CAR_COLLISION_1, 5); break;
-	case SOUND_PED_CHAT_SEXY: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_DIABLO_1_CHAT_SEXY_1, 4); break;
-	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_DIABLO_1_CHAT_1, 5); break;
+	case SOUND_PED_CAR_JACKING: GetPhrase(&sfx, &lastSfx, SFX_DIABLO_MALE_VOICE_1_CARJACKING_1, 2); break;
+	case SOUND_PED_CAR_JACKED: GetPhrase(&sfx, &lastSfx, SFX_DIABLO_MALE_VOICE_1_CARJACKED_1, 2); break;
+	case SOUND_PED_ATTACK: GetPhrase(&sfx, &lastSfx, SFX_DIABLO_MALE_VOICE_1_FIGHT_1, 4); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, SFX_DIABLO_MALE_VOICE_1_DODGE_1, 4); break;
+	case SOUND_PED_CAR_COLLISION: GetPhrase(&sfx, &lastSfx, SFX_DIABLO_MALE_VOICE_1_DRIVER_ABUSE_1, 5); break;
+	case SOUND_PED_CHAT_SEXY: GetPhrase(&sfx, &lastSfx, SFX_DIABLO_MALE_VOICE_1_EYING_1, 4); break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, SFX_DIABLO_MALE_VOICE_1_CHAT_1, 5); break;
 	default: return GetGenericMaleTalkSfx(sound);
 	}
 	return 30 * (m_sQueueSample.m_nEntityIndex & 1) + sfx;
@@ -966,12 +965,12 @@ cAudioManager::GetYakuzaTalkSfx(int16 sound)
 	static uint32 lastSfx = NO_SAMPLE;
 
 	switch(sound) {
-	case SOUND_PED_CAR_JACKING: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_YAKUZA_1_CAR_JACKING_1, 2); break;
-	case SOUND_PED_CAR_JACKED: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_YAKUZA_1_CAR_JACKED_1, 2); break;
-	case SOUND_PED_ATTACK: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_YAKUZA_1_ATTACK_1, 5); break;
-	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_YAKUZA_1_EVADE_1, 4); break;
-	case SOUND_PED_CAR_COLLISION: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_YAKUZA_1_CAR_COLLISION_1, 6); break;
-	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_YAKUZA_1_CHAT_1, 5); break;
+	case SOUND_PED_CAR_JACKING: GetPhrase(&sfx, &lastSfx, SFX_YAKUZA_MALE_VOICE_1_CARJACKING_1, 2); break;
+	case SOUND_PED_CAR_JACKED: GetPhrase(&sfx, &lastSfx, SFX_YAKUZA_MALE_VOICE_1_CARJACKED_1, 2); break;
+	case SOUND_PED_ATTACK: GetPhrase(&sfx, &lastSfx, SFX_YAKUZA_MALE_VOICE_1_FIGHT_1, 5); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, SFX_YAKUZA_MALE_VOICE_1_DODGE_1, 4); break;
+	case SOUND_PED_CAR_COLLISION: GetPhrase(&sfx, &lastSfx, SFX_YAKUZA_MALE_VOICE_1_DRIVER_ABUSE_1, 6); break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, SFX_YAKUZA_MALE_VOICE_1_CHAT_1, 5); break;
 	default: return GetGenericMaleTalkSfx(sound);
 	}
 	return 24 * (m_sQueueSample.m_nEntityIndex & 1) + sfx;
@@ -984,14 +983,14 @@ 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_CAR_JACKING: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_YARDIE_1_CAR_JACKING_1, 2); 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, 6); break;
-	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_YARDIE_1_EVADE_1, 5); break;
-	case SOUND_PED_CAR_COLLISION: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_YARDIE_1_CAR_COLLISION_1, 6); break;
-	case SOUND_PED_CHAT_SEXY: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_YARDIE_1_CHAT_SEXY_1, 2); break;
-	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_YARDIE_1_CHAT_1, 8); break;
+	case SOUND_PED_HANDS_UP: sfx = SFX_YARDIE_MALE_VOICE_1_GUN_COOL_1; break;
+	case SOUND_PED_CAR_JACKING: GetPhrase(&sfx, &lastSfx, SFX_YARDIE_MALE_VOICE_1_CARJACKING_1, 2); break;
+	case SOUND_PED_CAR_JACKED: sfx = SFX_YARDIE_MALE_VOICE_1_CARJACKED_1; break;
+	case SOUND_PED_ATTACK: GetPhrase(&sfx, &lastSfx, SFX_YARDIE_MALE_VOICE_1_FIGHT_1, 6); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, SFX_YARDIE_MALE_VOICE_1_DODGE_1, 5); break;
+	case SOUND_PED_CAR_COLLISION: GetPhrase(&sfx, &lastSfx, SFX_YARDIE_MALE_VOICE_1_DRIVER_ABUSE_1, 6); break;
+	case SOUND_PED_CHAT_SEXY: GetPhrase(&sfx, &lastSfx, SFX_YARDIE_MALE_VOICE_1_EYING_1, 2); break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, SFX_YARDIE_MALE_VOICE_1_CHAT_1, 8); break;
 	default: return GetGenericMaleTalkSfx(sound);
 	}
 	return 31 * (m_sQueueSample.m_nEntityIndex & 1) + sfx;
@@ -1004,13 +1003,13 @@ cAudioManager::GetColumbianTalkSfx(int16 sound)
 	static uint32 lastSfx = NO_SAMPLE;
 
 	switch(sound) {
-	case SOUND_PED_CAR_JACKING: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_COLUMB_1_CAR_JACKING_1, 2); break;
-	case SOUND_PED_CAR_JACKED: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_COLUMB_1_CAR_JACKED_1, 2); break;
-	case SOUND_PED_ATTACK: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_COLUMB_1_ATTACK_1, 5); break;
-	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_COLUMB_1_EVADE_1, 5); break;
-	case SOUND_PED_CAR_COLLISION: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_COLUMB_1_CAR_COLLISION_1, 6); break;
-	case SOUND_PED_CHAT_SEXY: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_COLUMB_1_CHAT_SEXY_1, 2); break;
-	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_COLUMB_1_CHAT_1, 5); break;
+	case SOUND_PED_CAR_JACKING: GetPhrase(&sfx, &lastSfx, SFX_COLUMBIAN_MALE_VOICE_1_CARJACKING_1, 2); break;
+	case SOUND_PED_CAR_JACKED: GetPhrase(&sfx, &lastSfx, SFX_COLUMBIAN_MALE_VOICE_1_CARJACKED_1, 2); break;
+	case SOUND_PED_ATTACK: GetPhrase(&sfx, &lastSfx, SFX_COLUMBIAN_MALE_VOICE_1_FIGHT_1, 5); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, SFX_COLUMBIAN_MALE_VOICE_1_DODGE_1, 5); break;
+	case SOUND_PED_CAR_COLLISION: GetPhrase(&sfx, &lastSfx, SFX_COLUMBIAN_MALE_VOICE_1_DRIVER_ABUSE_1, 6); break;
+	case SOUND_PED_CHAT_SEXY: GetPhrase(&sfx, &lastSfx, SFX_COLUMBIAN_MALE_VOICE_1_EYING_1, 2); break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, SFX_COLUMBIAN_MALE_VOICE_1_CHAT_1, 5); break;
 	default: return GetGenericMaleTalkSfx(sound);
 	}
 	return 27 * (m_sQueueSample.m_nEntityIndex & 1) + sfx;
@@ -1023,14 +1022,14 @@ cAudioManager::GetHoodTalkSfx(int16 sound)
 	static uint32 lastSfx = NO_SAMPLE;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_UP: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_HOODS_1_HANDS_UP_1, 5); break;
-	case SOUND_PED_CAR_JACKING: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_HOODS_1_CAR_JACKING_1, 2); break;
-	case SOUND_PED_CAR_JACKED: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_HOODS_1_CAR_JACKED_1, 2); break;
-	case SOUND_PED_ATTACK: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_HOODS_1_ATTACK_1, 6); break;
-	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_HOODS_1_EVADE_1, 5); break;
-	case SOUND_PED_CAR_COLLISION: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_HOODS_1_CAR_COLLISION_1, 7); break;
-	case SOUND_PED_CHAT_SEXY: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_HOODS_1_CHAT_SEXY_1, 2); break;
-	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_HOODS_1_CHAT_1, 6); break;
+	case SOUND_PED_HANDS_UP: GetPhrase(&sfx, &lastSfx, SFX_HOOD_MALE_VOICE_1_GUN_COOL_1, 5); break;
+	case SOUND_PED_CAR_JACKING: GetPhrase(&sfx, &lastSfx, SFX_HOOD_MALE_VOICE_1_CARJACKING_1, 2); break;
+	case SOUND_PED_CAR_JACKED: GetPhrase(&sfx, &lastSfx, SFX_HOOD_MALE_VOICE_1_CARJACKED_1, 2); break;
+	case SOUND_PED_ATTACK: GetPhrase(&sfx, &lastSfx, SFX_HOOD_MALE_VOICE_1_FIGHT_1, 6); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, SFX_HOOD_MALE_VOICE_1_DODGE_1, 5); break;
+	case SOUND_PED_CAR_COLLISION: GetPhrase(&sfx, &lastSfx, SFX_HOOD_MALE_VOICE_1_DRIVER_ABUSE_1, 7); break;
+	case SOUND_PED_CHAT_SEXY: GetPhrase(&sfx, &lastSfx, SFX_HOOD_MALE_VOICE_1_EYING_1, 2); break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, SFX_HOOD_MALE_VOICE_1_CHAT_1, 6); break;
 
 	default: return GetGenericMaleTalkSfx(sound); break;
 	}
@@ -1044,13 +1043,13 @@ cAudioManager::GetBlackCriminalTalkSfx(int16 sound)
 	static uint32 lastSfx = NO_SAMPLE;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_UP: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_CRIMINAL_1_HANDS_UP_1, 4); 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, 2); break;
-	case SOUND_PED_ATTACK: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_CRIMINAL_1_ATTACK_1, 5); break;
-	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_CRIMINAL_1_EVADE_1, 6); break;
+	case SOUND_PED_HANDS_UP: GetPhrase(&sfx, &lastSfx, SFX_BLACK_CRIMINAL_VOICE_1_GUN_COOL_1, 4); break;
+	case SOUND_PED_CAR_JACKING: sfx = SFX_BLACK_CRIMINAL_VOICE_1_CARJACKING_1; break;
+	case SOUND_PED_MUGGING: GetPhrase(&sfx, &lastSfx, SFX_BLACK_CRIMINAL_VOICE_1_MUGGING_1, 2); break;
+	case SOUND_PED_ATTACK: GetPhrase(&sfx, &lastSfx, SFX_BLACK_CRIMINAL_VOICE_1_FIGHT_1, 5); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, SFX_BLACK_CRIMINAL_VOICE_1_DODGE_1, 6); break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_CRIMINAL_1_CAR_COLLISION_1, 5);
+		GetPhrase(&sfx, &lastSfx, SFX_BLACK_CRIMINAL_VOICE_1_DRIVER_ABUSE_1, 5);
 		break;
 	default: return GetGenericMaleTalkSfx(sound); break;
 	}
@@ -1064,13 +1063,13 @@ cAudioManager::GetWhiteCriminalTalkSfx(int16 sound)
 	static uint32 lastSfx = NO_SAMPLE;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_UP: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_CRIMINAL_1_HANDS_UP_1, 3); 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, 2); break;
-	case SOUND_PED_ATTACK: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_CRIMINAL_1_ATTACK_1, 4); break;
-	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_CRIMINAL_1_EVADE_1, 5); break;
+	case SOUND_PED_HANDS_UP: GetPhrase(&sfx, &lastSfx, SFX_WHITE_CRIMINAL_VOICE_1_GUN_COOL_1, 3); break;
+	case SOUND_PED_CAR_JACKING: sfx = SFX_WHITE_CRIMINAL_VOICE_1_CARJACKING_1; break;
+	case SOUND_PED_MUGGING: GetPhrase(&sfx, &lastSfx, SFX_WHITE_CRIMINAL_VOICE_1_MUGGING_1, 2); break;
+	case SOUND_PED_ATTACK: GetPhrase(&sfx, &lastSfx, SFX_WHITE_CRIMINAL_VOICE_1_FIGHT_1, 4); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, SFX_WHITE_CRIMINAL_VOICE_1_DODGE_1, 5); break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_CRIMINAL_1_CAR_COLLISION_1, 4);
+		GetPhrase(&sfx, &lastSfx, SFX_WHITE_CRIMINAL_VOICE_1_DRIVER_ABUSE_1, 4);
 		break;
 	default: return GetGenericMaleTalkSfx(sound); break;
 	}
@@ -1084,13 +1083,13 @@ cAudioManager::GetMaleNo2TalkSfx(int16 sound)
 	static uint32 lastSfx = NO_SAMPLE;
 
 	switch(sound) {
-	case SOUND_PED_CAR_JACKED: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MALE_NO_2_CAR_JACKED_1, 3); break;
-	case SOUND_PED_ROBBED: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MALE_NO_2_ROBBED_1, 4); break;
-	case SOUND_PED_ATTACK: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MALE_NO_2_ATTACK_1, 4); break;
-	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MALE_NO_2_EVADE_1, 4); break;
-	case SOUND_PED_CAR_COLLISION: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MALE_NO_2_CAR_COLLISION_1, 7); break;
-	case SOUND_PED_CHAT_SEXY: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MALE_NO_2_CHAT_SEXY_1, 5); break;
-	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MALE_NO_2_CHAT_1, 7); break;
+	case SOUND_PED_CAR_JACKED: GetPhrase(&sfx, &lastSfx, SFX_CASUAL_MALE_OLD_VOICE_1_CARJACKED_1, 3); break;
+	case SOUND_PED_ROBBED: GetPhrase(&sfx, &lastSfx, SFX_CASUAL_MALE_OLD_VOICE_1_MUGGED_1, 4); break;
+	case SOUND_PED_ATTACK: GetPhrase(&sfx, &lastSfx, SFX_CASUAL_MALE_OLD_VOICE_1_FIGHT_1, 4); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, SFX_CASUAL_MALE_OLD_VOICE_1_DODGE_1, 4); break;
+	case SOUND_PED_CAR_COLLISION: GetPhrase(&sfx, &lastSfx, SFX_CASUAL_MALE_OLD_VOICE_1_DRIVER_ABUSE_1, 7); break;
+	case SOUND_PED_CHAT_SEXY: GetPhrase(&sfx, &lastSfx, SFX_CASUAL_MALE_OLD_VOICE_1_EYING_1, 5); break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, SFX_CASUAL_MALE_OLD_VOICE_1_CHAT_1, 7); break;
 	default: return GetGenericMaleTalkSfx(sound);
 	}
 	return sfx;
@@ -1103,20 +1102,20 @@ cAudioManager::GetBlackProjectMaleTalkSfx(int16 sound, int32 model)
 	static uint32 lastSfx = NO_SAMPLE;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_UP: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_1_HANDS_UP_1, 3); break;
+	case SOUND_PED_HANDS_UP: GetPhrase(&sfx, &lastSfx, SFX_BLACK_PROJECT_MALE_VOICE_1_GUN_COOL_1, 3); break;
 	case SOUND_PED_CAR_JACKED:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_1_CAR_JACKED_1, 2);
+		GetPhrase(&sfx, &lastSfx, SFX_BLACK_PROJECT_MALE_VOICE_1_CARJACKED_1, 2);
 		break;
-	case SOUND_PED_ROBBED: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_1_ROBBED_1, 2); break;
-	case SOUND_PED_ATTACK: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_1_ATTACK_1, 6); break;
-	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_1_EVADE_1, 5); break;
+	case SOUND_PED_ROBBED: GetPhrase(&sfx, &lastSfx, SFX_BLACK_PROJECT_MALE_VOICE_1_MUGGED_1, 2); break;
+	case SOUND_PED_ATTACK: GetPhrase(&sfx, &lastSfx, SFX_BLACK_PROJECT_MALE_VOICE_1_FIGHT_1, 6); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, SFX_BLACK_PROJECT_MALE_VOICE_1_DODGE_1, 5); break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_1_CAR_COLLISION_1, 7);
+		GetPhrase(&sfx, &lastSfx, SFX_BLACK_PROJECT_MALE_VOICE_1_DRIVER_ABUSE_1, 7);
 		break;
 	case SOUND_PED_CHAT_SEXY:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_1_CHAT_SEXY_1, 3);
+		GetPhrase(&sfx, &lastSfx, SFX_BLACK_PROJECT_MALE_VOICE_1_EYING_1, 3);
 		break;
-	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_1_CHAT_1, 6);
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, SFX_BLACK_PROJECT_MALE_VOICE_1_CHAT_1, 6);
 	default: return GetGenericMaleTalkSfx(sound);
 	}
 
@@ -1131,16 +1130,16 @@ cAudioManager::GetWhiteFatMaleTalkSfx(int16 sound)
 	static uint32 lastSfx = NO_SAMPLE;
 
 	switch(sound) {
-	case SOUND_PED_CAR_JACKED: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_FAT_MALE_1_CAR_JACKED_1, 3); break;
-	case SOUND_PED_ROBBED: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_FAT_MALE_1_ROBBED_1, 3); break;
-	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_FAT_MALE_1_EVADE_1, 9); break;
+	case SOUND_PED_CAR_JACKED: GetPhrase(&sfx, &lastSfx, SFX_WHITE_FAT_MALE_VOICE_1_CARJACKED_1, 3); break;
+	case SOUND_PED_ROBBED: GetPhrase(&sfx, &lastSfx, SFX_WHITE_FAT_MALE_VOICE_1_MUGGED_1, 3); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, SFX_WHITE_FAT_MALE_VOICE_1_DODGE_1, 9); break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_FAT_MALE_1_CAR_COLLISION_1, 9);
+		GetPhrase(&sfx, &lastSfx, SFX_WHITE_FAT_MALE_VOICE_1_DRIVER_ABUSE_1, 9);
 		break;
 	case SOUND_PED_WAIT_DOUBLEBACK:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_FAT_MALE_1_WAIT_DOUBLEBACK_1, 2);
+		GetPhrase(&sfx, &lastSfx, SFX_WHITE_FAT_MALE_VOICE_1_LOST_1, 2);
 		break;
-	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_FAT_MALE_1_CHAT_1, 9);
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, SFX_WHITE_FAT_MALE_VOICE_1_CHAT_1, 9);
 	default: return GetGenericMaleTalkSfx(sound);
 	}
 	return sfx;
@@ -1153,16 +1152,16 @@ cAudioManager::GetBlackFatMaleTalkSfx(int16 sound)
 	static uint32 lastSfx = NO_SAMPLE;
 
 	switch(sound) {
-	case SOUND_PED_CAR_JACKED: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_FAT_MALE_1_CAR_JACKED_1, 4); break;
-	case SOUND_PED_ROBBED: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_FAT_MALE_1_ROBBED_1, 3); break;
-	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_FAT_MALE_1_EVADE_1, 7); break;
+	case SOUND_PED_CAR_JACKED: GetPhrase(&sfx, &lastSfx, SFX_BLACK_FAT_MALE_VOICE_1_CARJACKED_1, 4); break;
+	case SOUND_PED_ROBBED: GetPhrase(&sfx, &lastSfx, SFX_BLACK_FAT_MALE_VOICE_1_MUGGED_1, 3); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, SFX_BLACK_FAT_MALE_VOICE_1_DODGE_1, 7); break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_FAT_MALE_1_CAR_COLLISION_1, 6);
+		GetPhrase(&sfx, &lastSfx, SFX_BLACK_FAT_MALE_VOICE_1_DRIVER_ABUSE_1, 6);
 		break;
 	case SOUND_PED_WAIT_DOUBLEBACK:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_FAT_MALE_1_WAIT_DOUBLEBACK_1, 3);
+		GetPhrase(&sfx, &lastSfx, SFX_BLACK_FAT_MALE_VOICE_1_LOST_1, 3);
 		break;
-	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_FAT_MALE_1_CHAT_1, 8); break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, SFX_BLACK_FAT_MALE_VOICE_1_CHAT_1, 8); break;
 	default: return GetGenericMaleTalkSfx(sound);
 	}
 	return sfx;
@@ -1176,23 +1175,23 @@ cAudioManager::GetBlackCasualFemaleTalkSfx(int16 sound)
 
 	switch(sound) {
 	case SOUND_PED_HANDS_COWER:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_CASUAL_FEMALE_1_HANDS_COWER_1, 2);
+		GetPhrase(&sfx, &lastSfx, SFX_FEMALE_1_VOICE_1_GUN_PANIC_1, 2);
 		break;
 	case SOUND_PED_CAR_JACKED:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_CASUAL_FEMALE_1_CAR_JACKED_1, 2);
+		GetPhrase(&sfx, &lastSfx, SFX_FEMALE_1_VOICE_1_CARJACKED_1, 2);
 		break;
-	case SOUND_PED_ROBBED: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_CASUAL_FEMALE_1_ROBBED_1, 3); break;
-	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_CASUAL_FEMALE_1_EVADE_1, 6); break;
+	case SOUND_PED_ROBBED: GetPhrase(&sfx, &lastSfx, SFX_FEMALE_1_VOICE_1_MUGGED_1, 3); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, SFX_FEMALE_1_VOICE_1_DODGE_1, 6); break;
 	case SOUND_PED_FLEE_RUN:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_CASUAL_FEMALE_1_FLEE_RUN_1, 2);
+		GetPhrase(&sfx, &lastSfx, SFX_FEMALE_1_VOICE_1_RUN_FROM_FIGHT_1, 2);
 		break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_CASUAL_FEMALE_1_CAR_COLLISION_1, 7);
+		GetPhrase(&sfx, &lastSfx, SFX_FEMALE_1_VOICE_1_DRIVER_ABUSE_1, 7);
 		break;
 	case SOUND_PED_CHAT_EVENT:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_CASUAL_FEMALE_1_CHAT_EVENT_1, 4);
+		GetPhrase(&sfx, &lastSfx, SFX_FEMALE_1_VOICE_1_SHOCKED_1, 4);
 		break;
-	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_CASUAL_FEMALE_1_CHAT_1, 8); break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, SFX_FEMALE_1_VOICE_1_CHAT_1, 8); break;
 	default: return GetGenericFemaleTalkSfx(sound);
 	}
 	return sfx;
@@ -1206,23 +1205,23 @@ cAudioManager::GetWhiteCasualFemaleTalkSfx(int16 sound)
 
 	switch(sound) {
 	case SOUND_PED_HANDS_COWER:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_CASUAL_FEMALE_1_HANDS_COWER_1, 2);
+		GetPhrase(&sfx, &lastSfx, SFX_WHITE_CASUAL_FEMALE_VOICE_1_GUN_PANIC_1, 2);
 		break;
 	case SOUND_PED_CAR_JACKED:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_CASUAL_FEMALE_1_CAR_JACKED_1, 2);
+		GetPhrase(&sfx, &lastSfx, SFX_WHITE_CASUAL_FEMALE_VOICE_1_CARJACKED_1, 2);
 		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, 3); break;
+	case SOUND_PED_ROBBED: sfx = SFX_WHITE_CASUAL_FEMALE_VOICE_1_MUGGED_1; break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, SFX_WHITE_CASUAL_FEMALE_VOICE_1_DODGE_1, 3); break;
 	case SOUND_PED_FLEE_RUN:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_CASUAL_FEMALE_1_FLEE_RUN_1, 2);
+		GetPhrase(&sfx, &lastSfx, SFX_WHITE_CASUAL_FEMALE_VOICE_1_RUN_FROM_FIGHT_1, 2);
 		break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_CASUAL_FEMALE_1_CAR_COLLISION_1, 8);
+		GetPhrase(&sfx, &lastSfx, SFX_WHITE_CASUAL_FEMALE_VOICE_1_DRIVER_ABUSE_1, 8);
 		break;
 	case SOUND_PED_CHAT_EVENT:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_CASUAL_FEMALE_1_CHAT_EVENT_1, 2);
+		GetPhrase(&sfx, &lastSfx, SFX_WHITE_CASUAL_FEMALE_VOICE_1_SHOCKED_1, 2);
 		break;
-	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_CASUAL_FEMALE_1_CHAT_1, 4); break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, SFX_WHITE_CASUAL_FEMALE_VOICE_1_CHAT_1, 4); break;
 	default: return GetGenericFemaleTalkSfx(sound);
 	}
 	return sfx;
@@ -1235,16 +1234,16 @@ cAudioManager::GetFemaleNo3TalkSfx(int16 sound)
 	static uint32 lastSfx = NO_SAMPLE;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_COWER: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_FEMALE_NO_3_HANDS_COWER_1, 5); break;
-	case SOUND_PED_CAR_JACKED: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_FEMALE_NO_3_CAR_JACKED_1, 3); break;
-	case SOUND_PED_ROBBED: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_FEMALE_NO_3_ROBBED_1, 3); break;
-	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_FEMALE_NO_3_EVADE_1, 6); break;
-	case SOUND_PED_FLEE_RUN: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_FEMALE_NO_3_FLEE_RUN_1, 4); break;
+	case SOUND_PED_HANDS_COWER: GetPhrase(&sfx, &lastSfx, SFX_FEMALE_3_VOICE_1_GUN_PANIC_1, 5); break;
+	case SOUND_PED_CAR_JACKED: GetPhrase(&sfx, &lastSfx, SFX_FEMALE_3_VOICE_1_CARJACKED_1, 3); break;
+	case SOUND_PED_ROBBED: GetPhrase(&sfx, &lastSfx, SFX_FEMALE_3_VOICE_1_MUGGED_1, 3); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, SFX_FEMALE_3_VOICE_1_DODGE_1, 6); break;
+	case SOUND_PED_FLEE_RUN: GetPhrase(&sfx, &lastSfx, SFX_FEMALE_3_VOICE_1_RUN_FROM_FIGHT_1, 4); break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_FEMALE_NO_3_CAR_COLLISION_1, 6);
+		GetPhrase(&sfx, &lastSfx, SFX_FEMALE_3_VOICE_1_DRIVER_ABUSE_1, 6);
 		break;
-	case SOUND_PED_CHAT_EVENT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_FEMALE_NO_3_CHAT_EVENT_1, 4); break;
-	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_FEMALE_NO_3_CHAT_1, 5); break;
+	case SOUND_PED_CHAT_EVENT: GetPhrase(&sfx, &lastSfx, SFX_FEMALE_3_VOICE_1_SHOCKED_1, 4); break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, SFX_FEMALE_3_VOICE_1_CHAT_1, 5); break;
 	default: return GetGenericFemaleTalkSfx(sound);
 	}
 	return sfx;
@@ -1258,20 +1257,20 @@ cAudioManager::GetBlackFatFemaleTalkSfx(int16 sound)
 
 	switch(sound) {
 	case SOUND_PED_HANDS_COWER:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_FAT_FEMALE_1_HANDS_COWER_1, 4);
+		GetPhrase(&sfx, &lastSfx, SFX_BLACK_FAT_FEMALE_VOICE_1_GUN_PANIC_1, 4);
 		break;
 	case SOUND_PED_CAR_JACKED:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_FAT_FEMALE_1_CAR_JACKED_1, 2);
+		GetPhrase(&sfx, &lastSfx, SFX_BLACK_FAT_FEMALE_VOICE_1_CARJACKED_1, 2);
 		break;
-	case SOUND_PED_ROBBED: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_FAT_FEMALE_1_ROBBED_1, 2); break;
-	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_FAT_FEMALE_1_EVADE_1, 5); break;
+	case SOUND_PED_ROBBED: GetPhrase(&sfx, &lastSfx, SFX_BLACK_FAT_FEMALE_VOICE_1_MUGGED_1, 2); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, SFX_BLACK_FAT_FEMALE_VOICE_1_DODGE_1, 5); break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_FAT_FEMALE_1_CAR_COLLISION_1, 6);
+		GetPhrase(&sfx, &lastSfx, SFX_BLACK_FAT_FEMALE_VOICE_1_DRIVER_ABUSE_1, 6);
 		break;
 	case SOUND_PED_CHAT_EVENT:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_FAT_FEMALE_1_CHAT_EVENT_1, 5);
+		GetPhrase(&sfx, &lastSfx, SFX_BLACK_FAT_FEMALE_VOICE_1_SHOCKED_1, 5);
 		break;
-	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_FAT_FEMALE_1_CHAT_1, 7); break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, SFX_BLACK_FAT_FEMALE_VOICE_1_CHAT_1, 7); break;
 	default: return GetGenericFemaleTalkSfx(sound);
 	}
 	return sfx;
@@ -1285,20 +1284,20 @@ cAudioManager::GetWhiteFatFemaleTalkSfx(int16 sound)
 
 	switch(sound) {
 	case SOUND_PED_CAR_JACKED:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_FAT_FEMALE_1_CAR_JACKED_1, 2);
+		GetPhrase(&sfx, &lastSfx, SFX_WHITE_FAT_FEMALE_VOICE_1_CARJACKED_1, 2);
 		break;
-	case SOUND_PED_ROBBED: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_FAT_FEMALE_1_ROBBED_1, 2); break;
-	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_FAT_FEMALE_1_EVADE_1, 6); break;
+	case SOUND_PED_ROBBED: GetPhrase(&sfx, &lastSfx, SFX_WHITE_FAT_FEMALE_VOICE_1_MUGGED_1, 2); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, SFX_WHITE_FAT_FEMALE_VOICE_1_DODGE_1, 6); break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_FAT_FEMALE_1_CAR_COLLISION_1, 8);
+		GetPhrase(&sfx, &lastSfx, SFX_WHITE_FAT_FEMALE_VOICE_1_DRIVER_ABUSE_1, 8);
 		break;
 	case SOUND_PED_WAIT_DOUBLEBACK:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_FAT_FEMALE_1_WAIT_DOUBLEBACK_1, 2);
+		GetPhrase(&sfx, &lastSfx, SFX_WHITE_FAT_FEMALE_VOICE_1_LOST_1, 2);
 		break;
 	case SOUND_PED_CHAT_EVENT:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_FAT_FEMALE_1_CHAT_EVENT_1, 4);
+		GetPhrase(&sfx, &lastSfx, SFX_WHITE_FAT_FEMALE_VOICE_1_SHOCKED_1, 4);
 		break;
-	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_FAT_FEMALE_1_CHAT_1, 8); break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, SFX_WHITE_FAT_FEMALE_VOICE_1_CHAT_1, 8); break;
 	default: return GetGenericFemaleTalkSfx(sound);
 	}
 	return sfx;
@@ -1312,20 +1311,20 @@ cAudioManager::GetBlackFemaleProstituteTalkSfx(int16 sound)
 
 	switch(sound) {
 	case SOUND_PED_HANDS_UP:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_FEMALE_PROSTITUTE_1_HANDS_UP_1, 4);
+		GetPhrase(&sfx, &lastSfx, SFX_BLACK_PROSTITUTE_VOICE_1_GUN_COOL_1, 4);
 		break;
-	case SOUND_PED_ROBBED: sfx = AUDIO_SAMPLE_PED_BLACK_FEMALE_PROSTITUTE_1_ROBBED_1; break;
+	case SOUND_PED_ROBBED: sfx = SFX_BLACK_PROSTITUTE_VOICE_1_MUGGED_1; break;
 	case SOUND_PED_ATTACK:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_FEMALE_PROSTITUTE_1_ATTACK_1, 4);
+		GetPhrase(&sfx, &lastSfx, SFX_BLACK_PROSTITUTE_VOICE_1_FIGHT_1, 4);
 		break;
-	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_FEMALE_PROSTITUTE_1_EVADE_1, 3); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, SFX_BLACK_PROSTITUTE_VOICE_1_DODGE_1, 3); break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_FEMALE_PROSTITUTE_1_CAR_COLLISION_1, 4);
+		GetPhrase(&sfx, &lastSfx, SFX_BLACK_PROSTITUTE_VOICE_1_DRIVER_ABUSE_1, 4);
 		break;
 	case SOUND_PED_SOLICIT:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_FEMALE_PROSTITUTE_1_SOLICIT_1, 8);
+		GetPhrase(&sfx, &lastSfx, SFX_BLACK_PROSTITUTE_VOICE_1_SOLICIT_1, 8);
 		break;
-	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_FEMALE_PROSTITUTE_1_CHAT_1, 4); break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, SFX_BLACK_PROSTITUTE_VOICE_1_CHAT_1, 4); break;
 	default: return GetGenericFemaleTalkSfx(sound);
 	}
 	return 28 * (m_sQueueSample.m_nEntityIndex & 1) + sfx;
@@ -1339,19 +1338,19 @@ cAudioManager::GetWhiteFemaleProstituteTalkSfx(int16 sound)
 
 	switch(sound) {
 	case SOUND_PED_ROBBED:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_FEMALE_PROSTITUTE_1_ROBBED_1, 2);
+		GetPhrase(&sfx, &lastSfx, SFX_WHITE_PROSTITUTE_VOICE_1_MUGGED_1, 2);
 		break;
 	case SOUND_PED_ATTACK:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_FEMALE_PROSTITUTE_1_ATTACK_1, 4);
+		GetPhrase(&sfx, &lastSfx, SFX_WHITE_PROSTITUTE_VOICE_1_FIGHT_1, 4);
 		break;
-	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_FEMALE_PROSTITUTE_1_EVADE_1, 3); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, SFX_WHITE_PROSTITUTE_VOICE_1_DODGE_1, 3); break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_FEMALE_PROSTITUTE_1_CAR_COLLISION_1, 4);
+		GetPhrase(&sfx, &lastSfx, SFX_WHITE_PROSTITUTE_VOICE_1_DRIVER_ABUSE_1, 4);
 		break;
 	case SOUND_PED_SOLICIT:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_FEMALE_PROSTITUTE_1_SOLICIT_1, 8);
+		GetPhrase(&sfx, &lastSfx, SFX_WHITE_PROSTITUTE_VOICE_1_SOLICIT_1, 8);
 		break;
-	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_FEMALE_PROSTITUTE_1_CHAT_1, 4); break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, SFX_WHITE_PROSTITUTE_VOICE_1_CHAT_1, 4); break;
 	default: return GetGenericFemaleTalkSfx(sound);
 	}
 	return 25 * (m_sQueueSample.m_nEntityIndex & 1) + sfx;
@@ -1365,24 +1364,24 @@ 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, 6);
+		GetPhrase(&sfx, &lastSfx, SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_CARJACKED_1, 6);
 		break;
 	case SOUND_PED_ROBBED:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_OLD_1_ROBBED_1, 2);
+		GetPhrase(&sfx, &lastSfx, SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_MUGGED_1, 2);
 		break;
 	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_OLD_1_EVADE_1, 10);
+		GetPhrase(&sfx, &lastSfx, SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_DODGE_1, 10);
 		break;
 	case SOUND_PED_FLEE_RUN:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_OLD_1_FLEE_RUN_1, 6);
+		GetPhrase(&sfx, &lastSfx, SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_RUN_FROM_FIGHT_1, 6);
 		break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_OLD_1_CAR_COLLISION_1, 7);
+		GetPhrase(&sfx, &lastSfx, SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_DRIVER_ABUSE_1, 7);
 		break;
 	case SOUND_PED_CHAT_EVENT:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_OLD_1_CHAT_EVENT_1, 2);
+		GetPhrase(&sfx, &lastSfx, SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_SHOCKED_1, 2);
 		break;
-	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_OLD_1_CHAT_1, 10); break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_CHAT_1, 10); break;
 	default: return GetGenericFemaleTalkSfx(sound);
 	}
 	return sfx;
@@ -1396,22 +1395,22 @@ cAudioManager::GetBlackProjectFemaleYoungTalkSfx(int16 sound)
 
 	switch(sound) {
 	case SOUND_PED_HANDS_COWER:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_YOUNG_1_HANDS_COWER_1, 4);
+		GetPhrase(&sfx, &lastSfx, SFX_BLACK_PROJECT_FEMALE_YOUNG_VOICE_1_GUN_PANIC_1, 4);
 		break;
-	case SOUND_PED_CAR_JACKED: sfx = AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_YOUNG_1_CAR_JACKED_1; break;
+	case SOUND_PED_CAR_JACKED: sfx = SFX_BLACK_PROJECT_FEMALE_YOUNG_VOICE_1_CARJACKED_1; break;
 	case SOUND_PED_ROBBED:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_YOUNG_1_ROBBED_1, 2);
+		GetPhrase(&sfx, &lastSfx, SFX_BLACK_PROJECT_FEMALE_YOUNG_VOICE_1_MUGGED_1, 2);
 		break;
 	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_YOUNG_1_EVADE_1, 5);
+		GetPhrase(&sfx, &lastSfx, SFX_BLACK_PROJECT_FEMALE_YOUNG_VOICE_1_DODGE_1, 5);
 		break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_YOUNG_1_CAR_COLLISION_1, 6);
+		GetPhrase(&sfx, &lastSfx, SFX_BLACK_PROJECT_FEMALE_YOUNG_VOICE_1_DRIVER_ABUSE_1, 6);
 		break;
 	case SOUND_PED_CHAT_EVENT:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_YOUNG_1_CHAT_EVENT_1, 5);
+		GetPhrase(&sfx, &lastSfx, SFX_BLACK_PROJECT_FEMALE_YOUNG_VOICE_1_SHOCKED_1, 5);
 		break;
-	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_YOUNG_1_CHAT_1, 7); break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, SFX_BLACK_PROJECT_FEMALE_YOUNG_VOICE_1_CHAT_1, 7); break;
 	default: return GetGenericFemaleTalkSfx(sound);
 	}
 	return sfx;
@@ -1425,18 +1424,18 @@ cAudioManager::GetChinatownMaleOldTalkSfx(int16 sound)
 
 	switch(sound) {
 	case SOUND_PED_HANDS_COWER:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_CHINATOWN_MALE_OLD_HANDS_COWER_1, 3);
+		GetPhrase(&sfx, &lastSfx, SFX_CHINATOWN_MALE_OLD_VOICE_1_GUN_PANIC_1, 3);
 		break;
 	case SOUND_PED_CAR_JACKED:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_CHINATOWN_MALE_OLD_CAR_JACKED_1, 2);
+		GetPhrase(&sfx, &lastSfx, SFX_CHINATOWN_MALE_OLD_VOICE_1_CARJACKED_1, 2);
 		break;
-	case SOUND_PED_ATTACK: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_CHINATOWN_MALE_OLD_ATTACK_1, 5); break;
-	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_CHINATOWN_MALE_OLD_EVADE_1, 6); break;
+	case SOUND_PED_ATTACK: GetPhrase(&sfx, &lastSfx, SFX_CHINATOWN_MALE_OLD_VOICE_1_FIGHT_1, 5); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, SFX_CHINATOWN_MALE_OLD_VOICE_1_DODGE_1, 6); break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_CHINATOWN_MALE_OLD_CAR_COLLISION_1, 6);
+		GetPhrase(&sfx, &lastSfx, SFX_CHINATOWN_MALE_OLD_VOICE_1_DRIVER_ABUSE_1, 6);
 		break;
-	case SOUND_PED_CHAT_SEXY: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_CHINATOWN_MALE_OLD_CHAT_SEXY_1, 3); break;
-	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_CHINATOWN_MALE_OLD_CHAT_1, 7); break;
+	case SOUND_PED_CHAT_SEXY: GetPhrase(&sfx, &lastSfx, SFX_CHINATOWN_MALE_OLD_VOICE_1_EYING_1, 3); break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, SFX_CHINATOWN_MALE_OLD_VOICE_1_CHAT_1, 7); break;
 	default: return GetGenericMaleTalkSfx(sound);
 	}
 	return sfx;
@@ -1450,20 +1449,20 @@ cAudioManager::GetChinatownMaleYoungTalkSfx(int16 sound)
 
 	switch(sound) {
 	case SOUND_PED_HANDS_COWER:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_CHINATOWN_MALE_YOUNG_HANDS_COWER_1, 2);
+		GetPhrase(&sfx, &lastSfx, SFX_CHINATOWN_MALE_YOUNG_VOICE_1_GUN_PANIC_1, 2);
 		break;
 	case SOUND_PED_CAR_JACKED:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_CHINATOWN_MALE_YOUNG_CAR_JACKED_1, 2);
+		GetPhrase(&sfx, &lastSfx, SFX_CHINATOWN_MALE_YOUNG_VOICE_1_CARJACKED_1, 2);
 		break;
-	case SOUND_PED_ATTACK: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_CHINATOWN_MALE_YOUNG_ATTACK_1, 6); break;
-	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_CHINATOWN_MALE_YOUNG_EVADE_1, 5); break;
+	case SOUND_PED_ATTACK: GetPhrase(&sfx, &lastSfx, SFX_CHINATOWN_MALE_YOUNG_VOICE_1_FIGHT_1, 6); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, SFX_CHINATOWN_MALE_YOUNG_VOICE_1_DODGE_1, 5); break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_CHINATOWN_MALE_YOUNG_CAR_COLLISION_1, 6);
+		GetPhrase(&sfx, &lastSfx, SFX_CHINATOWN_MALE_YOUNG_VOICE_1_DRIVER_ABUSE_1, 6);
 		break;
 	case SOUND_PED_CHAT_SEXY:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_CHINATOWN_MALE_YOUNG_CHAT_SEXY_1, 3);
+		GetPhrase(&sfx, &lastSfx, SFX_CHINATOWN_MALE_YOUNG_VOICE_1_EYING_1, 3);
 		break;
-	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_CHINATOWN_MALE_YOUNG_CHAT_1, 6); break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, SFX_CHINATOWN_MALE_YOUNG_VOICE_1_CHAT_1, 6); break;
 	default: return GetGenericMaleTalkSfx(sound);
 	}
 	return sfx;
@@ -1477,15 +1476,15 @@ cAudioManager::GetChinatownFemaleOldTalkSfx(int16 sound)
 
 	switch(sound) {
 	case SOUND_PED_HANDS_COWER:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_CHINATOWN_FEMALE_OLD_HANDS_COWER_1, 3);
+		GetPhrase(&sfx, &lastSfx, SFX_CHINATOWN_OLD_FEMALE_VOICE_1_GUN_PANIC_1, 3);
 		break;
-	case SOUND_PED_ROBBED: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_CHINATOWN_FEMALE_OLD_ROBBED_1, 2); break;
-	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_CHINATOWN_FEMALE_OLD_EVADE_1, 5); break;
+	case SOUND_PED_ROBBED: GetPhrase(&sfx, &lastSfx, SFX_CHINATOWN_OLD_FEMALE_VOICE_1_MUGGED_1, 2); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, SFX_CHINATOWN_OLD_FEMALE_VOICE_1_DODGE_1, 5); break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_CHINATOWN_FEMALE_OLD_CAR_COLLISION_1, 5);
+		GetPhrase(&sfx, &lastSfx, SFX_CHINATOWN_OLD_FEMALE_VOICE_1_DRIVER_ABUSE_1, 5);
 		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, 6); break;
+	case SOUND_PED_CHAT_EVENT: sfx = SFX_CHINATOWN_OLD_FEMALE_VOICE_1_SHOCKED_1; break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, SFX_CHINATOWN_OLD_FEMALE_VOICE_1_CHAT_1, 6); break;
 	default: return GetGenericFemaleTalkSfx(sound);
 	}
 	return sfx;
@@ -1499,17 +1498,17 @@ cAudioManager::GetChinatownFemaleYoungTalkSfx(int16 sound)
 
 	switch(sound) {
 	case SOUND_PED_CAR_JACKED:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_CHINATOWN_FEMALE_YOUNG_CAR_JACKED_1, 2);
+		GetPhrase(&sfx, &lastSfx, SFX_CHINATOWN_YOUNG_FEMALE_VOICE_1_CARJACKED_1, 2);
 		break;
-	case SOUND_PED_ROBBED: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_CHINATOWN_FEMALE_YOUNG_ROBBED_1, 2); break;
-	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_CHINATOWN_FEMALE_YOUNG_EVADE_1, 6); break;
+	case SOUND_PED_ROBBED: GetPhrase(&sfx, &lastSfx, SFX_CHINATOWN_YOUNG_FEMALE_VOICE_1_MUGGED_1, 2); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, SFX_CHINATOWN_YOUNG_FEMALE_VOICE_1_DODGE_1, 6); break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_CHINATOWN_FEMALE_YOUNG_CAR_COLLISION_1, 7);
+		GetPhrase(&sfx, &lastSfx, SFX_CHINATOWN_YOUNG_FEMALE_VOICE_1_DRIVER_ABUSE_1, 7);
 		break;
 	case SOUND_PED_CHAT_EVENT:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_CHINATOWN_FEMALE_YOUNG_CHAT_EVENT_1, 4);
+		GetPhrase(&sfx, &lastSfx, SFX_CHINATOWN_YOUNG_FEMALE_VOICE_1_SHOCKED_1, 4);
 		break;
-	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_CHINATOWN_FEMALE_YOUNG_CHAT_1, 7); break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, SFX_CHINATOWN_YOUNG_FEMALE_VOICE_1_CHAT_1, 7); break;
 	default: return GetGenericFemaleTalkSfx(sound);
 	}
 	return sfx;
@@ -1523,18 +1522,18 @@ cAudioManager::GetLittleItalyMaleTalkSfx(int16 sound)
 
 	switch(sound) {
 	case SOUND_PED_HANDS_COWER:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_LITTLE_ITALY_MALE_1_HANDS_COWER_1, 3);
+		GetPhrase(&sfx, &lastSfx, SFX_LITTLE_ITALY_MALE_VOICE_1_GUN_PANIC_1, 3);
 		break;
 	case SOUND_PED_CAR_JACKED:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_LITTLE_ITALY_MALE_1_CAR_JACKED_1, 2);
+		GetPhrase(&sfx, &lastSfx, SFX_LITTLE_ITALY_MALE_VOICE_1_CARJACKED_1, 2);
 		break;
-	case SOUND_PED_ROBBED: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_LITTLE_ITALY_MALE_1_ROBBED_1, 2); break;
-	case SOUND_PED_ATTACK: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_LITTLE_ITALY_MALE_1_ATTACK_1, 5); break;
-	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_LITTLE_ITALY_MALE_1_EVADE_1, 5); break;
+	case SOUND_PED_ROBBED: GetPhrase(&sfx, &lastSfx, SFX_LITTLE_ITALY_MALE_VOICE_1_MUGGED_1, 2); break;
+	case SOUND_PED_ATTACK: GetPhrase(&sfx, &lastSfx, SFX_LITTLE_ITALY_MALE_VOICE_1_FIGHT_1, 5); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, SFX_LITTLE_ITALY_MALE_VOICE_1_DODGE_1, 5); break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_LITTLE_ITALY_MALE_1_CAR_COLLISION_1, 7);
+		GetPhrase(&sfx, &lastSfx, SFX_LITTLE_ITALY_MALE_VOICE_1_DRIVER_ABUSE_1, 7);
 		break;
-	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_LITTLE_ITALY_MALE_1_CHAT_1, 6); break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, SFX_LITTLE_ITALY_MALE_VOICE_1_CHAT_1, 6); break;
 	default: return GetGenericMaleTalkSfx(sound);
 	}
 	return 30 * (m_sQueueSample.m_nEntityIndex & 1) + sfx;
@@ -1548,17 +1547,17 @@ cAudioManager::GetLittleItalyFemaleOldTalkSfx(int16 sound)
 
 	switch(sound) {
 	case SOUND_PED_CAR_JACKED:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_OLD_CAR_JACKED_1, 2);
+		GetPhrase(&sfx, &lastSfx, SFX_LITTLE_ITALY_OLD_FEMALE_VOICE_1_CARJACKED_1, 2);
 		break;
-	case SOUND_PED_ROBBED: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_OLD_ROBBED_1, 2); break;
-	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_OLD_EVADE_1, 6); break;
+	case SOUND_PED_ROBBED: GetPhrase(&sfx, &lastSfx, SFX_LITTLE_ITALY_OLD_FEMALE_VOICE_1_MUGGED_1, 2); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, SFX_LITTLE_ITALY_OLD_FEMALE_VOICE_1_DODGE_1, 6); break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_OLD_CAR_COLLISION_1, 7);
+		GetPhrase(&sfx, &lastSfx, SFX_LITTLE_ITALY_OLD_FEMALE_VOICE_1_DRIVER_ABUSE_1, 7);
 		break;
 	case SOUND_PED_CHAT_EVENT:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_OLD_CHAT_EVENT_1, 4);
+		GetPhrase(&sfx, &lastSfx, SFX_LITTLE_ITALY_OLD_FEMALE_VOICE_1_SHOCKED_1, 4);
 		break;
-	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_OLD_CHAT_1, 7); break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, SFX_LITTLE_ITALY_OLD_FEMALE_VOICE_1_CHAT_1, 7); break;
 	default: return GetGenericFemaleTalkSfx(sound);
 	}
 	return sfx;
@@ -1572,19 +1571,19 @@ cAudioManager::GetLittleItalyFemaleYoungTalkSfx(int16 sound)
 
 	switch(sound) {
 	case SOUND_PED_CAR_JACKED:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_YOUNG_CAR_JACKED_1, 2);
+		GetPhrase(&sfx, &lastSfx, SFX_LITTLE_ITALY_YOUNG_FEMALE_VOICE_1_CARJACKED_1, 2);
 		break;
 	case SOUND_PED_ROBBED:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_YOUNG_ROBBED_1, 2);
+		GetPhrase(&sfx, &lastSfx, SFX_LITTLE_ITALY_YOUNG_FEMALE_VOICE_1_MUGGED_1, 2);
 		break;
-	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_YOUNG_EVADE_1, 7); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, SFX_LITTLE_ITALY_YOUNG_FEMALE_VOICE_1_DODGE_1, 7); break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_YOUNG_CAR_COLLISION_1, 6);
+		GetPhrase(&sfx, &lastSfx, SFX_LITTLE_ITALY_YOUNG_FEMALE_VOICE_1_DRIVER_ABUSE_1, 6);
 		break;
 	case SOUND_PED_CHAT_EVENT:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_YOUNG_CHAT_EVENT_1, 4);
+		GetPhrase(&sfx, &lastSfx, SFX_LITTLE_ITALY_YOUNG_FEMALE_VOICE_1_SHOCKED_1, 4);
 		break;
-	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_YOUNG_CHAT_1, 6); break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, SFX_LITTLE_ITALY_YOUNG_FEMALE_VOICE_1_CHAT_1, 6); break;
 	default: return GetGenericFemaleTalkSfx(sound);
 	}
 	return sfx;
@@ -1598,15 +1597,15 @@ cAudioManager::GetWhiteDockerMaleTalkSfx(int16 sound)
 
 	switch(sound) {
 	case SOUND_PED_HANDS_COWER:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_DOCKER_MALE_HANDS_COWER_1, 2);
+		GetPhrase(&sfx, &lastSfx, SFX_WHITE_DOCKER_MALE_VOICE_1_GUN_PANIC_1, 2);
 		break;
-	case SOUND_PED_ATTACK: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_DOCKER_MALE_ATTACK_1, 3); break;
-	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_DOCKER_MALE_EVADE_1, 4); break;
+	case SOUND_PED_ATTACK: GetPhrase(&sfx, &lastSfx, SFX_WHITE_DOCKER_MALE_VOICE_1_FIGHT_1, 3); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, SFX_WHITE_DOCKER_MALE_VOICE_1_DODGE_1, 4); break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_DOCKER_MALE_CAR_COLLISION_1, 4);
+		GetPhrase(&sfx, &lastSfx, SFX_WHITE_DOCKER_MALE_VOICE_1_DRIVER_ABUSE_1, 4);
 		break;
-	case SOUND_PED_CHAT_SEXY: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_DOCKER_MALE_CHAT_SEXY_1, 3); break;
-	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_DOCKER_MALE_CHAT_1, 5); break;
+	case SOUND_PED_CHAT_SEXY: GetPhrase(&sfx, &lastSfx, SFX_WHITE_DOCKER_MALE_VOICE_1_EYING_1, 3); break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, SFX_WHITE_DOCKER_MALE_VOICE_1_CHAT_1, 5); break;
 	default: return GetGenericMaleTalkSfx(sound);
 	}
 	return sfx;
@@ -1620,15 +1619,15 @@ cAudioManager::GetBlackDockerMaleTalkSfx(int16 sound)
 
 	switch(sound) {
 	case SOUND_PED_HANDS_COWER:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_DOCKER_MALE_HANDS_COWER_1, 3);
+		GetPhrase(&sfx, &lastSfx, SFX_BLACK_DOCKER_VOICE_1_GUN_PANIC_1, 3);
 		break;
-	case SOUND_PED_ATTACK: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_DOCKER_MALE_ATTACK_1, 5); break;
-	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_DOCKER_MALE_EVADE_1, 5); break;
+	case SOUND_PED_ATTACK: GetPhrase(&sfx, &lastSfx, SFX_BLACK_DOCKER_VOICE_1_FIGHT_1, 5); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, SFX_BLACK_DOCKER_VOICE_1_DODGE_1, 5); break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_DOCKER_MALE_CAR_COLLISION_1, 6);
+		GetPhrase(&sfx, &lastSfx, SFX_BLACK_DOCKER_VOICE_1_DRIVER_ABUSE_1, 6);
 		break;
-	case SOUND_PED_CHAT_SEXY: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_DOCKER_MALE_CHAT_SEXY_1, 3); break;
-	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_DOCKER_MALE_CHAT_1, 5); break;
+	case SOUND_PED_CHAT_SEXY: GetPhrase(&sfx, &lastSfx, SFX_BLACK_DOCKER_VOICE_1_EYING_1, 3); break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, SFX_BLACK_DOCKER_VOICE_1_CHAT_1, 5); break;
 	default: return GetGenericMaleTalkSfx(sound);
 	}
 	return sfx;
@@ -1641,16 +1640,16 @@ cAudioManager::GetScumMaleTalkSfx(int16 sound)
 	static uint32 lastSfx = NO_SAMPLE;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_COWER: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SCUM_MALE_HANDS_COWER_1, 5); 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, 0xA); break;
-	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SCUM_MALE_EVADE_1, 5); break;
-	case SOUND_PED_CAR_COLLISION: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SCUM_MALE_CAR_COLLISION_1, 6); break;
+	case SOUND_PED_HANDS_COWER: GetPhrase(&sfx, &lastSfx, SFX_SCUM_MALE_VOICE_1_GUN_PANIC_1, 5); break;
+	case SOUND_PED_ROBBED: sfx = SFX_SCUM_MALE_VOICE_1_MUGGED_1; break;
+	case SOUND_PED_ATTACK: GetPhrase(&sfx, &lastSfx, SFX_SCUM_MALE_VOICE_1_FIGHT_1, 0xA); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, SFX_SCUM_MALE_VOICE_1_DODGE_1, 5); break;
+	case SOUND_PED_CAR_COLLISION: GetPhrase(&sfx, &lastSfx, SFX_SCUM_MALE_VOICE_1_DRIVER_ABUSE_1, 6); break;
 	case SOUND_PED_WAIT_DOUBLEBACK:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SCUM_MALE_WAIT_DOUBLEBACK_1, 3);
+		GetPhrase(&sfx, &lastSfx, SFX_SCUM_MALE_VOICE_1_LOST_1, 3);
 		break;
-	case SOUND_PED_CHAT_SEXY: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SCUM_MALE_CHAT_SEXY_1, 5); break;
-	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SCUM_MALE_CHAT_1, 9); break;
+	case SOUND_PED_CHAT_SEXY: GetPhrase(&sfx, &lastSfx, SFX_SCUM_MALE_VOICE_1_EYING_1, 5); break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, SFX_SCUM_MALE_VOICE_1_CHAT_1, 9); break;
 	default: return GetGenericMaleTalkSfx(sound);
 	}
 	return sfx;
@@ -1663,14 +1662,14 @@ cAudioManager::GetScumFemaleTalkSfx(int16 sound)
 	static uint32 lastSfx = NO_SAMPLE;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_COWER: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SCUM_FEMALE_HANDS_COWER_1, 4); break;
-	case SOUND_PED_ROBBED: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SCUM_FEMALE_ROBBED_1, 2); break;
-	case SOUND_PED_ATTACK: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SCUM_FEMALE_ATTACK_1, 4); break;
-	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SCUM_FEMALE_EVADE_1, 8); break;
+	case SOUND_PED_HANDS_COWER: GetPhrase(&sfx, &lastSfx, SFX_SCUM_FEMALE_VOICE_1_GUN_PANIC_1, 4); break;
+	case SOUND_PED_ROBBED: GetPhrase(&sfx, &lastSfx, SFX_SCUM_FEMALE_VOICE_1_MUGGED_1, 2); break;
+	case SOUND_PED_ATTACK: GetPhrase(&sfx, &lastSfx, SFX_SCUM_FEMALE_VOICE_1_FIGHT_1, 4); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, SFX_SCUM_FEMALE_VOICE_1_DODGE_1, 8); break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SCUM_FEMALE_CAR_COLLISION_1, 5);
+		GetPhrase(&sfx, &lastSfx, SFX_SCUM_FEMALE_VOICE_1_DRIVER_ABUSE_1, 5);
 		break;
-	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SCUM_FEMALE_CHAT_1, 13); break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, SFX_SCUM_FEMALE_VOICE_1_CHAT_1, 13); break;
 	default: return GetGenericFemaleTalkSfx(sound);
 	}
 	return sfx;
@@ -1684,15 +1683,15 @@ cAudioManager::GetWhiteWorkerMaleTalkSfx(int16 sound)
 
 	switch(sound) {
 	case SOUND_PED_HANDS_COWER:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_WORKER_MALE_HANDS_COWER_1, 3);
+		GetPhrase(&sfx, &lastSfx, SFX_WHITE_WORKER_MALE_VOICE_1_GUN_PANIC_1, 3);
 		break;
-	case SOUND_PED_ATTACK: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_WORKER_MALE_ATTACK_1, 3); break;
-	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_WORKER_MALE_EVADE_1, 4); break;
+	case SOUND_PED_ATTACK: GetPhrase(&sfx, &lastSfx, SFX_WHITE_WORKER_MALE_VOICE_1_FIGHT_1, 3); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, SFX_WHITE_WORKER_MALE_VOICE_1_DODGE_1, 4); break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_WORKER_MALE_CAR_COLLISION_1, 6);
+		GetPhrase(&sfx, &lastSfx, SFX_WHITE_WORKER_MALE_VOICE_1_DRIVER_ABUSE_1, 6);
 		break;
-	case SOUND_PED_CHAT_SEXY: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_WORKER_MALE_CHAT_SEXY_1, 2); break;
-	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_WORKER_MALE_CHAT_1, 6); break;
+	case SOUND_PED_CHAT_SEXY: GetPhrase(&sfx, &lastSfx, SFX_WHITE_WORKER_MALE_VOICE_1_EYING_1, 2); break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, SFX_WHITE_WORKER_MALE_VOICE_1_CHAT_1, 6); break;
 	default: return GetGenericMaleTalkSfx(sound);
 	}
 	return sfx;
@@ -1706,15 +1705,15 @@ cAudioManager::GetBlackWorkerMaleTalkSfx(int16 sound)
 
 	switch(sound) {
 	case SOUND_PED_HANDS_COWER:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_WORKER_MALE_HANDS_COWER_1, 4);
+		GetPhrase(&sfx, &lastSfx, SFX_BLACK_WORKER_MALE_VOICE_1_GUN_PANIC_1, 4);
 		break;
-	case SOUND_PED_ATTACK: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_WORKER_MALE_ATTACK_1, 3); break;
-	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_WORKER_MALE_EVADE_1, 3); break;
+	case SOUND_PED_ATTACK: GetPhrase(&sfx, &lastSfx, SFX_BLACK_WORKER_MALE_VOICE_1_FIGHT_1, 3); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, SFX_BLACK_WORKER_MALE_VOICE_1_DODGE_1, 3); break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_WORKER_MALE_CAR_COLLISION_1, 4);
+		GetPhrase(&sfx, &lastSfx, SFX_BLACK_WORKER_MALE_VOICE_1_DRIVER_ABUSE_1, 4);
 		break;
-	case SOUND_PED_CHAT_SEXY: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_WORKER_MALE_CHAT_SEXY_1, 3); break;
-	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_WORKER_MALE_CHAT_1, 4); break;
+	case SOUND_PED_CHAT_SEXY: GetPhrase(&sfx, &lastSfx, SFX_BLACK_WORKER_MALE_VOICE_1_EYING_1, 3); break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, SFX_BLACK_WORKER_MALE_VOICE_1_CHAT_1, 4); break;
 	default: return GetGenericMaleTalkSfx(sound);
 	}
 	return sfx;
@@ -1728,21 +1727,21 @@ 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, 3);
+		GetPhrase(&sfx, &lastSfx, SFX_BUSINESS_MALE_YOUNG_VOICE_1_GUN_PANIC_1, 3);
 		break;
 	case SOUND_PED_CAR_JACKED:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BUSINESS_MALE_YOUNG_1_CAR_JACKED_1, 2);
+		GetPhrase(&sfx, &lastSfx, SFX_BUSINESS_MALE_YOUNG_VOICE_1_CARJACKED_1, 2);
 		break;
-	case SOUND_PED_ROBBED: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BUSINESS_MALE_YOUNG_1_ROBBED_1, 2); break;
-	case SOUND_PED_ATTACK: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BUSINESS_MALE_YOUNG_1_ATTACK_1, 4); break;
-	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BUSINESS_MALE_YOUNG_1_EVADE_1, 4); break;
+	case SOUND_PED_ROBBED: GetPhrase(&sfx, &lastSfx, SFX_BUSINESS_MALE_YOUNG_VOICE_1_MUGGED_1, 2); break;
+	case SOUND_PED_ATTACK: GetPhrase(&sfx, &lastSfx, SFX_BUSINESS_MALE_YOUNG_VOICE_1_FIGHT_1, 4); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, SFX_BUSINESS_MALE_YOUNG_VOICE_1_DODGE_1, 4); break;
 	case SOUND_PED_FLEE_RUN:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BUSINESS_MALE_YOUNG_1_FLEE_RUN_1, 5);
+		GetPhrase(&sfx, &lastSfx, SFX_BUSINESS_MALE_YOUNG_VOICE_1_RUN_FROM_FIGHT_1, 5);
 		break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BUSINESS_MALE_YOUNG_1_CAR_COLLISION_1, 6);
+		GetPhrase(&sfx, &lastSfx, SFX_BUSINESS_MALE_YOUNG_VOICE_1_DRIVER_ABUSE_1, 6);
 		break;
-	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BUSINESS_MALE_YOUNG_1_CHAT_1, 6); break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, SFX_BUSINESS_MALE_YOUNG_VOICE_1_CHAT_1, 6); break;
 	default: return GetGenericMaleTalkSfx(sound);
 	}
 
@@ -1758,19 +1757,19 @@ cAudioManager::GetBusinessMaleOldTalkSfx(int16 sound)
 
 	switch(sound) {
 	case SOUND_PED_HANDS_COWER:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BUSINESS_MALE_OLD_1_HANDS_COWER_1, 3);
+		GetPhrase(&sfx, &lastSfx, SFX_BUSINESS_MALE_OLD_VOICE_1_GUN_PANIC_1, 3);
 		break;
 	case SOUND_PED_CAR_JACKED:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BUSINESS_MALE_OLD_1_CAR_JACKED_1, 2);
+		GetPhrase(&sfx, &lastSfx, SFX_BUSINESS_MALE_OLD_VOICE_1_CARJACKED_1, 2);
 		break;
-	case SOUND_PED_ROBBED: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BUSINESS_MALE_OLD_1_ROBBED_1, 2); break;
-	case SOUND_PED_ATTACK: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BUSINESS_MALE_OLD_1_ATTACK_1, 5); break;
-	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BUSINESS_MALE_OLD_1_EVADE_1, 4); break;
-	case SOUND_PED_FLEE_RUN: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BUSINESS_MALE_OLD_1_FLEE_RUN_1, 5); break;
+	case SOUND_PED_ROBBED: GetPhrase(&sfx, &lastSfx, SFX_BUSINESS_MALE_OLD_VOICE_1_MUGGED_1, 2); break;
+	case SOUND_PED_ATTACK: GetPhrase(&sfx, &lastSfx, SFX_BUSINESS_MALE_OLD_VOICE_1_FIGHT_1, 5); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, SFX_BUSINESS_MALE_OLD_VOICE_1_DODGE_1, 4); break;
+	case SOUND_PED_FLEE_RUN: GetPhrase(&sfx, &lastSfx, SFX_BUSINESS_MALE_OLD_VOICE_1_MRUN_FROM_FIGHT_1, 5); break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BUSINESS_MALE_OLD_1_CAR_COLLISION_1, 5);
+		GetPhrase(&sfx, &lastSfx, SFX_BUSINESS_MALE_OLD_VOICE_1_DRIVER_ABUSE_1, 5);
 		break;
-	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BUSINESS_MALE_OLD_1_CHAT_1, 5); break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, SFX_BUSINESS_MALE_OLD_VOICE_1_CHAT_1, 5); break;
 	default: return GetGenericMaleTalkSfx(sound);
 	}
 	return sfx;
@@ -1784,17 +1783,17 @@ 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, 4);
+		GetPhrase(&sfx, &lastSfx, SFX_WHITE_BUSINESS_FEMALE_VOICE_1_GUN_PANIC_1, 4);
 		break;
-	case SOUND_PED_CAR_JACKED: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BUSINESS_WOMAN_1_CAR_JACKED_1, 2); break;
-	case SOUND_PED_ROBBED: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BUSINESS_WOMAN_1_ROBBED_1, 2); break;
-	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BUSINESS_WOMAN_1_EVADE_1, 6); break;
-	case SOUND_PED_FLEE_RUN: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BUSINESS_WOMAN_1_FLEE_RUN_1, 4); break;
+	case SOUND_PED_CAR_JACKED: GetPhrase(&sfx, &lastSfx, SFX_WHITE_BUSINESS_FEMALE_VOICE_1_CARJACKED_1, 2); break;
+	case SOUND_PED_ROBBED: GetPhrase(&sfx, &lastSfx, SFX_WHITE_BUSINESS_FEMALE_VOICE_1_MUGGED_1, 2); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, SFX_WHITE_BUSINESS_FEMALE_VOICE_1_DODGE_1, 6); break;
+	case SOUND_PED_FLEE_RUN: GetPhrase(&sfx, &lastSfx, SFX_WHITE_BUSINESS_FEMALE_VOICE_1_RUN_FROM_FIGHT_1, 4); break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BUSINESS_WOMAN_1_CAR_COLLISION_1, 5);
+		GetPhrase(&sfx, &lastSfx, SFX_WHITE_BUSINESS_FEMALE_VOICE_1_DRIVER_ABUSE_1, 5);
 		break;
-	case SOUND_PED_CHAT_EVENT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BUSINESS_WOMAN_1_CHAT_EVENT_1, 4); break;
-	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BUSINESS_WOMAN_1_CHAT_1, 7); break;
+	case SOUND_PED_CHAT_EVENT: GetPhrase(&sfx, &lastSfx, SFX_WHITE_BUSINESS_FEMALE_VOICE_1_SHOCKED_1, 4); break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, SFX_WHITE_BUSINESS_FEMALE_VOICE_1_CHAT_1, 7); break;
 	default: return GetGenericFemaleTalkSfx(sound);
 	}
 
@@ -1810,23 +1809,23 @@ cAudioManager::GetBlackBusinessFemaleTalkSfx(int16 sound)
 
 	switch(sound) {
 	case SOUND_PED_HANDS_COWER:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_BUSINESS_FEMALE_HANDS_COWER_1, 5);
+		GetPhrase(&sfx, &lastSfx, SFX_BLACK_BUSINESS_FEMALE_VOICE_1_GUN_PANIC_1, 5);
 		break;
 	case SOUND_PED_CAR_JACKED:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_BUSINESS_FEMALE_CAR_JACKED_1, 4);
+		GetPhrase(&sfx, &lastSfx, SFX_BLACK_BUSINESS_FEMALE_VOICE_1_CARAJACKED_1, 4);
 		break;
-	case SOUND_PED_ROBBED: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_BUSINESS_FEMALE_ROBBED_1, 3); break;
-	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_BUSINESS_FEMALE_EVADE_1, 6); break;
+	case SOUND_PED_ROBBED: GetPhrase(&sfx, &lastSfx, SFX_BLACK_BUSINESS_FEMALE_VOICE_1_MUGGED_1, 3); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, SFX_BLACK_BUSINESS_FEMALE_VOICE_1_DODGE_1, 6); break;
 	case SOUND_PED_FLEE_RUN:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_BUSINESS_FEMALE_FLEE_RUN_1, 6);
+		GetPhrase(&sfx, &lastSfx, SFX_BLACK_BUSINESS_FEMALE_VOICE_1_RUN_FROM_FIGHT_1, 6);
 		break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_BUSINESS_FEMALE_CAR_COLLISION_1, 7);
+		GetPhrase(&sfx, &lastSfx, SFX_BLACK_BUSINESS_FEMALE_VOICE_1_DRIVER_ABUSE_1, 7);
 		break;
 	case SOUND_PED_CHAT_EVENT:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_BUSINESS_FEMALE_CHAT_EVENT_1, 4);
+		GetPhrase(&sfx, &lastSfx, SFX_BLACK_BUSINESS_FEMALE_VOICE_1_SHOCKED_1, 4);
 		break;
-	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_BUSINESS_FEMALE_CHAT_1, 7); break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, SFX_BLACK_BUSINESS_FEMALE_VOICE_1_CHAT_1, 7); break;
 	default: return GetGenericFemaleTalkSfx(sound);
 	}
 	return sfx;
@@ -1839,15 +1838,15 @@ cAudioManager::GetSupermodelMaleTalkSfx(int16 sound)
 	static uint32 lastSfx = NO_SAMPLE;
 
 	switch(sound) {
-	case SOUND_PED_CAR_JACKED: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SUPERMODEL_MALE_CAR_JACKED_1, 2); break;
-	case SOUND_PED_ROBBED: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SUPERMODEL_MALE_ROBBED_1, 2); break;
-	case SOUND_PED_ATTACK: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SUPERMODEL_MALE_ATTACK_1, 5); break;
-	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SUPERMODEL_MALE_EVADE_1, 6); break;
+	case SOUND_PED_CAR_JACKED: GetPhrase(&sfx, &lastSfx, SFX_MODEL_MALE_VOICE_1_CARJACKED_1, 2); break;
+	case SOUND_PED_ROBBED: GetPhrase(&sfx, &lastSfx, SFX_MODEL_MALE_VOICE_1_MUGGED_1, 2); break;
+	case SOUND_PED_ATTACK: GetPhrase(&sfx, &lastSfx, SFX_MODEL_MALE_VOICE_1_FIGHT_1, 5); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, SFX_MODEL_MALE_VOICE_1_DODGE_1, 6); break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SUPERMODEL_MALE_CAR_COLLISION_1, 6);
+		GetPhrase(&sfx, &lastSfx, SFX_MODEL_MALE_VOICE_1_DRIVER_ABUSE_1, 6);
 		break;
-	case SOUND_PED_CHAT_SEXY: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SUPERMODEL_MALE_CHAT_SEXY_1, 3); break;
-	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SUPERMODEL_MALE_CHAT_1, 6); break;
+	case SOUND_PED_CHAT_SEXY: GetPhrase(&sfx, &lastSfx, SFX_MODEL_MALE_VOICE_1_EYING_1, 3); break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, SFX_MODEL_MALE_VOICE_1_CHAT_1, 6); break;
 	default: return GetGenericMaleTalkSfx(sound);
 	}
 	return sfx;
@@ -1861,17 +1860,17 @@ cAudioManager::GetSupermodelFemaleTalkSfx(int16 sound)
 
 	switch(sound) {
 	case SOUND_PED_HANDS_COWER:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SUPERMODEL_FEMALE_HANDS_COWER_1, 4);
+		GetPhrase(&sfx, &lastSfx, SFX_MODEL_FEMALE_VOICE_1_GUN_PANIC_1, 4);
 		break;
-	case SOUND_PED_ROBBED: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SUPERMODEL_FEMALE_ROBBED_1, 3); break;
-	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SUPERMODEL_FEMALE_EVADE_1, 4); break;
+	case SOUND_PED_ROBBED: GetPhrase(&sfx, &lastSfx, SFX_MODEL_FEMALE_VOICE_1_MUGGED_1, 3); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, SFX_MODEL_FEMALE_VOICE_1_DODGE_1, 4); break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SUPERMODEL_FEMALE_CAR_COLLISION_1, 7);
+		GetPhrase(&sfx, &lastSfx, SFX_MODEL_FEMALE_VOICE_1_DRIVER_ABUSE_1, 7);
 		break;
 	case SOUND_PED_CHAT_EVENT:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SUPERMODEL_FEMALE_CHAT_EVENT_1, 5);
+		GetPhrase(&sfx, &lastSfx, SFX_MODEL_FEMALE_VOICE_1_SHOCKED_1, 5);
 		break;
-	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SUPERMODEL_FEMALE_CHAT_1, 8); break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, SFX_MODEL_FEMALE_VOICE_1_CHAT_1, 8); break;
 	default: return GetGenericFemaleTalkSfx(sound);
 	}
 	return sfx;
@@ -1884,13 +1883,13 @@ cAudioManager::GetStewardMaleTalkSfx(int16 sound)
 	static uint32 lastSfx = NO_SAMPLE;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_COWER: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_STEWARD_MALE_HANDS_COWER_1, 3); break;
-	case SOUND_PED_ATTACK: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_STEWARD_MALE_ATTACK_1, 4); break;
-	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_STEWARD_MALE_EVADE_1, 3); break;
+	case SOUND_PED_HANDS_COWER: GetPhrase(&sfx, &lastSfx, SFX_STEWARD_MALE_VOICE_1_GUN_PANIC_1, 3); break;
+	case SOUND_PED_ATTACK: GetPhrase(&sfx, &lastSfx, SFX_STEWARD_MALE_VOICE_1_FIGHT_1, 4); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, SFX_STEWARD_MALE_VOICE_1_DODGE_1, 3); break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_STEWARD_MALE_CAR_COLLISION_1, 5);
+		GetPhrase(&sfx, &lastSfx, SFX_STEWARD_MALE_VOICE_1_DRIVER_ABUSE_1, 5);
 		break;
-	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_STEWARD_MALE_CHAT_1, 4); break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, SFX_STEWARD_MALE_VOICE_1_CHAT_1, 4); break;
 	default: return GetGenericMaleTalkSfx(sound);
 	}
 	return sfx;
@@ -1904,13 +1903,13 @@ cAudioManager::GetStewardFemaleTalkSfx(int16 sound)
 
 	switch(sound) {
 	case SOUND_PED_HANDS_COWER:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_STEWARD_FEMALE_1_HANDS_COWER_1, 3);
+		GetPhrase(&sfx, &lastSfx, SFX_STEWARD_FEMALE_VOICE_1_GUN_PANIC_1, 3);
 		break;
-	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_STEWARD_FEMALE_1_EVADE_1, 5); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, SFX_STEWARD_FEMALE_VOICE_1_DODGE_1, 5); break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_STEWARD_FEMALE_1_CAR_COLLISION_1, 5);
+		GetPhrase(&sfx, &lastSfx, SFX_STEWARD_FEMALE_VOICE_1_DRIVER_ABUSE_1, 5);
 		break;
-	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_STEWARD_FEMALE_1_CHAT_1, 5); break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, SFX_STEWARD_FEMALE_VOICE_1_CHAT_1, 5); break;
 	default: return GetGenericFemaleTalkSfx(sound);
 	}
 	return 18 * (m_sQueueSample.m_nEntityIndex & 1) + sfx;
@@ -1923,11 +1922,11 @@ cAudioManager::GetFanMaleTalkSfx(int16 sound, int32 model)
 	static uint32 lastSfx = NO_SAMPLE;
 
 	switch(sound) {
-	case SOUND_PED_ATTACK: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_FAN_MALE_1_ATTACK_1, 3); break;
-	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_FAN_MALE_1_EVADE_1, 4); break;
-	case SOUND_PED_CAR_COLLISION: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_FAN_MALE_1_CAR_COLLISION_1, 5); break;
-	case SOUND_PED_CHAT_EVENT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_FAN_MALE_1_CHAT_EVENT_1, 2); break;
-	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_FAN_MALE_1_CHAT_1, 6); break;
+	case SOUND_PED_ATTACK: GetPhrase(&sfx, &lastSfx, SFX_FOOTBALL_MALE_VOICE_1_FIGHT_1, 3); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, SFX_FOOTBALL_MALE_VOICE_1_DODGE_1, 4); break;
+	case SOUND_PED_CAR_COLLISION: GetPhrase(&sfx, &lastSfx, SFX_FOOTBALL_MALE_VOICE_1_DRIVER_ABUSE_1, 5); break;
+	case SOUND_PED_CHAT_EVENT: GetPhrase(&sfx, &lastSfx, SFX_FOOTBALL_MALE_VOICE_1_SHOCKED_1, 2); break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, SFX_FOOTBALL_MALE_VOICE_1_CHAT_1, 6); break;
 	default: return GetGenericMaleTalkSfx(sound);
 	}
 
@@ -1942,13 +1941,13 @@ 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_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_FAN_FEMALE_1_EVADE_1, 4); break;
+	case SOUND_PED_ROBBED: sfx = SFX_FOOTBALL_FEMALE_VOICE_1_MUGGED_1; break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, SFX_FOOTBALL_FEMALE_VOICE_1_DODGE_1, 4); break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_FAN_FEMALE_1_CAR_COLLISION_1, 5);
+		GetPhrase(&sfx, &lastSfx, SFX_FOOTBALL_FEMALE_VOICE_1_DRIVER_ABUSE_1, 5);
 		break;
-	case SOUND_PED_CHAT_EVENT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_FAN_FEMALE_1_CHAT_EVENT_1, 2); break;
-	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_FAN_FEMALE_1_CHAT_1, 6); break;
+	case SOUND_PED_CHAT_EVENT: GetPhrase(&sfx, &lastSfx, SFX_FOOTBALL_FEMALE_VOICE_1_SHOCKED_1, 2); break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, SFX_FOOTBALL_FEMALE_VOICE_1_CHAT_1, 6); break;
 	default: return GetGenericFemaleTalkSfx(sound);
 	}
 	return 18 * (m_sQueueSample.m_nEntityIndex & 1) + sfx;
@@ -1961,13 +1960,13 @@ cAudioManager::GetHospitalMaleTalkSfx(int16 sound)
 	static uint32 lastSfx = NO_SAMPLE;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_COWER: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_HOSPITAL_MALE_HANDS_COWER_1, 4); break;
-	case SOUND_PED_ATTACK: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_HOSPITAL_MALE_ATTACK_1, 4); break;
-	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_HOSPITAL_MALE_EVADE_1, 4); break;
+	case SOUND_PED_HANDS_COWER: GetPhrase(&sfx, &lastSfx, SFX_HOSPITAL_MALE_VOICE_1_GUN_PANIC_1, 4); break;
+	case SOUND_PED_ATTACK: GetPhrase(&sfx, &lastSfx, SFX_HOSPITAL_MALE_VOICE_1_FIGHT_1, 4); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, SFX_HOSPITAL_MALE_VOICE_1_DODGE_1, 4); break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_HOSPITAL_MALE_CAR_COLLISION_1, 5);
+		GetPhrase(&sfx, &lastSfx, SFX_HOSPITAL_MALE_VOICE_1_DRIVER_ABUSE_1, 5);
 		break;
-	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_HOSPITAL_MALE_CHAT_1, 5); break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, SFX_HOSPITAL_MALE_VOICE_1_CHAT_1, 5); break;
 	default: return GetGenericMaleTalkSfx(sound);
 	}
 	return sfx;
@@ -1980,11 +1979,11 @@ cAudioManager::GetHospitalFemaleTalkSfx(int16 sound)
 	static uint32 lastSfx = NO_SAMPLE;
 
 	switch(sound) {
-	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_HOSPITAL_FEMALE_EVADE_1, 5); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, SFX_HOSPITAL_FEMALE_VOICE_1_DODGE_1, 5); break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_HOSPITAL_FEMALE_CAR_COLLISION_1, 6);
+		GetPhrase(&sfx, &lastSfx, SFX_HOSPITAL_FEMALE_VOICE_1_DRIVER_ABUSE_1, 6);
 		break;
-	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_HOSPITAL_FEMALE_CHAT_1, 6); break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, SFX_HOSPITAL_FEMALE_VOICE_1_CHAT_1, 6); break;
 	default: return GetGenericFemaleTalkSfx(sound);
 	}
 	return sfx;
@@ -1998,20 +1997,20 @@ cAudioManager::GetWhiteConstructionWorkerTalkSfx(int16 sound)
 
 	switch(sound) {
 	case SOUND_PED_HANDS_COWER:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_CONSTRUCTION_WORKER_HANDS_COWER_1, 3);
+		GetPhrase(&sfx, &lastSfx, SFX_WHITE_MALE_CONSTRUCTION_VOICE_1_GUN_PANIC_1, 3);
 		break;
-	case SOUND_PED_CAR_JACKED: sfx = AUDIO_SAMPLE_PED_WHITE_CONSTRUCTION_WORKER_CAR_JACKED_1; break;
+	case SOUND_PED_CAR_JACKED: sfx = SFX_WHITE_MALE_CONSTRUCTION_VOICE_1_CARJACKED_1; break;
 	case SOUND_PED_ATTACK:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_CONSTRUCTION_WORKER_ATTACK_1, 5);
+		GetPhrase(&sfx, &lastSfx, SFX_WHITE_MALE_CONSTRUCTION_VOICE_1_FIGHT_1, 5);
 		break;
-	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_CONSTRUCTION_WORKER_EVADE_1, 5); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, SFX_WHITE_MALE_CONSTRUCTION_VOICE_1_DODGE_1, 5); break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_CONSTRUCTION_WORKER_CAR_COLLISION_1, 4);
+		GetPhrase(&sfx, &lastSfx, SFX_WHITE_MALE_CONSTRUCTION_VOICE_1_DRIVER_ABUSE_1, 4);
 		break;
 	case SOUND_PED_CHAT_SEXY:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_CONSTRUCTION_WORKER_CHAT_SEXY_1, 3);
+		GetPhrase(&sfx, &lastSfx, SFX_WHITE_MALE_CONSTRUCTION_VOICE_1_EYING_1, 3);
 		break;
-	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_WHITE_CONSTRUCTION_WORKER_CHAT_1, 7); break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, SFX_WHITE_MALE_CONSTRUCTION_VOICE_1_CHAT_1, 7); break;
 	default: return GetGenericMaleTalkSfx(sound);
 	}
 	return sfx;
@@ -2025,22 +2024,22 @@ cAudioManager::GetBlackConstructionWorkerTalkSfx(int16 sound)
 
 	switch(sound) {
 	case SOUND_PED_HANDS_COWER:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_CONSTRUCTION_WORKER_HANDS_COWER_1, 3);
+		GetPhrase(&sfx, &lastSfx, SFX_BLACK_CONSTRUCTION_MALE_VOICE_1_GUN_PANIC_1, 3);
 		break;
 	case SOUND_PED_CAR_JACKED:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_CONSTRUCTION_WORKER_CAR_JACKED_1, 2);
+		GetPhrase(&sfx, &lastSfx, SFX_BLACK_CONSTRUCTION_MALE_VOICE_1_CARJACKED_1, 2);
 		break;
 	case SOUND_PED_ATTACK:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_CONSTRUCTION_WORKER_ATTACK_1, 5);
+		GetPhrase(&sfx, &lastSfx, SFX_BLACK_CONSTRUCTION_MALE_VOICE_1_FIGHT_1, 5);
 		break;
-	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_CONSTRUCTION_WORKER_EVADE_1, 5); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, SFX_BLACK_CONSTRUCTION_MALE_VOICE_1_DODGE_1, 5); break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_CONSTRUCTION_WORKER_CAR_COLLISION_1, 5);
+		GetPhrase(&sfx, &lastSfx, SFX_BLACK_CONSTRUCTION_MALE_VOICE_1_DRIVER_ABUSE_1, 5);
 		break;
 	case SOUND_PED_CHAT_SEXY:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_CONSTRUCTION_WORKER_CHAT_SEXY_1, 4);
+		GetPhrase(&sfx, &lastSfx, SFX_BLACK_CONSTRUCTION_MALE_VOICE_1_EYING_1, 4);
 		break;
-	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BLACK_CONSTRUCTION_WORKER_CHAT_1, 4); break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, SFX_BLACK_CONSTRUCTION_MALE_VOICE_1_CHAT_1, 4); break;
 	default: return GetGenericMaleTalkSfx(sound);
 	}
 	return sfx;
@@ -2053,14 +2052,14 @@ cAudioManager::GetShopperFemaleTalkSfx(int16 sound, int32 model)
 	static uint32 lastSfx = NO_SAMPLE;
 
 	switch(sound) {
-	case SOUND_PED_CAR_JACKED: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SHOPPER_FEMALE_1_CAR_JACKED_1, 2); break;
-	case SOUND_PED_ROBBED: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SHOPPER_FEMALE_1_ROBBED_1, 2); break;
-	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SHOPPER_FEMALE_1_EVADE_1, 6); break;
+	case SOUND_PED_CAR_JACKED: GetPhrase(&sfx, &lastSfx, SFX_SHOPPER_VOICE_1_CARJACKED_1, 2); break;
+	case SOUND_PED_ROBBED: GetPhrase(&sfx, &lastSfx, SFX_SHOPPER_VOICE_1_MUGGED_1, 2); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, SFX_SHOPPER_VOICE_1_DODGE_1, 6); break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SHOPPER_FEMALE_1_CAR_COLLISION_1, 7);
+		GetPhrase(&sfx, &lastSfx, SFX_SHOPPER_VOICE_1_DRIVER_ABUSE_1, 7);
 		break;
-	case SOUND_PED_CHAT_EVENT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SHOPPER_FEMALE_1_CHAT_EVENT_1, 4); break;
-	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SHOPPER_FEMALE_1_CHAT_1, 7); break;
+	case SOUND_PED_CHAT_EVENT: GetPhrase(&sfx, &lastSfx, SFX_SHOPPER_VOICE_1_SHOCKED_1, 4); break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, SFX_SHOPPER_VOICE_1_CHAT_1, 7); break;
 	default: return GetGenericFemaleTalkSfx(sound);
 	}
 
@@ -2079,15 +2078,15 @@ cAudioManager::GetStudentMaleTalkSfx(int16 sound)
 	static uint32 lastSfx = NO_SAMPLE;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_COWER: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_STUDENT_MALE_HANDS_COWER_1, 2); break;
-	case SOUND_PED_ROBBED: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_STUDENT_MALE_ROBBED_1, 2); break;
-	case SOUND_PED_ATTACK: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_STUDENT_MALE_ATTACK_1, 4); break;
-	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_STUDENT_MALE_EVADE_1, 4); break;
+	case SOUND_PED_HANDS_COWER: GetPhrase(&sfx, &lastSfx, SFX_STUDENT_MALE_VOICE_1_GUN_PANIC_1, 2); break;
+	case SOUND_PED_ROBBED: GetPhrase(&sfx, &lastSfx, SFX_STUDENT_MALE_VOICE_1_MUGGED_1, 2); break;
+	case SOUND_PED_ATTACK: GetPhrase(&sfx, &lastSfx, SFX_STUDENT_MALE_VOICE_1_FIGHT_1, 4); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, SFX_STUDENT_MALE_VOICE_1_DODGE_1, 4); break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_STUDENT_MALE_CAR_COLLISION_1, 4);
+		GetPhrase(&sfx, &lastSfx, SFX_STUDENT_MALE_VOICE_1_DRIVER_ABUSE_1, 4);
 		break;
-	case SOUND_PED_CHAT_EVENT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_STUDENT_MALE_CHAT_EVENT_1, 3); break;
-	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_STUDENT_MALE_CHAT_1, 5); break;
+	case SOUND_PED_CHAT_EVENT: GetPhrase(&sfx, &lastSfx, SFX_STUDENT_MALE_VOICE_1_SHOCKED_1, 3); break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, SFX_STUDENT_MALE_VOICE_1_CHAT_1, 5); break;
 	default: return GetGenericMaleTalkSfx(sound);
 	}
 	return sfx;
@@ -2100,15 +2099,15 @@ cAudioManager::GetStudentFemaleTalkSfx(int16 sound)
 	static uint32 lastSfx = NO_SAMPLE;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_COWER: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_STUDENT_FEMALE_HANDS_COWER_1, 4); break;
-	case SOUND_PED_ROBBED: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_STUDENT_FEMALE_ROBBED_1, 2); break;
-	case SOUND_PED_ATTACK: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_STUDENT_FEMALE_ATTACK_1, 4); break;
-	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_STUDENT_FEMALE_EVADE_1, 4); break;
+	case SOUND_PED_HANDS_COWER: GetPhrase(&sfx, &lastSfx, SFX_STUDENT_FEMALE_VOICE_1_GUN_PANIC_1, 4); break;
+	case SOUND_PED_ROBBED: GetPhrase(&sfx, &lastSfx, SFX_STUDENT_FEMALE_VOICE_1_MUGGED_1, 2); break;
+	case SOUND_PED_ATTACK: GetPhrase(&sfx, &lastSfx, SFX_STUDENT_FEMALE_VOICE_1_FIGHT_1, 4); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, SFX_STUDENT_FEMALE_VOICE_1_DODGE_1, 4); break;
 	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_STUDENT_FEMALE_CAR_COLLISION_1, 4);
+		GetPhrase(&sfx, &lastSfx, SFX_STUDENT_FEMALE_VOICE_1_DRIVER_ABUSE_1, 4);
 		break;
-	case SOUND_PED_CHAT_EVENT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_STUDENT_FEMALE_CHAT_EVENT_1, 2); break;
-	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_STUDENT_FEMALE_CHAT_1, 4); break;
+	case SOUND_PED_CHAT_EVENT: GetPhrase(&sfx, &lastSfx, SFX_STUDENT_FEMALE_VOICE_1_SHOCKED_1, 2); break;
+	case SOUND_PED_CHAT: GetPhrase(&sfx, &lastSfx, SFX_STUDENT_FEMALE_VOICE_1_CHAT_1, 4); break;
 	default: return GetGenericFemaleTalkSfx(sound);
 	}
 	return sfx;
@@ -2144,10 +2143,10 @@ cAudioManager::GetEightTalkSfx(int16 sound)
 	static uint32 lastSfx = NO_SAMPLE;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_UP: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_EIGHT_HANDS_UP_1, 2); break;
-	case SOUND_PED_ROBBED: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_EIGHT_ROBBED_1, 2); break;
-	case SOUND_PED_ATTACK: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_EIGHT_ATTACK_1, 6); break;
-	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_EIGHT_EVADE_1, 7); break;
+	case SOUND_PED_HANDS_UP: GetPhrase(&sfx, &lastSfx, SFX_8BALL_GUN_COOL_1, 2); break;
+	case SOUND_PED_ROBBED: GetPhrase(&sfx, &lastSfx, SFX_8BALL_MUGGED_1, 2); break;
+	case SOUND_PED_ATTACK: GetPhrase(&sfx, &lastSfx, SFX_8BALL_FIGHT_1, 6); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, SFX_8BALL_DODGE_1, 7); break;
 	default: return GetGenericMaleTalkSfx(sound);
 	}
 	return sfx;
@@ -2160,10 +2159,10 @@ cAudioManager::GetFrankieTalkSfx(int16 sound)
 	static uint32 lastSfx = NO_SAMPLE;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_UP: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_FRANKIE_HANDS_UP_1, 4); break;
-	case SOUND_PED_ROBBED: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_FRANKIE_ROBBED_1, 2); break;
-	case SOUND_PED_ATTACK: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_FRANKIE_ATTACK_1, 6); break;
-	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_FRANKIE_EVADE_1, 3); break;
+	case SOUND_PED_HANDS_UP: GetPhrase(&sfx, &lastSfx, SFX_SALVATORE_GUN_COOL_1, 4); break;
+	case SOUND_PED_ROBBED: GetPhrase(&sfx, &lastSfx, SFX_SALVATORE_MUGGED_1, 2); break;
+	case SOUND_PED_ATTACK: GetPhrase(&sfx, &lastSfx, SFX_SALVATORE_FIGHT_1, 6); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, SFX_SALVATORE_DODGE_1, 3); break;
 	default: return GetGenericMaleTalkSfx(sound);
 	}
 	return sfx;
@@ -2176,11 +2175,11 @@ cAudioManager::GetMistyTalkSfx(int16 sound)
 	static uint32 lastSfx = NO_SAMPLE;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_UP: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MISTY_HANDS_UP_1, 5); break;
-	case SOUND_PED_ROBBED: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MISTY_ROBBED_1, 2); break;
-	case SOUND_PED_ATTACK: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MISTY_ATTACK_1, 4); break;
-	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MISTY_EVADE_1, 5); break;
-	case SOUND_PED_TAXI_CALL: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MISTY_THUMB_LIFT_1, 4); break;
+	case SOUND_PED_HANDS_UP: GetPhrase(&sfx, &lastSfx, SFX_MISTY_GUN_COOL_1, 5); break;
+	case SOUND_PED_ROBBED: GetPhrase(&sfx, &lastSfx, SFX_MISTY_MUGGED_1, 2); break;
+	case SOUND_PED_ATTACK: GetPhrase(&sfx, &lastSfx, SFX_MISTY_FIGHT_1, 4); break;
+	case SOUND_PED_EVADE: GetPhrase(&sfx, &lastSfx, SFX_MISTY_DODGE_1, 5); break;
+	case SOUND_PED_TAXI_CALL: GetPhrase(&sfx, &lastSfx, SFX_MISTY_HERE_1, 4); break;
 	default: return GetGenericFemaleTalkSfx(sound); break;
 	}
 	return sfx;
@@ -2206,7 +2205,7 @@ cAudioManager::GetBomberTalkSfx(int16 sound)
 
 	if(sound != SOUND_PED_BOMBER) return GetGenericMaleTalkSfx(sound);
 
-	GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_BOMBER_THREAT_1, 7);
+	GetPhrase(&sfx, &lastSfx, SFX_BOMBERMAN_1, 7);
 	return sfx;
 }
 
@@ -2217,12 +2216,12 @@ cAudioManager::GetSecurityGuardTalkSfx(int16 sound)
 	static uint32 lastSfx = NO_SAMPLE;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_UP: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SECURITY_GUARD_HANDS_UP_1, 2); break;
-	case SOUND_PED_HANDS_COWER: sfx = AUDIO_SAMPLE_PED_SECURITY_GUARD_HANDS_COWER_1; break;
+	case SOUND_PED_HANDS_UP: GetPhrase(&sfx, &lastSfx, SFX_SECURITY_GUARD_VOICE_1_GUN_COOL_1, 2); break;
+	case SOUND_PED_HANDS_COWER: sfx = SFX_SECURITY_GUARD_VOICE_1_GUN_PANIC_1; break;
 	case SOUND_PED_CAR_JACKED:
-	case SOUND_PED_CAR_COLLISION: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SECURITY_GUARD_CAR_EVENT_1, 6); break;
-	case SOUND_PED_ATTACK: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SECURITY_GUARD_ATTACK_1, 2); break;
-	case SOUND_PED_FLEE_RUN: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_SECURITY_GUARD_CAR_EVENT_1, 12); break;
+	case SOUND_PED_CAR_COLLISION: GetPhrase(&sfx, &lastSfx, SFX_SECURITY_GUARD_VOICE_1_DRIVER_ABUSE_1, 6); break;
+	case SOUND_PED_ATTACK: GetPhrase(&sfx, &lastSfx, SFX_SECURITY_GUARD_VOICE_1_FIGHT_1, 2); break;
+	case SOUND_PED_FLEE_RUN: GetPhrase(&sfx, &lastSfx, SFX_SECURITY_GUARD_VOICE_1_DRIVER_ABUSE_1, 12); break;
 	default: return GetGenericMaleTalkSfx(sound);
 	}
 	return sfx;
@@ -2234,11 +2233,11 @@ cAudioManager::GetChunkyTalkSfx(int16 sound)
 	uint32 sfx;
 	static uint32 lastSfx = NO_SAMPLE;
 
-	if(sound == SOUND_PED_DEATH) return AUDIO_SAMPLE_PED_CHUNKY_DEATH_1;
+	if(sound == SOUND_PED_DEATH) return SFX_CHUNKY_DEATH;
 
 	if(sound != SOUND_PED_FLEE_RUN) return GetGenericMaleTalkSfx(sound);
 
-	GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_CHUNKY_FLEE_RUN_1, 5);
+	GetPhrase(&sfx, &lastSfx, SFX_CHUNKY_RUN_1, 5);
 	return sfx;
 }
 
@@ -2249,11 +2248,11 @@ cAudioManager::GetGenericMaleTalkSfx(int16 sound)
 	static uint32 lastSfx = NO_SAMPLE;
 
 	switch(sound) {
-	case SOUND_PED_DEATH: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MALE_DEATH_1, 8); break;
+	case SOUND_PED_DEATH: GetPhrase(&sfx, &lastSfx, SFX_GENERIC_MALE_DEATH_1, 8); break;
 	case SOUND_PED_BULLET_HIT:
-	case SOUND_PED_DEFEND: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_INJURED_PED_MALE_OUCH_1, 15); break;
-	case SOUND_PED_BURNING: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MALE_BURNING_1, 8); break;
-	case SOUND_PED_FLEE_SPRINT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_MALE_FLEE_SPRINT_1, 6); break;
+	case SOUND_PED_DEFEND: GetPhrase(&sfx, &lastSfx, SFX_GENERIC_MALE_GRUNT_1, 15); break;
+	case SOUND_PED_BURNING: GetPhrase(&sfx, &lastSfx, SFX_GENERIC_MALE_FIRE_1, 8); break;
+	case SOUND_PED_FLEE_SPRINT: GetPhrase(&sfx, &lastSfx, SFX_GENERIC_MALE_PANIC_1, 6); break;
 	default: return NO_SAMPLE;
 	}
 	return sfx;
@@ -2266,11 +2265,11 @@ cAudioManager::GetGenericFemaleTalkSfx(int16 sound)
 	static uint32 lastSfx = NO_SAMPLE;
 
 	switch(sound) {
-	case SOUND_PED_DEATH: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_FEMALE_DEATH_1, 10); break;
+	case SOUND_PED_DEATH: GetPhrase(&sfx, &lastSfx, SFX_GENERIC_FEMALE_DEATH_1, 10); break;
 	case SOUND_PED_BULLET_HIT:
-	case SOUND_PED_DEFEND: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_INJURED_PED_FEMALE_OUCH_1, 11); break;
-	case SOUND_PED_BURNING: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_FEMALE_BURNING_1, 9); break;
-	case SOUND_PED_FLEE_SPRINT: GetPhrase(&sfx, &lastSfx, AUDIO_SAMPLE_PED_FEMALE_FLEE_SPRINT_1, 8); break;
+	case SOUND_PED_DEFEND: GetPhrase(&sfx, &lastSfx, SFX_GENERIC_FEMALE_GRUNT_1, 11); break;
+	case SOUND_PED_BURNING: GetPhrase(&sfx, &lastSfx, SFX_GENERIC_FEMALE_FIRE_1, 9); break;
+	case SOUND_PED_FLEE_SPRINT: GetPhrase(&sfx, &lastSfx, SFX_GENERIC_FEMALE_PANIC_1, 8); break;
 	default: return NO_SAMPLE;
 	}
 	return sfx;
@@ -2616,75 +2615,75 @@ cAudioManager::InitialisePoliceRadioZones()
 	}
 
 	strcpy(ZoneSfx[0].m_aName, "HOSPI_2");
-	ZoneSfx[0].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_ROCKFORD;
+	ZoneSfx[0].m_nSampleIndex = SFX_POLICE_RADIO_ROCKFORD;
 	strcpy(ZoneSfx[1].m_aName, "CONSTRU");
-	ZoneSfx[1].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_FORT_STAUNTON;
+	ZoneSfx[1].m_nSampleIndex = SFX_POLICE_RADIO_FORT_STAUNTON;
 	strcpy(ZoneSfx[2].m_aName, "STADIUM");
-	ZoneSfx[2].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_ASPATRIA;
+	ZoneSfx[2].m_nSampleIndex = SFX_POLICE_RADIO_ASPATRIA;
 	strcpy(ZoneSfx[3].m_aName, "YAKUSA");
-	ZoneSfx[3].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_TORRINGTON;
+	ZoneSfx[3].m_nSampleIndex = SFX_POLICE_RADIO_TORRINGTON;
 	strcpy(ZoneSfx[4].m_aName, "SHOPING");
-	ZoneSfx[4].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_BEDFORD_POINT;
+	ZoneSfx[4].m_nSampleIndex = SFX_POLICE_RADIO_BEDFORD_POINT;
 	strcpy(ZoneSfx[5].m_aName, "COM_EAS");
-	ZoneSfx[5].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_NEWPORT;
+	ZoneSfx[5].m_nSampleIndex = SFX_POLICE_RADIO_NEWPORT;
 	strcpy(ZoneSfx[6].m_aName, "PARK");
-	ZoneSfx[6].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_BELLEVILLE;
+	ZoneSfx[6].m_nSampleIndex = SFX_POLICE_RADIO_BELLEVILLE_PARK;
 	strcpy(ZoneSfx[7].m_aName, "UNIVERS");
-	ZoneSfx[7].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_LIBERTY_CAMPUS;
+	ZoneSfx[7].m_nSampleIndex = SFX_POLICE_RADIO_LIBERTY_CAMPUS;
 	strcpy(ZoneSfx[8].m_aName, "BIG_DAM");
-	ZoneSfx[8].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_COCHRANE;
+	ZoneSfx[8].m_nSampleIndex = SFX_POLICE_RADIO_COCHRANE_DAM;
 	strcpy(ZoneSfx[9].m_aName, "SUB_IND");
-	ZoneSfx[9].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_PIKE_CREEK;
+	ZoneSfx[9].m_nSampleIndex = SFX_POLICE_RADIO_PIKE_CREEK;
 	strcpy(ZoneSfx[10].m_aName, "SWANKS");
-	ZoneSfx[10].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_CEDAR_GROVE;
+	ZoneSfx[10].m_nSampleIndex = SFX_POLICE_RADIO_CEDAR_GROVE;
 	strcpy(ZoneSfx[11].m_aName, "PROJECT");
-	ZoneSfx[11].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_WICHITA_GARDEN;
+	ZoneSfx[11].m_nSampleIndex = SFX_POLICE_RADIO_WICHITA_GARDENS;
 	strcpy(ZoneSfx[12].m_aName, "AIRPORT");
-	ZoneSfx[12].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_FRANCIS_INTNL;
+	ZoneSfx[12].m_nSampleIndex = SFX_POLICE_RADIO_FRANCIS_INTERNATIONAL_AIRPORT;
 	strcpy(ZoneSfx[13].m_aName, "PORT_W");
-	ZoneSfx[13].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_CALLAHAN_POINT;
+	ZoneSfx[13].m_nSampleIndex = SFX_POLICE_RADIO_CALLAHAN_POINT;
 	strcpy(ZoneSfx[14].m_aName, "PORT_S");
-	ZoneSfx[14].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_ATLANTIC_QUAYS;
+	ZoneSfx[14].m_nSampleIndex = SFX_POLICE_RADIO_ATLANTIC_QUAYS;
 	strcpy(ZoneSfx[15].m_aName, "PORT_E");
-	ZoneSfx[15].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_PORTLAND_HARBOUR;
+	ZoneSfx[15].m_nSampleIndex = SFX_POLICE_RADIO_PORTLAND_HARBOUR;
 	strcpy(ZoneSfx[16].m_aName, "PORT_I");
-	ZoneSfx[16].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_TRENTON;
+	ZoneSfx[16].m_nSampleIndex = SFX_POLICE_RADIO_TRENTON;
 	strcpy(ZoneSfx[17].m_aName, "CHINA");
-	ZoneSfx[17].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_CHINATOWN;
+	ZoneSfx[17].m_nSampleIndex = SFX_POLICE_RADIO_CHINATOWN;
 	strcpy(ZoneSfx[18].m_aName, "REDLIGH");
-	ZoneSfx[18].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_REDLIGHT;
+	ZoneSfx[18].m_nSampleIndex = SFX_POLICE_RADIO_RED_LIGHT_DISTRICT;
 	strcpy(ZoneSfx[19].m_aName, "TOWERS");
-	ZoneSfx[19].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_HEPBURN_HEIGHTS;
+	ZoneSfx[19].m_nSampleIndex = SFX_POLICE_RADIO_HEPBURN_HEIGHTS;
 	strcpy(ZoneSfx[20].m_aName, "LITTLEI");
-	ZoneSfx[20].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_ST_MARKS;
+	ZoneSfx[20].m_nSampleIndex = SFX_POLICE_RADIO_SAINT_MARKS;
 	strcpy(ZoneSfx[21].m_aName, "HARWOOD");
-	ZoneSfx[21].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_HARWOOD;
+	ZoneSfx[21].m_nSampleIndex = SFX_POLICE_RADIO_HARWOOD;
 	strcpy(ZoneSfx[22].m_aName, "EASTBAY");
-	ZoneSfx[22].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_PORTLAND_BEACH;
+	ZoneSfx[22].m_nSampleIndex = SFX_POLICE_RADIO_PORTLAND_BEACH;
 	strcpy(ZoneSfx[23].m_aName, "S_VIEW");
-	ZoneSfx[23].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_PORTLAND_VIEW;
+	ZoneSfx[23].m_nSampleIndex = SFX_POLICE_RADIO_PORTLAND_STRAIGHTS;
 	strcpy(ZoneSfx[24].m_aName, "CITYZON");
-	ZoneSfx[24].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_LIBERTY_CITY;
+	ZoneSfx[24].m_nSampleIndex = SFX_POLICE_RADIO_LIBERTY_CITY;
 	strcpy(ZoneSfx[25].m_aName, "IND_ZON");
-	ZoneSfx[25].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_PORTLAND;
+	ZoneSfx[25].m_nSampleIndex = SFX_POLICE_RADIO_PORTLAND;
 	strcpy(ZoneSfx[26].m_aName, "COM_ZON");
-	ZoneSfx[26].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_STAUNTON;
+	ZoneSfx[26].m_nSampleIndex = SFX_POLICE_RADIO_STAUNTON_ISLAND;
 	strcpy(ZoneSfx[27].m_aName, "SUB_ZON");
-	ZoneSfx[27].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_SHORESIDE;
+	ZoneSfx[27].m_nSampleIndex = SFX_POLICE_RADIO_SHORESIDE_VALE;
 	strcpy(ZoneSfx[28].m_aName, "SUB_ZO2");
-	ZoneSfx[28].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_SHORESIDE;
+	ZoneSfx[28].m_nSampleIndex = SFX_POLICE_RADIO_SHORESIDE_VALE;
 	strcpy(ZoneSfx[29].m_aName, "SUB_ZO3");
-	ZoneSfx[29].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_SHORESIDE;
+	ZoneSfx[29].m_nSampleIndex = SFX_POLICE_RADIO_SHORESIDE_VALE;
 	strcpy(ZoneSfx[30].m_aName, "A");
-	ZoneSfx[30].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_ROCKFORD;
+	ZoneSfx[30].m_nSampleIndex = SFX_POLICE_RADIO_ROCKFORD;
 	strcpy(ZoneSfx[31].m_aName, "A");
-	ZoneSfx[31].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_ROCKFORD;
+	ZoneSfx[31].m_nSampleIndex = SFX_POLICE_RADIO_ROCKFORD;
 	strcpy(ZoneSfx[32].m_aName, "A");
-	ZoneSfx[32].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_ROCKFORD;
+	ZoneSfx[32].m_nSampleIndex = SFX_POLICE_RADIO_ROCKFORD;
 	strcpy(ZoneSfx[33].m_aName, "A");
-	ZoneSfx[33].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_ROCKFORD;
+	ZoneSfx[33].m_nSampleIndex = SFX_POLICE_RADIO_ROCKFORD;
 	strcpy(ZoneSfx[34].m_aName, "A");
-	ZoneSfx[34].m_nSampleIndex = AUDIO_SAMPLE_POLICE_SCANNER_ZONE_ROCKFORD;
+	ZoneSfx[34].m_nSampleIndex = SFX_POLICE_RADIO_ROCKFORD;
 	strcpy(SubZo2Label, "SUB_ZO2");
 	strcpy(SubZo3Label, "SUB_ZO3");
 }
@@ -2837,34 +2836,34 @@ cAudioManager::PlaySuspectLastSeen(float x, float y, float z)
 					if(policeChannelTimer != 60) {
 						crimesSamples[policeChannelTimerSeconds] =
 						    m_anRandomTable[4] % 3 +
-						    AUDIO_SAMPLE_POLICE_SCANNER_SMALL_CRACKLE_1;
+						    SFX_POLICE_RADIO_MESSAGE_NOISE_1;
 						++policeChannelTimer;
 						policeChannelTimerSeconds = (policeChannelTimerSeconds + 1) % 60;
 					}
 					if(policeChannelTimer != 60) {
 						crimesSamples[policeChannelTimerSeconds] =
-						    AUDIO_SAMPLE_POLICE_SCANNER_SUSPECT;
+						    SFX_POLICE_RADIO_SUSPECT;
 						++policeChannelTimer;
 						policeChannelTimerSeconds = (policeChannelTimerSeconds + 1) % 60;
 					}
 					if(policeChannelTimer != 60) {
 						crimesSamples[policeChannelTimerSeconds] =
-						    AUDIO_SAMPLE_POLICE_SCANNER_LAST_SEEN;
+						    SFX_POLICE_RADIO_LAST_SEEN;
 						++policeChannelTimer;
 						policeChannelTimerSeconds = (policeChannelTimerSeconds + 1) % 60;
 					}
 					if(policeChannelTimer != 60) {
 						crimesSamples[policeChannelTimerSeconds] =
-						    AUDIO_SAMPLE_POLICE_SCANNER_IN;
+						    SFX_IN;
 						++policeChannelTimer;
 						policeChannelTimerSeconds = (policeChannelTimerSeconds + 1) % 60;
 					}
-					if(sample == AUDIO_SAMPLE_POLICE_SCANNER_ZONE_SHORESIDE &&
+					if(sample == SFX_POLICE_RADIO_SHORESIDE_VALE &&
 					   (strcmp(zone->name, SubZo2Label) == 0 ||
 					    strcmp(zone->name, SubZo3Label) == 0)) {
 						if(policeChannelTimer != 60) {
 							crimesSamples[policeChannelTimerSeconds] =
-							    AUDIO_SAMPLE_POLICE_SCANNER_NORTH;
+							    SFX_NORTH;
 							++policeChannelTimer;
 							policeChannelTimerSeconds =
 							    (policeChannelTimerSeconds + 1) % 60;
@@ -2874,7 +2873,7 @@ cAudioManager::PlaySuspectLastSeen(float x, float y, float z)
 							return;
 						}
 						crimesSamples[policeChannelTimerSeconds] =
-						    AUDIO_SAMPLE_POLICE_SCANNER_EAST;
+						    SFX_EAST;
 						++policeChannelTimer;
 						policeChannelTimerSeconds = (policeChannelTimerSeconds + 1) % 60;
 					}
@@ -2888,7 +2887,7 @@ cAudioManager::PlaySuspectLastSeen(float x, float y, float z)
 						if(halfY - quarterY > vec.y) {
 							if(policeChannelTimer != 60) {
 								crimesSamples[policeChannelTimerSeconds] =
-								    AUDIO_SAMPLE_POLICE_SCANNER_SOUTH;
+								    SFX_SOUTH;
 								++policeChannelTimer;
 								policeChannelTimerSeconds =
 								    (policeChannelTimerSeconds + 1) % 60;
@@ -2897,7 +2896,7 @@ cAudioManager::PlaySuspectLastSeen(float x, float y, float z)
 						}
 					} else if(policeChannelTimer != 60) {
 						crimesSamples[policeChannelTimerSeconds] =
-						    AUDIO_SAMPLE_POLICE_SCANNER_NORTH;
+						    SFX_NORTH;
 						++policeChannelTimer;
 						policeChannelTimerSeconds = (policeChannelTimerSeconds + 1) % 60;
 						processed = 1;
@@ -2915,7 +2914,7 @@ cAudioManager::PlaySuspectLastSeen(float x, float y, float z)
 								if(policeChannelTimer != 60) {
 									crimesSamples[policeChannelTimerSeconds] =
 									    m_anRandomTable[2] % 3 +
-									    AUDIO_SAMPLE_POLICE_SCANNER_SMALL_CRACKLE_1;
+									    SFX_POLICE_RADIO_MESSAGE_NOISE_1;
 									++policeChannelTimer;
 									policeChannelTimerSeconds =
 									    (policeChannelTimerSeconds + 1) % 60;
@@ -2931,21 +2930,21 @@ cAudioManager::PlaySuspectLastSeen(float x, float y, float z)
 								return;
 							}
 							crimesSamples[policeChannelTimerSeconds] =
-							    AUDIO_SAMPLE_POLICE_SCANNER_CENTRAL;
+							    SFX_CENTRAL;
 							++policeChannelTimer;
 							policeChannelTimerSeconds =
 							    (policeChannelTimerSeconds + 1) % 60;
 						}
 						if(policeChannelTimer != 60) {
 							crimesSamples[policeChannelTimerSeconds] =
-							    AUDIO_SAMPLE_POLICE_SCANNER_WEST;
+							    SFX_WEST;
 							++policeChannelTimer;
 							policeChannelTimerSeconds =
 							    (policeChannelTimerSeconds + 1) % 60;
 						}
 					} else if(policeChannelTimer != 60) {
 						crimesSamples[policeChannelTimerSeconds] =
-						    AUDIO_SAMPLE_POLICE_SCANNER_EAST;
+						    SFX_EAST;
 						++policeChannelTimer;
 						policeChannelTimerSeconds = (policeChannelTimerSeconds + 1) % 60;
 					}
@@ -2957,7 +2956,7 @@ cAudioManager::PlaySuspectLastSeen(float x, float y, float z)
 					if(policeChannelTimer != 60) {
 						crimesSamples[policeChannelTimerSeconds] =
 						    m_anRandomTable[2] % 3 +
-						    AUDIO_SAMPLE_POLICE_SCANNER_SMALL_CRACKLE_1;
+						    SFX_POLICE_RADIO_MESSAGE_NOISE_1;
 						++policeChannelTimer;
 						policeChannelTimerSeconds = (policeChannelTimerSeconds + 1) % 60;
 					}
@@ -3030,8 +3029,8 @@ cAudioManager::PostTerminateGameSpecificShutdown()
 void
 cAudioManager::PreInitialiseGameSpecificSetup() const
 {
-	BankStartOffset[0] = AUDIO_SAMPLE_VEHICLE_HORN_0;
-	BankStartOffset[1] = AUDIO_SAMPLE_POLICE_COP_1_ARREST_1;
+	BankStartOffset[0] = SFX_CAR_HORN_JEEP;
+	BankStartOffset[1] = SFX_COP_VOICE_1_ARREST_1;
 }
 
 WRAPPER
@@ -3100,8 +3099,8 @@ cAudioManager::ProcessAirBrakes(cVehicleParams *params)
 	m_sQueueSample.m_bVolume = ComputeVolume(rand, 30.0f, m_sQueueSample.m_fDistance);
 	if(m_sQueueSample.m_bVolume) {
 		m_sQueueSample.m_counter = 13;
-		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_VEHICLE_AIR_BRAKES;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_VEHICLE_AIR_BRAKES);
+		m_sQueueSample.m_nSampleIndex = SFX_AIR_BRAKES;
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_AIR_BRAKES);
 		m_sQueueSample.m_nFrequency += RandomDisplacement(m_sQueueSample.m_nFrequency >> 4);
 		m_sQueueSample.m_bBankIndex = 0;
 		m_sQueueSample.m_bIsDistant = 0;
@@ -3149,7 +3148,7 @@ cAudioManager::ProcessAirportScriptObject(uint8 sound)
 			m_sQueueSample.m_bVolume =
 			    ComputeVolume(110, m_sQueueSample.m_fSoundIntensity, m_sQueueSample.m_fDistance);
 			if(m_sQueueSample.m_bVolume) {
-				m_sQueueSample.m_nSampleIndex = (m_anRandomTable[1] & 3) + AUDIO_SAMPLE_AIRPORT_1;
+				m_sQueueSample.m_nSampleIndex = (m_anRandomTable[1] & 3) + SFX_AIRPORT_ANNOUNCEMENT_1;
 				m_sQueueSample.m_bBankIndex = 0;
 				m_sQueueSample.m_nFrequency =
 				    SampleManager.GetSampleBaseFrequency(m_sQueueSample.m_nSampleIndex);
@@ -3191,7 +3190,7 @@ cAudioManager::ProcessBoatEngine(cVehicleParams *params)
 			m_sQueueSample.m_bVolume = ComputeVolume(80, 50.f, m_sQueueSample.m_fDistance);
 			if(m_sQueueSample.m_bVolume) {
 				m_sQueueSample.m_counter = 39;
-				m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_MOTOR;
+				m_sQueueSample.m_nSampleIndex = SFX_FISHING_BOAT_IDLE;
 				m_sQueueSample.m_nFrequency = 10386;
 				m_sQueueSample.m_nFrequency += (m_sQueueSample.m_nEntityIndex << 16) % 1000;
 				m_sQueueSample.m_bBankIndex = 0;
@@ -3236,7 +3235,7 @@ cAudioManager::ProcessBoatEngine(cVehicleParams *params)
 			m_sQueueSample.m_bVolume = ComputeVolume(emittingVol, 50.f, m_sQueueSample.m_fDistance);
 			if(!m_sQueueSample.m_bVolume) return 1;
 			m_sQueueSample.m_counter = 40;
-			m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_BOAT_ENGINE;
+			m_sQueueSample.m_nSampleIndex = SFX_POLICE_BOAT_ACCEL;
 			m_sQueueSample.m_nFrequency += (m_sQueueSample.m_nEntityIndex << 16) % 1000;
 			m_sQueueSample.m_bBankIndex = 0;
 			m_sQueueSample.m_bIsDistant = 0;
@@ -3262,7 +3261,7 @@ cAudioManager::ProcessBoatEngine(cVehicleParams *params)
 					emittingVol = 45 - 45 * padAccelerate / 40;
 					m_sQueueSample.m_nFrequency = 100 * padAccelerate + 11025;
 					m_sQueueSample.m_counter = 39;
-					m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_BOAT_ENGINE_IDLE;
+					m_sQueueSample.m_nSampleIndex = SFX_POLICE_BOAT_IDLE;
 					if(LastAccel > 20) {
 						oneShotVol = LastVol;
 						PlayOneShot(m_sQueueSample.m_nEntityIndex, SOUND_17, oneShotVol);
@@ -3273,7 +3272,7 @@ cAudioManager::ProcessBoatEngine(cVehicleParams *params)
 					if(!boat->m_bIsAnchored)
 						m_sQueueSample.m_nFrequency = 11 * m_sQueueSample.m_nFrequency / 10;
 					m_sQueueSample.m_counter = 40;
-					m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_BOAT_ENGINE;
+					m_sQueueSample.m_nSampleIndex = SFX_POLICE_BOAT_ACCEL;
 				}
 				LastVol = emittingVol;
 				LastAccel = padAccelerate;
@@ -3283,14 +3282,14 @@ cAudioManager::ProcessBoatEngine(cVehicleParams *params)
 					m_sQueueSample.m_nFrequency = 11025;
 					emittingVol = 45;
 					m_sQueueSample.m_counter = 39;
-					m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_BOAT_ENGINE_IDLE;
+					m_sQueueSample.m_nSampleIndex = SFX_POLICE_BOAT_IDLE;
 				} else {
 					emittingVol = (105.f * gasPedal) + 15;
 					m_sQueueSample.m_nFrequency = (4000.f * gasPedal) + 8000;
 					if(!boat->m_bIsAnchored)
 						m_sQueueSample.m_nFrequency = 11 * m_sQueueSample.m_nFrequency / 10;
 					m_sQueueSample.m_counter = 40;
-					m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_BOAT_ENGINE;
+					m_sQueueSample.m_nSampleIndex = SFX_POLICE_BOAT_ACCEL;
 				}
 			}
 			CalculateDistance((bool *)params, params->m_fDistance);
@@ -3337,7 +3336,7 @@ cAudioManager::ProcessBoatMovingOverWater(cVehicleParams *params)
 	m_sQueueSample.m_bVolume = ComputeVolume(vol, 50.f, m_sQueueSample.m_fDistance);
 	if(m_sQueueSample.m_bVolume) {
 		m_sQueueSample.m_counter = 38;
-		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_LOOPING_WATER;
+		m_sQueueSample.m_nSampleIndex = SFX_BOAT_WATER_LOOP;
 		m_sQueueSample.m_bBankIndex = 0;
 		m_sQueueSample.m_bIsDistant = 0;
 		m_sQueueSample.field_16 = 3;
@@ -3392,7 +3391,7 @@ cAudioManager::ProcessBridgeMotor()
 		m_sQueueSample.m_bVolume = ComputeVolume(maxVolume, 400.f, m_sQueueSample.m_fDistance);
 		if(m_sQueueSample.m_bVolume) {
 			m_sQueueSample.m_counter = 1;
-			m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_MOTOR;
+			m_sQueueSample.m_nSampleIndex = SFX_FISHING_BOAT_IDLE;
 			m_sQueueSample.m_bBankIndex = 0;
 			m_sQueueSample.m_bIsDistant = 0;
 			m_sQueueSample.field_16 = 1;
@@ -3419,21 +3418,21 @@ cAudioManager::ProcessBridgeOneShots()
 
 	if(CBridge::State == STATE_LIFT_PART_IS_UP && CBridge::OldState == STATE_LIFT_PART_MOVING_UP) {
 		maxDist = 400.f;
-		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_COLLISION_METAL_27;
+		m_sQueueSample.m_nSampleIndex = SFX_COL_CONTAINER_1;
 	} else {
 		if(CBridge::State == STATE_LIFT_PART_IS_DOWN && CBridge::OldState == STATE_LIFT_PART_MOVING_DOWN) {
 			maxDist = 400.f;
-			m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_COLLISION_METAL_27;
+			m_sQueueSample.m_nSampleIndex = SFX_COL_CONTAINER_1;
 		} else {
 			if(CBridge::State == STATE_LIFT_PART_MOVING_UP &&
 			   CBridge::OldState == STATE_LIFT_PART_ABOUT_TO_MOVE_UP) {
 				maxDist = 400.f;
-				m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_COLLISION_METAL_27;
+				m_sQueueSample.m_nSampleIndex = SFX_COL_CONTAINER_1;
 			} else {
 				if(CBridge::State == STATE_LIFT_PART_MOVING_DOWN &&
 				   CBridge::OldState == STATE_LIFT_PART_IS_UP) {
 					maxDist = 400.f;
-					m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_COLLISION_METAL_27;
+					m_sQueueSample.m_nSampleIndex = SFX_COL_CONTAINER_1;
 				} else
 					return;
 			}
@@ -3473,7 +3472,7 @@ cAudioManager::ProcessBridgeWarning()
 			m_sQueueSample.m_bBankIndex = 0;
 			m_sQueueSample.m_bIsDistant = 0;
 			m_sQueueSample.field_16 = 1;
-			m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_BRIDGE_WARNING);
+			m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_BRIDGE_OPEN_WARNING);
 			m_sQueueSample.m_nLoopCount = 0;
 			m_sQueueSample.m_bEmittingVolume = 100;
 			m_sQueueSample.m_nLoopStart =
@@ -3502,11 +3501,11 @@ cAudioManager::ProcessCarBombTick(cVehicleParams *params)
 		m_sQueueSample.m_bVolume = ComputeVolume(60, 40.f, m_sQueueSample.m_fDistance);
 		if(m_sQueueSample.m_bVolume) {
 			m_sQueueSample.m_counter = 35;
-			m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_CAR_BOMB_TICK;
+			m_sQueueSample.m_nSampleIndex = SFX_COUNTDOWN;
 			m_sQueueSample.m_bBankIndex = 0;
 			m_sQueueSample.m_bIsDistant = 0;
 			m_sQueueSample.field_16 = 0;
-			m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_CAR_BOMB_TICK);
+			m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_COUNTDOWN);
 			m_sQueueSample.m_nLoopCount = 0;
 			m_sQueueSample.m_bEmittingVolume = 60;
 			m_sQueueSample.m_nLoopStart =
@@ -3559,7 +3558,7 @@ cAudioManager::ProcessCinemaScriptObject(uint8 sound)
 			m_sQueueSample.m_bVolume =
 			    ComputeVolume(rand, m_sQueueSample.m_fSoundIntensity, m_sQueueSample.m_fDistance);
 			if(m_sQueueSample.m_bVolume) {
-				m_sQueueSample.m_nSampleIndex = counter % 3 + AUDIO_SAMPLE_CINEMA_1;
+				m_sQueueSample.m_nSampleIndex = counter % 3 + SFX_CINEMA_BASS_1;
 				m_sQueueSample.m_bBankIndex = 0;
 				m_sQueueSample.m_nFrequency =
 				    SampleManager.GetSampleBaseFrequency(m_sQueueSample.m_nSampleIndex);
@@ -3619,9 +3618,9 @@ cAudioManager::ProcessDocksScriptObject(uint8 sound)
 			m_sQueueSample.m_bVolume =
 			    ComputeVolume(rand, m_sQueueSample.m_fSoundIntensity, m_sQueueSample.m_fDistance);
 			if(m_sQueueSample.m_bVolume) {
-				m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_DOCKS;
+				m_sQueueSample.m_nSampleIndex = SFX_DOCKS_FOGHORN;
 				m_sQueueSample.m_bBankIndex = 0;
-				m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_DOCKS);
+				m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_DOCKS_FOGHORN);
 				m_sQueueSample.m_nFrequency += RandomDisplacement(m_sQueueSample.m_nFrequency >> 3);
 				m_sQueueSample.m_counter = counter++;
 				m_sQueueSample.m_bIsDistant = 0;
@@ -3654,15 +3653,15 @@ cAudioManager::ProcessEngineDamage(cVehicleParams *params)
 		engineStatus = veh->Damage.GetEngineStatus();
 		if(engineStatus > 250u || engineStatus < 100) return 1;
 		if(engineStatus < 225) {
-			m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_JUMBO_TAXI_SOUND;
+			m_sQueueSample.m_nSampleIndex = SFX_JUMBO_TAXI;
 			emittingVolume = 6;
 			m_sQueueSample.field_16 = 7;
 			m_sQueueSample.m_nFrequency = 40000;
 		} else {
 			emittingVolume = 60;
-			m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_FIRE_ENTITY;
+			m_sQueueSample.m_nSampleIndex = SFX_CAR_ON_FIRE;
 			m_sQueueSample.field_16 = 7;
-			m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_FIRE_ENTITY);
+			m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_CAR_ON_FIRE);
 		}
 		CalculateDistance((bool *)params, params->m_fDistance);
 		m_sQueueSample.m_bVolume = ComputeVolume(emittingVolume, 40.f, m_sQueueSample.m_fDistance);
@@ -3784,7 +3783,7 @@ cAudioManager::ProcessExplosions(int32 explosion)
 			case EXPLOSION_TANK_GRENADE:
 				maxDist = 160000.f;
 				m_sQueueSample.m_fSoundIntensity = 400.0f;
-				m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_WEAPON_GRENADE_EXPLOSION;
+				m_sQueueSample.m_nSampleIndex = SFX_EXPLOSION_2;
 				m_sQueueSample.m_nFrequency = RandomDisplacement(2000) + 38000;
 				m_sQueueSample.field_16 = 0;
 				m_sQueueSample.m_bBankIndex = 0;
@@ -3792,7 +3791,7 @@ cAudioManager::ProcessExplosions(int32 explosion)
 			case EXPLOSION_MOLOTOV:
 				maxDist = 40000.f;
 				m_sQueueSample.m_fSoundIntensity = 200.0f;
-				m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_WEAPON_MOLOTOV_EXPLOSION;
+				m_sQueueSample.m_nSampleIndex = SFX_EXPLOSION_3;
 				m_sQueueSample.m_nFrequency = RandomDisplacement(1000) + 19000;
 				m_sQueueSample.field_16 = 0;
 				m_sQueueSample.m_bBankIndex = 0;
@@ -3801,7 +3800,7 @@ cAudioManager::ProcessExplosions(int32 explosion)
 			case EXPLOSION_HELI_BOMB:
 				maxDist = 90000.f;
 				m_sQueueSample.m_fSoundIntensity = 300.0f;
-				m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_WEAPON_ROCKET_SHOT;
+				m_sQueueSample.m_nSampleIndex = SFX_ROCKET_LEFT;
 				m_sQueueSample.m_nFrequency = RandomDisplacement(1000) + 12347;
 				m_sQueueSample.field_16 = 0;
 				m_sQueueSample.m_bBankIndex = 0;
@@ -3809,7 +3808,7 @@ cAudioManager::ProcessExplosions(int32 explosion)
 			default:
 				maxDist = 160000.f;
 				m_sQueueSample.m_fSoundIntensity = 400.0f;
-				m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_EXPLOSION_CAR;
+				m_sQueueSample.m_nSampleIndex = SFX_EXPLOSION_1;
 				m_sQueueSample.m_nFrequency = RandomDisplacement(2000) + 38000;
 				if(type == EXPLOSION_HELI)
 					m_sQueueSample.m_nFrequency = 8 * m_sQueueSample.m_nFrequency / 10;
@@ -3856,7 +3855,7 @@ cAudioManager::ProcessFireHydrant()
 		m_sQueueSample.m_bVolume = ComputeVolume(40, 35.f, m_sQueueSample.m_fDistance);
 		if(m_sQueueSample.m_bVolume) {
 			m_sQueueSample.m_counter = 0;
-			m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_JUMBO_TAXI_SOUND;
+			m_sQueueSample.m_nSampleIndex = SFX_JUMBO_TAXI;
 			m_sQueueSample.m_bBankIndex = 0;
 			m_sQueueSample.m_bIsDistant = 0;
 			m_sQueueSample.field_16 = 4;
@@ -3896,15 +3895,15 @@ cAudioManager::ProcessFrontEnd()
 		processed = 0;
 		switch(m_asAudioEntities[m_sQueueSample.m_nEntityIndex].m_awAudioEvent[i]) {
 		case SOUND_WEAPON_SNIPER_SHOT_NO_ZOOM:
-			m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_SNIPER_NO_ZOOM;
+			m_sQueueSample.m_nSampleIndex = SFX_ERROR_FIRE_RIFLE;
 			break;
 		case SOUND_WEAPON_ROCKET_SHOT_NO_ZOOM:
-			m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_ROCKET_NO_ZOOM;
+			m_sQueueSample.m_nSampleIndex = SFX_ERROR_FIRE_ROCKET_LAUNCHER;
 			break;
 		case SOUND_GARAGE_NO_MONEY:
 		case SOUND_GARAGE_BAD_VEHICLE:
 		case SOUND_3C:
-			m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_PICKUP_FAIL_1;
+			m_sQueueSample.m_nSampleIndex = SFX_PICKUP_ERROR_LEFT;
 			processed = 1;
 			break;
 		case SOUND_GARAGE_OPENING:
@@ -3920,16 +3919,16 @@ cAudioManager::ProcessFrontEnd()
 		case SOUND_PICKUP_ARMOUR:
 		case SOUND_EVIDENCE_PICKUP:
 		case SOUND_UNLOAD_GOLD:
-			m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_PICKUP_SUCCESS_1;
+			m_sQueueSample.m_nSampleIndex = SFX_PICKUP_2_LEFT;
 			processed = 1;
 			break;
 		case SOUND_PICKUP_WEAPON_BOUGHT:
 		case SOUND_PICKUP_WEAPON:
-			m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_PICKUP_NEUTRAL_1;
+			m_sQueueSample.m_nSampleIndex = SFX_PICKUP_1_LEFT;
 			processed = 1;
 			break;
 		case SOUND_4A:
-			m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_PICKUP_FAIL_1;
+			m_sQueueSample.m_nSampleIndex = SFX_PICKUP_ERROR_LEFT;
 			processed = 1;
 			break;
 		case SOUND_PICKUP_BONUS:
@@ -3938,65 +3937,65 @@ cAudioManager::ProcessFrontEnd()
 		case SOUND_PICKUP_PACMAN_PILL:
 		case SOUND_PICKUP_PACMAN_PACKAGE:
 		case SOUND_PICKUP_FLOAT_PACKAGE:
-			m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_PICKUP_SUCCESS_3;
+			m_sQueueSample.m_nSampleIndex = SFX_PICKUP_3_LEFT;
 			processed = 1;
 			break;
-		case SOUND_PAGER: m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_PAGER; break;
+		case SOUND_PAGER: m_sQueueSample.m_nSampleIndex = SFX_PAGER; break;
 		case SOUND_RACE_START_3:
 		case SOUND_RACE_START_2:
 		case SOUND_RACE_START_1:
-		case SOUND_CLOCK_TICK: m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_FRONTEND_CLOCK_TICK; break;
+		case SOUND_CLOCK_TICK: m_sQueueSample.m_nSampleIndex = SFX_TIMER_BEEP; break;
 		case SOUND_RACE_START_GO:
-			m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_FRONTEND_PART_MISSION_COMPLETED;
+			m_sQueueSample.m_nSampleIndex = SFX_PART_MISSION_COMPLETE;
 			break;
 		case SOUND_PART_MISSION_COMPLETE:
-			m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_FRONTEND_PART_MISSION_COMPLETED;
+			m_sQueueSample.m_nSampleIndex = SFX_PART_MISSION_COMPLETE;
 			break;
 		case SOUND_FRONTEND_MENU_STARTING:
 			processed = 1;
-			m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_FRONTEND_MENU_STARTING_1;
+			m_sQueueSample.m_nSampleIndex = SFX_START_BUTTON_LEFT;
 			break;
 		case SOUND_FRONTEND_MENU_COMPLETED:
 			processed = 1;
-			m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_FRONTEND_MENU_COMPLETED_1;
+			m_sQueueSample.m_nSampleIndex = SFX_PAGE_CHANGE_AND_BACK_LEFT;
 			break;
 		case SOUND_FRONTEND_MENU_DENIED:
 			processed = 1;
-			m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_FRONTEND_MENU_DENIED_1;
+			m_sQueueSample.m_nSampleIndex = SFX_HIGHLIGHT_LEFT;
 			break;
 		case SOUND_FRONTEND_MENU_SUCCESS:
 			processed = 1;
-			m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_FRONTEND_MENU_SUCCESS_1;
+			m_sQueueSample.m_nSampleIndex = SFX_SELECT_LEFT;
 			break;
 		case SOUND_FRONTEND_EXIT:
 			processed = 1;
-			m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_FRONTEND_MENU_EXIT_1;
+			m_sQueueSample.m_nSampleIndex = SFX_SUB_MENU_BACK_LEFT;
 			break;
 		case SOUND_9A:
 			processed = 1;
-			m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_380;
+			m_sQueueSample.m_nSampleIndex = SFX_STEREO_LEFT;
 			break;
-		case SOUND_9B: m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_382; break;
+		case SOUND_9B: m_sQueueSample.m_nSampleIndex = SFX_MONO; break;
 		case SOUND_FRONTEND_AUDIO_TEST:
 			m_sQueueSample.m_nSampleIndex =
-			    m_anRandomTable[0] % 3 + AUDIO_SAMPLE_FRONTEND_MENU_AUDIO_TEST_1;
+			    m_anRandomTable[0] % 3 + SFX_NOISE_BURST_1;
 			break;
 		case SOUND_FRONTEND_FAIL:
 			processed = 1;
-			m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_FRONTEND_MENU_FAIL_1;
+			m_sQueueSample.m_nSampleIndex = SFX_ERROR_LEFT;
 			break;
 		case SOUND_FRONTEND_NO_RADIO:
 		case SOUND_FRONTEND_RADIO_CHANGE:
-			m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_FRONTEND_GAMEPLAY_FAIL;
+			m_sQueueSample.m_nSampleIndex = SFX_RADIO_CLICK;
 			break;
-		case SOUND_A0: m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_FRONTEND_GAMEPLAY_SUCCESS; break;
+		case SOUND_A0: m_sQueueSample.m_nSampleIndex = SFX_INFO; break;
 		default: continue;
 		}
 
 		sample = m_asAudioEntities[m_sQueueSample.m_nEntityIndex].m_awAudioEvent[i];
-		if(sample == AUDIO_SAMPLE_COLLISION_LOOPING_GRASS) {
+		if(sample == SFX_RAIN) {
 			m_sQueueSample.m_nFrequency = 28509;
-		} else if(sample == AUDIO_SAMPLE_PICKUP_NEUTRAL_1) {
+		} else if(sample == SFX_PICKUP_1_LEFT) {
 			if(1.f == m_asAudioEntities[m_sQueueSample.m_nEntityIndex].m_afVolume[i])
 				m_sQueueSample.m_nFrequency = 32000;
 			else
@@ -4073,7 +4072,7 @@ cAudioManager::ProcessHelicopter(cVehicleParams *params)
 		    ComputeVolume(emittingVol, gHeliSfxRanges[i].m_fMaxDistance, m_sQueueSample.m_fDistance);
 		if(m_sQueueSample.m_bVolume) {
 			m_sQueueSample.m_counter = i + 65;
-			m_sQueueSample.m_nSampleIndex = i + AUDIO_SAMPLE_HELI_FAR;
+			m_sQueueSample.m_nSampleIndex = i + SFX_HELI_1;
 			m_sQueueSample.m_bBankIndex = 0;
 			m_sQueueSample.m_bIsDistant = 0;
 			m_sQueueSample.field_16 = 0;
@@ -4126,7 +4125,7 @@ cAudioManager::ProcessHomeScriptObject(uint8 sound)
 			m_sQueueSample.m_bVolume =
 			    ComputeVolume(rand, m_sQueueSample.m_fSoundIntensity, m_sQueueSample.m_fDistance);
 			if(m_sQueueSample.m_bVolume) {
-				m_sQueueSample.m_nSampleIndex = m_anRandomTable[0] % 5 + AUDIO_SAMPLE_HOME_1;
+				m_sQueueSample.m_nSampleIndex = m_anRandomTable[0] % 5 + SFX_HOME_1;
 				m_sQueueSample.m_bBankIndex = 0;
 				m_sQueueSample.m_nFrequency =
 				    SampleManager.GetSampleBaseFrequency(m_sQueueSample.m_nSampleIndex);
@@ -4280,9 +4279,9 @@ cAudioManager::ProcessLaunderetteScriptObject(uint8 sound)
 		m_sQueueSample.m_bVolume =
 		    ComputeVolume(45, m_sQueueSample.m_fSoundIntensity, m_sQueueSample.m_fDistance);
 		if(m_sQueueSample.m_bVolume) {
-			m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_LAUNDERETTE_1;
+			m_sQueueSample.m_nSampleIndex = SFX_LAUNDERETTE_LOOP;
 			m_sQueueSample.m_bBankIndex = 0;
-			m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_LAUNDERETTE_1);
+			m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_LAUNDERETTE_LOOP);
 			m_sQueueSample.m_counter = 0;
 			m_sQueueSample.m_bIsDistant = 0;
 			m_sQueueSample.m_nLoopCount = 0;
@@ -4300,9 +4299,9 @@ cAudioManager::ProcessLaunderetteScriptObject(uint8 sound)
 		m_sQueueSample.m_bVolume =
 		    ComputeVolume(110, m_sQueueSample.m_fSoundIntensity, m_sQueueSample.m_fDistance);
 		if(m_sQueueSample.m_bVolume) {
-			m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_LAUNDERETTE_2;
+			m_sQueueSample.m_nSampleIndex = SFX_LAUNDERETTE_SONG_LOOP;
 			m_sQueueSample.m_bBankIndex = 0;
-			m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_LAUNDERETTE_2);
+			m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_LAUNDERETTE_SONG_LOOP);
 			m_sQueueSample.m_counter = 1;
 			m_sQueueSample.m_bIsDistant = 0;
 			m_sQueueSample.m_nLoopCount = 0;
@@ -4331,10 +4330,10 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 	case SCRIPT_SOUND_PARTY_1_LOOP_S:
 		maxDist = 900.f;
 		m_sQueueSample.m_fSoundIntensity = 30.0f;
-		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_PARTY_1;
+		m_sQueueSample.m_nSampleIndex = SFX_CLUB_1;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = maxVolume;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_PARTY_1);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_CLUB_1);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -4342,10 +4341,10 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 	case SCRIPT_SOUND_PARTY_1_LOOP_L:
 		maxDist = 6400.f;
 		m_sQueueSample.m_fSoundIntensity = 80.0f;
-		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_PARTY_1;
+		m_sQueueSample.m_nSampleIndex = SFX_CLUB_1;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = maxVolume;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_PARTY_1);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_CLUB_1);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -4353,10 +4352,10 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 	case SCRIPT_SOUND_PARTY_2_LOOP_S:
 		maxDist = 900.f;
 		m_sQueueSample.m_fSoundIntensity = 30.0f;
-		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_PARTY_2;
+		m_sQueueSample.m_nSampleIndex = SFX_CLUB_2;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = maxVolume;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_PARTY_2);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_CLUB_2);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -4364,10 +4363,10 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 	case SCRIPT_SOUND_PARTY_2_LOOP_L:
 		maxDist = 6400.f;
 		m_sQueueSample.m_fSoundIntensity = 80.0f;
-		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_PARTY_2;
+		m_sQueueSample.m_nSampleIndex = SFX_CLUB_2;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = maxVolume;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_PARTY_2);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_CLUB_2);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -4375,10 +4374,10 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 	case SCRIPT_SOUND_PARTY_3_LOOP_S:
 		maxDist = 900.f;
 		m_sQueueSample.m_fSoundIntensity = 30.0f;
-		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_PARTY_3;
+		m_sQueueSample.m_nSampleIndex = SFX_CLUB_3;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = maxVolume;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_PARTY_3);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_CLUB_3);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -4386,10 +4385,10 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 	case SCRIPT_SOUND_PARTY_3_LOOP_L:
 		maxDist = 6400.f;
 		m_sQueueSample.m_fSoundIntensity = 80.0f;
-		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_PARTY_3;
+		m_sQueueSample.m_nSampleIndex = SFX_CLUB_3;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = maxVolume;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_PARTY_3);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_CLUB_3);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -4397,10 +4396,10 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 	case SCRIPT_SOUND_PARTY_4_LOOP_S:
 		maxDist = 900.f;
 		m_sQueueSample.m_fSoundIntensity = 30.0f;
-		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_PARTY_4;
+		m_sQueueSample.m_nSampleIndex = SFX_CLUB_4;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = maxVolume;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_PARTY_4);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_CLUB_4);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -4408,10 +4407,10 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 	case SCRIPT_SOUND_PARTY_4_LOOP_L:
 		maxDist = 6400.f;
 		m_sQueueSample.m_fSoundIntensity = 80.0f;
-		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_PARTY_4;
+		m_sQueueSample.m_nSampleIndex = SFX_CLUB_4;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = maxVolume;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_PARTY_4);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_CLUB_4);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -4419,10 +4418,10 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 	case SCRIPT_SOUND_PARTY_5_LOOP_S:
 		maxDist = 900.f;
 		m_sQueueSample.m_fSoundIntensity = 30.0f;
-		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_PARTY_5;
+		m_sQueueSample.m_nSampleIndex = SFX_CLUB_5;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = maxVolume;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_PARTY_5);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_CLUB_5);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -4430,10 +4429,10 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 	case SCRIPT_SOUND_PARTY_5_LOOP_L:
 		maxDist = 6400.f;
 		m_sQueueSample.m_fSoundIntensity = 80.0f;
-		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_PARTY_5;
+		m_sQueueSample.m_nSampleIndex = SFX_CLUB_5;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = maxVolume;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_PARTY_5);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_CLUB_5);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -4441,10 +4440,10 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 	case SCRIPT_SOUND_PARTY_6_LOOP_S:
 		maxDist = 900.f;
 		m_sQueueSample.m_fSoundIntensity = 30.0f;
-		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_PARTY_6;
+		m_sQueueSample.m_nSampleIndex = SFX_CLUB_6;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = maxVolume;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_PARTY_6);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_CLUB_6);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -4452,10 +4451,10 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 	case SCRIPT_SOUND_PARTY_6_LOOP_L:
 		maxDist = 6400.f;
 		m_sQueueSample.m_fSoundIntensity = 80.0f;
-		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_PARTY_6;
+		m_sQueueSample.m_nSampleIndex = SFX_CLUB_6;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = maxVolume;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_PARTY_6);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_CLUB_6);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -4463,10 +4462,10 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 	case SCRIPT_SOUND_PARTY_7_LOOP_S:
 		maxDist = 900.f;
 		m_sQueueSample.m_fSoundIntensity = 30.0f;
-		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_PARTY_7;
+		m_sQueueSample.m_nSampleIndex = SFX_CLUB_7;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = maxVolume;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_PARTY_7);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_CLUB_7);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -4474,10 +4473,10 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 	case SCRIPT_SOUND_PARTY_7_LOOP_L:
 		maxDist = 6400.f;
 		m_sQueueSample.m_fSoundIntensity = 80.0f;
-		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_PARTY_7;
+		m_sQueueSample.m_nSampleIndex = SFX_CLUB_7;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = maxVolume;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_PARTY_7);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_CLUB_7);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -4485,10 +4484,10 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 	case SCRIPT_SOUND_PARTY_8_LOOP_S:
 		maxDist = 900.f;
 		m_sQueueSample.m_fSoundIntensity = 30.0f;
-		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_PARTY_8;
+		m_sQueueSample.m_nSampleIndex = SFX_CLUB_8;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = maxVolume;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_PARTY_8);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_CLUB_8);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -4496,10 +4495,10 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 	case SCRIPT_SOUND_PARTY_8_LOOP_L:
 		maxDist = 6400.f;
 		m_sQueueSample.m_fSoundIntensity = 80.0f;
-		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_PARTY_8;
+		m_sQueueSample.m_nSampleIndex = SFX_CLUB_8;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = maxVolume;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_PARTY_8);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_CLUB_8);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -4507,10 +4506,10 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 	case SCRIPT_SOUND_PARTY_9_LOOP_S:
 		maxDist = 900.f;
 		m_sQueueSample.m_fSoundIntensity = 30.0f;
-		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_PARTY_9;
+		m_sQueueSample.m_nSampleIndex = SFX_CLUB_9;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = maxVolume;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_PARTY_9);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_CLUB_9);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -4518,10 +4517,10 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 	case SCRIPT_SOUND_PARTY_9_LOOP_L:
 		maxDist = 6400.f;
 		m_sQueueSample.m_fSoundIntensity = 80.0f;
-		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_PARTY_9;
+		m_sQueueSample.m_nSampleIndex = SFX_CLUB_9;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = maxVolume;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_PARTY_9);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_CLUB_9);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -4529,10 +4528,10 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 	case SCRIPT_SOUND_PARTY_10_LOOP_S:
 		maxDist = 900.f;
 		m_sQueueSample.m_fSoundIntensity = 30.0f;
-		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_PARTY_10;
+		m_sQueueSample.m_nSampleIndex = SFX_CLUB_10;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = maxVolume;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_PARTY_10);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_CLUB_10);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -4540,10 +4539,10 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 	case SCRIPT_SOUND_PARTY_10_LOOP_L:
 		maxDist = 6400.f;
 		m_sQueueSample.m_fSoundIntensity = 80.0f;
-		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_PARTY_10;
+		m_sQueueSample.m_nSampleIndex = SFX_CLUB_10;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = maxVolume;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_PARTY_10);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_CLUB_10);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -4551,10 +4550,10 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 	case SCRIPT_SOUND_PARTY_11_LOOP_S:
 		maxDist = 900.f;
 		m_sQueueSample.m_fSoundIntensity = 30.0f;
-		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_PARTY_11;
+		m_sQueueSample.m_nSampleIndex = SFX_CLUB_11;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = maxVolume;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_PARTY_11);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_CLUB_11);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -4562,10 +4561,10 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 	case SCRIPT_SOUND_PARTY_11_LOOP_L:
 		maxDist = 6400.f;
 		m_sQueueSample.m_fSoundIntensity = 80.0f;
-		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_PARTY_11;
+		m_sQueueSample.m_nSampleIndex = SFX_CLUB_11;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = maxVolume;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_PARTY_11);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_CLUB_11);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -4573,10 +4572,10 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 	case SCRIPT_SOUND_PARTY_12_LOOP_S:
 		maxDist = 900.f;
 		m_sQueueSample.m_fSoundIntensity = 30.0f;
-		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_PARTY_12;
+		m_sQueueSample.m_nSampleIndex = SFX_CLUB_12;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = maxVolume;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_PARTY_12);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_CLUB_12);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -4584,10 +4583,10 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 	case SCRIPT_SOUND_PARTY_12_LOOP_L:
 		maxDist = 6400.f;
 		m_sQueueSample.m_fSoundIntensity = 80.0f;
-		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_PARTY_12;
+		m_sQueueSample.m_nSampleIndex = SFX_CLUB_12;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = maxVolume;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_PARTY_12);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_CLUB_12);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -4595,10 +4594,10 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 	case SCRIPT_SOUND_PARTY_13_LOOP_S:
 		maxDist = 900.f;
 		m_sQueueSample.m_fSoundIntensity = 30.0f;
-		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_PARTY_13;
+		m_sQueueSample.m_nSampleIndex = SFX_CLUB_RAGGA;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = maxVolume;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_PARTY_13);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_CLUB_RAGGA);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -4606,10 +4605,10 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 	case SCRIPT_SOUND_PARTY_13_LOOP_L:
 		maxDist = 6400.f;
 		m_sQueueSample.m_fSoundIntensity = 80.0f;
-		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_PARTY_13;
+		m_sQueueSample.m_nSampleIndex = SFX_CLUB_RAGGA;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = maxVolume;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_PARTY_13);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_CLUB_RAGGA);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -4617,10 +4616,10 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 	case SCRIPT_SOUND_STRIP_CLUB_LOOP_1_S:
 		maxDist = 900.f;
 		m_sQueueSample.m_fSoundIntensity = 30.0f;
-		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_STRIP_CLUB_1;
+		m_sQueueSample.m_nSampleIndex = SFX_STRIP_CLUB_1;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = maxVolume;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_STRIP_CLUB_1);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_STRIP_CLUB_1);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -4628,10 +4627,10 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 	case SCRIPT_SOUND_STRIP_CLUB_LOOP_1_L:
 		maxDist = 6400.f;
 		m_sQueueSample.m_fSoundIntensity = 80.0f;
-		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_STRIP_CLUB_1;
+		m_sQueueSample.m_nSampleIndex = SFX_STRIP_CLUB_1;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = maxVolume;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_STRIP_CLUB_1);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_STRIP_CLUB_1);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -4639,10 +4638,10 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 	case SCRIPT_SOUND_STRIP_CLUB_LOOP_2_S:
 		maxDist = 900.f;
 		m_sQueueSample.m_fSoundIntensity = 30.0f;
-		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_STRIP_CLUB_2;
+		m_sQueueSample.m_nSampleIndex = SFX_STRIP_CLUB_2;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = maxVolume;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_STRIP_CLUB_2);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_STRIP_CLUB_2);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -4650,10 +4649,10 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 	case SCRIPT_SOUND_STRIP_CLUB_LOOP_2_L:
 		maxDist = 6400.f;
 		m_sQueueSample.m_fSoundIntensity = 80.0f;
-		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_STRIP_CLUB_2;
+		m_sQueueSample.m_nSampleIndex = SFX_STRIP_CLUB_2;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = maxVolume;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_STRIP_CLUB_2);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_STRIP_CLUB_2);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -4665,10 +4664,10 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 	case SCRIPT_SOUND_38:
 		maxDist = 900.f;
 		m_sQueueSample.m_fSoundIntensity = 30.0f;
-		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_409;
+		m_sQueueSample.m_nSampleIndex = SFX_DOG_FOOD_FACTORY;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = 110;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_409);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_DOG_FOOD_FACTORY);
 		m_sQueueSample.field_16 = 6;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -4676,10 +4675,10 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 	case SCRIPT_SOUND_39:
 		maxDist = 6400.f;
 		m_sQueueSample.m_fSoundIntensity = 80.0f;
-		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_409;
+		m_sQueueSample.m_nSampleIndex = SFX_DOG_FOOD_FACTORY;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = 110;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_409);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_DOG_FOOD_FACTORY);
 		m_sQueueSample.field_16 = 6;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -4689,10 +4688,10 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 	case SCRIPT_SOUND_CHINATOWN_RESTAURANT_S:
 		maxDist = 900.f;
 		m_sQueueSample.m_fSoundIntensity = 30.0f;
-		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_CHINATOWN_RESTAURANT;
+		m_sQueueSample.m_nSampleIndex = SFX_RESTAURANT_CHINATOWN;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = 110;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_CHINATOWN_RESTAURANT);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_RESTAURANT_CHINATOWN);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -4700,10 +4699,10 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 	case SCRIPT_SOUND_CHINATOWN_RESTAURANT_L:
 		maxDist = 6400.f;
 		m_sQueueSample.m_fSoundIntensity = 80.0f;
-		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_CHINATOWN_RESTAURANT;
+		m_sQueueSample.m_nSampleIndex = SFX_RESTAURANT_CHINATOWN;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = 110;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_CHINATOWN_RESTAURANT);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_RESTAURANT_CHINATOWN);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -4711,10 +4710,10 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 	case SCRIPT_SOUND_CIPRIANI_RESAURANT_S:
 		maxDist = 900.f;
 		m_sQueueSample.m_fSoundIntensity = 30.0f;
-		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_CIPRIANI_RESTAURANT;
+		m_sQueueSample.m_nSampleIndex = SFX_RESTAURANT_ITALY;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = 110;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_CIPRIANI_RESTAURANT);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_RESTAURANT_ITALY);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -4722,10 +4721,10 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 	case SCRIPT_SOUND_CIPRIANI_RESAURANT_L:
 		maxDist = 6400.f;
 		m_sQueueSample.m_fSoundIntensity = 80.0f;
-		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_CIPRIANI_RESTAURANT;
+		m_sQueueSample.m_nSampleIndex = SFX_RESTAURANT_ITALY;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = 110;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_CIPRIANI_RESTAURANT);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_RESTAURANT_ITALY);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -4733,10 +4732,10 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 	case SCRIPT_SOUND_46:
 		maxDist = 900.f;
 		m_sQueueSample.m_fSoundIntensity = 30.0f;
-		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_414;
+		m_sQueueSample.m_nSampleIndex = SFX_RESTAURANT_GENERIC_1;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = 110;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_414);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_RESTAURANT_GENERIC_1);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -4744,10 +4743,10 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 	case SCRIPT_SOUND_47:
 		maxDist = 6400.f;
 		m_sQueueSample.m_fSoundIntensity = 80.0f;
-		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_414;
+		m_sQueueSample.m_nSampleIndex = SFX_RESTAURANT_GENERIC_1;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = 110;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_414);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_RESTAURANT_GENERIC_1);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -4755,10 +4754,10 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 	case SCRIPT_SOUND_MARCO_BISTRO_S:
 		maxDist = 900.f;
 		m_sQueueSample.m_fSoundIntensity = 30.0f;
-		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_MARCO_BISTRO;
+		m_sQueueSample.m_nSampleIndex = SFX_RESTAURANT_GENERIC_2;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = 110;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_MARCO_BISTRO);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_RESTAURANT_GENERIC_2);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -4766,10 +4765,10 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 	case SCRIPT_SOUND_MARCO_BISTRO_L:
 		maxDist = 6400.f;
 		m_sQueueSample.m_fSoundIntensity = 80.0f;
-		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_MARCO_BISTRO;
+		m_sQueueSample.m_nSampleIndex = SFX_RESTAURANT_GENERIC_2;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = 110;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_MARCO_BISTRO);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_RESTAURANT_GENERIC_2);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -4787,10 +4786,10 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 	case SCRIPT_SOUND_FRANKIE_PIANO:
 		maxDist = 900.f;
 		m_sQueueSample.m_fSoundIntensity = 30.0f;
-		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_FRANKIE_PIANO;
+		m_sQueueSample.m_nSampleIndex = SFX_PIANO_BAR_1;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = maxVolume;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_FRANKIE_PIANO);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_PIANO_BAR_1);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -4798,10 +4797,10 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 	case SCRIPT_SOUND_PARTY_1_LOOP:
 		maxDist = 6400.f;
 		m_sQueueSample.m_fSoundIntensity = 80.0f;
-		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_PARTY_1;
+		m_sQueueSample.m_nSampleIndex = SFX_CLUB_1;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = maxVolume;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_PARTY_1);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_CLUB_1);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -4817,10 +4816,10 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 	case SCRIPT_SOUND_BANK_ALARM_LOOP_S:
 		maxDist = 900.f;
 		m_sQueueSample.m_fSoundIntensity = 30.0f;
-		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_BANK_ALARM;
+		m_sQueueSample.m_nSampleIndex = SFX_BANK_ALARM_1;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = 90;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_BANK_ALARM);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_BANK_ALARM_1);
 		m_sQueueSample.field_16 = 2;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -4828,10 +4827,10 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 	case SCRIPT_SOUND_BANK_ALARM_LOOP_L:
 		maxDist = 6400.f;
 		m_sQueueSample.m_fSoundIntensity = 80.0f;
-		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_BANK_ALARM;
+		m_sQueueSample.m_nSampleIndex = SFX_BANK_ALARM_1;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = 90;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_BANK_ALARM);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_BANK_ALARM_1);
 		m_sQueueSample.field_16 = 2;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -4839,10 +4838,10 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 	case SCRIPT_SOUND_POLICE_BALL_LOOP_S:
 		maxDist = 900.f;
 		m_sQueueSample.m_fSoundIntensity = 30.0f;
-		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_POLICE_BALL;
+		m_sQueueSample.m_nSampleIndex = SFX_POLICE_BALL_1;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = maxVolume;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_POLICE_BALL);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_POLICE_BALL_1);
 		m_sQueueSample.field_16 = 2;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -4850,10 +4849,10 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 	case SCRIPT_SOUND_POLICE_BALL_LOOP_L:
 		maxDist = 6400.f;
 		m_sQueueSample.m_fSoundIntensity = 80.0f;
-		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_POLICE_BALL;
+		m_sQueueSample.m_nSampleIndex = SFX_POLICE_BALL_1;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = maxVolume;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_POLICE_BALL);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_POLICE_BALL_1);
 		m_sQueueSample.field_16 = 2;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -4861,10 +4860,10 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 	case SCRIPT_SOUND_RAVE_LOOP_INDUSTRIAL_S:
 		maxDist = 900.f;
 		m_sQueueSample.m_fSoundIntensity = 30.0f;
-		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_RAVE_INDUSTRIAL;
+		m_sQueueSample.m_nSampleIndex = SFX_RAVE_INDUSTRIAL;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = maxVolume;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_RAVE_INDUSTRIAL);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_RAVE_INDUSTRIAL);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -4872,10 +4871,10 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 	case SCRIPT_SOUND_RAVE_LOOP_INDUSTRIAL_L:
 		maxDist = 6400.f;
 		m_sQueueSample.m_fSoundIntensity = 80.0f;
-		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_RAVE_INDUSTRIAL;
+		m_sQueueSample.m_nSampleIndex = SFX_RAVE_INDUSTRIAL;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = maxVolume;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_RAVE_INDUSTRIAL);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_RAVE_INDUSTRIAL);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -4886,7 +4885,7 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 	case SCRIPT_SOUND_RAVE_2_LOOP_S:
 		maxDist = 900.f;
 		m_sQueueSample.m_fSoundIntensity = 30.0f;
-		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_RAVE_1;
+		m_sQueueSample.m_nSampleIndex = SFX_RAVE_COMMERCIAL;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = maxVolume;
 		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(m_sQueueSample.m_nSampleIndex);
@@ -4898,7 +4897,7 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 	case SCRIPT_SOUND_RAVE_2_LOOP_L:
 		maxDist = 6400.f;
 		m_sQueueSample.m_fSoundIntensity = 80.0f;
-		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_RAVE_1;
+		m_sQueueSample.m_nSampleIndex = SFX_RAVE_COMMERCIAL;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = maxVolume;
 		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(m_sQueueSample.m_nSampleIndex);
@@ -4909,10 +4908,10 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 	case SCRIPT_SOUND_RAVE_3_LOOP_S:
 		maxDist = 900.f;
 		m_sQueueSample.m_fSoundIntensity = 30.0f;
-		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_RAVE_2;
+		m_sQueueSample.m_nSampleIndex = SFX_RAVE_SUBURBAN;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = maxVolume;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_RAVE_2);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_RAVE_SUBURBAN);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -4920,10 +4919,10 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 	case SCRIPT_SOUND_RAVE_3_LOOP_L:
 		maxDist = 6400.f;
 		m_sQueueSample.m_fSoundIntensity = 80.0f;
-		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_RAVE_2;
+		m_sQueueSample.m_nSampleIndex = SFX_RAVE_SUBURBAN;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = maxVolume;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_RAVE_2);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_RAVE_SUBURBAN);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_76 = 3;
 		m_sQueueSample.field_48 = 2.0f;
@@ -4931,10 +4930,10 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 	case SCRIPT_SOUND_PRETEND_FIRE_LOOP:
 		maxDist = 2500.f;
 		m_sQueueSample.m_fSoundIntensity = 50.0f;
-		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_FIRE_ENTITY;
+		m_sQueueSample.m_nSampleIndex = SFX_CAR_ON_FIRE;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = 80;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_FIRE_ENTITY);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_CAR_ON_FIRE);
 		m_sQueueSample.field_16 = 8;
 		m_sQueueSample.field_76 = 10;
 		m_sQueueSample.field_48 = 2.0f;
@@ -5121,7 +5120,7 @@ cAudioManager::ProcessModelCarEngine(cVehicleParams *params)
 					    ComputeVolume(emittingVol, 30.f, m_sQueueSample.m_fDistance);
 					if(m_sQueueSample.m_bVolume) {
 						m_sQueueSample.m_counter = 2;
-						m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_MODEL_VEHICLE_ACCELERATING;
+						m_sQueueSample.m_nSampleIndex = SFX_REMOTE_CONTROLLED_CAR;
 						m_sQueueSample.m_bBankIndex = 0;
 						m_sQueueSample.m_bIsDistant = 0;
 						m_sQueueSample.field_16 = 1;
@@ -5180,7 +5179,7 @@ cAudioManager::ProcessOneShotScriptObject(uint8 sound)
 	case SCRIPT_SOUND_GATE_STOP_CLUNK:
 		maxDist = 1600.f;
 		m_sQueueSample.m_fSoundIntensity = 40.0f;
-		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_COLLISION_GATE;
+		m_sQueueSample.m_nSampleIndex = SFX_COL_GATE;
 		m_sQueueSample.m_bBankIndex = 0;
 		if(sound == SCRIPT_SOUND_GATE_START_CLUNK)
 			m_sQueueSample.m_nFrequency = 10600;
@@ -5197,7 +5196,7 @@ cAudioManager::ProcessOneShotScriptObject(uint8 sound)
 	case SCRIPT_SOUND_BULLET_HIT_GROUND_3:
 		maxDist = 2500.f;
 		m_sQueueSample.m_fSoundIntensity = 50.0f;
-		m_sQueueSample.m_nSampleIndex = m_anRandomTable[iSound % 5] % 3 + AUDIO_SAMPLE_BULLET_HIT_GROUND_1;
+		m_sQueueSample.m_nSampleIndex = m_anRandomTable[iSound % 5] % 3 + SFX_BULLET_WALL_1;
 		m_sQueueSample.m_bBankIndex = 0;
 		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(m_sQueueSample.m_nSampleIndex);
 		m_sQueueSample.m_nFrequency += RandomDisplacement(m_sQueueSample.m_nFrequency >> 5);
@@ -5211,10 +5210,10 @@ cAudioManager::ProcessOneShotScriptObject(uint8 sound)
 		if(SampleManager.IsSampleBankLoaded(0) != 1) return;
 		maxDist = 6400.f;
 		m_sQueueSample.m_fSoundIntensity = 80.0f;
-		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_389;
+		m_sQueueSample.m_nSampleIndex = SFX_TRAIN_STATION_ANNOUNCE;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = maxVolume;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_389);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_TRAIN_STATION_ANNOUNCE);
 		m_sQueueSample.field_16 = 0;
 		m_sQueueSample.field_48 = 2.0f;
 		m_sQueueSample.m_bIsDistant = 0;
@@ -5222,10 +5221,10 @@ cAudioManager::ProcessOneShotScriptObject(uint8 sound)
 	case SCRIPT_SOUND_PAYPHONE_RINGING:
 		maxDist = 6400.f;
 		m_sQueueSample.m_fSoundIntensity = 80.0f;
-		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_PAYPHONE_RINGING;
+		m_sQueueSample.m_nSampleIndex = SFX_PHONE_RING;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = 80;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_PAYPHONE_RINGING);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_PHONE_RING);
 		m_sQueueSample.field_16 = 1;
 		m_sQueueSample.field_48 = 2.0f;
 		m_sQueueSample.m_bIsDistant = 0;
@@ -5234,10 +5233,10 @@ cAudioManager::ProcessOneShotScriptObject(uint8 sound)
 	case SCRIPT_SOUND_GLASS_BREAK_L:
 		maxDist = 3600.f;
 		m_sQueueSample.m_fSoundIntensity = 60.0f;
-		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_GLASS_GENERIC_BREAK;
+		m_sQueueSample.m_nSampleIndex = SFX_GLASS_SMASH;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = 70;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_GLASS_GENERIC_BREAK);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_GLASS_SMASH);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_48 = 0.0f;
 		m_sQueueSample.m_bIsDistant = 0;
@@ -5245,10 +5244,10 @@ cAudioManager::ProcessOneShotScriptObject(uint8 sound)
 	case SCRIPT_SOUND_GLASS_BREAK_S:
 		maxDist = 3600.f;
 		m_sQueueSample.m_fSoundIntensity = 60.0f;
-		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_GLASS_GENERIC_BREAK;
+		m_sQueueSample.m_nSampleIndex = SFX_GLASS_SMASH;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = 60;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_GLASS_GENERIC_BREAK);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_GLASS_SMASH);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_48 = 0.0f;
 		m_sQueueSample.m_bIsDistant = 0;
@@ -5256,10 +5255,10 @@ cAudioManager::ProcessOneShotScriptObject(uint8 sound)
 	case SCRIPT_SOUND_GLASS_CRACK:
 		maxDist = 3600.f;
 		m_sQueueSample.m_fSoundIntensity = 60.0f;
-		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_GLASS_WINDSHIELD_CRACK;
+		m_sQueueSample.m_nSampleIndex = SFX_GLASS_CRACK;
 		m_sQueueSample.m_bBankIndex = 0;
 		emittingVolume = 70;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_GLASS_WINDSHIELD_CRACK);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_GLASS_CRACK);
 		m_sQueueSample.field_16 = 3;
 		m_sQueueSample.field_48 = 0.0f;
 		m_sQueueSample.m_bIsDistant = 0;
@@ -5268,7 +5267,7 @@ cAudioManager::ProcessOneShotScriptObject(uint8 sound)
 	case SCRIPT_SOUND_GLASS_LIGHT_BREAK:
 		maxDist = 3025.f;
 		m_sQueueSample.m_fSoundIntensity = 55.0f;
-		m_sQueueSample.m_nSampleIndex = (m_anRandomTable[4] & 3) + AUDIO_SAMPLE_GLASS_LIGHT_BREAK_1;
+		m_sQueueSample.m_nSampleIndex = (m_anRandomTable[4] & 3) + SFX_GLASS_SHARD_1;
 		m_sQueueSample.m_bBankIndex = 0;
 		m_sQueueSample.m_nFrequency = RandomDisplacement(2000) + 19000;
 		m_sQueueSample.field_16 = 9;
@@ -5279,7 +5278,7 @@ cAudioManager::ProcessOneShotScriptObject(uint8 sound)
 	case SCRIPT_SOUND_BOX_DESTROYED_1:
 		maxDist = 3600.f;
 		m_sQueueSample.m_fSoundIntensity = 60.0f;
-		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_BOX_DESTROYED_1;
+		m_sQueueSample.m_nSampleIndex = SFX_WOODEN_BOX_SMASH;
 		m_sQueueSample.m_bBankIndex = 0;
 		m_sQueueSample.m_nFrequency = RandomDisplacement(1500) + 18600;
 		m_sQueueSample.field_16 = 3;
@@ -5291,7 +5290,7 @@ cAudioManager::ProcessOneShotScriptObject(uint8 sound)
 	case SCRIPT_SOUND_BOX_DESTROYED_2:
 		maxDist = 3600.f;
 		m_sQueueSample.m_fSoundIntensity = 60.0f;
-		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_BOX_DESTROYED_2;
+		m_sQueueSample.m_nSampleIndex = SFX_CARDBOARD_BOX_SMASH;
 		m_sQueueSample.m_bBankIndex = 0;
 		m_sQueueSample.m_nFrequency = RandomDisplacement(1500) + 18600;
 		m_sQueueSample.field_16 = 3;
@@ -5303,7 +5302,7 @@ cAudioManager::ProcessOneShotScriptObject(uint8 sound)
 	case SCRIPT_SOUND_METAL_COLLISION:
 		maxDist = 3600.f;
 		m_sQueueSample.m_fSoundIntensity = 60.0f;
-		m_sQueueSample.m_nSampleIndex = m_anRandomTable[3] % 5 + AUDIO_SAMPLE_COLLISION_METAL;
+		m_sQueueSample.m_nSampleIndex = m_anRandomTable[3] % 5 + SFX_COL_CAR_1;
 		m_sQueueSample.m_bBankIndex = 0;
 		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(m_sQueueSample.m_nSampleIndex);
 		m_sQueueSample.m_nFrequency += RandomDisplacement(m_sQueueSample.m_nFrequency >> 4);
@@ -5316,7 +5315,7 @@ cAudioManager::ProcessOneShotScriptObject(uint8 sound)
 	case SCRIPT_SOUND_TIRE_COLLISION:
 		maxDist = 3600.f;
 		m_sQueueSample.m_fSoundIntensity = 60.0f;
-		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_COLLISION_RUBBER;
+		m_sQueueSample.m_nSampleIndex = SFX_TYRE_BUMP;
 		m_sQueueSample.m_bBankIndex = 0;
 		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(m_sQueueSample.m_nSampleIndex);
 		m_sQueueSample.m_nFrequency += RandomDisplacement(m_sQueueSample.m_nFrequency >> 4);
@@ -5338,7 +5337,7 @@ cAudioManager::ProcessOneShotScriptObject(uint8 sound)
 			case SURFACE_SAND:
 			case SURFACE_TIRE:
 			case SURFACE_HEDGE:
-				m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_BULLET_GUNSHELL_SOFT_DROP;
+				m_sQueueSample.m_nSampleIndex = SFX_BULLET_SHELL_HIT_GROUND_2;
 				m_sQueueSample.m_nFrequency = RandomDisplacement(500) + 11000;
 				m_sQueueSample.field_16 = 18;
 				maxDist = 400.f;
@@ -5369,7 +5368,7 @@ cAudioManager::ProcessOneShotScriptObject(uint8 sound)
 			default: break;
 			}
 		}
-		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_BULLET_GUNSHELL_HARD_DROP;
+		m_sQueueSample.m_nSampleIndex = SFX_BULLET_SHELL_HIT_GROUND_1;
 		m_sQueueSample.m_nFrequency = RandomDisplacement(750) + 18000;
 		m_sQueueSample.field_16 = 15;
 		maxDist = 400.f;
@@ -5380,7 +5379,7 @@ cAudioManager::ProcessOneShotScriptObject(uint8 sound)
 		emittingVolume = m_anRandomTable[2] % 20 + 30;
 		break;
 	case SCRIPT_SOUND_GUNSHELL_DROP_SOFT:
-		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_BULLET_GUNSHELL_SOFT_DROP;
+		m_sQueueSample.m_nSampleIndex = SFX_BULLET_SHELL_HIT_GROUND_2;
 		m_sQueueSample.m_nFrequency = RandomDisplacement(500) + 11000;
 		m_sQueueSample.field_16 = 18;
 		maxDist = 400.f;
@@ -5458,12 +5457,12 @@ cAudioManager::ProcessPedHeadphones(cPedParams *params)
 			m_sQueueSample.m_bVolume = ComputeVolume(emittingVol, 7.f, m_sQueueSample.m_fDistance);
 			if(m_sQueueSample.m_bVolume) {
 				m_sQueueSample.m_counter = 64;
-				m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_PED_HEADPHONES;
+				m_sQueueSample.m_nSampleIndex = SFX_HEADPHONES;
 				m_sQueueSample.m_bBankIndex = 0;
 				m_sQueueSample.m_bIsDistant = 0;
 				m_sQueueSample.field_16 = 5;
 				m_sQueueSample.m_nFrequency =
-				    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_PED_HEADPHONES);
+				    SampleManager.GetSampleBaseFrequency(SFX_HEADPHONES);
 				m_sQueueSample.m_nLoopCount = 0;
 				m_sQueueSample.m_bEmittingVolume = emittingVol;
 				m_sQueueSample.m_nLoopStart =
@@ -5523,11 +5522,11 @@ cAudioManager::ProcessPedOneShots(cPedParams *params)
 				maxDist = 400.f;
 				switch(params->m_pPed->m_nSurfaceTouched) {
 				case SURFACE_GRASS:
-					sampleIndex = m_anRandomTable[1] % 5 + AUDIO_SAMPLE_PED_FALL_GRASS_1;
+					sampleIndex = m_anRandomTable[1] % 5 + SFX_FOOTSTEP_GRASS_1;
 					break;
 				case SURFACE_DIRT:
 				case SURFACE_DIRTTRACK:
-					sampleIndex = m_anRandomTable[4] % 5 + AUDIO_SAMPLE_PED_FALL_DIRT_1;
+					sampleIndex = m_anRandomTable[4] % 5 + SFX_FOOTSTEP_GRAVEL_1;
 					break;
 				case SURFACE_METAL6:
 				case SURFACE_METAL_DOOR:
@@ -5540,24 +5539,24 @@ cAudioManager::ProcessPedOneShots(cPedParams *params)
 				case SURFACE_METAL_FENCE:
 				case SURFACE_METAL27:
 				case SURFACE_METAL28:
-					sampleIndex = m_anRandomTable[0] % 5 + AUDIO_SAMPLE_PED_FALL_METAL_1;
+					sampleIndex = m_anRandomTable[0] % 5 + SFX_FOOTSTEP_METAL_1;
 					break;
 				case SURFACE_SAND:
-					sampleIndex = (m_anRandomTable[4] & 3) + AUDIO_SAMPLE_PED_FALL_SAND_1;
+					sampleIndex = (m_anRandomTable[4] & 3) + SFX_FOOTSTEP_SAND_1;
 					break;
 				case SURFACE_PUDDLE:
-					sampleIndex = (m_anRandomTable[3] & 3) + AUDIO_SAMPLE_PED_FALL_IN_WATER_1;
+					sampleIndex = (m_anRandomTable[3] & 3) + SFX_FOOTSTEP_WATER_1;
 					break;
 				case SURFACE_WOOD:
 				case SURFACE_WOOD_BOX:
 				case SURFACE_WOOD_PLANK:
-					sampleIndex = m_anRandomTable[2] % 5 + AUDIO_SAMPLE_PED_FALL_WOOD_1;
+					sampleIndex = m_anRandomTable[2] % 5 + SFX_FOOTSTEP_WOOD_1;
 					break;
 				case SURFACE_HEDGE:
-					sampleIndex = m_anRandomTable[2] % 5 + AUDIO_SAMPLE_COLLISION_HEDGE;
+					sampleIndex = m_anRandomTable[2] % 5 + SFX_COL_VEG_1;
 					break;
 				default:
-					sampleIndex = m_anRandomTable[2] % 5 + AUDIO_SAMPLE_PED_FALL_PAVEMENT_1;
+					sampleIndex = m_anRandomTable[2] % 5 + SFX_FOOTSTEP_CONCRETE_1;
 					break;
 				}
 				m_sQueueSample.m_nSampleIndex = sampleIndex;
@@ -5598,11 +5597,11 @@ cAudioManager::ProcessPedOneShots(cPedParams *params)
 				emittingVol = m_anRandomTable[3] % 20 + 80;
 				if(ped->m_nSurfaceTouched == SURFACE_PUDDLE) {
 					m_sQueueSample.m_nSampleIndex =
-					    (m_anRandomTable[3] & 3) + AUDIO_SAMPLE_PED_FALL_IN_WATER_1;
+					    (m_anRandomTable[3] & 3) + SFX_FOOTSTEP_WATER_1;
 				} else if(sound == SOUND_FALL_LAND) {
-					m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_PED_FALL_LAND;
+					m_sQueueSample.m_nSampleIndex = SFX_BODY_LAND;
 				} else {
-					m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_PED_FALL_COLLAPSE;
+					m_sQueueSample.m_nSampleIndex = SFX_BODY_LAND_AND_FALL;
 				}
 				m_sQueueSample.m_bBankIndex = 0;
 				m_sQueueSample.m_counter = 1;
@@ -5623,7 +5622,7 @@ cAudioManager::ProcessPedOneShots(cPedParams *params)
 			}
 			break;
 		case SOUND_FIGHT_PUNCH_33:
-			m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_PED_HIT_1;
+			m_sQueueSample.m_nSampleIndex = SFX_FIGHT_1;
 			m_sQueueSample.m_nFrequency = 18000;
 			m_sQueueSample.m_bBankIndex = 0;
 			m_sQueueSample.m_counter = iSound;
@@ -5643,7 +5642,7 @@ cAudioManager::ProcessPedOneShots(cPedParams *params)
 			m_sQueueSample.m_bRequireReflection = 1;
 			break;
 		case SOUND_FIGHT_KICK_34:
-			m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_PED_HIT_1;
+			m_sQueueSample.m_nSampleIndex = SFX_FIGHT_1;
 			m_sQueueSample.m_nFrequency = 16500;
 			m_sQueueSample.m_bBankIndex = 0;
 			m_sQueueSample.m_counter = iSound;
@@ -5663,7 +5662,7 @@ cAudioManager::ProcessPedOneShots(cPedParams *params)
 			m_sQueueSample.m_bRequireReflection = 1;
 			break;
 		case SOUND_FIGHT_HEADBUTT_35:
-			m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_PED_HIT_1;
+			m_sQueueSample.m_nSampleIndex = SFX_FIGHT_1;
 			m_sQueueSample.m_nFrequency = 20000;
 			m_sQueueSample.m_bBankIndex = 0;
 			m_sQueueSample.m_counter = iSound;
@@ -5683,7 +5682,7 @@ cAudioManager::ProcessPedOneShots(cPedParams *params)
 			m_sQueueSample.m_bRequireReflection = 1;
 			break;
 		case SOUND_FIGHT_PUNCH_36:
-			m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_PED_HIT_2;
+			m_sQueueSample.m_nSampleIndex = SFX_FIGHT_2;
 			m_sQueueSample.m_nFrequency = 18000;
 			m_sQueueSample.m_bBankIndex = 0;
 			m_sQueueSample.m_counter = iSound;
@@ -5703,7 +5702,7 @@ cAudioManager::ProcessPedOneShots(cPedParams *params)
 			m_sQueueSample.m_bRequireReflection = 1;
 			break;
 		case SOUND_FIGHT_PUNCH_37:
-			m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_PED_HIT_2;
+			m_sQueueSample.m_nSampleIndex = SFX_FIGHT_2;
 			m_sQueueSample.m_nFrequency = 16500;
 			m_sQueueSample.m_bBankIndex = 0;
 			m_sQueueSample.m_counter = iSound;
@@ -5723,7 +5722,7 @@ cAudioManager::ProcessPedOneShots(cPedParams *params)
 			m_sQueueSample.m_bRequireReflection = 1;
 			break;
 		case SOUND_FIGHT_CLOSE_PUNCH_38:
-			m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_PED_HIT_2;
+			m_sQueueSample.m_nSampleIndex = SFX_FIGHT_2;
 			m_sQueueSample.m_nFrequency = 20000;
 			m_sQueueSample.m_bBankIndex = 0;
 			m_sQueueSample.m_counter = iSound;
@@ -5743,7 +5742,7 @@ cAudioManager::ProcessPedOneShots(cPedParams *params)
 			m_sQueueSample.m_bRequireReflection = 1;
 			break;
 		case SOUND_FIGHT_PUNCH_39:
-			m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_PED_HIT_3;
+			m_sQueueSample.m_nSampleIndex = SFX_FIGHT_4;
 			m_sQueueSample.m_nFrequency = 18000;
 			m_sQueueSample.m_bBankIndex = 0;
 			m_sQueueSample.m_counter = iSound;
@@ -5763,7 +5762,7 @@ cAudioManager::ProcessPedOneShots(cPedParams *params)
 			m_sQueueSample.m_bRequireReflection = 1;
 			break;
 		case SOUND_FIGHT_PUNCH_OR_KICK_BELOW_40:
-			m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_PED_HIT_3;
+			m_sQueueSample.m_nSampleIndex = SFX_FIGHT_4;
 			m_sQueueSample.m_nFrequency = 16500;
 			m_sQueueSample.m_bBankIndex = 0;
 			m_sQueueSample.m_counter = iSound;
@@ -5783,7 +5782,7 @@ cAudioManager::ProcessPedOneShots(cPedParams *params)
 			m_sQueueSample.m_bRequireReflection = 1;
 			break;
 		case SOUND_FIGHT_PUNCH_41:
-			m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_PED_HIT_3;
+			m_sQueueSample.m_nSampleIndex = SFX_FIGHT_4;
 			m_sQueueSample.m_nFrequency = 20000;
 			m_sQueueSample.m_bBankIndex = 0;
 			m_sQueueSample.m_counter = iSound;
@@ -5803,7 +5802,7 @@ cAudioManager::ProcessPedOneShots(cPedParams *params)
 			m_sQueueSample.m_bRequireReflection = 1;
 			break;
 		case SOUND_FIGHT_PUNCH_FROM_BEHIND_42:
-			m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_PED_HIT_4;
+			m_sQueueSample.m_nSampleIndex = SFX_FIGHT_5;
 			m_sQueueSample.m_nFrequency = 18000;
 			m_sQueueSample.m_bBankIndex = 0;
 			m_sQueueSample.m_counter = iSound;
@@ -5823,7 +5822,7 @@ cAudioManager::ProcessPedOneShots(cPedParams *params)
 			m_sQueueSample.m_bRequireReflection = 1;
 			break;
 		case SOUND_FIGHT_KNEE_OR_KICK_43:
-			m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_PED_HIT_4;
+			m_sQueueSample.m_nSampleIndex = SFX_FIGHT_5;
 			m_sQueueSample.m_nFrequency = 16500;
 			m_sQueueSample.m_bBankIndex = 0;
 			m_sQueueSample.m_counter = iSound;
@@ -5843,7 +5842,7 @@ cAudioManager::ProcessPedOneShots(cPedParams *params)
 			m_sQueueSample.m_bRequireReflection = 1;
 			break;
 		case SOUND_FIGHT_KICK_44:
-			m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_PED_HIT_4;
+			m_sQueueSample.m_nSampleIndex = SFX_FIGHT_5;
 			m_sQueueSample.m_nFrequency = 20000;
 			m_sQueueSample.m_bBankIndex = 0;
 			m_sQueueSample.m_counter = iSound;
@@ -5863,7 +5862,7 @@ cAudioManager::ProcessPedOneShots(cPedParams *params)
 			m_sQueueSample.m_bRequireReflection = 1;
 			break;
 		case SOUND_WEAPON_BAT_ATTACK:
-			m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_PED_HIT_BY_BAT;
+			m_sQueueSample.m_nSampleIndex = SFX_BAT_HIT_LEFT;
 			m_sQueueSample.m_bBankIndex = 0;
 			m_sQueueSample.m_counter = iSound++;
 			processed = 1;
@@ -5888,12 +5887,12 @@ cAudioManager::ProcessPedOneShots(cPedParams *params)
 			weapon = &ped->m_weapons[ped->m_currentWeapon];
 			switch(weapon->m_eWeaponType) {
 			case WEAPONTYPE_COLT45:
-				m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_WEAPON_PISTOL_SHOT;
+				m_sQueueSample.m_nSampleIndex = SFX_COLT45_LEFT;
 				m_sQueueSample.m_bBankIndex = 0;
 				m_sQueueSample.m_counter = iSound++;
 				processed = 1;
 				m_sQueueSample.m_nFrequency =
-				    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_WEAPON_PISTOL_SHOT);
+				    SampleManager.GetSampleBaseFrequency(SFX_COLT45_LEFT);
 				m_sQueueSample.m_nFrequency += RandomDisplacement(m_sQueueSample.m_nFrequency >> 5);
 				m_sQueueSample.field_16 = 3;
 				m_sQueueSample.field_48 = 0.0f;
@@ -5912,12 +5911,12 @@ cAudioManager::ProcessPedOneShots(cPedParams *params)
 					noReflection = 1;
 				break;
 			case WEAPONTYPE_UZI:
-				m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_WEAPON_UZI_SHOT;
+				m_sQueueSample.m_nSampleIndex = SFX_UZI_LEFT;
 				m_sQueueSample.m_bBankIndex = 0;
 				m_sQueueSample.m_counter = iSound++;
 				processed = 1;
 				m_sQueueSample.m_nFrequency =
-				    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_WEAPON_UZI_SHOT);
+				    SampleManager.GetSampleBaseFrequency(SFX_UZI_LEFT);
 				m_sQueueSample.m_nFrequency += RandomDisplacement(m_sQueueSample.m_nFrequency >> 5);
 				m_sQueueSample.field_16 = 3;
 				m_sQueueSample.field_48 = 0.0f;
@@ -5932,12 +5931,12 @@ cAudioManager::ProcessPedOneShots(cPedParams *params)
 				m_sQueueSample.field_56 = 1;
 				break;
 			case WEAPONTYPE_SHOTGUN:
-				m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_WEAPON_SHOTGUN_SHOT;
+				m_sQueueSample.m_nSampleIndex = SFX_SHOTGUN_LEFT;
 				m_sQueueSample.m_bBankIndex = 0;
 				m_sQueueSample.m_counter = iSound++;
 				processed = 1;
 				m_sQueueSample.m_nFrequency =
-				    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_WEAPON_SHOTGUN_SHOT);
+				    SampleManager.GetSampleBaseFrequency(SFX_SHOTGUN_LEFT);
 				m_sQueueSample.m_nFrequency += RandomDisplacement(m_sQueueSample.m_nFrequency >> 5);
 				m_sQueueSample.field_16 = 3;
 				m_sQueueSample.field_48 = 0.0f;
@@ -5956,12 +5955,12 @@ cAudioManager::ProcessPedOneShots(cPedParams *params)
 					noReflection = 1;
 				break;
 			case WEAPONTYPE_AK47:
-				m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_WEAPON_CHAINGUN_SHOT;
+				m_sQueueSample.m_nSampleIndex = SFX_AK47_LEFT;
 				m_sQueueSample.m_bBankIndex = 0;
 				m_sQueueSample.m_counter = iSound++;
 				processed = 1;
 				m_sQueueSample.m_nFrequency =
-				    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_WEAPON_CHAINGUN_SHOT);
+				    SampleManager.GetSampleBaseFrequency(SFX_AK47_LEFT);
 				m_sQueueSample.m_nFrequency += RandomDisplacement(m_sQueueSample.m_nFrequency >> 5);
 				m_sQueueSample.field_16 = 3;
 				m_sQueueSample.field_48 = 0.0f;
@@ -5976,12 +5975,12 @@ cAudioManager::ProcessPedOneShots(cPedParams *params)
 				m_sQueueSample.field_56 = 1;
 				break;
 			case WEAPONTYPE_M16:
-				m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_WEAPON_M16_SHOT;
+				m_sQueueSample.m_nSampleIndex = SFX_M16_LEFT;
 				m_sQueueSample.m_bBankIndex = 0;
 				m_sQueueSample.m_counter = iSound++;
 				processed = 1;
 				m_sQueueSample.m_nFrequency =
-				    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_WEAPON_M16_SHOT);
+				    SampleManager.GetSampleBaseFrequency(SFX_M16_LEFT);
 				m_sQueueSample.m_nFrequency += RandomDisplacement(m_sQueueSample.m_nFrequency >> 5);
 				m_sQueueSample.field_16 = 3;
 				m_sQueueSample.field_48 = 0.0f;
@@ -5996,12 +5995,12 @@ cAudioManager::ProcessPedOneShots(cPedParams *params)
 				m_sQueueSample.field_56 = 1;
 				break;
 			case WEAPONTYPE_SNIPERRIFLE:
-				m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_WEAPON_SNIPER_SHOT;
+				m_sQueueSample.m_nSampleIndex = SFX_SNIPER_LEFT;
 				m_sQueueSample.m_bBankIndex = 0;
 				m_sQueueSample.m_counter = iSound++;
 				processed = 1;
 				m_sQueueSample.m_nFrequency =
-				    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_WEAPON_SNIPER_SHOT);
+				    SampleManager.GetSampleBaseFrequency(SFX_SNIPER_LEFT);
 				m_sQueueSample.m_nFrequency += RandomDisplacement(m_sQueueSample.m_nFrequency >> 5);
 				m_sQueueSample.field_16 = 3;
 				m_sQueueSample.field_48 = 0.0f;
@@ -6020,12 +6019,12 @@ cAudioManager::ProcessPedOneShots(cPedParams *params)
 					noReflection = 1;
 				break;
 			case WEAPONTYPE_ROCKETLAUNCHER:
-				m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_WEAPON_ROCKET_SHOT;
+				m_sQueueSample.m_nSampleIndex = SFX_ROCKET_LEFT;
 				m_sQueueSample.m_bBankIndex = 0;
 				m_sQueueSample.m_counter = iSound++;
 				processed = 1;
 				m_sQueueSample.m_nFrequency =
-				    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_WEAPON_ROCKET_SHOT);
+				    SampleManager.GetSampleBaseFrequency(SFX_ROCKET_LEFT);
 				m_sQueueSample.m_nFrequency += RandomDisplacement(m_sQueueSample.m_nFrequency >> 5);
 				m_sQueueSample.field_16 = 1;
 				m_sQueueSample.field_48 = 0.0f;
@@ -6044,13 +6043,13 @@ cAudioManager::ProcessPedOneShots(cPedParams *params)
 					noReflection = 1;
 				break;
 			case WEAPONTYPE_FLAMETHROWER:
-				m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_WEAPON_FLAMETHROWER_SHOT;
+				m_sQueueSample.m_nSampleIndex = SFX_FLAMETHROWER_LEFT;
 				m_sQueueSample.m_bBankIndex = 0;
 				m_sQueueSample.m_counter = 9;
 				emittingVol = 90;
 				m_sQueueSample.m_nFrequency =
 				    (10 * m_sQueueSample.m_nEntityIndex & 2047) +
-				    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_WEAPON_FLAMETHROWER_SHOT);
+				    SampleManager.GetSampleBaseFrequency(SFX_FLAMETHROWER_LEFT);
 				m_sQueueSample.field_16 = 3;
 				m_sQueueSample.field_48 = 4.0f;
 				m_sQueueSample.m_fSoundIntensity = 60.0f;
@@ -6077,12 +6076,12 @@ cAudioManager::ProcessPedOneShots(cPedParams *params)
 			weapon = &ped->m_weapons[ped->m_currentWeapon];
 			switch(weapon->m_eWeaponType) {
 			case WEAPONTYPE_COLT45:
-				m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_WEAPON_PISTOL_RELOAD;
+				m_sQueueSample.m_nSampleIndex = SFX_PISTOL_RELOAD;
 				emittingVol = 75;
 				m_sQueueSample.m_counter = iSound++;
 				processed = 1;
 				m_sQueueSample.m_nFrequency =
-				    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_WEAPON_PISTOL_RELOAD) +
+				    SampleManager.GetSampleBaseFrequency(SFX_PISTOL_RELOAD) +
 				    RandomDisplacement(300);
 				m_sQueueSample.m_nFrequency += RandomDisplacement(300);
 				m_sQueueSample.m_bBankIndex = 0;
@@ -6099,7 +6098,7 @@ cAudioManager::ProcessPedOneShots(cPedParams *params)
 				m_sQueueSample.m_bRequireReflection = 1;
 				break;
 			case WEAPONTYPE_UZI:
-				m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_WEAPON_UZI_RELOAD;
+				m_sQueueSample.m_nSampleIndex = SFX_M16_RELOAD;
 				emittingVol = 75;
 				m_sQueueSample.m_counter = iSound++;
 				processed = 1;
@@ -6119,7 +6118,7 @@ cAudioManager::ProcessPedOneShots(cPedParams *params)
 				m_sQueueSample.m_bRequireReflection = 1;
 				break;
 			case WEAPONTYPE_SHOTGUN:
-				m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_WEAPON_CHAINGUN_RELOAD;
+				m_sQueueSample.m_nSampleIndex = SFX_AK47_RELOAD;
 				emittingVol = 75;
 				m_sQueueSample.m_counter = iSound++;
 				processed = 1;
@@ -6139,12 +6138,12 @@ cAudioManager::ProcessPedOneShots(cPedParams *params)
 				m_sQueueSample.m_bRequireReflection = 1;
 				break;
 			case WEAPONTYPE_AK47:
-				m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_WEAPON_CHAINGUN_RELOAD;
+				m_sQueueSample.m_nSampleIndex = SFX_AK47_RELOAD;
 				emittingVol = 75;
 				m_sQueueSample.m_counter = iSound++;
 				processed = 1;
 				m_sQueueSample.m_nFrequency =
-				    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_WEAPON_CHAINGUN_RELOAD);
+				    SampleManager.GetSampleBaseFrequency(SFX_AK47_RELOAD);
 				m_sQueueSample.m_nFrequency += RandomDisplacement(300);
 				m_sQueueSample.m_bBankIndex = 0;
 				m_sQueueSample.field_16 = 5;
@@ -6160,12 +6159,12 @@ cAudioManager::ProcessPedOneShots(cPedParams *params)
 				m_sQueueSample.m_bRequireReflection = 1;
 				break;
 			case WEAPONTYPE_M16:
-				m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_WEAPON_UZI_RELOAD;
+				m_sQueueSample.m_nSampleIndex = SFX_M16_RELOAD;
 				emittingVol = 75;
 				m_sQueueSample.m_counter = iSound++;
 				processed = 1;
 				m_sQueueSample.m_nFrequency =
-				    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_WEAPON_UZI_RELOAD);
+				    SampleManager.GetSampleBaseFrequency(SFX_M16_RELOAD);
 				m_sQueueSample.m_nFrequency += RandomDisplacement(300);
 				m_sQueueSample.m_bBankIndex = 0;
 				m_sQueueSample.field_16 = 5;
@@ -6181,12 +6180,12 @@ cAudioManager::ProcessPedOneShots(cPedParams *params)
 				m_sQueueSample.m_bRequireReflection = 1;
 				break;
 			case WEAPONTYPE_SNIPERRIFLE:
-				m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_WEAPON_SNIPER_RELOAD;
+				m_sQueueSample.m_nSampleIndex = SFX_RIFLE_RELOAD;
 				emittingVol = 75;
 				m_sQueueSample.m_counter = iSound++;
 				processed = 1;
 				m_sQueueSample.m_nFrequency =
-				    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_WEAPON_SNIPER_RELOAD);
+				    SampleManager.GetSampleBaseFrequency(SFX_RIFLE_RELOAD);
 				m_sQueueSample.m_nFrequency += RandomDisplacement(300);
 				m_sQueueSample.m_bBankIndex = 0;
 				m_sQueueSample.field_16 = 5;
@@ -6202,12 +6201,12 @@ cAudioManager::ProcessPedOneShots(cPedParams *params)
 				m_sQueueSample.m_bRequireReflection = 1;
 				break;
 			case WEAPONTYPE_ROCKETLAUNCHER:
-				m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_WEAPON_ROCKET_RELOAD;
+				m_sQueueSample.m_nSampleIndex = SFX_ROCKET_RELOAD;
 				emittingVol = 75;
 				m_sQueueSample.m_counter = iSound++;
 				processed = 1;
 				m_sQueueSample.m_nFrequency =
-				    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_WEAPON_ROCKET_RELOAD);
+				    SampleManager.GetSampleBaseFrequency(SFX_ROCKET_RELOAD);
 				m_sQueueSample.m_nFrequency += RandomDisplacement(300);
 				m_sQueueSample.m_bBankIndex = 0;
 				m_sQueueSample.field_16 = 5;
@@ -6228,11 +6227,11 @@ cAudioManager::ProcessPedOneShots(cPedParams *params)
 		case SOUND_WEAPON_AK47_BULLET_ECHO:
 		case SOUND_WEAPON_UZI_BULLET_ECHO:
 		case SOUND_WEAPON_M16_BULLET_ECHO:
-			m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_75;
+			m_sQueueSample.m_nSampleIndex = SFX_UZI_END_LEFT;
 			m_sQueueSample.m_bBankIndex = 0;
 			m_sQueueSample.m_counter = iSound++;
 			processed = 1;
-			m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_75);
+			m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_UZI_END_LEFT);
 			m_sQueueSample.m_nFrequency += RandomDisplacement(m_sQueueSample.m_nFrequency >> 4);
 			m_sQueueSample.field_16 = 3;
 			m_sQueueSample.field_48 = 0.0f;
@@ -6251,11 +6250,11 @@ cAudioManager::ProcessPedOneShots(cPedParams *params)
 				noReflection = 1;
 			break;
 		case SOUND_WEAPON_FLAMETHROWER_FIRE:
-			m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_WEAPON_FLAMETHROWER_FIRE;
+			m_sQueueSample.m_nSampleIndex = SFX_FLAMETHROWER_START_LEFT;
 			m_sQueueSample.m_bBankIndex = 0;
 			m_sQueueSample.m_counter = iSound++;
 			m_sQueueSample.m_nFrequency =
-			    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_WEAPON_FLAMETHROWER_FIRE);
+			    SampleManager.GetSampleBaseFrequency(SFX_FLAMETHROWER_START_LEFT);
 			m_sQueueSample.m_nFrequency += RandomDisplacement(m_sQueueSample.m_nFrequency >> 4);
 			m_sQueueSample.field_16 = 3;
 			m_sQueueSample.field_48 = 4.0f;
@@ -6270,11 +6269,11 @@ cAudioManager::ProcessPedOneShots(cPedParams *params)
 			m_sQueueSample.field_56 = 1;
 			break;
 		case SOUND_WEAPON_HIT_PED:
-			m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_BULLET_HIT_PED;
+			m_sQueueSample.m_nSampleIndex = SFX_BULLET_PED;
 			m_sQueueSample.m_bBankIndex = 0;
 			m_sQueueSample.m_counter = iSound++;
 			processed = 1;
-			m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_BULLET_HIT_PED);
+			m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_BULLET_PED);
 			m_sQueueSample.m_nFrequency += RandomDisplacement(m_sQueueSample.m_nFrequency >> 3);
 			m_sQueueSample.field_16 = 7;
 			m_sQueueSample.field_48 = 0.0f;
@@ -6289,7 +6288,7 @@ cAudioManager::ProcessPedOneShots(cPedParams *params)
 			m_sQueueSample.field_56 = 1;
 			break;
 		case SOUND_SPLASH:
-			m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_COLLISION_WATER;
+			m_sQueueSample.m_nSampleIndex = SFX_SPLASH_1;
 			m_sQueueSample.m_bBankIndex = 0;
 			m_sQueueSample.m_counter = iSound++;
 			processed = 1;
@@ -6372,10 +6371,10 @@ cAudioManager::ProcessPlane(cVehicleParams *params)
 }
 
 struct tVehicleSampleData {
-	eAudioSamples m_nAccelerationSampleIndex;
+	eSfxSample m_nAccelerationSampleIndex;
 	char m_bEngineSoundType;
 	char gap_5[3];
-	eAudioSamples m_nHornSample;
+	eSfxSample m_nHornSample;
 	int32 m_nHornFrequency;
 	char m_nSirenOrAlarmSample;
 	int m_nSirenOrAlarmFrequency;
@@ -6506,14 +6505,14 @@ cAudioManager::ProcessPlayersVehicleEngine(cVehicleParams *params, CAutomobile *
 				freq = (5000.f * (gasPedalAudio - 0.05f) * 20.f / 19) + 19000;
 				if(engineSoundType == 6) freq >>= 1;
 				AddPlayerCarSample((25.f * (gasPedalAudio - 0.05f) * 20.f / 19) + 40, freq,
-				                   (soundOffset + AUDIO_SAMPLE_VEHICLE_ENGINE_STOPPING_GENERIC),
+				                   (soundOffset + SFX_CAR_FINGER_OFF_ACCEL_1),
 				                   engineSoundType, 63, 0);
 			}
 		}
 		freq = (10000.f * gasPedalAudio) + 22050;
 		if(engineSoundType == 6) freq >>= 1;
 		AddPlayerCarSample(110 - (40.f * gasPedalAudio), freq,
-		                   (engineSoundType + AUDIO_SAMPLE_VEHICLE_ENGINE_IDLE_NONE), 0, 52, 1);
+		                   (engineSoundType + SFX_CAR_REV_10), 0, 52, 1);
 
 		CurrentPretendGear = max(1, currentGear);
 		LastAccel = accelerateState;
@@ -6547,7 +6546,7 @@ cAudioManager::ProcessPlayersVehicleEngine(cVehicleParams *params, CAutomobile *
 				SampleManager.StopChannel(m_bActiveSamples);
 				bAccelSampleStopped = 1;
 			}
-			AddPlayerCarSample(vol, freq, (engineSoundType + AUDIO_SAMPLE_PAYPHONE_RINGING), 0, 2, 1);
+			AddPlayerCarSample(vol, freq, (engineSoundType + SFX_PHONE_RING), 0, 2, 1);
 			LastAccel = accelerateState;
 
 			bHandbrakeOnLastFrame = automobile->bIsHandbrakeOn;
@@ -6646,7 +6645,7 @@ cAudioManager::ProcessPlayersVehicleEngine(cVehicleParams *params, CAutomobile *
 		}
 		freq = 27 * nCruising + freqModifier + 22050;
 		if(engineSoundType == 6) freq >>= 1;
-		AddPlayerCarSample(85, freq, (soundOffset + AUDIO_SAMPLE_VEHICLE_ENGINE_CHANGE_GEAR_GENERIC),
+		AddPlayerCarSample(85, freq, (soundOffset + SFX_CAR_AFTER_ACCEL_1),
 		                   engineSoundType, 64, 1);
 	}
 	LastAccel = accelerateState;
@@ -6683,9 +6682,9 @@ cAudioManager::ProcessPoliceCellBeatingScriptObject(uint8 sound)
 		if(distSquared < maxDist) {
 			m_sQueueSample.m_fDistance = sqrt(distSquared);
 			if(m_nTimeOfRecentCrime & 1)
-				sampleIndex = (m_anRandomTable[1] & 3) + AUDIO_SAMPLE_PED_HIT_1;
+				sampleIndex = (m_anRandomTable[1] & 3) + SFX_FIGHT_1;
 			else
-				sampleIndex = (m_anRandomTable[3] & 1) + AUDIO_SAMPLE_PED_HIT_BY_BAT;
+				sampleIndex = (m_anRandomTable[3] & 1) + SFX_BAT_HIT_LEFT;
 			m_sQueueSample.m_nSampleIndex = sampleIndex;
 			emittingVol = m_anRandomTable[0] % 50 + 55;
 			m_sQueueSample.m_bVolume =
@@ -6721,7 +6720,7 @@ void
 cAudioManager::ProcessPornCinema(uint8 sound)
 {
 
-	eAudioSamples sample;
+	eSfxSample sample;
 	uint32 time;
 	int32 rand;
 	float distSquared;
@@ -6730,47 +6729,47 @@ cAudioManager::ProcessPornCinema(uint8 sound)
 	switch(sound) {
 	case SCRIPT_SOUND_PORN_CINEMA_1_S:
 	case SCRIPT_SOUND_MISTY_SEX_S:
-		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_PORN_CINEMA_1_BACKGROUND_1;
+		m_sQueueSample.m_nSampleIndex = SFX_PORN_1_LOOP;
 		m_sQueueSample.m_bBankIndex = 0;
 		maxDist = 400.f;
-		sample = AUDIO_SAMPLE_PORN_CINEMA_1_SEX_1;
+		sample = SFX_PORN_1_GROAN_1;
 		m_sQueueSample.m_fSoundIntensity = 20.0f;
 		break;
 	case SCRIPT_SOUND_PORN_CINEMA_1_L:
 	case SCRIPT_SOUND_MISTY_SEX_L:
-		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_PORN_CINEMA_1_BACKGROUND_1;
+		m_sQueueSample.m_nSampleIndex = SFX_PORN_1_LOOP;
 		m_sQueueSample.m_bBankIndex = 0;
 		maxDist = 6400.f;
-		sample = AUDIO_SAMPLE_PORN_CINEMA_1_SEX_1;
+		sample = SFX_PORN_1_GROAN_1;
 		m_sQueueSample.m_fSoundIntensity = 80.0f;
 		break;
 	case SCRIPT_SOUND_PORN_CINEMA_2_S:
-		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_PORN_CINEMA_2_BACKGROUND_2;
+		m_sQueueSample.m_nSampleIndex = SFX_PORN_2_LOOP;
 		m_sQueueSample.m_bBankIndex = 0;
 		maxDist = 400.f;
-		sample = AUDIO_SAMPLE_PORN_CINEMA_2_SEX_1;
+		sample = SFX_PORN_2_GROAN_1;
 		m_sQueueSample.m_fSoundIntensity = 20.0f;
 		break;
 	case SCRIPT_SOUND_PORN_CINEMA_2_L:
-		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_PORN_CINEMA_2_BACKGROUND_2;
+		m_sQueueSample.m_nSampleIndex = SFX_PORN_2_LOOP;
 		m_sQueueSample.m_bBankIndex = 0;
 		maxDist = 6400.f;
-		sample = AUDIO_SAMPLE_PORN_CINEMA_2_SEX_1;
+		sample = SFX_PORN_2_GROAN_1;
 		m_sQueueSample.m_fSoundIntensity = 80.0f;
 		break;
 	case SCRIPT_SOUND_PORN_CINEMA_3_S:
-		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_PORN_CINEMA_3_BACKGROUND_3;
+		m_sQueueSample.m_nSampleIndex = SFX_PORN_3_LOOP;
 		m_sQueueSample.m_bBankIndex = 0;
 		maxDist = 400.f;
 		m_sQueueSample.m_fSoundIntensity = 20.0f;
-		sample = AUDIO_SAMPLE_PORN_CINEMA_3_SEX_1;
+		sample = SFX_PORN_3_GROAN_1;
 		break;
 	case SCRIPT_SOUND_PORN_CINEMA_3_L:
-		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_PORN_CINEMA_3_BACKGROUND_3;
+		m_sQueueSample.m_nSampleIndex = SFX_PORN_3_LOOP;
 		m_sQueueSample.m_bBankIndex = 0;
 		maxDist = 6400.f;
 		m_sQueueSample.m_fSoundIntensity = 80.0f;
-		sample = AUDIO_SAMPLE_PORN_CINEMA_3_SEX_1;
+		sample = SFX_PORN_3_GROAN_1;
 		break;
 	default: return;
 	}
@@ -6843,17 +6842,17 @@ cAudioManager::ProcessProjectiles()
 				m_sQueueSample.m_nSampleIndex = 81;
 				m_sQueueSample.m_bBankIndex = 0;
 				m_sQueueSample.m_nFrequency =
-				    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_WEAPON_ROCKET_PROCESS);
+				    SampleManager.GetSampleBaseFrequency(SFX_ROCKET_FLY);
 				m_sQueueSample.field_16 = 3;
 				break;
 			case WEAPONTYPE_MOLOTOV:
 				emittingVol = 50;
 				maxDist = 900.f;
 				m_sQueueSample.m_fSoundIntensity = 30.0;
-				m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_FIRE_PED;
+				m_sQueueSample.m_nSampleIndex = SFX_PED_ON_FIRE;
 				m_sQueueSample.m_bBankIndex = 0;
 				m_sQueueSample.m_nFrequency =
-				    32 * SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_FIRE_PED) / 25;
+				    32 * SampleManager.GetSampleBaseFrequency(SFX_PED_ON_FIRE) / 25;
 				m_sQueueSample.field_16 = 7;
 				break;
 			default: return;
@@ -6905,7 +6904,7 @@ cAudioManager::ProcessRainOnVehicle(cVehicleParams *params)
 				veh = params->m_pVehicle;
 				if(veh->m_bRainSamplesCounter > 4) veh->m_bRainSamplesCounter = 68;
 				m_sQueueSample.m_nSampleIndex =
-				    (m_anRandomTable[1] & 3) + AUDIO_SAMPLE_RAIN_ON_VEHICLE_1;
+				    (m_anRandomTable[1] & 3) + SFX_CAR_RAIN_1;
 				m_sQueueSample.m_bBankIndex = 0;
 				m_sQueueSample.m_bIsDistant = 0;
 				m_sQueueSample.field_16 = 9;
@@ -6961,10 +6960,10 @@ cAudioManager::ProcessReverseGear(cVehicleParams *params)
 		if(m_sQueueSample.m_bVolume) {
 			if(params->m_pVehicle->m_fGasPedal >= 0.0f) {
 				m_sQueueSample.m_counter = 62;
-				m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_REVERSE_GEAR_CONSTANT;
+				m_sQueueSample.m_nSampleIndex = SFX_REVERSE_GEAR_2;
 			} else {
 				m_sQueueSample.m_counter = 61;
-				m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_REVERSE_GEAR_ACCELERATING;
+				m_sQueueSample.m_nSampleIndex = SFX_REVERSE_GEAR;
 			}
 			m_sQueueSample.m_bBankIndex = 0;
 			m_sQueueSample.m_bIsDistant = 0;
@@ -7008,9 +7007,9 @@ cAudioManager::ProcessSawMillScriptObject(uint8 sound)
 		m_sQueueSample.m_bVolume =
 		    ComputeVolume(30, m_sQueueSample.m_fSoundIntensity, m_sQueueSample.m_fDistance);
 		if(m_sQueueSample.m_bVolume) {
-			m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_SAWMILL_1;
+			m_sQueueSample.m_nSampleIndex = SFX_SAWMILL_LOOP;
 			m_sQueueSample.m_bBankIndex = 0;
-			m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_SAWMILL_1);
+			m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_SAWMILL_LOOP);
 			m_sQueueSample.m_counter = 0;
 			m_sQueueSample.m_bIsDistant = 0;
 			m_sQueueSample.m_nLoopCount = 0;
@@ -7030,7 +7029,7 @@ cAudioManager::ProcessSawMillScriptObject(uint8 sound)
 			m_sQueueSample.m_bVolume =
 			    ComputeVolume(70, m_sQueueSample.m_fSoundIntensity, m_sQueueSample.m_fDistance);
 			if(m_sQueueSample.m_bVolume) {
-				m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_SAWMILL_2;
+				m_sQueueSample.m_nSampleIndex = SFX_SAWMILL_CUT_WOOD;
 				m_sQueueSample.m_bBankIndex = 0;
 				m_sQueueSample.m_nFrequency =
 				    SampleManager.GetSampleBaseFrequency(m_sQueueSample.m_nSampleIndex);
@@ -7086,9 +7085,9 @@ cAudioManager::ProcessShopScriptObject(uint8 sound)
 		m_sQueueSample.m_bVolume =
 		    ComputeVolume(30, m_sQueueSample.m_fSoundIntensity, m_sQueueSample.m_fDistance);
 		if(m_sQueueSample.m_bVolume) {
-			m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_SHOP_1;
+			m_sQueueSample.m_nSampleIndex = SFX_SHOP_LOOP;
 			m_sQueueSample.m_bBankIndex = 0;
-			m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_SHOP_1);
+			m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_SHOP_LOOP);
 			m_sQueueSample.m_counter = 0;
 			m_sQueueSample.m_bIsDistant = 0;
 			m_sQueueSample.m_nLoopCount = 0;
@@ -7109,7 +7108,7 @@ cAudioManager::ProcessShopScriptObject(uint8 sound)
 			    ComputeVolume(70, m_sQueueSample.m_fSoundIntensity, m_sQueueSample.m_fDistance);
 			if(m_sQueueSample.m_bVolume) {
 				rand = m_anRandomTable[1] & 1;
-				m_sQueueSample.m_nSampleIndex = rand + AUDIO_SAMPLE_SHOP_2;
+				m_sQueueSample.m_nSampleIndex = rand + SFX_SHOP_TILL_1;
 				m_sQueueSample.m_bBankIndex = 0;
 				m_sQueueSample.m_nFrequency =
 				    SampleManager.GetSampleBaseFrequency(m_sQueueSample.m_nSampleIndex);
@@ -7172,12 +7171,12 @@ cAudioManager::ProcessTrainNoise(cVehicleParams *params)
 			m_sQueueSample.m_bVolume = ComputeVolume(emittingVol, 300.f, m_sQueueSample.m_fDistance);
 			if(m_sQueueSample.m_bVolume) {
 				m_sQueueSample.m_counter = 32;
-				m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_TRAIN_FAR;
+				m_sQueueSample.m_nSampleIndex = SFX_TRAIN_FAR;
 				m_sQueueSample.m_bBankIndex = 0;
 				m_sQueueSample.m_bIsDistant = 0;
 				m_sQueueSample.field_16 = 2;
 				m_sQueueSample.m_nFrequency =
-				    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_TRAIN_FAR);
+				    SampleManager.GetSampleBaseFrequency(SFX_TRAIN_FAR);
 				m_sQueueSample.m_nLoopCount = 0;
 				m_sQueueSample.m_bEmittingVolume = emittingVol;
 				m_sQueueSample.m_nLoopStart =
@@ -7197,12 +7196,12 @@ cAudioManager::ProcessTrainNoise(cVehicleParams *params)
 			m_sQueueSample.m_bVolume = ComputeVolume(emittingVol, 70.f, m_sQueueSample.m_fDistance);
 			if(m_sQueueSample.m_bVolume) {
 				m_sQueueSample.m_counter = 33;
-				m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_TRAIN_CLOSE;
+				m_sQueueSample.m_nSampleIndex = SFX_TRAIN_NEAR;
 				m_sQueueSample.m_bBankIndex = 0;
 				m_sQueueSample.m_bIsDistant = 0;
 				m_sQueueSample.field_16 = 5;
 				m_sQueueSample.m_nFrequency =
-				    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_TRAIN_CLOSE) +
+				    SampleManager.GetSampleBaseFrequency(SFX_TRAIN_NEAR) +
 				    100 * m_sQueueSample.m_nEntityIndex % 987;
 				m_sQueueSample.m_nLoopCount = 0;
 				m_sQueueSample.m_bEmittingVolume = emittingVol;
@@ -7335,7 +7334,7 @@ cAudioManager::ProcessVehicleDoors(cVehicleParams *params)
 					if(m_sQueueSample.m_bVolume) {
 						m_sQueueSample.m_counter = i + 6;
 						m_sQueueSample.m_nSampleIndex =
-						    m_anRandomTable[1] % 6 + AUDIO_SAMPLE_CAR_DOOR_MOVEMENT_1;
+						    m_anRandomTable[1] % 6 + SFX_COL_CAR_PANEL_1;
 						m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(
 						                                  m_sQueueSample.m_nSampleIndex) +
 						                              RandomDisplacement(1000);
@@ -7460,13 +7459,13 @@ cAudioManager::ProcessVehicleReverseWarning(cVehicleParams *params)
 		m_sQueueSample.m_bVolume = ComputeVolume(60, 50.f, m_sQueueSample.m_fDistance);
 		if(m_sQueueSample.m_bVolume) {
 			m_sQueueSample.m_counter = 12;
-			m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_VEHICLE_REVERSE_WARNING;
+			m_sQueueSample.m_nSampleIndex = SFX_REVERSE_WARNING;
 			m_sQueueSample.m_bBankIndex = 0;
 			m_sQueueSample.m_bIsDistant = 0;
 			m_sQueueSample.field_16 = 2;
 			m_sQueueSample.m_nFrequency =
 			    (100 * m_sQueueSample.m_nEntityIndex & 1023) +
-			    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_VEHICLE_REVERSE_WARNING);
+			    SampleManager.GetSampleBaseFrequency(SFX_REVERSE_WARNING);
 			m_sQueueSample.m_nLoopCount = 0;
 			m_sQueueSample.m_bEmittingVolume = 60;
 			m_sQueueSample.m_nLoopStart =
@@ -7508,13 +7507,13 @@ cAudioManager::ProcessVehicleRoadNoise(cVehicleParams *params)
 					m_sQueueSample.m_bIsDistant = 0;
 					m_sQueueSample.field_16 = 3;
 					if(params->m_pVehicle->m_nSurfaceTouched == SURFACE_PUDDLE) {
-						m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_LOOPING_WATER;
+						m_sQueueSample.m_nSampleIndex = SFX_BOAT_WATER_LOOP;
 						freq = 6050 * emittingVol / 30 + 16000;
 					} else {
-						m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_VEHICLE_ROAD_NOISE;
+						m_sQueueSample.m_nSampleIndex = SFX_ROAD_NOISE;
 						modificator = m_sQueueSample.m_fDistance * 1.f / 95.f * 0.5f;
 						sampleFreq = SampleManager.GetSampleBaseFrequency(
-						    AUDIO_SAMPLE_VEHICLE_ROAD_NOISE);
+						    SFX_ROAD_NOISE);
 						freq = (sampleFreq * modificator) + ((3 * sampleFreq) >> 2);
 					}
 					m_sQueueSample.m_nFrequency = freq;
@@ -7602,7 +7601,7 @@ cAudioManager::ProcessVehicleSkidding(cVehicleParams *params)
 			switch(params->m_pVehicle->m_nSurfaceTouched) {
 			case SURFACE_GRASS:
 			case SURFACE_HEDGE:
-				m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_COLLISION_LOOPING_GRASS;
+				m_sQueueSample.m_nSampleIndex = SFX_RAIN;
 				emittingVol /= 4;
 				m_sQueueSample.m_nFrequency = (signed __int64)(13000.f * skidVal + 35000.f);
 				m_sQueueSample.m_bVolume /= 4;
@@ -7611,12 +7610,12 @@ cAudioManager::ProcessVehicleSkidding(cVehicleParams *params)
 			case SURFACE_DIRTTRACK:
 			case SURFACE_SAND:
 			case SURFACE_PUDDLE:
-				m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_COLLISION_LOOPING_SOFT;
+				m_sQueueSample.m_nSampleIndex = SFX_GRAVEL_SKID;
 				m_sQueueSample.m_nFrequency = 6000.f * skidVal + 10000.f;
 				break;
 
 			default:
-				m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_VEHICLE_SKIDDING;
+				m_sQueueSample.m_nSampleIndex = SFX_SKID;
 				m_sQueueSample.m_nFrequency = 5000.f * skidVal + 11000.f;
 				break;
 			}
@@ -7652,7 +7651,7 @@ void cAudioManager::ProcessWaterCannon(int32)
 				    ComputeVolume(50, m_sQueueSample.m_fSoundIntensity, m_sQueueSample.m_fDistance);
 				if(m_sQueueSample.m_bVolume) {
 					m_sQueueSample.m_fSoundIntensity = 900.0f;
-					m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_JUMBO_TAXI_SOUND;
+					m_sQueueSample.m_nSampleIndex = SFX_JUMBO_TAXI;
 					m_sQueueSample.m_bBankIndex = 0;
 					m_sQueueSample.m_nFrequency = 15591;
 					m_sQueueSample.field_16 = 5;
@@ -7684,12 +7683,12 @@ cAudioManager::ProcessWeather(int32 id)
 
 	if(m_asAudioEntities[id].m_AudioEvents && m_asAudioEntities[id].m_awAudioEvent[0] == SOUND_LIGHTNING) {
 		if(m_asAudioEntities[id].m_afVolume[0] >= 10.f) {
-			m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_EXPLOSION_CAR;
+			m_sQueueSample.m_nSampleIndex = SFX_EXPLOSION_1;
 			m_sQueueSample.m_bBankIndex = 0;
 			m_sQueueSample.m_nFrequency = RandomDisplacement(500) + 4000;
 			vol = (m_asAudioEntities[id].m_afVolume[0] - 10.f) + 40;
 		} else {
-			m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_WEAPON_GRENADE_EXPLOSION;
+			m_sQueueSample.m_nSampleIndex = SFX_EXPLOSION_2;
 			m_sQueueSample.m_bBankIndex = 0;
 			m_sQueueSample.m_nFrequency = RandomDisplacement(500) + 4000;
 			vol = (m_asAudioEntities[id].m_afVolume[0]) + 35;
@@ -7711,9 +7710,9 @@ cAudioManager::ProcessWeather(int32 id)
 		AddSampleToRequestedQueue();
 	}
 	if(CWeather::Rain > 0.0f && (!CCullZones::CamNoRain() || !CCullZones::PlayerNoRain())) {
-		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_COLLISION_LOOPING_GRASS;
+		m_sQueueSample.m_nSampleIndex = SFX_RAIN;
 		m_sQueueSample.m_nFrequency =
-		    SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_COLLISION_LOOPING_GRASS);
+		    SampleManager.GetSampleBaseFrequency(SFX_RAIN);
 		m_sQueueSample.m_bVolume = (uint8)(25.f * CWeather::Rain);
 		m_sQueueSample.m_counter = 4;
 		m_sQueueSample.m_bBankIndex = 0;
@@ -7753,12 +7752,12 @@ cAudioManager::ProcessWetRoadNoise(cVehicleParams *params)
 				m_sQueueSample.m_bVolume = ComputeVolume(emittingVol, 30.f, m_sQueueSample.m_fDistance);
 				if(m_sQueueSample.m_bVolume) {
 					m_sQueueSample.m_counter = 1;
-					m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_VEHICLE_ROAD_NOISE;
+					m_sQueueSample.m_nSampleIndex = SFX_ROAD_NOISE;
 					m_sQueueSample.m_bBankIndex = 0;
 					m_sQueueSample.m_bIsDistant = 0;
 					m_sQueueSample.field_16 = 3;
 					modificator = m_sQueueSample.m_fDistance * 1.f / 3.f * 0.5f;
-					freq = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_VEHICLE_ROAD_NOISE);
+					freq = SampleManager.GetSampleBaseFrequency(SFX_ROAD_NOISE);
 					m_sQueueSample.m_nFrequency = freq + freq * modificator;
 					m_sQueueSample.m_nLoopCount = 0;
 					m_sQueueSample.m_bEmittingVolume = emittingVol;
@@ -7800,9 +7799,9 @@ cAudioManager::ProcessWorkShopScriptObject(uint8 sound)
 		m_sQueueSample.m_bVolume =
 		    ComputeVolume(30, m_sQueueSample.m_fSoundIntensity, m_sQueueSample.m_fDistance);
 		if(m_sQueueSample.m_bVolume) {
-			m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_WORK_SHOP;
+			m_sQueueSample.m_nSampleIndex = SFX_WORKSHOP_1;
 			m_sQueueSample.m_bBankIndex = 0;
-			m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_WORK_SHOP);
+			m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_WORKSHOP_1);
 			m_sQueueSample.m_counter = 0;
 			m_sQueueSample.m_bIsDistant = 0;
 			m_sQueueSample.m_nLoopCount = 0;
@@ -8099,9 +8098,9 @@ cAudioManager::ServicePoliceRadioChannel(int32 wantedLevel)
 				} else {
 					SampleManager.InitialiseChannel(policeChannel, sample, 0);
 					switch(sample) {
-					case AUDIO_SAMPLE_POLICE_SCANNER_SMALL_CRACKLE_1:
-					case AUDIO_SAMPLE_POLICE_SCANNER_SMALL_CRACKLE_2:
-					case AUDIO_SAMPLE_POLICE_SCANNER_SMALL_CRACKLE_3:
+					case SFX_POLICE_RADIO_MESSAGE_NOISE_1:
+					case SFX_POLICE_RADIO_MESSAGE_NOISE_2:
+					case SFX_POLICE_RADIO_MESSAGE_NOISE_3:
 						freq = m_anRandomTable[4] % 2000 + 10025;
 						bChannelOpen = bChannelOpen == 0;
 						break;
@@ -8226,13 +8225,13 @@ cAudioManager::SetLoopingCollisionRequestedSfxFreqAndGetVol(cAudioCollision *aud
 	if(surface1 == SURFACE_GRASS || surface2 == SURFACE_GRASS || surface1 == SURFACE_HEDGE ||
 	   surface2 == SURFACE_HEDGE) {
 		ratio = GetCollisionRatio(audioCollision->m_fIntensity2, 0.0001f, 0.09f, 0.0899f);
-		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_COLLISION_LOOPING_GRASS;
+		m_sQueueSample.m_nSampleIndex = SFX_RAIN;
 		m_sQueueSample.m_nFrequency = 13000.f * ratio + 35000;
 		vol = 50.f * ratio;
 	} else {
 		if(surface1 == SURFACE_PUDDLE || surface2 == SURFACE_PUDDLE) {
 			ratio = GetCollisionRatio(audioCollision->m_fIntensity2, 0.0001f, 0.09f, 0.0899f);
-			m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_LOOPING_WATER;
+			m_sQueueSample.m_nSampleIndex = SFX_BOAT_WATER_LOOP;
 			m_sQueueSample.m_nFrequency = 6050.f * ratio + 16000;
 			vol = 30.f * ratio;
 
@@ -8240,13 +8239,13 @@ cAudioManager::SetLoopingCollisionRequestedSfxFreqAndGetVol(cAudioCollision *aud
 			if(surface1 == SURFACE_DIRT || surface2 == SURFACE_DIRT || surface1 == SURFACE_DIRTTRACK ||
 			   surface2 == SURFACE_DIRTTRACK || surface1 == SURFACE_SAND || surface2 == SURFACE_SAND) {
 				ratio = GetCollisionRatio(audioCollision->m_fIntensity2, 0.0001f, 0.09f, 0.0899f);
-				m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_COLLISION_LOOPING_SOFT;
+				m_sQueueSample.m_nSampleIndex = SFX_GRAVEL_SKID;
 				m_sQueueSample.m_nFrequency = 6000.f * ratio + 10000;
 				vol = 50.f * ratio;
 			} else {
 				if(surface1 == SURFACE_FLESH || surface2 == SURFACE_FLESH) { return 0; }
 				ratio = GetCollisionRatio(audioCollision->m_fIntensity2, 0.0001f, 0.09f, 0.0899f);
-				m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_COLLISION_LOOPING_GENERIC;
+				m_sQueueSample.m_nSampleIndex = SFX_SCRAPE_CAR_1;
 				m_sQueueSample.m_nFrequency = 10000.f * ratio + 10000;
 				vol = 40.f * ratio;
 			}
@@ -8330,17 +8329,17 @@ void
 cAudioManager::SetUpOneShotCollisionSound(cAudioCollision *col)
 {
 	static constexpr int32 gOneShotCol[] = {
-	    AUDIO_SAMPLE_COLLISION_PAVEMENT,   AUDIO_SAMPLE_COLLISION_PAVEMENT,   AUDIO_SAMPLE_COLLISION_MUFFLED,
-	    AUDIO_SAMPLE_COLLISION_DIRT,       AUDIO_SAMPLE_COLLISION_MUD,        AUDIO_SAMPLE_COLLISION_PAVEMENT,
-	    AUDIO_SAMPLE_COLLISION_METAL,      AUDIO_SAMPLE_COLLISION_MUFFLED,    AUDIO_SAMPLE_COLLISION_HARD,
-	    AUDIO_SAMPLE_COLLISION_METAL_DOOR, AUDIO_SAMPLE_CAR_DOOR_MOVEMENT_1,  AUDIO_SAMPLE_COLLISION_METAL_11,
-	    AUDIO_SAMPLE_COLLISION_HARD,       AUDIO_SAMPLE_COLLISION_METAL_13,   AUDIO_SAMPLE_COLLISION_METAL_14,
-	    AUDIO_SAMPLE_COLLISION_METAL_14,   AUDIO_SAMPLE_COLLISION_FENCE,      AUDIO_SAMPLE_COLLISION_FLESH,
-	    AUDIO_SAMPLE_COLLISION_SAND,       AUDIO_SAMPLE_COLLISION_WATER,      AUDIO_SAMPLE_COLLISION_WOOD,
-	    AUDIO_SAMPLE_COLLISION_WOOD_BOX,   AUDIO_SAMPLE_COLLISION_WOOD_PLANK, AUDIO_SAMPLE_COLLISION_MUFFLED,
-	    AUDIO_SAMPLE_COLLISION_MUFFLED,    AUDIO_SAMPLE_COLLISION_HEDGE,      AUDIO_SAMPLE_COLLISION_PAVEMENT,
-	    AUDIO_SAMPLE_COLLISION_METAL_27,   AUDIO_SAMPLE_COLLISION_METAL_28,   AUDIO_SAMPLE_COLLISION_RUBBER,
-	    AUDIO_SAMPLE_COLLISION_LOOSE,      AUDIO_SAMPLE_COLLISION_PAVEMENT,   AUDIO_SAMPLE_COLLISION_GATE};
+	    SFX_COL_TARMAC_1,   SFX_COL_TARMAC_1,   SFX_COL_GRASS_1,
+	    SFX_COL_GRAVEL_1,       SFX_COL_MUD_1,        SFX_COL_TARMAC_1,
+	    SFX_COL_CAR_1,      SFX_COL_GRASS_1,    SFX_COL_SCAFFOLD_POLE_1,
+	    SFX_COL_GARAGE_DOOR_1, SFX_COL_CAR_PANEL_1,  SFX_COL_THICK_METAL_PLATE_1,
+	    SFX_COL_SCAFFOLD_POLE_1,       SFX_COL_LAMP_POST_1,   SFX_COL_HYDRANT_1,
+	    SFX_COL_HYDRANT_1,   SFX_COL_METAL_CHAIN_FENCE_1,      SFX_COL_PED_1,
+	    SFX_COL_SAND_1,       SFX_SPLASH_1,      SFX_COL_WOOD_CRATES_1,
+	    SFX_COL_WOOD_BENCH_1,   SFX_COL_WOOD_SOLID_1, SFX_COL_GRASS_1,
+	    SFX_COL_GRASS_1,    SFX_COL_VEG_1,      SFX_COL_TARMAC_1,
+	    SFX_COL_CONTAINER_1,   SFX_COL_NEWS_VENDOR_1,   SFX_TYRE_BUMP,
+	    SFX_COL_CARDBOARD_1,      SFX_COL_TARMAC_1,   SFX_COL_GATE};
 
 	int16 s1;
 	int16 s2;
@@ -8371,37 +8370,37 @@ cAudioManager::SetUpOneShotCollisionSound(cAudioCollision *col)
 			if(m_sQueueSample.m_bVolume) {
 				m_sQueueSample.m_nSampleIndex = gOneShotCol[s1];
 				switch(m_sQueueSample.m_nSampleIndex) {
-				case AUDIO_SAMPLE_COLLISION_PAVEMENT:
+				case SFX_COL_TARMAC_1:
 					m_sQueueSample.m_nSampleIndex += m_anRandomTable[3] % 5;
 					break;
-				case AUDIO_SAMPLE_CAR_DOOR_MOVEMENT_1:
+				case SFX_COL_CAR_PANEL_1:
 					m_sQueueSample.m_nSampleIndex += m_anRandomTable[0] % 6;
 					break;
-				case AUDIO_SAMPLE_COLLISION_METAL_13:
+				case SFX_COL_LAMP_POST_1:
 					m_sQueueSample.m_nSampleIndex += m_anRandomTable[1] & 1;
 					break;
-				case AUDIO_SAMPLE_COLLISION_FENCE:
+				case SFX_COL_METAL_CHAIN_FENCE_1:
 					m_sQueueSample.m_nSampleIndex += m_anRandomTable[3] & 3;
 					break;
-				case AUDIO_SAMPLE_COLLISION_FLESH:
+				case SFX_COL_PED_1:
 					m_sQueueSample.m_nSampleIndex += m_anRandomTable[4] % 5;
 					break;
-				case AUDIO_SAMPLE_COLLISION_WOOD:
+				case SFX_COL_WOOD_CRATES_1:
 					m_sQueueSample.m_nSampleIndex += m_anRandomTable[4] & 3;
 					break;
-				case AUDIO_SAMPLE_COLLISION_WOOD_BOX:
+				case SFX_COL_WOOD_BENCH_1:
 					m_sQueueSample.m_nSampleIndex += m_anRandomTable[1] & 3;
 					break;
-				case AUDIO_SAMPLE_COLLISION_HEDGE:
+				case SFX_COL_VEG_1:
 					m_sQueueSample.m_nSampleIndex += m_anRandomTable[2] % 5;
 					break;
-				case AUDIO_SAMPLE_COLLISION_METAL_28:
+				case SFX_COL_NEWS_VENDOR_1:
 					m_sQueueSample.m_nSampleIndex += m_anRandomTable[2] % 3;
 					break;
-				case AUDIO_SAMPLE_COLLISION_METAL:
+				case SFX_COL_CAR_1:
 					m_sQueueSample.m_nSampleIndex += m_anRandomTable[1] % 5;
 					break;
-				case AUDIO_SAMPLE_COLLISION_LOOSE:
+				case SFX_COL_CARDBOARD_1:
 					m_sQueueSample.m_nSampleIndex += m_anRandomTable[3] & 1;
 					break;
 				default: break;
@@ -8487,19 +8486,19 @@ cAudioManager::SetupCrimeReport()
 		if(j < 36) {
 			if(policeChannelTimer != 60) {
 				crimesSamples[policeChannelTimerSeconds] =
-				    m_anRandomTable[4] % 3 + AUDIO_SAMPLE_POLICE_SCANNER_SMALL_CRACKLE_1;
+				    m_anRandomTable[4] % 3 + SFX_POLICE_RADIO_MESSAGE_NOISE_1;
 				++policeChannelTimer;
 				policeChannelTimerSeconds = (policeChannelTimerSeconds + 1) % 60;
 			}
 			if(policeChannelTimer != 60) {
 				crimesSamples[policeChannelTimerSeconds] =
-				    m_anRandomTable[0] % 3 + AUDIO_SAMPLE_POLICE_SCANNER_WE_GOT_1;
+				    m_anRandomTable[0] % 3 + SFX_WEVE_GOT;
 				++policeChannelTimer;
 				policeChannelTimerSeconds = (policeChannelTimerSeconds + 1) % 60;
 			}
 			if(policeChannelTimer != 60) {
 				crimesSamples[policeChannelTimerSeconds] =
-				    (m_anRandomTable[1] & 1) + AUDIO_SAMPLE_POLICE_SCANNER_TEN_1;
+				    (m_anRandomTable[1] & 1) + SFX_A_10_1;
 				++policeChannelTimer;
 				policeChannelTimerSeconds = (policeChannelTimerSeconds + 1) % 60;
 			}
@@ -8512,19 +8511,19 @@ cAudioManager::SetupCrimeReport()
 			}
 			if(policeChannelTimer != 60) {
 				crimesSamples[policeChannelTimerSeconds] =
-				    crimes[i].type + AUDIO_SAMPLE_POLICE_SCANNER_TEN_2;
+				    crimes[i].type + SFX_A_10_2;
 				++policeChannelTimer;
 				policeChannelTimerSeconds = (policeChannelTimerSeconds + 1) % 60;
 			}
 			if(policeChannelTimer != 60) {
-				crimesSamples[policeChannelTimerSeconds] = AUDIO_SAMPLE_POLICE_SCANNER_IN;
+				crimesSamples[policeChannelTimerSeconds] = SFX_IN;
 				++policeChannelTimer;
 				policeChannelTimerSeconds = (policeChannelTimerSeconds + 1) % 60;
 			}
-			if(sampleIndex == AUDIO_SAMPLE_POLICE_SCANNER_ZONE_SHORESIDE &&
+			if(sampleIndex == SFX_POLICE_RADIO_SHORESIDE_VALE &&
 			   (strcmp(zone->name, SubZo2Label) == 0 || strcmp(zone->name, SubZo3Label) == 0)) {
 				if(policeChannelTimer != 60) {
-					crimesSamples[policeChannelTimerSeconds] = AUDIO_SAMPLE_POLICE_SCANNER_NORTH;
+					crimesSamples[policeChannelTimerSeconds] = SFX_NORTH;
 					++policeChannelTimer;
 					policeChannelTimerSeconds = (policeChannelTimerSeconds + 1) % 60;
 				}
@@ -8533,7 +8532,7 @@ cAudioManager::SetupCrimeReport()
 					AgeCrimes();
 					return 1;
 				}
-				crimesSamples[policeChannelTimerSeconds] = AUDIO_SAMPLE_POLICE_SCANNER_EAST;
+				crimesSamples[policeChannelTimerSeconds] = SFX_EAST;
 				++policeChannelTimer;
 				policeChannelTimerSeconds = (policeChannelTimerSeconds + 1) % 60;
 			}
@@ -8547,14 +8546,14 @@ cAudioManager::SetupCrimeReport()
 				if(halfY - quarterY > crimes[i].position.y) {
 					if(policeChannelTimer != 60) {
 						crimesSamples[policeChannelTimerSeconds] =
-						    AUDIO_SAMPLE_POLICE_SCANNER_SOUTH;
+						    SFX_SOUTH;
 						++policeChannelTimer;
 						policeChannelTimerSeconds = (policeChannelTimerSeconds + 1) % 60;
 					}
 					processed = 1;
 				}
 			} else if(policeChannelTimer != 60) {
-				crimesSamples[policeChannelTimerSeconds] = AUDIO_SAMPLE_POLICE_SCANNER_NORTH;
+				crimesSamples[policeChannelTimerSeconds] = SFX_NORTH;
 				++policeChannelTimer;
 				policeChannelTimerSeconds = (policeChannelTimerSeconds + 1) % 60;
 				processed = 1;
@@ -8572,7 +8571,7 @@ cAudioManager::SetupCrimeReport()
 						if(policeChannelTimer != 60) {
 							crimesSamples[policeChannelTimerSeconds] =
 							    m_anRandomTable[2] % 3 +
-							    AUDIO_SAMPLE_POLICE_SCANNER_SMALL_CRACKLE_1;
+							    SFX_POLICE_RADIO_MESSAGE_NOISE_1;
 							++policeChannelTimer;
 							policeChannelTimerSeconds =
 							    (policeChannelTimerSeconds + 1) % 60;
@@ -8587,17 +8586,17 @@ cAudioManager::SetupCrimeReport()
 						AgeCrimes();
 						return 1;
 					}
-					crimesSamples[policeChannelTimerSeconds] = AUDIO_SAMPLE_POLICE_SCANNER_CENTRAL;
+					crimesSamples[policeChannelTimerSeconds] = SFX_CENTRAL;
 					++policeChannelTimer;
 					policeChannelTimerSeconds = (policeChannelTimerSeconds + 1) % 60;
 				}
 				if(policeChannelTimer != 60) {
-					crimesSamples[policeChannelTimerSeconds] = AUDIO_SAMPLE_POLICE_SCANNER_WEST;
+					crimesSamples[policeChannelTimerSeconds] = SFX_WEST;
 					++policeChannelTimer;
 					policeChannelTimerSeconds = (policeChannelTimerSeconds + 1) % 60;
 				}
 			} else if(policeChannelTimer != 60) {
-				crimesSamples[policeChannelTimerSeconds] = AUDIO_SAMPLE_POLICE_SCANNER_EAST;
+				crimesSamples[policeChannelTimerSeconds] = SFX_EAST;
 				++policeChannelTimer;
 				policeChannelTimerSeconds = (policeChannelTimerSeconds + 1) % 60;
 			}
@@ -8608,7 +8607,7 @@ cAudioManager::SetupCrimeReport()
 			}
 			if(policeChannelTimer != 60) {
 				crimesSamples[policeChannelTimerSeconds] =
-				    m_anRandomTable[2] % 3 + AUDIO_SAMPLE_POLICE_SCANNER_SMALL_CRACKLE_1;
+				    m_anRandomTable[2] % 3 + SFX_POLICE_RADIO_MESSAGE_NOISE_1;
 				++policeChannelTimer;
 				policeChannelTimerSeconds = (policeChannelTimerSeconds + 1) % 60;
 			}
@@ -8635,14 +8634,14 @@ cAudioManager::SetupJumboFlySound(uint8 emittingVol)
 	int32 vol = ComputeVolume(emittingVol, 440.0f, m_sQueueSample.m_fDistance);
 	m_sQueueSample.m_bVolume = vol;
 	if(m_sQueueSample.m_bVolume) {
-		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_JUMBO_FLY_SOUND;
+		m_sQueueSample.m_nSampleIndex = SFX_JUMBO_DIST_FLY;
 		m_sQueueSample.m_counter = 0;
 		m_sQueueSample.m_bBankIndex = 0;
 		m_sQueueSample.m_bIsDistant = 0;
 		m_sQueueSample.field_16 = 1;
 		m_sQueueSample.m_bEmittingVolume = emittingVol;
 		m_sQueueSample.m_nLoopCount = 0;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_JUMBO_FLY_SOUND);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_JUMBO_DIST_FLY);
 		m_sQueueSample.m_nLoopStart = SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
 		m_sQueueSample.m_fSoundIntensity = 440.0f;
 		m_sQueueSample.field_56 = 0;
@@ -8664,11 +8663,11 @@ cAudioManager::SetupJumboRumbleSound(uint8 emittingVol)
 
 	if(m_sQueueSample.m_bVolume) {
 		m_sQueueSample.m_counter = 5;
-		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_JUMBO_RUMBLE_SOUND;
+		m_sQueueSample.m_nSampleIndex = SFX_JUMBO_RUMBLE;
 		m_sQueueSample.m_bBankIndex = 0;
 		m_sQueueSample.m_bIsDistant = 1;
 		m_sQueueSample.field_16 = 1;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(AUDIO_SAMPLE_JUMBO_RUMBLE_SOUND);
+		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_JUMBO_RUMBLE);
 		m_sQueueSample.m_nLoopCount = 0;
 		m_sQueueSample.m_bEmittingVolume = emittingVol;
 		m_sQueueSample.m_nLoopStart = SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
@@ -8682,7 +8681,7 @@ cAudioManager::SetupJumboRumbleSound(uint8 emittingVol)
 		m_sQueueSample.m_bRequireReflection = 0;
 		AddSampleToRequestedQueue();
 		m_sQueueSample.m_counter = 6;
-		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_JUMBO_RUMBLE_SOUND;
+		m_sQueueSample.m_nSampleIndex = SFX_JUMBO_RUMBLE;
 		m_sQueueSample.m_nFrequency += 200;
 		m_sQueueSample.m_bOffset = maxVolume;
 		AddSampleToRequestedQueue();
@@ -8702,7 +8701,7 @@ cAudioManager::SetupJumboTaxiSound(uint8 vol)
 
 	if(m_sQueueSample.m_bVolume) {
 		m_sQueueSample.m_counter = 1;
-		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_JUMBO_TAXI_SOUND;
+		m_sQueueSample.m_nSampleIndex = SFX_JUMBO_TAXI;
 		m_sQueueSample.m_bBankIndex = 0;
 		m_sQueueSample.m_bIsDistant = 0;
 		m_sQueueSample.field_16 = 1;
@@ -8731,7 +8730,7 @@ cAudioManager::SetupJumboWhineSound(uint8 emittingVol, int32 freq)
 
 	if(m_sQueueSample.m_bVolume) {
 		m_sQueueSample.m_counter = 2;
-		m_sQueueSample.m_nSampleIndex = AUDIO_SAMPLE_JUMBO_WHINE_SOUND;
+		m_sQueueSample.m_nSampleIndex = SFX_JUMBO_WHINE;
 		m_sQueueSample.m_bBankIndex = 0;
 		m_sQueueSample.m_bIsDistant = 0;
 		m_sQueueSample.field_16 = 1;
@@ -8762,9 +8761,9 @@ cAudioManager::SetupPedComments(cPedParams *params, uint32 sound)
 
 	if(ped) {
 		switch(sound) {
-		case SOUND_AMMUNATION_WELCOME_1: pedComment.m_nSampleIndex = AUDIO_SAMPLE_AMMUNATION_WELCOME_1; break;
-		case SOUND_AMMUNATION_WELCOME_2: pedComment.m_nSampleIndex = AUDIO_SAMPLE_AMMUNATION_WELCOME_2; break;
-		case SOUND_AMMUNATION_WELCOME_3: pedComment.m_nSampleIndex = AUDIO_SAMPLE_AMMUNATION_WELCOME_3; break;
+		case SOUND_AMMUNATION_WELCOME_1: pedComment.m_nSampleIndex = SFX_AMMU_D; break;
+		case SOUND_AMMUNATION_WELCOME_2: pedComment.m_nSampleIndex = SFX_AMMU_E; break;
+		case SOUND_AMMUNATION_WELCOME_3: pedComment.m_nSampleIndex = SFX_AMMU_F; break;
 		default:
 			pedComment.m_nSampleIndex = GetPedCommentSfx(ped, sound);
 			if(pedComment.m_nSampleIndex == NO_SAMPLE) return;
@@ -8809,7 +8808,7 @@ cAudioManager::SetupPedComments(cPedParams *params, uint32 sound)
 			maxDist = 160000.f;
 			soundIntensity = 400.f;
 			pedComment.m_nSampleIndex = m_anRandomTable[m_sQueueSample.m_nEntityIndex & 3] % 29 +
-			                            AUDIO_SAMPLE_POLICE_HELI_FOUND_PLAYER_1;
+			                            SFX_POLICE_HELI_1;
 			break;
 		case SOUND_PED_BODYCAST_HIT:
 			if(CTimer::GetTimeInMilliseconds() <= audioLogicTimers[8]) return;
@@ -8817,20 +8816,20 @@ cAudioManager::SetupPedComments(cPedParams *params, uint32 sound)
 			soundIntensity = 50.f;
 			audioLogicTimers[8] = CTimer::GetTimeInMilliseconds() + 500;
 			pedComment.m_nSampleIndex =
-			    (m_anRandomTable[m_sQueueSample.m_nEntityIndex & 3] & 3) + AUDIO_SAMPLE_PED_BODYCAST_HIT_1;
+			    (m_anRandomTable[m_sQueueSample.m_nEntityIndex & 3] & 3) + SFX_PLASTER_BLOKE_1;
 			break;
 		case SOUND_INJURED_PED_MALE_OUCH:
 		case SOUND_8A:
 			maxDist = 2500.f;
 			soundIntensity = 50.f;
 			pedComment.m_nSampleIndex = m_anRandomTable[m_sQueueSample.m_nEntityIndex & 3] % 15 +
-			                            AUDIO_SAMPLE_INJURED_PED_MALE_OUCH_1;
+			                            SFX_GENERIC_MALE_GRUNT_1;
 			break;
 		case SOUND_INJURED_PED_FEMALE:
 			maxDist = 2500.f;
 			soundIntensity = 50.f;
 			pedComment.m_nSampleIndex = m_anRandomTable[m_sQueueSample.m_nEntityIndex & 3] % 11 +
-			                            AUDIO_SAMPLE_INJURED_PED_FEMALE_OUCH_1;
+			                            SFX_GENERIC_FEMALE_GRUNT_1;
 			break;
 		default: return;
 		}
@@ -8911,49 +8910,49 @@ cAudioManager::SetupSuspectLastSeenReport()
 					color_post_modifier = colors[index + 2];
 					switch(automobile->m_modelIndex) {
 					case MI_LANDSTAL:
-					case MI_BLISTA: sample = AUDIO_SAMPLE_POLICE_SCANNER_CAR_CRUISER; break;
+					case MI_BLISTA: sample = SFX_POLICE_RADIO_CRUISER; break;
 					case MI_IDAHO:
-					case MI_STALLION: sample = AUDIO_SAMPLE_POLICE_SCANNER_CAR_CONVERTIBLE; break;
+					case MI_STALLION: sample = SFX_POLICE_RADIO_CONVERTIBLE; break;
 					case MI_STINGER:
 					case MI_INFERNUS:
 					case MI_CHEETAH:
-					case MI_BANSHEE: sample = AUDIO_SAMPLE_POLICE_SCANNER_CAR_SPORTS_CAR; break;
+					case MI_BANSHEE: sample = SFX_POLICE_RADIO_SPORTS_CAR; break;
 					case MI_PEREN:
 					case MI_SENTINEL:
-					case MI_FBICAR: sample = AUDIO_SAMPLE_POLICE_SCANNER_CAR_ECONOMY; break;
+					case MI_FBICAR: sample = SFX_POLICE_RADIO_SALOON; break;
 					case MI_PATRIOT:
-					case MI_BOBCAT: sample = AUDIO_SAMPLE_POLICE_SCANNER_CAR_PICKUP; break;
-					case MI_FIRETRUCK: sample = AUDIO_SAMPLE_POLICE_SCANNER_CAR_FIRETRUCK; break;
+					case MI_BOBCAT: sample = SFX_POLICE_RADIO_PICKUP; break;
+					case MI_FIRETRUCK: sample = SFX_POLICE_RADIO_FIRE_TRUCK; break;
 					case MI_TRASH:
-					case MI_BARRACKS: sample = AUDIO_SAMPLE_POLICE_SCANNER_CAR_TRUCK; break;
-					case MI_STRETCH: sample = AUDIO_SAMPLE_POLICE_SCANNER_CAR_LIMO; break;
+					case MI_BARRACKS: sample = SFX_POLICE_RADIO_TRUCK; break;
+					case MI_STRETCH: sample = SFX_POLICE_RADIO_LIMO; break;
 					case MI_MANANA:
-					case MI_ESPERANT: sample = AUDIO_SAMPLE_POLICE_SCANNER_CAR_COUPE; break;
+					case MI_ESPERANT: sample = SFX_POLICE_RADIO_2_DOOR; break;
 					case MI_PONY:
 					case MI_MULE:
 					case MI_MOONBEAM:
 					case MI_ENFORCER:
 					case MI_SECURICA:
-					case MI_RUMPO: sample = AUDIO_SAMPLE_POLICE_SCANNER_CAR_VAN; break;
-					case MI_AMBULAN: sample = AUDIO_SAMPLE_POLICE_SCANNER_CAR_AMBULANCE; break;
+					case MI_RUMPO: sample = SFX_POLICE_RADIO_VAN; break;
+					case MI_AMBULAN: sample = SFX_POLICE_RADIO_AMBULANCE; break;
 					case MI_TAXI:
 					case MI_CABBIE:
-					case MI_BORGNINE: sample = AUDIO_SAMPLE_POLICE_SCANNER_CAR_TAXI; break;
+					case MI_BORGNINE: sample = SFX_POLICE_RADIO_TAXI; break;
 					case MI_MRWHOOP:
-						sample = AUDIO_SAMPLE_POLICE_SCANNER_CAR_ICE_CREAM_TRUCK;
+						sample = SFX_POLICE_RADIO_ICE_CREAM_VAN;
 						break;
-					case MI_BFINJECT: sample = AUDIO_SAMPLE_POLICE_SCANNER_CAR_BUGGY; break;
-					case MI_POLICE: sample = AUDIO_SAMPLE_POLICE_SCANNER_CAR_POLICE_CAR; break;
-					case MI_PREDATOR: sample = AUDIO_SAMPLE_POLICE_SCANNER_CAR_BOAT; break;
+					case MI_BFINJECT: sample = SFX_POLICE_RADIO_BUGGY; break;
+					case MI_POLICE: sample = SFX_POLICE_RADIO_POLICE_CAR; break;
+					case MI_PREDATOR: sample = SFX_POLICE_RADIO_BOAT; break;
 					case MI_BUS:
-					case MI_COACH: sample = AUDIO_SAMPLE_POLICE_SCANNER_CAR_BUS; break;
+					case MI_COACH: sample = SFX_POLICE_RADIO_BUS; break;
 					case MI_RHINO:
-						sample = AUDIO_SAMPLE_POLICE_SCANNER_CAR_TANK;
+						sample = SFX_POLICE_RADIO_TANK;
 						main_color = TOTAL_AUDIO_SAMPLES;
 						color_post_modifier = TOTAL_AUDIO_SAMPLES;
 						break;
 					case MI_TRAIN:
-						sample = AUDIO_SAMPLE_POLICE_SCANNER_CAR_SUBWAY_CAR;
+						sample = SFX_POLICE_RADIO_SUBWAY_CAR;
 						main_color = TOTAL_AUDIO_SAMPLES;
 						color_post_modifier = TOTAL_AUDIO_SAMPLES;
 
@@ -8966,33 +8965,33 @@ cAudioManager::SetupSuspectLastSeenReport()
 					if(policeChannelTimer != 60) {
 						crimesSamples[policeChannelTimerSeconds] =
 						    m_anRandomTable[4] % 3 +
-						    AUDIO_SAMPLE_POLICE_SCANNER_SMALL_CRACKLE_1;
+						    SFX_POLICE_RADIO_MESSAGE_NOISE_1;
 						++policeChannelTimer;
 						policeChannelTimerSeconds = (policeChannelTimerSeconds + 1) % 60;
 					}
 					if(policeChannelTimer != 60) {
 						crimesSamples[policeChannelTimerSeconds] =
-						    AUDIO_SAMPLE_POLICE_SCANNER_SUSPECT;
+						    SFX_POLICE_RADIO_SUSPECT;
 						++policeChannelTimer;
 						policeChannelTimerSeconds = (policeChannelTimerSeconds + 1) % 60;
 					}
 					if(m_anRandomTable[3] & 1 && policeChannelTimer != 60) {
 						crimesSamples[policeChannelTimerSeconds] =
-						    AUDIO_SAMPLE_POLICE_SCANNER_LAST_SEEN;
+						    SFX_POLICE_RADIO_LAST_SEEN;
 						++policeChannelTimer;
 						policeChannelTimerSeconds = (policeChannelTimerSeconds + 1) % 60;
 					}
-					if(main_color == AUDIO_SAMPLE_POLICE_SCANNER_COLOR_ORANGE) {
+					if(main_color == SFX_POLICE_RADIO_ORANGE) {
 						if(policeChannelTimer != 60) {
 							crimesSamples[policeChannelTimerSeconds] =
-							    AUDIO_SAMPLE_POLICE_SCANNER_IN_AN;
+							    SFX_POLICE_RADIO_IN_AN;
 							++policeChannelTimer;
 							policeChannelTimerSeconds =
 							    (policeChannelTimerSeconds + 1) % 60;
 						}
 					} else if(policeChannelTimer != 60) {
 						crimesSamples[policeChannelTimerSeconds] =
-						    AUDIO_SAMPLE_POLICE_SCANNER_IN_A;
+						    SFX_POLICE_RADIO_IN_A;
 						++policeChannelTimer;
 						policeChannelTimerSeconds = (policeChannelTimerSeconds + 1) % 60;
 					}
@@ -9019,7 +9018,7 @@ cAudioManager::SetupSuspectLastSeenReport()
 					if(policeChannelTimer != 60) {
 						crimesSamples[policeChannelTimerSeconds] =
 						    m_anRandomTable[0] % 3 +
-						    AUDIO_SAMPLE_POLICE_SCANNER_SMALL_CRACKLE_1;
+						    SFX_POLICE_RADIO_MESSAGE_NOISE_1;
 						++policeChannelTimer;
 						policeChannelTimerSeconds = (policeChannelTimerSeconds + 1) % 60;
 					}
@@ -9034,23 +9033,23 @@ cAudioManager::SetupSuspectLastSeenReport()
 			if(60 - policeChannelTimer > 4) {
 				if(policeChannelTimer != 60) {
 					crimesSamples[policeChannelTimerSeconds] =
-					    m_anRandomTable[4] % 3 + AUDIO_SAMPLE_POLICE_SCANNER_SMALL_CRACKLE_1;
+					    m_anRandomTable[4] % 3 + SFX_POLICE_RADIO_MESSAGE_NOISE_1;
 					++policeChannelTimer;
 					policeChannelTimerSeconds = (policeChannelTimerSeconds + 1) % 60;
 				}
 				if(policeChannelTimer != 60) {
-					crimesSamples[policeChannelTimerSeconds] = AUDIO_SAMPLE_POLICE_SCANNER_SUSPECT;
+					crimesSamples[policeChannelTimerSeconds] = SFX_POLICE_RADIO_SUSPECT;
 					++policeChannelTimer;
 					policeChannelTimerSeconds = (policeChannelTimerSeconds + 1) % 60;
 				}
 				if(policeChannelTimer != 60) {
-					crimesSamples[policeChannelTimerSeconds] = AUDIO_SAMPLE_POLICE_SCANNER_ON_FOOT;
+					crimesSamples[policeChannelTimerSeconds] = SFX_POLICE_RADIO_ON_FOOT;
 					++policeChannelTimer;
 					policeChannelTimerSeconds = (policeChannelTimerSeconds + 1) % 60;
 				}
 				if(policeChannelTimer != 60) {
 					crimesSamples[policeChannelTimerSeconds] =
-					    m_anRandomTable[0] % 3 + AUDIO_SAMPLE_POLICE_SCANNER_SMALL_CRACKLE_1;
+					    m_anRandomTable[0] % 3 + SFX_POLICE_RADIO_MESSAGE_NOISE_1;
 					++policeChannelTimer;
 					policeChannelTimerSeconds = (policeChannelTimerSeconds + 1) % 60;
 				}
diff --git a/src/audio/AudioSamples.h b/src/audio/AudioSamples.h
index 2c4f8df8..7936fa26 100644
--- a/src/audio/AudioSamples.h
+++ b/src/audio/AudioSamples.h
@@ -2,3048 +2,3063 @@
 
 #include "common.h"
 
-enum eAudioSamples : uint32 {
-	AUDIO_SAMPLE_VEHICLE_HORN_0 = 0,
-	AUDIO_SAMPLE_VEHICLE_HORN_1 = 1,
-	AUDIO_SAMPLE_VEHICLE_HORN_2 = 2,
-	AUDIO_SAMPLE_VEHICLE_HORN_3 = 3,
-	AUDIO_SAMPLE_VEHICLE_HORN_4 = 4,
-	AUDIO_SAMPLE_VEHICLE_HORN_5 = 5,
-	AUDIO_SAMPLE_VEHICLE_HORN_6 = 6,
-	AUDIO_SAMPLE_VEHICLE_HORN_7 = 7,
-	AUDIO_SAMPLE_VEHICLE_OPEN_DOOR_TYPE_1 = 8,
-	AUDIO_SAMPLE_VEHICLE_CLOSE_DOOR_TYPE_1 = 9,
-	AUDIO_SAMPLE_VEHICLE_OPEN_DOOR_TYPE_2 = 10,
-	AUDIO_SAMPLE_VEHICLE_CLOSE_DOOR_TYPE_2 = 11,
-	AUDIO_SAMPLE_VEHICLE_OPEN_DOOR_TYPE_3 = 12,
-	AUDIO_SAMPLE_VEHICLE_CLOSE_DOOR_TYPE_3 = 13,
-	AUDIO_SAMPLE_MODEL_VEHICLE_ACCELERATING = 14,
-	AUDIO_SAMPLE_REVERSE_GEAR_ACCELERATING = 15,
-	AUDIO_SAMPLE_REVERSE_GEAR_CONSTANT = 16,
-	AUDIO_SAMPLE_VEHICLE_ENGINE_START = 17,
-	AUDIO_SAMPLE_VEHICLE_ROAD_NOISE = 18,
-	AUDIO_SAMPLE_VEHICLE_SKIDDING = 19,
-	AUDIO_SAMPLE_COLLISION_LOOPING_SOFT = 20,
-	AUDIO_SAMPLE_VEHICLE_SIREN = 21,
-	AUDIO_SAMPLE_VEHICLE_SIREN_HORN = 22,
-	AUDIO_SAMPLE_VEHICLE_AMBULANCE_SIREN = 23,
-	AUDIO_SAMPLE_VEHICLE_REVERSE_WARNING = 24,
-	AUDIO_SAMPLE_VEHICLE_ICE_CREAM_JINGLE = 25,
-	AUDIO_SAMPLE_VEHICLE_ALARM = 26,
-	AUDIO_SAMPLE_VEHICLE_AIR_BRAKES = 27,
-	AUDIO_SAMPLE_28_EMPTY = 28,
-	AUDIO_SAMPLE_COLLISION_RUBBER = 29,
-	AUDIO_SAMPLE_TRAIN_FAR = 30,
-	AUDIO_SAMPLE_TRAIN_CLOSE = 31,
-	AUDIO_SAMPLE_PED_FALL_PAVEMENT_1 = 32,
-	AUDIO_SAMPLE_PED_FALL_PAVEMENT_2 = 33,
-	AUDIO_SAMPLE_PED_FALL_PAVEMENT_3 = 34,
-	AUDIO_SAMPLE_PED_FALL_PAVEMENT_4 = 35,
-	AUDIO_SAMPLE_PED_FALL_PAVEMENT_5 = 36,
-	AUDIO_SAMPLE_PED_FALL_GRASS_1 = 37,
-	AUDIO_SAMPLE_PED_FALL_GRASS_2 = 38,
-	AUDIO_SAMPLE_PED_FALL_GRASS_3 = 39,
-	AUDIO_SAMPLE_PED_FALL_GRASS_4 = 40,
-	AUDIO_SAMPLE_PED_FALL_GRASS_5 = 41,
-	AUDIO_SAMPLE_PED_FALL_DIRT_1 = 42,
-	AUDIO_SAMPLE_PED_FALL_DIRT_2 = 43,
-	AUDIO_SAMPLE_PED_FALL_DIRT_3 = 44,
-	AUDIO_SAMPLE_PED_FALL_DIRT_4 = 45,
-	AUDIO_SAMPLE_PED_FALL_DIRT_5 = 46,
-	AUDIO_SAMPLE_PED_FALL_WOOD_1 = 47,
-	AUDIO_SAMPLE_PED_FALL_WOOD_2 = 48,
-	AUDIO_SAMPLE_PED_FALL_WOOD_3 = 49,
-	AUDIO_SAMPLE_PED_FALL_WOOD_4 = 50,
-	AUDIO_SAMPLE_PED_FALL_WOOD_5 = 51,
-	AUDIO_SAMPLE_PED_FALL_METAL_1 = 52,
-	AUDIO_SAMPLE_PED_FALL_METAL_2 = 53,
-	AUDIO_SAMPLE_PED_FALL_METAL_3 = 54,
-	AUDIO_SAMPLE_PED_FALL_METAL_4 = 55,
-	AUDIO_SAMPLE_PED_FALL_METAL_5 = 56,
-	AUDIO_SAMPLE_PED_FALL_IN_WATER_1 = 57,
-	AUDIO_SAMPLE_PED_FALL_IN_WATER_2 = 58,
-	AUDIO_SAMPLE_PED_FALL_IN_WATER_3 = 59,
-	AUDIO_SAMPLE_PED_FALL_IN_WATER_4 = 60,
-	AUDIO_SAMPLE_PED_FALL_SAND_1 = 61,
-	AUDIO_SAMPLE_PED_FALL_SAND_2 = 62,
-	AUDIO_SAMPLE_PED_FALL_SAND_3 = 63,
-	AUDIO_SAMPLE_64 = 64,
-	AUDIO_SAMPLE_WEAPON_GRENADE_EXPLOSION = 65,
-	AUDIO_SAMPLE_WEAPON_MOLOTOV_EXPLOSION = 66,
-	AUDIO_SAMPLE_WEAPON_PISTOL_SHOT = 67,
-	AUDIO_SAMPLE_68 = 68,
-	AUDIO_SAMPLE_WEAPON_M16_SHOT = 69,
-	AUDIO_SAMPLE_70 = 70,
-	AUDIO_SAMPLE_WEAPON_CHAINGUN_SHOT = 71,
-	AUDIO_SAMPLE_72 = 72,
-	AUDIO_SAMPLE_WEAPON_UZI_SHOT = 73,
-	AUDIO_SAMPLE_74 = 74,
-	AUDIO_SAMPLE_75 = 75,
-	AUDIO_SAMPLE_76 = 76,
-	AUDIO_SAMPLE_WEAPON_SNIPER_SHOT = 77,
-	AUDIO_SAMPLE_78 = 78,
-	AUDIO_SAMPLE_WEAPON_ROCKET_SHOT = 79,
-	AUDIO_SAMPLE_80 = 80,
-	AUDIO_SAMPLE_WEAPON_ROCKET_PROCESS = 81,
-	AUDIO_SAMPLE_WEAPON_FLAMETHROWER_SHOT = 82,
-	AUDIO_SAMPLE_83 = 83,
-	AUDIO_SAMPLE_WEAPON_FLAMETHROWER_FIRE = 84,
-	AUDIO_SAMPLE_85 = 85,
-	AUDIO_SAMPLE_WEAPON_SHOTGUN_SHOT = 86,
-	AUDIO_SAMPLE_87 = 87,
-	AUDIO_SAMPLE_WEAPON_PISTOL_RELOAD = 88,
-	AUDIO_SAMPLE_WEAPON_CHAINGUN_RELOAD = 89,
-	AUDIO_SAMPLE_WEAPON_UZI_RELOAD = 90,
-	AUDIO_SAMPLE_WEAPON_ROCKET_RELOAD = 91,
-	AUDIO_SAMPLE_WEAPON_SNIPER_RELOAD = 92,
-	AUDIO_SAMPLE_COLLISION_PAVEMENT = 93,
-	AUDIO_SAMPLE_94 = 94,
-	AUDIO_SAMPLE_95 = 95,
-	AUDIO_SAMPLE_96 = 96,
-	AUDIO_SAMPLE_97 = 97,
-	AUDIO_SAMPLE_COLLISION_MUFFLED = 98,
-	AUDIO_SAMPLE_COLLISION_DIRT = 99,
-	AUDIO_SAMPLE_COLLISION_MUD = 100,
-	AUDIO_SAMPLE_COLLISION_METAL_DOOR = 101,
-	AUDIO_SAMPLE_CAR_DOOR_MOVEMENT_1 = 102,
-	AUDIO_SAMPLE_CAR_DOOR_MOVEMENT_2 = 103,
-	AUDIO_SAMPLE_CAR_DOOR_MOVEMENT_3 = 104,
-	AUDIO_SAMPLE_CAR_DOOR_MOVEMENT_4 = 105,
-	AUDIO_SAMPLE_CAR_DOOR_MOVEMENT_5 = 106,
-	AUDIO_SAMPLE_CAR_DOOR_MOVEMENT_6 = 107,
-	AUDIO_SAMPLE_COLLISION_METAL_11 = 108,
-	AUDIO_SAMPLE_COLLISION_HARD = 109,
-	AUDIO_SAMPLE_COLLISION_METAL_13 = 110,
-	AUDIO_SAMPLE_COLLISION_METAL_14 = 111,
-	AUDIO_SAMPLE_COLLISION_FENCE = 112,
-	AUDIO_SAMPLE_113 = 113,
-	AUDIO_SAMPLE_114 = 114,
-	AUDIO_SAMPLE_115 = 115,
-	AUDIO_SAMPLE_COLLISION_FLESH = 116,
-	AUDIO_SAMPLE_117 = 117,
-	AUDIO_SAMPLE_118 = 118,
-	AUDIO_SAMPLE_119 = 119,
-	AUDIO_SAMPLE_120 = 120,
-	AUDIO_SAMPLE_COLLISION_SAND = 121,
-	AUDIO_SAMPLE_COLLISION_WOOD = 122,
-	AUDIO_SAMPLE_123 = 123,
-	AUDIO_SAMPLE_124 = 124,
-	AUDIO_SAMPLE_125 = 125,
-	AUDIO_SAMPLE_COLLISION_WOOD_BOX = 126,
-	AUDIO_SAMPLE_127 = 127,
-	AUDIO_SAMPLE_128 = 128,
-	AUDIO_SAMPLE_129 = 129,
-	AUDIO_SAMPLE_COLLISION_WOOD_PLANK = 130,
-	AUDIO_SAMPLE_COLLISION_HEDGE = 131,
-	AUDIO_SAMPLE_PED_FALL_HEDGE_2 = 132,
-	AUDIO_SAMPLE_PED_FALL_HEDGE_3 = 133,
-	AUDIO_SAMPLE_PED_FALL_HEDGE_4 = 134,
-	AUDIO_SAMPLE_PED_FALL_HEDGE_5 = 135,
-	AUDIO_SAMPLE_COLLISION_METAL_27 = 136,
-	AUDIO_SAMPLE_COLLISION_METAL_28 = 137,
-	AUDIO_SAMPLE_138 = 138,
-	AUDIO_SAMPLE_139 = 139,
-	AUDIO_SAMPLE_COLLISION_METAL = 140,
-	AUDIO_SAMPLE_COLLISION_CRANE = 141,
-	AUDIO_SAMPLE_142 = 142,
-	AUDIO_SAMPLE_143 = 143,
-	AUDIO_SAMPLE_144 = 144,
-	AUDIO_SAMPLE_COLLISION_LOOSE = 145,
-	AUDIO_SAMPLE_146 = 146,
-	AUDIO_SAMPLE_COLLISION_GATE = 147,
-	AUDIO_SAMPLE_COLLISION_LOOPING_GENERIC = 148,
-	AUDIO_SAMPLE_149 = 149,
-	AUDIO_SAMPLE_GLASS_WINDSHIELD_CRACK = 150,
-	AUDIO_SAMPLE_GLASS_GENERIC_BREAK = 151,
-	AUDIO_SAMPLE_GLASS_LIGHT_BREAK_1 = 152,
-	AUDIO_SAMPLE_GLASS_LIGHT_BREAK_2 = 153,
-	AUDIO_SAMPLE_GLASS_LIGHT_BREAK_3 = 154,
-	AUDIO_SAMPLE_GLASS_LIGHT_BREAK_4 = 155,
-	AUDIO_SAMPLE_FIRE_PED = 156,
-	AUDIO_SAMPLE_FIRE_ENTITY = 157,
-	AUDIO_SAMPLE_COLLISION_LOOPING_GRASS = 158,
-	AUDIO_SAMPLE_PICKUP_NEUTRAL_1 = 159,
-	AUDIO_SAMPLE_PICKUP_NEUTRAL_2 = 160,
-	AUDIO_SAMPLE_PICKUP_SUCCESS_1 = 161,
-	AUDIO_SAMPLE_PICKUP_SUCCESS_2 = 162,
-	AUDIO_SAMPLE_PICKUP_SUCCESS_3 = 163,
-	AUDIO_SAMPLE_PICKUP_SUCCESS_4 = 164,
-	AUDIO_SAMPLE_PICKUP_FAIL_1 = 165,
-	AUDIO_SAMPLE_PICKUP_FAIL_2 = 166,
-	AUDIO_SAMPLE_BULLET_GUNSHELL_HARD_DROP = 167,
-	AUDIO_SAMPLE_BULLET_GUNSHELL_SOFT_DROP = 168,
-	AUDIO_SAMPLE_BULLET_HIT_PED = 169,
-	AUDIO_SAMPLE_BULLET_HIT_VEHICLE_1 = 170,
-	AUDIO_SAMPLE_BULLET_HIT_VEHICLE_2 = 171,
-	AUDIO_SAMPLE_BULLET_HIT_VEHICLE_3 = 172,
-	AUDIO_SAMPLE_BULLET_HIT_VEHICLE_4 = 173,
-	AUDIO_SAMPLE_BULLET_HIT_VEHICLE_5 = 174,
-	AUDIO_SAMPLE_BULLET_HIT_VEHICLE_6 = 175,
-	AUDIO_SAMPLE_BULLET_HIT_GROUND_1 = 176,
-	AUDIO_SAMPLE_BULLET_HIT_GROUND_2 = 177,
-	AUDIO_SAMPLE_BULLET_HIT_GROUND_3 = 178,
-	AUDIO_SAMPLE_PED_HIT_BY_BAT = 179,
-	AUDIO_SAMPLE_180 = 180,
-	AUDIO_SAMPLE_PED_HIT_1 = 181,
-	AUDIO_SAMPLE_PED_HIT_2 = 182,
-	AUDIO_SAMPLE_PED_HIT_3 = 183,
-	AUDIO_SAMPLE_PED_HIT_4 = 184,
-	AUDIO_SAMPLE_GARAGE_DOOR_PROCESS = 185,
-	AUDIO_SAMPLE_CAR_BOMB_TICK = 186,
-	AUDIO_SAMPLE_CAR_BOMB_ACTIVATED = 187,
-	AUDIO_SAMPLE_POLICE_SCANNER_CRACKLE = 188,
-	AUDIO_SAMPLE_POLICE_SCANNER_WE_GOT_1 = 189,
-	AUDIO_SAMPLE_POLICE_SCANNER_WE_GOT_2 = 190,
-	AUDIO_SAMPLE_POLICE_SCANNER_WE_GOT_3 = 191,
-	AUDIO_SAMPLE_POLICE_SCANNER_TEN_1 = 192,
-	AUDIO_SAMPLE_POLICE_SCANNER_TEN_2 = 193,
-	AUDIO_SAMPLE_POLICE_SCANNER_CODE_CRIME_1 = 194,
-	AUDIO_SAMPLE_POLICE_SCANNER_CODE_CRIME_2 = 195,
-	AUDIO_SAMPLE_POLICE_SCANNER_CODE_CRIME_3 = 196,
-	AUDIO_SAMPLE_POLICE_SCANNER_CODE_CRIME_4 = 197,
-	AUDIO_SAMPLE_POLICE_SCANNER_CODE_CRIME_5 = 198,
-	AUDIO_SAMPLE_POLICE_SCANNER_CODE_CRIME_6 = 199,
-	AUDIO_SAMPLE_POLICE_SCANNER_CODE_CRIME_7 = 200,
-	AUDIO_SAMPLE_POLICE_SCANNER_CODE_CRIME_8 = 201,
-	AUDIO_SAMPLE_POLICE_SCANNER_CODE_CRIME_9 = 202,
-	AUDIO_SAMPLE_POLICE_SCANNER_CODE_CRIME_10 = 203,
-	AUDIO_SAMPLE_POLICE_SCANNER_CODE_CRIME_11 = 204,
-	AUDIO_SAMPLE_POLICE_SCANNER_CODE_CRIME_12 = 205,
-	AUDIO_SAMPLE_POLICE_SCANNER_IN = 206,
-	AUDIO_SAMPLE_POLICE_SCANNER_NORTH = 207,
-	AUDIO_SAMPLE_POLICE_SCANNER_EAST = 208,
-	AUDIO_SAMPLE_POLICE_SCANNER_SOUTH = 209,
-	AUDIO_SAMPLE_POLICE_SCANNER_WEST = 210,
-	AUDIO_SAMPLE_POLICE_SCANNER_CENTRAL = 211,
-	AUDIO_SAMPLE_POLICE_SCANNER_SMALL_CRACKLE_1 = 212,
-	AUDIO_SAMPLE_POLICE_SCANNER_SMALL_CRACKLE_2 = 213,
-	AUDIO_SAMPLE_POLICE_SCANNER_SMALL_CRACKLE_3 = 214,
-	AUDIO_SAMPLE_POLICE_SCANNER_ZONE_LIBERTY_CITY = 215,
-	AUDIO_SAMPLE_POLICE_SCANNER_ZONE_PORTLAND = 216,
-	AUDIO_SAMPLE_POLICE_SCANNER_ZONE_STAUNTON = 217,
-	AUDIO_SAMPLE_POLICE_SCANNER_ZONE_SHORESIDE = 218,
-	AUDIO_SAMPLE_POLICE_SCANNER_ZONE_ROCKFORD = 219,
-	AUDIO_SAMPLE_POLICE_SCANNER_ZONE_FORT_STAUNTON = 220,
-	AUDIO_SAMPLE_POLICE_SCANNER_ZONE_ASPATRIA = 221,
-	AUDIO_SAMPLE_POLICE_SCANNER_ZONE_TORRINGTON = 222,
-	AUDIO_SAMPLE_POLICE_SCANNER_ZONE_BEDFORD_POINT = 223,
-	AUDIO_SAMPLE_POLICE_SCANNER_ZONE_NEWPORT = 224,
-	AUDIO_SAMPLE_POLICE_SCANNER_ZONE_BELLEVILLE = 225,
-	AUDIO_SAMPLE_POLICE_SCANNER_ZONE_LIBERTY_CAMPUS = 226,
-	AUDIO_SAMPLE_POLICE_SCANNER_ZONE_COCHRANE = 227,
-	AUDIO_SAMPLE_POLICE_SCANNER_ZONE_PIKE_CREEK = 228,
-	AUDIO_SAMPLE_POLICE_SCANNER_ZONE_CEDAR_GROVE = 229,
-	AUDIO_SAMPLE_POLICE_SCANNER_ZONE_WICHITA_GARDEN = 230,
-	AUDIO_SAMPLE_POLICE_SCANNER_ZONE_FRANCIS_INTNL = 231,
-	AUDIO_SAMPLE_POLICE_SCANNER_ZONE_CALLAHAN_POINT = 232,
-	AUDIO_SAMPLE_POLICE_SCANNER_ZONE_ATLANTIC_QUAYS = 233,
-	AUDIO_SAMPLE_POLICE_SCANNER_ZONE_PORTLAND_HARBOUR = 234,
-	AUDIO_SAMPLE_POLICE_SCANNER_ZONE_TRENTON = 235,
-	AUDIO_SAMPLE_POLICE_SCANNER_ZONE_CHINATOWN = 236,
-	AUDIO_SAMPLE_POLICE_SCANNER_ZONE_REDLIGHT = 237,
-	AUDIO_SAMPLE_POLICE_SCANNER_ZONE_HEPBURN_HEIGHTS = 238,
-	AUDIO_SAMPLE_POLICE_SCANNER_ZONE_ST_MARKS = 239,
-	AUDIO_SAMPLE_POLICE_SCANNER_ZONE_HARWOOD = 240,
-	AUDIO_SAMPLE_POLICE_SCANNER_ZONE_PORTLAND_BEACH = 241,
-	AUDIO_SAMPLE_POLICE_SCANNER_ZONE_PORTLAND_VIEW = 242,
-	AUDIO_SAMPLE_POLICE_SCANNER_SUSPECT = 243,
-	AUDIO_SAMPLE_POLICE_SCANNER_LAST_SEEN = 244,
-	AUDIO_SAMPLE_POLICE_SCANNER_ON_FOOT = 245,
-	AUDIO_SAMPLE_POLICE_SCANNER_IN_A = 246,
-	AUDIO_SAMPLE_POLICE_SCANNER_IN_AN = 247,
-	AUDIO_SAMPLE_POLICE_SCANNER_COLOR_BLACK = 248,
-	AUDIO_SAMPLE_POLICE_SCANNER_COLOR_WHITE = 249,
-	AUDIO_SAMPLE_POLICE_SCANNER_COLOR_BLUE = 250,
-	AUDIO_SAMPLE_POLICE_SCANNER_COLOR_RED = 251,
-	AUDIO_SAMPLE_POLICE_SCANNER_COLOR_PURPLE = 252,
-	AUDIO_SAMPLE_POLICE_SCANNER_COLOR_YELLOW = 253,
-	AUDIO_SAMPLE_POLICE_SCANNER_COLOR_GREY = 254,
-	AUDIO_SAMPLE_POLICE_SCANNER_COLOR_ORANGE = 255,
-	AUDIO_SAMPLE_POLICE_SCANNER_COLOR_GREEN = 256,
-	AUDIO_SAMPLE_POLICE_SCANNER_COLOR_SILVER = 257,
-	AUDIO_SAMPLE_POLICE_SCANNER_COLOR_DARK = 258,
-	AUDIO_SAMPLE_POLICE_SCANNER_COLOR_LIGHT = 259,
-	AUDIO_SAMPLE_POLICE_SCANNER_COLOR_BRIGHT = 260,
-	AUDIO_SAMPLE_POLICE_SCANNER_CAR_AMBULANCE = 261,
-	AUDIO_SAMPLE_POLICE_SCANNER_CAR_VAN = 262,
-	AUDIO_SAMPLE_POLICE_SCANNER_CAR_TRUCK = 263,
-	AUDIO_SAMPLE_POLICE_SCANNER_CAR_ECONOMY = 264,
-	AUDIO_SAMPLE_POLICE_SCANNER_CAR_SPORTS_CAR = 265,
-	AUDIO_SAMPLE_POLICE_SCANNER_CAR_BUGGY = 266,
-	AUDIO_SAMPLE_POLICE_SCANNER_CAR_TAXI = 267,
-	AUDIO_SAMPLE_POLICE_SCANNER_CAR_CRUISER = 268,
-	AUDIO_SAMPLE_POLICE_SCANNER_CAR_BUS = 269,
-	AUDIO_SAMPLE_POLICE_SCANNER_CAR_COUPE = 270,
-	AUDIO_SAMPLE_POLICE_SCANNER_CAR_FIRETRUCK = 271,
-	AUDIO_SAMPLE_POLICE_SCANNER_CAR_BOAT = 272,
-	AUDIO_SAMPLE_POLICE_SCANNER_CAR_PICKUP = 273,
-	AUDIO_SAMPLE_POLICE_SCANNER_CAR_ICE_CREAM_TRUCK = 274,
-	AUDIO_SAMPLE_POLICE_SCANNER_CAR_LIMO = 275,
-	AUDIO_SAMPLE_POLICE_SCANNER_CAR_POLICE_CAR = 276,
-	AUDIO_SAMPLE_POLICE_SCANNER_CAR_CONVERTIBLE = 277,
-	AUDIO_SAMPLE_POLICE_SCANNER_CAR_SUBWAY_CAR = 278,
-	AUDIO_SAMPLE_POLICE_SCANNER_CAR_TANK = 279,
-	AUDIO_SAMPLE_HELI_FAR = 280,
-	AUDIO_SAMPLE_HELI_AVERAGE = 281,
-	AUDIO_SAMPLE_HELI_CLOSE = 282,
-	AUDIO_SAMPLE_PAYPHONE_RINGING = 283,
-	AUDIO_SAMPLE_VEHICLE_ENGINE_GENERIC = 284,
-	AUDIO_SAMPLE_VEHICLE_ENGINE_PICKUPS = 285,
-	AUDIO_SAMPLE_VEHICLE_ENGINE_SPORTS_1 = 286,
-	AUDIO_SAMPLE_VEHICLE_ENGINE_VANS = 287,
-	AUDIO_SAMPLE_VEHICLE_ENGINE_CEDANS = 288,
-	AUDIO_SAMPLE_VEHICLE_ENGINE_BIG = 289,
-	AUDIO_SAMPLE_VEHICLE_ENGINE_TUNED = 290,
-	AUDIO_SAMPLE_VEHICLE_ENGINE_SPORTS_2 = 291,
-	AUDIO_SAMPLE_292 = 292,
-	AUDIO_SAMPLE_VEHICLE_ENGINE_IDLE_NONE = 293,
-	AUDIO_SAMPLE_VEHICLE_ENGINE_IDLE_GENERIC = 294,
-	AUDIO_SAMPLE_VEHICLE_ENGINE_IDLE_PICKUPS = 295,
-	AUDIO_SAMPLE_VEHICLE_ENGINE_IDLE_SPORTS_1 = 296,
-	AUDIO_SAMPLE_VEHICLE_ENGINE_IDLE_VANS = 297,
-	AUDIO_SAMPLE_VEHICLE_ENGINE_IDLE_CEDANS = 298,
-	AUDIO_SAMPLE_VEHICLE_ENGINE_IDLE_BIG = 299,
-	AUDIO_SAMPLE_VEHICLE_ENGINE_IDLE_TUNED = 300,
-	AUDIO_SAMPLE_VEHICLE_ENGINE_IDLE_SPORTS_2 = 301,
-	AUDIO_SAMPLE_302 = 302,
-	AUDIO_SAMPLE_303 = 303,
-	AUDIO_SAMPLE_JUMBO_FLY_SOUND = 304,
-	AUDIO_SAMPLE_JUMBO_TAXI_SOUND = 305,
-	AUDIO_SAMPLE_JUMBO_WHINE_SOUND = 306,
-	AUDIO_SAMPLE_JUMBO_ENGINE_SOUND = 307,
-	AUDIO_SAMPLE_JUMBO_RUMBLE_SOUND = 308,
-	AUDIO_SAMPLE_VEHICLE_PLANE_TOUCHES_GROUND = 309,
-	AUDIO_SAMPLE_BOAT_ENGINE_IDLE = 310,
-	AUDIO_SAMPLE_BOAT_ENGINE = 311,
-	AUDIO_SAMPLE_BOAT_IDLE = 312,
-	AUDIO_SAMPLE_LOOPING_WATER = 313,
-	AUDIO_SAMPLE_BOAT_SPLASH_0 = 314,
-	AUDIO_SAMPLE_BOAT_SPLASH_1 = 315,
-	AUDIO_SAMPLE_MOTOR = 316,
-	AUDIO_SAMPLE_VEHICLE_CESNA_FAR = 317,
-	AUDIO_SAMPLE_VEHICLE_CESNA_CLOSE = 318,
-	AUDIO_SAMPLE_RAIN_ON_VEHICLE_1 = 319,
-	AUDIO_SAMPLE_RAIN_ON_VEHICLE_2 = 320,
-	AUDIO_SAMPLE_RAIN_ON_VEHICLE_3 = 321,
-	AUDIO_SAMPLE_RAIN_ON_VEHICLE_4 = 322,
-	AUDIO_SAMPLE_COLLISION_WATER = 323,
-	AUDIO_SAMPLE_SPLATTER_1 = 324,
-	AUDIO_SAMPLE_SPLATTER_2 = 325,
-	AUDIO_SAMPLE_PED_HEADPHONES = 326,
-	AUDIO_SAMPLE_BOX_DESTROYED_1 = 327,
-	AUDIO_SAMPLE_BOX_DESTROYED_2 = 328,
-	AUDIO_SAMPLE_ROCKET_NO_ZOOM = 329,
-	AUDIO_SAMPLE_SNIPER_NO_ZOOM = 330,
-	AUDIO_SAMPLE_VEHICLE_TURRET_ROTATE = 331,
-	AUDIO_SAMPLE_CRANE_PROCESS = 332,
-	AUDIO_SAMPLE_PED_FALL_COLLAPSE = 333,
-	AUDIO_SAMPLE_PED_FALL_LAND = 334,
-	AUDIO_SAMPLE_FRONTEND_BOMB_TICK = 335,
-	AUDIO_SAMPLE_FRONTEND_CLOCK_TICK = 336,
-	AUDIO_SAMPLE_FRONTEND_PART_MISSION_COMPLETED = 337,
-	AUDIO_SAMPLE_FRONTEND_MENU_STARTING_1 = 338,
-	AUDIO_SAMPLE_FRONTEND_MENU_STARTING_2 = 339,
-	AUDIO_SAMPLE_VEHICLE_HYDRAULIC = 340,
-	AUDIO_SAMPLE_VEHICLE_HYDRAULIC_EFFECT = 341,
-	AUDIO_SAMPLE_VEHICLE_JERK = 342,
-	AUDIO_SAMPLE_FRONTEND_GAMEPLAY_FAIL = 343,
-	AUDIO_SAMPLE_FRONTEND_GAMEPLAY_SUCCESS = 344,
-	AUDIO_SAMPLE_345 = 345,
-	AUDIO_SAMPLE_VEHICLE_ENGINE_CHANGE_GEAR_GENERIC = 346,
-	AUDIO_SAMPLE_VEHICLE_ENGINE_STOPPING_GENERIC = 347,
-	AUDIO_SAMPLE_348 = 348,
-	AUDIO_SAMPLE_VEHICLE_ENGINE_CHANGE_GEAR_PICKUPS = 349,
-	AUDIO_SAMPLE_VEHICLE_ENGINE_STOPPING_PICKUPS = 350,
-	AUDIO_SAMPLE_351 = 351,
-	AUDIO_SAMPLE_VEHICLE_ENGINE_CHANGE_GEAR_SPORTS_1 = 352,
-	AUDIO_SAMPLE_VEHICLE_ENGINE_STOPPING_SPORTS_1 = 353,
-	AUDIO_SAMPLE_354 = 354,
-	AUDIO_SAMPLE_VEHICLE_ENGINE_CHANGE_GEAR_VANS = 355,
-	AUDIO_SAMPLE_VEHICLE_ENGINE_STOPPING_VANS = 356,
-	AUDIO_SAMPLE_357 = 357,
-	AUDIO_SAMPLE_VEHICLE_ENGINE_CHANGE_GEAR_CEDANS = 358,
-	AUDIO_SAMPLE_VEHICLE_ENGINE_STOPPING_CEDANS = 359,
-	AUDIO_SAMPLE_360 = 360,
-	AUDIO_SAMPLE_VEHICLE_ENGINE_CHANGE_GEAR_BIG = 361,
-	AUDIO_SAMPLE_VEHICLE_ENGINE_STOPPING_BIG = 362,
-	AUDIO_SAMPLE_363 = 363,
-	AUDIO_SAMPLE_VEHICLE_ENGINE_CHANGE_GEAR_TUNED = 364,
-	AUDIO_SAMPLE_VEHICLE_ENGINE_STOPPING_TUNED = 365,
-	AUDIO_SAMPLE_366 = 366,
-	AUDIO_SAMPLE_VEHICLE_ENGINE_CHANGE_GEAR_SPORTS_2 = 367,
-	AUDIO_SAMPLE_VEHICLE_ENGINE_STOPPING_SPORTS_2 = 368,
-	AUDIO_SAMPLE_369 = 369,
-	AUDIO_SAMPLE_370 = 370,
-	AUDIO_SAMPLE_371 = 371,
-	AUDIO_SAMPLE_FRONTEND_MENU_COMPLETED_1 = 372,
-	AUDIO_SAMPLE_FRONTEND_MENU_COMPLETED_2 = 373,
-	AUDIO_SAMPLE_FRONTEND_MENU_DENIED_1 = 374,
-	AUDIO_SAMPLE_FRONTEND_MENU_DENIED_2 = 375,
-	AUDIO_SAMPLE_FRONTEND_MENU_SUCCESS_1 = 376,
-	AUDIO_SAMPLE_FRONTEND_MENU_SUCCESS_2 = 377,
-	AUDIO_SAMPLE_FRONTEND_MENU_EXIT_1 = 378,
-	AUDIO_SAMPLE_FRONTEND_MENU_EXIT_2 = 379,
-	AUDIO_SAMPLE_380 = 380,
-	AUDIO_SAMPLE_381 = 381,
-	AUDIO_SAMPLE_382 = 382,
-	AUDIO_SAMPLE_FRONTEND_MENU_AUDIO_TEST_1 = 383,
-	AUDIO_SAMPLE_FRONTEND_MENU_AUDIO_TEST_2 = 384,
-	AUDIO_SAMPLE_FRONTEND_MENU_AUDIO_TEST_3 = 385,
-	AUDIO_SAMPLE_FRONTEND_MENU_FAIL_1 = 386,
-	AUDIO_SAMPLE_FRONTEND_MENU_FAIL_2 = 387,
-	AUDIO_SAMPLE_388 = 388,
-	AUDIO_SAMPLE_389 = 389,
-	AUDIO_SAMPLE_PARTY_1 = 390,
-	AUDIO_SAMPLE_PARTY_2 = 391,
-	AUDIO_SAMPLE_PARTY_3 = 392,
-	AUDIO_SAMPLE_PARTY_4 = 393,
-	AUDIO_SAMPLE_PARTY_5 = 394,
-	AUDIO_SAMPLE_PARTY_6 = 395,
-	AUDIO_SAMPLE_PARTY_7 = 396,
-	AUDIO_SAMPLE_PARTY_8 = 397,
-	AUDIO_SAMPLE_PARTY_9 = 398,
-	AUDIO_SAMPLE_PARTY_10 = 399,
-	AUDIO_SAMPLE_PARTY_11 = 400,
-	AUDIO_SAMPLE_PARTY_12 = 401,
-	AUDIO_SAMPLE_PARTY_13 = 402,
-	AUDIO_SAMPLE_STRIP_CLUB_1 = 403,
-	AUDIO_SAMPLE_STRIP_CLUB_2 = 404,
-	AUDIO_SAMPLE_WORK_SHOP = 405,
-	AUDIO_SAMPLE_FRANKIE_PIANO = 406,
-	AUDIO_SAMPLE_SAWMILL_1 = 407,
-	AUDIO_SAMPLE_SAWMILL_2 = 408,
-	AUDIO_SAMPLE_409 = 409,
-	AUDIO_SAMPLE_LAUNDERETTE_1 = 410,
-	AUDIO_SAMPLE_LAUNDERETTE_2 = 411,
-	AUDIO_SAMPLE_CHINATOWN_RESTAURANT = 412,
-	AUDIO_SAMPLE_CIPRIANI_RESTAURANT = 413,
-	AUDIO_SAMPLE_414 = 414,
-	AUDIO_SAMPLE_MARCO_BISTRO = 415,
-	AUDIO_SAMPLE_AIRPORT_1 = 416,
-	AUDIO_SAMPLE_AIRPORT_2 = 417,
-	AUDIO_SAMPLE_AIRPORT_3 = 418,
-	AUDIO_SAMPLE_AIRPORT_4 = 419,
-	AUDIO_SAMPLE_SHOP_1 = 420,
-	AUDIO_SAMPLE_SHOP_2 = 421,
-	AUDIO_SAMPLE_SHOP_3 = 422,
-	AUDIO_SAMPLE_CINEMA_1 = 423,
-	AUDIO_SAMPLE_CINEMA_2 = 424,
-	AUDIO_SAMPLE_CINEMA_3 = 425,
-	AUDIO_SAMPLE_DOCKS = 426,
-	AUDIO_SAMPLE_HOME_1 = 427,
-	AUDIO_SAMPLE_HOME_2 = 428,
-	AUDIO_SAMPLE_HOME_3 = 429,
-	AUDIO_SAMPLE_HOME_4 = 430,
-	AUDIO_SAMPLE_HOME_5 = 431,
-	AUDIO_SAMPLE_PORN_CINEMA_1_BACKGROUND_1 = 432,
-	AUDIO_SAMPLE_PORN_CINEMA_1_SEX_1 = 433,
-	AUDIO_SAMPLE_PORN_CINEMA_1_SEX_2 = 434,
-	AUDIO_SAMPLE_PORN_CINEMA_2_BACKGROUND_2 = 435,
-	AUDIO_SAMPLE_PORN_CINEMA_2_SEX_1 = 436,
-	AUDIO_SAMPLE_PORN_CINEMA_2_SEX_2 = 437,
-	AUDIO_SAMPLE_PORN_CINEMA_3_BACKGROUND_3 = 438,
-	AUDIO_SAMPLE_PORN_CINEMA_3_SEX_1 = 439,
-	AUDIO_SAMPLE_PORN_CINEMA_3_SEX_2 = 440,
-	AUDIO_SAMPLE_POLICE_BALL = 441,
-	AUDIO_SAMPLE_BANK_ALARM = 442,
-	AUDIO_SAMPLE_RAVE_INDUSTRIAL = 443,
-	AUDIO_SAMPLE_RAVE_1 = 444,
-	AUDIO_SAMPLE_RAVE_2 = 445,
-	AUDIO_SAMPLE_RAVE_3 = 446,
-	AUDIO_SAMPLE_447 = 447,
-	AUDIO_SAMPLE_448 = 448,
-	AUDIO_SAMPLE_449 = 449,
-	AUDIO_SAMPLE_450 = 450,
-	AUDIO_SAMPLE_451 = 451,
-	AUDIO_SAMPLE_452 = 452,
-	AUDIO_SAMPLE_453 = 453,
-	AUDIO_SAMPLE_454 = 454,
-	AUDIO_SAMPLE_455 = 455,
-	AUDIO_SAMPLE_EXPLOSION_CAR = 456,
-	AUDIO_SAMPLE_BRIDGE_WARNING = 457,
-	AUDIO_SAMPLE_PAGER = 458,
-	AUDIO_SAMPLE_POLICE_COP_1_ARREST_1 = 459,
-	AUDIO_SAMPLE_POLICE_COP_1_ARREST_2 = 460,
-	AUDIO_SAMPLE_POLICE_COP_1_ARREST_3 = 461,
-	AUDIO_SAMPLE_POLICE_COP_1_ARREST_4 = 462,
-	AUDIO_SAMPLE_POLICE_COP_1_ARREST_5 = 463,
-	AUDIO_SAMPLE_POLICE_COP_1_ARREST_6 = 464,
-	AUDIO_SAMPLE_POLICE_COP_1_PURSUIT_1 = 465,
-	AUDIO_SAMPLE_POLICE_COP_1_PURSUIT_2 = 466,
-	AUDIO_SAMPLE_POLICE_COP_1_PURSUIT_3 = 467,
-	AUDIO_SAMPLE_POLICE_COP_1_PURSUIT_4 = 468,
-	AUDIO_SAMPLE_POLICE_COP_1_PURSUIT_5 = 469,
-	AUDIO_SAMPLE_POLICE_COP_1_PURSUIT_6 = 470,
-	AUDIO_SAMPLE_POLICE_COP_1_PURSUIT_7 = 471,
-	AUDIO_SAMPLE_POLICE_COP_2_ARREST_1 = 472,
-	AUDIO_SAMPLE_POLICE_COP_2_ARREST_2 = 473,
-	AUDIO_SAMPLE_POLICE_COP_2_ARREST_3 = 474,
-	AUDIO_SAMPLE_POLICE_COP_2_ARREST_4 = 475,
-	AUDIO_SAMPLE_POLICE_COP_2_ARREST_5 = 476,
-	AUDIO_SAMPLE_POLICE_COP_2_ARREST_6 = 477,
-	AUDIO_SAMPLE_POLICE_COP_2_PURSUIT_1 = 478,
-	AUDIO_SAMPLE_POLICE_COP_2_PURSUIT_2 = 479,
-	AUDIO_SAMPLE_POLICE_COP_2_PURSUIT_3 = 480,
-	AUDIO_SAMPLE_POLICE_COP_2_PURSUIT_4 = 481,
-	AUDIO_SAMPLE_POLICE_COP_2_PURSUIT_5 = 482,
-	AUDIO_SAMPLE_POLICE_COP_2_PURSUIT_6 = 483,
-	AUDIO_SAMPLE_POLICE_COP_2_PURSUIT_7 = 484,
-	AUDIO_SAMPLE_POLICE_COP_3_ARREST_1 = 485,
-	AUDIO_SAMPLE_POLICE_COP_3_ARREST_2 = 486,
-	AUDIO_SAMPLE_POLICE_COP_3_ARREST_3 = 487,
-	AUDIO_SAMPLE_POLICE_COP_3_ARREST_4 = 488,
-	AUDIO_SAMPLE_POLICE_COP_3_ARREST_5 = 489,
-	AUDIO_SAMPLE_POLICE_COP_3_ARREST_6 = 490,
-	AUDIO_SAMPLE_POLICE_COP_3_PURSUIT_1 = 491,
-	AUDIO_SAMPLE_POLICE_COP_3_PURSUIT_2 = 492,
-	AUDIO_SAMPLE_POLICE_COP_3_PURSUIT_3 = 493,
-	AUDIO_SAMPLE_POLICE_COP_3_PURSUIT_4 = 494,
-	AUDIO_SAMPLE_POLICE_COP_3_PURSUIT_5 = 495,
-	AUDIO_SAMPLE_POLICE_COP_3_PURSUIT_6 = 496,
-	AUDIO_SAMPLE_POLICE_COP_3_PURSUIT_7 = 497,
-	AUDIO_SAMPLE_POLICE_COP_4_ARREST_1 = 498,
-	AUDIO_SAMPLE_POLICE_COP_4_ARREST_2 = 499,
-	AUDIO_SAMPLE_POLICE_COP_4_ARREST_3 = 500,
-	AUDIO_SAMPLE_POLICE_COP_4_ARREST_4 = 501,
-	AUDIO_SAMPLE_POLICE_COP_4_ARREST_5 = 502,
-	AUDIO_SAMPLE_POLICE_COP_4_ARREST_6 = 503,
-	AUDIO_SAMPLE_POLICE_COP_4_PURSUIT_1 = 504,
-	AUDIO_SAMPLE_POLICE_COP_4_PURSUIT_2 = 505,
-	AUDIO_SAMPLE_POLICE_COP_4_PURSUIT_3 = 506,
-	AUDIO_SAMPLE_POLICE_COP_4_PURSUIT_4 = 507,
-	AUDIO_SAMPLE_POLICE_COP_4_PURSUIT_5 = 508,
-	AUDIO_SAMPLE_POLICE_COP_4_PURSUIT_6 = 509,
-	AUDIO_SAMPLE_POLICE_COP_4_PURSUIT_7 = 510,
-	AUDIO_SAMPLE_POLICE_COP_5_ARREST_1 = 511,
-	AUDIO_SAMPLE_POLICE_COP_5_ARREST_2 = 512,
-	AUDIO_SAMPLE_POLICE_COP_5_ARREST_3 = 513,
-	AUDIO_SAMPLE_POLICE_COP_5_ARREST_4 = 514,
-	AUDIO_SAMPLE_POLICE_COP_5_ARREST_5 = 515,
-	AUDIO_SAMPLE_POLICE_COP_5_ARREST_6 = 516,
-	AUDIO_SAMPLE_POLICE_COP_5_PURSUIT_1 = 517,
-	AUDIO_SAMPLE_POLICE_COP_5_PURSUIT_2 = 518,
-	AUDIO_SAMPLE_POLICE_COP_5_PURSUIT_3 = 519,
-	AUDIO_SAMPLE_POLICE_COP_5_PURSUIT_4 = 520,
-	AUDIO_SAMPLE_POLICE_COP_5_PURSUIT_5 = 521,
-	AUDIO_SAMPLE_POLICE_COP_5_PURSUIT_6 = 522,
-	AUDIO_SAMPLE_POLICE_COP_5_PURSUIT_7 = 523,
-	AUDIO_SAMPLE_POLICE_SWAT_1_PURSUIT_ARREST_1 = 524,
-	AUDIO_SAMPLE_POLICE_SWAT_1_PURSUIT_ARREST_2 = 525,
-	AUDIO_SAMPLE_POLICE_SWAT_1_PURSUIT_ARREST_3 = 526,
-	AUDIO_SAMPLE_POLICE_SWAT_1_PURSUIT_ARREST_4 = 527,
-	AUDIO_SAMPLE_POLICE_SWAT_1_PURSUIT_ARREST_5 = 528,
-	AUDIO_SAMPLE_POLICE_SWAT_1_PURSUIT_ARREST_6 = 529,
-	AUDIO_SAMPLE_POLICE_SWAT_2_PURSUIT_ARREST_1 = 530,
-	AUDIO_SAMPLE_POLICE_SWAT_2_PURSUIT_ARREST_2 = 531,
-	AUDIO_SAMPLE_POLICE_SWAT_2_PURSUIT_ARREST_3 = 532,
-	AUDIO_SAMPLE_POLICE_SWAT_2_PURSUIT_ARREST_4 = 533,
-	AUDIO_SAMPLE_POLICE_SWAT_2_PURSUIT_ARREST_5 = 534,
-	AUDIO_SAMPLE_POLICE_SWAT_2_PURSUIT_ARREST_6 = 535,
-	AUDIO_SAMPLE_POLICE_SWAT_3_PURSUIT_ARREST_1 = 536,
-	AUDIO_SAMPLE_POLICE_SWAT_3_PURSUIT_ARREST_2 = 537,
-	AUDIO_SAMPLE_POLICE_SWAT_3_PURSUIT_ARREST_3 = 538,
-	AUDIO_SAMPLE_POLICE_SWAT_3_PURSUIT_ARREST_4 = 539,
-	AUDIO_SAMPLE_POLICE_SWAT_3_PURSUIT_ARREST_5 = 540,
-	AUDIO_SAMPLE_POLICE_SWAT_3_PURSUIT_ARREST_6 = 541,
-	AUDIO_SAMPLE_POLICE_SWAT_4_PURSUIT_ARREST_1 = 542,
-	AUDIO_SAMPLE_POLICE_SWAT_4_PURSUIT_ARREST_2 = 543,
-	AUDIO_SAMPLE_POLICE_SWAT_4_PURSUIT_ARREST_3 = 544,
-	AUDIO_SAMPLE_POLICE_SWAT_4_PURSUIT_ARREST_4 = 545,
-	AUDIO_SAMPLE_POLICE_SWAT_4_PURSUIT_ARREST_5 = 546,
-	AUDIO_SAMPLE_POLICE_SWAT_4_PURSUIT_ARREST_6 = 547,
-	AUDIO_SAMPLE_POLICE_FBI_1_PURSUIT_ARREST_1 = 548,
-	AUDIO_SAMPLE_POLICE_FBI_1_PURSUIT_ARREST_2 = 549,
-	AUDIO_SAMPLE_POLICE_FBI_1_PURSUIT_ARREST_3 = 550,
-	AUDIO_SAMPLE_POLICE_FBI_1_PURSUIT_ARREST_4 = 551,
-	AUDIO_SAMPLE_POLICE_FBI_1_PURSUIT_ARREST_5 = 552,
-	AUDIO_SAMPLE_POLICE_FBI_1_PURSUIT_ARREST_6 = 553,
-	AUDIO_SAMPLE_POLICE_FBI_2_PURSUIT_ARREST_1 = 554,
-	AUDIO_SAMPLE_POLICE_FBI_2_PURSUIT_ARREST_2 = 555,
-	AUDIO_SAMPLE_POLICE_FBI_2_PURSUIT_ARREST_3 = 556,
-	AUDIO_SAMPLE_POLICE_FBI_2_PURSUIT_ARREST_4 = 557,
-	AUDIO_SAMPLE_POLICE_FBI_2_PURSUIT_ARREST_5 = 558,
-	AUDIO_SAMPLE_POLICE_FBI_2_PURSUIT_ARREST_6 = 559,
-	AUDIO_SAMPLE_POLICE_FBI_3_PURSUIT_ARREST_1 = 560,
-	AUDIO_SAMPLE_POLICE_FBI_3_PURSUIT_ARREST_2 = 561,
-	AUDIO_SAMPLE_POLICE_FBI_3_PURSUIT_ARREST_3 = 562,
-	AUDIO_SAMPLE_POLICE_FBI_3_PURSUIT_ARREST_4 = 563,
-	AUDIO_SAMPLE_POLICE_FBI_3_PURSUIT_ARREST_5 = 564,
-	AUDIO_SAMPLE_POLICE_FBI_3_PURSUIT_ARREST_6 = 565,
-	AUDIO_SAMPLE_POLICE_HELI_FOUND_PLAYER_1 = 566,
-	AUDIO_SAMPLE_POLICE_HELI_FOUND_PLAYER_2 = 567,
-	AUDIO_SAMPLE_POLICE_HELI_FOUND_PLAYER_3 = 568,
-	AUDIO_SAMPLE_POLICE_HELI_FOUND_PLAYER_4 = 569,
-	AUDIO_SAMPLE_POLICE_HELI_FOUND_PLAYER_5 = 570,
-	AUDIO_SAMPLE_POLICE_HELI_FOUND_PLAYER_6 = 571,
-	AUDIO_SAMPLE_POLICE_HELI_FOUND_PLAYER_7 = 572,
-	AUDIO_SAMPLE_POLICE_HELI_FOUND_PLAYER_8 = 573,
-	AUDIO_SAMPLE_POLICE_HELI_FOUND_PLAYER_9 = 574,
-	AUDIO_SAMPLE_POLICE_HELI_FOUND_PLAYER_10 = 575,
-	AUDIO_SAMPLE_POLICE_HELI_FOUND_PLAYER_11 = 576,
-	AUDIO_SAMPLE_POLICE_HELI_FOUND_PLAYER_12 = 577,
-	AUDIO_SAMPLE_POLICE_HELI_FOUND_PLAYER_13 = 578,
-	AUDIO_SAMPLE_POLICE_HELI_FOUND_PLAYER_14 = 579,
-	AUDIO_SAMPLE_POLICE_HELI_FOUND_PLAYER_15 = 580,
-	AUDIO_SAMPLE_POLICE_HELI_FOUND_PLAYER_16 = 581,
-	AUDIO_SAMPLE_POLICE_HELI_FOUND_PLAYER_17 = 582,
-	AUDIO_SAMPLE_POLICE_HELI_FOUND_PLAYER_18 = 583,
-	AUDIO_SAMPLE_POLICE_HELI_FOUND_PLAYER_19 = 584,
-	AUDIO_SAMPLE_POLICE_HELI_FOUND_PLAYER_20 = 585,
-	AUDIO_SAMPLE_POLICE_HELI_FOUND_PLAYER_21 = 586,
-	AUDIO_SAMPLE_POLICE_HELI_FOUND_PLAYER_22 = 587,
-	AUDIO_SAMPLE_POLICE_HELI_FOUND_PLAYER_23 = 588,
-	AUDIO_SAMPLE_POLICE_HELI_FOUND_PLAYER_24 = 589,
-	AUDIO_SAMPLE_POLICE_HELI_FOUND_PLAYER_25 = 590,
-	AUDIO_SAMPLE_POLICE_HELI_FOUND_PLAYER_26 = 591,
-	AUDIO_SAMPLE_POLICE_HELI_FOUND_PLAYER_27 = 592,
-	AUDIO_SAMPLE_POLICE_HELI_FOUND_PLAYER_28 = 593,
-	AUDIO_SAMPLE_POLICE_HELI_FOUND_PLAYER_29 = 594,
-	AUDIO_SAMPLE_PED_CHUNKY_DEATH_1 = 595,
-	AUDIO_SAMPLE_PED_BLACK_DOCKER_MALE_CAR_COLLISION_1 = 596,
-	AUDIO_SAMPLE_PED_BLACK_DOCKER_MALE_CAR_COLLISION_2 = 597,
-	AUDIO_SAMPLE_PED_BLACK_DOCKER_MALE_CAR_COLLISION_3 = 598,
-	AUDIO_SAMPLE_PED_BLACK_DOCKER_MALE_CAR_COLLISION_4 = 599,
-	AUDIO_SAMPLE_PED_BLACK_DOCKER_MALE_CAR_COLLISION_5 = 600,
-	AUDIO_SAMPLE_PED_BLACK_DOCKER_MALE_CAR_COLLISION_6 = 601,
-	AUDIO_SAMPLE_PED_BLACK_DOCKER_MALE_CHAT_1 = 602,
-	AUDIO_SAMPLE_PED_BLACK_DOCKER_MALE_CHAT_2 = 603,
-	AUDIO_SAMPLE_PED_BLACK_DOCKER_MALE_CHAT_3 = 604,
-	AUDIO_SAMPLE_PED_BLACK_DOCKER_MALE_CHAT_4 = 605,
-	AUDIO_SAMPLE_PED_BLACK_DOCKER_MALE_CHAT_5 = 606,
-	AUDIO_SAMPLE_PED_BLACK_DOCKER_MALE_EVADE_1 = 607,
-	AUDIO_SAMPLE_PED_BLACK_DOCKER_MALE_EVADE_2 = 608,
-	AUDIO_SAMPLE_PED_BLACK_DOCKER_MALE_EVADE_3 = 609,
-	AUDIO_SAMPLE_PED_BLACK_DOCKER_MALE_EVADE_4 = 610,
-	AUDIO_SAMPLE_PED_BLACK_DOCKER_MALE_EVADE_5 = 611,
-	AUDIO_SAMPLE_PED_BLACK_DOCKER_MALE_CHAT_SEXY_1 = 612,
-	AUDIO_SAMPLE_PED_BLACK_DOCKER_MALE_CHAT_SEXY_2 = 613,
-	AUDIO_SAMPLE_PED_BLACK_DOCKER_MALE_CHAT_SEXY_3 = 614,
-	AUDIO_SAMPLE_PED_BLACK_DOCKER_MALE_ATTACK_1 = 615,
-	AUDIO_SAMPLE_PED_BLACK_DOCKER_MALE_ATTACK_2 = 616,
-	AUDIO_SAMPLE_PED_BLACK_DOCKER_MALE_ATTACK_3 = 617,
-	AUDIO_SAMPLE_PED_BLACK_DOCKER_MALE_ATTACK_4 = 618,
-	AUDIO_SAMPLE_PED_BLACK_DOCKER_MALE_ATTACK_5 = 619,
-	AUDIO_SAMPLE_PED_BLACK_DOCKER_MALE_HANDS_COWER_1 = 620,
-	AUDIO_SAMPLE_PED_BLACK_DOCKER_MALE_HANDS_COWER_2 = 621,
-	AUDIO_SAMPLE_PED_BLACK_DOCKER_MALE_HANDS_COWER_3 = 622,
-	AUDIO_SAMPLE_POLICE_ARMY_1_PURSUIT_1 = 623,
-	AUDIO_SAMPLE_POLICE_ARMY_1_PURSUIT_2 = 624,
-	AUDIO_SAMPLE_POLICE_ARMY_1_PURSUIT_3 = 625,
-	AUDIO_SAMPLE_POLICE_ARMY_1_PURSUIT_4 = 626,
-	AUDIO_SAMPLE_POLICE_ARMY_1_PURSUIT_5 = 627,
-	AUDIO_SAMPLE_POLICE_ARMY_1_PURSUIT_6 = 628,
-	AUDIO_SAMPLE_POLICE_ARMY_1_PURSUIT_7 = 629,
-	AUDIO_SAMPLE_POLICE_ARMY_1_PURSUIT_8 = 630,
-	AUDIO_SAMPLE_POLICE_ARMY_1_PURSUIT_9 = 631,
-	AUDIO_SAMPLE_POLICE_ARMY_1_PURSUIT_10 = 632,
-	AUDIO_SAMPLE_POLICE_ARMY_1_PURSUIT_11 = 633,
-	AUDIO_SAMPLE_POLICE_ARMY_1_PURSUIT_12 = 634,
-	AUDIO_SAMPLE_POLICE_ARMY_1_PURSUIT_13 = 635,
-	AUDIO_SAMPLE_POLICE_ARMY_1_PURSUIT_14 = 636,
-	AUDIO_SAMPLE_POLICE_ARMY_1_PURSUIT_15 = 637,
-	AUDIO_SAMPLE_POLICE_ARMY_2_PURSUIT_1 = 638,
-	AUDIO_SAMPLE_POLICE_ARMY_2_PURSUIT_2 = 639,
-	AUDIO_SAMPLE_POLICE_ARMY_2_PURSUIT_3 = 640,
-	AUDIO_SAMPLE_POLICE_ARMY_2_PURSUIT_4 = 641,
-	AUDIO_SAMPLE_POLICE_ARMY_2_PURSUIT_5 = 642,
-	AUDIO_SAMPLE_POLICE_ARMY_2_PURSUIT_6 = 643,
-	AUDIO_SAMPLE_POLICE_ARMY_2_PURSUIT_7 = 644,
-	AUDIO_SAMPLE_POLICE_ARMY_2_PURSUIT_8 = 645,
-	AUDIO_SAMPLE_POLICE_ARMY_2_PURSUIT_9 = 646,
-	AUDIO_SAMPLE_POLICE_ARMY_2_PURSUIT_10 = 647,
-	AUDIO_SAMPLE_POLICE_ARMY_2_PURSUIT_11 = 648,
-	AUDIO_SAMPLE_POLICE_ARMY_2_PURSUIT_12 = 649,
-	AUDIO_SAMPLE_POLICE_ARMY_2_PURSUIT_13 = 650,
-	AUDIO_SAMPLE_POLICE_ARMY_2_PURSUIT_14 = 651,
-	AUDIO_SAMPLE_POLICE_ARMY_2_PURSUIT_15 = 652,
-	AUDIO_SAMPLE_PED_HIT_REACTION_1 = 653,
-	AUDIO_SAMPLE_PED_HIT_REACTION_2 = 654,
-	AUDIO_SAMPLE_PED_HIT_REACTION_3 = 655,
-	AUDIO_SAMPLE_PED_HIT_REACTION_4 = 656,
-	AUDIO_SAMPLE_PED_HIT_REACTION_5 = 657,
-	AUDIO_SAMPLE_PED_HIT_REACTION_6 = 658,
-	AUDIO_SAMPLE_PED_HIT_REACTION_7 = 659,
-	AUDIO_SAMPLE_PED_HIT_REACTION_8 = 660,
-	AUDIO_SAMPLE_PED_HIT_REACTION_9 = 661,
-	AUDIO_SAMPLE_PED_HIT_REACTION_10 = 662,
-	AUDIO_SAMPLE_PED_DAMAGE_REACTION_1 = 663,
-	AUDIO_SAMPLE_PED_DAMAGE_REACTION_2 = 664,
-	AUDIO_SAMPLE_PED_DAMAGE_REACTION_3 = 665,
-	AUDIO_SAMPLE_PED_DAMAGE_REACTION_4 = 666,
-	AUDIO_SAMPLE_PED_DAMAGE_REACTION_5 = 667,
-	AUDIO_SAMPLE_PED_DAMAGE_REACTION_6 = 668,
-	AUDIO_SAMPLE_PED_DAMAGE_REACTION_7 = 669,
-	AUDIO_SAMPLE_PED_DAMAGE_REACTION_8 = 670,
-	AUDIO_SAMPLE_PED_DAMAGE_REACTION_9 = 671,
-	AUDIO_SAMPLE_PED_DAMAGE_REACTION_10 = 672,
-	AUDIO_SAMPLE_PED_DAMAGE_REACTION_11 = 673,
-	AUDIO_SAMPLE_PED_FALL_REACTION_1 = 674,
-	AUDIO_SAMPLE_PED_FALL_REACTION_2 = 675,
-	AUDIO_SAMPLE_PED_FALL_REACTION_3 = 676,
-	AUDIO_SAMPLE_PED_FALL_REACTION_4 = 677,
-	AUDIO_SAMPLE_PED_FALL_REACTION_5 = 678,
-	AUDIO_SAMPLE_PED_FALL_REACTION_6 = 679,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_OLD_1_CAR_COLLISION_1 = 680,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_OLD_1_CAR_COLLISION_2 = 681,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_OLD_1_CAR_COLLISION_3 = 682,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_OLD_1_CAR_COLLISION_4 = 683,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_OLD_1_CAR_COLLISION_5 = 684,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_OLD_1_CAR_COLLISION_6 = 685,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_OLD_1_CAR_COLLISION_7 = 686,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_OLD_1_CHAT_1 = 687,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_OLD_1_CHAT_2 = 688,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_OLD_1_CHAT_3 = 689,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_OLD_1_CHAT_4 = 690,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_OLD_1_CHAT_5 = 691,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_OLD_1_CHAT_6 = 692,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_OLD_1_CHAT_7 = 693,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_OLD_1_CHAT_8 = 694,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_OLD_1_CHAT_9 = 695,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_OLD_1_CHAT_10 = 696,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_OLD_1_EVADE_1 = 697,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_OLD_1_EVADE_2 = 698,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_OLD_1_EVADE_3 = 699,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_OLD_1_EVADE_4 = 700,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_OLD_1_EVADE_5 = 701,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_OLD_1_EVADE_6 = 702,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_OLD_1_EVADE_7 = 703,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_OLD_1_EVADE_8 = 704,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_OLD_1_EVADE_9 = 705,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_OLD_1_EVADE_10 = 706,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_OLD_1_CAR_JACKED_1 = 707,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_OLD_1_CAR_JACKED_2 = 708,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_OLD_1_CAR_JACKED_3 = 709,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_OLD_1_CAR_JACKED_4 = 710,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_OLD_1_CAR_JACKED_5 = 711,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_OLD_1_CAR_JACKED_6 = 712,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_OLD_1_ROBBED_1 = 713,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_OLD_1_ROBBED_2 = 714,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_OLD_1_FLEE_RUN_1 = 715,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_OLD_1_FLEE_RUN_2 = 716,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_OLD_1_FLEE_RUN_3 = 717,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_OLD_1_FLEE_RUN_4 = 718,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_OLD_1_FLEE_RUN_5 = 719,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_OLD_1_FLEE_RUN_6 = 720,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_OLD_1_CHAT_EVENT_1 = 721,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_OLD_1_CHAT_EVENT_2 = 722,
-	AUDIO_SAMPLE_PED_CHUNKY_FLEE_RUN_1 = 723,
-	AUDIO_SAMPLE_PED_CHUNKY_FLEE_RUN_2 = 724,
-	AUDIO_SAMPLE_PED_CHUNKY_FLEE_RUN_3 = 725,
-	AUDIO_SAMPLE_PED_CHUNKY_FLEE_RUN_4 = 726,
-	AUDIO_SAMPLE_PED_CHUNKY_FLEE_RUN_5 = 727,
-	AUDIO_SAMPLE_PED_PIMP_CAR_COLLISION_1 = 728,
-	AUDIO_SAMPLE_PED_PIMP_CAR_COLLISION_2 = 729,
-	AUDIO_SAMPLE_PED_PIMP_CAR_COLLISION_3 = 730,
-	AUDIO_SAMPLE_PED_PIMP_CAR_COLLISION_4 = 731,
-	AUDIO_SAMPLE_PED_PIMP_CAR_COLLISION_5 = 732,
-	AUDIO_SAMPLE_PED_PIMP_CHAT_1 = 733,
-	AUDIO_SAMPLE_PED_PIMP_CHAT_2 = 734,
-	AUDIO_SAMPLE_PED_PIMP_CHAT_3 = 735,
-	AUDIO_SAMPLE_PED_PIMP_CHAT_4 = 736,
-	AUDIO_SAMPLE_PED_PIMP_CHAT_5 = 737,
-	AUDIO_SAMPLE_PED_PIMP_CHAT_6 = 738,
-	AUDIO_SAMPLE_PED_PIMP_CHAT_7 = 739,
-	AUDIO_SAMPLE_PED_PIMP_CHAT_8 = 740,
-	AUDIO_SAMPLE_PED_PIMP_CHAT_9 = 741,
-	AUDIO_SAMPLE_PED_PIMP_CHAT_10 = 742,
-	AUDIO_SAMPLE_PED_PIMP_CHAT_11 = 743,
-	AUDIO_SAMPLE_PED_PIMP_CHAT_12 = 744,
-	AUDIO_SAMPLE_PED_PIMP_CHAT_13 = 745,
-	AUDIO_SAMPLE_PED_PIMP_CHAT_14 = 746,
-	AUDIO_SAMPLE_PED_PIMP_CHAT_15 = 747,
-	AUDIO_SAMPLE_PED_PIMP_CHAT_16 = 748,
-	AUDIO_SAMPLE_PED_PIMP_CHAT_17 = 749,
-	AUDIO_SAMPLE_PED_PIMP_EVADE_1 = 750,
-	AUDIO_SAMPLE_PED_PIMP_EVADE_2 = 751,
-	AUDIO_SAMPLE_PED_PIMP_EVADE_3 = 752,
-	AUDIO_SAMPLE_PED_PIMP_EVADE_4 = 753,
-	AUDIO_SAMPLE_PED_PIMP_EVADE_5 = 754,
-	AUDIO_SAMPLE_PED_PIMP_EVADE_6 = 755,
-	AUDIO_SAMPLE_PED_PIMP_DEFEND_1 = 756,
-	AUDIO_SAMPLE_PED_PIMP_DEFEND_2 = 757,
-	AUDIO_SAMPLE_PED_PIMP_DEFEND_3 = 758,
-	AUDIO_SAMPLE_PED_PIMP_DEFEND_4 = 759,
-	AUDIO_SAMPLE_PED_PIMP_DEFEND_5 = 760,
-	AUDIO_SAMPLE_PED_PIMP_DEFEND_6 = 761,
-	AUDIO_SAMPLE_PED_PIMP_DEFEND_7 = 762,
-	AUDIO_SAMPLE_PED_PIMP_DEFEND_8 = 763,
-	AUDIO_SAMPLE_PED_PIMP_DEFEND_9 = 764,
-	AUDIO_SAMPLE_PED_PIMP_HANDS_UP_1 = 765,
-	AUDIO_SAMPLE_PED_PIMP_HANDS_UP_2 = 766,
-	AUDIO_SAMPLE_PED_PIMP_HANDS_UP_3 = 767,
-	AUDIO_SAMPLE_PED_PIMP_HANDS_UP_4 = 768,
-	AUDIO_SAMPLE_PED_PIMP_HANDS_UP_5 = 769,
-	AUDIO_SAMPLE_PED_PIMP_HANDS_UP_6 = 770,
-	AUDIO_SAMPLE_PED_PIMP_HANDS_UP_7 = 771,
-	AUDIO_SAMPLE_PED_PIMP_CAR_JACKED_1 = 772,
-	AUDIO_SAMPLE_PED_PIMP_CAR_JACKED_2 = 773,
-	AUDIO_SAMPLE_PED_PIMP_CAR_JACKED_3 = 774,
-	AUDIO_SAMPLE_PED_PIMP_CAR_JACKED_4 = 775,
-	AUDIO_SAMPLE_PED_PIMP_CHAT_EVENT_1 = 776,
-	AUDIO_SAMPLE_PED_PIMP_CHAT_EVENT_2 = 777,
-	AUDIO_SAMPLE_PED_NORMAL_MALE_CAR_COLLISION_1 = 778,
-	AUDIO_SAMPLE_PED_NORMAL_MALE_CAR_COLLISION_2 = 779,
-	AUDIO_SAMPLE_PED_NORMAL_MALE_CAR_COLLISION_3 = 780,
-	AUDIO_SAMPLE_PED_NORMAL_MALE_CAR_COLLISION_4 = 781,
-	AUDIO_SAMPLE_PED_NORMAL_MALE_CAR_COLLISION_5 = 782,
-	AUDIO_SAMPLE_PED_NORMAL_MALE_CAR_COLLISION_6 = 783,
-	AUDIO_SAMPLE_PED_NORMAL_MALE_CAR_COLLISION_7 = 784,
-	AUDIO_SAMPLE_PED_NORMAL_MALE_CAR_COLLISION_8 = 785,
-	AUDIO_SAMPLE_PED_NORMAL_MALE_CAR_COLLISION_9 = 786,
-	AUDIO_SAMPLE_PED_NORMAL_MALE_CAR_COLLISION_10 = 787,
-	AUDIO_SAMPLE_PED_NORMAL_MALE_CAR_COLLISION_11 = 788,
-	AUDIO_SAMPLE_PED_NORMAL_MALE_CAR_COLLISION_12 = 789,
-	AUDIO_SAMPLE_PED_NORMAL_MALE_CHAT_1 = 790,
-	AUDIO_SAMPLE_PED_NORMAL_MALE_CHAT_2 = 791,
-	AUDIO_SAMPLE_PED_NORMAL_MALE_CHAT_3 = 792,
-	AUDIO_SAMPLE_PED_NORMAL_MALE_CHAT_4 = 793,
-	AUDIO_SAMPLE_PED_NORMAL_MALE_CHAT_5 = 794,
-	AUDIO_SAMPLE_PED_NORMAL_MALE_CHAT_6 = 795,
-	AUDIO_SAMPLE_PED_NORMAL_MALE_CHAT_7 = 796,
-	AUDIO_SAMPLE_PED_NORMAL_MALE_CHAT_8 = 797,
-	AUDIO_SAMPLE_PED_NORMAL_MALE_CHAT_9 = 798,
-	AUDIO_SAMPLE_PED_NORMAL_MALE_CHAT_10 = 799,
-	AUDIO_SAMPLE_PED_NORMAL_MALE_CHAT_11 = 800,
-	AUDIO_SAMPLE_PED_NORMAL_MALE_CHAT_12 = 801,
-	AUDIO_SAMPLE_PED_NORMAL_MALE_CHAT_13 = 802,
-	AUDIO_SAMPLE_PED_NORMAL_MALE_CHAT_14 = 803,
-	AUDIO_SAMPLE_PED_NORMAL_MALE_CHAT_15 = 804,
-	AUDIO_SAMPLE_PED_NORMAL_MALE_CHAT_16 = 805,
-	AUDIO_SAMPLE_PED_NORMAL_MALE_CHAT_17 = 806,
-	AUDIO_SAMPLE_PED_NORMAL_MALE_CHAT_18 = 807,
-	AUDIO_SAMPLE_PED_NORMAL_MALE_CHAT_19 = 808,
-	AUDIO_SAMPLE_PED_NORMAL_MALE_CHAT_20 = 809,
-	AUDIO_SAMPLE_PED_NORMAL_MALE_CHAT_21 = 810,
-	AUDIO_SAMPLE_PED_NORMAL_MALE_CHAT_22 = 811,
-	AUDIO_SAMPLE_PED_NORMAL_MALE_CHAT_23 = 812,
-	AUDIO_SAMPLE_PED_NORMAL_MALE_CHAT_24 = 813,
-	AUDIO_SAMPLE_PED_NORMAL_MALE_CHAT_25 = 814,
-	AUDIO_SAMPLE_PED_NORMAL_MALE_EVADE_1 = 815,
-	AUDIO_SAMPLE_PED_NORMAL_MALE_EVADE_2 = 816,
-	AUDIO_SAMPLE_PED_NORMAL_MALE_EVADE_3 = 817,
-	AUDIO_SAMPLE_PED_NORMAL_MALE_EVADE_4 = 818,
-	AUDIO_SAMPLE_PED_NORMAL_MALE_EVADE_5 = 819,
-	AUDIO_SAMPLE_PED_NORMAL_MALE_EVADE_6 = 820,
-	AUDIO_SAMPLE_PED_NORMAL_MALE_EVADE_7 = 821,
-	AUDIO_SAMPLE_PED_NORMAL_MALE_EVADE_8 = 822,
-	AUDIO_SAMPLE_PED_NORMAL_MALE_EVADE_9 = 823,
-	AUDIO_SAMPLE_PED_NORMAL_MALE_CHAT_SEXY_1 = 824,
-	AUDIO_SAMPLE_PED_NORMAL_MALE_CHAT_SEXY_2 = 825,
-	AUDIO_SAMPLE_PED_NORMAL_MALE_CHAT_SEXY_3 = 826,
-	AUDIO_SAMPLE_PED_NORMAL_MALE_CHAT_SEXY_4 = 827,
-	AUDIO_SAMPLE_PED_NORMAL_MALE_CHAT_SEXY_5 = 828,
-	AUDIO_SAMPLE_PED_NORMAL_MALE_CHAT_SEXY_6 = 829,
-	AUDIO_SAMPLE_PED_NORMAL_MALE_CHAT_SEXY_7 = 830,
-	AUDIO_SAMPLE_PED_NORMAL_MALE_CHAT_SEXY_8 = 831,
-	AUDIO_SAMPLE_PED_NORMAL_MALE_HANDS_COWER_1 = 832,
-	AUDIO_SAMPLE_PED_NORMAL_MALE_HANDS_COWER_2 = 833,
-	AUDIO_SAMPLE_PED_NORMAL_MALE_HANDS_COWER_3 = 834,
-	AUDIO_SAMPLE_PED_NORMAL_MALE_HANDS_COWER_4 = 835,
-	AUDIO_SAMPLE_PED_NORMAL_MALE_HANDS_COWER_5 = 836,
-	AUDIO_SAMPLE_PED_NORMAL_MALE_HANDS_COWER_6 = 837,
-	AUDIO_SAMPLE_PED_NORMAL_MALE_HANDS_COWER_7 = 838,
-	AUDIO_SAMPLE_PED_NORMAL_MALE_CAR_JACKED_1 = 839,
-	AUDIO_SAMPLE_PED_NORMAL_MALE_CAR_JACKED_2 = 840,
-	AUDIO_SAMPLE_PED_NORMAL_MALE_CAR_JACKED_3 = 841,
-	AUDIO_SAMPLE_PED_NORMAL_MALE_CAR_JACKED_4 = 842,
-	AUDIO_SAMPLE_PED_NORMAL_MALE_CAR_JACKED_5 = 843,
-	AUDIO_SAMPLE_PED_NORMAL_MALE_CAR_JACKED_6 = 844,
-	AUDIO_SAMPLE_PED_NORMAL_MALE_CAR_JACKED_7 = 845,
-	AUDIO_SAMPLE_PED_NORMAL_MALE_FLEE_RUN_1 = 846,
-	AUDIO_SAMPLE_PED_NORMAL_MALE_FLEE_RUN_2 = 847,
-	AUDIO_SAMPLE_PED_NORMAL_MALE_FLEE_RUN_3 = 848,
-	AUDIO_SAMPLE_PED_NORMAL_MALE_FLEE_RUN_4 = 849,
-	AUDIO_SAMPLE_PED_NORMAL_MALE_FLEE_RUN_5 = 850,
-	AUDIO_SAMPLE_PED_NORMAL_MALE_CHAT_EVENT_1 = 851,
-	AUDIO_SAMPLE_PED_NORMAL_MALE_CHAT_EVENT_2 = 852,
-	AUDIO_SAMPLE_PED_NORMAL_MALE_CHAT_EVENT_3 = 853,
-	AUDIO_SAMPLE_PED_NORMAL_MALE_CHAT_EVENT_4 = 854,
-	AUDIO_SAMPLE_PED_NORMAL_MALE_CHAT_EVENT_5 = 855,
-	AUDIO_SAMPLE_PED_NORMAL_MALE_CHAT_EVENT_6 = 856,
-	AUDIO_SAMPLE_PED_NORMAL_MALE_CHAT_EVENT_7 = 857,
-	AUDIO_SAMPLE_PED_NORMAL_MALE_CHAT_EVENT_8 = 858,
-	AUDIO_SAMPLE_PED_NORMAL_MALE_CHAT_EVENT_9 = 859,
-	AUDIO_SAMPLE_PED_NORMAL_MALE_CHAT_EVENT_10 = 860,
-	AUDIO_SAMPLE_PED_BOMBER_THREAT_1 = 861,
-	AUDIO_SAMPLE_PED_BOMBER_THREAT_2 = 862,
-	AUDIO_SAMPLE_PED_BOMBER_THREAT_3 = 863,
-	AUDIO_SAMPLE_PED_BOMBER_THREAT_4 = 864,
-	AUDIO_SAMPLE_PED_BOMBER_THREAT_5 = 865,
-	AUDIO_SAMPLE_PED_BOMBER_THREAT_6 = 866,
-	AUDIO_SAMPLE_PED_BOMBER_THREAT_7 = 867,
-	AUDIO_SAMPLE_PED_EIGHT_EVADE_1 = 868,
-	AUDIO_SAMPLE_PED_EIGHT_EVADE_2 = 869,
-	AUDIO_SAMPLE_PED_EIGHT_EVADE_3 = 870,
-	AUDIO_SAMPLE_PED_EIGHT_EVADE_4 = 871,
-	AUDIO_SAMPLE_PED_EIGHT_EVADE_5 = 872,
-	AUDIO_SAMPLE_PED_EIGHT_EVADE_6 = 873,
-	AUDIO_SAMPLE_PED_EIGHT_EVADE_7 = 874,
-	AUDIO_SAMPLE_PED_EIGHT_ATTACK_1 = 875,
-	AUDIO_SAMPLE_PED_EIGHT_ATTACK_2 = 876,
-	AUDIO_SAMPLE_PED_EIGHT_ATTACK_3 = 877,
-	AUDIO_SAMPLE_PED_EIGHT_ATTACK_4 = 878,
-	AUDIO_SAMPLE_PED_EIGHT_ATTACK_5 = 879,
-	AUDIO_SAMPLE_PED_EIGHT_ATTACK_6 = 880,
-	AUDIO_SAMPLE_PED_EIGHT_HANDS_UP_1 = 881,
-	AUDIO_SAMPLE_PED_EIGHT_HANDS_UP_2 = 882,
-	AUDIO_SAMPLE_PED_EIGHT_ROBBED_1 = 883,
-	AUDIO_SAMPLE_PED_EIGHT_ROBBED_2 = 884,
-	AUDIO_SAMPLE_PED_FRANKIE_EVADE_1 = 885,
-	AUDIO_SAMPLE_PED_FRANKIE_EVADE_2 = 886,
-	AUDIO_SAMPLE_PED_FRANKIE_EVADE_3 = 887,
-	AUDIO_SAMPLE_PED_FRANKIE_ATTACK_1 = 888,
-	AUDIO_SAMPLE_PED_FRANKIE_ATTACK_2 = 889,
-	AUDIO_SAMPLE_PED_FRANKIE_ATTACK_3 = 890,
-	AUDIO_SAMPLE_PED_FRANKIE_ATTACK_4 = 891,
-	AUDIO_SAMPLE_PED_FRANKIE_ATTACK_5 = 892,
-	AUDIO_SAMPLE_PED_FRANKIE_ATTACK_6 = 893,
-	AUDIO_SAMPLE_PED_FRANKIE_HANDS_UP_1 = 894,
-	AUDIO_SAMPLE_PED_FRANKIE_HANDS_UP_2 = 895,
-	AUDIO_SAMPLE_PED_FRANKIE_HANDS_UP_3 = 896,
-	AUDIO_SAMPLE_PED_FRANKIE_HANDS_UP_4 = 897,
-	AUDIO_SAMPLE_PED_FRANKIE_ROBBED_1 = 898,
-	AUDIO_SAMPLE_PED_FRANKIE_ROBBED_2 = 899,
-	AUDIO_SAMPLE_PED_MISTY_EVADE_1 = 900,
-	AUDIO_SAMPLE_PED_MISTY_EVADE_2 = 901,
-	AUDIO_SAMPLE_PED_MISTY_EVADE_3 = 902,
-	AUDIO_SAMPLE_PED_MISTY_EVADE_4 = 903,
-	AUDIO_SAMPLE_PED_MISTY_EVADE_5 = 904,
-	AUDIO_SAMPLE_PED_MISTY_ATTACK_1 = 905,
-	AUDIO_SAMPLE_PED_MISTY_ATTACK_2 = 906,
-	AUDIO_SAMPLE_PED_MISTY_ATTACK_3 = 907,
-	AUDIO_SAMPLE_PED_MISTY_ATTACK_4 = 908,
-	AUDIO_SAMPLE_PED_MISTY_HANDS_UP_1 = 909,
-	AUDIO_SAMPLE_PED_MISTY_HANDS_UP_2 = 910,
-	AUDIO_SAMPLE_PED_MISTY_HANDS_UP_3 = 911,
-	AUDIO_SAMPLE_PED_MISTY_HANDS_UP_4 = 912,
-	AUDIO_SAMPLE_PED_MISTY_HANDS_UP_5 = 913,
-	AUDIO_SAMPLE_PED_MISTY_THUMB_LIFT_1 = 914,
-	AUDIO_SAMPLE_PED_MISTY_THUMB_LIFT_2 = 915,
-	AUDIO_SAMPLE_PED_MISTY_THUMB_LIFT_3 = 916,
-	AUDIO_SAMPLE_PED_MISTY_THUMB_LIFT_4 = 917,
-	AUDIO_SAMPLE_PED_MISTY_ROBBED_1 = 918,
-	AUDIO_SAMPLE_PED_MISTY_ROBBED_2 = 919,
-	AUDIO_SAMPLE_PED_MEDIC_1_HANDS_COWER_1 = 920,
-	AUDIO_SAMPLE_PED_MEDIC_1_HANDS_COWER_2 = 921,
-	AUDIO_SAMPLE_PED_MEDIC_1_HANDS_COWER_3 = 922,
-	AUDIO_SAMPLE_PED_MEDIC_1_HANDS_COWER_4 = 923,
-	AUDIO_SAMPLE_PED_MEDIC_1_HANDS_COWER_5 = 924,
-	AUDIO_SAMPLE_PED_MEDIC_1_CAR_JACKED_1 = 925,
-	AUDIO_SAMPLE_PED_MEDIC_1_CAR_JACKED_2 = 926,
-	AUDIO_SAMPLE_PED_MEDIC_1_CAR_JACKED_3 = 927,
-	AUDIO_SAMPLE_PED_MEDIC_1_CAR_JACKED_4 = 928,
-	AUDIO_SAMPLE_PED_MEDIC_1_CAR_JACKED_5 = 929,
-	AUDIO_SAMPLE_PED_MEDIC_1_FLEE_RUN_1 = 930,
-	AUDIO_SAMPLE_PED_MEDIC_1_FLEE_RUN_2 = 931,
-	AUDIO_SAMPLE_PED_MEDIC_1_FLEE_RUN_3 = 932,
-	AUDIO_SAMPLE_PED_MEDIC_1_FLEE_RUN_4 = 933,
-	AUDIO_SAMPLE_PED_MEDIC_1_FLEE_RUN_5 = 934,
-	AUDIO_SAMPLE_PED_MEDIC_1_FLEE_RUN_6 = 935,
-	AUDIO_SAMPLE_PED_MEDIC_1_LEAVE_VEHICLE_1 = 936,
-	AUDIO_SAMPLE_PED_MEDIC_1_LEAVE_VEHICLE_2 = 937,
-	AUDIO_SAMPLE_PED_MEDIC_1_LEAVE_VEHICLE_3 = 938,
-	AUDIO_SAMPLE_PED_MEDIC_1_LEAVE_VEHICLE_4 = 939,
-	AUDIO_SAMPLE_PED_MEDIC_1_LEAVE_VEHICLE_5 = 940,
-	AUDIO_SAMPLE_PED_MEDIC_1_LEAVE_VEHICLE_6 = 941,
-	AUDIO_SAMPLE_PED_MEDIC_1_LEAVE_VEHICLE_7 = 942,
-	AUDIO_SAMPLE_PED_MEDIC_1_LEAVE_VEHICLE_8 = 943,
-	AUDIO_SAMPLE_PED_MEDIC_1_LEAVE_VEHICLE_9 = 944,
-	AUDIO_SAMPLE_PED_MEDIC_1_HEALING_1 = 945,
-	AUDIO_SAMPLE_PED_MEDIC_1_HEALING_2 = 946,
-	AUDIO_SAMPLE_PED_MEDIC_1_HEALING_3 = 947,
-	AUDIO_SAMPLE_PED_MEDIC_1_HEALING_4 = 948,
-	AUDIO_SAMPLE_PED_MEDIC_1_HEALING_5 = 949,
-	AUDIO_SAMPLE_PED_MEDIC_1_HEALING_6 = 950,
-	AUDIO_SAMPLE_PED_MEDIC_1_HEALING_7 = 951,
-	AUDIO_SAMPLE_PED_MEDIC_1_HEALING_8 = 952,
-	AUDIO_SAMPLE_PED_MEDIC_1_HEALING_9 = 953,
-	AUDIO_SAMPLE_PED_MEDIC_1_HEALING_10 = 954,
-	AUDIO_SAMPLE_PED_MEDIC_1_HEALING_11 = 955,
-	AUDIO_SAMPLE_PED_MEDIC_1_HEALING_12 = 956,
-	AUDIO_SAMPLE_PED_MEDIC_2_HANDS_COWER_1 = 957,
-	AUDIO_SAMPLE_PED_MEDIC_2_HANDS_COWER_2 = 958,
-	AUDIO_SAMPLE_PED_MEDIC_2_HANDS_COWER_3 = 959,
-	AUDIO_SAMPLE_PED_MEDIC_2_HANDS_COWER_4 = 960,
-	AUDIO_SAMPLE_PED_MEDIC_2_HANDS_COWER_5 = 961,
-	AUDIO_SAMPLE_PED_MEDIC_2_CAR_JACKED_1 = 962,
-	AUDIO_SAMPLE_PED_MEDIC_2_CAR_JACKED_2 = 963,
-	AUDIO_SAMPLE_PED_MEDIC_2_CAR_JACKED_3 = 964,
-	AUDIO_SAMPLE_PED_MEDIC_2_CAR_JACKED_4 = 965,
-	AUDIO_SAMPLE_PED_MEDIC_2_CAR_JACKED_5 = 966,
-	AUDIO_SAMPLE_PED_MEDIC_2_FLEE_RUN_1 = 967,
-	AUDIO_SAMPLE_PED_MEDIC_2_FLEE_RUN_2 = 968,
-	AUDIO_SAMPLE_PED_MEDIC_2_FLEE_RUN_3 = 969,
-	AUDIO_SAMPLE_PED_MEDIC_2_FLEE_RUN_4 = 970,
-	AUDIO_SAMPLE_PED_MEDIC_2_FLEE_RUN_5 = 971,
-	AUDIO_SAMPLE_PED_MEDIC_2_FLEE_RUN_6 = 972,
-	AUDIO_SAMPLE_PED_MEDIC_2_LEAVE_VEHICLE_1 = 973,
-	AUDIO_SAMPLE_PED_MEDIC_2_LEAVE_VEHICLE_2 = 974,
-	AUDIO_SAMPLE_PED_MEDIC_2_LEAVE_VEHICLE_3 = 975,
-	AUDIO_SAMPLE_PED_MEDIC_2_LEAVE_VEHICLE_4 = 976,
-	AUDIO_SAMPLE_PED_MEDIC_2_LEAVE_VEHICLE_5 = 977,
-	AUDIO_SAMPLE_PED_MEDIC_2_LEAVE_VEHICLE_6 = 978,
-	AUDIO_SAMPLE_PED_MEDIC_2_LEAVE_VEHICLE_7 = 979,
-	AUDIO_SAMPLE_PED_MEDIC_2_LEAVE_VEHICLE_8 = 980,
-	AUDIO_SAMPLE_PED_MEDIC_2_LEAVE_VEHICLE_9 = 981,
-	AUDIO_SAMPLE_PED_MEDIC_2_HEALING_1 = 982,
-	AUDIO_SAMPLE_PED_MEDIC_2_HEALING_2 = 983,
-	AUDIO_SAMPLE_PED_MEDIC_2_HEALING_3 = 984,
-	AUDIO_SAMPLE_PED_MEDIC_2_HEALING_4 = 985,
-	AUDIO_SAMPLE_PED_MEDIC_2_HEALING_5 = 986,
-	AUDIO_SAMPLE_PED_MEDIC_2_HEALING_6 = 987,
-	AUDIO_SAMPLE_PED_MEDIC_2_HEALING_7 = 988,
-	AUDIO_SAMPLE_PED_MEDIC_2_HEALING_8 = 989,
-	AUDIO_SAMPLE_PED_MEDIC_2_HEALING_9 = 990,
-	AUDIO_SAMPLE_PED_MEDIC_2_HEALING_10 = 991,
-	AUDIO_SAMPLE_PED_MEDIC_2_HEALING_11 = 992,
-	AUDIO_SAMPLE_PED_MEDIC_2_HEALING_12 = 993,
-	AUDIO_SAMPLE_PED_BODYCAST_HIT_1 = 994,
-	AUDIO_SAMPLE_PED_BODYCAST_HIT_2 = 995,
-	AUDIO_SAMPLE_PED_BODYCAST_HIT_3 = 996,
-	AUDIO_SAMPLE_PED_BODYCAST_HIT_4 = 997,
-	AUDIO_SAMPLE_PED_BLACK_CONSTRUCTION_WORKER_CAR_COLLISION_1 = 998,
-	AUDIO_SAMPLE_PED_BLACK_CONSTRUCTION_WORKER_CAR_COLLISION_2 = 999,
-	AUDIO_SAMPLE_PED_BLACK_CONSTRUCTION_WORKER_CAR_COLLISION_3 = 1000,
-	AUDIO_SAMPLE_PED_BLACK_CONSTRUCTION_WORKER_CAR_COLLISION_4 = 1001,
-	AUDIO_SAMPLE_PED_BLACK_CONSTRUCTION_WORKER_CAR_COLLISION_5 = 1002,
-	AUDIO_SAMPLE_PED_BLACK_CONSTRUCTION_WORKER_CHAT_1 = 1003,
-	AUDIO_SAMPLE_PED_BLACK_CONSTRUCTION_WORKER_CHAT_2 = 1004,
-	AUDIO_SAMPLE_PED_BLACK_CONSTRUCTION_WORKER_CHAT_3 = 1005,
-	AUDIO_SAMPLE_PED_BLACK_CONSTRUCTION_WORKER_CHAT_4 = 1006,
-	AUDIO_SAMPLE_PED_BLACK_CONSTRUCTION_WORKER_EVADE_1 = 1007,
-	AUDIO_SAMPLE_PED_BLACK_CONSTRUCTION_WORKER_EVADE_2 = 1008,
-	AUDIO_SAMPLE_PED_BLACK_CONSTRUCTION_WORKER_EVADE_3 = 1009,
-	AUDIO_SAMPLE_PED_BLACK_CONSTRUCTION_WORKER_EVADE_4 = 1010,
-	AUDIO_SAMPLE_PED_BLACK_CONSTRUCTION_WORKER_EVADE_5 = 1011,
-	AUDIO_SAMPLE_PED_BLACK_CONSTRUCTION_WORKER_CHAT_SEXY_1 = 1012,
-	AUDIO_SAMPLE_PED_BLACK_CONSTRUCTION_WORKER_CHAT_SEXY_2 = 1013,
-	AUDIO_SAMPLE_PED_BLACK_CONSTRUCTION_WORKER_CHAT_SEXY_3 = 1014,
-	AUDIO_SAMPLE_PED_BLACK_CONSTRUCTION_WORKER_CHAT_SEXY_4 = 1015,
-	AUDIO_SAMPLE_PED_BLACK_CONSTRUCTION_WORKER_ATTACK_1 = 1016,
-	AUDIO_SAMPLE_PED_BLACK_CONSTRUCTION_WORKER_ATTACK_2 = 1017,
-	AUDIO_SAMPLE_PED_BLACK_CONSTRUCTION_WORKER_ATTACK_3 = 1018,
-	AUDIO_SAMPLE_PED_BLACK_CONSTRUCTION_WORKER_ATTACK_4 = 1019,
-	AUDIO_SAMPLE_PED_BLACK_CONSTRUCTION_WORKER_ATTACK_5 = 1020,
-	AUDIO_SAMPLE_PED_BLACK_CONSTRUCTION_WORKER_HANDS_COWER_1 = 1021,
-	AUDIO_SAMPLE_PED_BLACK_CONSTRUCTION_WORKER_HANDS_COWER_2 = 1022,
-	AUDIO_SAMPLE_PED_BLACK_CONSTRUCTION_WORKER_HANDS_COWER_3 = 1023,
-	AUDIO_SAMPLE_PED_BLACK_CONSTRUCTION_WORKER_CAR_JACKED_1 = 1024,
-	AUDIO_SAMPLE_PED_BLACK_CONSTRUCTION_WORKER_CAR_JACKED_2 = 1025,
-	AUDIO_SAMPLE_PED_FAN_FEMALE_1_CAR_COLLISION_1 = 1026,
-	AUDIO_SAMPLE_PED_FAN_FEMALE_1_CAR_COLLISION_2 = 1027,
-	AUDIO_SAMPLE_PED_FAN_FEMALE_1_CAR_COLLISION_3 = 1028,
-	AUDIO_SAMPLE_PED_FAN_FEMALE_1_CAR_COLLISION_4 = 1029,
-	AUDIO_SAMPLE_PED_FAN_FEMALE_1_CAR_COLLISION_5 = 1030,
-	AUDIO_SAMPLE_PED_FAN_FEMALE_1_CHAT_1 = 1031,
-	AUDIO_SAMPLE_PED_FAN_FEMALE_1_CHAT_2 = 1032,
-	AUDIO_SAMPLE_PED_FAN_FEMALE_1_CHAT_3 = 1033,
-	AUDIO_SAMPLE_PED_FAN_FEMALE_1_CHAT_4 = 1034,
-	AUDIO_SAMPLE_PED_FAN_FEMALE_1_CHAT_5 = 1035,
-	AUDIO_SAMPLE_PED_FAN_FEMALE_1_CHAT_6 = 1036,
-	AUDIO_SAMPLE_PED_FAN_FEMALE_1_EVADE_1 = 1037,
-	AUDIO_SAMPLE_PED_FAN_FEMALE_1_EVADE_2 = 1038,
-	AUDIO_SAMPLE_PED_FAN_FEMALE_1_EVADE_3 = 1039,
-	AUDIO_SAMPLE_PED_FAN_FEMALE_1_EVADE_4 = 1040,
-	AUDIO_SAMPLE_PED_FAN_FEMALE_1_ROBBED_1 = 1041,
-	AUDIO_SAMPLE_PED_FAN_FEMALE_1_CHAT_EVENT_1 = 1042,
-	AUDIO_SAMPLE_PED_FAN_FEMALE_1_CHAT_EVENT_2 = 1043,
-	AUDIO_SAMPLE_PED_FAN_FEMALE_2_CAR_COLLISION_1 = 1044,
-	AUDIO_SAMPLE_PED_FAN_FEMALE_2_CAR_COLLISION_2 = 1045,
-	AUDIO_SAMPLE_PED_FAN_FEMALE_2_CAR_COLLISION_3 = 1046,
-	AUDIO_SAMPLE_PED_FAN_FEMALE_2_CAR_COLLISION_4 = 1047,
-	AUDIO_SAMPLE_PED_FAN_FEMALE_2_CAR_COLLISION_5 = 1048,
-	AUDIO_SAMPLE_PED_FAN_FEMALE_2_CHAT_1 = 1049,
-	AUDIO_SAMPLE_PED_FAN_FEMALE_2_CHAT_2 = 1050,
-	AUDIO_SAMPLE_PED_FAN_FEMALE_2_CHAT_3 = 1051,
-	AUDIO_SAMPLE_PED_FAN_FEMALE_2_CHAT_4 = 1052,
-	AUDIO_SAMPLE_PED_FAN_FEMALE_2_CHAT_5 = 1053,
-	AUDIO_SAMPLE_PED_FAN_FEMALE_2_CHAT_6 = 1054,
-	AUDIO_SAMPLE_PED_FAN_FEMALE_2_EVADE_1 = 1055,
-	AUDIO_SAMPLE_PED_FAN_FEMALE_2_EVADE_2 = 1056,
-	AUDIO_SAMPLE_PED_FAN_FEMALE_2_EVADE_3 = 1057,
-	AUDIO_SAMPLE_PED_FAN_FEMALE_2_EVADE_4 = 1058,
-	AUDIO_SAMPLE_PED_FAN_FEMALE_2_ROBBED_1 = 1059,
-	AUDIO_SAMPLE_PED_FAN_FEMALE_2_CHAT_EVENT_1 = 1060,
-	AUDIO_SAMPLE_PED_FAN_FEMALE_2_CHAT_EVENT_2 = 1061,
-	AUDIO_SAMPLE_PED_FAN_MALE_1_CAR_COLLISION_1 = 1062,
-	AUDIO_SAMPLE_PED_FAN_MALE_1_CAR_COLLISION_2 = 1063,
-	AUDIO_SAMPLE_PED_FAN_MALE_1_CAR_COLLISION_3 = 1064,
-	AUDIO_SAMPLE_PED_FAN_MALE_1_CAR_COLLISION_4 = 1065,
-	AUDIO_SAMPLE_PED_FAN_MALE_1_CAR_COLLISION_5 = 1066,
-	AUDIO_SAMPLE_PED_FAN_MALE_1_CHAT_1 = 1067,
-	AUDIO_SAMPLE_PED_FAN_MALE_1_CHAT_2 = 1068,
-	AUDIO_SAMPLE_PED_FAN_MALE_1_CHAT_3 = 1069,
-	AUDIO_SAMPLE_PED_FAN_MALE_1_CHAT_4 = 1070,
-	AUDIO_SAMPLE_PED_FAN_MALE_1_CHAT_5 = 1071,
-	AUDIO_SAMPLE_PED_FAN_MALE_1_CHAT_6 = 1072,
-	AUDIO_SAMPLE_PED_FAN_MALE_1_EVADE_1 = 1073,
-	AUDIO_SAMPLE_PED_FAN_MALE_1_EVADE_2 = 1074,
-	AUDIO_SAMPLE_PED_FAN_MALE_1_EVADE_3 = 1075,
-	AUDIO_SAMPLE_PED_FAN_MALE_1_EVADE_4 = 1076,
-	AUDIO_SAMPLE_PED_FAN_MALE_1_ATTACK_1 = 1077,
-	AUDIO_SAMPLE_PED_FAN_MALE_1_ATTACK_2 = 1078,
-	AUDIO_SAMPLE_PED_FAN_MALE_1_ATTACK_3 = 1079,
-	AUDIO_SAMPLE_PED_FAN_MALE_1_CHAT_EVENT_1 = 1080,
-	AUDIO_SAMPLE_PED_FAN_MALE_1_CHAT_EVENT_2 = 1081,
-	AUDIO_SAMPLE_PED_FAN_MALE_2_CAR_COLLISION_1 = 1082,
-	AUDIO_SAMPLE_PED_FAN_MALE_2_CAR_COLLISION_2 = 1083,
-	AUDIO_SAMPLE_PED_FAN_MALE_2_CAR_COLLISION_3 = 1084,
-	AUDIO_SAMPLE_PED_FAN_MALE_2_CAR_COLLISION_4 = 1085,
-	AUDIO_SAMPLE_PED_FAN_MALE_2_CAR_COLLISION_5 = 1086,
-	AUDIO_SAMPLE_PED_FAN_MALE_2_CHAT_1 = 1087,
-	AUDIO_SAMPLE_PED_FAN_MALE_2_CHAT_2 = 1088,
-	AUDIO_SAMPLE_PED_FAN_MALE_2_CHAT_3 = 1089,
-	AUDIO_SAMPLE_PED_FAN_MALE_2_CHAT_4 = 1090,
-	AUDIO_SAMPLE_PED_FAN_MALE_2_CHAT_5 = 1091,
-	AUDIO_SAMPLE_PED_FAN_MALE_2_CHAT_6 = 1092,
-	AUDIO_SAMPLE_PED_FAN_MALE_2_EVADE_1 = 1093,
-	AUDIO_SAMPLE_PED_FAN_MALE_2_EVADE_2 = 1094,
-	AUDIO_SAMPLE_PED_FAN_MALE_2_EVADE_3 = 1095,
-	AUDIO_SAMPLE_PED_FAN_MALE_2_EVADE_4 = 1096,
-	AUDIO_SAMPLE_PED_FAN_MALE_2_ATTACK_1 = 1097,
-	AUDIO_SAMPLE_PED_FAN_MALE_2_ATTACK_2 = 1098,
-	AUDIO_SAMPLE_PED_FAN_MALE_2_ATTACK_3 = 1099,
-	AUDIO_SAMPLE_PED_FAN_MALE_2_CHAT_EVENT_1 = 1100,
-	AUDIO_SAMPLE_PED_FAN_MALE_2_CHAT_EVENT_2 = 1101,
-	AUDIO_SAMPLE_PED_SUPERMODEL_FEMALE_CAR_COLLISION_1 = 1102,
-	AUDIO_SAMPLE_PED_SUPERMODEL_FEMALE_CAR_COLLISION_2 = 1103,
-	AUDIO_SAMPLE_PED_SUPERMODEL_FEMALE_CAR_COLLISION_3 = 1104,
-	AUDIO_SAMPLE_PED_SUPERMODEL_FEMALE_CAR_COLLISION_4 = 1105,
-	AUDIO_SAMPLE_PED_SUPERMODEL_FEMALE_CAR_COLLISION_5 = 1106,
-	AUDIO_SAMPLE_PED_SUPERMODEL_FEMALE_CAR_COLLISION_6 = 1107,
-	AUDIO_SAMPLE_PED_SUPERMODEL_FEMALE_CAR_COLLISION_7 = 1108,
-	AUDIO_SAMPLE_PED_SUPERMODEL_FEMALE_CHAT_1 = 1109,
-	AUDIO_SAMPLE_PED_SUPERMODEL_FEMALE_CHAT_2 = 1110,
-	AUDIO_SAMPLE_PED_SUPERMODEL_FEMALE_CHAT_3 = 1111,
-	AUDIO_SAMPLE_PED_SUPERMODEL_FEMALE_CHAT_4 = 1112,
-	AUDIO_SAMPLE_PED_SUPERMODEL_FEMALE_CHAT_5 = 1113,
-	AUDIO_SAMPLE_PED_SUPERMODEL_FEMALE_CHAT_6 = 1114,
-	AUDIO_SAMPLE_PED_SUPERMODEL_FEMALE_CHAT_7 = 1115,
-	AUDIO_SAMPLE_PED_SUPERMODEL_FEMALE_CHAT_8 = 1116,
-	AUDIO_SAMPLE_PED_SUPERMODEL_FEMALE_EVADE_1 = 1117,
-	AUDIO_SAMPLE_PED_SUPERMODEL_FEMALE_EVADE_2 = 1118,
-	AUDIO_SAMPLE_PED_SUPERMODEL_FEMALE_EVADE_3 = 1119,
-	AUDIO_SAMPLE_PED_SUPERMODEL_FEMALE_EVADE_4 = 1120,
-	AUDIO_SAMPLE_PED_SUPERMODEL_FEMALE_HANDS_COWER_1 = 1121,
-	AUDIO_SAMPLE_PED_SUPERMODEL_FEMALE_HANDS_COWER_2 = 1122,
-	AUDIO_SAMPLE_PED_SUPERMODEL_FEMALE_HANDS_COWER_3 = 1123,
-	AUDIO_SAMPLE_PED_SUPERMODEL_FEMALE_HANDS_COWER_4 = 1124,
-	AUDIO_SAMPLE_PED_SUPERMODEL_FEMALE_ROBBED_1 = 1125,
-	AUDIO_SAMPLE_PED_SUPERMODEL_FEMALE_ROBBED_2 = 1126,
-	AUDIO_SAMPLE_PED_SUPERMODEL_FEMALE_ROBBED_3 = 1127,
-	AUDIO_SAMPLE_PED_SUPERMODEL_FEMALE_CHAT_EVENT_1 = 1128,
-	AUDIO_SAMPLE_PED_SUPERMODEL_FEMALE_CHAT_EVENT_2 = 1129,
-	AUDIO_SAMPLE_PED_SUPERMODEL_FEMALE_CHAT_EVENT_3 = 1130,
-	AUDIO_SAMPLE_PED_SUPERMODEL_FEMALE_CHAT_EVENT_4 = 1131,
-	AUDIO_SAMPLE_PED_SUPERMODEL_FEMALE_CHAT_EVENT_5 = 1132,
-	AUDIO_SAMPLE_PED_SUPERMODEL_MALE_CAR_COLLISION_1 = 1133,
-	AUDIO_SAMPLE_PED_SUPERMODEL_MALE_CAR_COLLISION_2 = 1134,
-	AUDIO_SAMPLE_PED_SUPERMODEL_MALE_CAR_COLLISION_3 = 1135,
-	AUDIO_SAMPLE_PED_SUPERMODEL_MALE_CAR_COLLISION_4 = 1136,
-	AUDIO_SAMPLE_PED_SUPERMODEL_MALE_CAR_COLLISION_5 = 1137,
-	AUDIO_SAMPLE_PED_SUPERMODEL_MALE_CAR_COLLISION_6 = 1138,
-	AUDIO_SAMPLE_PED_SUPERMODEL_MALE_CHAT_1 = 1139,
-	AUDIO_SAMPLE_PED_SUPERMODEL_MALE_CHAT_2 = 1140,
-	AUDIO_SAMPLE_PED_SUPERMODEL_MALE_CHAT_3 = 1141,
-	AUDIO_SAMPLE_PED_SUPERMODEL_MALE_CHAT_4 = 1142,
-	AUDIO_SAMPLE_PED_SUPERMODEL_MALE_CHAT_5 = 1143,
-	AUDIO_SAMPLE_PED_SUPERMODEL_MALE_CHAT_6 = 1144,
-	AUDIO_SAMPLE_PED_SUPERMODEL_MALE_EVADE_1 = 1145,
-	AUDIO_SAMPLE_PED_SUPERMODEL_MALE_EVADE_2 = 1146,
-	AUDIO_SAMPLE_PED_SUPERMODEL_MALE_EVADE_3 = 1147,
-	AUDIO_SAMPLE_PED_SUPERMODEL_MALE_EVADE_4 = 1148,
-	AUDIO_SAMPLE_PED_SUPERMODEL_MALE_EVADE_5 = 1149,
-	AUDIO_SAMPLE_PED_SUPERMODEL_MALE_EVADE_6 = 1150,
-	AUDIO_SAMPLE_PED_SUPERMODEL_MALE_CHAT_SEXY_1 = 1151,
-	AUDIO_SAMPLE_PED_SUPERMODEL_MALE_CHAT_SEXY_2 = 1152,
-	AUDIO_SAMPLE_PED_SUPERMODEL_MALE_CHAT_SEXY_3 = 1153,
-	AUDIO_SAMPLE_PED_SUPERMODEL_MALE_ATTACK_1 = 1154,
-	AUDIO_SAMPLE_PED_SUPERMODEL_MALE_ATTACK_2 = 1155,
-	AUDIO_SAMPLE_PED_SUPERMODEL_MALE_ATTACK_3 = 1156,
-	AUDIO_SAMPLE_PED_SUPERMODEL_MALE_ATTACK_4 = 1157,
-	AUDIO_SAMPLE_PED_SUPERMODEL_MALE_ATTACK_5 = 1158,
-	AUDIO_SAMPLE_PED_SUPERMODEL_MALE_CAR_JACKED_1 = 1159,
-	AUDIO_SAMPLE_PED_SUPERMODEL_MALE_CAR_JACKED_2 = 1160,
-	AUDIO_SAMPLE_PED_SUPERMODEL_MALE_ROBBED_1 = 1161,
-	AUDIO_SAMPLE_PED_SUPERMODEL_MALE_ROBBED_2 = 1162,
-	AUDIO_SAMPLE_PED_CHINATOWN_MALE_YOUNG_CAR_COLLISION_1 = 1163,
-	AUDIO_SAMPLE_PED_CHINATOWN_MALE_YOUNG_CAR_COLLISION_2 = 1164,
-	AUDIO_SAMPLE_PED_CHINATOWN_MALE_YOUNG_CAR_COLLISION_3 = 1165,
-	AUDIO_SAMPLE_PED_CHINATOWN_MALE_YOUNG_CAR_COLLISION_4 = 1166,
-	AUDIO_SAMPLE_PED_CHINATOWN_MALE_YOUNG_CAR_COLLISION_5 = 1167,
-	AUDIO_SAMPLE_PED_CHINATOWN_MALE_YOUNG_CAR_COLLISION_6 = 1168,
-	AUDIO_SAMPLE_PED_CHINATOWN_MALE_YOUNG_CHAT_1 = 1169,
-	AUDIO_SAMPLE_PED_CHINATOWN_MALE_YOUNG_CHAT_2 = 1170,
-	AUDIO_SAMPLE_PED_CHINATOWN_MALE_YOUNG_CHAT_3 = 1171,
-	AUDIO_SAMPLE_PED_CHINATOWN_MALE_YOUNG_CHAT_4 = 1172,
-	AUDIO_SAMPLE_PED_CHINATOWN_MALE_YOUNG_CHAT_5 = 1173,
-	AUDIO_SAMPLE_PED_CHINATOWN_MALE_YOUNG_CHAT_6 = 1174,
-	AUDIO_SAMPLE_PED_CHINATOWN_MALE_YOUNG_EVADE_1 = 1175,
-	AUDIO_SAMPLE_PED_CHINATOWN_MALE_YOUNG_EVADE_2 = 1176,
-	AUDIO_SAMPLE_PED_CHINATOWN_MALE_YOUNG_EVADE_3 = 1177,
-	AUDIO_SAMPLE_PED_CHINATOWN_MALE_YOUNG_EVADE_4 = 1178,
-	AUDIO_SAMPLE_PED_CHINATOWN_MALE_YOUNG_EVADE_5 = 1179,
-	AUDIO_SAMPLE_PED_CHINATOWN_MALE_YOUNG_CHAT_SEXY_1 = 1180,
-	AUDIO_SAMPLE_PED_CHINATOWN_MALE_YOUNG_CHAT_SEXY_2 = 1181,
-	AUDIO_SAMPLE_PED_CHINATOWN_MALE_YOUNG_CHAT_SEXY_3 = 1182,
-	AUDIO_SAMPLE_PED_CHINATOWN_MALE_YOUNG_ATTACK_1 = 1183,
-	AUDIO_SAMPLE_PED_CHINATOWN_MALE_YOUNG_ATTACK_2 = 1184,
-	AUDIO_SAMPLE_PED_CHINATOWN_MALE_YOUNG_ATTACK_3 = 1185,
-	AUDIO_SAMPLE_PED_CHINATOWN_MALE_YOUNG_ATTACK_4 = 1186,
-	AUDIO_SAMPLE_PED_CHINATOWN_MALE_YOUNG_ATTACK_5 = 1187,
-	AUDIO_SAMPLE_PED_CHINATOWN_MALE_YOUNG_ATTACK_6 = 1188,
-	AUDIO_SAMPLE_PED_CHINATOWN_MALE_YOUNG_HANDS_COWER_1 = 1189,
-	AUDIO_SAMPLE_PED_CHINATOWN_MALE_YOUNG_HANDS_COWER_2 = 1190,
-	AUDIO_SAMPLE_PED_CHINATOWN_MALE_YOUNG_CAR_JACKED_1 = 1191,
-	AUDIO_SAMPLE_PED_CHINATOWN_MALE_YOUNG_CAR_JACKED_2 = 1192,
-	AUDIO_SAMPLE_PED_SCUM_MALE_CAR_COLLISION_1 = 1193,
-	AUDIO_SAMPLE_PED_SCUM_MALE_CAR_COLLISION_2 = 1194,
-	AUDIO_SAMPLE_PED_SCUM_MALE_CAR_COLLISION_3 = 1195,
-	AUDIO_SAMPLE_PED_SCUM_MALE_CAR_COLLISION_4 = 1196,
-	AUDIO_SAMPLE_PED_SCUM_MALE_CAR_COLLISION_5 = 1197,
-	AUDIO_SAMPLE_PED_SCUM_MALE_CAR_COLLISION_6 = 1198,
-	AUDIO_SAMPLE_PED_SCUM_MALE_CHAT_1 = 1199,
-	AUDIO_SAMPLE_PED_SCUM_MALE_CHAT_2 = 1200,
-	AUDIO_SAMPLE_PED_SCUM_MALE_CHAT_3 = 1201,
-	AUDIO_SAMPLE_PED_SCUM_MALE_CHAT_4 = 1202,
-	AUDIO_SAMPLE_PED_SCUM_MALE_CHAT_5 = 1203,
-	AUDIO_SAMPLE_PED_SCUM_MALE_CHAT_6 = 1204,
-	AUDIO_SAMPLE_PED_SCUM_MALE_CHAT_7 = 1205,
-	AUDIO_SAMPLE_PED_SCUM_MALE_CHAT_8 = 1206,
-	AUDIO_SAMPLE_PED_SCUM_MALE_CHAT_9 = 1207,
-	AUDIO_SAMPLE_PED_SCUM_MALE_EVADE_1 = 1208,
-	AUDIO_SAMPLE_PED_SCUM_MALE_EVADE_2 = 1209,
-	AUDIO_SAMPLE_PED_SCUM_MALE_EVADE_3 = 1210,
-	AUDIO_SAMPLE_PED_SCUM_MALE_EVADE_4 = 1211,
-	AUDIO_SAMPLE_PED_SCUM_MALE_EVADE_5 = 1212,
-	AUDIO_SAMPLE_PED_SCUM_MALE_CHAT_SEXY_1 = 1213,
-	AUDIO_SAMPLE_PED_SCUM_MALE_CHAT_SEXY_2 = 1214,
-	AUDIO_SAMPLE_PED_SCUM_MALE_CHAT_SEXY_3 = 1215,
-	AUDIO_SAMPLE_PED_SCUM_MALE_CHAT_SEXY_4 = 1216,
-	AUDIO_SAMPLE_PED_SCUM_MALE_CHAT_SEXY_5 = 1217,
-	AUDIO_SAMPLE_PED_SCUM_MALE_ATTACK_1 = 1218,
-	AUDIO_SAMPLE_PED_SCUM_MALE_ATTACK_2 = 1219,
-	AUDIO_SAMPLE_PED_SCUM_MALE_ATTACK_3 = 1220,
-	AUDIO_SAMPLE_PED_SCUM_MALE_ATTACK_4 = 1221,
-	AUDIO_SAMPLE_PED_SCUM_MALE_ATTACK_5 = 1222,
-	AUDIO_SAMPLE_PED_SCUM_MALE_ATTACK_6 = 1223,
-	AUDIO_SAMPLE_PED_SCUM_MALE_ATTACK_7 = 1224,
-	AUDIO_SAMPLE_PED_SCUM_MALE_ATTACK_8 = 1225,
-	AUDIO_SAMPLE_PED_SCUM_MALE_ATTACK_9 = 1226,
-	AUDIO_SAMPLE_PED_SCUM_MALE_ATTACK_10 = 1227,
-	AUDIO_SAMPLE_PED_SCUM_MALE_HANDS_COWER_1 = 1228,
-	AUDIO_SAMPLE_PED_SCUM_MALE_HANDS_COWER_2 = 1229,
-	AUDIO_SAMPLE_PED_SCUM_MALE_HANDS_COWER_3 = 1230,
-	AUDIO_SAMPLE_PED_SCUM_MALE_HANDS_COWER_4 = 1231,
-	AUDIO_SAMPLE_PED_SCUM_MALE_HANDS_COWER_5 = 1232,
-	AUDIO_SAMPLE_PED_SCUM_MALE_WAIT_DOUBLEBACK_1 = 1233,
-	AUDIO_SAMPLE_PED_SCUM_MALE_WAIT_DOUBLEBACK_2 = 1234,
-	AUDIO_SAMPLE_PED_SCUM_MALE_WAIT_DOUBLEBACK_3 = 1235,
-	AUDIO_SAMPLE_PED_SCUM_MALE_ROBBED_1 = 1236,
-	AUDIO_SAMPLE_PED_SCUM_FEMALE_CAR_COLLISION_1 = 1237,
-	AUDIO_SAMPLE_PED_SCUM_FEMALE_CAR_COLLISION_2 = 1238,
-	AUDIO_SAMPLE_PED_SCUM_FEMALE_CAR_COLLISION_3 = 1239,
-	AUDIO_SAMPLE_PED_SCUM_FEMALE_CAR_COLLISION_4 = 1240,
-	AUDIO_SAMPLE_PED_SCUM_FEMALE_CAR_COLLISION_5 = 1241,
-	AUDIO_SAMPLE_PED_SCUM_FEMALE_CHAT_1 = 1242,
-	AUDIO_SAMPLE_PED_SCUM_FEMALE_CHAT_2 = 1243,
-	AUDIO_SAMPLE_PED_SCUM_FEMALE_CHAT_3 = 1244,
-	AUDIO_SAMPLE_PED_SCUM_FEMALE_CHAT_4 = 1245,
-	AUDIO_SAMPLE_PED_SCUM_FEMALE_CHAT_5 = 1246,
-	AUDIO_SAMPLE_PED_SCUM_FEMALE_CHAT_6 = 1247,
-	AUDIO_SAMPLE_PED_SCUM_FEMALE_CHAT_7 = 1248,
-	AUDIO_SAMPLE_PED_SCUM_FEMALE_CHAT_8 = 1249,
-	AUDIO_SAMPLE_PED_SCUM_FEMALE_CHAT_9 = 1250,
-	AUDIO_SAMPLE_PED_SCUM_FEMALE_CHAT_10 = 1251,
-	AUDIO_SAMPLE_PED_SCUM_FEMALE_CHAT_11 = 1252,
-	AUDIO_SAMPLE_PED_SCUM_FEMALE_CHAT_12 = 1253,
-	AUDIO_SAMPLE_PED_SCUM_FEMALE_CHAT_13 = 1254,
-	AUDIO_SAMPLE_PED_SCUM_FEMALE_EVADE_1 = 1255,
-	AUDIO_SAMPLE_PED_SCUM_FEMALE_EVADE_2 = 1256,
-	AUDIO_SAMPLE_PED_SCUM_FEMALE_EVADE_3 = 1257,
-	AUDIO_SAMPLE_PED_SCUM_FEMALE_EVADE_4 = 1258,
-	AUDIO_SAMPLE_PED_SCUM_FEMALE_EVADE_5 = 1259,
-	AUDIO_SAMPLE_PED_SCUM_FEMALE_EVADE_6 = 1260,
-	AUDIO_SAMPLE_PED_SCUM_FEMALE_EVADE_7 = 1261,
-	AUDIO_SAMPLE_PED_SCUM_FEMALE_EVADE_8 = 1262,
-	AUDIO_SAMPLE_PED_SCUM_FEMALE_ATTACK_1 = 1263,
-	AUDIO_SAMPLE_PED_SCUM_FEMALE_ATTACK_2 = 1264,
-	AUDIO_SAMPLE_PED_SCUM_FEMALE_ATTACK_3 = 1265,
-	AUDIO_SAMPLE_PED_SCUM_FEMALE_ATTACK_4 = 1266,
-	AUDIO_SAMPLE_PED_SCUM_FEMALE_HANDS_COWER_1 = 1267,
-	AUDIO_SAMPLE_PED_SCUM_FEMALE_HANDS_COWER_2 = 1268,
-	AUDIO_SAMPLE_PED_SCUM_FEMALE_HANDS_COWER_3 = 1269,
-	AUDIO_SAMPLE_PED_SCUM_FEMALE_HANDS_COWER_4 = 1270,
-	AUDIO_SAMPLE_PED_SCUM_FEMALE_ROBBED_1 = 1271,
-	AUDIO_SAMPLE_PED_SCUM_FEMALE_ROBBED_2 = 1272,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_YOUNG_1_CAR_COLLISION_1 = 1273,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_YOUNG_1_CAR_COLLISION_2 = 1274,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_YOUNG_1_CAR_COLLISION_3 = 1275,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_YOUNG_1_CAR_COLLISION_4 = 1276,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_YOUNG_1_CAR_COLLISION_5 = 1277,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_YOUNG_1_CAR_COLLISION_6 = 1278,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_YOUNG_1_CHAT_1 = 1279,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_YOUNG_1_CHAT_2 = 1280,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_YOUNG_1_CHAT_3 = 1281,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_YOUNG_1_CHAT_4 = 1282,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_YOUNG_1_CHAT_5 = 1283,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_YOUNG_1_CHAT_6 = 1284,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_YOUNG_1_CHAT_7 = 1285,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_YOUNG_1_EVADE_1 = 1286,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_YOUNG_1_EVADE_2 = 1287,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_YOUNG_1_EVADE_3 = 1288,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_YOUNG_1_EVADE_4 = 1289,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_YOUNG_1_EVADE_5 = 1290,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_YOUNG_1_HANDS_COWER_1 = 1291,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_YOUNG_1_HANDS_COWER_2 = 1292,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_YOUNG_1_HANDS_COWER_3 = 1293,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_YOUNG_1_HANDS_COWER_4 = 1294,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_YOUNG_1_CAR_JACKED_1 = 1295,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_YOUNG_1_ROBBED_1 = 1296,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_YOUNG_1_ROBBED_2 = 1297,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_YOUNG_1_CHAT_EVENT_1 = 1298,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_YOUNG_1_CHAT_EVENT_2 = 1299,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_YOUNG_1_CHAT_EVENT_3 = 1300,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_YOUNG_1_CHAT_EVENT_4 = 1301,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_FEMALE_YOUNG_1_CHAT_EVENT_5 = 1302,
-	AUDIO_SAMPLE_PED_BUSINESS_MALE_YOUNG_1_CAR_COLLISION_1 = 1303,
-	AUDIO_SAMPLE_PED_BUSINESS_MALE_YOUNG_1_CAR_COLLISION_2 = 1304,
-	AUDIO_SAMPLE_PED_BUSINESS_MALE_YOUNG_1_CAR_COLLISION_3 = 1305,
-	AUDIO_SAMPLE_PED_BUSINESS_MALE_YOUNG_1_CAR_COLLISION_4 = 1306,
-	AUDIO_SAMPLE_PED_BUSINESS_MALE_YOUNG_1_CAR_COLLISION_5 = 1307,
-	AUDIO_SAMPLE_PED_BUSINESS_MALE_YOUNG_1_CAR_COLLISION_6 = 1308,
-	AUDIO_SAMPLE_PED_BUSINESS_MALE_YOUNG_1_CHAT_1 = 1309,
-	AUDIO_SAMPLE_PED_BUSINESS_MALE_YOUNG_1_CHAT_2 = 1310,
-	AUDIO_SAMPLE_PED_BUSINESS_MALE_YOUNG_1_CHAT_3 = 1311,
-	AUDIO_SAMPLE_PED_BUSINESS_MALE_YOUNG_1_CHAT_4 = 1312,
-	AUDIO_SAMPLE_PED_BUSINESS_MALE_YOUNG_1_CHAT_5 = 1313,
-	AUDIO_SAMPLE_PED_BUSINESS_MALE_YOUNG_1_CHAT_6 = 1314,
-	AUDIO_SAMPLE_PED_BUSINESS_MALE_YOUNG_1_EVADE_1 = 1315,
-	AUDIO_SAMPLE_PED_BUSINESS_MALE_YOUNG_1_EVADE_2 = 1316,
-	AUDIO_SAMPLE_PED_BUSINESS_MALE_YOUNG_1_EVADE_3 = 1317,
-	AUDIO_SAMPLE_PED_BUSINESS_MALE_YOUNG_1_EVADE_4 = 1318,
-	AUDIO_SAMPLE_PED_BUSINESS_MALE_YOUNG_1_ATTACK_1 = 1319,
-	AUDIO_SAMPLE_PED_BUSINESS_MALE_YOUNG_1_ATTACK_2 = 1320,
-	AUDIO_SAMPLE_PED_BUSINESS_MALE_YOUNG_1_ATTACK_3 = 1321,
-	AUDIO_SAMPLE_PED_BUSINESS_MALE_YOUNG_1_ATTACK_4 = 1322,
-	AUDIO_SAMPLE_PED_BUSINESS_MALE_YOUNG_1_HANDS_COWER_1 = 1323,
-	AUDIO_SAMPLE_PED_BUSINESS_MALE_YOUNG_1_HANDS_COWER_2 = 1324,
-	AUDIO_SAMPLE_PED_BUSINESS_MALE_YOUNG_1_HANDS_COWER_3 = 1325,
-	AUDIO_SAMPLE_PED_BUSINESS_MALE_YOUNG_1_CAR_JACKED_1 = 1326,
-	AUDIO_SAMPLE_PED_BUSINESS_MALE_YOUNG_1_CAR_JACKED_2 = 1327,
-	AUDIO_SAMPLE_PED_BUSINESS_MALE_YOUNG_1_ROBBED_1 = 1328,
-	AUDIO_SAMPLE_PED_BUSINESS_MALE_YOUNG_1_ROBBED_2 = 1329,
-	AUDIO_SAMPLE_PED_BUSINESS_MALE_YOUNG_1_FLEE_RUN_1 = 1330,
-	AUDIO_SAMPLE_PED_BUSINESS_MALE_YOUNG_1_FLEE_RUN_2 = 1331,
-	AUDIO_SAMPLE_PED_BUSINESS_MALE_YOUNG_1_FLEE_RUN_3 = 1332,
-	AUDIO_SAMPLE_PED_BUSINESS_MALE_YOUNG_1_FLEE_RUN_4 = 1333,
-	AUDIO_SAMPLE_PED_BUSINESS_MALE_YOUNG_1_FLEE_RUN_5 = 1334,
-	AUDIO_SAMPLE_PED_LAZLOW_UNUSED_CAR_COLLISION_1 = 1335,
-	AUDIO_SAMPLE_PED_LAZLOW_UNUSED_CAR_COLLISION_2 = 1336,
-	AUDIO_SAMPLE_PED_LAZLOW_UNUSED_CAR_COLLISION_3 = 1337,
-	AUDIO_SAMPLE_PED_LAZLOW_UNUSED_CAR_COLLISION_4 = 1338,
-	AUDIO_SAMPLE_PED_LAZLOW_UNUSED_CAR_COLLISION_5 = 1339,
-	AUDIO_SAMPLE_PED_LAZLOW_UNUSED_CAR_COLLISION_6 = 1340,
-	AUDIO_SAMPLE_PED_LAZLOW_UNUSED_CHAT_1 = 1341,
-	AUDIO_SAMPLE_PED_LAZLOW_UNUSED_CHAT_2 = 1342,
-	AUDIO_SAMPLE_PED_LAZLOW_UNUSED_CHAT_3 = 1343,
-	AUDIO_SAMPLE_PED_LAZLOW_UNUSED_CHAT_4 = 1344,
-	AUDIO_SAMPLE_PED_LAZLOW_UNUSED_CHAT_5 = 1345,
-	AUDIO_SAMPLE_PED_LAZLOW_UNUSED_CHAT_6 = 1346,
-	AUDIO_SAMPLE_PED_LAZLOW_UNUSED_EVADE_1 = 1347,
-	AUDIO_SAMPLE_PED_LAZLOW_UNUSED_EVADE_2 = 1348,
-	AUDIO_SAMPLE_PED_LAZLOW_UNUSED_EVADE_3 = 1349,
-	AUDIO_SAMPLE_PED_LAZLOW_UNUSED_EVADE_4 = 1350,
-	AUDIO_SAMPLE_PED_LAZLOW_UNUSED_ATTACK_1 = 1351,
-	AUDIO_SAMPLE_PED_LAZLOW_UNUSED_ATTACK_2 = 1352,
-	AUDIO_SAMPLE_PED_LAZLOW_UNUSED_ATTACK_3 = 1353,
-	AUDIO_SAMPLE_PED_LAZLOW_UNUSED_ATTACK_4 = 1354,
-	AUDIO_SAMPLE_PED_LAZLOW_UNUSED_HANDS_COWER_1 = 1355,
-	AUDIO_SAMPLE_PED_LAZLOW_UNUSED_HANDS_COWER_2 = 1356,
-	AUDIO_SAMPLE_PED_LAZLOW_UNUSED_HANDS_COWER_3 = 1357,
-	AUDIO_SAMPLE_PED_LAZLOW_UNUSED_CAR_JACKED_1 = 1358,
-	AUDIO_SAMPLE_PED_LAZLOW_UNUSED_CAR_JACKED_2 = 1359,
-	AUDIO_SAMPLE_PED_LAZLOW_UNUSED_ROBBED_1 = 1360,
-	AUDIO_SAMPLE_PED_LAZLOW_UNUSED_ROBBED_2 = 1361,
-	AUDIO_SAMPLE_PED_LAZLOW_UNUSED_FLEE_RUN_1 = 1362,
-	AUDIO_SAMPLE_PED_LAZLOW_UNUSED_FLEE_RUN_2 = 1363,
-	AUDIO_SAMPLE_PED_LAZLOW_UNUSED_FLEE_RUN_3 = 1364,
-	AUDIO_SAMPLE_PED_LAZLOW_UNUSED_FLEE_RUN_4 = 1365,
-	AUDIO_SAMPLE_PED_LAZLOW_UNUSED_FLEE_RUN_5 = 1366,
-	AUDIO_SAMPLE_PED_BLACK_FAT_FEMALE_1_CAR_COLLISION_1 = 1367,
-	AUDIO_SAMPLE_PED_BLACK_FAT_FEMALE_1_CAR_COLLISION_2 = 1368,
-	AUDIO_SAMPLE_PED_BLACK_FAT_FEMALE_1_CAR_COLLISION_3 = 1369,
-	AUDIO_SAMPLE_PED_BLACK_FAT_FEMALE_1_CAR_COLLISION_4 = 1370,
-	AUDIO_SAMPLE_PED_BLACK_FAT_FEMALE_1_CAR_COLLISION_5 = 1371,
-	AUDIO_SAMPLE_PED_BLACK_FAT_FEMALE_1_CAR_COLLISION_6 = 1372,
-	AUDIO_SAMPLE_PED_BLACK_FAT_FEMALE_1_CHAT_1 = 1373,
-	AUDIO_SAMPLE_PED_BLACK_FAT_FEMALE_1_CHAT_2 = 1374,
-	AUDIO_SAMPLE_PED_BLACK_FAT_FEMALE_1_CHAT_3 = 1375,
-	AUDIO_SAMPLE_PED_BLACK_FAT_FEMALE_1_CHAT_4 = 1376,
-	AUDIO_SAMPLE_PED_BLACK_FAT_FEMALE_1_CHAT_5 = 1377,
-	AUDIO_SAMPLE_PED_BLACK_FAT_FEMALE_1_CHAT_6 = 1378,
-	AUDIO_SAMPLE_PED_BLACK_FAT_FEMALE_1_CHAT_7 = 1379,
-	AUDIO_SAMPLE_PED_BLACK_FAT_FEMALE_1_EVADE_1 = 1380,
-	AUDIO_SAMPLE_PED_BLACK_FAT_FEMALE_1_EVADE_2 = 1381,
-	AUDIO_SAMPLE_PED_BLACK_FAT_FEMALE_1_EVADE_3 = 1382,
-	AUDIO_SAMPLE_PED_BLACK_FAT_FEMALE_1_EVADE_4 = 1383,
-	AUDIO_SAMPLE_PED_BLACK_FAT_FEMALE_1_EVADE_5 = 1384,
-	AUDIO_SAMPLE_PED_BLACK_FAT_FEMALE_1_HANDS_COWER_1 = 1385,
-	AUDIO_SAMPLE_PED_BLACK_FAT_FEMALE_1_HANDS_COWER_2 = 1386,
-	AUDIO_SAMPLE_PED_BLACK_FAT_FEMALE_1_HANDS_COWER_3 = 1387,
-	AUDIO_SAMPLE_PED_BLACK_FAT_FEMALE_1_HANDS_COWER_4 = 1388,
-	AUDIO_SAMPLE_PED_BLACK_FAT_FEMALE_1_CAR_JACKED_1 = 1389,
-	AUDIO_SAMPLE_PED_BLACK_FAT_FEMALE_1_CAR_JACKED_2 = 1390,
-	AUDIO_SAMPLE_PED_BLACK_FAT_FEMALE_1_ROBBED_1 = 1391,
-	AUDIO_SAMPLE_PED_BLACK_FAT_FEMALE_1_ROBBED_2 = 1392,
-	AUDIO_SAMPLE_PED_BLACK_FAT_FEMALE_1_CHAT_EVENT_1 = 1393,
-	AUDIO_SAMPLE_PED_BLACK_FAT_FEMALE_1_CHAT_EVENT_2 = 1394,
-	AUDIO_SAMPLE_PED_BLACK_FAT_FEMALE_1_CHAT_EVENT_3 = 1395,
-	AUDIO_SAMPLE_PED_BLACK_FAT_FEMALE_1_CHAT_EVENT_4 = 1396,
-	AUDIO_SAMPLE_PED_BLACK_FAT_FEMALE_1_CHAT_EVENT_5 = 1397,
-	AUDIO_SAMPLE_PED_WHITE_DOCKER_MALE_CAR_COLLISION_1 = 1398,
-	AUDIO_SAMPLE_PED_WHITE_DOCKER_MALE_CAR_COLLISION_2 = 1399,
-	AUDIO_SAMPLE_PED_WHITE_DOCKER_MALE_CAR_COLLISION_3 = 1400,
-	AUDIO_SAMPLE_PED_WHITE_DOCKER_MALE_CAR_COLLISION_4 = 1401,
-	AUDIO_SAMPLE_PED_WHITE_DOCKER_MALE_CHAT_1 = 1402,
-	AUDIO_SAMPLE_PED_WHITE_DOCKER_MALE_CHAT_2 = 1403,
-	AUDIO_SAMPLE_PED_WHITE_DOCKER_MALE_CHAT_3 = 1404,
-	AUDIO_SAMPLE_PED_WHITE_DOCKER_MALE_CHAT_4 = 1405,
-	AUDIO_SAMPLE_PED_WHITE_DOCKER_MALE_CHAT_5 = 1406,
-	AUDIO_SAMPLE_PED_WHITE_DOCKER_MALE_EVADE_1 = 1407,
-	AUDIO_SAMPLE_PED_WHITE_DOCKER_MALE_EVADE_2 = 1408,
-	AUDIO_SAMPLE_PED_WHITE_DOCKER_MALE_EVADE_3 = 1409,
-	AUDIO_SAMPLE_PED_WHITE_DOCKER_MALE_EVADE_4 = 1410,
-	AUDIO_SAMPLE_PED_WHITE_DOCKER_MALE_CHAT_SEXY_1 = 1411,
-	AUDIO_SAMPLE_PED_WHITE_DOCKER_MALE_CHAT_SEXY_2 = 1412,
-	AUDIO_SAMPLE_PED_WHITE_DOCKER_MALE_CHAT_SEXY_3 = 1413,
-	AUDIO_SAMPLE_PED_WHITE_DOCKER_MALE_ATTACK_1 = 1414,
-	AUDIO_SAMPLE_PED_WHITE_DOCKER_MALE_ATTACK_2 = 1415,
-	AUDIO_SAMPLE_PED_WHITE_DOCKER_MALE_ATTACK_3 = 1416,
-	AUDIO_SAMPLE_PED_WHITE_DOCKER_MALE_HANDS_COWER_1 = 1417,
-	AUDIO_SAMPLE_PED_WHITE_DOCKER_MALE_HANDS_COWER_2 = 1418,
-	AUDIO_SAMPLE_PED_HOSPITAL_MALE_CAR_COLLISION_1 = 1419,
-	AUDIO_SAMPLE_PED_HOSPITAL_MALE_CAR_COLLISION_2 = 1420,
-	AUDIO_SAMPLE_PED_HOSPITAL_MALE_CAR_COLLISION_3 = 1421,
-	AUDIO_SAMPLE_PED_HOSPITAL_MALE_CAR_COLLISION_4 = 1422,
-	AUDIO_SAMPLE_PED_HOSPITAL_MALE_CAR_COLLISION_5 = 1423,
-	AUDIO_SAMPLE_PED_HOSPITAL_MALE_CHAT_1 = 1424,
-	AUDIO_SAMPLE_PED_HOSPITAL_MALE_CHAT_2 = 1425,
-	AUDIO_SAMPLE_PED_HOSPITAL_MALE_CHAT_3 = 1426,
-	AUDIO_SAMPLE_PED_HOSPITAL_MALE_CHAT_4 = 1427,
-	AUDIO_SAMPLE_PED_HOSPITAL_MALE_CHAT_5 = 1428,
-	AUDIO_SAMPLE_PED_HOSPITAL_MALE_EVADE_1 = 1429,
-	AUDIO_SAMPLE_PED_HOSPITAL_MALE_EVADE_2 = 1430,
-	AUDIO_SAMPLE_PED_HOSPITAL_MALE_EVADE_3 = 1431,
-	AUDIO_SAMPLE_PED_HOSPITAL_MALE_EVADE_4 = 1432,
-	AUDIO_SAMPLE_PED_HOSPITAL_MALE_ATTACK_1 = 1433,
-	AUDIO_SAMPLE_PED_HOSPITAL_MALE_ATTACK_2 = 1434,
-	AUDIO_SAMPLE_PED_HOSPITAL_MALE_ATTACK_3 = 1435,
-	AUDIO_SAMPLE_PED_HOSPITAL_MALE_ATTACK_4 = 1436,
-	AUDIO_SAMPLE_PED_HOSPITAL_MALE_HANDS_COWER_1 = 1437,
-	AUDIO_SAMPLE_PED_HOSPITAL_MALE_HANDS_COWER_2 = 1438,
-	AUDIO_SAMPLE_PED_HOSPITAL_MALE_HANDS_COWER_3 = 1439,
-	AUDIO_SAMPLE_PED_HOSPITAL_MALE_HANDS_COWER_4 = 1440,
-	AUDIO_SAMPLE_PED_HOSPITAL_FEMALE_CAR_COLLISION_1 = 1441,
-	AUDIO_SAMPLE_PED_HOSPITAL_FEMALE_CAR_COLLISION_2 = 1442,
-	AUDIO_SAMPLE_PED_HOSPITAL_FEMALE_CAR_COLLISION_3 = 1443,
-	AUDIO_SAMPLE_PED_HOSPITAL_FEMALE_CAR_COLLISION_4 = 1444,
-	AUDIO_SAMPLE_PED_HOSPITAL_FEMALE_CAR_COLLISION_5 = 1445,
-	AUDIO_SAMPLE_PED_HOSPITAL_FEMALE_CAR_COLLISION_6 = 1446,
-	AUDIO_SAMPLE_PED_HOSPITAL_FEMALE_CHAT_1 = 1447,
-	AUDIO_SAMPLE_PED_HOSPITAL_FEMALE_CHAT_2 = 1448,
-	AUDIO_SAMPLE_PED_HOSPITAL_FEMALE_CHAT_3 = 1449,
-	AUDIO_SAMPLE_PED_HOSPITAL_FEMALE_CHAT_4 = 1450,
-	AUDIO_SAMPLE_PED_HOSPITAL_FEMALE_CHAT_5 = 1451,
-	AUDIO_SAMPLE_PED_HOSPITAL_FEMALE_CHAT_6 = 1452,
-	AUDIO_SAMPLE_PED_HOSPITAL_FEMALE_EVADE_1 = 1453,
-	AUDIO_SAMPLE_PED_HOSPITAL_FEMALE_EVADE_2 = 1454,
-	AUDIO_SAMPLE_PED_HOSPITAL_FEMALE_EVADE_3 = 1455,
-	AUDIO_SAMPLE_PED_HOSPITAL_FEMALE_EVADE_4 = 1456,
-	AUDIO_SAMPLE_PED_HOSPITAL_FEMALE_EVADE_5 = 1457,
-	AUDIO_SAMPLE_PED_BLACK_CASUAL_FEMALE_1_CAR_COLLISION_1 = 1458,
-	AUDIO_SAMPLE_PED_BLACK_CASUAL_FEMALE_1_CAR_COLLISION_2 = 1459,
-	AUDIO_SAMPLE_PED_BLACK_CASUAL_FEMALE_1_CAR_COLLISION_3 = 1460,
-	AUDIO_SAMPLE_PED_BLACK_CASUAL_FEMALE_1_CAR_COLLISION_4 = 1461,
-	AUDIO_SAMPLE_PED_BLACK_CASUAL_FEMALE_1_CAR_COLLISION_5 = 1462,
-	AUDIO_SAMPLE_PED_BLACK_CASUAL_FEMALE_1_CAR_COLLISION_6 = 1463,
-	AUDIO_SAMPLE_PED_BLACK_CASUAL_FEMALE_1_CAR_COLLISION_7 = 1464,
-	AUDIO_SAMPLE_PED_BLACK_CASUAL_FEMALE_1_CHAT_1 = 1465,
-	AUDIO_SAMPLE_PED_BLACK_CASUAL_FEMALE_1_CHAT_2 = 1466,
-	AUDIO_SAMPLE_PED_BLACK_CASUAL_FEMALE_1_CHAT_3 = 1467,
-	AUDIO_SAMPLE_PED_BLACK_CASUAL_FEMALE_1_CHAT_4 = 1468,
-	AUDIO_SAMPLE_PED_BLACK_CASUAL_FEMALE_1_CHAT_5 = 1469,
-	AUDIO_SAMPLE_PED_BLACK_CASUAL_FEMALE_1_CHAT_6 = 1470,
-	AUDIO_SAMPLE_PED_BLACK_CASUAL_FEMALE_1_CHAT_7 = 1471,
-	AUDIO_SAMPLE_PED_BLACK_CASUAL_FEMALE_1_CHAT_8 = 1472,
-	AUDIO_SAMPLE_PED_BLACK_CASUAL_FEMALE_1_EVADE_1 = 1473,
-	AUDIO_SAMPLE_PED_BLACK_CASUAL_FEMALE_1_EVADE_2 = 1474,
-	AUDIO_SAMPLE_PED_BLACK_CASUAL_FEMALE_1_EVADE_3 = 1475,
-	AUDIO_SAMPLE_PED_BLACK_CASUAL_FEMALE_1_EVADE_4 = 1476,
-	AUDIO_SAMPLE_PED_BLACK_CASUAL_FEMALE_1_EVADE_5 = 1477,
-	AUDIO_SAMPLE_PED_BLACK_CASUAL_FEMALE_1_EVADE_6 = 1478,
-	AUDIO_SAMPLE_PED_BLACK_CASUAL_FEMALE_1_HANDS_COWER_1 = 1479,
-	AUDIO_SAMPLE_PED_BLACK_CASUAL_FEMALE_1_HANDS_COWER_2 = 1480,
-	AUDIO_SAMPLE_PED_BLACK_CASUAL_FEMALE_1_CAR_JACKED_1 = 1481,
-	AUDIO_SAMPLE_PED_BLACK_CASUAL_FEMALE_1_CAR_JACKED_2 = 1482,
-	AUDIO_SAMPLE_PED_BLACK_CASUAL_FEMALE_1_ROBBED_1 = 1483,
-	AUDIO_SAMPLE_PED_BLACK_CASUAL_FEMALE_1_ROBBED_2 = 1484,
-	AUDIO_SAMPLE_PED_BLACK_CASUAL_FEMALE_1_ROBBED_3 = 1485,
-	AUDIO_SAMPLE_PED_BLACK_CASUAL_FEMALE_1_FLEE_RUN_1 = 1486,
-	AUDIO_SAMPLE_PED_BLACK_CASUAL_FEMALE_1_FLEE_RUN_2 = 1487,
-	AUDIO_SAMPLE_PED_BLACK_CASUAL_FEMALE_1_CHAT_EVENT_1 = 1488,
-	AUDIO_SAMPLE_PED_BLACK_CASUAL_FEMALE_1_CHAT_EVENT_2 = 1489,
-	AUDIO_SAMPLE_PED_BLACK_CASUAL_FEMALE_1_CHAT_EVENT_3 = 1490,
-	AUDIO_SAMPLE_PED_BLACK_CASUAL_FEMALE_1_CHAT_EVENT_4 = 1491,
-	AUDIO_SAMPLE_PED_FEMALE_NO_3_CAR_COLLISION_1 = 1492,
-	AUDIO_SAMPLE_PED_FEMALE_NO_3_CAR_COLLISION_2 = 1493,
-	AUDIO_SAMPLE_PED_FEMALE_NO_3_CAR_COLLISION_3 = 1494,
-	AUDIO_SAMPLE_PED_FEMALE_NO_3_CAR_COLLISION_4 = 1495,
-	AUDIO_SAMPLE_PED_FEMALE_NO_3_CAR_COLLISION_5 = 1496,
-	AUDIO_SAMPLE_PED_FEMALE_NO_3_CAR_COLLISION_6 = 1497,
-	AUDIO_SAMPLE_PED_FEMALE_NO_3_CHAT_1 = 1498,
-	AUDIO_SAMPLE_PED_FEMALE_NO_3_CHAT_2 = 1499,
-	AUDIO_SAMPLE_PED_FEMALE_NO_3_CHAT_3 = 1500,
-	AUDIO_SAMPLE_PED_FEMALE_NO_3_CHAT_4 = 1501,
-	AUDIO_SAMPLE_PED_FEMALE_NO_3_CHAT_5 = 1502,
-	AUDIO_SAMPLE_PED_FEMALE_NO_3_EVADE_1 = 1503,
-	AUDIO_SAMPLE_PED_FEMALE_NO_3_EVADE_2 = 1504,
-	AUDIO_SAMPLE_PED_FEMALE_NO_3_EVADE_3 = 1505,
-	AUDIO_SAMPLE_PED_FEMALE_NO_3_EVADE_4 = 1506,
-	AUDIO_SAMPLE_PED_FEMALE_NO_3_EVADE_5 = 1507,
-	AUDIO_SAMPLE_PED_FEMALE_NO_3_EVADE_6 = 1508,
-	AUDIO_SAMPLE_PED_FEMALE_NO_3_HANDS_COWER_1 = 1509,
-	AUDIO_SAMPLE_PED_FEMALE_NO_3_HANDS_COWER_2 = 1510,
-	AUDIO_SAMPLE_PED_FEMALE_NO_3_HANDS_COWER_3 = 1511,
-	AUDIO_SAMPLE_PED_FEMALE_NO_3_HANDS_COWER_4 = 1512,
-	AUDIO_SAMPLE_PED_FEMALE_NO_3_HANDS_COWER_5 = 1513,
-	AUDIO_SAMPLE_PED_FEMALE_NO_3_CAR_JACKED_1 = 1514,
-	AUDIO_SAMPLE_PED_FEMALE_NO_3_CAR_JACKED_2 = 1515,
-	AUDIO_SAMPLE_PED_FEMALE_NO_3_CAR_JACKED_3 = 1516,
-	AUDIO_SAMPLE_PED_FEMALE_NO_3_ROBBED_1 = 1517,
-	AUDIO_SAMPLE_PED_FEMALE_NO_3_ROBBED_2 = 1518,
-	AUDIO_SAMPLE_PED_FEMALE_NO_3_ROBBED_3 = 1519,
-	AUDIO_SAMPLE_PED_FEMALE_NO_3_FLEE_RUN_1 = 1520,
-	AUDIO_SAMPLE_PED_FEMALE_NO_3_FLEE_RUN_2 = 1521,
-	AUDIO_SAMPLE_PED_FEMALE_NO_3_FLEE_RUN_3 = 1522,
-	AUDIO_SAMPLE_PED_FEMALE_NO_3_FLEE_RUN_4 = 1523,
-	AUDIO_SAMPLE_PED_FEMALE_NO_3_CHAT_EVENT_1 = 1524,
-	AUDIO_SAMPLE_PED_FEMALE_NO_3_CHAT_EVENT_2 = 1525,
-	AUDIO_SAMPLE_PED_FEMALE_NO_3_CHAT_EVENT_3 = 1526,
-	AUDIO_SAMPLE_PED_FEMALE_NO_3_CHAT_EVENT_4 = 1527,
-	AUDIO_SAMPLE_PED_MALE_NO_2_CAR_COLLISION_1 = 1528,
-	AUDIO_SAMPLE_PED_MALE_NO_2_CAR_COLLISION_2 = 1529,
-	AUDIO_SAMPLE_PED_MALE_NO_2_CAR_COLLISION_3 = 1530,
-	AUDIO_SAMPLE_PED_MALE_NO_2_CAR_COLLISION_4 = 1531,
-	AUDIO_SAMPLE_PED_MALE_NO_2_CAR_COLLISION_5 = 1532,
-	AUDIO_SAMPLE_PED_MALE_NO_2_CAR_COLLISION_6 = 1533,
-	AUDIO_SAMPLE_PED_MALE_NO_2_CAR_COLLISION_7 = 1534,
-	AUDIO_SAMPLE_PED_MALE_NO_2_CHAT_1 = 1535,
-	AUDIO_SAMPLE_PED_MALE_NO_2_CHAT_2 = 1536,
-	AUDIO_SAMPLE_PED_MALE_NO_2_CHAT_3 = 1537,
-	AUDIO_SAMPLE_PED_MALE_NO_2_CHAT_4 = 1538,
-	AUDIO_SAMPLE_PED_MALE_NO_2_CHAT_5 = 1539,
-	AUDIO_SAMPLE_PED_MALE_NO_2_CHAT_6 = 1540,
-	AUDIO_SAMPLE_PED_MALE_NO_2_CHAT_7 = 1541,
-	AUDIO_SAMPLE_PED_MALE_NO_2_EVADE_1 = 1542,
-	AUDIO_SAMPLE_PED_MALE_NO_2_EVADE_2 = 1543,
-	AUDIO_SAMPLE_PED_MALE_NO_2_EVADE_3 = 1544,
-	AUDIO_SAMPLE_PED_MALE_NO_2_EVADE_4 = 1545,
-	AUDIO_SAMPLE_PED_MALE_NO_2_CHAT_SEXY_1 = 1546,
-	AUDIO_SAMPLE_PED_MALE_NO_2_CHAT_SEXY_2 = 1547,
-	AUDIO_SAMPLE_PED_MALE_NO_2_CHAT_SEXY_3 = 1548,
-	AUDIO_SAMPLE_PED_MALE_NO_2_CHAT_SEXY_4 = 1549,
-	AUDIO_SAMPLE_PED_MALE_NO_2_CHAT_SEXY_5 = 1550,
-	AUDIO_SAMPLE_PED_MALE_NO_2_ATTACK_1 = 1551,
-	AUDIO_SAMPLE_PED_MALE_NO_2_ATTACK_2 = 1552,
-	AUDIO_SAMPLE_PED_MALE_NO_2_ATTACK_3 = 1553,
-	AUDIO_SAMPLE_PED_MALE_NO_2_ATTACK_4 = 1554,
-	AUDIO_SAMPLE_PED_MALE_NO_2_CAR_JACKED_1 = 1555,
-	AUDIO_SAMPLE_PED_MALE_NO_2_CAR_JACKED_2 = 1556,
-	AUDIO_SAMPLE_PED_MALE_NO_2_CAR_JACKED_3 = 1557,
-	AUDIO_SAMPLE_PED_MALE_NO_2_ROBBED_1 = 1558,
-	AUDIO_SAMPLE_PED_MALE_NO_2_ROBBED_2 = 1559,
-	AUDIO_SAMPLE_PED_MALE_NO_2_ROBBED_3 = 1560,
-	AUDIO_SAMPLE_PED_MALE_NO_2_ROBBED_4 = 1561,
-	AUDIO_SAMPLE_PED_STUDENT_MALE_CAR_COLLISION_1 = 1562,
-	AUDIO_SAMPLE_PED_STUDENT_MALE_CAR_COLLISION_2 = 1563,
-	AUDIO_SAMPLE_PED_STUDENT_MALE_CAR_COLLISION_3 = 1564,
-	AUDIO_SAMPLE_PED_STUDENT_MALE_CAR_COLLISION_4 = 1565,
-	AUDIO_SAMPLE_PED_STUDENT_MALE_CHAT_1 = 1566,
-	AUDIO_SAMPLE_PED_STUDENT_MALE_CHAT_2 = 1567,
-	AUDIO_SAMPLE_PED_STUDENT_MALE_CHAT_3 = 1568,
-	AUDIO_SAMPLE_PED_STUDENT_MALE_CHAT_4 = 1569,
-	AUDIO_SAMPLE_PED_STUDENT_MALE_CHAT_5 = 1570,
-	AUDIO_SAMPLE_PED_STUDENT_MALE_EVADE_1 = 1571,
-	AUDIO_SAMPLE_PED_STUDENT_MALE_EVADE_2 = 1572,
-	AUDIO_SAMPLE_PED_STUDENT_MALE_EVADE_3 = 1573,
-	AUDIO_SAMPLE_PED_STUDENT_MALE_EVADE_4 = 1574,
-	AUDIO_SAMPLE_PED_STUDENT_MALE_ATTACK_1 = 1575,
-	AUDIO_SAMPLE_PED_STUDENT_MALE_ATTACK_2 = 1576,
-	AUDIO_SAMPLE_PED_STUDENT_MALE_ATTACK_3 = 1577,
-	AUDIO_SAMPLE_PED_STUDENT_MALE_ATTACK_4 = 1578,
-	AUDIO_SAMPLE_PED_STUDENT_MALE_HANDS_COWER_1 = 1579,
-	AUDIO_SAMPLE_PED_STUDENT_MALE_HANDS_COWER_2 = 1580,
-	AUDIO_SAMPLE_PED_STUDENT_MALE_ROBBED_1 = 1581,
-	AUDIO_SAMPLE_PED_STUDENT_MALE_ROBBED_2 = 1582,
-	AUDIO_SAMPLE_PED_STUDENT_MALE_CHAT_EVENT_1 = 1583,
-	AUDIO_SAMPLE_PED_STUDENT_MALE_CHAT_EVENT_2 = 1584,
-	AUDIO_SAMPLE_PED_STUDENT_MALE_CHAT_EVENT_3 = 1585,
-	AUDIO_SAMPLE_PED_STUDENT_FEMALE_CAR_COLLISION_1 = 1586,
-	AUDIO_SAMPLE_PED_STUDENT_FEMALE_CAR_COLLISION_2 = 1587,
-	AUDIO_SAMPLE_PED_STUDENT_FEMALE_CAR_COLLISION_3 = 1588,
-	AUDIO_SAMPLE_PED_STUDENT_FEMALE_CAR_COLLISION_4 = 1589,
-	AUDIO_SAMPLE_PED_STUDENT_FEMALE_CHAT_1 = 1590,
-	AUDIO_SAMPLE_PED_STUDENT_FEMALE_CHAT_2 = 1591,
-	AUDIO_SAMPLE_PED_STUDENT_FEMALE_CHAT_3 = 1592,
-	AUDIO_SAMPLE_PED_STUDENT_FEMALE_CHAT_4 = 1593,
-	AUDIO_SAMPLE_PED_STUDENT_FEMALE_EVADE_1 = 1594,
-	AUDIO_SAMPLE_PED_STUDENT_FEMALE_EVADE_2 = 1595,
-	AUDIO_SAMPLE_PED_STUDENT_FEMALE_EVADE_3 = 1596,
-	AUDIO_SAMPLE_PED_STUDENT_FEMALE_EVADE_4 = 1597,
-	AUDIO_SAMPLE_PED_STUDENT_FEMALE_ATTACK_1 = 1598,
-	AUDIO_SAMPLE_PED_STUDENT_FEMALE_ATTACK_2 = 1599,
-	AUDIO_SAMPLE_PED_STUDENT_FEMALE_ATTACK_3 = 1600,
-	AUDIO_SAMPLE_PED_STUDENT_FEMALE_ATTACK_4 = 1601,
-	AUDIO_SAMPLE_PED_STUDENT_FEMALE_HANDS_COWER_1 = 1602,
-	AUDIO_SAMPLE_PED_STUDENT_FEMALE_HANDS_COWER_2 = 1603,
-	AUDIO_SAMPLE_PED_STUDENT_FEMALE_HANDS_COWER_3 = 1604,
-	AUDIO_SAMPLE_PED_STUDENT_FEMALE_HANDS_COWER_4 = 1605,
-	AUDIO_SAMPLE_PED_STUDENT_FEMALE_ROBBED_1 = 1606,
-	AUDIO_SAMPLE_PED_STUDENT_FEMALE_ROBBED_2 = 1607,
-	AUDIO_SAMPLE_PED_STUDENT_FEMALE_CHAT_EVENT_1 = 1608,
-	AUDIO_SAMPLE_PED_STUDENT_FEMALE_CHAT_EVENT_2 = 1609,
-	AUDIO_SAMPLE_PED_HOODS_1_CAR_COLLISION_1 = 1610,
-	AUDIO_SAMPLE_PED_HOODS_1_CAR_COLLISION_2 = 1611,
-	AUDIO_SAMPLE_PED_HOODS_1_CAR_COLLISION_3 = 1612,
-	AUDIO_SAMPLE_PED_HOODS_1_CAR_COLLISION_4 = 1613,
-	AUDIO_SAMPLE_PED_HOODS_1_CAR_COLLISION_5 = 1614,
-	AUDIO_SAMPLE_PED_HOODS_1_CAR_COLLISION_6 = 1615,
-	AUDIO_SAMPLE_PED_HOODS_1_CAR_COLLISION_7 = 1616,
-	AUDIO_SAMPLE_PED_HOODS_1_CHAT_1 = 1617,
-	AUDIO_SAMPLE_PED_HOODS_1_CHAT_2 = 1618,
-	AUDIO_SAMPLE_PED_HOODS_1_CHAT_3 = 1619,
-	AUDIO_SAMPLE_PED_HOODS_1_CHAT_4 = 1620,
-	AUDIO_SAMPLE_PED_HOODS_1_CHAT_5 = 1621,
-	AUDIO_SAMPLE_PED_HOODS_1_CHAT_6 = 1622,
-	AUDIO_SAMPLE_PED_HOODS_1_EVADE_1 = 1623,
-	AUDIO_SAMPLE_PED_HOODS_1_EVADE_2 = 1624,
-	AUDIO_SAMPLE_PED_HOODS_1_EVADE_3 = 1625,
-	AUDIO_SAMPLE_PED_HOODS_1_EVADE_4 = 1626,
-	AUDIO_SAMPLE_PED_HOODS_1_EVADE_5 = 1627,
-	AUDIO_SAMPLE_PED_HOODS_1_CHAT_SEXY_1 = 1628,
-	AUDIO_SAMPLE_PED_HOODS_1_CHAT_SEXY_2 = 1629,
-	AUDIO_SAMPLE_PED_HOODS_1_ATTACK_1 = 1630,
-	AUDIO_SAMPLE_PED_HOODS_1_ATTACK_2 = 1631,
-	AUDIO_SAMPLE_PED_HOODS_1_ATTACK_3 = 1632,
-	AUDIO_SAMPLE_PED_HOODS_1_ATTACK_4 = 1633,
-	AUDIO_SAMPLE_PED_HOODS_1_ATTACK_5 = 1634,
-	AUDIO_SAMPLE_PED_HOODS_1_ATTACK_6 = 1635,
-	AUDIO_SAMPLE_PED_HOODS_1_HANDS_UP_1 = 1636,
-	AUDIO_SAMPLE_PED_HOODS_1_HANDS_UP_2 = 1637,
-	AUDIO_SAMPLE_PED_HOODS_1_HANDS_UP_3 = 1638,
-	AUDIO_SAMPLE_PED_HOODS_1_HANDS_UP_4 = 1639,
-	AUDIO_SAMPLE_PED_HOODS_1_HANDS_UP_5 = 1640,
-	AUDIO_SAMPLE_PED_HOODS_1_CAR_JACKED_1 = 1641,
-	AUDIO_SAMPLE_PED_HOODS_1_CAR_JACKED_2 = 1642,
-	AUDIO_SAMPLE_PED_HOODS_1_CAR_JACKING_1 = 1643,
-	AUDIO_SAMPLE_PED_HOODS_1_CAR_JACKING_2 = 1644,
-	AUDIO_SAMPLE_PED_HOODS_2_CAR_COLLISION_1 = 1645,
-	AUDIO_SAMPLE_PED_HOODS_2_CAR_COLLISION_2 = 1646,
-	AUDIO_SAMPLE_PED_HOODS_2_CAR_COLLISION_3 = 1647,
-	AUDIO_SAMPLE_PED_HOODS_2_CAR_COLLISION_4 = 1648,
-	AUDIO_SAMPLE_PED_HOODS_2_CAR_COLLISION_5 = 1649,
-	AUDIO_SAMPLE_PED_HOODS_2_CAR_COLLISION_6 = 1650,
-	AUDIO_SAMPLE_PED_HOODS_2_CAR_COLLISION_7 = 1651,
-	AUDIO_SAMPLE_PED_HOODS_2_CHAT_1 = 1652,
-	AUDIO_SAMPLE_PED_HOODS_2_CHAT_2 = 1653,
-	AUDIO_SAMPLE_PED_HOODS_2_CHAT_3 = 1654,
-	AUDIO_SAMPLE_PED_HOODS_2_CHAT_4 = 1655,
-	AUDIO_SAMPLE_PED_HOODS_2_CHAT_5 = 1656,
-	AUDIO_SAMPLE_PED_HOODS_2_CHAT_6 = 1657,
-	AUDIO_SAMPLE_PED_HOODS_2_EVADE_1 = 1658,
-	AUDIO_SAMPLE_PED_HOODS_2_EVADE_2 = 1659,
-	AUDIO_SAMPLE_PED_HOODS_2_EVADE_3 = 1660,
-	AUDIO_SAMPLE_PED_HOODS_2_EVADE_4 = 1661,
-	AUDIO_SAMPLE_PED_HOODS_2_EVADE_5 = 1662,
-	AUDIO_SAMPLE_PED_HOODS_2_CHAT_SEXY_1 = 1663,
-	AUDIO_SAMPLE_PED_HOODS_2_CHAT_SEXY_2 = 1664,
-	AUDIO_SAMPLE_PED_HOODS_2_ATTACK_1 = 1665,
-	AUDIO_SAMPLE_PED_HOODS_2_ATTACK_2 = 1666,
-	AUDIO_SAMPLE_PED_HOODS_2_ATTACK_3 = 1667,
-	AUDIO_SAMPLE_PED_HOODS_2_ATTACK_4 = 1668,
-	AUDIO_SAMPLE_PED_HOODS_2_ATTACK_5 = 1669,
-	AUDIO_SAMPLE_PED_HOODS_2_ATTACK_6 = 1670,
-	AUDIO_SAMPLE_PED_HOODS_2_HANDS_UP_1 = 1671,
-	AUDIO_SAMPLE_PED_HOODS_2_HANDS_UP_2 = 1672,
-	AUDIO_SAMPLE_PED_HOODS_2_HANDS_UP_3 = 1673,
-	AUDIO_SAMPLE_PED_HOODS_2_HANDS_UP_4 = 1674,
-	AUDIO_SAMPLE_PED_HOODS_2_HANDS_UP_5 = 1675,
-	AUDIO_SAMPLE_PED_HOODS_2_CAR_JACKED_1 = 1676,
-	AUDIO_SAMPLE_PED_HOODS_2_CAR_JACKED_2 = 1677,
-	AUDIO_SAMPLE_PED_HOODS_2_CAR_JACKING_1 = 1678,
-	AUDIO_SAMPLE_PED_HOODS_2_CAR_JACKING_2 = 1679,
-	AUDIO_SAMPLE_PED_YARDIE_1_CAR_COLLISION_1 = 1680,
-	AUDIO_SAMPLE_PED_YARDIE_1_CAR_COLLISION_2 = 1681,
-	AUDIO_SAMPLE_PED_YARDIE_1_CAR_COLLISION_3 = 1682,
-	AUDIO_SAMPLE_PED_YARDIE_1_CAR_COLLISION_4 = 1683,
-	AUDIO_SAMPLE_PED_YARDIE_1_CAR_COLLISION_5 = 1684,
-	AUDIO_SAMPLE_PED_YARDIE_1_CAR_COLLISION_6 = 1685,
-	AUDIO_SAMPLE_PED_YARDIE_1_CHAT_1 = 1686,
-	AUDIO_SAMPLE_PED_YARDIE_1_CHAT_2 = 1687,
-	AUDIO_SAMPLE_PED_YARDIE_1_CHAT_3 = 1688,
-	AUDIO_SAMPLE_PED_YARDIE_1_CHAT_4 = 1689,
-	AUDIO_SAMPLE_PED_YARDIE_1_CHAT_5 = 1690,
-	AUDIO_SAMPLE_PED_YARDIE_1_CHAT_6 = 1691,
-	AUDIO_SAMPLE_PED_YARDIE_1_CHAT_7 = 1692,
-	AUDIO_SAMPLE_PED_YARDIE_1_CHAT_8 = 1693,
-	AUDIO_SAMPLE_PED_YARDIE_1_EVADE_1 = 1694,
-	AUDIO_SAMPLE_PED_YARDIE_1_EVADE_2 = 1695,
-	AUDIO_SAMPLE_PED_YARDIE_1_EVADE_3 = 1696,
-	AUDIO_SAMPLE_PED_YARDIE_1_EVADE_4 = 1697,
-	AUDIO_SAMPLE_PED_YARDIE_1_EVADE_5 = 1698,
-	AUDIO_SAMPLE_PED_YARDIE_1_CHAT_SEXY_1 = 1699,
-	AUDIO_SAMPLE_PED_YARDIE_1_CHAT_SEXY_2 = 1700,
-	AUDIO_SAMPLE_PED_YARDIE_1_ATTACK_1 = 1701,
-	AUDIO_SAMPLE_PED_YARDIE_1_ATTACK_2 = 1702,
-	AUDIO_SAMPLE_PED_YARDIE_1_ATTACK_3 = 1703,
-	AUDIO_SAMPLE_PED_YARDIE_1_ATTACK_4 = 1704,
-	AUDIO_SAMPLE_PED_YARDIE_1_ATTACK_5 = 1705,
-	AUDIO_SAMPLE_PED_YARDIE_1_ATTACK_6 = 1706,
-	AUDIO_SAMPLE_PED_YARDIE_1_HANDS_UP_1 = 1707,
-	AUDIO_SAMPLE_PED_YARDIE_1_CAR_JACKED_1 = 1708,
-	AUDIO_SAMPLE_PED_YARDIE_1_CAR_JACKING_1 = 1709,
-	AUDIO_SAMPLE_PED_YARDIE_1_CAR_JACKING_2 = 1710,
-	AUDIO_SAMPLE_PED_YARDIE_2_CAR_COLLISION_1 = 1711,
-	AUDIO_SAMPLE_PED_YARDIE_2_CAR_COLLISION_2 = 1712,
-	AUDIO_SAMPLE_PED_YARDIE_2_CAR_COLLISION_3 = 1713,
-	AUDIO_SAMPLE_PED_YARDIE_2_CAR_COLLISION_4 = 1714,
-	AUDIO_SAMPLE_PED_YARDIE_2_CAR_COLLISION_5 = 1715,
-	AUDIO_SAMPLE_PED_YARDIE_2_CAR_COLLISION_6 = 1716,
-	AUDIO_SAMPLE_PED_YARDIE_2_CHAT_1 = 1717,
-	AUDIO_SAMPLE_PED_YARDIE_2_CHAT_2 = 1718,
-	AUDIO_SAMPLE_PED_YARDIE_2_CHAT_3 = 1719,
-	AUDIO_SAMPLE_PED_YARDIE_2_CHAT_4 = 1720,
-	AUDIO_SAMPLE_PED_YARDIE_2_CHAT_5 = 1721,
-	AUDIO_SAMPLE_PED_YARDIE_2_CHAT_6 = 1722,
-	AUDIO_SAMPLE_PED_YARDIE_2_CHAT_7 = 1723,
-	AUDIO_SAMPLE_PED_YARDIE_2_CHAT_8 = 1724,
-	AUDIO_SAMPLE_PED_YARDIE_2_EVADE_1 = 1725,
-	AUDIO_SAMPLE_PED_YARDIE_2_EVADE_2 = 1726,
-	AUDIO_SAMPLE_PED_YARDIE_2_EVADE_3 = 1727,
-	AUDIO_SAMPLE_PED_YARDIE_2_EVADE_4 = 1728,
-	AUDIO_SAMPLE_PED_YARDIE_2_EVADE_5 = 1729,
-	AUDIO_SAMPLE_PED_YARDIE_2_CHAT_SEXY_1 = 1730,
-	AUDIO_SAMPLE_PED_YARDIE_2_CHAT_SEXY_2 = 1731,
-	AUDIO_SAMPLE_PED_YARDIE_2_ATTACK_1 = 1732,
-	AUDIO_SAMPLE_PED_YARDIE_2_ATTACK_2 = 1733,
-	AUDIO_SAMPLE_PED_YARDIE_2_ATTACK_3 = 1734,
-	AUDIO_SAMPLE_PED_YARDIE_2_ATTACK_4 = 1735,
-	AUDIO_SAMPLE_PED_YARDIE_2_ATTACK_5 = 1736,
-	AUDIO_SAMPLE_PED_YARDIE_2_ATTACK_6 = 1737,
-	AUDIO_SAMPLE_PED_YARDIE_2_HANDS_UP_1 = 1738,
-	AUDIO_SAMPLE_PED_YARDIE_2_CAR_JACKED_1 = 1739,
-	AUDIO_SAMPLE_PED_YARDIE_2_CAR_JACKING_1 = 1740,
-	AUDIO_SAMPLE_PED_YARDIE_2_CAR_JACKING_2 = 1741,
-	AUDIO_SAMPLE_PED_BLACK_BUSINESS_FEMALE_CAR_COLLISION_1 = 1742,
-	AUDIO_SAMPLE_PED_BLACK_BUSINESS_FEMALE_CAR_COLLISION_2 = 1743,
-	AUDIO_SAMPLE_PED_BLACK_BUSINESS_FEMALE_CAR_COLLISION_3 = 1744,
-	AUDIO_SAMPLE_PED_BLACK_BUSINESS_FEMALE_CAR_COLLISION_4 = 1745,
-	AUDIO_SAMPLE_PED_BLACK_BUSINESS_FEMALE_CAR_COLLISION_5 = 1746,
-	AUDIO_SAMPLE_PED_BLACK_BUSINESS_FEMALE_CAR_COLLISION_6 = 1747,
-	AUDIO_SAMPLE_PED_BLACK_BUSINESS_FEMALE_CAR_COLLISION_7 = 1748,
-	AUDIO_SAMPLE_PED_BLACK_BUSINESS_FEMALE_CHAT_1 = 1749,
-	AUDIO_SAMPLE_PED_BLACK_BUSINESS_FEMALE_CHAT_2 = 1750,
-	AUDIO_SAMPLE_PED_BLACK_BUSINESS_FEMALE_CHAT_3 = 1751,
-	AUDIO_SAMPLE_PED_BLACK_BUSINESS_FEMALE_CHAT_4 = 1752,
-	AUDIO_SAMPLE_PED_BLACK_BUSINESS_FEMALE_CHAT_5 = 1753,
-	AUDIO_SAMPLE_PED_BLACK_BUSINESS_FEMALE_CHAT_6 = 1754,
-	AUDIO_SAMPLE_PED_BLACK_BUSINESS_FEMALE_CHAT_7 = 1755,
-	AUDIO_SAMPLE_PED_BLACK_BUSINESS_FEMALE_EVADE_1 = 1756,
-	AUDIO_SAMPLE_PED_BLACK_BUSINESS_FEMALE_EVADE_2 = 1757,
-	AUDIO_SAMPLE_PED_BLACK_BUSINESS_FEMALE_EVADE_3 = 1758,
-	AUDIO_SAMPLE_PED_BLACK_BUSINESS_FEMALE_EVADE_4 = 1759,
-	AUDIO_SAMPLE_PED_BLACK_BUSINESS_FEMALE_EVADE_5 = 1760,
-	AUDIO_SAMPLE_PED_BLACK_BUSINESS_FEMALE_EVADE_6 = 1761,
-	AUDIO_SAMPLE_PED_BLACK_BUSINESS_FEMALE_HANDS_COWER_1 = 1762,
-	AUDIO_SAMPLE_PED_BLACK_BUSINESS_FEMALE_HANDS_COWER_2 = 1763,
-	AUDIO_SAMPLE_PED_BLACK_BUSINESS_FEMALE_HANDS_COWER_3 = 1764,
-	AUDIO_SAMPLE_PED_BLACK_BUSINESS_FEMALE_HANDS_COWER_4 = 1765,
-	AUDIO_SAMPLE_PED_BLACK_BUSINESS_FEMALE_HANDS_COWER_5 = 1766,
-	AUDIO_SAMPLE_PED_BLACK_BUSINESS_FEMALE_CAR_JACKED_1 = 1767,
-	AUDIO_SAMPLE_PED_BLACK_BUSINESS_FEMALE_CAR_JACKED_2 = 1768,
-	AUDIO_SAMPLE_PED_BLACK_BUSINESS_FEMALE_CAR_JACKED_3 = 1769,
-	AUDIO_SAMPLE_PED_BLACK_BUSINESS_FEMALE_CAR_JACKED_4 = 1770,
-	AUDIO_SAMPLE_PED_BLACK_BUSINESS_FEMALE_ROBBED_1 = 1771,
-	AUDIO_SAMPLE_PED_BLACK_BUSINESS_FEMALE_ROBBED_2 = 1772,
-	AUDIO_SAMPLE_PED_BLACK_BUSINESS_FEMALE_ROBBED_3 = 1773,
-	AUDIO_SAMPLE_PED_BLACK_BUSINESS_FEMALE_FLEE_RUN_1 = 1774,
-	AUDIO_SAMPLE_PED_BLACK_BUSINESS_FEMALE_FLEE_RUN_2 = 1775,
-	AUDIO_SAMPLE_PED_BLACK_BUSINESS_FEMALE_FLEE_RUN_3 = 1776,
-	AUDIO_SAMPLE_PED_BLACK_BUSINESS_FEMALE_FLEE_RUN_4 = 1777,
-	AUDIO_SAMPLE_PED_BLACK_BUSINESS_FEMALE_FLEE_RUN_5 = 1778,
-	AUDIO_SAMPLE_PED_BLACK_BUSINESS_FEMALE_FLEE_RUN_6 = 1779,
-	AUDIO_SAMPLE_PED_BLACK_BUSINESS_FEMALE_CHAT_EVENT_1 = 1780,
-	AUDIO_SAMPLE_PED_BLACK_BUSINESS_FEMALE_CHAT_EVENT_2 = 1781,
-	AUDIO_SAMPLE_PED_BLACK_BUSINESS_FEMALE_CHAT_EVENT_3 = 1782,
-	AUDIO_SAMPLE_PED_BLACK_BUSINESS_FEMALE_CHAT_EVENT_4 = 1783,
-	AUDIO_SAMPLE_PED_WHITE_WORKER_MALE_CAR_COLLISION_1 = 1784,
-	AUDIO_SAMPLE_PED_WHITE_WORKER_MALE_CAR_COLLISION_2 = 1785,
-	AUDIO_SAMPLE_PED_WHITE_WORKER_MALE_CAR_COLLISION_3 = 1786,
-	AUDIO_SAMPLE_PED_WHITE_WORKER_MALE_CAR_COLLISION_4 = 1787,
-	AUDIO_SAMPLE_PED_WHITE_WORKER_MALE_CAR_COLLISION_5 = 1788,
-	AUDIO_SAMPLE_PED_WHITE_WORKER_MALE_CAR_COLLISION_6 = 1789,
-	AUDIO_SAMPLE_PED_WHITE_WORKER_MALE_CHAT_1 = 1790,
-	AUDIO_SAMPLE_PED_WHITE_WORKER_MALE_CHAT_2 = 1791,
-	AUDIO_SAMPLE_PED_WHITE_WORKER_MALE_CHAT_3 = 1792,
-	AUDIO_SAMPLE_PED_WHITE_WORKER_MALE_CHAT_4 = 1793,
-	AUDIO_SAMPLE_PED_WHITE_WORKER_MALE_CHAT_5 = 1794,
-	AUDIO_SAMPLE_PED_WHITE_WORKER_MALE_CHAT_6 = 1795,
-	AUDIO_SAMPLE_PED_WHITE_WORKER_MALE_EVADE_1 = 1796,
-	AUDIO_SAMPLE_PED_WHITE_WORKER_MALE_EVADE_2 = 1797,
-	AUDIO_SAMPLE_PED_WHITE_WORKER_MALE_EVADE_3 = 1798,
-	AUDIO_SAMPLE_PED_WHITE_WORKER_MALE_EVADE_4 = 1799,
-	AUDIO_SAMPLE_PED_WHITE_WORKER_MALE_CHAT_SEXY_1 = 1800,
-	AUDIO_SAMPLE_PED_WHITE_WORKER_MALE_CHAT_SEXY_2 = 1801,
-	AUDIO_SAMPLE_PED_WHITE_WORKER_MALE_ATTACK_1 = 1802,
-	AUDIO_SAMPLE_PED_WHITE_WORKER_MALE_ATTACK_2 = 1803,
-	AUDIO_SAMPLE_PED_WHITE_WORKER_MALE_ATTACK_3 = 1804,
-	AUDIO_SAMPLE_PED_WHITE_WORKER_MALE_HANDS_COWER_1 = 1805,
-	AUDIO_SAMPLE_PED_WHITE_WORKER_MALE_HANDS_COWER_2 = 1806,
-	AUDIO_SAMPLE_PED_WHITE_WORKER_MALE_HANDS_COWER_3 = 1807,
-	AUDIO_SAMPLE_PED_STEWARD_MALE_CAR_COLLISION_1 = 1808,
-	AUDIO_SAMPLE_PED_STEWARD_MALE_CAR_COLLISION_2 = 1809,
-	AUDIO_SAMPLE_PED_STEWARD_MALE_CAR_COLLISION_3 = 1810,
-	AUDIO_SAMPLE_PED_STEWARD_MALE_CAR_COLLISION_4 = 1811,
-	AUDIO_SAMPLE_PED_STEWARD_MALE_CAR_COLLISION_5 = 1812,
-	AUDIO_SAMPLE_PED_STEWARD_MALE_CHAT_1 = 1813,
-	AUDIO_SAMPLE_PED_STEWARD_MALE_CHAT_2 = 1814,
-	AUDIO_SAMPLE_PED_STEWARD_MALE_CHAT_3 = 1815,
-	AUDIO_SAMPLE_PED_STEWARD_MALE_CHAT_4 = 1816,
-	AUDIO_SAMPLE_PED_STEWARD_MALE_EVADE_1 = 1817,
-	AUDIO_SAMPLE_PED_STEWARD_MALE_EVADE_2 = 1818,
-	AUDIO_SAMPLE_PED_STEWARD_MALE_EVADE_3 = 1819,
-	AUDIO_SAMPLE_PED_STEWARD_MALE_ATTACK_1 = 1820,
-	AUDIO_SAMPLE_PED_STEWARD_MALE_ATTACK_2 = 1821,
-	AUDIO_SAMPLE_PED_STEWARD_MALE_ATTACK_3 = 1822,
-	AUDIO_SAMPLE_PED_STEWARD_MALE_ATTACK_4 = 1823,
-	AUDIO_SAMPLE_PED_STEWARD_MALE_HANDS_COWER_1 = 1824,
-	AUDIO_SAMPLE_PED_STEWARD_MALE_HANDS_COWER_2 = 1825,
-	AUDIO_SAMPLE_PED_STEWARD_MALE_HANDS_COWER_3 = 1826,
-	AUDIO_SAMPLE_PED_STEWARD_FEMALE_1_CAR_COLLISION_1 = 1827,
-	AUDIO_SAMPLE_PED_STEWARD_FEMALE_1_CAR_COLLISION_2 = 1828,
-	AUDIO_SAMPLE_PED_STEWARD_FEMALE_1_CAR_COLLISION_3 = 1829,
-	AUDIO_SAMPLE_PED_STEWARD_FEMALE_1_CAR_COLLISION_4 = 1830,
-	AUDIO_SAMPLE_PED_STEWARD_FEMALE_1_CAR_COLLISION_5 = 1831,
-	AUDIO_SAMPLE_PED_STEWARD_FEMALE_1_CHAT_1 = 1832,
-	AUDIO_SAMPLE_PED_STEWARD_FEMALE_1_CHAT_2 = 1833,
-	AUDIO_SAMPLE_PED_STEWARD_FEMALE_1_CHAT_3 = 1834,
-	AUDIO_SAMPLE_PED_STEWARD_FEMALE_1_CHAT_4 = 1835,
-	AUDIO_SAMPLE_PED_STEWARD_FEMALE_1_CHAT_5 = 1836,
-	AUDIO_SAMPLE_PED_STEWARD_FEMALE_1_EVADE_1 = 1837,
-	AUDIO_SAMPLE_PED_STEWARD_FEMALE_1_EVADE_2 = 1838,
-	AUDIO_SAMPLE_PED_STEWARD_FEMALE_1_EVADE_3 = 1839,
-	AUDIO_SAMPLE_PED_STEWARD_FEMALE_1_EVADE_4 = 1840,
-	AUDIO_SAMPLE_PED_STEWARD_FEMALE_1_EVADE_5 = 1841,
-	AUDIO_SAMPLE_PED_STEWARD_FEMALE_1_HANDS_COWER_1 = 1842,
-	AUDIO_SAMPLE_PED_STEWARD_FEMALE_1_HANDS_COWER_2 = 1843,
-	AUDIO_SAMPLE_PED_STEWARD_FEMALE_1_HANDS_COWER_3 = 1844,
-	AUDIO_SAMPLE_PED_STEWARD_FEMALE_2_CAR_COLLISION_1 = 1845,
-	AUDIO_SAMPLE_PED_STEWARD_FEMALE_2_CAR_COLLISION_2 = 1846,
-	AUDIO_SAMPLE_PED_STEWARD_FEMALE_2_CAR_COLLISION_3 = 1847,
-	AUDIO_SAMPLE_PED_STEWARD_FEMALE_2_CAR_COLLISION_4 = 1848,
-	AUDIO_SAMPLE_PED_STEWARD_FEMALE_2_CAR_COLLISION_5 = 1849,
-	AUDIO_SAMPLE_PED_STEWARD_FEMALE_2_CHAT_1 = 1850,
-	AUDIO_SAMPLE_PED_STEWARD_FEMALE_2_CHAT_2 = 1851,
-	AUDIO_SAMPLE_PED_STEWARD_FEMALE_2_CHAT_3 = 1852,
-	AUDIO_SAMPLE_PED_STEWARD_FEMALE_2_CHAT_4 = 1853,
-	AUDIO_SAMPLE_PED_STEWARD_FEMALE_2_CHAT_5 = 1854,
-	AUDIO_SAMPLE_PED_STEWARD_FEMALE_2_EVADE_1 = 1855,
-	AUDIO_SAMPLE_PED_STEWARD_FEMALE_2_EVADE_2 = 1856,
-	AUDIO_SAMPLE_PED_STEWARD_FEMALE_2_EVADE_3 = 1857,
-	AUDIO_SAMPLE_PED_STEWARD_FEMALE_2_EVADE_4 = 1858,
-	AUDIO_SAMPLE_PED_STEWARD_FEMALE_2_EVADE_5 = 1859,
-	AUDIO_SAMPLE_PED_STEWARD_FEMALE_2_HANDS_COWER_1 = 1860,
-	AUDIO_SAMPLE_PED_STEWARD_FEMALE_2_HANDS_COWER_2 = 1861,
-	AUDIO_SAMPLE_PED_STEWARD_FEMALE_2_HANDS_COWER_3 = 1862,
-	AUDIO_SAMPLE_PED_CHINATOWN_MALE_OLD_CAR_COLLISION_1 = 1863,
-	AUDIO_SAMPLE_PED_CHINATOWN_MALE_OLD_CAR_COLLISION_2 = 1864,
-	AUDIO_SAMPLE_PED_CHINATOWN_MALE_OLD_CAR_COLLISION_3 = 1865,
-	AUDIO_SAMPLE_PED_CHINATOWN_MALE_OLD_CAR_COLLISION_4 = 1866,
-	AUDIO_SAMPLE_PED_CHINATOWN_MALE_OLD_CAR_COLLISION_5 = 1867,
-	AUDIO_SAMPLE_PED_CHINATOWN_MALE_OLD_CAR_COLLISION_6 = 1868,
-	AUDIO_SAMPLE_PED_CHINATOWN_MALE_OLD_CHAT_1 = 1869,
-	AUDIO_SAMPLE_PED_CHINATOWN_MALE_OLD_CHAT_2 = 1870,
-	AUDIO_SAMPLE_PED_CHINATOWN_MALE_OLD_CHAT_3 = 1871,
-	AUDIO_SAMPLE_PED_CHINATOWN_MALE_OLD_CHAT_4 = 1872,
-	AUDIO_SAMPLE_PED_CHINATOWN_MALE_OLD_CHAT_5 = 1873,
-	AUDIO_SAMPLE_PED_CHINATOWN_MALE_OLD_CHAT_6 = 1874,
-	AUDIO_SAMPLE_PED_CHINATOWN_MALE_OLD_CHAT_7 = 1875,
-	AUDIO_SAMPLE_PED_CHINATOWN_MALE_OLD_EVADE_1 = 1876,
-	AUDIO_SAMPLE_PED_CHINATOWN_MALE_OLD_EVADE_2 = 1877,
-	AUDIO_SAMPLE_PED_CHINATOWN_MALE_OLD_EVADE_3 = 1878,
-	AUDIO_SAMPLE_PED_CHINATOWN_MALE_OLD_EVADE_4 = 1879,
-	AUDIO_SAMPLE_PED_CHINATOWN_MALE_OLD_EVADE_5 = 1880,
-	AUDIO_SAMPLE_PED_CHINATOWN_MALE_OLD_EVADE_6 = 1881,
-	AUDIO_SAMPLE_PED_CHINATOWN_MALE_OLD_CHAT_SEXY_1 = 1882,
-	AUDIO_SAMPLE_PED_CHINATOWN_MALE_OLD_CHAT_SEXY_2 = 1883,
-	AUDIO_SAMPLE_PED_CHINATOWN_MALE_OLD_CHAT_SEXY_3 = 1884,
-	AUDIO_SAMPLE_PED_CHINATOWN_MALE_OLD_ATTACK_1 = 1885,
-	AUDIO_SAMPLE_PED_CHINATOWN_MALE_OLD_ATTACK_2 = 1886,
-	AUDIO_SAMPLE_PED_CHINATOWN_MALE_OLD_ATTACK_3 = 1887,
-	AUDIO_SAMPLE_PED_CHINATOWN_MALE_OLD_ATTACK_4 = 1888,
-	AUDIO_SAMPLE_PED_CHINATOWN_MALE_OLD_ATTACK_5 = 1889,
-	AUDIO_SAMPLE_PED_CHINATOWN_MALE_OLD_HANDS_COWER_1 = 1890,
-	AUDIO_SAMPLE_PED_CHINATOWN_MALE_OLD_HANDS_COWER_2 = 1891,
-	AUDIO_SAMPLE_PED_CHINATOWN_MALE_OLD_HANDS_COWER_3 = 1892,
-	AUDIO_SAMPLE_PED_CHINATOWN_MALE_OLD_CAR_JACKED_1 = 1893,
-	AUDIO_SAMPLE_PED_CHINATOWN_MALE_OLD_CAR_JACKED_2 = 1894,
-	AUDIO_SAMPLE_PED_BUSINESS_WOMAN_1_CAR_COLLISION_1 = 1895,
-	AUDIO_SAMPLE_PED_BUSINESS_WOMAN_1_CAR_COLLISION_2 = 1896,
-	AUDIO_SAMPLE_PED_BUSINESS_WOMAN_1_CAR_COLLISION_3 = 1897,
-	AUDIO_SAMPLE_PED_BUSINESS_WOMAN_1_CAR_COLLISION_4 = 1898,
-	AUDIO_SAMPLE_PED_BUSINESS_WOMAN_1_CAR_COLLISION_5 = 1899,
-	AUDIO_SAMPLE_PED_BUSINESS_WOMAN_1_CHAT_1 = 1900,
-	AUDIO_SAMPLE_PED_BUSINESS_WOMAN_1_CHAT_2 = 1901,
-	AUDIO_SAMPLE_PED_BUSINESS_WOMAN_1_CHAT_3 = 1902,
-	AUDIO_SAMPLE_PED_BUSINESS_WOMAN_1_CHAT_4 = 1903,
-	AUDIO_SAMPLE_PED_BUSINESS_WOMAN_1_CHAT_5 = 1904,
-	AUDIO_SAMPLE_PED_BUSINESS_WOMAN_1_CHAT_6 = 1905,
-	AUDIO_SAMPLE_PED_BUSINESS_WOMAN_1_CHAT_7 = 1906,
-	AUDIO_SAMPLE_PED_BUSINESS_WOMAN_1_EVADE_1 = 1907,
-	AUDIO_SAMPLE_PED_BUSINESS_WOMAN_1_EVADE_2 = 1908,
-	AUDIO_SAMPLE_PED_BUSINESS_WOMAN_1_EVADE_3 = 1909,
-	AUDIO_SAMPLE_PED_BUSINESS_WOMAN_1_EVADE_4 = 1910,
-	AUDIO_SAMPLE_PED_BUSINESS_WOMAN_1_EVADE_5 = 1911,
-	AUDIO_SAMPLE_PED_BUSINESS_WOMAN_1_EVADE_6 = 1912,
-	AUDIO_SAMPLE_PED_BUSINESS_WOMAN_1_HANDS_COWER_1 = 1913,
-	AUDIO_SAMPLE_PED_BUSINESS_WOMAN_1_HANDS_COWER_2 = 1914,
-	AUDIO_SAMPLE_PED_BUSINESS_WOMAN_1_HANDS_COWER_3 = 1915,
-	AUDIO_SAMPLE_PED_BUSINESS_WOMAN_1_HANDS_COWER_4 = 1916,
-	AUDIO_SAMPLE_PED_BUSINESS_WOMAN_1_CAR_JACKED_1 = 1917,
-	AUDIO_SAMPLE_PED_BUSINESS_WOMAN_1_CAR_JACKED_2 = 1918,
-	AUDIO_SAMPLE_PED_BUSINESS_WOMAN_1_ROBBED_1 = 1919,
-	AUDIO_SAMPLE_PED_BUSINESS_WOMAN_1_ROBBED_2 = 1920,
-	AUDIO_SAMPLE_PED_BUSINESS_WOMAN_1_FLEE_RUN_1 = 1921,
-	AUDIO_SAMPLE_PED_BUSINESS_WOMAN_1_FLEE_RUN_2 = 1922,
-	AUDIO_SAMPLE_PED_BUSINESS_WOMAN_1_FLEE_RUN_3 = 1923,
-	AUDIO_SAMPLE_PED_BUSINESS_WOMAN_1_FLEE_RUN_4 = 1924,
-	AUDIO_SAMPLE_PED_BUSINESS_WOMAN_1_CHAT_EVENT_1 = 1925,
-	AUDIO_SAMPLE_PED_BUSINESS_WOMAN_1_CHAT_EVENT_2 = 1926,
-	AUDIO_SAMPLE_PED_BUSINESS_WOMAN_1_CHAT_EVENT_3 = 1927,
-	AUDIO_SAMPLE_PED_BUSINESS_WOMAN_1_CHAT_EVENT_4 = 1928,
-	AUDIO_SAMPLE_PED_BUSINESS_WOMAN_2_CAR_COLLISION_1 = 1929,
-	AUDIO_SAMPLE_PED_BUSINESS_WOMAN_2_CAR_COLLISION_2 = 1930,
-	AUDIO_SAMPLE_PED_BUSINESS_WOMAN_2_CAR_COLLISION_3 = 1931,
-	AUDIO_SAMPLE_PED_BUSINESS_WOMAN_2_CAR_COLLISION_4 = 1932,
-	AUDIO_SAMPLE_PED_BUSINESS_WOMAN_2_CAR_COLLISION_5 = 1933,
-	AUDIO_SAMPLE_PED_BUSINESS_WOMAN_2_CHAT_1 = 1934,
-	AUDIO_SAMPLE_PED_BUSINESS_WOMAN_2_CHAT_2 = 1935,
-	AUDIO_SAMPLE_PED_BUSINESS_WOMAN_2_CHAT_3 = 1936,
-	AUDIO_SAMPLE_PED_BUSINESS_WOMAN_2_CHAT_4 = 1937,
-	AUDIO_SAMPLE_PED_BUSINESS_WOMAN_2_CHAT_5 = 1938,
-	AUDIO_SAMPLE_PED_BUSINESS_WOMAN_2_CHAT_6 = 1939,
-	AUDIO_SAMPLE_PED_BUSINESS_WOMAN_2_CHAT_7 = 1940,
-	AUDIO_SAMPLE_PED_BUSINESS_WOMAN_2_EVADE_1 = 1941,
-	AUDIO_SAMPLE_PED_BUSINESS_WOMAN_2_EVADE_2 = 1942,
-	AUDIO_SAMPLE_PED_BUSINESS_WOMAN_2_EVADE_3 = 1943,
-	AUDIO_SAMPLE_PED_BUSINESS_WOMAN_2_EVADE_4 = 1944,
-	AUDIO_SAMPLE_PED_BUSINESS_WOMAN_2_EVADE_5 = 1945,
-	AUDIO_SAMPLE_PED_BUSINESS_WOMAN_2_EVADE_6 = 1946,
-	AUDIO_SAMPLE_PED_BUSINESS_WOMAN_2_HANDS_COWER_1 = 1947,
-	AUDIO_SAMPLE_PED_BUSINESS_WOMAN_2_HANDS_COWER_2 = 1948,
-	AUDIO_SAMPLE_PED_BUSINESS_WOMAN_2_HANDS_COWER_3 = 1949,
-	AUDIO_SAMPLE_PED_BUSINESS_WOMAN_2_HANDS_COWER_4 = 1950,
-	AUDIO_SAMPLE_PED_BUSINESS_WOMAN_2_CAR_JACKED_1 = 1951,
-	AUDIO_SAMPLE_PED_BUSINESS_WOMAN_2_CAR_JACKED_2 = 1952,
-	AUDIO_SAMPLE_PED_BUSINESS_WOMAN_2_ROBBED_1 = 1953,
-	AUDIO_SAMPLE_PED_BUSINESS_WOMAN_2_ROBBED_2 = 1954,
-	AUDIO_SAMPLE_PED_BUSINESS_WOMAN_2_FLEE_RUN_1 = 1955,
-	AUDIO_SAMPLE_PED_BUSINESS_WOMAN_2_FLEE_RUN_2 = 1956,
-	AUDIO_SAMPLE_PED_BUSINESS_WOMAN_2_FLEE_RUN_3 = 1957,
-	AUDIO_SAMPLE_PED_BUSINESS_WOMAN_2_FLEE_RUN_4 = 1958,
-	AUDIO_SAMPLE_PED_BUSINESS_WOMAN_2_CHAT_EVENT_1 = 1959,
-	AUDIO_SAMPLE_PED_BUSINESS_WOMAN_2_CHAT_EVENT_2 = 1960,
-	AUDIO_SAMPLE_PED_BUSINESS_WOMAN_2_CHAT_EVENT_3 = 1961,
-	AUDIO_SAMPLE_PED_BUSINESS_WOMAN_2_CHAT_EVENT_4 = 1962,
-	AUDIO_SAMPLE_PED_BLACK_FAT_MALE_1_CAR_COLLISION_1 = 1963,
-	AUDIO_SAMPLE_PED_BLACK_FAT_MALE_1_CAR_COLLISION_2 = 1964,
-	AUDIO_SAMPLE_PED_BLACK_FAT_MALE_1_CAR_COLLISION_3 = 1965,
-	AUDIO_SAMPLE_PED_BLACK_FAT_MALE_1_CAR_COLLISION_4 = 1966,
-	AUDIO_SAMPLE_PED_BLACK_FAT_MALE_1_CAR_COLLISION_5 = 1967,
-	AUDIO_SAMPLE_PED_BLACK_FAT_MALE_1_CAR_COLLISION_6 = 1968,
-	AUDIO_SAMPLE_PED_BLACK_FAT_MALE_1_CHAT_1 = 1969,
-	AUDIO_SAMPLE_PED_BLACK_FAT_MALE_1_CHAT_2 = 1970,
-	AUDIO_SAMPLE_PED_BLACK_FAT_MALE_1_CHAT_3 = 1971,
-	AUDIO_SAMPLE_PED_BLACK_FAT_MALE_1_CHAT_4 = 1972,
-	AUDIO_SAMPLE_PED_BLACK_FAT_MALE_1_CHAT_5 = 1973,
-	AUDIO_SAMPLE_PED_BLACK_FAT_MALE_1_CHAT_6 = 1974,
-	AUDIO_SAMPLE_PED_BLACK_FAT_MALE_1_CHAT_7 = 1975,
-	AUDIO_SAMPLE_PED_BLACK_FAT_MALE_1_CHAT_8 = 1976,
-	AUDIO_SAMPLE_PED_BLACK_FAT_MALE_1_EVADE_1 = 1977,
-	AUDIO_SAMPLE_PED_BLACK_FAT_MALE_1_EVADE_2 = 1978,
-	AUDIO_SAMPLE_PED_BLACK_FAT_MALE_1_EVADE_3 = 1979,
-	AUDIO_SAMPLE_PED_BLACK_FAT_MALE_1_EVADE_4 = 1980,
-	AUDIO_SAMPLE_PED_BLACK_FAT_MALE_1_EVADE_5 = 1981,
-	AUDIO_SAMPLE_PED_BLACK_FAT_MALE_1_EVADE_6 = 1982,
-	AUDIO_SAMPLE_PED_BLACK_FAT_MALE_1_EVADE_7 = 1983,
-	AUDIO_SAMPLE_PED_BLACK_FAT_MALE_1_CAR_JACKED_1 = 1984,
-	AUDIO_SAMPLE_PED_BLACK_FAT_MALE_1_CAR_JACKED_2 = 1985,
-	AUDIO_SAMPLE_PED_BLACK_FAT_MALE_1_CAR_JACKED_3 = 1986,
-	AUDIO_SAMPLE_PED_BLACK_FAT_MALE_1_CAR_JACKED_4 = 1987,
-	AUDIO_SAMPLE_PED_BLACK_FAT_MALE_1_WAIT_DOUBLEBACK_1 = 1988,
-	AUDIO_SAMPLE_PED_BLACK_FAT_MALE_1_WAIT_DOUBLEBACK_2 = 1989,
-	AUDIO_SAMPLE_PED_BLACK_FAT_MALE_1_WAIT_DOUBLEBACK_3 = 1990,
-	AUDIO_SAMPLE_PED_BLACK_FAT_MALE_1_ROBBED_1 = 1991,
-	AUDIO_SAMPLE_PED_BLACK_FAT_MALE_1_ROBBED_2 = 1992,
-	AUDIO_SAMPLE_PED_BLACK_FAT_MALE_1_ROBBED_3 = 1993,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_1_CAR_COLLISION_1 = 1994,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_1_CAR_COLLISION_2 = 1995,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_1_CAR_COLLISION_3 = 1996,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_1_CAR_COLLISION_4 = 1997,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_1_CAR_COLLISION_5 = 1998,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_1_CAR_COLLISION_6 = 1999,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_1_CAR_COLLISION_7 = 2000,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_1_CHAT_1 = 2001,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_1_CHAT_2 = 2002,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_1_CHAT_3 = 2003,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_1_CHAT_4 = 2004,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_1_CHAT_5 = 2005,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_1_CHAT_6 = 2006,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_1_EVADE_1 = 2007,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_1_EVADE_2 = 2008,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_1_EVADE_3 = 2009,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_1_EVADE_4 = 2010,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_1_EVADE_5 = 2011,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_1_CHAT_SEXY_1 = 2012,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_1_CHAT_SEXY_2 = 2013,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_1_CHAT_SEXY_3 = 2014,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_1_ATTACK_1 = 2015,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_1_ATTACK_2 = 2016,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_1_ATTACK_3 = 2017,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_1_ATTACK_4 = 2018,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_1_ATTACK_5 = 2019,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_1_ATTACK_6 = 2020,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_1_HANDS_UP_1 = 2021,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_1_HANDS_UP_2 = 2022,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_1_HANDS_UP_3 = 2023,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_1_CAR_JACKED_1 = 2024,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_1_CAR_JACKED_2 = 2025,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_1_ROBBED_1 = 2026,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_1_ROBBED_2 = 2027,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_2_CAR_COLLISION_1 = 2028,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_2_CAR_COLLISION_2 = 2029,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_2_CAR_COLLISION_3 = 2030,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_2_CAR_COLLISION_4 = 2031,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_2_CAR_COLLISION_5 = 2032,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_2_CAR_COLLISION_6 = 2033,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_2_CAR_COLLISION_7 = 2034,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_2_CHAT_1 = 2035,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_2_CHAT_2 = 2036,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_2_CHAT_3 = 2037,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_2_CHAT_4 = 2038,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_2_CHAT_5 = 2039,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_2_CHAT_6 = 2040,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_2_EVADE_1 = 2041,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_2_EVADE_2 = 2042,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_2_EVADE_3 = 2043,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_2_EVADE_4 = 2044,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_2_EVADE_5 = 2045,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_2_CHAT_SEXY_1 = 2046,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_2_CHAT_SEXY_2 = 2047,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_2_CHAT_SEXY_3 = 2048,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_2_ATTACK_1 = 2049,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_2_ATTACK_2 = 2050,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_2_ATTACK_3 = 2051,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_2_ATTACK_4 = 2052,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_2_ATTACK_5 = 2053,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_2_ATTACK_6 = 2054,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_2_HANDS_UP_1 = 2055,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_2_HANDS_UP_2 = 2056,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_2_HANDS_UP_3 = 2057,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_2_CAR_JACKED_1 = 2058,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_2_CAR_JACKED_2 = 2059,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_2_ROBBED_1 = 2060,
-	AUDIO_SAMPLE_PED_BLACK_PROJECT_MALE_2_ROBBED_2 = 2061,
-	AUDIO_SAMPLE_PED_BLACK_WORKER_MALE_CAR_COLLISION_1 = 2062,
-	AUDIO_SAMPLE_PED_BLACK_WORKER_MALE_CAR_COLLISION_2 = 2063,
-	AUDIO_SAMPLE_PED_BLACK_WORKER_MALE_CAR_COLLISION_3 = 2064,
-	AUDIO_SAMPLE_PED_BLACK_WORKER_MALE_CAR_COLLISION_4 = 2065,
-	AUDIO_SAMPLE_PED_BLACK_WORKER_MALE_CHAT_1 = 2066,
-	AUDIO_SAMPLE_PED_BLACK_WORKER_MALE_CHAT_2 = 2067,
-	AUDIO_SAMPLE_PED_BLACK_WORKER_MALE_CHAT_3 = 2068,
-	AUDIO_SAMPLE_PED_BLACK_WORKER_MALE_CHAT_4 = 2069,
-	AUDIO_SAMPLE_PED_BLACK_WORKER_MALE_EVADE_1 = 2070,
-	AUDIO_SAMPLE_PED_BLACK_WORKER_MALE_EVADE_2 = 2071,
-	AUDIO_SAMPLE_PED_BLACK_WORKER_MALE_EVADE_3 = 2072,
-	AUDIO_SAMPLE_PED_BLACK_WORKER_MALE_CHAT_SEXY_1 = 2073,
-	AUDIO_SAMPLE_PED_BLACK_WORKER_MALE_CHAT_SEXY_2 = 2074,
-	AUDIO_SAMPLE_PED_BLACK_WORKER_MALE_CHAT_SEXY_3 = 2075,
-	AUDIO_SAMPLE_PED_BLACK_WORKER_MALE_ATTACK_1 = 2076,
-	AUDIO_SAMPLE_PED_BLACK_WORKER_MALE_ATTACK_2 = 2077,
-	AUDIO_SAMPLE_PED_BLACK_WORKER_MALE_ATTACK_3 = 2078,
-	AUDIO_SAMPLE_PED_BLACK_WORKER_MALE_HANDS_COWER_1 = 2079,
-	AUDIO_SAMPLE_PED_BLACK_WORKER_MALE_HANDS_COWER_2 = 2080,
-	AUDIO_SAMPLE_PED_BLACK_WORKER_MALE_HANDS_COWER_3 = 2081,
-	AUDIO_SAMPLE_PED_BLACK_WORKER_MALE_HANDS_COWER_4 = 2082,
-	AUDIO_SAMPLE_PED_SHOPPER_FEMALE_1_CAR_COLLISION_1 = 2083,
-	AUDIO_SAMPLE_PED_SHOPPER_FEMALE_1_CAR_COLLISION_2 = 2084,
-	AUDIO_SAMPLE_PED_SHOPPER_FEMALE_1_CAR_COLLISION_3 = 2085,
-	AUDIO_SAMPLE_PED_SHOPPER_FEMALE_1_CAR_COLLISION_4 = 2086,
-	AUDIO_SAMPLE_PED_SHOPPER_FEMALE_1_CAR_COLLISION_5 = 2087,
-	AUDIO_SAMPLE_PED_SHOPPER_FEMALE_1_CAR_COLLISION_6 = 2088,
-	AUDIO_SAMPLE_PED_SHOPPER_FEMALE_1_CAR_COLLISION_7 = 2089,
-	AUDIO_SAMPLE_PED_SHOPPER_FEMALE_1_CHAT_1 = 2090,
-	AUDIO_SAMPLE_PED_SHOPPER_FEMALE_1_CHAT_2 = 2091,
-	AUDIO_SAMPLE_PED_SHOPPER_FEMALE_1_CHAT_3 = 2092,
-	AUDIO_SAMPLE_PED_SHOPPER_FEMALE_1_CHAT_4 = 2093,
-	AUDIO_SAMPLE_PED_SHOPPER_FEMALE_1_CHAT_5 = 2094,
-	AUDIO_SAMPLE_PED_SHOPPER_FEMALE_1_CHAT_6 = 2095,
-	AUDIO_SAMPLE_PED_SHOPPER_FEMALE_1_CHAT_7 = 2096,
-	AUDIO_SAMPLE_PED_SHOPPER_FEMALE_1_EVADE_1 = 2097,
-	AUDIO_SAMPLE_PED_SHOPPER_FEMALE_1_EVADE_2 = 2098,
-	AUDIO_SAMPLE_PED_SHOPPER_FEMALE_1_EVADE_3 = 2099,
-	AUDIO_SAMPLE_PED_SHOPPER_FEMALE_1_EVADE_4 = 2100,
-	AUDIO_SAMPLE_PED_SHOPPER_FEMALE_1_EVADE_5 = 2101,
-	AUDIO_SAMPLE_PED_SHOPPER_FEMALE_1_EVADE_6 = 2102,
-	AUDIO_SAMPLE_PED_SHOPPER_FEMALE_1_CAR_JACKED_1 = 2103,
-	AUDIO_SAMPLE_PED_SHOPPER_FEMALE_1_CAR_JACKED_2 = 2104,
-	AUDIO_SAMPLE_PED_SHOPPER_FEMALE_1_ROBBED_1 = 2105,
-	AUDIO_SAMPLE_PED_SHOPPER_FEMALE_1_ROBBED_2 = 2106,
-	AUDIO_SAMPLE_PED_SHOPPER_FEMALE_1_CHAT_EVENT_1 = 2107,
-	AUDIO_SAMPLE_PED_SHOPPER_FEMALE_1_CHAT_EVENT_2 = 2108,
-	AUDIO_SAMPLE_PED_SHOPPER_FEMALE_1_CHAT_EVENT_3 = 2109,
-	AUDIO_SAMPLE_PED_SHOPPER_FEMALE_1_CHAT_EVENT_4 = 2110,
-	AUDIO_SAMPLE_PED_SHOPPER_FEMALE_2_CAR_COLLISION_1 = 2111,
-	AUDIO_SAMPLE_PED_SHOPPER_FEMALE_2_CAR_COLLISION_2 = 2112,
-	AUDIO_SAMPLE_PED_SHOPPER_FEMALE_2_CAR_COLLISION_3 = 2113,
-	AUDIO_SAMPLE_PED_SHOPPER_FEMALE_2_CAR_COLLISION_4 = 2114,
-	AUDIO_SAMPLE_PED_SHOPPER_FEMALE_2_CAR_COLLISION_5 = 2115,
-	AUDIO_SAMPLE_PED_SHOPPER_FEMALE_2_CAR_COLLISION_6 = 2116,
-	AUDIO_SAMPLE_PED_SHOPPER_FEMALE_2_CAR_COLLISION_7 = 2117,
-	AUDIO_SAMPLE_PED_SHOPPER_FEMALE_2_CHAT_1 = 2118,
-	AUDIO_SAMPLE_PED_SHOPPER_FEMALE_2_CHAT_2 = 2119,
-	AUDIO_SAMPLE_PED_SHOPPER_FEMALE_2_CHAT_3 = 2120,
-	AUDIO_SAMPLE_PED_SHOPPER_FEMALE_2_CHAT_4 = 2121,
-	AUDIO_SAMPLE_PED_SHOPPER_FEMALE_2_CHAT_5 = 2122,
-	AUDIO_SAMPLE_PED_SHOPPER_FEMALE_2_CHAT_6 = 2123,
-	AUDIO_SAMPLE_PED_SHOPPER_FEMALE_2_CHAT_7 = 2124,
-	AUDIO_SAMPLE_PED_SHOPPER_FEMALE_2_EVADE_1 = 2125,
-	AUDIO_SAMPLE_PED_SHOPPER_FEMALE_2_EVADE_2 = 2126,
-	AUDIO_SAMPLE_PED_SHOPPER_FEMALE_2_EVADE_3 = 2127,
-	AUDIO_SAMPLE_PED_SHOPPER_FEMALE_2_EVADE_4 = 2128,
-	AUDIO_SAMPLE_PED_SHOPPER_FEMALE_2_EVADE_5 = 2129,
-	AUDIO_SAMPLE_PED_SHOPPER_FEMALE_2_EVADE_6 = 2130,
-	AUDIO_SAMPLE_PED_SHOPPER_FEMALE_2_CAR_JACKED_1 = 2131,
-	AUDIO_SAMPLE_PED_SHOPPER_FEMALE_2_CAR_JACKED_2 = 2132,
-	AUDIO_SAMPLE_PED_SHOPPER_FEMALE_2_ROBBED_1 = 2133,
-	AUDIO_SAMPLE_PED_SHOPPER_FEMALE_2_ROBBED_2 = 2134,
-	AUDIO_SAMPLE_PED_SHOPPER_FEMALE_2_CHAT_EVENT_1 = 2135,
-	AUDIO_SAMPLE_PED_SHOPPER_FEMALE_2_CHAT_EVENT_2 = 2136,
-	AUDIO_SAMPLE_PED_SHOPPER_FEMALE_2_CHAT_EVENT_3 = 2137,
-	AUDIO_SAMPLE_PED_SHOPPER_FEMALE_2_CHAT_EVENT_4 = 2138,
-	AUDIO_SAMPLE_PED_SHOPPER_FEMALE_3_CAR_COLLISION_1 = 2139,
-	AUDIO_SAMPLE_PED_SHOPPER_FEMALE_3_CAR_COLLISION_2 = 2140,
-	AUDIO_SAMPLE_PED_SHOPPER_FEMALE_3_CAR_COLLISION_3 = 2141,
-	AUDIO_SAMPLE_PED_SHOPPER_FEMALE_3_CAR_COLLISION_4 = 2142,
-	AUDIO_SAMPLE_PED_SHOPPER_FEMALE_3_CAR_COLLISION_5 = 2143,
-	AUDIO_SAMPLE_PED_SHOPPER_FEMALE_3_CAR_COLLISION_6 = 2144,
-	AUDIO_SAMPLE_PED_SHOPPER_FEMALE_3_CAR_COLLISION_7 = 2145,
-	AUDIO_SAMPLE_PED_SHOPPER_FEMALE_3_CHAT_1 = 2146,
-	AUDIO_SAMPLE_PED_SHOPPER_FEMALE_3_CHAT_2 = 2147,
-	AUDIO_SAMPLE_PED_SHOPPER_FEMALE_3_CHAT_3 = 2148,
-	AUDIO_SAMPLE_PED_SHOPPER_FEMALE_3_CHAT_4 = 2149,
-	AUDIO_SAMPLE_PED_SHOPPER_FEMALE_3_CHAT_5 = 2150,
-	AUDIO_SAMPLE_PED_SHOPPER_FEMALE_3_CHAT_6 = 2151,
-	AUDIO_SAMPLE_PED_SHOPPER_FEMALE_3_CHAT_7 = 2152,
-	AUDIO_SAMPLE_PED_SHOPPER_FEMALE_3_EVADE_1 = 2153,
-	AUDIO_SAMPLE_PED_SHOPPER_FEMALE_3_EVADE_2 = 2154,
-	AUDIO_SAMPLE_PED_SHOPPER_FEMALE_3_EVADE_3 = 2155,
-	AUDIO_SAMPLE_PED_SHOPPER_FEMALE_3_EVADE_4 = 2156,
-	AUDIO_SAMPLE_PED_SHOPPER_FEMALE_3_EVADE_5 = 2157,
-	AUDIO_SAMPLE_PED_SHOPPER_FEMALE_3_EVADE_6 = 2158,
-	AUDIO_SAMPLE_PED_SHOPPER_FEMALE_3_CAR_JACKED_1 = 2159,
-	AUDIO_SAMPLE_PED_SHOPPER_FEMALE_3_CAR_JACKED_2 = 2160,
-	AUDIO_SAMPLE_PED_SHOPPER_FEMALE_3_ROBBED_1 = 2161,
-	AUDIO_SAMPLE_PED_SHOPPER_FEMALE_3_ROBBED_2 = 2162,
-	AUDIO_SAMPLE_PED_SHOPPER_FEMALE_3_CHAT_EVENT_1 = 2163,
-	AUDIO_SAMPLE_PED_SHOPPER_FEMALE_3_CHAT_EVENT_2 = 2164,
-	AUDIO_SAMPLE_PED_SHOPPER_FEMALE_3_CHAT_EVENT_3 = 2165,
-	AUDIO_SAMPLE_PED_SHOPPER_FEMALE_3_CHAT_EVENT_4 = 2166,
-	AUDIO_SAMPLE_PED_COLUMB_1_CAR_COLLISION_1 = 2167,
-	AUDIO_SAMPLE_PED_COLUMB_1_CAR_COLLISION_2 = 2168,
-	AUDIO_SAMPLE_PED_COLUMB_1_CAR_COLLISION_3 = 2169,
-	AUDIO_SAMPLE_PED_COLUMB_1_CAR_COLLISION_4 = 2170,
-	AUDIO_SAMPLE_PED_COLUMB_1_CAR_COLLISION_5 = 2171,
-	AUDIO_SAMPLE_PED_COLUMB_1_CAR_COLLISION_6 = 2172,
-	AUDIO_SAMPLE_PED_COLUMB_1_CHAT_1 = 2173,
-	AUDIO_SAMPLE_PED_COLUMB_1_CHAT_2 = 2174,
-	AUDIO_SAMPLE_PED_COLUMB_1_CHAT_3 = 2175,
-	AUDIO_SAMPLE_PED_COLUMB_1_CHAT_4 = 2176,
-	AUDIO_SAMPLE_PED_COLUMB_1_CHAT_5 = 2177,
-	AUDIO_SAMPLE_PED_COLUMB_1_EVADE_1 = 2178,
-	AUDIO_SAMPLE_PED_COLUMB_1_EVADE_2 = 2179,
-	AUDIO_SAMPLE_PED_COLUMB_1_EVADE_3 = 2180,
-	AUDIO_SAMPLE_PED_COLUMB_1_EVADE_4 = 2181,
-	AUDIO_SAMPLE_PED_COLUMB_1_EVADE_5 = 2182,
-	AUDIO_SAMPLE_PED_COLUMB_1_CHAT_SEXY_1 = 2183,
-	AUDIO_SAMPLE_PED_COLUMB_1_CHAT_SEXY_2 = 2184,
-	AUDIO_SAMPLE_PED_COLUMB_1_ATTACK_1 = 2185,
-	AUDIO_SAMPLE_PED_COLUMB_1_ATTACK_2 = 2186,
-	AUDIO_SAMPLE_PED_COLUMB_1_ATTACK_3 = 2187,
-	AUDIO_SAMPLE_PED_COLUMB_1_ATTACK_4 = 2188,
-	AUDIO_SAMPLE_PED_COLUMB_1_ATTACK_5 = 2189,
-	AUDIO_SAMPLE_PED_COLUMB_1_CAR_JACKED_1 = 2190,
-	AUDIO_SAMPLE_PED_COLUMB_1_CAR_JACKED_2 = 2191,
-	AUDIO_SAMPLE_PED_COLUMB_1_CAR_JACKING_1 = 2192,
-	AUDIO_SAMPLE_PED_COLUMB_1_CAR_JACKING_2 = 2193,
-	AUDIO_SAMPLE_PED_COLUMB_2_CAR_COLLISION_1 = 2194,
-	AUDIO_SAMPLE_PED_COLUMB_2_CAR_COLLISION_2 = 2195,
-	AUDIO_SAMPLE_PED_COLUMB_2_CAR_COLLISION_3 = 2196,
-	AUDIO_SAMPLE_PED_COLUMB_2_CAR_COLLISION_4 = 2197,
-	AUDIO_SAMPLE_PED_COLUMB_2_CAR_COLLISION_5 = 2198,
-	AUDIO_SAMPLE_PED_COLUMB_2_CAR_COLLISION_6 = 2199,
-	AUDIO_SAMPLE_PED_COLUMB_2_CHAT_1 = 2200,
-	AUDIO_SAMPLE_PED_COLUMB_2_CHAT_2 = 2201,
-	AUDIO_SAMPLE_PED_COLUMB_2_CHAT_3 = 2202,
-	AUDIO_SAMPLE_PED_COLUMB_2_CHAT_4 = 2203,
-	AUDIO_SAMPLE_PED_COLUMB_2_CHAT_5 = 2204,
-	AUDIO_SAMPLE_PED_COLUMB_2_EVADE_1 = 2205,
-	AUDIO_SAMPLE_PED_COLUMB_2_EVADE_2 = 2206,
-	AUDIO_SAMPLE_PED_COLUMB_2_EVADE_3 = 2207,
-	AUDIO_SAMPLE_PED_COLUMB_2_EVADE_4 = 2208,
-	AUDIO_SAMPLE_PED_COLUMB_2_EVADE_5 = 2209,
-	AUDIO_SAMPLE_PED_COLUMB_2_CHAT_SEXY_1 = 2210,
-	AUDIO_SAMPLE_PED_COLUMB_2_CHAT_SEXY_2 = 2211,
-	AUDIO_SAMPLE_PED_COLUMB_2_ATTACK_1 = 2212,
-	AUDIO_SAMPLE_PED_COLUMB_2_ATTACK_2 = 2213,
-	AUDIO_SAMPLE_PED_COLUMB_2_ATTACK_3 = 2214,
-	AUDIO_SAMPLE_PED_COLUMB_2_ATTACK_4 = 2215,
-	AUDIO_SAMPLE_PED_COLUMB_2_ATTACK_5 = 2216,
-	AUDIO_SAMPLE_PED_COLUMB_2_CAR_JACKED_1 = 2217,
-	AUDIO_SAMPLE_PED_COLUMB_2_CAR_JACKED_2 = 2218,
-	AUDIO_SAMPLE_PED_COLUMB_2_CAR_JACKING_1 = 2219,
-	AUDIO_SAMPLE_PED_COLUMB_2_CAR_JACKING_2 = 2220,
-	AUDIO_SAMPLE_PED_CHINATOWN_FEMALE_YOUNG_CAR_COLLISION_1 = 2221,
-	AUDIO_SAMPLE_PED_CHINATOWN_FEMALE_YOUNG_CAR_COLLISION_2 = 2222,
-	AUDIO_SAMPLE_PED_CHINATOWN_FEMALE_YOUNG_CAR_COLLISION_3 = 2223,
-	AUDIO_SAMPLE_PED_CHINATOWN_FEMALE_YOUNG_CAR_COLLISION_4 = 2224,
-	AUDIO_SAMPLE_PED_CHINATOWN_FEMALE_YOUNG_CAR_COLLISION_5 = 2225,
-	AUDIO_SAMPLE_PED_CHINATOWN_FEMALE_YOUNG_CAR_COLLISION_6 = 2226,
-	AUDIO_SAMPLE_PED_CHINATOWN_FEMALE_YOUNG_CAR_COLLISION_7 = 2227,
-	AUDIO_SAMPLE_PED_CHINATOWN_FEMALE_YOUNG_CHAT_1 = 2228,
-	AUDIO_SAMPLE_PED_CHINATOWN_FEMALE_YOUNG_CHAT_2 = 2229,
-	AUDIO_SAMPLE_PED_CHINATOWN_FEMALE_YOUNG_CHAT_3 = 2230,
-	AUDIO_SAMPLE_PED_CHINATOWN_FEMALE_YOUNG_CHAT_4 = 2231,
-	AUDIO_SAMPLE_PED_CHINATOWN_FEMALE_YOUNG_CHAT_5 = 2232,
-	AUDIO_SAMPLE_PED_CHINATOWN_FEMALE_YOUNG_CHAT_6 = 2233,
-	AUDIO_SAMPLE_PED_CHINATOWN_FEMALE_YOUNG_CHAT_7 = 2234,
-	AUDIO_SAMPLE_PED_CHINATOWN_FEMALE_YOUNG_EVADE_1 = 2235,
-	AUDIO_SAMPLE_PED_CHINATOWN_FEMALE_YOUNG_EVADE_2 = 2236,
-	AUDIO_SAMPLE_PED_CHINATOWN_FEMALE_YOUNG_EVADE_3 = 2237,
-	AUDIO_SAMPLE_PED_CHINATOWN_FEMALE_YOUNG_EVADE_4 = 2238,
-	AUDIO_SAMPLE_PED_CHINATOWN_FEMALE_YOUNG_EVADE_5 = 2239,
-	AUDIO_SAMPLE_PED_CHINATOWN_FEMALE_YOUNG_EVADE_6 = 2240,
-	AUDIO_SAMPLE_PED_CHINATOWN_FEMALE_YOUNG_CAR_JACKED_1 = 2241,
-	AUDIO_SAMPLE_PED_CHINATOWN_FEMALE_YOUNG_CAR_JACKED_2 = 2242,
-	AUDIO_SAMPLE_PED_CHINATOWN_FEMALE_YOUNG_ROBBED_1 = 2243,
-	AUDIO_SAMPLE_PED_CHINATOWN_FEMALE_YOUNG_ROBBED_2 = 2244,
-	AUDIO_SAMPLE_PED_CHINATOWN_FEMALE_YOUNG_CHAT_EVENT_1 = 2245,
-	AUDIO_SAMPLE_PED_CHINATOWN_FEMALE_YOUNG_CHAT_EVENT_2 = 2246,
-	AUDIO_SAMPLE_PED_CHINATOWN_FEMALE_YOUNG_CHAT_EVENT_3 = 2247,
-	AUDIO_SAMPLE_PED_CHINATOWN_FEMALE_YOUNG_CHAT_EVENT_4 = 2248,
-	AUDIO_SAMPLE_PED_CHINATOWN_FEMALE_OLD_CAR_COLLISION_1 = 2249,
-	AUDIO_SAMPLE_PED_CHINATOWN_FEMALE_OLD_CAR_COLLISION_2 = 2250,
-	AUDIO_SAMPLE_PED_CHINATOWN_FEMALE_OLD_CAR_COLLISION_3 = 2251,
-	AUDIO_SAMPLE_PED_CHINATOWN_FEMALE_OLD_CAR_COLLISION_4 = 2252,
-	AUDIO_SAMPLE_PED_CHINATOWN_FEMALE_OLD_CAR_COLLISION_5 = 2253,
-	AUDIO_SAMPLE_PED_CHINATOWN_FEMALE_OLD_CHAT_1 = 2254,
-	AUDIO_SAMPLE_PED_CHINATOWN_FEMALE_OLD_CHAT_2 = 2255,
-	AUDIO_SAMPLE_PED_CHINATOWN_FEMALE_OLD_CHAT_3 = 2256,
-	AUDIO_SAMPLE_PED_CHINATOWN_FEMALE_OLD_CHAT_4 = 2257,
-	AUDIO_SAMPLE_PED_CHINATOWN_FEMALE_OLD_CHAT_5 = 2258,
-	AUDIO_SAMPLE_PED_CHINATOWN_FEMALE_OLD_CHAT_6 = 2259,
-	AUDIO_SAMPLE_PED_CHINATOWN_FEMALE_OLD_EVADE_1 = 2260,
-	AUDIO_SAMPLE_PED_CHINATOWN_FEMALE_OLD_EVADE_2 = 2261,
-	AUDIO_SAMPLE_PED_CHINATOWN_FEMALE_OLD_EVADE_3 = 2262,
-	AUDIO_SAMPLE_PED_CHINATOWN_FEMALE_OLD_EVADE_4 = 2263,
-	AUDIO_SAMPLE_PED_CHINATOWN_FEMALE_OLD_EVADE_5 = 2264,
-	AUDIO_SAMPLE_PED_CHINATOWN_FEMALE_OLD_HANDS_COWER_1 = 2265,
-	AUDIO_SAMPLE_PED_CHINATOWN_FEMALE_OLD_HANDS_COWER_2 = 2266,
-	AUDIO_SAMPLE_PED_CHINATOWN_FEMALE_OLD_HANDS_COWER_3 = 2267,
-	AUDIO_SAMPLE_PED_CHINATOWN_FEMALE_OLD_ROBBED_1 = 2268,
-	AUDIO_SAMPLE_PED_CHINATOWN_FEMALE_OLD_ROBBED_2 = 2269,
-	AUDIO_SAMPLE_PED_CHINATOWN_FEMALE_OLD_CHAT_EVENT_1 = 2270,
-	AUDIO_SAMPLE_PED_FEMALE_DEATH_1 = 2271,
-	AUDIO_SAMPLE_PED_FEMALE_DEATH_2 = 2272,
-	AUDIO_SAMPLE_PED_FEMALE_DEATH_3 = 2273,
-	AUDIO_SAMPLE_PED_FEMALE_DEATH_4 = 2274,
-	AUDIO_SAMPLE_PED_FEMALE_DEATH_5 = 2275,
-	AUDIO_SAMPLE_PED_FEMALE_DEATH_6 = 2276,
-	AUDIO_SAMPLE_PED_FEMALE_DEATH_7 = 2277,
-	AUDIO_SAMPLE_PED_FEMALE_DEATH_8 = 2278,
-	AUDIO_SAMPLE_PED_FEMALE_DEATH_9 = 2279,
-	AUDIO_SAMPLE_PED_FEMALE_DEATH_10 = 2280,
-	AUDIO_SAMPLE_PED_FEMALE_BURNING_1 = 2281,
-	AUDIO_SAMPLE_PED_FEMALE_BURNING_2 = 2282,
-	AUDIO_SAMPLE_PED_FEMALE_BURNING_3 = 2283,
-	AUDIO_SAMPLE_PED_FEMALE_BURNING_4 = 2284,
-	AUDIO_SAMPLE_PED_FEMALE_BURNING_5 = 2285,
-	AUDIO_SAMPLE_PED_FEMALE_BURNING_6 = 2286,
-	AUDIO_SAMPLE_PED_FEMALE_BURNING_7 = 2287,
-	AUDIO_SAMPLE_PED_FEMALE_BURNING_8 = 2288,
-	AUDIO_SAMPLE_PED_FEMALE_BURNING_9 = 2289,
-	AUDIO_SAMPLE_INJURED_PED_FEMALE_OUCH_1 = 2290,
-	AUDIO_SAMPLE_INJURED_PED_FEMALE_OUCH_2 = 2291,
-	AUDIO_SAMPLE_INJURED_PED_FEMALE_OUCH_3 = 2292,
-	AUDIO_SAMPLE_INJURED_PED_FEMALE_OUCH_4 = 2293,
-	AUDIO_SAMPLE_INJURED_PED_FEMALE_OUCH_5 = 2294,
-	AUDIO_SAMPLE_INJURED_PED_FEMALE_OUCH_6 = 2295,
-	AUDIO_SAMPLE_INJURED_PED_FEMALE_OUCH_7 = 2296,
-	AUDIO_SAMPLE_INJURED_PED_FEMALE_OUCH_8 = 2297,
-	AUDIO_SAMPLE_INJURED_PED_FEMALE_OUCH_9 = 2298,
-	AUDIO_SAMPLE_INJURED_PED_FEMALE_OUCH_10 = 2299,
-	AUDIO_SAMPLE_INJURED_PED_FEMALE_OUCH_11 = 2300,
-	AUDIO_SAMPLE_PED_FEMALE_FLEE_SPRINT_1 = 2301,
-	AUDIO_SAMPLE_PED_FEMALE_FLEE_SPRINT_2 = 2302,
-	AUDIO_SAMPLE_PED_FEMALE_FLEE_SPRINT_3 = 2303,
-	AUDIO_SAMPLE_PED_FEMALE_FLEE_SPRINT_4 = 2304,
-	AUDIO_SAMPLE_PED_FEMALE_FLEE_SPRINT_5 = 2305,
-	AUDIO_SAMPLE_PED_FEMALE_FLEE_SPRINT_6 = 2306,
-	AUDIO_SAMPLE_PED_FEMALE_FLEE_SPRINT_7 = 2307,
-	AUDIO_SAMPLE_PED_FEMALE_FLEE_SPRINT_8 = 2308,
-	AUDIO_SAMPLE_PED_BLACK_CRIMINAL_1_CAR_COLLISION_1 = 2309,
-	AUDIO_SAMPLE_PED_BLACK_CRIMINAL_1_CAR_COLLISION_2 = 2310,
-	AUDIO_SAMPLE_PED_BLACK_CRIMINAL_1_CAR_COLLISION_3 = 2311,
-	AUDIO_SAMPLE_PED_BLACK_CRIMINAL_1_CAR_COLLISION_4 = 2312,
-	AUDIO_SAMPLE_PED_BLACK_CRIMINAL_1_CAR_COLLISION_5 = 2313,
-	AUDIO_SAMPLE_PED_BLACK_CRIMINAL_1_EVADE_1 = 2314,
-	AUDIO_SAMPLE_PED_BLACK_CRIMINAL_1_EVADE_2 = 2315,
-	AUDIO_SAMPLE_PED_BLACK_CRIMINAL_1_EVADE_3 = 2316,
-	AUDIO_SAMPLE_PED_BLACK_CRIMINAL_1_EVADE_4 = 2317,
-	AUDIO_SAMPLE_PED_BLACK_CRIMINAL_1_EVADE_5 = 2318,
-	AUDIO_SAMPLE_PED_BLACK_CRIMINAL_1_EVADE_6 = 2319,
-	AUDIO_SAMPLE_PED_BLACK_CRIMINAL_1_ATTACK_1 = 2320,
-	AUDIO_SAMPLE_PED_BLACK_CRIMINAL_1_ATTACK_2 = 2321,
-	AUDIO_SAMPLE_PED_BLACK_CRIMINAL_1_ATTACK_3 = 2322,
-	AUDIO_SAMPLE_PED_BLACK_CRIMINAL_1_ATTACK_4 = 2323,
-	AUDIO_SAMPLE_PED_BLACK_CRIMINAL_1_ATTACK_5 = 2324,
-	AUDIO_SAMPLE_PED_BLACK_CRIMINAL_1_HANDS_UP_1 = 2325,
-	AUDIO_SAMPLE_PED_BLACK_CRIMINAL_1_HANDS_UP_2 = 2326,
-	AUDIO_SAMPLE_PED_BLACK_CRIMINAL_1_HANDS_UP_3 = 2327,
-	AUDIO_SAMPLE_PED_BLACK_CRIMINAL_1_HANDS_UP_4 = 2328,
-	AUDIO_SAMPLE_PED_BLACK_CRIMINAL_1_CAR_JACKING_1 = 2329,
-	AUDIO_SAMPLE_PED_BLACK_CRIMINAL_1_MUGGING_1 = 2330,
-	AUDIO_SAMPLE_PED_BLACK_CRIMINAL_1_MUGGING_2 = 2331,
-	AUDIO_SAMPLE_PED_WHITE_CRIMINAL_1_CAR_COLLISION_1 = 2332,
-	AUDIO_SAMPLE_PED_WHITE_CRIMINAL_1_CAR_COLLISION_2 = 2333,
-	AUDIO_SAMPLE_PED_WHITE_CRIMINAL_1_CAR_COLLISION_3 = 2334,
-	AUDIO_SAMPLE_PED_WHITE_CRIMINAL_1_CAR_COLLISION_4 = 2335,
-	AUDIO_SAMPLE_PED_WHITE_CRIMINAL_1_EVADE_1 = 2336,
-	AUDIO_SAMPLE_PED_WHITE_CRIMINAL_1_EVADE_2 = 2337,
-	AUDIO_SAMPLE_PED_WHITE_CRIMINAL_1_EVADE_3 = 2338,
-	AUDIO_SAMPLE_PED_WHITE_CRIMINAL_1_EVADE_4 = 2339,
-	AUDIO_SAMPLE_PED_WHITE_CRIMINAL_1_EVADE_5 = 2340,
-	AUDIO_SAMPLE_PED_WHITE_CRIMINAL_1_ATTACK_1 = 2341,
-	AUDIO_SAMPLE_PED_WHITE_CRIMINAL_1_ATTACK_2 = 2342,
-	AUDIO_SAMPLE_PED_WHITE_CRIMINAL_1_ATTACK_3 = 2343,
-	AUDIO_SAMPLE_PED_WHITE_CRIMINAL_1_ATTACK_4 = 2344,
-	AUDIO_SAMPLE_PED_WHITE_CRIMINAL_1_HANDS_UP_1 = 2345,
-	AUDIO_SAMPLE_PED_WHITE_CRIMINAL_1_HANDS_UP_2 = 2346,
-	AUDIO_SAMPLE_PED_WHITE_CRIMINAL_1_HANDS_UP_3 = 2347,
-	AUDIO_SAMPLE_PED_WHITE_CRIMINAL_1_CAR_JACKING_1 = 2348,
-	AUDIO_SAMPLE_PED_WHITE_CRIMINAL_1_MUGGING_1 = 2349,
-	AUDIO_SAMPLE_PED_WHITE_CRIMINAL_1_MUGGING_2 = 2350,
-	AUDIO_SAMPLE_PED_BUSINESS_MALE_OLD_1_CAR_COLLISION_1 = 2351,
-	AUDIO_SAMPLE_PED_BUSINESS_MALE_OLD_1_CAR_COLLISION_2 = 2352,
-	AUDIO_SAMPLE_PED_BUSINESS_MALE_OLD_1_CAR_COLLISION_3 = 2353,
-	AUDIO_SAMPLE_PED_BUSINESS_MALE_OLD_1_CAR_COLLISION_4 = 2354,
-	AUDIO_SAMPLE_PED_BUSINESS_MALE_OLD_1_CAR_COLLISION_5 = 2355,
-	AUDIO_SAMPLE_PED_BUSINESS_MALE_OLD_1_CHAT_1 = 2356,
-	AUDIO_SAMPLE_PED_BUSINESS_MALE_OLD_1_CHAT_2 = 2357,
-	AUDIO_SAMPLE_PED_BUSINESS_MALE_OLD_1_CHAT_3 = 2358,
-	AUDIO_SAMPLE_PED_BUSINESS_MALE_OLD_1_CHAT_4 = 2359,
-	AUDIO_SAMPLE_PED_BUSINESS_MALE_OLD_1_CHAT_5 = 2360,
-	AUDIO_SAMPLE_PED_BUSINESS_MALE_OLD_1_EVADE_1 = 2361,
-	AUDIO_SAMPLE_PED_BUSINESS_MALE_OLD_1_EVADE_2 = 2362,
-	AUDIO_SAMPLE_PED_BUSINESS_MALE_OLD_1_EVADE_3 = 2363,
-	AUDIO_SAMPLE_PED_BUSINESS_MALE_OLD_1_EVADE_4 = 2364,
-	AUDIO_SAMPLE_PED_BUSINESS_MALE_OLD_1_ATTACK_1 = 2365,
-	AUDIO_SAMPLE_PED_BUSINESS_MALE_OLD_1_ATTACK_2 = 2366,
-	AUDIO_SAMPLE_PED_BUSINESS_MALE_OLD_1_ATTACK_3 = 2367,
-	AUDIO_SAMPLE_PED_BUSINESS_MALE_OLD_1_ATTACK_4 = 2368,
-	AUDIO_SAMPLE_PED_BUSINESS_MALE_OLD_1_ATTACK_5 = 2369,
-	AUDIO_SAMPLE_PED_BUSINESS_MALE_OLD_1_HANDS_COWER_1 = 2370,
-	AUDIO_SAMPLE_PED_BUSINESS_MALE_OLD_1_HANDS_COWER_2 = 2371,
-	AUDIO_SAMPLE_PED_BUSINESS_MALE_OLD_1_HANDS_COWER_3 = 2372,
-	AUDIO_SAMPLE_PED_BUSINESS_MALE_OLD_1_CAR_JACKED_1 = 2373,
-	AUDIO_SAMPLE_PED_BUSINESS_MALE_OLD_1_CAR_JACKED_2 = 2374,
-	AUDIO_SAMPLE_PED_BUSINESS_MALE_OLD_1_ROBBED_1 = 2375,
-	AUDIO_SAMPLE_PED_BUSINESS_MALE_OLD_1_ROBBED_2 = 2376,
-	AUDIO_SAMPLE_PED_BUSINESS_MALE_OLD_1_FLEE_RUN_1 = 2377,
-	AUDIO_SAMPLE_PED_BUSINESS_MALE_OLD_1_FLEE_RUN_2 = 2378,
-	AUDIO_SAMPLE_PED_BUSINESS_MALE_OLD_1_FLEE_RUN_3 = 2379,
-	AUDIO_SAMPLE_PED_BUSINESS_MALE_OLD_1_FLEE_RUN_4 = 2380,
-	AUDIO_SAMPLE_PED_BUSINESS_MALE_OLD_1_FLEE_RUN_5 = 2381,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_MALE_1_CAR_COLLISION_1 = 2382,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_MALE_1_CAR_COLLISION_2 = 2383,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_MALE_1_CAR_COLLISION_3 = 2384,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_MALE_1_CAR_COLLISION_4 = 2385,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_MALE_1_CAR_COLLISION_5 = 2386,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_MALE_1_CAR_COLLISION_6 = 2387,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_MALE_1_CAR_COLLISION_7 = 2388,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_MALE_1_CHAT_1 = 2389,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_MALE_1_CHAT_2 = 2390,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_MALE_1_CHAT_3 = 2391,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_MALE_1_CHAT_4 = 2392,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_MALE_1_CHAT_5 = 2393,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_MALE_1_CHAT_6 = 2394,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_MALE_1_EVADE_1 = 2395,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_MALE_1_EVADE_2 = 2396,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_MALE_1_EVADE_3 = 2397,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_MALE_1_EVADE_4 = 2398,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_MALE_1_EVADE_5 = 2399,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_MALE_1_ATTACK_1 = 2400,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_MALE_1_ATTACK_2 = 2401,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_MALE_1_ATTACK_3 = 2402,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_MALE_1_ATTACK_4 = 2403,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_MALE_1_ATTACK_5 = 2404,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_MALE_1_HANDS_COWER_1 = 2405,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_MALE_1_HANDS_COWER_2 = 2406,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_MALE_1_HANDS_COWER_3 = 2407,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_MALE_1_CAR_JACKED_1 = 2408,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_MALE_1_CAR_JACKED_2 = 2409,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_MALE_1_ROBBED_1 = 2410,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_MALE_1_ROBBED_2 = 2411,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_MALE_2_CAR_COLLISION_1 = 2412,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_MALE_2_CAR_COLLISION_2 = 2413,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_MALE_2_CAR_COLLISION_3 = 2414,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_MALE_2_CAR_COLLISION_4 = 2415,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_MALE_2_CAR_COLLISION_5 = 2416,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_MALE_2_CAR_COLLISION_6 = 2417,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_MALE_2_CAR_COLLISION_7 = 2418,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_MALE_2_CHAT_1 = 2419,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_MALE_2_CHAT_2 = 2420,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_MALE_2_CHAT_3 = 2421,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_MALE_2_CHAT_4 = 2422,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_MALE_2_CHAT_5 = 2423,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_MALE_2_CHAT_6 = 2424,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_MALE_2_EVADE_1 = 2425,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_MALE_2_EVADE_2 = 2426,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_MALE_2_EVADE_3 = 2427,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_MALE_2_EVADE_4 = 2428,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_MALE_2_EVADE_5 = 2429,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_MALE_2_ATTACK_1 = 2430,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_MALE_2_ATTACK_2 = 2431,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_MALE_2_ATTACK_3 = 2432,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_MALE_2_ATTACK_4 = 2433,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_MALE_2_ATTACK_5 = 2434,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_MALE_2_HANDS_COWER_1 = 2435,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_MALE_2_HANDS_COWER_2 = 2436,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_MALE_2_HANDS_COWER_3 = 2437,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_MALE_2_CAR_JACKED_1 = 2438,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_MALE_2_CAR_JACKED_2 = 2439,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_MALE_2_ROBBED_1 = 2440,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_MALE_2_ROBBED_2 = 2441,
-	AUDIO_SAMPLE_PED_TRIAD_1_CAR_COLLISION_1 = 2442,
-	AUDIO_SAMPLE_PED_TRIAD_1_CAR_COLLISION_2 = 2443,
-	AUDIO_SAMPLE_PED_TRIAD_1_CAR_COLLISION_3 = 2444,
-	AUDIO_SAMPLE_PED_TRIAD_1_CAR_COLLISION_4 = 2445,
-	AUDIO_SAMPLE_PED_TRIAD_1_CAR_COLLISION_5 = 2446,
-	AUDIO_SAMPLE_PED_TRIAD_1_CAR_COLLISION_6 = 2447,
-	AUDIO_SAMPLE_PED_TRIAD_1_CAR_COLLISION_7 = 2448,
-	AUDIO_SAMPLE_PED_TRIAD_1_CHAT_1 = 2449,
-	AUDIO_SAMPLE_PED_TRIAD_1_CHAT_2 = 2450,
-	AUDIO_SAMPLE_PED_TRIAD_1_CHAT_3 = 2451,
-	AUDIO_SAMPLE_PED_TRIAD_1_CHAT_4 = 2452,
-	AUDIO_SAMPLE_PED_TRIAD_1_CHAT_5 = 2453,
-	AUDIO_SAMPLE_PED_TRIAD_1_CHAT_6 = 2454,
-	AUDIO_SAMPLE_PED_TRIAD_1_CHAT_7 = 2455,
-	AUDIO_SAMPLE_PED_TRIAD_1_CHAT_8 = 2456,
-	AUDIO_SAMPLE_PED_TRIAD_1_EVADE_1 = 2457,
-	AUDIO_SAMPLE_PED_TRIAD_1_EVADE_2 = 2458,
-	AUDIO_SAMPLE_PED_TRIAD_1_EVADE_3 = 2459,
-	AUDIO_SAMPLE_PED_TRIAD_1_EVADE_4 = 2460,
-	AUDIO_SAMPLE_PED_TRIAD_1_CHAT_SEXY_1 = 2461,
-	AUDIO_SAMPLE_PED_TRIAD_1_CHAT_SEXY_2 = 2462,
-	AUDIO_SAMPLE_PED_TRIAD_1_CHAT_SEXY_3 = 2463,
-	AUDIO_SAMPLE_PED_TRIAD_1_ATTACK_1 = 2464,
-	AUDIO_SAMPLE_PED_TRIAD_1_ATTACK_2 = 2465,
-	AUDIO_SAMPLE_PED_TRIAD_1_ATTACK_3 = 2466,
-	AUDIO_SAMPLE_PED_TRIAD_1_ATTACK_4 = 2467,
-	AUDIO_SAMPLE_PED_TRIAD_1_ATTACK_5 = 2468,
-	AUDIO_SAMPLE_PED_TRIAD_1_HANDS_UP_1 = 2469,
-	AUDIO_SAMPLE_PED_TRIAD_1_HANDS_UP_2 = 2470,
-	AUDIO_SAMPLE_PED_TRIAD_1_HANDS_UP_3 = 2471,
-	AUDIO_SAMPLE_PED_TRIAD_1_CAR_JACKED_1 = 2472,
-	AUDIO_SAMPLE_PED_TRIAD_1_CAR_JACKED_2 = 2473,
-	AUDIO_SAMPLE_PED_TRIAD_1_CAR_JACKING_1 = 2474,
-	AUDIO_SAMPLE_PED_TRIAD_1_CAR_JACKING_2 = 2475,
-	AUDIO_SAMPLE_PED_MAFIA_1_CAR_COLLISION_1 = 2476,
-	AUDIO_SAMPLE_PED_MAFIA_1_CAR_COLLISION_2 = 2477,
-	AUDIO_SAMPLE_PED_MAFIA_1_CAR_COLLISION_3 = 2478,
-	AUDIO_SAMPLE_PED_MAFIA_1_CAR_COLLISION_4 = 2479,
-	AUDIO_SAMPLE_PED_MAFIA_1_CAR_COLLISION_5 = 2480,
-	AUDIO_SAMPLE_PED_MAFIA_1_CAR_COLLISION_6 = 2481,
-	AUDIO_SAMPLE_PED_MAFIA_1_CHAT_1 = 2482,
-	AUDIO_SAMPLE_PED_MAFIA_1_CHAT_2 = 2483,
-	AUDIO_SAMPLE_PED_MAFIA_1_CHAT_3 = 2484,
-	AUDIO_SAMPLE_PED_MAFIA_1_CHAT_4 = 2485,
-	AUDIO_SAMPLE_PED_MAFIA_1_CHAT_5 = 2486,
-	AUDIO_SAMPLE_PED_MAFIA_1_CHAT_6 = 2487,
-	AUDIO_SAMPLE_PED_MAFIA_1_CHAT_7 = 2488,
-	AUDIO_SAMPLE_PED_MAFIA_1_EVADE_1 = 2489,
-	AUDIO_SAMPLE_PED_MAFIA_1_EVADE_2 = 2490,
-	AUDIO_SAMPLE_PED_MAFIA_1_EVADE_3 = 2491,
-	AUDIO_SAMPLE_PED_MAFIA_1_EVADE_4 = 2492,
-	AUDIO_SAMPLE_PED_MAFIA_1_EVADE_5 = 2493,
-	AUDIO_SAMPLE_PED_MAFIA_1_CHAT_SEXY_1 = 2494,
-	AUDIO_SAMPLE_PED_MAFIA_1_CHAT_SEXY_2 = 2495,
-	AUDIO_SAMPLE_PED_MAFIA_1_CHAT_SEXY_3 = 2496,
-	AUDIO_SAMPLE_PED_MAFIA_1_ATTACK_1 = 2497,
-	AUDIO_SAMPLE_PED_MAFIA_1_ATTACK_2 = 2498,
-	AUDIO_SAMPLE_PED_MAFIA_1_ATTACK_3 = 2499,
-	AUDIO_SAMPLE_PED_MAFIA_1_ATTACK_4 = 2500,
-	AUDIO_SAMPLE_PED_MAFIA_1_ATTACK_5 = 2501,
-	AUDIO_SAMPLE_PED_MAFIA_1_CAR_JACKED_1 = 2502,
-	AUDIO_SAMPLE_PED_MAFIA_1_CAR_JACKED_2 = 2503,
-	AUDIO_SAMPLE_PED_MAFIA_1_CAR_JACKING_1 = 2504,
-	AUDIO_SAMPLE_PED_MAFIA_1_CAR_JACKING_2 = 2505,
-	AUDIO_SAMPLE_PED_MAFIA_2_CAR_COLLISION_1 = 2506,
-	AUDIO_SAMPLE_PED_MAFIA_2_CAR_COLLISION_2 = 2507,
-	AUDIO_SAMPLE_PED_MAFIA_2_CAR_COLLISION_3 = 2508,
-	AUDIO_SAMPLE_PED_MAFIA_2_CAR_COLLISION_4 = 2509,
-	AUDIO_SAMPLE_PED_MAFIA_2_CAR_COLLISION_5 = 2510,
-	AUDIO_SAMPLE_PED_MAFIA_2_CAR_COLLISION_6 = 2511,
-	AUDIO_SAMPLE_PED_MAFIA_2_CHAT_1 = 2512,
-	AUDIO_SAMPLE_PED_MAFIA_2_CHAT_2 = 2513,
-	AUDIO_SAMPLE_PED_MAFIA_2_CHAT_3 = 2514,
-	AUDIO_SAMPLE_PED_MAFIA_2_CHAT_4 = 2515,
-	AUDIO_SAMPLE_PED_MAFIA_2_CHAT_5 = 2516,
-	AUDIO_SAMPLE_PED_MAFIA_2_CHAT_6 = 2517,
-	AUDIO_SAMPLE_PED_MAFIA_2_CHAT_7 = 2518,
-	AUDIO_SAMPLE_PED_MAFIA_2_EVADE_1 = 2519,
-	AUDIO_SAMPLE_PED_MAFIA_2_EVADE_2 = 2520,
-	AUDIO_SAMPLE_PED_MAFIA_2_EVADE_3 = 2521,
-	AUDIO_SAMPLE_PED_MAFIA_2_EVADE_4 = 2522,
-	AUDIO_SAMPLE_PED_MAFIA_2_EVADE_5 = 2523,
-	AUDIO_SAMPLE_PED_MAFIA_2_CHAT_SEXY_1 = 2524,
-	AUDIO_SAMPLE_PED_MAFIA_2_CHAT_SEXY_2 = 2525,
-	AUDIO_SAMPLE_PED_MAFIA_2_CHAT_SEXY_3 = 2526,
-	AUDIO_SAMPLE_PED_MAFIA_2_ATTACK_1 = 2527,
-	AUDIO_SAMPLE_PED_MAFIA_2_ATTACK_2 = 2528,
-	AUDIO_SAMPLE_PED_MAFIA_2_ATTACK_3 = 2529,
-	AUDIO_SAMPLE_PED_MAFIA_2_ATTACK_4 = 2530,
-	AUDIO_SAMPLE_PED_MAFIA_2_ATTACK_5 = 2531,
-	AUDIO_SAMPLE_PED_MAFIA_2_CAR_JACKED_1 = 2532,
-	AUDIO_SAMPLE_PED_MAFIA_2_CAR_JACKED_2 = 2533,
-	AUDIO_SAMPLE_PED_MAFIA_2_CAR_JACKING_1 = 2534,
-	AUDIO_SAMPLE_PED_MAFIA_2_CAR_JACKING_2 = 2535,
-	AUDIO_SAMPLE_PED_MAFIA_3_CAR_COLLISION_1 = 2536,
-	AUDIO_SAMPLE_PED_MAFIA_3_CAR_COLLISION_2 = 2537,
-	AUDIO_SAMPLE_PED_MAFIA_3_CAR_COLLISION_3 = 2538,
-	AUDIO_SAMPLE_PED_MAFIA_3_CAR_COLLISION_4 = 2539,
-	AUDIO_SAMPLE_PED_MAFIA_3_CAR_COLLISION_5 = 2540,
-	AUDIO_SAMPLE_PED_MAFIA_3_CAR_COLLISION_6 = 2541,
-	AUDIO_SAMPLE_PED_MAFIA_3_CHAT_1 = 2542,
-	AUDIO_SAMPLE_PED_MAFIA_3_CHAT_2 = 2543,
-	AUDIO_SAMPLE_PED_MAFIA_3_CHAT_3 = 2544,
-	AUDIO_SAMPLE_PED_MAFIA_3_CHAT_4 = 2545,
-	AUDIO_SAMPLE_PED_MAFIA_3_CHAT_5 = 2546,
-	AUDIO_SAMPLE_PED_MAFIA_3_CHAT_6 = 2547,
-	AUDIO_SAMPLE_PED_MAFIA_3_CHAT_7 = 2548,
-	AUDIO_SAMPLE_PED_MAFIA_3_EVADE_1 = 2549,
-	AUDIO_SAMPLE_PED_MAFIA_3_EVADE_2 = 2550,
-	AUDIO_SAMPLE_PED_MAFIA_3_EVADE_3 = 2551,
-	AUDIO_SAMPLE_PED_MAFIA_3_EVADE_4 = 2552,
-	AUDIO_SAMPLE_PED_MAFIA_3_EVADE_5 = 2553,
-	AUDIO_SAMPLE_PED_MAFIA_3_CHAT_SEXY_1 = 2554,
-	AUDIO_SAMPLE_PED_MAFIA_3_CHAT_SEXY_2 = 2555,
-	AUDIO_SAMPLE_PED_MAFIA_3_CHAT_SEXY_3 = 2556,
-	AUDIO_SAMPLE_PED_MAFIA_3_ATTACK_1 = 2557,
-	AUDIO_SAMPLE_PED_MAFIA_3_ATTACK_2 = 2558,
-	AUDIO_SAMPLE_PED_MAFIA_3_ATTACK_3 = 2559,
-	AUDIO_SAMPLE_PED_MAFIA_3_ATTACK_4 = 2560,
-	AUDIO_SAMPLE_PED_MAFIA_3_ATTACK_5 = 2561,
-	AUDIO_SAMPLE_PED_MAFIA_3_CAR_JACKED_1 = 2562,
-	AUDIO_SAMPLE_PED_MAFIA_3_CAR_JACKED_2 = 2563,
-	AUDIO_SAMPLE_PED_MAFIA_3_CAR_JACKING_1 = 2564,
-	AUDIO_SAMPLE_PED_MAFIA_3_CAR_JACKING_2 = 2565,
-	AUDIO_SAMPLE_PED_YAKUZA_1_CAR_COLLISION_1 = 2566,
-	AUDIO_SAMPLE_PED_YAKUZA_1_CAR_COLLISION_2 = 2567,
-	AUDIO_SAMPLE_PED_YAKUZA_1_CAR_COLLISION_3 = 2568,
-	AUDIO_SAMPLE_PED_YAKUZA_1_CAR_COLLISION_4 = 2569,
-	AUDIO_SAMPLE_PED_YAKUZA_1_CAR_COLLISION_5 = 2570,
-	AUDIO_SAMPLE_PED_YAKUZA_1_CAR_COLLISION_6 = 2571,
-	AUDIO_SAMPLE_PED_YAKUZA_1_CHAT_1 = 2572,
-	AUDIO_SAMPLE_PED_YAKUZA_1_CHAT_2 = 2573,
-	AUDIO_SAMPLE_PED_YAKUZA_1_CHAT_3 = 2574,
-	AUDIO_SAMPLE_PED_YAKUZA_1_CHAT_4 = 2575,
-	AUDIO_SAMPLE_PED_YAKUZA_1_CHAT_5 = 2576,
-	AUDIO_SAMPLE_PED_YAKUZA_1_EVADE_1 = 2577,
-	AUDIO_SAMPLE_PED_YAKUZA_1_EVADE_2 = 2578,
-	AUDIO_SAMPLE_PED_YAKUZA_1_EVADE_3 = 2579,
-	AUDIO_SAMPLE_PED_YAKUZA_1_EVADE_4 = 2580,
-	AUDIO_SAMPLE_PED_YAKUZA_1_ATTACK_1 = 2581,
-	AUDIO_SAMPLE_PED_YAKUZA_1_ATTACK_2 = 2582,
-	AUDIO_SAMPLE_PED_YAKUZA_1_ATTACK_3 = 2583,
-	AUDIO_SAMPLE_PED_YAKUZA_1_ATTACK_4 = 2584,
-	AUDIO_SAMPLE_PED_YAKUZA_1_ATTACK_5 = 2585,
-	AUDIO_SAMPLE_PED_YAKUZA_1_CAR_JACKED_1 = 2586,
-	AUDIO_SAMPLE_PED_YAKUZA_1_CAR_JACKED_2 = 2587,
-	AUDIO_SAMPLE_PED_YAKUZA_1_CAR_JACKING_1 = 2588,
-	AUDIO_SAMPLE_PED_YAKUZA_1_CAR_JACKING_2 = 2589,
-	AUDIO_SAMPLE_PED_YAKUZA_2_CAR_COLLISION_1 = 2590,
-	AUDIO_SAMPLE_PED_YAKUZA_2_CAR_COLLISION_2 = 2591,
-	AUDIO_SAMPLE_PED_YAKUZA_2_CAR_COLLISION_3 = 2592,
-	AUDIO_SAMPLE_PED_YAKUZA_2_CAR_COLLISION_4 = 2593,
-	AUDIO_SAMPLE_PED_YAKUZA_2_CAR_COLLISION_5 = 2594,
-	AUDIO_SAMPLE_PED_YAKUZA_2_CAR_COLLISION_6 = 2595,
-	AUDIO_SAMPLE_PED_YAKUZA_2_CHAT_1 = 2596,
-	AUDIO_SAMPLE_PED_YAKUZA_2_CHAT_2 = 2597,
-	AUDIO_SAMPLE_PED_YAKUZA_2_CHAT_3 = 2598,
-	AUDIO_SAMPLE_PED_YAKUZA_2_CHAT_4 = 2599,
-	AUDIO_SAMPLE_PED_YAKUZA_2_CHAT_5 = 2600,
-	AUDIO_SAMPLE_PED_YAKUZA_2_EVADE_1 = 2601,
-	AUDIO_SAMPLE_PED_YAKUZA_2_EVADE_2 = 2602,
-	AUDIO_SAMPLE_PED_YAKUZA_2_EVADE_3 = 2603,
-	AUDIO_SAMPLE_PED_YAKUZA_2_EVADE_4 = 2604,
-	AUDIO_SAMPLE_PED_YAKUZA_2_ATTACK_1 = 2605,
-	AUDIO_SAMPLE_PED_YAKUZA_2_ATTACK_2 = 2606,
-	AUDIO_SAMPLE_PED_YAKUZA_2_ATTACK_3 = 2607,
-	AUDIO_SAMPLE_PED_YAKUZA_2_ATTACK_4 = 2608,
-	AUDIO_SAMPLE_PED_YAKUZA_2_ATTACK_5 = 2609,
-	AUDIO_SAMPLE_PED_YAKUZA_2_CAR_JACKED_1 = 2610,
-	AUDIO_SAMPLE_PED_YAKUZA_2_CAR_JACKED_2 = 2611,
-	AUDIO_SAMPLE_PED_YAKUZA_2_CAR_JACKING_1 = 2612,
-	AUDIO_SAMPLE_PED_YAKUZA_2_CAR_JACKING_2 = 2613,
-	AUDIO_SAMPLE_PED_WHITE_CONSTRUCTION_WORKER_CAR_COLLISION_1 = 2614,
-	AUDIO_SAMPLE_PED_WHITE_CONSTRUCTION_WORKER_CAR_COLLISION_2 = 2615,
-	AUDIO_SAMPLE_PED_WHITE_CONSTRUCTION_WORKER_CAR_COLLISION_3 = 2616,
-	AUDIO_SAMPLE_PED_WHITE_CONSTRUCTION_WORKER_CAR_COLLISION_4 = 2617,
-	AUDIO_SAMPLE_PED_WHITE_CONSTRUCTION_WORKER_CHAT_1 = 2618,
-	AUDIO_SAMPLE_PED_WHITE_CONSTRUCTION_WORKER_CHAT_2 = 2619,
-	AUDIO_SAMPLE_PED_WHITE_CONSTRUCTION_WORKER_CHAT_3 = 2620,
-	AUDIO_SAMPLE_PED_WHITE_CONSTRUCTION_WORKER_CHAT_4 = 2621,
-	AUDIO_SAMPLE_PED_WHITE_CONSTRUCTION_WORKER_CHAT_5 = 2622,
-	AUDIO_SAMPLE_PED_WHITE_CONSTRUCTION_WORKER_CHAT_6 = 2623,
-	AUDIO_SAMPLE_PED_WHITE_CONSTRUCTION_WORKER_CHAT_7 = 2624,
-	AUDIO_SAMPLE_PED_WHITE_CONSTRUCTION_WORKER_EVADE_1 = 2625,
-	AUDIO_SAMPLE_PED_WHITE_CONSTRUCTION_WORKER_EVADE_2 = 2626,
-	AUDIO_SAMPLE_PED_WHITE_CONSTRUCTION_WORKER_EVADE_3 = 2627,
-	AUDIO_SAMPLE_PED_WHITE_CONSTRUCTION_WORKER_EVADE_4 = 2628,
-	AUDIO_SAMPLE_PED_WHITE_CONSTRUCTION_WORKER_EVADE_5 = 2629,
-	AUDIO_SAMPLE_PED_WHITE_CONSTRUCTION_WORKER_CHAT_SEXY_1 = 2630,
-	AUDIO_SAMPLE_PED_WHITE_CONSTRUCTION_WORKER_CHAT_SEXY_2 = 2631,
-	AUDIO_SAMPLE_PED_WHITE_CONSTRUCTION_WORKER_CHAT_SEXY_3 = 2632,
-	AUDIO_SAMPLE_PED_WHITE_CONSTRUCTION_WORKER_ATTACK_1 = 2633,
-	AUDIO_SAMPLE_PED_WHITE_CONSTRUCTION_WORKER_ATTACK_2 = 2634,
-	AUDIO_SAMPLE_PED_WHITE_CONSTRUCTION_WORKER_ATTACK_3 = 2635,
-	AUDIO_SAMPLE_PED_WHITE_CONSTRUCTION_WORKER_ATTACK_4 = 2636,
-	AUDIO_SAMPLE_PED_WHITE_CONSTRUCTION_WORKER_ATTACK_5 = 2637,
-	AUDIO_SAMPLE_PED_WHITE_CONSTRUCTION_WORKER_HANDS_COWER_1 = 2638,
-	AUDIO_SAMPLE_PED_WHITE_CONSTRUCTION_WORKER_HANDS_COWER_2 = 2639,
-	AUDIO_SAMPLE_PED_WHITE_CONSTRUCTION_WORKER_HANDS_COWER_3 = 2640,
-	AUDIO_SAMPLE_PED_WHITE_CONSTRUCTION_WORKER_CAR_JACKED_1 = 2641,
-	AUDIO_SAMPLE_PED_TAXI_DRIVER_1_CAR_COLLISION_1 = 2642,
-	AUDIO_SAMPLE_PED_TAXI_DRIVER_1_CAR_COLLISION_2 = 2643,
-	AUDIO_SAMPLE_PED_TAXI_DRIVER_1_CAR_COLLISION_3 = 2644,
-	AUDIO_SAMPLE_PED_TAXI_DRIVER_1_CAR_COLLISION_4 = 2645,
-	AUDIO_SAMPLE_PED_TAXI_DRIVER_1_CAR_COLLISION_5 = 2646,
-	AUDIO_SAMPLE_PED_TAXI_DRIVER_1_CAR_COLLISION_6 = 2647,
-	AUDIO_SAMPLE_PED_TAXI_DRIVER_1_CAR_JACKED_1 = 2648,
-	AUDIO_SAMPLE_PED_TAXI_DRIVER_1_CAR_JACKED_2 = 2649,
-	AUDIO_SAMPLE_PED_TAXI_DRIVER_1_CAR_JACKED_3 = 2650,
-	AUDIO_SAMPLE_PED_TAXI_DRIVER_1_CAR_JACKED_4 = 2651,
-	AUDIO_SAMPLE_PED_TAXI_DRIVER_1_CAR_JACKED_5 = 2652,
-	AUDIO_SAMPLE_PED_TAXI_DRIVER_1_CAR_JACKED_6 = 2653,
-	AUDIO_SAMPLE_PED_TAXI_DRIVER_1_CAR_JACKED_7 = 2654,
-	AUDIO_SAMPLE_PED_TAXI_DRIVER_2_CAR_COLLISION_1 = 2655,
-	AUDIO_SAMPLE_PED_TAXI_DRIVER_2_CAR_COLLISION_2 = 2656,
-	AUDIO_SAMPLE_PED_TAXI_DRIVER_2_CAR_COLLISION_3 = 2657,
-	AUDIO_SAMPLE_PED_TAXI_DRIVER_2_CAR_COLLISION_4 = 2658,
-	AUDIO_SAMPLE_PED_TAXI_DRIVER_2_CAR_COLLISION_5 = 2659,
-	AUDIO_SAMPLE_PED_TAXI_DRIVER_2_CAR_COLLISION_6 = 2660,
-	AUDIO_SAMPLE_PED_TAXI_DRIVER_2_CAR_JACKED_1 = 2661,
-	AUDIO_SAMPLE_PED_TAXI_DRIVER_2_CAR_JACKED_2 = 2662,
-	AUDIO_SAMPLE_PED_TAXI_DRIVER_2_CAR_JACKED_3 = 2663,
-	AUDIO_SAMPLE_PED_TAXI_DRIVER_2_CAR_JACKED_4 = 2664,
-	AUDIO_SAMPLE_PED_TAXI_DRIVER_2_CAR_JACKED_5 = 2665,
-	AUDIO_SAMPLE_PED_TAXI_DRIVER_2_CAR_JACKED_6 = 2666,
-	AUDIO_SAMPLE_PED_TAXI_DRIVER_2_CAR_JACKED_7 = 2667,
-	AUDIO_SAMPLE_PED_SECURITY_GUARD_CAR_EVENT_1 = 2668,
-	AUDIO_SAMPLE_PED_SECURITY_GUARD_CAR_EVENT_2 = 2669,
-	AUDIO_SAMPLE_PED_SECURITY_GUARD_CAR_EVENT_3 = 2670,
-	AUDIO_SAMPLE_PED_SECURITY_GUARD_CAR_EVENT_4 = 2671,
-	AUDIO_SAMPLE_PED_SECURITY_GUARD_CAR_EVENT_5 = 2672,
-	AUDIO_SAMPLE_PED_SECURITY_GUARD_CAR_EVENT_6 = 2673,
-	AUDIO_SAMPLE_PED_SECURITY_GUARD_ATTACK_1 = 2674,
-	AUDIO_SAMPLE_PED_SECURITY_GUARD_ATTACK_2 = 2675,
-	AUDIO_SAMPLE_PED_SECURITY_GUARD_HANDS_UP_1 = 2676,
-	AUDIO_SAMPLE_PED_SECURITY_GUARD_HANDS_UP_2 = 2677,
-	AUDIO_SAMPLE_PED_SECURITY_GUARD_HANDS_COWER_1 = 2678,
-	AUDIO_SAMPLE_PED_SECURITY_GUARD_FLEE_RUN_1 = 2679,
-	AUDIO_SAMPLE_PED_BLACK_FEMALE_PROSTITUTE_1_CHAT_1 = 2680,
-	AUDIO_SAMPLE_PED_BLACK_FEMALE_PROSTITUTE_1_CHAT_2 = 2681,
-	AUDIO_SAMPLE_PED_BLACK_FEMALE_PROSTITUTE_1_CHAT_3 = 2682,
-	AUDIO_SAMPLE_PED_BLACK_FEMALE_PROSTITUTE_1_CHAT_4 = 2683,
-	AUDIO_SAMPLE_PED_BLACK_FEMALE_PROSTITUTE_1_EVADE_1 = 2684,
-	AUDIO_SAMPLE_PED_BLACK_FEMALE_PROSTITUTE_1_EVADE_2 = 2685,
-	AUDIO_SAMPLE_PED_BLACK_FEMALE_PROSTITUTE_1_EVADE_3 = 2686,
-	AUDIO_SAMPLE_PED_BLACK_FEMALE_PROSTITUTE_1_ROBBED_1 = 2687,
-	AUDIO_SAMPLE_PED_BLACK_FEMALE_PROSTITUTE_1_CAR_COLLISION_1 = 2688,
-	AUDIO_SAMPLE_PED_BLACK_FEMALE_PROSTITUTE_1_CAR_COLLISION_2 = 2689,
-	AUDIO_SAMPLE_PED_BLACK_FEMALE_PROSTITUTE_1_CAR_COLLISION_3 = 2690,
-	AUDIO_SAMPLE_PED_BLACK_FEMALE_PROSTITUTE_1_CAR_COLLISION_4 = 2691,
-	AUDIO_SAMPLE_PED_BLACK_FEMALE_PROSTITUTE_1_ATTACK_1 = 2692,
-	AUDIO_SAMPLE_PED_BLACK_FEMALE_PROSTITUTE_1_ATTACK_2 = 2693,
-	AUDIO_SAMPLE_PED_BLACK_FEMALE_PROSTITUTE_1_ATTACK_3 = 2694,
-	AUDIO_SAMPLE_PED_BLACK_FEMALE_PROSTITUTE_1_ATTACK_4 = 2695,
-	AUDIO_SAMPLE_PED_BLACK_FEMALE_PROSTITUTE_1_SOLICIT_1 = 2696,
-	AUDIO_SAMPLE_PED_BLACK_FEMALE_PROSTITUTE_1_SOLICIT_2 = 2697,
-	AUDIO_SAMPLE_PED_BLACK_FEMALE_PROSTITUTE_1_SOLICIT_3 = 2698,
-	AUDIO_SAMPLE_PED_BLACK_FEMALE_PROSTITUTE_1_SOLICIT_4 = 2699,
-	AUDIO_SAMPLE_PED_BLACK_FEMALE_PROSTITUTE_1_SOLICIT_5 = 2700,
-	AUDIO_SAMPLE_PED_BLACK_FEMALE_PROSTITUTE_1_SOLICIT_6 = 2701,
-	AUDIO_SAMPLE_PED_BLACK_FEMALE_PROSTITUTE_1_SOLICIT_7 = 2702,
-	AUDIO_SAMPLE_PED_BLACK_FEMALE_PROSTITUTE_1_SOLICIT_8 = 2703,
-	AUDIO_SAMPLE_PED_BLACK_FEMALE_PROSTITUTE_1_HANDS_UP_1 = 2704,
-	AUDIO_SAMPLE_PED_BLACK_FEMALE_PROSTITUTE_1_HANDS_UP_2 = 2705,
-	AUDIO_SAMPLE_PED_BLACK_FEMALE_PROSTITUTE_1_HANDS_UP_3 = 2706,
-	AUDIO_SAMPLE_PED_BLACK_FEMALE_PROSTITUTE_1_HANDS_UP_4 = 2707,
-	AUDIO_SAMPLE_PED_BLACK_FEMALE_PROSTITUTE_2_CHAT_1 = 2708,
-	AUDIO_SAMPLE_PED_BLACK_FEMALE_PROSTITUTE_2_CHAT_2 = 2709,
-	AUDIO_SAMPLE_PED_BLACK_FEMALE_PROSTITUTE_2_CHAT_3 = 2710,
-	AUDIO_SAMPLE_PED_BLACK_FEMALE_PROSTITUTE_2_CHAT_4 = 2711,
-	AUDIO_SAMPLE_PED_BLACK_FEMALE_PROSTITUTE_2_EVADE_1 = 2712,
-	AUDIO_SAMPLE_PED_BLACK_FEMALE_PROSTITUTE_2_EVADE_2 = 2713,
-	AUDIO_SAMPLE_PED_BLACK_FEMALE_PROSTITUTE_2_EVADE_3 = 2714,
-	AUDIO_SAMPLE_PED_BLACK_FEMALE_PROSTITUTE_2_ROBBED_1 = 2715,
-	AUDIO_SAMPLE_PED_BLACK_FEMALE_PROSTITUTE_2_CAR_COLLISION_1 = 2716,
-	AUDIO_SAMPLE_PED_BLACK_FEMALE_PROSTITUTE_2_CAR_COLLISION_2 = 2717,
-	AUDIO_SAMPLE_PED_BLACK_FEMALE_PROSTITUTE_2_CAR_COLLISION_3 = 2718,
-	AUDIO_SAMPLE_PED_BLACK_FEMALE_PROSTITUTE_2_CAR_COLLISION_4 = 2719,
-	AUDIO_SAMPLE_PED_BLACK_FEMALE_PROSTITUTE_2_ATTACK_1 = 2720,
-	AUDIO_SAMPLE_PED_BLACK_FEMALE_PROSTITUTE_2_ATTACK_2 = 2721,
-	AUDIO_SAMPLE_PED_BLACK_FEMALE_PROSTITUTE_2_ATTACK_3 = 2722,
-	AUDIO_SAMPLE_PED_BLACK_FEMALE_PROSTITUTE_2_ATTACK_4 = 2723,
-	AUDIO_SAMPLE_PED_BLACK_FEMALE_PROSTITUTE_2_SOLICIT_1 = 2724,
-	AUDIO_SAMPLE_PED_BLACK_FEMALE_PROSTITUTE_2_SOLICIT_2 = 2725,
-	AUDIO_SAMPLE_PED_BLACK_FEMALE_PROSTITUTE_2_SOLICIT_3 = 2726,
-	AUDIO_SAMPLE_PED_BLACK_FEMALE_PROSTITUTE_2_SOLICIT_4 = 2727,
-	AUDIO_SAMPLE_PED_BLACK_FEMALE_PROSTITUTE_2_SOLICIT_5 = 2728,
-	AUDIO_SAMPLE_PED_BLACK_FEMALE_PROSTITUTE_2_SOLICIT_6 = 2729,
-	AUDIO_SAMPLE_PED_BLACK_FEMALE_PROSTITUTE_2_SOLICIT_7 = 2730,
-	AUDIO_SAMPLE_PED_BLACK_FEMALE_PROSTITUTE_2_SOLICIT_8 = 2731,
-	AUDIO_SAMPLE_PED_BLACK_FEMALE_PROSTITUTE_2_HANDS_UP_1 = 2732,
-	AUDIO_SAMPLE_PED_BLACK_FEMALE_PROSTITUTE_2_HANDS_UP_2 = 2733,
-	AUDIO_SAMPLE_PED_BLACK_FEMALE_PROSTITUTE_2_HANDS_UP_3 = 2734,
-	AUDIO_SAMPLE_PED_BLACK_FEMALE_PROSTITUTE_2_HANDS_UP_4 = 2735,
-	AUDIO_SAMPLE_PED_WHITE_FEMALE_PROSTITUTE_1_CHAT_1 = 2736,
-	AUDIO_SAMPLE_PED_WHITE_FEMALE_PROSTITUTE_1_CHAT_2 = 2737,
-	AUDIO_SAMPLE_PED_WHITE_FEMALE_PROSTITUTE_1_CHAT_3 = 2738,
-	AUDIO_SAMPLE_PED_WHITE_FEMALE_PROSTITUTE_1_CHAT_4 = 2739,
-	AUDIO_SAMPLE_PED_WHITE_FEMALE_PROSTITUTE_1_EVADE_1 = 2740,
-	AUDIO_SAMPLE_PED_WHITE_FEMALE_PROSTITUTE_1_EVADE_2 = 2741,
-	AUDIO_SAMPLE_PED_WHITE_FEMALE_PROSTITUTE_1_EVADE_3 = 2742,
-	AUDIO_SAMPLE_PED_WHITE_FEMALE_PROSTITUTE_1_ROBBED_1 = 2743,
-	AUDIO_SAMPLE_PED_WHITE_FEMALE_PROSTITUTE_1_ROBBED_2 = 2744,
-	AUDIO_SAMPLE_PED_WHITE_FEMALE_PROSTITUTE_1_CAR_COLLISION_1 = 2745,
-	AUDIO_SAMPLE_PED_WHITE_FEMALE_PROSTITUTE_1_CAR_COLLISION_2 = 2746,
-	AUDIO_SAMPLE_PED_WHITE_FEMALE_PROSTITUTE_1_CAR_COLLISION_3 = 2747,
-	AUDIO_SAMPLE_PED_WHITE_FEMALE_PROSTITUTE_1_CAR_COLLISION_4 = 2748,
-	AUDIO_SAMPLE_PED_WHITE_FEMALE_PROSTITUTE_1_ATTACK_1 = 2749,
-	AUDIO_SAMPLE_PED_WHITE_FEMALE_PROSTITUTE_1_ATTACK_2 = 2750,
-	AUDIO_SAMPLE_PED_WHITE_FEMALE_PROSTITUTE_1_ATTACK_3 = 2751,
-	AUDIO_SAMPLE_PED_WHITE_FEMALE_PROSTITUTE_1_ATTACK_4 = 2752,
-	AUDIO_SAMPLE_PED_WHITE_FEMALE_PROSTITUTE_1_SOLICIT_1 = 2753,
-	AUDIO_SAMPLE_PED_WHITE_FEMALE_PROSTITUTE_1_SOLICIT_2 = 2754,
-	AUDIO_SAMPLE_PED_WHITE_FEMALE_PROSTITUTE_1_SOLICIT_3 = 2755,
-	AUDIO_SAMPLE_PED_WHITE_FEMALE_PROSTITUTE_1_SOLICIT_4 = 2756,
-	AUDIO_SAMPLE_PED_WHITE_FEMALE_PROSTITUTE_1_SOLICIT_5 = 2757,
-	AUDIO_SAMPLE_PED_WHITE_FEMALE_PROSTITUTE_1_SOLICIT_6 = 2758,
-	AUDIO_SAMPLE_PED_WHITE_FEMALE_PROSTITUTE_1_SOLICIT_7 = 2759,
-	AUDIO_SAMPLE_PED_WHITE_FEMALE_PROSTITUTE_1_SOLICIT_8 = 2760,
-	AUDIO_SAMPLE_PED_WHITE_FEMALE_PROSTITUTE_2_CHAT_1 = 2761,
-	AUDIO_SAMPLE_PED_WHITE_FEMALE_PROSTITUTE_2_CHAT_2 = 2762,
-	AUDIO_SAMPLE_PED_WHITE_FEMALE_PROSTITUTE_2_CHAT_3 = 2763,
-	AUDIO_SAMPLE_PED_WHITE_FEMALE_PROSTITUTE_2_CHAT_4 = 2764,
-	AUDIO_SAMPLE_PED_WHITE_FEMALE_PROSTITUTE_2_EVADE_1 = 2765,
-	AUDIO_SAMPLE_PED_WHITE_FEMALE_PROSTITUTE_2_EVADE_2 = 2766,
-	AUDIO_SAMPLE_PED_WHITE_FEMALE_PROSTITUTE_2_EVADE_3 = 2767,
-	AUDIO_SAMPLE_PED_WHITE_FEMALE_PROSTITUTE_2_ROBBED_1 = 2768,
-	AUDIO_SAMPLE_PED_WHITE_FEMALE_PROSTITUTE_2_ROBBED_2 = 2769,
-	AUDIO_SAMPLE_PED_WHITE_FEMALE_PROSTITUTE_2_CAR_COLLISION_1 = 2770,
-	AUDIO_SAMPLE_PED_WHITE_FEMALE_PROSTITUTE_2_CAR_COLLISION_2 = 2771,
-	AUDIO_SAMPLE_PED_WHITE_FEMALE_PROSTITUTE_2_CAR_COLLISION_3 = 2772,
-	AUDIO_SAMPLE_PED_WHITE_FEMALE_PROSTITUTE_2_CAR_COLLISION_4 = 2773,
-	AUDIO_SAMPLE_PED_WHITE_FEMALE_PROSTITUTE_2_ATTACK_1 = 2774,
-	AUDIO_SAMPLE_PED_WHITE_FEMALE_PROSTITUTE_2_ATTACK_2 = 2775,
-	AUDIO_SAMPLE_PED_WHITE_FEMALE_PROSTITUTE_2_ATTACK_3 = 2776,
-	AUDIO_SAMPLE_PED_WHITE_FEMALE_PROSTITUTE_2_ATTACK_4 = 2777,
-	AUDIO_SAMPLE_PED_WHITE_FEMALE_PROSTITUTE_2_SOLICIT_1 = 2778,
-	AUDIO_SAMPLE_PED_WHITE_FEMALE_PROSTITUTE_2_SOLICIT_2 = 2779,
-	AUDIO_SAMPLE_PED_WHITE_FEMALE_PROSTITUTE_2_SOLICIT_3 = 2780,
-	AUDIO_SAMPLE_PED_WHITE_FEMALE_PROSTITUTE_2_SOLICIT_4 = 2781,
-	AUDIO_SAMPLE_PED_WHITE_FEMALE_PROSTITUTE_2_SOLICIT_5 = 2782,
-	AUDIO_SAMPLE_PED_WHITE_FEMALE_PROSTITUTE_2_SOLICIT_6 = 2783,
-	AUDIO_SAMPLE_PED_WHITE_FEMALE_PROSTITUTE_2_SOLICIT_7 = 2784,
-	AUDIO_SAMPLE_PED_WHITE_FEMALE_PROSTITUTE_2_SOLICIT_8 = 2785,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_YOUNG_CHAT_1 = 2786,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_YOUNG_CHAT_2 = 2787,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_YOUNG_CHAT_3 = 2788,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_YOUNG_CHAT_4 = 2789,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_YOUNG_CHAT_5 = 2790,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_YOUNG_CHAT_6 = 2791,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_YOUNG_EVADE_1 = 2792,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_YOUNG_EVADE_2 = 2793,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_YOUNG_EVADE_3 = 2794,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_YOUNG_EVADE_4 = 2795,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_YOUNG_EVADE_5 = 2796,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_YOUNG_EVADE_6 = 2797,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_YOUNG_EVADE_7 = 2798,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_YOUNG_CAR_JACKED_1 = 2799,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_YOUNG_CAR_JACKED_2 = 2800,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_YOUNG_ROBBED_1 = 2801,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_YOUNG_ROBBED_2 = 2802,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_YOUNG_CAR_COLLISION_1 = 2803,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_YOUNG_CAR_COLLISION_2 = 2804,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_YOUNG_CAR_COLLISION_3 = 2805,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_YOUNG_CAR_COLLISION_4 = 2806,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_YOUNG_CAR_COLLISION_5 = 2807,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_YOUNG_CAR_COLLISION_6 = 2808,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_YOUNG_CHAT_EVENT_1 = 2809,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_YOUNG_CHAT_EVENT_2 = 2810,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_YOUNG_CHAT_EVENT_3 = 2811,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_YOUNG_CHAT_EVENT_4 = 2812,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_OLD_CHAT_1 = 2813,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_OLD_CHAT_2 = 2814,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_OLD_CHAT_3 = 2815,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_OLD_CHAT_4 = 2816,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_OLD_CHAT_5 = 2817,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_OLD_CHAT_6 = 2818,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_OLD_CHAT_7 = 2819,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_OLD_EVADE_1 = 2820,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_OLD_EVADE_2 = 2821,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_OLD_EVADE_3 = 2822,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_OLD_EVADE_4 = 2823,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_OLD_EVADE_5 = 2824,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_OLD_EVADE_6 = 2825,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_OLD_CAR_JACKED_1 = 2826,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_OLD_CAR_JACKED_2 = 2827,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_OLD_ROBBED_1 = 2828,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_OLD_ROBBED_2 = 2829,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_OLD_CAR_COLLISION_1 = 2830,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_OLD_CAR_COLLISION_2 = 2831,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_OLD_CAR_COLLISION_3 = 2832,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_OLD_CAR_COLLISION_4 = 2833,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_OLD_CAR_COLLISION_5 = 2834,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_OLD_CAR_COLLISION_6 = 2835,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_OLD_CAR_COLLISION_7 = 2836,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_OLD_CHAT_EVENT_1 = 2837,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_OLD_CHAT_EVENT_2 = 2838,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_OLD_CHAT_EVENT_3 = 2839,
-	AUDIO_SAMPLE_PED_LITTLE_ITALY_FEMALE_OLD_CHAT_EVENT_4 = 2840,
-	AUDIO_SAMPLE_PED_MALE_DEATH_1 = 2841,
-	AUDIO_SAMPLE_PED_MALE_DEATH_2 = 2842,
-	AUDIO_SAMPLE_PED_MALE_DEATH_3 = 2843,
-	AUDIO_SAMPLE_PED_MALE_DEATH_4 = 2844,
-	AUDIO_SAMPLE_PED_MALE_DEATH_5 = 2845,
-	AUDIO_SAMPLE_PED_MALE_DEATH_6 = 2846,
-	AUDIO_SAMPLE_PED_MALE_DEATH_7 = 2847,
-	AUDIO_SAMPLE_PED_MALE_DEATH_8 = 2848,
-	AUDIO_SAMPLE_PED_MALE_BURNING_1 = 2849,
-	AUDIO_SAMPLE_PED_MALE_BURNING_2 = 2850,
-	AUDIO_SAMPLE_PED_MALE_BURNING_3 = 2851,
-	AUDIO_SAMPLE_PED_MALE_BURNING_4 = 2852,
-	AUDIO_SAMPLE_PED_MALE_BURNING_5 = 2853,
-	AUDIO_SAMPLE_PED_MALE_BURNING_6 = 2854,
-	AUDIO_SAMPLE_PED_MALE_BURNING_7 = 2855,
-	AUDIO_SAMPLE_PED_MALE_BURNING_8 = 2856,
-	AUDIO_SAMPLE_INJURED_PED_MALE_OUCH_1 = 2857,
-	AUDIO_SAMPLE_INJURED_PED_MALE_OUCH_2 = 2858,
-	AUDIO_SAMPLE_INJURED_PED_MALE_OUCH_3 = 2859,
-	AUDIO_SAMPLE_INJURED_PED_MALE_OUCH_4 = 2860,
-	AUDIO_SAMPLE_INJURED_PED_MALE_OUCH_5 = 2861,
-	AUDIO_SAMPLE_INJURED_PED_MALE_OUCH_6 = 2862,
-	AUDIO_SAMPLE_INJURED_PED_MALE_OUCH_7 = 2863,
-	AUDIO_SAMPLE_INJURED_PED_MALE_OUCH_8 = 2864,
-	AUDIO_SAMPLE_INJURED_PED_MALE_OUCH_9 = 2865,
-	AUDIO_SAMPLE_INJURED_PED_MALE_OUCH_10 = 2866,
-	AUDIO_SAMPLE_INJURED_PED_MALE_OUCH_11 = 2867,
-	AUDIO_SAMPLE_INJURED_PED_MALE_OUCH_12 = 2868,
-	AUDIO_SAMPLE_INJURED_PED_MALE_OUCH_13 = 2869,
-	AUDIO_SAMPLE_INJURED_PED_MALE_OUCH_14 = 2870,
-	AUDIO_SAMPLE_INJURED_PED_MALE_OUCH_15 = 2871,
-	AUDIO_SAMPLE_PED_MALE_FLEE_SPRINT_1 = 2872,
-	AUDIO_SAMPLE_PED_MALE_FLEE_SPRINT_2 = 2873,
-	AUDIO_SAMPLE_PED_MALE_FLEE_SPRINT_3 = 2874,
-	AUDIO_SAMPLE_PED_MALE_FLEE_SPRINT_4 = 2875,
-	AUDIO_SAMPLE_PED_MALE_FLEE_SPRINT_5 = 2876,
-	AUDIO_SAMPLE_PED_MALE_FLEE_SPRINT_6 = 2877,
-	AUDIO_SAMPLE_PED_WHITE_FAT_MALE_1_CHAT_1 = 2878,
-	AUDIO_SAMPLE_PED_WHITE_FAT_MALE_1_CHAT_2 = 2879,
-	AUDIO_SAMPLE_PED_WHITE_FAT_MALE_1_CHAT_3 = 2880,
-	AUDIO_SAMPLE_PED_WHITE_FAT_MALE_1_CHAT_4 = 2881,
-	AUDIO_SAMPLE_PED_WHITE_FAT_MALE_1_CHAT_5 = 2882,
-	AUDIO_SAMPLE_PED_WHITE_FAT_MALE_1_CHAT_6 = 2883,
-	AUDIO_SAMPLE_PED_WHITE_FAT_MALE_1_CHAT_7 = 2884,
-	AUDIO_SAMPLE_PED_WHITE_FAT_MALE_1_CHAT_8 = 2885,
-	AUDIO_SAMPLE_PED_WHITE_FAT_MALE_1_CHAT_9 = 2886,
-	AUDIO_SAMPLE_PED_WHITE_FAT_MALE_1_EVADE_1 = 2887,
-	AUDIO_SAMPLE_PED_WHITE_FAT_MALE_1_EVADE_2 = 2888,
-	AUDIO_SAMPLE_PED_WHITE_FAT_MALE_1_EVADE_3 = 2889,
-	AUDIO_SAMPLE_PED_WHITE_FAT_MALE_1_EVADE_4 = 2890,
-	AUDIO_SAMPLE_PED_WHITE_FAT_MALE_1_EVADE_5 = 2891,
-	AUDIO_SAMPLE_PED_WHITE_FAT_MALE_1_EVADE_6 = 2892,
-	AUDIO_SAMPLE_PED_WHITE_FAT_MALE_1_EVADE_7 = 2893,
-	AUDIO_SAMPLE_PED_WHITE_FAT_MALE_1_EVADE_8 = 2894,
-	AUDIO_SAMPLE_PED_WHITE_FAT_MALE_1_EVADE_9 = 2895,
-	AUDIO_SAMPLE_PED_WHITE_FAT_MALE_1_CAR_JACKED_1 = 2896,
-	AUDIO_SAMPLE_PED_WHITE_FAT_MALE_1_CAR_JACKED_2 = 2897,
-	AUDIO_SAMPLE_PED_WHITE_FAT_MALE_1_CAR_JACKED_3 = 2898,
-	AUDIO_SAMPLE_PED_WHITE_FAT_MALE_1_ROBBED_1 = 2899,
-	AUDIO_SAMPLE_PED_WHITE_FAT_MALE_1_ROBBED_2 = 2900,
-	AUDIO_SAMPLE_PED_WHITE_FAT_MALE_1_ROBBED_3 = 2901,
-	AUDIO_SAMPLE_PED_WHITE_FAT_MALE_1_WAIT_DOUBLEBACK_1 = 2902,
-	AUDIO_SAMPLE_PED_WHITE_FAT_MALE_1_WAIT_DOUBLEBACK_2 = 2903,
-	AUDIO_SAMPLE_PED_WHITE_FAT_MALE_1_CAR_COLLISION_1 = 2904,
-	AUDIO_SAMPLE_PED_WHITE_FAT_MALE_1_CAR_COLLISION_2 = 2905,
-	AUDIO_SAMPLE_PED_WHITE_FAT_MALE_1_CAR_COLLISION_3 = 2906,
-	AUDIO_SAMPLE_PED_WHITE_FAT_MALE_1_CAR_COLLISION_4 = 2907,
-	AUDIO_SAMPLE_PED_WHITE_FAT_MALE_1_CAR_COLLISION_5 = 2908,
-	AUDIO_SAMPLE_PED_WHITE_FAT_MALE_1_CAR_COLLISION_6 = 2909,
-	AUDIO_SAMPLE_PED_WHITE_FAT_MALE_1_CAR_COLLISION_7 = 2910,
-	AUDIO_SAMPLE_PED_WHITE_FAT_MALE_1_CAR_COLLISION_8 = 2911,
-	AUDIO_SAMPLE_PED_WHITE_FAT_MALE_1_CAR_COLLISION_9 = 2912,
-	AUDIO_SAMPLE_PED_WHITE_FAT_FEMALE_1_CHAT_1 = 2913,
-	AUDIO_SAMPLE_PED_WHITE_FAT_FEMALE_1_CHAT_2 = 2914,
-	AUDIO_SAMPLE_PED_WHITE_FAT_FEMALE_1_CHAT_3 = 2915,
-	AUDIO_SAMPLE_PED_WHITE_FAT_FEMALE_1_CHAT_4 = 2916,
-	AUDIO_SAMPLE_PED_WHITE_FAT_FEMALE_1_CHAT_5 = 2917,
-	AUDIO_SAMPLE_PED_WHITE_FAT_FEMALE_1_CHAT_6 = 2918,
-	AUDIO_SAMPLE_PED_WHITE_FAT_FEMALE_1_CHAT_7 = 2919,
-	AUDIO_SAMPLE_PED_WHITE_FAT_FEMALE_1_CHAT_8 = 2920,
-	AUDIO_SAMPLE_PED_WHITE_FAT_FEMALE_1_EVADE_1 = 2921,
-	AUDIO_SAMPLE_PED_WHITE_FAT_FEMALE_1_EVADE_2 = 2922,
-	AUDIO_SAMPLE_PED_WHITE_FAT_FEMALE_1_EVADE_3 = 2923,
-	AUDIO_SAMPLE_PED_WHITE_FAT_FEMALE_1_EVADE_4 = 2924,
-	AUDIO_SAMPLE_PED_WHITE_FAT_FEMALE_1_EVADE_5 = 2925,
-	AUDIO_SAMPLE_PED_WHITE_FAT_FEMALE_1_EVADE_6 = 2926,
-	AUDIO_SAMPLE_PED_WHITE_FAT_FEMALE_1_CAR_JACKED_1 = 2927,
-	AUDIO_SAMPLE_PED_WHITE_FAT_FEMALE_1_CAR_JACKED_2 = 2928,
-	AUDIO_SAMPLE_PED_WHITE_FAT_FEMALE_1_ROBBED_1 = 2929,
-	AUDIO_SAMPLE_PED_WHITE_FAT_FEMALE_1_ROBBED_2 = 2930,
-	AUDIO_SAMPLE_PED_WHITE_FAT_FEMALE_1_WAIT_DOUBLEBACK_1 = 2931,
-	AUDIO_SAMPLE_PED_WHITE_FAT_FEMALE_1_WAIT_DOUBLEBACK_2 = 2932,
-	AUDIO_SAMPLE_PED_WHITE_FAT_FEMALE_1_CAR_COLLISION_1 = 2933,
-	AUDIO_SAMPLE_PED_WHITE_FAT_FEMALE_1_CAR_COLLISION_2 = 2934,
-	AUDIO_SAMPLE_PED_WHITE_FAT_FEMALE_1_CAR_COLLISION_3 = 2935,
-	AUDIO_SAMPLE_PED_WHITE_FAT_FEMALE_1_CAR_COLLISION_4 = 2936,
-	AUDIO_SAMPLE_PED_WHITE_FAT_FEMALE_1_CAR_COLLISION_5 = 2937,
-	AUDIO_SAMPLE_PED_WHITE_FAT_FEMALE_1_CAR_COLLISION_6 = 2938,
-	AUDIO_SAMPLE_PED_WHITE_FAT_FEMALE_1_CAR_COLLISION_7 = 2939,
-	AUDIO_SAMPLE_PED_WHITE_FAT_FEMALE_1_CAR_COLLISION_8 = 2940,
-	AUDIO_SAMPLE_PED_WHITE_FAT_FEMALE_1_CHAT_EVENT_1 = 2941,
-	AUDIO_SAMPLE_PED_WHITE_FAT_FEMALE_1_CHAT_EVENT_2 = 2942,
-	AUDIO_SAMPLE_PED_WHITE_FAT_FEMALE_1_CHAT_EVENT_3 = 2943,
-	AUDIO_SAMPLE_PED_WHITE_FAT_FEMALE_1_CHAT_EVENT_4 = 2944,
-	AUDIO_SAMPLE_PED_WHITE_CASUAL_FEMALE_1_CHAT_1 = 2945,
-	AUDIO_SAMPLE_PED_WHITE_CASUAL_FEMALE_1_CHAT_2 = 2946,
-	AUDIO_SAMPLE_PED_WHITE_CASUAL_FEMALE_1_CHAT_3 = 2947,
-	AUDIO_SAMPLE_PED_WHITE_CASUAL_FEMALE_1_CHAT_4 = 2948,
-	AUDIO_SAMPLE_PED_WHITE_CASUAL_FEMALE_1_EVADE_1 = 2949,
-	AUDIO_SAMPLE_PED_WHITE_CASUAL_FEMALE_1_EVADE_2 = 2950,
-	AUDIO_SAMPLE_PED_WHITE_CASUAL_FEMALE_1_EVADE_3 = 2951,
-	AUDIO_SAMPLE_PED_WHITE_CASUAL_FEMALE_1_CAR_JACKED_1 = 2952,
-	AUDIO_SAMPLE_PED_WHITE_CASUAL_FEMALE_1_CAR_JACKED_2 = 2953,
-	AUDIO_SAMPLE_PED_WHITE_CASUAL_FEMALE_1_ROBBED_1 = 2954,
-	AUDIO_SAMPLE_PED_WHITE_CASUAL_FEMALE_1_CAR_COLLISION_1 = 2955,
-	AUDIO_SAMPLE_PED_WHITE_CASUAL_FEMALE_1_CAR_COLLISION_2 = 2956,
-	AUDIO_SAMPLE_PED_WHITE_CASUAL_FEMALE_1_CAR_COLLISION_3 = 2957,
-	AUDIO_SAMPLE_PED_WHITE_CASUAL_FEMALE_1_CAR_COLLISION_4 = 2958,
-	AUDIO_SAMPLE_PED_WHITE_CASUAL_FEMALE_1_CAR_COLLISION_5 = 2959,
-	AUDIO_SAMPLE_PED_WHITE_CASUAL_FEMALE_1_CAR_COLLISION_6 = 2960,
-	AUDIO_SAMPLE_PED_WHITE_CASUAL_FEMALE_1_CAR_COLLISION_7 = 2961,
-	AUDIO_SAMPLE_PED_WHITE_CASUAL_FEMALE_1_CAR_COLLISION_8 = 2962,
-	AUDIO_SAMPLE_PED_WHITE_CASUAL_FEMALE_1_CHAT_EVENT_1 = 2963,
-	AUDIO_SAMPLE_PED_WHITE_CASUAL_FEMALE_1_CHAT_EVENT_2 = 2964,
-	AUDIO_SAMPLE_PED_WHITE_CASUAL_FEMALE_1_HANDS_COWER_1 = 2965,
-	AUDIO_SAMPLE_PED_WHITE_CASUAL_FEMALE_1_HANDS_COWER_2 = 2966,
-	AUDIO_SAMPLE_PED_WHITE_CASUAL_FEMALE_1_FLEE_RUN_1 = 2967,
-	AUDIO_SAMPLE_PED_WHITE_CASUAL_FEMALE_1_FLEE_RUN_2 = 2968,
-	AUDIO_SAMPLE_PED_DIABLO_1_CHAT_1 = 2969,
-	AUDIO_SAMPLE_PED_DIABLO_1_CHAT_2 = 2970,
-	AUDIO_SAMPLE_PED_DIABLO_1_CHAT_3 = 2971,
-	AUDIO_SAMPLE_PED_DIABLO_1_CHAT_4 = 2972,
-	AUDIO_SAMPLE_PED_DIABLO_1_CHAT_5 = 2973,
-	AUDIO_SAMPLE_PED_DIABLO_1_EVADE_1 = 2974,
-	AUDIO_SAMPLE_PED_DIABLO_1_EVADE_2 = 2975,
-	AUDIO_SAMPLE_PED_DIABLO_1_EVADE_3 = 2976,
-	AUDIO_SAMPLE_PED_DIABLO_1_EVADE_4 = 2977,
-	AUDIO_SAMPLE_PED_DIABLO_1_CAR_JACKED_1 = 2978,
-	AUDIO_SAMPLE_PED_DIABLO_1_CAR_JACKED_2 = 2979,
-	AUDIO_SAMPLE_PED_DIABLO_1_CAR_JACKING_1 = 2980,
-	AUDIO_SAMPLE_PED_DIABLO_1_CAR_JACKING_2 = 2981,
-	AUDIO_SAMPLE_PED_DIABLO_1_ATTACK_1 = 2982,
-	AUDIO_SAMPLE_PED_DIABLO_1_ATTACK_2 = 2983,
-	AUDIO_SAMPLE_PED_DIABLO_1_ATTACK_3 = 2984,
-	AUDIO_SAMPLE_PED_DIABLO_1_ATTACK_4 = 2985,
-	AUDIO_SAMPLE_PED_DIABLO_1_CHAT_SEXY_1 = 2986,
-	AUDIO_SAMPLE_PED_DIABLO_1_CHAT_SEXY_2 = 2987,
-	AUDIO_SAMPLE_PED_DIABLO_1_CHAT_SEXY_3 = 2988,
-	AUDIO_SAMPLE_PED_DIABLO_1_CHAT_SEXY_4 = 2989,
-	AUDIO_SAMPLE_PED_DIABLO_1_HANDS_UP_1 = 2990,
-	AUDIO_SAMPLE_PED_DIABLO_1_HANDS_UP_2 = 2991,
-	AUDIO_SAMPLE_PED_DIABLO_1_HANDS_UP_3 = 2992,
-	AUDIO_SAMPLE_PED_DIABLO_1_HANDS_UP_4 = 2993,
-	AUDIO_SAMPLE_PED_DIABLO_1_CAR_COLLISION_1 = 2994,
-	AUDIO_SAMPLE_PED_DIABLO_1_CAR_COLLISION_2 = 2995,
-	AUDIO_SAMPLE_PED_DIABLO_1_CAR_COLLISION_3 = 2996,
-	AUDIO_SAMPLE_PED_DIABLO_1_CAR_COLLISION_4 = 2997,
-	AUDIO_SAMPLE_PED_DIABLO_1_CAR_COLLISION_5 = 2998,
-	AUDIO_SAMPLE_PED_DIABLO_2_CHAT_1 = 2999,
-	AUDIO_SAMPLE_PED_DIABLO_2_CHAT_2 = 3000,
-	AUDIO_SAMPLE_PED_DIABLO_2_CHAT_3 = 3001,
-	AUDIO_SAMPLE_PED_DIABLO_2_CHAT_4 = 3002,
-	AUDIO_SAMPLE_PED_DIABLO_2_CHAT_5 = 3003,
-	AUDIO_SAMPLE_PED_DIABLO_2_EVADE_1 = 3004,
-	AUDIO_SAMPLE_PED_DIABLO_2_EVADE_2 = 3005,
-	AUDIO_SAMPLE_PED_DIABLO_2_EVADE_3 = 3006,
-	AUDIO_SAMPLE_PED_DIABLO_2_EVADE_4 = 3007,
-	AUDIO_SAMPLE_PED_DIABLO_2_CAR_JACKED_1 = 3008,
-	AUDIO_SAMPLE_PED_DIABLO_2_CAR_JACKED_2 = 3009,
-	AUDIO_SAMPLE_PED_DIABLO_2_CAR_JACKING_1 = 3010,
-	AUDIO_SAMPLE_PED_DIABLO_2_CAR_JACKING_2 = 3011,
-	AUDIO_SAMPLE_PED_DIABLO_2_ATTACK_1 = 3012,
-	AUDIO_SAMPLE_PED_DIABLO_2_ATTACK_2 = 3013,
-	AUDIO_SAMPLE_PED_DIABLO_2_ATTACK_3 = 3014,
-	AUDIO_SAMPLE_PED_DIABLO_2_ATTACK_4 = 3015,
-	AUDIO_SAMPLE_PED_DIABLO_2_CHAT_SEXY_1 = 3016,
-	AUDIO_SAMPLE_PED_DIABLO_2_CHAT_SEXY_2 = 3017,
-	AUDIO_SAMPLE_PED_DIABLO_2_CHAT_SEXY_3 = 3018,
-	AUDIO_SAMPLE_PED_DIABLO_2_CHAT_SEXY_4 = 3019,
-	AUDIO_SAMPLE_PED_DIABLO_2_HANDS_UP_1 = 3020,
-	AUDIO_SAMPLE_PED_DIABLO_2_HANDS_UP_2 = 3021,
-	AUDIO_SAMPLE_PED_DIABLO_2_HANDS_UP_3 = 3022,
-	AUDIO_SAMPLE_PED_DIABLO_2_HANDS_UP_4 = 3023,
-	AUDIO_SAMPLE_PED_DIABLO_2_CAR_COLLISION_1 = 3024,
-	AUDIO_SAMPLE_PED_DIABLO_2_CAR_COLLISION_2 = 3025,
-	AUDIO_SAMPLE_PED_DIABLO_2_CAR_COLLISION_3 = 3026,
-	AUDIO_SAMPLE_PED_DIABLO_2_CAR_COLLISION_4 = 3027,
-	AUDIO_SAMPLE_PED_DIABLO_2_CAR_COLLISION_5 = 3028,
-	AUDIO_SAMPLE_AMMUNATION_WELCOME_1 = 3029,
-	AUDIO_SAMPLE_AMMUNATION_WELCOME_2 = 3030,
-	AUDIO_SAMPLE_AMMUNATION_WELCOME_3 = 3031,
-	TOTAL_AUDIO_SAMPLES = 3032,
-	NO_SAMPLE = 3033,
-	
-	// shorthands
-	SAMPLEBANK_START     = AUDIO_SAMPLE_VEHICLE_HORN_0,
-	SAMPLEBANK_END       = AUDIO_SAMPLE_PAGER,
-	SAMPLEBANK_MAX       = AUDIO_SAMPLE_PAGER+1,
-	SAMPLEBANK_PED_START = AUDIO_SAMPLE_POLICE_COP_1_ARREST_1,
-	SAMPLEBANK_PED_END   = AUDIO_SAMPLE_AMMUNATION_WELCOME_3,
-	SAMPLEBANK_PED_MAX   = AUDIO_SAMPLE_AMMUNATION_WELCOME_3+1,
-};
+enum eSfxSample : uint32
+{
+	SFX_CAR_HORN_JEEP = 0,
+	SFX_CAR_HORN_BMW328,
+	SFX_CAR_HORN_BUS,
+	SFX_CAR_HORN_BUS2,
+	SFX_CAR_HORN_56CHEV,
+	SFX_CAR_HORN_PICKUP,
+	SFX_CAR_HORN_PORSCHE,
+	SFX_CAR_HORN_TRUCK,
+	SFX_OLD_CAR_DOOR_OPEN,
+	SFX_OLD_CAR_DOOR_CLOSE,
+	SFX_NEW_CAR_DOOR_OPEN,
+	SFX_NEW_CAR_DOOR_CLOSE,
+	SFX_TRUCK_DOOR_OPEN,
+	SFX_TRUCK_DOOR_CLOSE,
+	SFX_REMOTE_CONTROLLED_CAR,
+	SFX_REVERSE_GEAR,
+	SFX_REVERSE_GEAR_2,
+	SFX_CAR_STARTER,
+	SFX_ROAD_NOISE,
+	SFX_SKID,
+	SFX_GRAVEL_SKID,
+	SFX_POLICE_SIREN_SLOW,
+	SFX_SIREN_FAST,
+	SFX_AMBULANCE_SIREN_SLOW,
+	SFX_REVERSE_WARNING,
+	SFX_ICE_CREAM_TUNE,
+	SFX_CAR_ALARM_1,
+	SFX_AIR_BRAKES,
+	SFX_SQUEAKY_BRAKES,
+	SFX_TYRE_BUMP,
+	SFX_TRAIN_FAR,
+	SFX_TRAIN_NEAR,
+	SFX_FOOTSTEP_CONCRETE_1,
+	SFX_FOOTSTEP_CONCRETE_2,
+	SFX_FOOTSTEP_CONCRETE_3,
+	SFX_FOOTSTEP_CONCRETE_4,
+	SFX_FOOTSTEP_CONCRETE_5,
+	SFX_FOOTSTEP_GRASS_1,
+	SFX_FOOTSTEP_GRASS_2,
+	SFX_FOOTSTEP_GRASS_3,
+	SFX_FOOTSTEP_GRASS_4,
+	SFX_FOOTSTEP_GRASS_5,
+	SFX_FOOTSTEP_GRAVEL_1,
+	SFX_FOOTSTEP_GRAVEL_2,
+	SFX_FOOTSTEP_GRAVEL_3,
+	SFX_FOOTSTEP_GRAVEL_4,
+	SFX_FOOTSTEP_GRAVEL_5,
+	SFX_FOOTSTEP_WOOD_1,
+	SFX_FOOTSTEP_WOOD_2,
+	SFX_FOOTSTEP_WOOD_3,
+	SFX_FOOTSTEP_WOOD_4,
+	SFX_FOOTSTEP_WOOD_5,
+	SFX_FOOTSTEP_METAL_1,
+	SFX_FOOTSTEP_METAL_2,
+	SFX_FOOTSTEP_METAL_3,
+	SFX_FOOTSTEP_METAL_4,
+	SFX_FOOTSTEP_METAL_5,
+	SFX_FOOTSTEP_WATER_1,
+	SFX_FOOTSTEP_WATER_2,
+	SFX_FOOTSTEP_WATER_3,
+	SFX_FOOTSTEP_WATER_4,
+	SFX_FOOTSTEP_SAND_1,
+	SFX_FOOTSTEP_SAND_2,
+	SFX_FOOTSTEP_SAND_3,
+	SFX_FOOTSTEP_SAND_4,
+	SFX_EXPLOSION_2,
+	SFX_EXPLOSION_3,
+	SFX_COLT45_LEFT,
+	SFX_COLT45_RIGHT,
+	SFX_M16_LEFT,
+	SFX_M16_RIGHT,
+	SFX_AK47_LEFT,
+	SFX_AK47_RIGHT,
+	SFX_UZI_LEFT,
+	SFX_UZI_RIGHT,
+	SFX_UZI_END_LEFT,
+	SFX_UZI_END_RIGHT,
+	SFX_SNIPER_LEFT,
+	SFX_SNIPER_RIGHT,
+	SFX_ROCKET_LEFT,
+	SFX_ROCKET_RIGHT,
+	SFX_ROCKET_FLY,
+	SFX_FLAMETHROWER_LEFT,
+	SFX_FLAMETHROWER_RIGHT,
+	SFX_FLAMETHROWER_START_LEFT,
+	SFX_FLAMETHROWER_START_RIGHT,
+	SFX_SHOTGUN_LEFT,
+	SFX_SHOTGUN_RIGHT,
+	SFX_PISTOL_RELOAD,
+	SFX_AK47_RELOAD,
+	SFX_M16_RELOAD,
+	SFX_ROCKET_RELOAD,
+	SFX_RIFLE_RELOAD,
+	SFX_COL_TARMAC_1,
+	SFX_COL_TARMAC_2,
+	SFX_COL_TARMAC_3,
+	SFX_COL_TARMAC_4,
+	SFX_COL_TARMAC_5,
+	SFX_COL_GRASS_1,
+	SFX_COL_GRAVEL_1,
+	SFX_COL_MUD_1,
+	SFX_COL_GARAGE_DOOR_1,
+	SFX_COL_CAR_PANEL_1,
+	SFX_COL_CAR_PANEL_2,
+	SFX_COL_CAR_PANEL_3,
+	SFX_COL_CAR_PANEL_4,
+	SFX_COL_CAR_PANEL_5,
+	SFX_COL_CAR_PANEL_6,
+	SFX_COL_THICK_METAL_PLATE_1,
+	SFX_COL_SCAFFOLD_POLE_1,
+	SFX_COL_LAMP_POST_1,
+	SFX_COL_HYDRANT_1,
+	SFX_COL_METAL_CHAIN_FENCE_1,
+	SFX_COL_METAL_CHAIN_FENCE_2,
+	SFX_COL_METAL_CHAIN_FENCE_3,
+	SFX_COL_METAL_CHAIN_FENCE_4,
+	SFX_COL_PED_1,
+	SFX_COL_PED_2,
+	SFX_COL_PED_3,
+	SFX_COL_PED_4,
+	SFX_COL_PED_5,
+	SFX_COL_SAND_1,
+	SFX_COL_WOOD_CRATES_1,
+	SFX_COL_WOOD_CRATES_2,
+	SFX_COL_WOOD_CRATES_3,
+	SFX_COL_WOOD_CRATES_4,
+	SFX_COL_WOOD_BENCH_1,
+	SFX_COL_WOOD_BENCH_2,
+	SFX_COL_WOOD_BENCH_3,
+	SFX_COL_WOOD_BENCH_4,
+	SFX_COL_WOOD_SOLID_1,
+	SFX_COL_VEG_1,
+	SFX_COL_VEG_2,
+	SFX_COL_VEG_3,
+	SFX_COL_VEG_4,
+	SFX_COL_VEG_5,
+	SFX_COL_CONTAINER_1,
+	SFX_COL_NEWS_VENDOR_1,
+	SFX_COL_NEWS_VENDOR_2,
+	SFX_COL_NEWS_VENDOR_3,
+	SFX_COL_CAR_1,
+	SFX_COL_CAR_2,
+	SFX_COL_CAR_3,
+	SFX_COL_CAR_4,
+	SFX_COL_CAR_5,
+	SFX_COL_CARDBOARD_1,
+	SFX_COL_CARDBOARD_2,
+	SFX_COL_GATE,
+	SFX_SCRAPE_CAR_1,
+	SFX_CRATE_SMASH,
+	SFX_GLASS_CRACK,
+	SFX_GLASS_SMASH,
+	SFX_GLASS_SHARD_1,
+	SFX_GLASS_SHARD_2,
+	SFX_GLASS_SHARD_3,
+	SFX_GLASS_SHARD_4,
+	SFX_PED_ON_FIRE,
+	SFX_CAR_ON_FIRE,
+	SFX_RAIN,
+	SFX_PICKUP_1_LEFT,
+	SFX_PICKUP_1_RIGHT,
+	SFX_PICKUP_2_LEFT,
+	SFX_PICKUP_2_RIGHT,
+	SFX_PICKUP_3_LEFT,
+	SFX_PICKUP_3_RIGHT,
+	SFX_PICKUP_ERROR_LEFT,
+	SFX_PICKUP_ERROR_RIGHT,
+	SFX_BULLET_SHELL_HIT_GROUND_1,
+	SFX_BULLET_SHELL_HIT_GROUND_2,
+	SFX_BULLET_PED,
+	SFX_BULLET_CAR_1,
+	SFX_BULLET_CAR_2,
+	SFX_BULLET_CAR_3,
+	SFX_BULLET_CAR_4,
+	SFX_BULLET_CAR_5,
+	SFX_BULLET_CAR_6,
+	SFX_BULLET_WALL_1,
+	SFX_BULLET_WALL_2,
+	SFX_BULLET_WALL_3,
+	SFX_BAT_HIT_LEFT,
+	SFX_BAT_HIT_RIGHT,
+	SFX_FIGHT_1,
+	SFX_FIGHT_2,
+	SFX_FIGHT_4,
+	SFX_FIGHT_5,
+	SFX_GARAGE_DOOR_LOOP,
+	SFX_COUNTDOWN,
+	SFX_ARM_BOMB,
+	SFX_POLICE_RADIO_CRACKLE,
+	SFX_WEVE_GOT,
+	SFX_THERES,
+	SFX_RESPOND_TO,
+	SFX_A_10_1,
+	SFX_A_10_2,
+	SFX_CRIME_1,
+	SFX_CRIME_2,
+	SFX_CRIME_3,
+	SFX_CRIME_4,
+	SFX_CRIME_5,
+	SFX_CRIME_6,
+	SFX_CRIME_7,
+	SFX_CRIME_8,
+	SFX_CRIME_9,
+	SFX_CRIME_10,
+	SFX_CRIME_11,
+	SFX_CRIME_12,
+	SFX_IN,
+	SFX_NORTH,
+	SFX_EAST,
+	SFX_SOUTH,
+	SFX_WEST,
+	SFX_CENTRAL,
+	SFX_POLICE_RADIO_MESSAGE_NOISE_1,
+	SFX_POLICE_RADIO_MESSAGE_NOISE_2,
+	SFX_POLICE_RADIO_MESSAGE_NOISE_3,
+	SFX_POLICE_RADIO_LIBERTY_CITY,
+	SFX_POLICE_RADIO_PORTLAND,
+	SFX_POLICE_RADIO_STAUNTON_ISLAND,
+	SFX_POLICE_RADIO_SHORESIDE_VALE,
+	SFX_POLICE_RADIO_ROCKFORD,
+	SFX_POLICE_RADIO_FORT_STAUNTON,
+	SFX_POLICE_RADIO_ASPATRIA,
+	SFX_POLICE_RADIO_TORRINGTON,
+	SFX_POLICE_RADIO_BEDFORD_POINT,
+	SFX_POLICE_RADIO_NEWPORT,
+	SFX_POLICE_RADIO_BELLEVILLE_PARK,
+	SFX_POLICE_RADIO_LIBERTY_CAMPUS,
+	SFX_POLICE_RADIO_COCHRANE_DAM,
+	SFX_POLICE_RADIO_PIKE_CREEK,
+	SFX_POLICE_RADIO_CEDAR_GROVE,
+	SFX_POLICE_RADIO_WICHITA_GARDENS,
+	SFX_POLICE_RADIO_FRANCIS_INTERNATIONAL_AIRPORT,
+	SFX_POLICE_RADIO_CALLAHAN_POINT,
+	SFX_POLICE_RADIO_ATLANTIC_QUAYS,
+	SFX_POLICE_RADIO_PORTLAND_HARBOUR,
+	SFX_POLICE_RADIO_TRENTON,
+	SFX_POLICE_RADIO_CHINATOWN,
+	SFX_POLICE_RADIO_RED_LIGHT_DISTRICT,
+	SFX_POLICE_RADIO_HEPBURN_HEIGHTS,
+	SFX_POLICE_RADIO_SAINT_MARKS,
+	SFX_POLICE_RADIO_HARWOOD,
+	SFX_POLICE_RADIO_PORTLAND_BEACH,
+	SFX_POLICE_RADIO_PORTLAND_STRAIGHTS, // shouldn't be used anymore
+	SFX_POLICE_RADIO_SUSPECT,
+	SFX_POLICE_RADIO_LAST_SEEN,
+	SFX_POLICE_RADIO_ON_FOOT,
+	SFX_POLICE_RADIO_IN_A,
+	SFX_POLICE_RADIO_IN_AN,
+	SFX_POLICE_RADIO_BLACK,
+	SFX_POLICE_RADIO_WHITE,
+	SFX_POLICE_RADIO_BLUE,
+	SFX_POLICE_RADIO_RED,
+	SFX_POLICE_RADIO_PURPLE,
+	SFX_POLICE_RADIO_YELLOW,
+	SFX_POLICE_RADIO_GREY,
+	SFX_POLICE_RADIO_ORANGE,
+	SFX_POLICE_RADIO_GREEN,
+	SFX_POLICE_RADIO_SILVER,
+	SFX_POLICE_RADIO_DARK,
+	SFX_POLICE_RADIO_LIGHT,
+	SFX_POLICE_RADIO_BRIGHT,
+	SFX_POLICE_RADIO_AMBULANCE,
+	SFX_POLICE_RADIO_VAN,
+	SFX_POLICE_RADIO_TRUCK,
+	SFX_POLICE_RADIO_SALOON,
+	SFX_POLICE_RADIO_SPORTS_CAR,
+	SFX_POLICE_RADIO_BUGGY,
+	SFX_POLICE_RADIO_TAXI,
+	SFX_POLICE_RADIO_CRUISER,
+	SFX_POLICE_RADIO_BUS,
+	SFX_POLICE_RADIO_2_DOOR,
+	SFX_POLICE_RADIO_FIRE_TRUCK,
+	SFX_POLICE_RADIO_BOAT,
+	SFX_POLICE_RADIO_PICKUP,
+	SFX_POLICE_RADIO_ICE_CREAM_VAN,
+	SFX_POLICE_RADIO_LIMO,
+	SFX_POLICE_RADIO_POLICE_CAR,
+	SFX_POLICE_RADIO_CONVERTIBLE,
+	SFX_POLICE_RADIO_SUBWAY_CAR,
+	SFX_POLICE_RADIO_TANK,
+	SFX_HELI_1,
+	SFX_HELI_2,
+	SFX_HELI_3,
+	SFX_PHONE_RING,
+	SFX_CAR_REV_1,
+	SFX_CAR_REV_2,
+	SFX_CAR_REV_3,
+	SFX_CAR_REV_4,
+	SFX_CAR_REV_5,
+	SFX_CAR_REV_6,
+	SFX_CAR_REV_7,
+	SFX_CAR_REV_8,
+	SFX_CAR_REV_9,
+	SFX_CAR_REV_10,
+	SFX_CAR_IDLE_1,
+	SFX_CAR_IDLE_2,
+	SFX_CAR_IDLE_3,
+	SFX_CAR_IDLE_4,
+	SFX_CAR_IDLE_5,
+	SFX_CAR_IDLE_6,
+	SFX_CAR_IDLE_7,
+	SFX_CAR_IDLE_8,
+	SFX_CAR_IDLE_9,
+	SFX_CAR_IDLE_10,
+	SFX_JUMBO_DIST_FLY,
+	SFX_JUMBO_TAXI,
+	SFX_JUMBO_WHINE,
+	SFX_JUMBO_ENGINE,
+	SFX_JUMBO_RUMBLE,
+	SFX_JUMBO_LAND_WHEELS,
+	SFX_POLICE_BOAT_IDLE,
+	SFX_POLICE_BOAT_ACCEL,
+	SFX_POLICE_BOAT_THUMB_OFF,
+	SFX_BOAT_WATER_LOOP,
+	SFX_BOAT_SPLASH_1,
+	SFX_BOAT_SPLASH_2,
+	SFX_FISHING_BOAT_IDLE,
+	SFX_CESNA_IDLE,
+	SFX_CESNA_REV,
+	SFX_CAR_RAIN_1,
+	SFX_CAR_RAIN_2,
+	SFX_CAR_RAIN_3,
+	SFX_CAR_RAIN_4,
+	SFX_SPLASH_1,
+	SFX_PED_CRUNCH_1,
+	SFX_PED_CRUNCH_2,
+	SFX_HEADPHONES,
+	SFX_WOODEN_BOX_SMASH,
+	SFX_CARDBOARD_BOX_SMASH,
+	SFX_ERROR_FIRE_ROCKET_LAUNCHER,
+	SFX_ERROR_FIRE_RIFLE,
+	SFX_TANK_TURRET,
+	SFX_CRANE_MAGNET,
+	SFX_BODY_LAND_AND_FALL,
+	SFX_BODY_LAND,
+	SFX_BOMB_BEEP,
+	SFX_TIMER_BEEP,
+	SFX_PART_MISSION_COMPLETE,
+	SFX_START_BUTTON_LEFT,
+	SFX_START_BUTTON_RIGHT,
+	SFX_SUSPENSION_FAST_MOVE,
+	SFX_SUSPENSION_SLOW_MOVE_LOOP,
+	SFX_SHAG_SUSPENSION,
+	SFX_RADIO_CLICK,
+	SFX_INFO,
+
+	SFX_CAR_ACCEL_1,
+	SFX_CAR_AFTER_ACCEL_1,
+	SFX_CAR_FINGER_OFF_ACCEL_1,
+
+	SFX_CAR_ACCEL_2,
+	SFX_CAR_AFTER_ACCEL_2,
+	SFX_CAR_FINGER_OFF_ACCEL_2,
+
+	SFX_CAR_ACCEL_3,
+	SFX_CAR_AFTER_ACCEL_3,
+	SFX_CAR_FINGER_OFF_ACCEL_3,
+
+	SFX_CAR_ACCEL_4,
+	SFX_CAR_AFTER_ACCEL_4,
+	SFX_CAR_FINGER_OFF_ACCEL_4,
+
+	SFX_CAR_ACCEL_5,
+	SFX_CAR_AFTER_ACCEL_5,
+	SFX_CAR_FINGER_OFF_ACCEL_5,
+
+	SFX_CAR_ACCEL_6,
+	SFX_CAR_AFTER_ACCEL_6,
+	SFX_CAR_FINGER_OFF_ACCEL_6,
+
+	SFX_CAR_ACCEL_7,
+	SFX_CAR_AFTER_ACCEL_7,
+	SFX_CAR_FINGER_OFF_ACCEL_7,
+
+	SFX_CAR_ACCEL_8,
+	SFX_CAR_AFTER_ACCEL_8,
+	SFX_CAR_FINGER_OFF_ACCEL_8,
+
+	SFX_CAR_ACCEL_9,
+	SFX_CAR_AFTER_ACCEL_9,
+	SFX_CAR_FINGER_OFF_ACCEL_9,
+
+	SFX_PAGE_CHANGE_AND_BACK_LEFT,
+	SFX_PAGE_CHANGE_AND_BACK_RIGHT,
+	SFX_HIGHLIGHT_LEFT,
+	SFX_HIGHLIGHT_RIGHT,
+	SFX_SELECT_LEFT,
+	SFX_SELECT_RIGHT,
+	SFX_SUB_MENU_BACK_LEFT,
+	SFX_SUB_MENU_BACK_RIGHT,
+	SFX_STEREO_LEFT,
+	SFX_STEREO_RIGHT,
+	SFX_MONO,
+	SFX_NOISE_BURST_1,
+	SFX_NOISE_BURST_2,
+	SFX_NOISE_BURST_3,
+	SFX_ERROR_LEFT,
+	SFX_ERROR_RIGHT,
+	SFX_TRAIN_STATION_AMBIENCE_LOOP,
+	SFX_TRAIN_STATION_ANNOUNCE,
+	SFX_CLUB_1,
+	SFX_CLUB_2,
+	SFX_CLUB_3,
+	SFX_CLUB_4,
+	SFX_CLUB_5,
+	SFX_CLUB_6,
+	SFX_CLUB_7,
+	SFX_CLUB_8,
+	SFX_CLUB_9,
+	SFX_CLUB_10,
+	SFX_CLUB_11,
+	SFX_CLUB_12,
+	SFX_CLUB_RAGGA,
+	SFX_STRIP_CLUB_1,
+	SFX_STRIP_CLUB_2,
+	SFX_WORKSHOP_1,
+	SFX_PIANO_BAR_1,
+	SFX_SAWMILL_LOOP,
+	SFX_SAWMILL_CUT_WOOD,
+	SFX_DOG_FOOD_FACTORY,
+	SFX_LAUNDERETTE_LOOP,
+	SFX_LAUNDERETTE_SONG_LOOP,
+	SFX_RESTAURANT_CHINATOWN,
+	SFX_RESTAURANT_ITALY,
+	SFX_RESTAURANT_GENERIC_1,
+	SFX_RESTAURANT_GENERIC_2,
+	SFX_AIRPORT_ANNOUNCEMENT_1,
+	SFX_AIRPORT_ANNOUNCEMENT_2,
+	SFX_AIRPORT_ANNOUNCEMENT_3,
+	SFX_AIRPORT_ANNOUNCEMENT_4,
+	SFX_SHOP_LOOP,
+	SFX_SHOP_TILL_1,
+	SFX_SHOP_TILL_2,
+	SFX_CINEMA_BASS_1,
+	SFX_CINEMA_BASS_2,
+	SFX_CINEMA_BASS_3,
+	SFX_DOCKS_FOGHORN,
+	SFX_HOME_1,
+	SFX_HOME_2,
+	SFX_HOME_3,
+	SFX_HOME_4,
+	SFX_HOME_5,
+	SFX_PORN_1_LOOP,
+	SFX_PORN_1_GROAN_1,
+	SFX_PORN_1_GROAN_2,
+	SFX_PORN_2_LOOP,
+	SFX_PORN_2_GROAN_1,
+	SFX_PORN_2_GROAN_2,
+	SFX_PORN_3_LOOP,
+	SFX_PORN_3_GROAN_1,
+	SFX_PORN_3_GROAN_2,
+	SFX_POLICE_BALL_1,
+	SFX_BANK_ALARM_1,
+	SFX_RAVE_INDUSTRIAL,
+	SFX_RAVE_COMMERCIAL,
+	SFX_RAVE_SUBURBAN,
+	SFX_RAVE_COMMERCIAL_2,
+
+	// unused banks 50-58
+	SFX_CLUB_1_1,
+	SFX_CLUB_1_2,
+	SFX_CLUB_1_3,
+	SFX_CLUB_1_4,
+	SFX_CLUB_1_5,
+	SFX_CLUB_1_6,
+	SFX_CLUB_1_7,
+	SFX_CLUB_1_8,
+	SFX_CLUB_1_9,
+
+	SFX_EXPLOSION_1,
+	SFX_BRIDGE_OPEN_WARNING,
+
+	SFX_PAGER, // used to be ped comment on PS2
+
+	SFX_COP_VOICE_1_ARREST_1,
+	SFX_COP_VOICE_1_ARREST_2,
+	SFX_COP_VOICE_1_ARREST_3,
+	SFX_COP_VOICE_1_ARREST_4,
+	SFX_COP_VOICE_1_ARREST_5,
+	SFX_COP_VOICE_1_ARREST_6,
+	SFX_COP_VOICE_1_CHASE_1,
+	SFX_COP_VOICE_1_CHASE_2,
+	SFX_COP_VOICE_1_CHASE_3,
+	SFX_COP_VOICE_1_CHASE_4,
+	SFX_COP_VOICE_1_CHASE_5,
+	SFX_COP_VOICE_1_CHASE_6,
+	SFX_COP_VOICE_1_CHASE_7,
+	SFX_COP_VOICE_2_ARREST_1,
+	SFX_COP_VOICE_2_ARREST_2,
+	SFX_COP_VOICE_2_ARREST_3,
+	SFX_COP_VOICE_2_ARREST_4,
+	SFX_COP_VOICE_2_ARREST_5,
+	SFX_COP_VOICE_2_ARREST_6,
+	SFX_COP_VOICE_2_CHASE_1,
+	SFX_COP_VOICE_2_CHASE_2,
+	SFX_COP_VOICE_2_CHASE_3,
+	SFX_COP_VOICE_2_CHASE_4,
+	SFX_COP_VOICE_2_CHASE_5,
+	SFX_COP_VOICE_2_CHASE_6,
+	SFX_COP_VOICE_2_CHASE_7,
+	SFX_COP_VOICE_3_ARREST_1,
+	SFX_COP_VOICE_3_ARREST_2,
+	SFX_COP_VOICE_3_ARREST_3,
+	SFX_COP_VOICE_3_ARREST_4,
+	SFX_COP_VOICE_3_ARREST_5,
+	SFX_COP_VOICE_3_ARREST_6,
+	SFX_COP_VOICE_3_CHASE_1,
+	SFX_COP_VOICE_3_CHASE_2,
+	SFX_COP_VOICE_3_CHASE_3,
+	SFX_COP_VOICE_3_CHASE_4,
+	SFX_COP_VOICE_3_CHASE_5,
+	SFX_COP_VOICE_3_CHASE_6,
+	SFX_COP_VOICE_3_CHASE_7,
+	SFX_COP_VOICE_4_ARREST_1,
+	SFX_COP_VOICE_4_ARREST_2,
+	SFX_COP_VOICE_4_ARREST_3,
+	SFX_COP_VOICE_4_ARREST_4,
+	SFX_COP_VOICE_4_ARREST_5,
+	SFX_COP_VOICE_4_ARREST_6,
+	SFX_COP_VOICE_4_CHASE_1,
+	SFX_COP_VOICE_4_CHASE_2,
+	SFX_COP_VOICE_4_CHASE_3,
+	SFX_COP_VOICE_4_CHASE_4,
+	SFX_COP_VOICE_4_CHASE_5,
+	SFX_COP_VOICE_4_CHASE_6,
+	SFX_COP_VOICE_4_CHASE_7,
+	SFX_COP_VOICE_5_ARREST_1,
+	SFX_COP_VOICE_5_ARREST_2,
+	SFX_COP_VOICE_5_ARREST_3,
+	SFX_COP_VOICE_5_ARREST_4,
+	SFX_COP_VOICE_5_ARREST_5,
+	SFX_COP_VOICE_5_ARREST_6,
+	SFX_COP_VOICE_5_CHASE_1,
+	SFX_COP_VOICE_5_CHASE_2,
+	SFX_COP_VOICE_5_CHASE_3,
+	SFX_COP_VOICE_5_CHASE_4,
+	SFX_COP_VOICE_5_CHASE_5,
+	SFX_COP_VOICE_5_CHASE_6,
+	SFX_COP_VOICE_5_CHASE_7,
+	SFX_SWAT_VOICE_1_CHASE_1,
+	SFX_SWAT_VOICE_1_CHASE_2,
+	SFX_SWAT_VOICE_1_CHASE_3,
+	SFX_SWAT_VOICE_1_CHASE_4,
+	SFX_SWAT_VOICE_1_CHASE_5,
+	SFX_SWAT_VOICE_1_CHASE_6,
+	SFX_SWAT_VOICE_2_CHASE_1,
+	SFX_SWAT_VOICE_2_CHASE_2,
+	SFX_SWAT_VOICE_2_CHASE_3,
+	SFX_SWAT_VOICE_2_CHASE_4,
+	SFX_SWAT_VOICE_2_CHASE_5,
+	SFX_SWAT_VOICE_2_CHASE_6,
+	SFX_SWAT_VOICE_3_CHASE_1,
+	SFX_SWAT_VOICE_3_CHASE_2,
+	SFX_SWAT_VOICE_3_CHASE_3,
+	SFX_SWAT_VOICE_3_CHASE_4,
+	SFX_SWAT_VOICE_3_CHASE_5,
+	SFX_SWAT_VOICE_3_CHASE_6,
+	SFX_SWAT_VOICE_4_CHASE_1,
+	SFX_SWAT_VOICE_4_CHASE_2,
+	SFX_SWAT_VOICE_4_CHASE_3,
+	SFX_SWAT_VOICE_4_CHASE_4,
+	SFX_SWAT_VOICE_4_CHASE_5,
+	SFX_SWAT_VOICE_4_CHASE_6,
+	SFX_FBI_VOICE_1_CHASE_1,
+	SFX_FBI_VOICE_1_CHASE_2,
+	SFX_FBI_VOICE_1_CHASE_3,
+	SFX_FBI_VOICE_1_CHASE_4,
+	SFX_FBI_VOICE_1_CHASE_5,
+	SFX_FBI_VOICE_1_CHASE_6,
+	SFX_FBI_VOICE_2_CHASE_1,
+	SFX_FBI_VOICE_2_CHASE_2,
+	SFX_FBI_VOICE_2_CHASE_3,
+	SFX_FBI_VOICE_2_CHASE_4,
+	SFX_FBI_VOICE_2_CHASE_5,
+	SFX_FBI_VOICE_2_CHASE_6,
+	SFX_FBI_VOICE_3_CHASE_1,
+	SFX_FBI_VOICE_3_CHASE_2,
+	SFX_FBI_VOICE_3_CHASE_3,
+	SFX_FBI_VOICE_3_CHASE_4,
+	SFX_FBI_VOICE_3_CHASE_5,
+	SFX_FBI_VOICE_3_CHASE_6,
+	SFX_POLICE_HELI_1,
+	SFX_POLICE_HELI_2,
+	SFX_POLICE_HELI_3,
+	SFX_POLICE_HELI_4,
+	SFX_POLICE_HELI_5,
+	SFX_POLICE_HELI_6,
+	SFX_POLICE_HELI_7,
+	SFX_POLICE_HELI_8,
+	SFX_POLICE_HELI_9,
+	SFX_POLICE_HELI_10,
+	SFX_POLICE_HELI_11,
+	SFX_POLICE_HELI_12,
+	SFX_POLICE_HELI_13,
+	SFX_POLICE_HELI_14,
+	SFX_POLICE_HELI_15,
+	SFX_POLICE_HELI_16,
+	SFX_POLICE_HELI_17,
+	SFX_POLICE_HELI_18,
+	SFX_POLICE_HELI_19,
+	SFX_POLICE_HELI_20,
+	SFX_POLICE_HELI_21,
+	SFX_POLICE_HELI_22,
+	SFX_POLICE_HELI_23,
+	SFX_POLICE_HELI_24,
+	SFX_POLICE_HELI_25,
+	SFX_POLICE_HELI_26,
+	SFX_POLICE_HELI_27,
+	SFX_POLICE_HELI_28,
+	SFX_POLICE_HELI_29,
+	SFX_CHUNKY_DEATH,
+	SFX_BLACK_DOCKER_VOICE_1_DRIVER_ABUSE_1,
+	SFX_BLACK_DOCKER_VOICE_1_DRIVER_ABUSE_2,
+	SFX_BLACK_DOCKER_VOICE_1_DRIVER_ABUSE_3,
+	SFX_BLACK_DOCKER_VOICE_1_DRIVER_ABUSE_4,
+	SFX_BLACK_DOCKER_VOICE_1_DRIVER_ABUSE_5,
+	SFX_BLACK_DOCKER_VOICE_1_DRIVER_ABUSE_6,
+	SFX_BLACK_DOCKER_VOICE_1_CHAT_1,
+	SFX_BLACK_DOCKER_VOICE_1_CHAT_2,
+	SFX_BLACK_DOCKER_VOICE_1_CHAT_3,
+	SFX_BLACK_DOCKER_VOICE_1_CHAT_4,
+	SFX_BLACK_DOCKER_VOICE_1_CHAT_5,
+	SFX_BLACK_DOCKER_VOICE_1_DODGE_1,
+	SFX_BLACK_DOCKER_VOICE_1_DODGE_2,
+	SFX_BLACK_DOCKER_VOICE_1_DODGE_3,
+	SFX_BLACK_DOCKER_VOICE_1_DODGE_4,
+	SFX_BLACK_DOCKER_VOICE_1_DODGE_5,
+	SFX_BLACK_DOCKER_VOICE_1_EYING_1,
+	SFX_BLACK_DOCKER_VOICE_1_EYING_2,
+	SFX_BLACK_DOCKER_VOICE_1_EYING_3,
+	SFX_BLACK_DOCKER_VOICE_1_FIGHT_1,
+	SFX_BLACK_DOCKER_VOICE_1_FIGHT_2,
+	SFX_BLACK_DOCKER_VOICE_1_FIGHT_3,
+	SFX_BLACK_DOCKER_VOICE_1_FIGHT_4,
+	SFX_BLACK_DOCKER_VOICE_1_FIGHT_5,
+	SFX_BLACK_DOCKER_VOICE_1_GUN_PANIC_1,
+	SFX_BLACK_DOCKER_VOICE_1_GUN_PANIC_2,
+	SFX_BLACK_DOCKER_VOICE_1_GUN_PANIC_3,
+	SFX_ARMY_VOICE_1_CHASE_1,
+	SFX_ARMY_VOICE_1_CHASE_2,
+	SFX_ARMY_VOICE_1_CHASE_3,
+	SFX_ARMY_VOICE_1_CHASE_4,
+	SFX_ARMY_VOICE_1_CHASE_5,
+	SFX_ARMY_VOICE_1_CHASE_6,
+	SFX_ARMY_VOICE_1_CHASE_7,
+	SFX_ARMY_VOICE_1_CHASE_8,
+	SFX_ARMY_VOICE_1_CHASE_9,
+	SFX_ARMY_VOICE_1_CHASE_10,
+	SFX_ARMY_VOICE_1_CHASE_11,
+	SFX_ARMY_VOICE_1_CHASE_12,
+	SFX_ARMY_VOICE_1_CHASE_13,
+	SFX_ARMY_VOICE_1_CHASE_14,
+	SFX_ARMY_VOICE_1_CHASE_15,
+	SFX_ARMY_VOICE_2_CHASE_1,
+	SFX_ARMY_VOICE_2_CHASE_2,
+	SFX_ARMY_VOICE_2_CHASE_3,
+	SFX_ARMY_VOICE_2_CHASE_4,
+	SFX_ARMY_VOICE_2_CHASE_5,
+	SFX_ARMY_VOICE_2_CHASE_6,
+	SFX_ARMY_VOICE_2_CHASE_7,
+	SFX_ARMY_VOICE_2_CHASE_8,
+	SFX_ARMY_VOICE_2_CHASE_9,
+	SFX_ARMY_VOICE_2_CHASE_10,
+	SFX_ARMY_VOICE_2_CHASE_11,
+	SFX_ARMY_VOICE_2_CHASE_12,
+	SFX_ARMY_VOICE_2_CHASE_13,
+	SFX_ARMY_VOICE_2_CHASE_14,
+	SFX_ARMY_VOICE_2_CHASE_15,
+	SFX_CLAUDE_LOW_DAMAGE_GRUNT_1,
+	SFX_CLAUDE_LOW_DAMAGE_GRUNT_2,
+	SFX_CLAUDE_LOW_DAMAGE_GRUNT_3,
+	SFX_CLAUDE_LOW_DAMAGE_GRUNT_4,
+	SFX_CLAUDE_LOW_DAMAGE_GRUNT_5,
+	SFX_CLAUDE_LOW_DAMAGE_GRUNT_6,
+	SFX_CLAUDE_LOW_DAMAGE_GRUNT_7,
+	SFX_CLAUDE_LOW_DAMAGE_GRUNT_8,
+	SFX_CLAUDE_LOW_DAMAGE_GRUNT_9,
+	SFX_CLAUDE_LOW_DAMAGE_GRUNT_10,
+	SFX_CLAUDE_HIGH_DAMAGE_GRUNT_1,
+	SFX_CLAUDE_HIGH_DAMAGE_GRUNT_2,
+	SFX_CLAUDE_HIGH_DAMAGE_GRUNT_3,
+	SFX_CLAUDE_HIGH_DAMAGE_GRUNT_4,
+	SFX_CLAUDE_HIGH_DAMAGE_GRUNT_5,
+	SFX_CLAUDE_HIGH_DAMAGE_GRUNT_6,
+	SFX_CLAUDE_HIGH_DAMAGE_GRUNT_7,
+	SFX_CLAUDE_HIGH_DAMAGE_GRUNT_8,
+	SFX_CLAUDE_HIGH_DAMAGE_GRUNT_9,
+	SFX_CLAUDE_HIGH_DAMAGE_GRUNT_10,
+	SFX_CLAUDE_HIGH_DAMAGE_GRUNT_11,
+	SFX_CLAUDE_HIT_GROUND_GRUNT_1,
+	SFX_CLAUDE_HIT_GROUND_GRUNT_2,
+	SFX_CLAUDE_HIT_GROUND_GRUNT_3,
+	SFX_CLAUDE_HIT_GROUND_GRUNT_4,
+	SFX_CLAUDE_HIT_GROUND_GRUNT_5,
+	SFX_CLAUDE_HIT_GROUND_GRUNT_6,
+	SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_DRIVER_ABUSE_1,
+	SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_DRIVER_ABUSE_2,
+	SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_DRIVER_ABUSE_3,
+	SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_DRIVER_ABUSE_4,
+	SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_DRIVER_ABUSE_5,
+	SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_DRIVER_ABUSE_6,
+	SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_DRIVER_ABUSE_7,
+	SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_CHAT_1,
+	SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_CHAT_2,
+	SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_CHAT_3,
+	SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_CHAT_4,
+	SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_CHAT_5,
+	SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_CHAT_6,
+	SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_CHAT_7,
+	SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_CHAT_8,
+	SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_CHAT_9,
+	SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_CHAT_10,
+	SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_DODGE_1,
+	SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_DODGE_2,
+	SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_DODGE_3,
+	SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_DODGE_4,
+	SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_DODGE_5,
+	SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_DODGE_6,
+	SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_DODGE_7,
+	SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_DODGE_8,
+	SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_DODGE_9,
+	SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_DODGE_10,
+	SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_CARJACKED_1,
+	SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_CARJACKED_2,
+	SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_CARJACKED_3,
+	SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_CARJACKED_4,
+	SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_CARJACKED_5,
+	SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_CARJACKED_6,
+	SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_MUGGED_1,
+	SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_MUGGED_2,
+	SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_RUN_FROM_FIGHT_1,
+	SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_RUN_FROM_FIGHT_2,
+	SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_RUN_FROM_FIGHT_3,
+	SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_RUN_FROM_FIGHT_4,
+	SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_RUN_FROM_FIGHT_5,
+	SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_RUN_FROM_FIGHT_6,
+	SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_SHOCKED_1,
+	SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_SHOCKED_2,
+	SFX_CHUNKY_RUN_1,
+	SFX_CHUNKY_RUN_2,
+	SFX_CHUNKY_RUN_3,
+	SFX_CHUNKY_RUN_4,
+	SFX_CHUNKY_RUN_5,
+	SFX_PIMP_DRIVER_ABUSE_1,
+	SFX_PIMP_DRIVER_ABUSE_2,
+	SFX_PIMP_DRIVER_ABUSE_3,
+	SFX_PIMP_DRIVER_ABUSE_4,
+	SFX_PIMP_DRIVER_ABUSE_5,
+	SFX_PIMP_CHAT_1,
+	SFX_PIMP_CHAT_2,
+	SFX_PIMP_CHAT_3,
+	SFX_PIMP_CHAT_4,
+	SFX_PIMP_CHAT_5,
+	SFX_PIMP_CHAT_6,
+	SFX_PIMP_CHAT_7,
+	SFX_PIMP_CHAT_8,
+	SFX_PIMP_CHAT_9,
+	SFX_PIMP_CHAT_10,
+	SFX_PIMP_CHAT_11,
+	SFX_PIMP_CHAT_12,
+	SFX_PIMP_CHAT_13,
+	SFX_PIMP_CHAT_14,
+	SFX_PIMP_CHAT_15,
+	SFX_PIMP_CHAT_16,
+	SFX_PIMP_CHAT_17,
+	SFX_PIMP_DODGE_1,
+	SFX_PIMP_DODGE_2,
+	SFX_PIMP_DODGE_3,
+	SFX_PIMP_DODGE_4,
+	SFX_PIMP_DODGE_5,
+	SFX_PIMP_DODGE_6,
+	SFX_PIMP_FIGHT_1,
+	SFX_PIMP_FIGHT_2,
+	SFX_PIMP_FIGHT_3,
+	SFX_PIMP_FIGHT_4,
+	SFX_PIMP_FIGHT_5,
+	SFX_PIMP_FIGHT_6,
+	SFX_PIMP_FIGHT_7,
+	SFX_PIMP_FIGHT_8,
+	SFX_PIMP_FIGHT_9,
+	SFX_PIMP_GUN_COOL_1,
+	SFX_PIMP_GUN_COOL_2,
+	SFX_PIMP_GUN_COOL_3,
+	SFX_PIMP_GUN_COOL_4,
+	SFX_PIMP_GUN_COOL_5,
+	SFX_PIMP_GUN_COOL_6,
+	SFX_PIMP_GUN_COOL_7,
+	SFX_PIMP_CARJACKED_1,
+	SFX_PIMP_CARJACKED_2,
+	SFX_PIMP_CARJACKED_3,
+	SFX_PIMP_CARJACKED_4,
+	SFX_PIMP_SHOCKED_1,
+	SFX_PIMP_SHOCKED_2,
+	SFX_NORMAL_MALE_DRIVER_ABUSE_1,
+	SFX_NORMAL_MALE_DRIVER_ABUSE_2,
+	SFX_NORMAL_MALE_DRIVER_ABUSE_3,
+	SFX_NORMAL_MALE_DRIVER_ABUSE_4,
+	SFX_NORMAL_MALE_DRIVER_ABUSE_5,
+	SFX_NORMAL_MALE_DRIVER_ABUSE_6,
+	SFX_NORMAL_MALE_DRIVER_ABUSE_7,
+	SFX_NORMAL_MALE_DRIVER_ABUSE_8,
+	SFX_NORMAL_MALE_DRIVER_ABUSE_9,
+	SFX_NORMAL_MALE_DRIVER_ABUSE_10,
+	SFX_NORMAL_MALE_DRIVER_ABUSE_11,
+	SFX_NORMAL_MALE_DRIVER_ABUSE_12,
+	SFX_NORMAL_MALE_CHAT_1,
+	SFX_NORMAL_MALE_CHAT_2,
+	SFX_NORMAL_MALE_CHAT_3,
+	SFX_NORMAL_MALE_CHAT_4,
+	SFX_NORMAL_MALE_CHAT_5,
+	SFX_NORMAL_MALE_CHAT_6,
+	SFX_NORMAL_MALE_CHAT_7,
+	SFX_NORMAL_MALE_CHAT_8,
+	SFX_NORMAL_MALE_CHAT_9,
+	SFX_NORMAL_MALE_CHAT_10,
+	SFX_NORMAL_MALE_CHAT_11,
+	SFX_NORMAL_MALE_CHAT_12,
+	SFX_NORMAL_MALE_CHAT_13,
+	SFX_NORMAL_MALE_CHAT_14,
+	SFX_NORMAL_MALE_CHAT_15,
+	SFX_NORMAL_MALE_CHAT_16,
+	SFX_NORMAL_MALE_CHAT_17,
+	SFX_NORMAL_MALE_CHAT_18,
+	SFX_NORMAL_MALE_CHAT_19,
+	SFX_NORMAL_MALE_CHAT_20,
+	SFX_NORMAL_MALE_CHAT_21,
+	SFX_NORMAL_MALE_CHAT_22,
+	SFX_NORMAL_MALE_CHAT_23,
+	SFX_NORMAL_MALE_CHAT_24,
+	SFX_NORMAL_MALE_CHAT_25,
+	SFX_NORMAL_MALE_DODGE_1,
+	SFX_NORMAL_MALE_DODGE_2,
+	SFX_NORMAL_MALE_DODGE_3,
+	SFX_NORMAL_MALE_DODGE_4,
+	SFX_NORMAL_MALE_DODGE_5,
+	SFX_NORMAL_MALE_DODGE_6,
+	SFX_NORMAL_MALE_DODGE_7,
+	SFX_NORMAL_MALE_DODGE_8,
+	SFX_NORMAL_MALE_DODGE_9,
+	SFX_NORMAL_MALE_EYING_1,
+	SFX_NORMAL_MALE_EYING_2,
+	SFX_NORMAL_MALE_EYING_3,
+	SFX_NORMAL_MALE_EYING_4,
+	SFX_NORMAL_MALE_EYING_5,
+	SFX_NORMAL_MALE_EYING_6,
+	SFX_NORMAL_MALE_EYING_7,
+	SFX_NORMAL_MALE_EYING_8,
+	SFX_NORMAL_MALE_GUN_PANIC_1,
+	SFX_NORMAL_MALE_GUN_PANIC_2,
+	SFX_NORMAL_MALE_GUN_PANIC_3,
+	SFX_NORMAL_MALE_GUN_PANIC_4,
+	SFX_NORMAL_MALE_GUN_PANIC_5,
+	SFX_NORMAL_MALE_GUN_PANIC_6,
+	SFX_NORMAL_MALE_GUN_PANIC_7,
+	SFX_NORMAL_MALE_CARJACKED_1,
+	SFX_NORMAL_MALE_CARJACKED_2,
+	SFX_NORMAL_MALE_CARJACKED_3,
+	SFX_NORMAL_MALE_CARJACKED_4,
+	SFX_NORMAL_MALE_CARJACKED_5,
+	SFX_NORMAL_MALE_CARJACKED_6,
+	SFX_NORMAL_MALE_CARJACKED_7,
+	SFX_NORMAL_MALE_RUN_FROM_FIGHT_1,
+	SFX_NORMAL_MALE_RUN_FROM_FIGHT_2,
+	SFX_NORMAL_MALE_RUN_FROM_FIGHT_3,
+	SFX_NORMAL_MALE_RUN_FROM_FIGHT_4,
+	SFX_NORMAL_MALE_RUN_FROM_FIGHT_5,
+	SFX_NORMAL_MALE_SHOCKED_1,
+	SFX_NORMAL_MALE_SHOCKED_2,
+	SFX_NORMAL_MALE_SHOCKED_3,
+	SFX_NORMAL_MALE_SHOCKED_4,
+	SFX_NORMAL_MALE_SHOCKED_5,
+	SFX_NORMAL_MALE_SHOCKED_6,
+	SFX_NORMAL_MALE_SHOCKED_7,
+	SFX_NORMAL_MALE_SHOCKED_8,
+	SFX_NORMAL_MALE_SHOCKED_9,
+	SFX_NORMAL_MALE_SHOCKED_10,
+	SFX_BOMBERMAN_1,
+	SFX_BOMBERMAN_2,
+	SFX_BOMBERMAN_3,
+	SFX_BOMBERMAN_4,
+	SFX_BOMBERMAN_5,
+	SFX_BOMBERMAN_6,
+	SFX_BOMBERMAN_7,
+	SFX_8BALL_DODGE_1,
+	SFX_8BALL_DODGE_2,
+	SFX_8BALL_DODGE_3,
+	SFX_8BALL_DODGE_4,
+	SFX_8BALL_DODGE_5,
+	SFX_8BALL_DODGE_6,
+	SFX_8BALL_DODGE_7,
+	SFX_8BALL_FIGHT_1,
+	SFX_8BALL_FIGHT_2,
+	SFX_8BALL_FIGHT_3,
+	SFX_8BALL_FIGHT_4,
+	SFX_8BALL_FIGHT_5,
+	SFX_8BALL_FIGHT_6,
+	SFX_8BALL_GUN_COOL_1,
+	SFX_8BALL_GUN_COOL_2,
+	SFX_8BALL_MUGGED_1,
+	SFX_8BALL_MUGGED_2,
+	SFX_SALVATORE_DODGE_1,
+	SFX_SALVATORE_DODGE_2,
+	SFX_SALVATORE_DODGE_3,
+	SFX_SALVATORE_FIGHT_1,
+	SFX_SALVATORE_FIGHT_2,
+	SFX_SALVATORE_FIGHT_3,
+	SFX_SALVATORE_FIGHT_4,
+	SFX_SALVATORE_FIGHT_5,
+	SFX_SALVATORE_FIGHT_6,
+	SFX_SALVATORE_GUN_COOL_1,
+	SFX_SALVATORE_GUN_COOL_2,
+	SFX_SALVATORE_GUN_COOL_3,
+	SFX_SALVATORE_GUN_COOL_4,
+	SFX_SALVATORE_MUGGED_1,
+	SFX_SALVATORE_MUGGED_2,
+	SFX_MISTY_DODGE_1,
+	SFX_MISTY_DODGE_2,
+	SFX_MISTY_DODGE_3,
+	SFX_MISTY_DODGE_4,
+	SFX_MISTY_DODGE_5,
+	SFX_MISTY_FIGHT_1,
+	SFX_MISTY_FIGHT_2,
+	SFX_MISTY_FIGHT_3,
+	SFX_MISTY_FIGHT_4,
+	SFX_MISTY_GUN_COOL_1,
+	SFX_MISTY_GUN_COOL_2,
+	SFX_MISTY_GUN_COOL_3,
+	SFX_MISTY_GUN_COOL_4,
+	SFX_MISTY_GUN_COOL_5,
+	SFX_MISTY_HERE_1,
+	SFX_MISTY_HERE_2,
+	SFX_MISTY_HERE_3,
+	SFX_MISTY_HERE_4,
+	SFX_MISTY_MUGGED_1,
+	SFX_MISTY_MUGGED_2,
+	SFX_MEDIC_VOICE_1_GUN_PANIC_1,
+	SFX_MEDIC_VOICE_1_GUN_PANIC_2,
+	SFX_MEDIC_VOICE_1_GUN_PANIC_3,
+	SFX_MEDIC_VOICE_1_GUN_PANIC_4,
+	SFX_MEDIC_VOICE_1_GUN_PANIC_5,
+	SFX_MEDIC_VOICE_1_CARJACKED_1,
+	SFX_MEDIC_VOICE_1_CARJACKED_2,
+	SFX_MEDIC_VOICE_1_CARJACKED_3,
+	SFX_MEDIC_VOICE_1_CARJACKED_4,
+	SFX_MEDIC_VOICE_1_CARJACKED_5,
+	SFX_MEDIC_VOICE_1_RUN_FROM_FIGHT_1,
+	SFX_MEDIC_VOICE_1_RUN_FROM_FIGHT_2,
+	SFX_MEDIC_VOICE_1_RUN_FROM_FIGHT_3,
+	SFX_MEDIC_VOICE_1_RUN_FROM_FIGHT_4,
+	SFX_MEDIC_VOICE_1_RUN_FROM_FIGHT_5,
+	SFX_MEDIC_VOICE_1_RUN_FROM_FIGHT_6,
+	SFX_MEDIC_VOICE_1_GET_OUT_VAN_CHAT_1,
+	SFX_MEDIC_VOICE_1_GET_OUT_VAN_CHAT_2,
+	SFX_MEDIC_VOICE_1_GET_OUT_VAN_CHAT_3,
+	SFX_MEDIC_VOICE_1_GET_OUT_VAN_CHAT_4,
+	SFX_MEDIC_VOICE_1_GET_OUT_VAN_CHAT_5,
+	SFX_MEDIC_VOICE_1_GET_OUT_VAN_CHAT_6,
+	SFX_MEDIC_VOICE_1_GET_OUT_VAN_CHAT_7,
+	SFX_MEDIC_VOICE_1_GET_OUT_VAN_CHAT_8,
+	SFX_MEDIC_VOICE_1_GET_OUT_VAN_CHAT_9,
+	SFX_MEDIC_VOICE_1_AT_VICTIM_1,
+	SFX_MEDIC_VOICE_1_AT_VICTIM_2,
+	SFX_MEDIC_VOICE_1_AT_VICTIM_3,
+	SFX_MEDIC_VOICE_1_AT_VICTIM_4,
+	SFX_MEDIC_VOICE_1_AT_VICTIM_5,
+	SFX_MEDIC_VOICE_1_AT_VICTIM_6,
+	SFX_MEDIC_VOICE_1_AT_VICTIM_7,
+	SFX_MEDIC_VOICE_1_AT_VICTIM_8,
+	SFX_MEDIC_VOICE_1_AT_VICTIM_9,
+	SFX_MEDIC_VOICE_1_AT_VICTIM_10,
+	SFX_MEDIC_VOICE_1_AT_VICTIM_11,
+	SFX_MEDIC_VOICE_1_AT_VICTIM_12,
+	SFX_MEDIC_VOICE_2_GUN_PANIC_1,
+	SFX_MEDIC_VOICE_2_GUN_PANIC_2,
+	SFX_MEDIC_VOICE_2_GUN_PANIC_3,
+	SFX_MEDIC_VOICE_2_GUN_PANIC_4,
+	SFX_MEDIC_VOICE_2_GUN_PANIC_5,
+	SFX_MEDIC_VOICE_2_CARJACKED_1,
+	SFX_MEDIC_VOICE_2_CARJACKED_2,
+	SFX_MEDIC_VOICE_2_CARJACKED_3,
+	SFX_MEDIC_VOICE_2_CARJACKED_4,
+	SFX_MEDIC_VOICE_2_CARJACKED_5,
+	SFX_MEDIC_VOICE_2_RUN_FROM_FIGHT_1,
+	SFX_MEDIC_VOICE_2_RUN_FROM_FIGHT_2,
+	SFX_MEDIC_VOICE_2_RUN_FROM_FIGHT_3,
+	SFX_MEDIC_VOICE_2_RUN_FROM_FIGHT_4,
+	SFX_MEDIC_VOICE_2_RUN_FROM_FIGHT_5,
+	SFX_MEDIC_VOICE_2_RUN_FROM_FIGHT_6,
+	SFX_MEDIC_VOICE_2_GET_OUT_VAN_CHAT_1,
+	SFX_MEDIC_VOICE_2_GET_OUT_VAN_CHAT_2,
+	SFX_MEDIC_VOICE_2_GET_OUT_VAN_CHAT_3,
+	SFX_MEDIC_VOICE_2_GET_OUT_VAN_CHAT_4,
+	SFX_MEDIC_VOICE_2_GET_OUT_VAN_CHAT_5,
+	SFX_MEDIC_VOICE_2_GET_OUT_VAN_CHAT_6,
+	SFX_MEDIC_VOICE_2_GET_OUT_VAN_CHAT_7,
+	SFX_MEDIC_VOICE_2_GET_OUT_VAN_CHAT_8,
+	SFX_MEDIC_VOICE_2_GET_OUT_VAN_CHAT_9,
+	SFX_MEDIC_VOICE_2_AT_VICTIM_1,
+	SFX_MEDIC_VOICE_2_AT_VICTIM_2,
+	SFX_MEDIC_VOICE_2_AT_VICTIM_3,
+	SFX_MEDIC_VOICE_2_AT_VICTIM_4,
+	SFX_MEDIC_VOICE_2_AT_VICTIM_5,
+	SFX_MEDIC_VOICE_2_AT_VICTIM_6,
+	SFX_MEDIC_VOICE_2_AT_VICTIM_7,
+	SFX_MEDIC_VOICE_2_AT_VICTIM_8,
+	SFX_MEDIC_VOICE_2_AT_VICTIM_9,
+	SFX_MEDIC_VOICE_2_AT_VICTIM_10,
+	SFX_MEDIC_VOICE_2_AT_VICTIM_11,
+	SFX_MEDIC_VOICE_2_AT_VICTIM_12,
+	SFX_PLASTER_BLOKE_1,
+	SFX_PLASTER_BLOKE_2,
+	SFX_PLASTER_BLOKE_3,
+	SFX_PLASTER_BLOKE_4,
+	SFX_BLACK_CONSTRUCTION_MALE_VOICE_1_DRIVER_ABUSE_1,
+	SFX_BLACK_CONSTRUCTION_MALE_VOICE_1_DRIVER_ABUSE_2,
+	SFX_BLACK_CONSTRUCTION_MALE_VOICE_1_DRIVER_ABUSE_3,
+	SFX_BLACK_CONSTRUCTION_MALE_VOICE_1_DRIVER_ABUSE_4,
+	SFX_BLACK_CONSTRUCTION_MALE_VOICE_1_DRIVER_ABUSE_5,
+	SFX_BLACK_CONSTRUCTION_MALE_VOICE_1_CHAT_1,
+	SFX_BLACK_CONSTRUCTION_MALE_VOICE_1_CHAT_2,
+	SFX_BLACK_CONSTRUCTION_MALE_VOICE_1_CHAT_3,
+	SFX_BLACK_CONSTRUCTION_MALE_VOICE_1_CHAT_4,
+	SFX_BLACK_CONSTRUCTION_MALE_VOICE_1_DODGE_1,
+	SFX_BLACK_CONSTRUCTION_MALE_VOICE_1_DODGE_2,
+	SFX_BLACK_CONSTRUCTION_MALE_VOICE_1_DODGE_3,
+	SFX_BLACK_CONSTRUCTION_MALE_VOICE_1_DODGE_4,
+	SFX_BLACK_CONSTRUCTION_MALE_VOICE_1_DODGE_5,
+	SFX_BLACK_CONSTRUCTION_MALE_VOICE_1_EYING_1,
+	SFX_BLACK_CONSTRUCTION_MALE_VOICE_1_EYING_2,
+	SFX_BLACK_CONSTRUCTION_MALE_VOICE_1_EYING_3,
+	SFX_BLACK_CONSTRUCTION_MALE_VOICE_1_EYING_4,
+	SFX_BLACK_CONSTRUCTION_MALE_VOICE_1_FIGHT_1,
+	SFX_BLACK_CONSTRUCTION_MALE_VOICE_1_FIGHT_2,
+	SFX_BLACK_CONSTRUCTION_MALE_VOICE_1_FIGHT_3,
+	SFX_BLACK_CONSTRUCTION_MALE_VOICE_1_FIGHT_4,
+	SFX_BLACK_CONSTRUCTION_MALE_VOICE_1_FIGHT_5,
+	SFX_BLACK_CONSTRUCTION_MALE_VOICE_1_GUN_PANIC_1,
+	SFX_BLACK_CONSTRUCTION_MALE_VOICE_1_GUN_PANIC_2,
+	SFX_BLACK_CONSTRUCTION_MALE_VOICE_1_GUN_PANIC_3,
+	SFX_BLACK_CONSTRUCTION_MALE_VOICE_1_CARJACKED_1,
+	SFX_BLACK_CONSTRUCTION_MALE_VOICE_1_CARJACKED_2,
+	SFX_FOOTBALL_FEMALE_VOICE_1_DRIVER_ABUSE_1,
+	SFX_FOOTBALL_FEMALE_VOICE_1_DRIVER_ABUSE_2,
+	SFX_FOOTBALL_FEMALE_VOICE_1_DRIVER_ABUSE_3,
+	SFX_FOOTBALL_FEMALE_VOICE_1_DRIVER_ABUSE_4,
+	SFX_FOOTBALL_FEMALE_VOICE_1_DRIVER_ABUSE_5,
+	SFX_FOOTBALL_FEMALE_VOICE_1_CHAT_1,
+	SFX_FOOTBALL_FEMALE_VOICE_1_CHAT_2,
+	SFX_FOOTBALL_FEMALE_VOICE_1_CHAT_3,
+	SFX_FOOTBALL_FEMALE_VOICE_1_CHAT_4,
+	SFX_FOOTBALL_FEMALE_VOICE_1_CHAT_5,
+	SFX_FOOTBALL_FEMALE_VOICE_1_CHAT_6,
+	SFX_FOOTBALL_FEMALE_VOICE_1_DODGE_1,
+	SFX_FOOTBALL_FEMALE_VOICE_1_DODGE_2,
+	SFX_FOOTBALL_FEMALE_VOICE_1_DODGE_3,
+	SFX_FOOTBALL_FEMALE_VOICE_1_DODGE_4,
+	SFX_FOOTBALL_FEMALE_VOICE_1_MUGGED_1,
+	SFX_FOOTBALL_FEMALE_VOICE_1_SHOCKED_1,
+	SFX_FOOTBALL_FEMALE_VOICE_1_SHOCKED_2,
+	SFX_FOOTBALL_FEMALE_VOICE_2_DRIVER_ABUSE_1,
+	SFX_FOOTBALL_FEMALE_VOICE_2_DRIVER_ABUSE_2,
+	SFX_FOOTBALL_FEMALE_VOICE_2_DRIVER_ABUSE_3,
+	SFX_FOOTBALL_FEMALE_VOICE_2_DRIVER_ABUSE_4,
+	SFX_FOOTBALL_FEMALE_VOICE_2_DRIVER_ABUSE_5,
+	SFX_FOOTBALL_FEMALE_VOICE_2_CHAT_1,
+	SFX_FOOTBALL_FEMALE_VOICE_2_CHAT_2,
+	SFX_FOOTBALL_FEMALE_VOICE_2_CHAT_3,
+	SFX_FOOTBALL_FEMALE_VOICE_2_CHAT_4,
+	SFX_FOOTBALL_FEMALE_VOICE_2_CHAT_5,
+	SFX_FOOTBALL_FEMALE_VOICE_2_CHAT_6,
+	SFX_FOOTBALL_FEMALE_VOICE_2_DODGE_1,
+	SFX_FOOTBALL_FEMALE_VOICE_2_DODGE_2,
+	SFX_FOOTBALL_FEMALE_VOICE_2_DODGE_3,
+	SFX_FOOTBALL_FEMALE_VOICE_2_DODGE_4,
+	SFX_FOOTBALL_FEMALE_VOICE_2_MUGGED_1,
+	SFX_FOOTBALL_FEMALE_VOICE_2_SHOCKED_1,
+	SFX_FOOTBALL_FEMALE_VOICE_2_SHOCKED_2,
+	SFX_FOOTBALL_MALE_VOICE_1_DRIVER_ABUSE_1,
+	SFX_FOOTBALL_MALE_VOICE_1_DRIVER_ABUSE_2,
+	SFX_FOOTBALL_MALE_VOICE_1_DRIVER_ABUSE_3,
+	SFX_FOOTBALL_MALE_VOICE_1_DRIVER_ABUSE_4,
+	SFX_FOOTBALL_MALE_VOICE_1_DRIVER_ABUSE_5,
+	SFX_FOOTBALL_MALE_VOICE_1_CHAT_1,
+	SFX_FOOTBALL_MALE_VOICE_1_CHAT_2,
+	SFX_FOOTBALL_MALE_VOICE_1_CHAT_3,
+	SFX_FOOTBALL_MALE_VOICE_1_CHAT_4,
+	SFX_FOOTBALL_MALE_VOICE_1_CHAT_5,
+	SFX_FOOTBALL_MALE_VOICE_1_CHAT_6,
+	SFX_FOOTBALL_MALE_VOICE_1_DODGE_1,
+	SFX_FOOTBALL_MALE_VOICE_1_DODGE_2,
+	SFX_FOOTBALL_MALE_VOICE_1_DODGE_3,
+	SFX_FOOTBALL_MALE_VOICE_1_DODGE_4,
+	SFX_FOOTBALL_MALE_VOICE_1_FIGHT_1,
+	SFX_FOOTBALL_MALE_VOICE_1_FIGHT_2,
+	SFX_FOOTBALL_MALE_VOICE_1_FIGHT_3,
+	SFX_FOOTBALL_MALE_VOICE_1_SHOCKED_1,
+	SFX_FOOTBALL_MALE_VOICE_1_SHOCKED_2,
+	SFX_FOOTBALL_MALE_VOICE_2_DRIVER_ABUSE_1,
+	SFX_FOOTBALL_MALE_VOICE_2_DRIVER_ABUSE_2,
+	SFX_FOOTBALL_MALE_VOICE_2_DRIVER_ABUSE_3,
+	SFX_FOOTBALL_MALE_VOICE_2_DRIVER_ABUSE_4,
+	SFX_FOOTBALL_MALE_VOICE_2_DRIVER_ABUSE_5,
+	SFX_FOOTBALL_MALE_VOICE_2_CHAT_1,
+	SFX_FOOTBALL_MALE_VOICE_2_CHAT_2,
+	SFX_FOOTBALL_MALE_VOICE_2_CHAT_3,
+	SFX_FOOTBALL_MALE_VOICE_2_CHAT_4,
+	SFX_FOOTBALL_MALE_VOICE_2_CHAT_5,
+	SFX_FOOTBALL_MALE_VOICE_2_CHAT_6,
+	SFX_FOOTBALL_MALE_VOICE_2_DODGE_1,
+	SFX_FOOTBALL_MALE_VOICE_2_DODGE_2,
+	SFX_FOOTBALL_MALE_VOICE_2_DODGE_3,
+	SFX_FOOTBALL_MALE_VOICE_2_DODGE_4,
+	SFX_FOOTBALL_MALE_VOICE_2_FIGHT_1,
+	SFX_FOOTBALL_MALE_VOICE_2_FIGHT_2,
+	SFX_FOOTBALL_MALE_VOICE_2_FIGHT_3,
+	SFX_FOOTBALL_MALE_VOICE_2_SHOCKED_1,
+	SFX_FOOTBALL_MALE_VOICE_2_SHOCKED_2,
+	SFX_MODEL_FEMALE_VOICE_1_DRIVER_ABUSE_1,
+	SFX_MODEL_FEMALE_VOICE_1_DRIVER_ABUSE_2,
+	SFX_MODEL_FEMALE_VOICE_1_DRIVER_ABUSE_3,
+	SFX_MODEL_FEMALE_VOICE_1_DRIVER_ABUSE_4,
+	SFX_MODEL_FEMALE_VOICE_1_DRIVER_ABUSE_5,
+	SFX_MODEL_FEMALE_VOICE_1_DRIVER_ABUSE_6,
+	SFX_MODEL_FEMALE_VOICE_1_DRIVER_ABUSE_7,
+	SFX_MODEL_FEMALE_VOICE_1_CHAT_1,
+	SFX_MODEL_FEMALE_VOICE_1_CHAT_2,
+	SFX_MODEL_FEMALE_VOICE_1_CHAT_3,
+	SFX_MODEL_FEMALE_VOICE_1_CHAT_4,
+	SFX_MODEL_FEMALE_VOICE_1_CHAT_5,
+	SFX_MODEL_FEMALE_VOICE_1_CHAT_6,
+	SFX_MODEL_FEMALE_VOICE_1_CHAT_7,
+	SFX_MODEL_FEMALE_VOICE_1_CHAT_8,
+	SFX_MODEL_FEMALE_VOICE_1_DODGE_1,
+	SFX_MODEL_FEMALE_VOICE_1_DODGE_2,
+	SFX_MODEL_FEMALE_VOICE_1_DODGE_3,
+	SFX_MODEL_FEMALE_VOICE_1_DODGE_4,
+	SFX_MODEL_FEMALE_VOICE_1_GUN_PANIC_1,
+	SFX_MODEL_FEMALE_VOICE_1_GUN_PANIC_2,
+	SFX_MODEL_FEMALE_VOICE_1_GUN_PANIC_3,
+	SFX_MODEL_FEMALE_VOICE_1_GUN_PANIC_4,
+	SFX_MODEL_FEMALE_VOICE_1_MUGGED_1,
+	SFX_MODEL_FEMALE_VOICE_1_MUGGED_2,
+	SFX_MODEL_FEMALE_VOICE_1_MUGGED_3,
+	SFX_MODEL_FEMALE_VOICE_1_SHOCKED_1,
+	SFX_MODEL_FEMALE_VOICE_1_SHOCKED_2,
+	SFX_MODEL_FEMALE_VOICE_1_SHOCKED_3,
+	SFX_MODEL_FEMALE_VOICE_1_SHOCKED_4,
+	SFX_MODEL_FEMALE_VOICE_1_SHOCKED_5,
+	SFX_MODEL_MALE_VOICE_1_DRIVER_ABUSE_1,
+	SFX_MODEL_MALE_VOICE_1_DRIVER_ABUSE_2,
+	SFX_MODEL_MALE_VOICE_1_DRIVER_ABUSE_3,
+	SFX_MODEL_MALE_VOICE_1_DRIVER_ABUSE_4,
+	SFX_MODEL_MALE_VOICE_1_DRIVER_ABUSE_5,
+	SFX_MODEL_MALE_VOICE_1_DRIVER_ABUSE_6,
+	SFX_MODEL_MALE_VOICE_1_CHAT_1,
+	SFX_MODEL_MALE_VOICE_1_CHAT_2,
+	SFX_MODEL_MALE_VOICE_1_CHAT_3,
+	SFX_MODEL_MALE_VOICE_1_CHAT_4,
+	SFX_MODEL_MALE_VOICE_1_CHAT_5,
+	SFX_MODEL_MALE_VOICE_1_CHAT_6,
+	SFX_MODEL_MALE_VOICE_1_DODGE_1,
+	SFX_MODEL_MALE_VOICE_1_DODGE_2,
+	SFX_MODEL_MALE_VOICE_1_DODGE_3,
+	SFX_MODEL_MALE_VOICE_1_DODGE_4,
+	SFX_MODEL_MALE_VOICE_1_DODGE_5,
+	SFX_MODEL_MALE_VOICE_1_DODGE_6,
+	SFX_MODEL_MALE_VOICE_1_EYING_1,
+	SFX_MODEL_MALE_VOICE_1_EYING_2,
+	SFX_MODEL_MALE_VOICE_1_EYING_3,
+	SFX_MODEL_MALE_VOICE_1_FIGHT_1,
+	SFX_MODEL_MALE_VOICE_1_FIGHT_2,
+	SFX_MODEL_MALE_VOICE_1_FIGHT_3,
+	SFX_MODEL_MALE_VOICE_1_FIGHT_4,
+	SFX_MODEL_MALE_VOICE_1_FIGHT_5,
+	SFX_MODEL_MALE_VOICE_1_CARJACKED_1,
+	SFX_MODEL_MALE_VOICE_1_CARJACKED_2,
+	SFX_MODEL_MALE_VOICE_1_MUGGED_1,
+	SFX_MODEL_MALE_VOICE_1_MUGGED_2,
+	SFX_CHINATOWN_MALE_YOUNG_VOICE_1_DRIVER_ABUSE_1,
+	SFX_CHINATOWN_MALE_YOUNG_VOICE_1_DRIVER_ABUSE_2,
+	SFX_CHINATOWN_MALE_YOUNG_VOICE_1_DRIVER_ABUSE_3,
+	SFX_CHINATOWN_MALE_YOUNG_VOICE_1_DRIVER_ABUSE_4,
+	SFX_CHINATOWN_MALE_YOUNG_VOICE_1_DRIVER_ABUSE_5,
+	SFX_CHINATOWN_MALE_YOUNG_VOICE_1_DRIVER_ABUSE_6,
+	SFX_CHINATOWN_MALE_YOUNG_VOICE_1_CHAT_1,
+	SFX_CHINATOWN_MALE_YOUNG_VOICE_1_CHAT_2,
+	SFX_CHINATOWN_MALE_YOUNG_VOICE_1_CHAT_3,
+	SFX_CHINATOWN_MALE_YOUNG_VOICE_1_CHAT_4,
+	SFX_CHINATOWN_MALE_YOUNG_VOICE_1_CHAT_5,
+	SFX_CHINATOWN_MALE_YOUNG_VOICE_1_CHAT_6,
+	SFX_CHINATOWN_MALE_YOUNG_VOICE_1_DODGE_1,
+	SFX_CHINATOWN_MALE_YOUNG_VOICE_1_DODGE_2,
+	SFX_CHINATOWN_MALE_YOUNG_VOICE_1_DODGE_3,
+	SFX_CHINATOWN_MALE_YOUNG_VOICE_1_DODGE_4,
+	SFX_CHINATOWN_MALE_YOUNG_VOICE_1_DODGE_5,
+	SFX_CHINATOWN_MALE_YOUNG_VOICE_1_EYING_1,
+	SFX_CHINATOWN_MALE_YOUNG_VOICE_1_EYING_2,
+	SFX_CHINATOWN_MALE_YOUNG_VOICE_1_EYING_3,
+	SFX_CHINATOWN_MALE_YOUNG_VOICE_1_FIGHT_1,
+	SFX_CHINATOWN_MALE_YOUNG_VOICE_1_FIGHT_2,
+	SFX_CHINATOWN_MALE_YOUNG_VOICE_1_FIGHT_3,
+	SFX_CHINATOWN_MALE_YOUNG_VOICE_1_FIGHT_4,
+	SFX_CHINATOWN_MALE_YOUNG_VOICE_1_FIGHT_5,
+	SFX_CHINATOWN_MALE_YOUNG_VOICE_1_FIGHT_6,
+	SFX_CHINATOWN_MALE_YOUNG_VOICE_1_GUN_PANIC_1,
+	SFX_CHINATOWN_MALE_YOUNG_VOICE_1_GUN_PANIC_2,
+	SFX_CHINATOWN_MALE_YOUNG_VOICE_1_CARJACKED_1,
+	SFX_CHINATOWN_MALE_YOUNG_VOICE_1_CARJACKED_2,
+	SFX_SCUM_MALE_VOICE_1_DRIVER_ABUSE_1,
+	SFX_SCUM_MALE_VOICE_1_DRIVER_ABUSE_2,
+	SFX_SCUM_MALE_VOICE_1_DRIVER_ABUSE_3,
+	SFX_SCUM_MALE_VOICE_1_DRIVER_ABUSE_4,
+	SFX_SCUM_MALE_VOICE_1_DRIVER_ABUSE_5,
+	SFX_SCUM_MALE_VOICE_1_DRIVER_ABUSE_6,
+	SFX_SCUM_MALE_VOICE_1_CHAT_1,
+	SFX_SCUM_MALE_VOICE_1_CHAT_2,
+	SFX_SCUM_MALE_VOICE_1_CHAT_3,
+	SFX_SCUM_MALE_VOICE_1_CHAT_4,
+	SFX_SCUM_MALE_VOICE_1_CHAT_5,
+	SFX_SCUM_MALE_VOICE_1_CHAT_6,
+	SFX_SCUM_MALE_VOICE_1_CHAT_7,
+	SFX_SCUM_MALE_VOICE_1_CHAT_8,
+	SFX_SCUM_MALE_VOICE_1_CHAT_9,
+	SFX_SCUM_MALE_VOICE_1_DODGE_1,
+	SFX_SCUM_MALE_VOICE_1_DODGE_2,
+	SFX_SCUM_MALE_VOICE_1_DODGE_3,
+	SFX_SCUM_MALE_VOICE_1_DODGE_4,
+	SFX_SCUM_MALE_VOICE_1_DODGE_5,
+	SFX_SCUM_MALE_VOICE_1_EYING_1,
+	SFX_SCUM_MALE_VOICE_1_EYING_2,
+	SFX_SCUM_MALE_VOICE_1_EYING_3,
+	SFX_SCUM_MALE_VOICE_1_EYING_4,
+	SFX_SCUM_MALE_VOICE_1_EYING_5,
+	SFX_SCUM_MALE_VOICE_1_FIGHT_1,
+	SFX_SCUM_MALE_VOICE_1_FIGHT_2,
+	SFX_SCUM_MALE_VOICE_1_FIGHT_3,
+	SFX_SCUM_MALE_VOICE_1_FIGHT_4,
+	SFX_SCUM_MALE_VOICE_1_FIGHT_5,
+	SFX_SCUM_MALE_VOICE_1_FIGHT_6,
+	SFX_SCUM_MALE_VOICE_1_FIGHT_7,
+	SFX_SCUM_MALE_VOICE_1_FIGHT_8,
+	SFX_SCUM_MALE_VOICE_1_FIGHT_9,
+	SFX_SCUM_MALE_VOICE_1_FIGHT_10,
+	SFX_SCUM_MALE_VOICE_1_GUN_PANIC_1,
+	SFX_SCUM_MALE_VOICE_1_GUN_PANIC_2,
+	SFX_SCUM_MALE_VOICE_1_GUN_PANIC_3,
+	SFX_SCUM_MALE_VOICE_1_GUN_PANIC_4,
+	SFX_SCUM_MALE_VOICE_1_GUN_PANIC_5,
+	SFX_SCUM_MALE_VOICE_1_LOST_1,
+	SFX_SCUM_MALE_VOICE_1_LOST_2,
+	SFX_SCUM_MALE_VOICE_1_LOST_3,
+	SFX_SCUM_MALE_VOICE_1_MUGGED_1,
+	SFX_SCUM_FEMALE_VOICE_1_DRIVER_ABUSE_1,
+	SFX_SCUM_FEMALE_VOICE_1_DRIVER_ABUSE_2,
+	SFX_SCUM_FEMALE_VOICE_1_DRIVER_ABUSE_3,
+	SFX_SCUM_FEMALE_VOICE_1_DRIVER_ABUSE_4,
+	SFX_SCUM_FEMALE_VOICE_1_DRIVER_ABUSE_5,
+	SFX_SCUM_FEMALE_VOICE_1_CHAT_1,
+	SFX_SCUM_FEMALE_VOICE_1_CHAT_2,
+	SFX_SCUM_FEMALE_VOICE_1_CHAT_3,
+	SFX_SCUM_FEMALE_VOICE_1_CHAT_4,
+	SFX_SCUM_FEMALE_VOICE_1_CHAT_5,
+	SFX_SCUM_FEMALE_VOICE_1_CHAT_6,
+	SFX_SCUM_FEMALE_VOICE_1_CHAT_7,
+	SFX_SCUM_FEMALE_VOICE_1_CHAT_8,
+	SFX_SCUM_FEMALE_VOICE_1_CHAT_9,
+	SFX_SCUM_FEMALE_VOICE_1_CHAT_10,
+	SFX_SCUM_FEMALE_VOICE_1_CHAT_11,
+	SFX_SCUM_FEMALE_VOICE_1_CHAT_12,
+	SFX_SCUM_FEMALE_VOICE_1_CHAT_13,
+	SFX_SCUM_FEMALE_VOICE_1_DODGE_1,
+	SFX_SCUM_FEMALE_VOICE_1_DODGE_2,
+	SFX_SCUM_FEMALE_VOICE_1_DODGE_3,
+	SFX_SCUM_FEMALE_VOICE_1_DODGE_4,
+	SFX_SCUM_FEMALE_VOICE_1_DODGE_5,
+	SFX_SCUM_FEMALE_VOICE_1_DODGE_6,
+	SFX_SCUM_FEMALE_VOICE_1_DODGE_7,
+	SFX_SCUM_FEMALE_VOICE_1_DODGE_8,
+	SFX_SCUM_FEMALE_VOICE_1_FIGHT_1,
+	SFX_SCUM_FEMALE_VOICE_1_FIGHT_2,
+	SFX_SCUM_FEMALE_VOICE_1_FIGHT_3,
+	SFX_SCUM_FEMALE_VOICE_1_FIGHT_4,
+	SFX_SCUM_FEMALE_VOICE_1_GUN_PANIC_1,
+	SFX_SCUM_FEMALE_VOICE_1_GUN_PANIC_2,
+	SFX_SCUM_FEMALE_VOICE_1_GUN_PANIC_3,
+	SFX_SCUM_FEMALE_VOICE_1_GUN_PANIC_4,
+	SFX_SCUM_FEMALE_VOICE_1_MUGGED_1,
+	SFX_SCUM_FEMALE_VOICE_1_MUGGED_2,
+	SFX_BLACK_PROJECT_FEMALE_YOUNG_VOICE_1_DRIVER_ABUSE_1,
+	SFX_BLACK_PROJECT_FEMALE_YOUNG_VOICE_1_DRIVER_ABUSE_2,
+	SFX_BLACK_PROJECT_FEMALE_YOUNG_VOICE_1_DRIVER_ABUSE_3,
+	SFX_BLACK_PROJECT_FEMALE_YOUNG_VOICE_1_DRIVER_ABUSE_4,
+	SFX_BLACK_PROJECT_FEMALE_YOUNG_VOICE_1_DRIVER_ABUSE_5,
+	SFX_BLACK_PROJECT_FEMALE_YOUNG_VOICE_1_DRIVER_ABUSE_6,
+	SFX_BLACK_PROJECT_FEMALE_YOUNG_VOICE_1_CHAT_1,
+	SFX_BLACK_PROJECT_FEMALE_YOUNG_VOICE_1_CHAT_2,
+	SFX_BLACK_PROJECT_FEMALE_YOUNG_VOICE_1_CHAT_3,
+	SFX_BLACK_PROJECT_FEMALE_YOUNG_VOICE_1_CHAT_4,
+	SFX_BLACK_PROJECT_FEMALE_YOUNG_VOICE_1_CHAT_5,
+	SFX_BLACK_PROJECT_FEMALE_YOUNG_VOICE_1_CHAT_6,
+	SFX_BLACK_PROJECT_FEMALE_YOUNG_VOICE_1_CHAT_7,
+	SFX_BLACK_PROJECT_FEMALE_YOUNG_VOICE_1_DODGE_1,
+	SFX_BLACK_PROJECT_FEMALE_YOUNG_VOICE_1_DODGE_2,
+	SFX_BLACK_PROJECT_FEMALE_YOUNG_VOICE_1_DODGE_3,
+	SFX_BLACK_PROJECT_FEMALE_YOUNG_VOICE_1_DODGE_4,
+	SFX_BLACK_PROJECT_FEMALE_YOUNG_VOICE_1_DODGE_5,
+	SFX_BLACK_PROJECT_FEMALE_YOUNG_VOICE_1_GUN_PANIC_1,
+	SFX_BLACK_PROJECT_FEMALE_YOUNG_VOICE_1_GUN_PANIC_2,
+	SFX_BLACK_PROJECT_FEMALE_YOUNG_VOICE_1_GUN_PANIC_3,
+	SFX_BLACK_PROJECT_FEMALE_YOUNG_VOICE_1_GUN_PANIC_4,
+	SFX_BLACK_PROJECT_FEMALE_YOUNG_VOICE_1_CARJACKED_1,
+	SFX_BLACK_PROJECT_FEMALE_YOUNG_VOICE_1_MUGGED_1,
+	SFX_BLACK_PROJECT_FEMALE_YOUNG_VOICE_1_MUGGED_2,
+	SFX_BLACK_PROJECT_FEMALE_YOUNG_VOICE_1_SHOCKED_1,
+	SFX_BLACK_PROJECT_FEMALE_YOUNG_VOICE_1_SHOCKED_2,
+	SFX_BLACK_PROJECT_FEMALE_YOUNG_VOICE_1_SHOCKED_3,
+	SFX_BLACK_PROJECT_FEMALE_YOUNG_VOICE_1_SHOCKED_4,
+	SFX_BLACK_PROJECT_FEMALE_YOUNG_VOICE_1_SHOCKED_5,
+	SFX_BUSINESS_MALE_YOUNG_VOICE_1_DRIVER_ABUSE_1,
+	SFX_BUSINESS_MALE_YOUNG_VOICE_1_DRIVER_ABUSE_2,
+	SFX_BUSINESS_MALE_YOUNG_VOICE_1_DRIVER_ABUSE_3,
+	SFX_BUSINESS_MALE_YOUNG_VOICE_1_DRIVER_ABUSE_4,
+	SFX_BUSINESS_MALE_YOUNG_VOICE_1_DRIVER_ABUSE_5,
+	SFX_BUSINESS_MALE_YOUNG_VOICE_1_DRIVER_ABUSE_6,
+	SFX_BUSINESS_MALE_YOUNG_VOICE_1_CHAT_1,
+	SFX_BUSINESS_MALE_YOUNG_VOICE_1_CHAT_2,
+	SFX_BUSINESS_MALE_YOUNG_VOICE_1_CHAT_3,
+	SFX_BUSINESS_MALE_YOUNG_VOICE_1_CHAT_4,
+	SFX_BUSINESS_MALE_YOUNG_VOICE_1_CHAT_5,
+	SFX_BUSINESS_MALE_YOUNG_VOICE_1_CHAT_6,
+	SFX_BUSINESS_MALE_YOUNG_VOICE_1_DODGE_1,
+	SFX_BUSINESS_MALE_YOUNG_VOICE_1_DODGE_2,
+	SFX_BUSINESS_MALE_YOUNG_VOICE_1_DODGE_3,
+	SFX_BUSINESS_MALE_YOUNG_VOICE_1_DODGE_4,
+	SFX_BUSINESS_MALE_YOUNG_VOICE_1_FIGHT_1,
+	SFX_BUSINESS_MALE_YOUNG_VOICE_1_FIGHT_2,
+	SFX_BUSINESS_MALE_YOUNG_VOICE_1_FIGHT_3,
+	SFX_BUSINESS_MALE_YOUNG_VOICE_1_FIGHT_4,
+	SFX_BUSINESS_MALE_YOUNG_VOICE_1_GUN_PANIC_1,
+	SFX_BUSINESS_MALE_YOUNG_VOICE_1_GUN_PANIC_2,
+	SFX_BUSINESS_MALE_YOUNG_VOICE_1_GUN_PANIC_3,
+	SFX_BUSINESS_MALE_YOUNG_VOICE_1_CARJACKED_1,
+	SFX_BUSINESS_MALE_YOUNG_VOICE_1_CARJACKED_2,
+	SFX_BUSINESS_MALE_YOUNG_VOICE_1_MUGGED_1,
+	SFX_BUSINESS_MALE_YOUNG_VOICE_1_MUGGED_2,
+	SFX_BUSINESS_MALE_YOUNG_VOICE_1_RUN_FROM_FIGHT_1,
+	SFX_BUSINESS_MALE_YOUNG_VOICE_1_RUN_FROM_FIGHT_2,
+	SFX_BUSINESS_MALE_YOUNG_VOICE_1_RUN_FROM_FIGHT_3,
+	SFX_BUSINESS_MALE_YOUNG_VOICE_1_RUN_FROM_FIGHT_4,
+	SFX_BUSINESS_MALE_YOUNG_VOICE_1_RUN_FROM_FIGHT_5,
+	SFX_BUSINESS_MALE_YOUNG_VOICE_2_DRIVER_ABUSE_1,
+	SFX_BUSINESS_MALE_YOUNG_VOICE_2_DRIVER_ABUSE_2,
+	SFX_BUSINESS_MALE_YOUNG_VOICE_2_DRIVER_ABUSE_3,
+	SFX_BUSINESS_MALE_YOUNG_VOICE_2_DRIVER_ABUSE_4,
+	SFX_BUSINESS_MALE_YOUNG_VOICE_2_DRIVER_ABUSE_5,
+	SFX_BUSINESS_MALE_YOUNG_VOICE_2_DRIVER_ABUSE_6,
+	SFX_BUSINESS_MALE_YOUNG_VOICE_2_CHAT_1,
+	SFX_BUSINESS_MALE_YOUNG_VOICE_2_CHAT_2,
+	SFX_BUSINESS_MALE_YOUNG_VOICE_2_CHAT_3,
+	SFX_BUSINESS_MALE_YOUNG_VOICE_2_CHAT_4,
+	SFX_BUSINESS_MALE_YOUNG_VOICE_2_CHAT_5,
+	SFX_BUSINESS_MALE_YOUNG_VOICE_2_CHAT_6,
+	SFX_BUSINESS_MALE_YOUNG_VOICE_2_DODGE_1,
+	SFX_BUSINESS_MALE_YOUNG_VOICE_2_DODGE_2,
+	SFX_BUSINESS_MALE_YOUNG_VOICE_2_DODGE_3,
+	SFX_BUSINESS_MALE_YOUNG_VOICE_2_DODGE_4,
+	SFX_BUSINESS_MALE_YOUNG_VOICE_2_FIGHT_1,
+	SFX_BUSINESS_MALE_YOUNG_VOICE_2_FIGHT_2,
+	SFX_BUSINESS_MALE_YOUNG_VOICE_2_FIGHT_3,
+	SFX_BUSINESS_MALE_YOUNG_VOICE_2_FIGHT_4,
+	SFX_BUSINESS_MALE_YOUNG_VOICE_2_GUN_PANIC_1,
+	SFX_BUSINESS_MALE_YOUNG_VOICE_2_GUN_PANIC_2,
+	SFX_BUSINESS_MALE_YOUNG_VOICE_2_GUN_PANIC_3,
+	SFX_BUSINESS_MALE_YOUNG_VOICE_2_CARJACKED_1,
+	SFX_BUSINESS_MALE_YOUNG_VOICE_2_CARJACKED_2,
+	SFX_BUSINESS_MALE_YOUNG_VOICE_2_MUGGED_1,
+	SFX_BUSINESS_MALE_YOUNG_VOICE_2_MUGGED_2,
+	SFX_BUSINESS_MALE_YOUNG_VOICE_2_RUN_FROM_FIGHT_1,
+	SFX_BUSINESS_MALE_YOUNG_VOICE_2_RUN_FROM_FIGHT_2,
+	SFX_BUSINESS_MALE_YOUNG_VOICE_2_RUN_FROM_FIGHT_3,
+	SFX_BUSINESS_MALE_YOUNG_VOICE_2_RUN_FROM_FIGHT_4,
+	SFX_BUSINESS_MALE_YOUNG_VOICE_2_RUN_FROM_FIGHT_5,
+	SFX_BLACK_FAT_FEMALE_VOICE_1_DRIVER_ABUSE_1,
+	SFX_BLACK_FAT_FEMALE_VOICE_1_DRIVER_ABUSE_2,
+	SFX_BLACK_FAT_FEMALE_VOICE_1_DRIVER_ABUSE_3,
+	SFX_BLACK_FAT_FEMALE_VOICE_1_DRIVER_ABUSE_4,
+	SFX_BLACK_FAT_FEMALE_VOICE_1_DRIVER_ABUSE_5,
+	SFX_BLACK_FAT_FEMALE_VOICE_1_DRIVER_ABUSE_6,
+	SFX_BLACK_FAT_FEMALE_VOICE_1_CHAT_1,
+	SFX_BLACK_FAT_FEMALE_VOICE_1_CHAT_2,
+	SFX_BLACK_FAT_FEMALE_VOICE_1_CHAT_3,
+	SFX_BLACK_FAT_FEMALE_VOICE_1_CHAT_4,
+	SFX_BLACK_FAT_FEMALE_VOICE_1_CHAT_5,
+	SFX_BLACK_FAT_FEMALE_VOICE_1_CHAT_6,
+	SFX_BLACK_FAT_FEMALE_VOICE_1_CHAT_7,
+	SFX_BLACK_FAT_FEMALE_VOICE_1_DODGE_1,
+	SFX_BLACK_FAT_FEMALE_VOICE_1_DODGE_2,
+	SFX_BLACK_FAT_FEMALE_VOICE_1_DODGE_3,
+	SFX_BLACK_FAT_FEMALE_VOICE_1_DODGE_4,
+	SFX_BLACK_FAT_FEMALE_VOICE_1_DODGE_5,
+	SFX_BLACK_FAT_FEMALE_VOICE_1_GUN_PANIC_1,
+	SFX_BLACK_FAT_FEMALE_VOICE_1_GUN_PANIC_2,
+	SFX_BLACK_FAT_FEMALE_VOICE_1_GUN_PANIC_3,
+	SFX_BLACK_FAT_FEMALE_VOICE_1_GUN_PANIC_4,
+	SFX_BLACK_FAT_FEMALE_VOICE_1_CARJACKED_1,
+	SFX_BLACK_FAT_FEMALE_VOICE_1_CARJACKED_2,
+	SFX_BLACK_FAT_FEMALE_VOICE_1_MUGGED_1,
+	SFX_BLACK_FAT_FEMALE_VOICE_1_MUGGED_2,
+	SFX_BLACK_FAT_FEMALE_VOICE_1_SHOCKED_1,
+	SFX_BLACK_FAT_FEMALE_VOICE_1_SHOCKED_2,
+	SFX_BLACK_FAT_FEMALE_VOICE_1_SHOCKED_3,
+	SFX_BLACK_FAT_FEMALE_VOICE_1_SHOCKED_4,
+	SFX_BLACK_FAT_FEMALE_VOICE_1_SHOCKED_5,
+	SFX_WHITE_DOCKER_MALE_VOICE_1_DRIVER_ABUSE_1,
+	SFX_WHITE_DOCKER_MALE_VOICE_1_DRIVER_ABUSE_2,
+	SFX_WHITE_DOCKER_MALE_VOICE_1_DRIVER_ABUSE_3,
+	SFX_WHITE_DOCKER_MALE_VOICE_1_DRIVER_ABUSE_4,
+	SFX_WHITE_DOCKER_MALE_VOICE_1_CHAT_1,
+	SFX_WHITE_DOCKER_MALE_VOICE_1_CHAT_2,
+	SFX_WHITE_DOCKER_MALE_VOICE_1_CHAT_3,
+	SFX_WHITE_DOCKER_MALE_VOICE_1_CHAT_4,
+	SFX_WHITE_DOCKER_MALE_VOICE_1_CHAT_5,
+	SFX_WHITE_DOCKER_MALE_VOICE_1_DODGE_1,
+	SFX_WHITE_DOCKER_MALE_VOICE_1_DODGE_2,
+	SFX_WHITE_DOCKER_MALE_VOICE_1_DODGE_3,
+	SFX_WHITE_DOCKER_MALE_VOICE_1_DODGE_4,
+	SFX_WHITE_DOCKER_MALE_VOICE_1_EYING_1,
+	SFX_WHITE_DOCKER_MALE_VOICE_1_EYING_2,
+	SFX_WHITE_DOCKER_MALE_VOICE_1_EYING_3,
+	SFX_WHITE_DOCKER_MALE_VOICE_1_FIGHT_1,
+	SFX_WHITE_DOCKER_MALE_VOICE_1_FIGHT_2,
+	SFX_WHITE_DOCKER_MALE_VOICE_1_FIGHT_3,
+	SFX_WHITE_DOCKER_MALE_VOICE_1_GUN_PANIC_1,
+	SFX_WHITE_DOCKER_MALE_VOICE_1_GUN_PANIC_2,
+	SFX_HOSPITAL_MALE_VOICE_1_DRIVER_ABUSE_1,
+	SFX_HOSPITAL_MALE_VOICE_1_DRIVER_ABUSE_2,
+	SFX_HOSPITAL_MALE_VOICE_1_DRIVER_ABUSE_3,
+	SFX_HOSPITAL_MALE_VOICE_1_DRIVER_ABUSE_4,
+	SFX_HOSPITAL_MALE_VOICE_1_DRIVER_ABUSE_5,
+	SFX_HOSPITAL_MALE_VOICE_1_CHAT_1,
+	SFX_HOSPITAL_MALE_VOICE_1_CHAT_2,
+	SFX_HOSPITAL_MALE_VOICE_1_CHAT_3,
+	SFX_HOSPITAL_MALE_VOICE_1_CHAT_4,
+	SFX_HOSPITAL_MALE_VOICE_1_CHAT_5,
+	SFX_HOSPITAL_MALE_VOICE_1_DODGE_1,
+	SFX_HOSPITAL_MALE_VOICE_1_DODGE_2,
+	SFX_HOSPITAL_MALE_VOICE_1_DODGE_3,
+	SFX_HOSPITAL_MALE_VOICE_1_DODGE_4,
+	SFX_HOSPITAL_MALE_VOICE_1_FIGHT_1,
+	SFX_HOSPITAL_MALE_VOICE_1_FIGHT_2,
+	SFX_HOSPITAL_MALE_VOICE_1_FIGHT_3,
+	SFX_HOSPITAL_MALE_VOICE_1_FIGHT_4,
+	SFX_HOSPITAL_MALE_VOICE_1_GUN_PANIC_1,
+	SFX_HOSPITAL_MALE_VOICE_1_GUN_PANIC_2,
+	SFX_HOSPITAL_MALE_VOICE_1_GUN_PANIC_3,
+	SFX_HOSPITAL_MALE_VOICE_1_GUN_PANIC_4,
+	SFX_HOSPITAL_FEMALE_VOICE_1_DRIVER_ABUSE_1,
+	SFX_HOSPITAL_FEMALE_VOICE_1_DRIVER_ABUSE_2,
+	SFX_HOSPITAL_FEMALE_VOICE_1_DRIVER_ABUSE_3,
+	SFX_HOSPITAL_FEMALE_VOICE_1_DRIVER_ABUSE_4,
+	SFX_HOSPITAL_FEMALE_VOICE_1_DRIVER_ABUSE_5,
+	SFX_HOSPITAL_FEMALE_VOICE_1_DRIVER_ABUSE_6,
+	SFX_HOSPITAL_FEMALE_VOICE_1_CHAT_1,
+	SFX_HOSPITAL_FEMALE_VOICE_1_CHAT_2,
+	SFX_HOSPITAL_FEMALE_VOICE_1_CHAT_3,
+	SFX_HOSPITAL_FEMALE_VOICE_1_CHAT_4,
+	SFX_HOSPITAL_FEMALE_VOICE_1_CHAT_5,
+	SFX_HOSPITAL_FEMALE_VOICE_1_CHAT_6,
+	SFX_HOSPITAL_FEMALE_VOICE_1_DODGE_1,
+	SFX_HOSPITAL_FEMALE_VOICE_1_DODGE_2,
+	SFX_HOSPITAL_FEMALE_VOICE_1_DODGE_3,
+	SFX_HOSPITAL_FEMALE_VOICE_1_DODGE_4,
+	SFX_HOSPITAL_FEMALE_VOICE_1_DODGE_5,
+	SFX_FEMALE_1_VOICE_1_DRIVER_ABUSE_1,
+	SFX_FEMALE_1_VOICE_1_DRIVER_ABUSE_2,
+	SFX_FEMALE_1_VOICE_1_DRIVER_ABUSE_3,
+	SFX_FEMALE_1_VOICE_1_DRIVER_ABUSE_4,
+	SFX_FEMALE_1_VOICE_1_DRIVER_ABUSE_5,
+	SFX_FEMALE_1_VOICE_1_DRIVER_ABUSE_6,
+	SFX_FEMALE_1_VOICE_1_DRIVER_ABUSE_7,
+	SFX_FEMALE_1_VOICE_1_CHAT_1,
+	SFX_FEMALE_1_VOICE_1_CHAT_2,
+	SFX_FEMALE_1_VOICE_1_CHAT_3,
+	SFX_FEMALE_1_VOICE_1_CHAT_4,
+	SFX_FEMALE_1_VOICE_1_CHAT_5,
+	SFX_FEMALE_1_VOICE_1_CHAT_6,
+	SFX_FEMALE_1_VOICE_1_CHAT_7,
+	SFX_FEMALE_1_VOICE_1_CHAT_8,
+	SFX_FEMALE_1_VOICE_1_DODGE_1,
+	SFX_FEMALE_1_VOICE_1_DODGE_2,
+	SFX_FEMALE_1_VOICE_1_DODGE_3,
+	SFX_FEMALE_1_VOICE_1_DODGE_4,
+	SFX_FEMALE_1_VOICE_1_DODGE_5,
+	SFX_FEMALE_1_VOICE_1_DODGE_6,
+	SFX_FEMALE_1_VOICE_1_GUN_PANIC_1,
+	SFX_FEMALE_1_VOICE_1_GUN_PANIC_2,
+	SFX_FEMALE_1_VOICE_1_CARJACKED_1,
+	SFX_FEMALE_1_VOICE_1_CARJACKED_2,
+	SFX_FEMALE_1_VOICE_1_MUGGED_1,
+	SFX_FEMALE_1_VOICE_1_MUGGED_2,
+	SFX_FEMALE_1_VOICE_1_MUGGED_3,
+	SFX_FEMALE_1_VOICE_1_RUN_FROM_FIGHT_1,
+	SFX_FEMALE_1_VOICE_1_RUN_FROM_FIGHT_2,
+	SFX_FEMALE_1_VOICE_1_SHOCKED_1,
+	SFX_FEMALE_1_VOICE_1_SHOCKED_2,
+	SFX_FEMALE_1_VOICE_1_SHOCKED_3,
+	SFX_FEMALE_1_VOICE_1_SHOCKED_4,
+	SFX_FEMALE_3_VOICE_1_DRIVER_ABUSE_1,
+	SFX_FEMALE_3_VOICE_1_DRIVER_ABUSE_2,
+	SFX_FEMALE_3_VOICE_1_DRIVER_ABUSE_3,
+	SFX_FEMALE_3_VOICE_1_DRIVER_ABUSE_4,
+	SFX_FEMALE_3_VOICE_1_DRIVER_ABUSE_5,
+	SFX_FEMALE_3_VOICE_1_DRIVER_ABUSE_6,
+	SFX_FEMALE_3_VOICE_1_CHAT_1,
+	SFX_FEMALE_3_VOICE_1_CHAT_2,
+	SFX_FEMALE_3_VOICE_1_CHAT_3,
+	SFX_FEMALE_3_VOICE_1_CHAT_4,
+	SFX_FEMALE_3_VOICE_1_CHAT_5,
+	SFX_FEMALE_3_VOICE_1_DODGE_1,
+	SFX_FEMALE_3_VOICE_1_DODGE_2,
+	SFX_FEMALE_3_VOICE_1_DODGE_3,
+	SFX_FEMALE_3_VOICE_1_DODGE_4,
+	SFX_FEMALE_3_VOICE_1_DODGE_5,
+	SFX_FEMALE_3_VOICE_1_DODGE_6,
+	SFX_FEMALE_3_VOICE_1_GUN_PANIC_1,
+	SFX_FEMALE_3_VOICE_1_GUN_PANIC_2,
+	SFX_FEMALE_3_VOICE_1_GUN_PANIC_3,
+	SFX_FEMALE_3_VOICE_1_GUN_PANIC_4,
+	SFX_FEMALE_3_VOICE_1_GUN_PANIC_5,
+	SFX_FEMALE_3_VOICE_1_CARJACKED_1,
+	SFX_FEMALE_3_VOICE_1_CARJACKED_2,
+	SFX_FEMALE_3_VOICE_1_CARJACKED_3,
+	SFX_FEMALE_3_VOICE_1_MUGGED_1,
+	SFX_FEMALE_3_VOICE_1_MUGGED_2,
+	SFX_FEMALE_3_VOICE_1_MUGGED_3,
+	SFX_FEMALE_3_VOICE_1_RUN_FROM_FIGHT_1,
+	SFX_FEMALE_3_VOICE_1_RUN_FROM_FIGHT_2,
+	SFX_FEMALE_3_VOICE_1_RUN_FROM_FIGHT_3,
+	SFX_FEMALE_3_VOICE_1_RUN_FROM_FIGHT_4,
+	SFX_FEMALE_3_VOICE_1_SHOCKED_1,
+	SFX_FEMALE_3_VOICE_1_SHOCKED_2,
+	SFX_FEMALE_3_VOICE_1_SHOCKED_3,
+	SFX_FEMALE_3_VOICE_1_SHOCKED_4,
+	SFX_CASUAL_MALE_OLD_VOICE_1_DRIVER_ABUSE_1,
+	SFX_CASUAL_MALE_OLD_VOICE_1_DRIVER_ABUSE_2,
+	SFX_CASUAL_MALE_OLD_VOICE_1_DRIVER_ABUSE_3,
+	SFX_CASUAL_MALE_OLD_VOICE_1_DRIVER_ABUSE_4,
+	SFX_CASUAL_MALE_OLD_VOICE_1_DRIVER_ABUSE_5,
+	SFX_CASUAL_MALE_OLD_VOICE_1_DRIVER_ABUSE_6,
+	SFX_CASUAL_MALE_OLD_VOICE_1_DRIVER_ABUSE_7,
+	SFX_CASUAL_MALE_OLD_VOICE_1_CHAT_1,
+	SFX_CASUAL_MALE_OLD_VOICE_1_CHAT_2,
+	SFX_CASUAL_MALE_OLD_VOICE_1_CHAT_3,
+	SFX_CASUAL_MALE_OLD_VOICE_1_CHAT_4,
+	SFX_CASUAL_MALE_OLD_VOICE_1_CHAT_5,
+	SFX_CASUAL_MALE_OLD_VOICE_1_CHAT_6,
+	SFX_CASUAL_MALE_OLD_VOICE_1_CHAT_7,
+	SFX_CASUAL_MALE_OLD_VOICE_1_DODGE_1,
+	SFX_CASUAL_MALE_OLD_VOICE_1_DODGE_2,
+	SFX_CASUAL_MALE_OLD_VOICE_1_DODGE_3,
+	SFX_CASUAL_MALE_OLD_VOICE_1_DODGE_4,
+	SFX_CASUAL_MALE_OLD_VOICE_1_EYING_1,
+	SFX_CASUAL_MALE_OLD_VOICE_1_EYING_2,
+	SFX_CASUAL_MALE_OLD_VOICE_1_EYING_3,
+	SFX_CASUAL_MALE_OLD_VOICE_1_EYING_4,
+	SFX_CASUAL_MALE_OLD_VOICE_1_EYING_5,
+	SFX_CASUAL_MALE_OLD_VOICE_1_FIGHT_1,
+	SFX_CASUAL_MALE_OLD_VOICE_1_FIGHT_2,
+	SFX_CASUAL_MALE_OLD_VOICE_1_FIGHT_3,
+	SFX_CASUAL_MALE_OLD_VOICE_1_FIGHT_4,
+	SFX_CASUAL_MALE_OLD_VOICE_1_CARJACKED_1,
+	SFX_CASUAL_MALE_OLD_VOICE_1_CARJACKED_2,
+	SFX_CASUAL_MALE_OLD_VOICE_1_CARJACKED_3,
+	SFX_CASUAL_MALE_OLD_VOICE_1_MUGGED_1,
+	SFX_CASUAL_MALE_OLD_VOICE_1_MUGGED_2,
+	SFX_CASUAL_MALE_OLD_VOICE_1_MUGGED_3,
+	SFX_CASUAL_MALE_OLD_VOICE_1_MUGGED_4,
+	SFX_STUDENT_MALE_VOICE_1_DRIVER_ABUSE_1,
+	SFX_STUDENT_MALE_VOICE_1_DRIVER_ABUSE_2,
+	SFX_STUDENT_MALE_VOICE_1_DRIVER_ABUSE_3,
+	SFX_STUDENT_MALE_VOICE_1_DRIVER_ABUSE_4,
+	SFX_STUDENT_MALE_VOICE_1_CHAT_1,
+	SFX_STUDENT_MALE_VOICE_1_CHAT_2,
+	SFX_STUDENT_MALE_VOICE_1_CHAT_3,
+	SFX_STUDENT_MALE_VOICE_1_CHAT_4,
+	SFX_STUDENT_MALE_VOICE_1_CHAT_5,
+	SFX_STUDENT_MALE_VOICE_1_DODGE_1,
+	SFX_STUDENT_MALE_VOICE_1_DODGE_2,
+	SFX_STUDENT_MALE_VOICE_1_DODGE_3,
+	SFX_STUDENT_MALE_VOICE_1_DODGE_4,
+	SFX_STUDENT_MALE_VOICE_1_FIGHT_1,
+	SFX_STUDENT_MALE_VOICE_1_FIGHT_2,
+	SFX_STUDENT_MALE_VOICE_1_FIGHT_3,
+	SFX_STUDENT_MALE_VOICE_1_FIGHT_4,
+	SFX_STUDENT_MALE_VOICE_1_GUN_PANIC_1,
+	SFX_STUDENT_MALE_VOICE_1_GUN_PANIC_2,
+	SFX_STUDENT_MALE_VOICE_1_MUGGED_1,
+	SFX_STUDENT_MALE_VOICE_1_MUGGED_2,
+	SFX_STUDENT_MALE_VOICE_1_SHOCKED_1,
+	SFX_STUDENT_MALE_VOICE_1_SHOCKED_2,
+	SFX_STUDENT_MALE_VOICE_1_SHOCKED_3,
+	SFX_STUDENT_FEMALE_VOICE_1_DRIVER_ABUSE_1,
+	SFX_STUDENT_FEMALE_VOICE_1_DRIVER_ABUSE_2,
+	SFX_STUDENT_FEMALE_VOICE_1_DRIVER_ABUSE_3,
+	SFX_STUDENT_FEMALE_VOICE_1_DRIVER_ABUSE_4,
+	SFX_STUDENT_FEMALE_VOICE_1_CHAT_1,
+	SFX_STUDENT_FEMALE_VOICE_1_CHAT_2,
+	SFX_STUDENT_FEMALE_VOICE_1_CHAT_3,
+	SFX_STUDENT_FEMALE_VOICE_1_CHAT_4,
+	SFX_STUDENT_FEMALE_VOICE_1_DODGE_1,
+	SFX_STUDENT_FEMALE_VOICE_1_DODGE_2,
+	SFX_STUDENT_FEMALE_VOICE_1_DODGE_3,
+	SFX_STUDENT_FEMALE_VOICE_1_DODGE_4,
+	SFX_STUDENT_FEMALE_VOICE_1_FIGHT_1,
+	SFX_STUDENT_FEMALE_VOICE_1_FIGHT_2,
+	SFX_STUDENT_FEMALE_VOICE_1_FIGHT_3,
+	SFX_STUDENT_FEMALE_VOICE_1_FIGHT_4,
+	SFX_STUDENT_FEMALE_VOICE_1_GUN_PANIC_1,
+	SFX_STUDENT_FEMALE_VOICE_1_GUN_PANIC_2,
+	SFX_STUDENT_FEMALE_VOICE_1_GUN_PANIC_3,
+	SFX_STUDENT_FEMALE_VOICE_1_GUN_PANIC_4,
+	SFX_STUDENT_FEMALE_VOICE_1_MUGGED_1,
+	SFX_STUDENT_FEMALE_VOICE_1_MUGGED_2,
+	SFX_STUDENT_FEMALE_VOICE_1_SHOCKED_1,
+	SFX_STUDENT_FEMALE_VOICE_1_SHOCKED_2,
+	SFX_HOOD_MALE_VOICE_1_DRIVER_ABUSE_1,
+	SFX_HOOD_MALE_VOICE_1_DRIVER_ABUSE_2,
+	SFX_HOOD_MALE_VOICE_1_DRIVER_ABUSE_3,
+	SFX_HOOD_MALE_VOICE_1_DRIVER_ABUSE_4,
+	SFX_HOOD_MALE_VOICE_1_DRIVER_ABUSE_5,
+	SFX_HOOD_MALE_VOICE_1_DRIVER_ABUSE_6,
+	SFX_HOOD_MALE_VOICE_1_DRIVER_ABUSE_7,
+	SFX_HOOD_MALE_VOICE_1_CHAT_1,
+	SFX_HOOD_MALE_VOICE_1_CHAT_2,
+	SFX_HOOD_MALE_VOICE_1_CHAT_3,
+	SFX_HOOD_MALE_VOICE_1_CHAT_4,
+	SFX_HOOD_MALE_VOICE_1_CHAT_5,
+	SFX_HOOD_MALE_VOICE_1_CHAT_6,
+	SFX_HOOD_MALE_VOICE_1_DODGE_1,
+	SFX_HOOD_MALE_VOICE_1_DODGE_2,
+	SFX_HOOD_MALE_VOICE_1_DODGE_3,
+	SFX_HOOD_MALE_VOICE_1_DODGE_4,
+	SFX_HOOD_MALE_VOICE_1_DODGE_5,
+	SFX_HOOD_MALE_VOICE_1_EYING_1,
+	SFX_HOOD_MALE_VOICE_1_EYING_2,
+	SFX_HOOD_MALE_VOICE_1_FIGHT_1,
+	SFX_HOOD_MALE_VOICE_1_FIGHT_2,
+	SFX_HOOD_MALE_VOICE_1_FIGHT_3,
+	SFX_HOOD_MALE_VOICE_1_FIGHT_4,
+	SFX_HOOD_MALE_VOICE_1_FIGHT_5,
+	SFX_HOOD_MALE_VOICE_1_FIGHT_6,
+	SFX_HOOD_MALE_VOICE_1_GUN_COOL_1,
+	SFX_HOOD_MALE_VOICE_1_GUN_COOL_2,
+	SFX_HOOD_MALE_VOICE_1_GUN_COOL_3,
+	SFX_HOOD_MALE_VOICE_1_GUN_COOL_4,
+	SFX_HOOD_MALE_VOICE_1_GUN_COOL_5,
+	SFX_HOOD_MALE_VOICE_1_CARJACKED_1,
+	SFX_HOOD_MALE_VOICE_1_CARJACKED_2,
+	SFX_HOOD_MALE_VOICE_1_CARJACKING_1,
+	SFX_HOOD_MALE_VOICE_1_CARJACKING_2,
+	SFX_HOOD_MALE_VOICE_2_DRIVER_ABUSE_1,
+	SFX_HOOD_MALE_VOICE_2_DRIVER_ABUSE_2,
+	SFX_HOOD_MALE_VOICE_2_DRIVER_ABUSE_3,
+	SFX_HOOD_MALE_VOICE_2_DRIVER_ABUSE_4,
+	SFX_HOOD_MALE_VOICE_2_DRIVER_ABUSE_5,
+	SFX_HOOD_MALE_VOICE_2_DRIVER_ABUSE_6,
+	SFX_HOOD_MALE_VOICE_2_DRIVER_ABUSE_7,
+	SFX_HOOD_MALE_VOICE_2_CHAT_1,
+	SFX_HOOD_MALE_VOICE_2_CHAT_2,
+	SFX_HOOD_MALE_VOICE_2_CHAT_3,
+	SFX_HOOD_MALE_VOICE_2_CHAT_4,
+	SFX_HOOD_MALE_VOICE_2_CHAT_5,
+	SFX_HOOD_MALE_VOICE_2_CHAT_6,
+	SFX_HOOD_MALE_VOICE_2_DODGE_1,
+	SFX_HOOD_MALE_VOICE_2_DODGE_2,
+	SFX_HOOD_MALE_VOICE_2_DODGE_3,
+	SFX_HOOD_MALE_VOICE_2_DODGE_4,
+	SFX_HOOD_MALE_VOICE_2_DODGE_5,
+	SFX_HOOD_MALE_VOICE_2_EYING_1,
+	SFX_HOOD_MALE_VOICE_2_EYING_2,
+	SFX_HOOD_MALE_VOICE_2_FIGHT_1,
+	SFX_HOOD_MALE_VOICE_2_FIGHT_2,
+	SFX_HOOD_MALE_VOICE_2_FIGHT_3,
+	SFX_HOOD_MALE_VOICE_2_FIGHT_4,
+	SFX_HOOD_MALE_VOICE_2_FIGHT_5,
+	SFX_HOOD_MALE_VOICE_2_FIGHT_6,
+	SFX_HOOD_MALE_VOICE_2_GUN_COOL_1,
+	SFX_HOOD_MALE_VOICE_2_GUN_COOL_2,
+	SFX_HOOD_MALE_VOICE_2_GUN_COOL_3,
+	SFX_HOOD_MALE_VOICE_2_GUN_COOL_4,
+	SFX_HOOD_MALE_VOICE_2_GUN_COOL_5,
+	SFX_HOOD_MALE_VOICE_2_CARJACKED_1,
+	SFX_HOOD_MALE_VOICE_2_CARJACKED_2,
+	SFX_HOOD_MALE_VOICE_2_CARJACKING_1,
+	SFX_HOOD_MALE_VOICE_2_CARJACKING_2,
+	SFX_YARDIE_MALE_VOICE_1_DRIVER_ABUSE_1,
+	SFX_YARDIE_MALE_VOICE_1_DRIVER_ABUSE_2,
+	SFX_YARDIE_MALE_VOICE_1_DRIVER_ABUSE_3,
+	SFX_YARDIE_MALE_VOICE_1_DRIVER_ABUSE_4,
+	SFX_YARDIE_MALE_VOICE_1_DRIVER_ABUSE_5,
+	SFX_YARDIE_MALE_VOICE_1_DRIVER_ABUSE_6,
+	SFX_YARDIE_MALE_VOICE_1_CHAT_1,
+	SFX_YARDIE_MALE_VOICE_1_CHAT_2,
+	SFX_YARDIE_MALE_VOICE_1_CHAT_3,
+	SFX_YARDIE_MALE_VOICE_1_CHAT_4,
+	SFX_YARDIE_MALE_VOICE_1_CHAT_5,
+	SFX_YARDIE_MALE_VOICE_1_CHAT_6,
+	SFX_YARDIE_MALE_VOICE_1_CHAT_7,
+	SFX_YARDIE_MALE_VOICE_1_CHAT_8,
+	SFX_YARDIE_MALE_VOICE_1_DODGE_1,
+	SFX_YARDIE_MALE_VOICE_1_DODGE_2,
+	SFX_YARDIE_MALE_VOICE_1_DODGE_3,
+	SFX_YARDIE_MALE_VOICE_1_DODGE_4,
+	SFX_YARDIE_MALE_VOICE_1_DODGE_5,
+	SFX_YARDIE_MALE_VOICE_1_EYING_1,
+	SFX_YARDIE_MALE_VOICE_1_EYING_2,
+	SFX_YARDIE_MALE_VOICE_1_FIGHT_1,
+	SFX_YARDIE_MALE_VOICE_1_FIGHT_2,
+	SFX_YARDIE_MALE_VOICE_1_FIGHT_3,
+	SFX_YARDIE_MALE_VOICE_1_FIGHT_4,
+	SFX_YARDIE_MALE_VOICE_1_FIGHT_5,
+	SFX_YARDIE_MALE_VOICE_1_FIGHT_6,
+	SFX_YARDIE_MALE_VOICE_1_GUN_COOL_1,
+	SFX_YARDIE_MALE_VOICE_1_CARJACKED_1,
+	SFX_YARDIE_MALE_VOICE_1_CARJACKING_1,
+	SFX_YARDIE_MALE_VOICE_1_CARJACKING_2,
+	SFX_YARDIE_MALE_VOICE_2_DRIVER_ABUSE_1,
+	SFX_YARDIE_MALE_VOICE_2_DRIVER_ABUSE_2,
+	SFX_YARDIE_MALE_VOICE_2_DRIVER_ABUSE_3,
+	SFX_YARDIE_MALE_VOICE_2_DRIVER_ABUSE_4,
+	SFX_YARDIE_MALE_VOICE_2_DRIVER_ABUSE_5,
+	SFX_YARDIE_MALE_VOICE_2_DRIVER_ABUSE_6,
+	SFX_YARDIE_MALE_VOICE_2_CHAT_1,
+	SFX_YARDIE_MALE_VOICE_2_CHAT_2,
+	SFX_YARDIE_MALE_VOICE_2_CHAT_3,
+	SFX_YARDIE_MALE_VOICE_2_CHAT_4,
+	SFX_YARDIE_MALE_VOICE_2_CHAT_5,
+	SFX_YARDIE_MALE_VOICE_2_CHAT_6,
+	SFX_YARDIE_MALE_VOICE_2_CHAT_7,
+	SFX_YARDIE_MALE_VOICE_2_CHAT_8,
+	SFX_YARDIE_MALE_VOICE_2_DODGE_1,
+	SFX_YARDIE_MALE_VOICE_2_DODGE_2,
+	SFX_YARDIE_MALE_VOICE_2_DODGE_3,
+	SFX_YARDIE_MALE_VOICE_2_DODGE_4,
+	SFX_YARDIE_MALE_VOICE_2_DODGE_5,
+	SFX_YARDIE_MALE_VOICE_2_EYING_1,
+	SFX_YARDIE_MALE_VOICE_2_EYING_2,
+	SFX_YARDIE_MALE_VOICE_2_FIGHT_1,
+	SFX_YARDIE_MALE_VOICE_2_FIGHT_2,
+	SFX_YARDIE_MALE_VOICE_2_FIGHT_3,
+	SFX_YARDIE_MALE_VOICE_2_FIGHT_4,
+	SFX_YARDIE_MALE_VOICE_2_FIGHT_5,
+	SFX_YARDIE_MALE_VOICE_2_FIGHT_6,
+	SFX_YARDIE_MALE_VOICE_2_GUN_COOL_1,
+	SFX_YARDIE_MALE_VOICE_2_CARJACKED_1,
+	SFX_YARDIE_MALE_VOICE_2_CARJACKING_1,
+	SFX_YARDIE_MALE_VOICE_2_CARJACKING_2,
+	SFX_BLACK_BUSINESS_FEMALE_VOICE_1_DRIVER_ABUSE_1,
+	SFX_BLACK_BUSINESS_FEMALE_VOICE_1_DRIVER_ABUSE_2,
+	SFX_BLACK_BUSINESS_FEMALE_VOICE_1_DRIVER_ABUSE_3,
+	SFX_BLACK_BUSINESS_FEMALE_VOICE_1_DRIVER_ABUSE_4,
+	SFX_BLACK_BUSINESS_FEMALE_VOICE_1_DRIVER_ABUSE_5,
+	SFX_BLACK_BUSINESS_FEMALE_VOICE_1_DRIVER_ABUSE_6,
+	SFX_BLACK_BUSINESS_FEMALE_VOICE_1_DRIVER_ABUSE_7,
+	SFX_BLACK_BUSINESS_FEMALE_VOICE_1_CHAT_1,
+	SFX_BLACK_BUSINESS_FEMALE_VOICE_1_CHAT_2,
+	SFX_BLACK_BUSINESS_FEMALE_VOICE_1_CHAT_3,
+	SFX_BLACK_BUSINESS_FEMALE_VOICE_1_CHAT_4,
+	SFX_BLACK_BUSINESS_FEMALE_VOICE_1_CHAT_5,
+	SFX_BLACK_BUSINESS_FEMALE_VOICE_1_CHAT_6,
+	SFX_BLACK_BUSINESS_FEMALE_VOICE_1_CHAT_7,
+	SFX_BLACK_BUSINESS_FEMALE_VOICE_1_DODGE_1,
+	SFX_BLACK_BUSINESS_FEMALE_VOICE_1_DODGE_2,
+	SFX_BLACK_BUSINESS_FEMALE_VOICE_1_DODGE_3,
+	SFX_BLACK_BUSINESS_FEMALE_VOICE_1_DODGE_4,
+	SFX_BLACK_BUSINESS_FEMALE_VOICE_1_DODGE_5,
+	SFX_BLACK_BUSINESS_FEMALE_VOICE_1_DODGE_6,
+	SFX_BLACK_BUSINESS_FEMALE_VOICE_1_GUN_PANIC_1,
+	SFX_BLACK_BUSINESS_FEMALE_VOICE_1_GUN_PANIC_2,
+	SFX_BLACK_BUSINESS_FEMALE_VOICE_1_GUN_PANIC_3,
+	SFX_BLACK_BUSINESS_FEMALE_VOICE_1_GUN_PANIC_4,
+	SFX_BLACK_BUSINESS_FEMALE_VOICE_1_GUN_PANIC_5,
+	SFX_BLACK_BUSINESS_FEMALE_VOICE_1_CARAJACKED_1,
+	SFX_BLACK_BUSINESS_FEMALE_VOICE_1_CARAJACKED_2,
+	SFX_BLACK_BUSINESS_FEMALE_VOICE_1_CARAJACKED_3,
+	SFX_BLACK_BUSINESS_FEMALE_VOICE_1_CARAJACKED_4,
+	SFX_BLACK_BUSINESS_FEMALE_VOICE_1_MUGGED_1,
+	SFX_BLACK_BUSINESS_FEMALE_VOICE_1_MUGGED_2,
+	SFX_BLACK_BUSINESS_FEMALE_VOICE_1_MUGGED_3,
+	SFX_BLACK_BUSINESS_FEMALE_VOICE_1_RUN_FROM_FIGHT_1,
+	SFX_BLACK_BUSINESS_FEMALE_VOICE_1_RUN_FROM_FIGHT_2,
+	SFX_BLACK_BUSINESS_FEMALE_VOICE_1_RUN_FROM_FIGHT_3,
+	SFX_BLACK_BUSINESS_FEMALE_VOICE_1_RUN_FROM_FIGHT_4,
+	SFX_BLACK_BUSINESS_FEMALE_VOICE_1_RUN_FROM_FIGHT_5,
+	SFX_BLACK_BUSINESS_FEMALE_VOICE_1_RUN_FROM_FIGHT_6,
+	SFX_BLACK_BUSINESS_FEMALE_VOICE_1_SHOCKED_1,
+	SFX_BLACK_BUSINESS_FEMALE_VOICE_1_SHOCKED_2,
+	SFX_BLACK_BUSINESS_FEMALE_VOICE_1_SHOCKED_3,
+	SFX_BLACK_BUSINESS_FEMALE_VOICE_1_SHOCKED_4,
+	SFX_WHITE_WORKER_MALE_VOICE_1_DRIVER_ABUSE_1,
+	SFX_WHITE_WORKER_MALE_VOICE_1_DRIVER_ABUSE_2,
+	SFX_WHITE_WORKER_MALE_VOICE_1_DRIVER_ABUSE_3,
+	SFX_WHITE_WORKER_MALE_VOICE_1_DRIVER_ABUSE_4,
+	SFX_WHITE_WORKER_MALE_VOICE_1_DRIVER_ABUSE_5,
+	SFX_WHITE_WORKER_MALE_VOICE_1_DRIVER_ABUSE_6,
+	SFX_WHITE_WORKER_MALE_VOICE_1_CHAT_1,
+	SFX_WHITE_WORKER_MALE_VOICE_1_CHAT_2,
+	SFX_WHITE_WORKER_MALE_VOICE_1_CHAT_3,
+	SFX_WHITE_WORKER_MALE_VOICE_1_CHAT_4,
+	SFX_WHITE_WORKER_MALE_VOICE_1_CHAT_5,
+	SFX_WHITE_WORKER_MALE_VOICE_1_CHAT_6,
+	SFX_WHITE_WORKER_MALE_VOICE_1_DODGE_1,
+	SFX_WHITE_WORKER_MALE_VOICE_1_DODGE_2,
+	SFX_WHITE_WORKER_MALE_VOICE_1_DODGE_3,
+	SFX_WHITE_WORKER_MALE_VOICE_1_DODGE_4,
+	SFX_WHITE_WORKER_MALE_VOICE_1_EYING_1,
+	SFX_WHITE_WORKER_MALE_VOICE_1_EYING_2,
+	SFX_WHITE_WORKER_MALE_VOICE_1_FIGHT_1,
+	SFX_WHITE_WORKER_MALE_VOICE_1_FIGHT_2,
+	SFX_WHITE_WORKER_MALE_VOICE_1_FIGHT_3,
+	SFX_WHITE_WORKER_MALE_VOICE_1_GUN_PANIC_1,
+	SFX_WHITE_WORKER_MALE_VOICE_1_GUN_PANIC_2,
+	SFX_WHITE_WORKER_MALE_VOICE_1_GUN_PANIC_3,
+	SFX_STEWARD_MALE_VOICE_1_DRIVER_ABUSE_1,
+	SFX_STEWARD_MALE_VOICE_1_DRIVER_ABUSE_2,
+	SFX_STEWARD_MALE_VOICE_1_DRIVER_ABUSE_3,
+	SFX_STEWARD_MALE_VOICE_1_DRIVER_ABUSE_4,
+	SFX_STEWARD_MALE_VOICE_1_DRIVER_ABUSE_5,
+	SFX_STEWARD_MALE_VOICE_1_CHAT_1,
+	SFX_STEWARD_MALE_VOICE_1_CHAT_2,
+	SFX_STEWARD_MALE_VOICE_1_CHAT_3,
+	SFX_STEWARD_MALE_VOICE_1_CHAT_4,
+	SFX_STEWARD_MALE_VOICE_1_DODGE_1,
+	SFX_STEWARD_MALE_VOICE_1_DODGE_2,
+	SFX_STEWARD_MALE_VOICE_1_DODGE_3,
+	SFX_STEWARD_MALE_VOICE_1_FIGHT_1,
+	SFX_STEWARD_MALE_VOICE_1_FIGHT_2,
+	SFX_STEWARD_MALE_VOICE_1_FIGHT_3,
+	SFX_STEWARD_MALE_VOICE_1_FIGHT_4,
+	SFX_STEWARD_MALE_VOICE_1_GUN_PANIC_1,
+	SFX_STEWARD_MALE_VOICE_1_GUN_PANIC_2,
+	SFX_STEWARD_MALE_VOICE_1_GUN_PANIC_3,
+	SFX_STEWARD_FEMALE_VOICE_1_DRIVER_ABUSE_1,
+	SFX_STEWARD_FEMALE_VOICE_1_DRIVER_ABUSE_2,
+	SFX_STEWARD_FEMALE_VOICE_1_DRIVER_ABUSE_3,
+	SFX_STEWARD_FEMALE_VOICE_1_DRIVER_ABUSE_4,
+	SFX_STEWARD_FEMALE_VOICE_1_DRIVER_ABUSE_5,
+	SFX_STEWARD_FEMALE_VOICE_1_CHAT_1,
+	SFX_STEWARD_FEMALE_VOICE_1_CHAT_2,
+	SFX_STEWARD_FEMALE_VOICE_1_CHAT_3,
+	SFX_STEWARD_FEMALE_VOICE_1_CHAT_4,
+	SFX_STEWARD_FEMALE_VOICE_1_CHAT_5,
+	SFX_STEWARD_FEMALE_VOICE_1_DODGE_1,
+	SFX_STEWARD_FEMALE_VOICE_1_DODGE_2,
+	SFX_STEWARD_FEMALE_VOICE_1_DODGE_3,
+	SFX_STEWARD_FEMALE_VOICE_1_DODGE_4,
+	SFX_STEWARD_FEMALE_VOICE_1_DODGE_5,
+	SFX_STEWARD_FEMALE_VOICE_1_GUN_PANIC_1,
+	SFX_STEWARD_FEMALE_VOICE_1_GUN_PANIC_2,
+	SFX_STEWARD_FEMALE_VOICE_1_GUN_PANIC_3,
+	SFX_STEWARD_FEMALE_VOICE_2_DRIVER_ABUSE_1,
+	SFX_STEWARD_FEMALE_VOICE_2_DRIVER_ABUSE_2,
+	SFX_STEWARD_FEMALE_VOICE_2_DRIVER_ABUSE_3,
+	SFX_STEWARD_FEMALE_VOICE_2_DRIVER_ABUSE_4,
+	SFX_STEWARD_FEMALE_VOICE_2_DRIVER_ABUSE_5,
+	SFX_STEWARD_FEMALE_VOICE_2_CHAT_1,
+	SFX_STEWARD_FEMALE_VOICE_2_CHAT_2,
+	SFX_STEWARD_FEMALE_VOICE_2_CHAT_3,
+	SFX_STEWARD_FEMALE_VOICE_2_CHAT_4,
+	SFX_STEWARD_FEMALE_VOICE_2_CHAT_5,
+	SFX_STEWARD_FEMALE_VOICE_2_DODGE_1,
+	SFX_STEWARD_FEMALE_VOICE_2_DODGE_2,
+	SFX_STEWARD_FEMALE_VOICE_2_DODGE_3,
+	SFX_STEWARD_FEMALE_VOICE_2_DODGE_4,
+	SFX_STEWARD_FEMALE_VOICE_2_DODGE_5,
+	SFX_STEWARD_FEMALE_VOICE_2_GUN_PANIC_1,
+	SFX_STEWARD_FEMALE_VOICE_2_GUN_PANIC_2,
+	SFX_STEWARD_FEMALE_VOICE_2_GUN_PANIC_3,
+	SFX_CHINATOWN_MALE_OLD_VOICE_1_DRIVER_ABUSE_1,
+	SFX_CHINATOWN_MALE_OLD_VOICE_1_DRIVER_ABUSE_2,
+	SFX_CHINATOWN_MALE_OLD_VOICE_1_DRIVER_ABUSE_3,
+	SFX_CHINATOWN_MALE_OLD_VOICE_1_DRIVER_ABUSE_4,
+	SFX_CHINATOWN_MALE_OLD_VOICE_1_DRIVER_ABUSE_5,
+	SFX_CHINATOWN_MALE_OLD_VOICE_1_DRIVER_ABUSE_6,
+	SFX_CHINATOWN_MALE_OLD_VOICE_1_CHAT_1,
+	SFX_CHINATOWN_MALE_OLD_VOICE_1_CHAT_2,
+	SFX_CHINATOWN_MALE_OLD_VOICE_1_CHAT_3,
+	SFX_CHINATOWN_MALE_OLD_VOICE_1_CHAT_4,
+	SFX_CHINATOWN_MALE_OLD_VOICE_1_CHAT_5,
+	SFX_CHINATOWN_MALE_OLD_VOICE_1_CHAT_6,
+	SFX_CHINATOWN_MALE_OLD_VOICE_1_CHAT_7,
+	SFX_CHINATOWN_MALE_OLD_VOICE_1_DODGE_1,
+	SFX_CHINATOWN_MALE_OLD_VOICE_1_DODGE_2,
+	SFX_CHINATOWN_MALE_OLD_VOICE_1_DODGE_3,
+	SFX_CHINATOWN_MALE_OLD_VOICE_1_DODGE_4,
+	SFX_CHINATOWN_MALE_OLD_VOICE_1_DODGE_5,
+	SFX_CHINATOWN_MALE_OLD_VOICE_1_DODGE_6,
+	SFX_CHINATOWN_MALE_OLD_VOICE_1_EYING_1,
+	SFX_CHINATOWN_MALE_OLD_VOICE_1_EYING_2,
+	SFX_CHINATOWN_MALE_OLD_VOICE_1_EYING_3,
+	SFX_CHINATOWN_MALE_OLD_VOICE_1_FIGHT_1,
+	SFX_CHINATOWN_MALE_OLD_VOICE_1_FIGHT_2,
+	SFX_CHINATOWN_MALE_OLD_VOICE_1_FIGHT_3,
+	SFX_CHINATOWN_MALE_OLD_VOICE_1_FIGHT_4,
+	SFX_CHINATOWN_MALE_OLD_VOICE_1_FIGHT_5,
+	SFX_CHINATOWN_MALE_OLD_VOICE_1_GUN_PANIC_1,
+	SFX_CHINATOWN_MALE_OLD_VOICE_1_GUN_PANIC_2,
+	SFX_CHINATOWN_MALE_OLD_VOICE_1_GUN_PANIC_3,
+	SFX_CHINATOWN_MALE_OLD_VOICE_1_CARJACKED_1,
+	SFX_CHINATOWN_MALE_OLD_VOICE_1_CARJACKED_2,
+	SFX_WHITE_BUSINESS_FEMALE_VOICE_1_DRIVER_ABUSE_1,
+	SFX_WHITE_BUSINESS_FEMALE_VOICE_1_DRIVER_ABUSE_2,
+	SFX_WHITE_BUSINESS_FEMALE_VOICE_1_DRIVER_ABUSE_3,
+	SFX_WHITE_BUSINESS_FEMALE_VOICE_1_DRIVER_ABUSE_4,
+	SFX_WHITE_BUSINESS_FEMALE_VOICE_1_DRIVER_ABUSE_5,
+	SFX_WHITE_BUSINESS_FEMALE_VOICE_1_CHAT_1,
+	SFX_WHITE_BUSINESS_FEMALE_VOICE_1_CHAT_2,
+	SFX_WHITE_BUSINESS_FEMALE_VOICE_1_CHAT_3,
+	SFX_WHITE_BUSINESS_FEMALE_VOICE_1_CHAT_4,
+	SFX_WHITE_BUSINESS_FEMALE_VOICE_1_CHAT_5,
+	SFX_WHITE_BUSINESS_FEMALE_VOICE_1_CHAT_6,
+	SFX_WHITE_BUSINESS_FEMALE_VOICE_1_CHAT_7,
+	SFX_WHITE_BUSINESS_FEMALE_VOICE_1_DODGE_1,
+	SFX_WHITE_BUSINESS_FEMALE_VOICE_1_DODGE_2,
+	SFX_WHITE_BUSINESS_FEMALE_VOICE_1_DODGE_3,
+	SFX_WHITE_BUSINESS_FEMALE_VOICE_1_DODGE_4,
+	SFX_WHITE_BUSINESS_FEMALE_VOICE_1_DODGE_5,
+	SFX_WHITE_BUSINESS_FEMALE_VOICE_1_DODGE_6,
+	SFX_WHITE_BUSINESS_FEMALE_VOICE_1_GUN_PANIC_1,
+	SFX_WHITE_BUSINESS_FEMALE_VOICE_1_GUN_PANIC_2,
+	SFX_WHITE_BUSINESS_FEMALE_VOICE_1_GUN_PANIC_3,
+	SFX_WHITE_BUSINESS_FEMALE_VOICE_1_GUN_PANIC_4,
+	SFX_WHITE_BUSINESS_FEMALE_VOICE_1_CARJACKED_1,
+	SFX_WHITE_BUSINESS_FEMALE_VOICE_1_CARJACKED_2,
+	SFX_WHITE_BUSINESS_FEMALE_VOICE_1_MUGGED_1,
+	SFX_WHITE_BUSINESS_FEMALE_VOICE_1_MUGGED_2,
+	SFX_WHITE_BUSINESS_FEMALE_VOICE_1_RUN_FROM_FIGHT_1,
+	SFX_WHITE_BUSINESS_FEMALE_VOICE_1_RUN_FROM_FIGHT_2,
+	SFX_WHITE_BUSINESS_FEMALE_VOICE_1_RUN_FROM_FIGHT_3,
+	SFX_WHITE_BUSINESS_FEMALE_VOICE_1_RUN_FROM_FIGHT_4,
+	SFX_WHITE_BUSINESS_FEMALE_VOICE_1_SHOCKED_1,
+	SFX_WHITE_BUSINESS_FEMALE_VOICE_1_SHOCKED_2,
+	SFX_WHITE_BUSINESS_FEMALE_VOICE_1_SHOCKED_3,
+	SFX_WHITE_BUSINESS_FEMALE_VOICE_1_SHOCKED_4,
+	SFX_WHITE_BUSINESS_FEMALE_VOICE_2_DRIVER_ABUSE_1,
+	SFX_WHITE_BUSINESS_FEMALE_VOICE_2_DRIVER_ABUSE_2,
+	SFX_WHITE_BUSINESS_FEMALE_VOICE_2_DRIVER_ABUSE_3,
+	SFX_WHITE_BUSINESS_FEMALE_VOICE_2_DRIVER_ABUSE_4,
+	SFX_WHITE_BUSINESS_FEMALE_VOICE_2_DRIVER_ABUSE_5,
+	SFX_WHITE_BUSINESS_FEMALE_VOICE_2_CHAT_1,
+	SFX_WHITE_BUSINESS_FEMALE_VOICE_2_CHAT_2,
+	SFX_WHITE_BUSINESS_FEMALE_VOICE_2_CHAT_3,
+	SFX_WHITE_BUSINESS_FEMALE_VOICE_2_CHAT_4,
+	SFX_WHITE_BUSINESS_FEMALE_VOICE_2_CHAT_5,
+	SFX_WHITE_BUSINESS_FEMALE_VOICE_2_CHAT_6,
+	SFX_WHITE_BUSINESS_FEMALE_VOICE_2_CHAT_7,
+	SFX_WHITE_BUSINESS_FEMALE_VOICE_2_DODGE_1,
+	SFX_WHITE_BUSINESS_FEMALE_VOICE_2_DODGE_2,
+	SFX_WHITE_BUSINESS_FEMALE_VOICE_2_DODGE_3,
+	SFX_WHITE_BUSINESS_FEMALE_VOICE_2_DODGE_4,
+	SFX_WHITE_BUSINESS_FEMALE_VOICE_2_DODGE_5,
+	SFX_WHITE_BUSINESS_FEMALE_VOICE_2_DODGE_6,
+	SFX_WHITE_BUSINESS_FEMALE_VOICE_2_GUN_PANIC_1,
+	SFX_WHITE_BUSINESS_FEMALE_VOICE_2_GUN_PANIC_2,
+	SFX_WHITE_BUSINESS_FEMALE_VOICE_2_GUN_PANIC_3,
+	SFX_WHITE_BUSINESS_FEMALE_VOICE_2_GUN_PANIC_4,
+	SFX_WHITE_BUSINESS_FEMALE_VOICE_2_CARJACKED_1,
+	SFX_WHITE_BUSINESS_FEMALE_VOICE_2_CARJACKED_2,
+	SFX_WHITE_BUSINESS_FEMALE_VOICE_2_MUGGED_1,
+	SFX_WHITE_BUSINESS_FEMALE_VOICE_2_MUGGED_2,
+	SFX_WHITE_BUSINESS_FEMALE_VOICE_2_RUN_FROM_FIGHT_1,
+	SFX_WHITE_BUSINESS_FEMALE_VOICE_2_RUN_FROM_FIGHT_2,
+	SFX_WHITE_BUSINESS_FEMALE_VOICE_2_RUN_FROM_FIGHT_3,
+	SFX_WHITE_BUSINESS_FEMALE_VOICE_2_RUN_FROM_FIGHT_4,
+	SFX_WHITE_BUSINESS_FEMALE_VOICE_2_SHOCKED_1,
+	SFX_WHITE_BUSINESS_FEMALE_VOICE_2_SHOCKED_2,
+	SFX_WHITE_BUSINESS_FEMALE_VOICE_2_SHOCKED_3,
+	SFX_WHITE_BUSINESS_FEMALE_VOICE_2_SHOCKED_4,
+	SFX_BLACK_FAT_MALE_VOICE_1_DRIVER_ABUSE_1,
+	SFX_BLACK_FAT_MALE_VOICE_1_DRIVER_ABUSE_2,
+	SFX_BLACK_FAT_MALE_VOICE_1_DRIVER_ABUSE_3,
+	SFX_BLACK_FAT_MALE_VOICE_1_DRIVER_ABUSE_4,
+	SFX_BLACK_FAT_MALE_VOICE_1_DRIVER_ABUSE_5,
+	SFX_BLACK_FAT_MALE_VOICE_1_DRIVER_ABUSE_6,
+	SFX_BLACK_FAT_MALE_VOICE_1_CHAT_1,
+	SFX_BLACK_FAT_MALE_VOICE_1_CHAT_2,
+	SFX_BLACK_FAT_MALE_VOICE_1_CHAT_3,
+	SFX_BLACK_FAT_MALE_VOICE_1_CHAT_4,
+	SFX_BLACK_FAT_MALE_VOICE_1_CHAT_5,
+	SFX_BLACK_FAT_MALE_VOICE_1_CHAT_6,
+	SFX_BLACK_FAT_MALE_VOICE_1_CHAT_7,
+	SFX_BLACK_FAT_MALE_VOICE_1_CHAT_8,
+	SFX_BLACK_FAT_MALE_VOICE_1_DODGE_1,
+	SFX_BLACK_FAT_MALE_VOICE_1_DODGE_2,
+	SFX_BLACK_FAT_MALE_VOICE_1_DODGE_3,
+	SFX_BLACK_FAT_MALE_VOICE_1_DODGE_4,
+	SFX_BLACK_FAT_MALE_VOICE_1_DODGE_5,
+	SFX_BLACK_FAT_MALE_VOICE_1_DODGE_6,
+	SFX_BLACK_FAT_MALE_VOICE_1_DODGE_7,
+	SFX_BLACK_FAT_MALE_VOICE_1_CARJACKED_1,
+	SFX_BLACK_FAT_MALE_VOICE_1_CARJACKED_2,
+	SFX_BLACK_FAT_MALE_VOICE_1_CARJACKED_3,
+	SFX_BLACK_FAT_MALE_VOICE_1_CARJACKED_4,
+	SFX_BLACK_FAT_MALE_VOICE_1_LOST_1,
+	SFX_BLACK_FAT_MALE_VOICE_1_LOST_2,
+	SFX_BLACK_FAT_MALE_VOICE_1_LOST_3,
+	SFX_BLACK_FAT_MALE_VOICE_1_MUGGED_1,
+	SFX_BLACK_FAT_MALE_VOICE_1_MUGGED_2,
+	SFX_BLACK_FAT_MALE_VOICE_1_MUGGED_3,
+	SFX_BLACK_PROJECT_MALE_VOICE_1_DRIVER_ABUSE_1,
+	SFX_BLACK_PROJECT_MALE_VOICE_1_DRIVER_ABUSE_2,
+	SFX_BLACK_PROJECT_MALE_VOICE_1_DRIVER_ABUSE_3,
+	SFX_BLACK_PROJECT_MALE_VOICE_1_DRIVER_ABUSE_4,
+	SFX_BLACK_PROJECT_MALE_VOICE_1_DRIVER_ABUSE_5,
+	SFX_BLACK_PROJECT_MALE_VOICE_1_DRIVER_ABUSE_6,
+	SFX_BLACK_PROJECT_MALE_VOICE_1_DRIVER_ABUSE_7,
+	SFX_BLACK_PROJECT_MALE_VOICE_1_CHAT_1,
+	SFX_BLACK_PROJECT_MALE_VOICE_1_CHAT_2,
+	SFX_BLACK_PROJECT_MALE_VOICE_1_CHAT_3,
+	SFX_BLACK_PROJECT_MALE_VOICE_1_CHAT_4,
+	SFX_BLACK_PROJECT_MALE_VOICE_1_CHAT_5,
+	SFX_BLACK_PROJECT_MALE_VOICE_1_CHAT_6,
+	SFX_BLACK_PROJECT_MALE_VOICE_1_DODGE_1,
+	SFX_BLACK_PROJECT_MALE_VOICE_1_DODGE_2,
+	SFX_BLACK_PROJECT_MALE_VOICE_1_DODGE_3,
+	SFX_BLACK_PROJECT_MALE_VOICE_1_DODGE_4,
+	SFX_BLACK_PROJECT_MALE_VOICE_1_DODGE_5,
+	SFX_BLACK_PROJECT_MALE_VOICE_1_EYING_1,
+	SFX_BLACK_PROJECT_MALE_VOICE_1_EYING_2,
+	SFX_BLACK_PROJECT_MALE_VOICE_1_EYING_3,
+	SFX_BLACK_PROJECT_MALE_VOICE_1_FIGHT_1,
+	SFX_BLACK_PROJECT_MALE_VOICE_1_FIGHT_2,
+	SFX_BLACK_PROJECT_MALE_VOICE_1_FIGHT_3,
+	SFX_BLACK_PROJECT_MALE_VOICE_1_FIGHT_4,
+	SFX_BLACK_PROJECT_MALE_VOICE_1_FIGHT_5,
+	SFX_BLACK_PROJECT_MALE_VOICE_1_FIGHT_6,
+	SFX_BLACK_PROJECT_MALE_VOICE_1_GUN_COOL_1,
+	SFX_BLACK_PROJECT_MALE_VOICE_1_GUN_COOL_2,
+	SFX_BLACK_PROJECT_MALE_VOICE_1_GUN_COOL_3,
+	SFX_BLACK_PROJECT_MALE_VOICE_1_CARJACKED_1,
+	SFX_BLACK_PROJECT_MALE_VOICE_1_CARJACKED_2,
+	SFX_BLACK_PROJECT_MALE_VOICE_1_MUGGED_1,
+	SFX_BLACK_PROJECT_MALE_VOICE_1_MUGGED_2,
+	SFX_BLACK_PROJECT_MALE_VOICE_2_DRIVER_ABUSE_1,
+	SFX_BLACK_PROJECT_MALE_VOICE_2_DRIVER_ABUSE_2,
+	SFX_BLACK_PROJECT_MALE_VOICE_2_DRIVER_ABUSE_3,
+	SFX_BLACK_PROJECT_MALE_VOICE_2_DRIVER_ABUSE_4,
+	SFX_BLACK_PROJECT_MALE_VOICE_2_DRIVER_ABUSE_5,
+	SFX_BLACK_PROJECT_MALE_VOICE_2_DRIVER_ABUSE_6,
+	SFX_BLACK_PROJECT_MALE_VOICE_2_DRIVER_ABUSE_7,
+	SFX_BLACK_PROJECT_MALE_VOICE_2_CHAT_1,
+	SFX_BLACK_PROJECT_MALE_VOICE_2_CHAT_2,
+	SFX_BLACK_PROJECT_MALE_VOICE_2_CHAT_3,
+	SFX_BLACK_PROJECT_MALE_VOICE_2_CHAT_4,
+	SFX_BLACK_PROJECT_MALE_VOICE_2_CHAT_5,
+	SFX_BLACK_PROJECT_MALE_VOICE_2_CHAT_6,
+	SFX_BLACK_PROJECT_MALE_VOICE_2_DODGE_1,
+	SFX_BLACK_PROJECT_MALE_VOICE_2_DODGE_2,
+	SFX_BLACK_PROJECT_MALE_VOICE_2_DODGE_3,
+	SFX_BLACK_PROJECT_MALE_VOICE_2_DODGE_4,
+	SFX_BLACK_PROJECT_MALE_VOICE_2_DODGE_5,
+	SFX_BLACK_PROJECT_MALE_VOICE_2_EYING_1,
+	SFX_BLACK_PROJECT_MALE_VOICE_2_EYING_2,
+	SFX_BLACK_PROJECT_MALE_VOICE_2_EYING_3,
+	SFX_BLACK_PROJECT_MALE_VOICE_2_FIGHT_1,
+	SFX_BLACK_PROJECT_MALE_VOICE_2_FIGHT_2,
+	SFX_BLACK_PROJECT_MALE_VOICE_2_FIGHT_3,
+	SFX_BLACK_PROJECT_MALE_VOICE_2_FIGHT_4,
+	SFX_BLACK_PROJECT_MALE_VOICE_2_FIGHT_5,
+	SFX_BLACK_PROJECT_MALE_VOICE_2_FIGHT_6,
+	SFX_BLACK_PROJECT_MALE_VOICE_2_GUN_COOL_1,
+	SFX_BLACK_PROJECT_MALE_VOICE_2_GUN_COOL_2,
+	SFX_BLACK_PROJECT_MALE_VOICE_2_GUN_COOL_3,
+	SFX_BLACK_PROJECT_MALE_VOICE_2_CARJACKED_1,
+	SFX_BLACK_PROJECT_MALE_VOICE_2_CARJACKED_2,
+	SFX_BLACK_PROJECT_MALE_VOICE_2_MUGGED_1,
+	SFX_BLACK_PROJECT_MALE_VOICE_2_MUGGED_2,
+	SFX_BLACK_WORKER_MALE_VOICE_1_DRIVER_ABUSE_1,
+	SFX_BLACK_WORKER_MALE_VOICE_1_DRIVER_ABUSE_2,
+	SFX_BLACK_WORKER_MALE_VOICE_1_DRIVER_ABUSE_3,
+	SFX_BLACK_WORKER_MALE_VOICE_1_DRIVER_ABUSE_4,
+	SFX_BLACK_WORKER_MALE_VOICE_1_CHAT_1,
+	SFX_BLACK_WORKER_MALE_VOICE_1_CHAT_2,
+	SFX_BLACK_WORKER_MALE_VOICE_1_CHAT_3,
+	SFX_BLACK_WORKER_MALE_VOICE_1_CHAT_4,
+	SFX_BLACK_WORKER_MALE_VOICE_1_DODGE_1,
+	SFX_BLACK_WORKER_MALE_VOICE_1_DODGE_2,
+	SFX_BLACK_WORKER_MALE_VOICE_1_DODGE_3,
+	SFX_BLACK_WORKER_MALE_VOICE_1_EYING_1,
+	SFX_BLACK_WORKER_MALE_VOICE_1_EYING_2,
+	SFX_BLACK_WORKER_MALE_VOICE_1_EYING_3,
+	SFX_BLACK_WORKER_MALE_VOICE_1_FIGHT_1,
+	SFX_BLACK_WORKER_MALE_VOICE_1_FIGHT_2,
+	SFX_BLACK_WORKER_MALE_VOICE_1_FIGHT_3,
+	SFX_BLACK_WORKER_MALE_VOICE_1_GUN_PANIC_1,
+	SFX_BLACK_WORKER_MALE_VOICE_1_GUN_PANIC_2,
+	SFX_BLACK_WORKER_MALE_VOICE_1_GUN_PANIC_3,
+	SFX_BLACK_WORKER_MALE_VOICE_1_GUN_PANIC_4,
+	SFX_SHOPPER_VOICE_1_DRIVER_ABUSE_1,
+	SFX_SHOPPER_VOICE_1_DRIVER_ABUSE_2,
+	SFX_SHOPPER_VOICE_1_DRIVER_ABUSE_3,
+	SFX_SHOPPER_VOICE_1_DRIVER_ABUSE_4,
+	SFX_SHOPPER_VOICE_1_DRIVER_ABUSE_5,
+	SFX_SHOPPER_VOICE_1_DRIVER_ABUSE_6,
+	SFX_SHOPPER_VOICE_1_DRIVER_ABUSE_7,
+	SFX_SHOPPER_VOICE_1_CHAT_1,
+	SFX_SHOPPER_VOICE_1_CHAT_2,
+	SFX_SHOPPER_VOICE_1_CHAT_3,
+	SFX_SHOPPER_VOICE_1_CHAT_4,
+	SFX_SHOPPER_VOICE_1_CHAT_5,
+	SFX_SHOPPER_VOICE_1_CHAT_6,
+	SFX_SHOPPER_VOICE_1_CHAT_7,
+	SFX_SHOPPER_VOICE_1_DODGE_1,
+	SFX_SHOPPER_VOICE_1_DODGE_2,
+	SFX_SHOPPER_VOICE_1_DODGE_3,
+	SFX_SHOPPER_VOICE_1_DODGE_4,
+	SFX_SHOPPER_VOICE_1_DODGE_5,
+	SFX_SHOPPER_VOICE_1_DODGE_6,
+	SFX_SHOPPER_VOICE_1_CARJACKED_1,
+	SFX_SHOPPER_VOICE_1_CARJACKED_2,
+	SFX_SHOPPER_VOICE_1_MUGGED_1,
+	SFX_SHOPPER_VOICE_1_MUGGED_2,
+	SFX_SHOPPER_VOICE_1_SHOCKED_1,
+	SFX_SHOPPER_VOICE_1_SHOCKED_2,
+	SFX_SHOPPER_VOICE_1_SHOCKED_3,
+	SFX_SHOPPER_VOICE_1_SHOCKED_4,
+	SFX_SHOPPER_VOICE_2_DRIVER_ABUSE_1,
+	SFX_SHOPPER_VOICE_2_DRIVER_ABUSE_2,
+	SFX_SHOPPER_VOICE_2_DRIVER_ABUSE_3,
+	SFX_SHOPPER_VOICE_2_DRIVER_ABUSE_4,
+	SFX_SHOPPER_VOICE_2_DRIVER_ABUSE_5,
+	SFX_SHOPPER_VOICE_2_DRIVER_ABUSE_6,
+	SFX_SHOPPER_VOICE_2_DRIVER_ABUSE_7,
+	SFX_SHOPPER_VOICE_2_CHAT_1,
+	SFX_SHOPPER_VOICE_2_CHAT_2,
+	SFX_SHOPPER_VOICE_2_CHAT_3,
+	SFX_SHOPPER_VOICE_2_CHAT_4,
+	SFX_SHOPPER_VOICE_2_CHAT_5,
+	SFX_SHOPPER_VOICE_2_CHAT_6,
+	SFX_SHOPPER_VOICE_2_CHAT_7,
+	SFX_SHOPPER_VOICE_2_DODGE_1,
+	SFX_SHOPPER_VOICE_2_DODGE_2,
+	SFX_SHOPPER_VOICE_2_DODGE_3,
+	SFX_SHOPPER_VOICE_2_DODGE_4,
+	SFX_SHOPPER_VOICE_2_DODGE_5,
+	SFX_SHOPPER_VOICE_2_DODGE_6,
+	SFX_SHOPPER_VOICE_2_CARJACKED_1,
+	SFX_SHOPPER_VOICE_2_CARJACKED_2,
+	SFX_SHOPPER_VOICE_2_MUGGED_1,
+	SFX_SHOPPER_VOICE_2_MUGGED_2,
+	SFX_SHOPPER_VOICE_2_SHOCKED_1,
+	SFX_SHOPPER_VOICE_2_SHOCKED_2,
+	SFX_SHOPPER_VOICE_2_SHOCKED_3,
+	SFX_SHOPPER_VOICE_2_SHOCKED_4,
+	SFX_SHOPPER_VOICE_3_DRIVER_ABUSE_1,
+	SFX_SHOPPER_VOICE_3_DRIVER_ABUSE_2,
+	SFX_SHOPPER_VOICE_3_DRIVER_ABUSE_3,
+	SFX_SHOPPER_VOICE_3_DRIVER_ABUSE_4,
+	SFX_SHOPPER_VOICE_3_DRIVER_ABUSE_5,
+	SFX_SHOPPER_VOICE_3_DRIVER_ABUSE_6,
+	SFX_SHOPPER_VOICE_3_DRIVER_ABUSE_7,
+	SFX_SHOPPER_VOICE_3_CHAT_1,
+	SFX_SHOPPER_VOICE_3_CHAT_2,
+	SFX_SHOPPER_VOICE_3_CHAT_3,
+	SFX_SHOPPER_VOICE_3_CHAT_4,
+	SFX_SHOPPER_VOICE_3_CHAT_5,
+	SFX_SHOPPER_VOICE_3_CHAT_6,
+	SFX_SHOPPER_VOICE_3_CHAT_7,
+	SFX_SHOPPER_VOICE_3_DODGE_1,
+	SFX_SHOPPER_VOICE_3_DODGE_2,
+	SFX_SHOPPER_VOICE_3_DODGE_3,
+	SFX_SHOPPER_VOICE_3_DODGE_4,
+	SFX_SHOPPER_VOICE_3_DODGE_5,
+	SFX_SHOPPER_VOICE_3_DODGE_6,
+	SFX_SHOPPER_VOICE_3_CARJACKED_1,
+	SFX_SHOPPER_VOICE_3_CARJACKED_2,
+	SFX_SHOPPER_VOICE_3_MUGGED_1,
+	SFX_SHOPPER_VOICE_3_MUGGED_2,
+	SFX_SHOPPER_VOICE_3_SHOCKED_1,
+	SFX_SHOPPER_VOICE_3_SHOCKED_2,
+	SFX_SHOPPER_VOICE_3_SHOCKED_3,
+	SFX_SHOPPER_VOICE_3_SHOCKED_4,
+	SFX_COLUMBIAN_MALE_VOICE_1_DRIVER_ABUSE_1,
+	SFX_COLUMBIAN_MALE_VOICE_1_DRIVER_ABUSE_2,
+	SFX_COLUMBIAN_MALE_VOICE_1_DRIVER_ABUSE_3,
+	SFX_COLUMBIAN_MALE_VOICE_1_DRIVER_ABUSE_4,
+	SFX_COLUMBIAN_MALE_VOICE_1_DRIVER_ABUSE_5,
+	SFX_COLUMBIAN_MALE_VOICE_1_DRIVER_ABUSE_6,
+	SFX_COLUMBIAN_MALE_VOICE_1_CHAT_1,
+	SFX_COLUMBIAN_MALE_VOICE_1_CHAT_2,
+	SFX_COLUMBIAN_MALE_VOICE_1_CHAT_3,
+	SFX_COLUMBIAN_MALE_VOICE_1_CHAT_4,
+	SFX_COLUMBIAN_MALE_VOICE_1_CHAT_5,
+	SFX_COLUMBIAN_MALE_VOICE_1_DODGE_1,
+	SFX_COLUMBIAN_MALE_VOICE_1_DODGE_2,
+	SFX_COLUMBIAN_MALE_VOICE_1_DODGE_3,
+	SFX_COLUMBIAN_MALE_VOICE_1_DODGE_4,
+	SFX_COLUMBIAN_MALE_VOICE_1_DODGE_5,
+	SFX_COLUMBIAN_MALE_VOICE_1_EYING_1,
+	SFX_COLUMBIAN_MALE_VOICE_1_EYING_2,
+	SFX_COLUMBIAN_MALE_VOICE_1_FIGHT_1,
+	SFX_COLUMBIAN_MALE_VOICE_1_FIGHT_2,
+	SFX_COLUMBIAN_MALE_VOICE_1_FIGHT_3,
+	SFX_COLUMBIAN_MALE_VOICE_1_FIGHT_4,
+	SFX_COLUMBIAN_MALE_VOICE_1_FIGHT_5,
+	SFX_COLUMBIAN_MALE_VOICE_1_CARJACKED_1,
+	SFX_COLUMBIAN_MALE_VOICE_1_CARJACKED_2,
+	SFX_COLUMBIAN_MALE_VOICE_1_CARJACKING_1,
+	SFX_COLUMBIAN_MALE_VOICE_1_CARJACKING_2,
+	SFX_COLUMBIAN_MALE_VOICE_2_DRIVER_ABUSE_1,
+	SFX_COLUMBIAN_MALE_VOICE_2_DRIVER_ABUSE_2,
+	SFX_COLUMBIAN_MALE_VOICE_2_DRIVER_ABUSE_3,
+	SFX_COLUMBIAN_MALE_VOICE_2_DRIVER_ABUSE_4,
+	SFX_COLUMBIAN_MALE_VOICE_2_DRIVER_ABUSE_5,
+	SFX_COLUMBIAN_MALE_VOICE_2_DRIVER_ABUSE_6,
+	SFX_COLUMBIAN_MALE_VOICE_2_CHAT_1,
+	SFX_COLUMBIAN_MALE_VOICE_2_CHAT_2,
+	SFX_COLUMBIAN_MALE_VOICE_2_CHAT_3,
+	SFX_COLUMBIAN_MALE_VOICE_2_CHAT_4,
+	SFX_COLUMBIAN_MALE_VOICE_2_CHAT_5,
+	SFX_COLUMBIAN_MALE_VOICE_2_DODGE_1,
+	SFX_COLUMBIAN_MALE_VOICE_2_DODGE_2,
+	SFX_COLUMBIAN_MALE_VOICE_2_DODGE_3,
+	SFX_COLUMBIAN_MALE_VOICE_2_DODGE_4,
+	SFX_COLUMBIAN_MALE_VOICE_2_DODGE_5,
+	SFX_COLUMBIAN_MALE_VOICE_2_EYING_1,
+	SFX_COLUMBIAN_MALE_VOICE_2_EYING_2,
+	SFX_COLUMBIAN_MALE_VOICE_2_FIGHT_1,
+	SFX_COLUMBIAN_MALE_VOICE_2_FIGHT_2,
+	SFX_COLUMBIAN_MALE_VOICE_2_FIGHT_3,
+	SFX_COLUMBIAN_MALE_VOICE_2_FIGHT_4,
+	SFX_COLUMBIAN_MALE_VOICE_2_FIGHT_5,
+	SFX_COLUMBIAN_MALE_VOICE_2_CARJACKED_1,
+	SFX_COLUMBIAN_MALE_VOICE_2_CARJACKED_2,
+	SFX_COLUMBIAN_MALE_VOICE_2_CARJACKING_1,
+	SFX_COLUMBIAN_MALE_VOICE_2_CARJACKING_2,
+	SFX_CHINATOWN_YOUNG_FEMALE_VOICE_1_DRIVER_ABUSE_1,
+	SFX_CHINATOWN_YOUNG_FEMALE_VOICE_1_DRIVER_ABUSE_2,
+	SFX_CHINATOWN_YOUNG_FEMALE_VOICE_1_DRIVER_ABUSE_3,
+	SFX_CHINATOWN_YOUNG_FEMALE_VOICE_1_DRIVER_ABUSE_4,
+	SFX_CHINATOWN_YOUNG_FEMALE_VOICE_1_DRIVER_ABUSE_5,
+	SFX_CHINATOWN_YOUNG_FEMALE_VOICE_1_DRIVER_ABUSE_6,
+	SFX_CHINATOWN_YOUNG_FEMALE_VOICE_1_DRIVER_ABUSE_7,
+	SFX_CHINATOWN_YOUNG_FEMALE_VOICE_1_CHAT_1,
+	SFX_CHINATOWN_YOUNG_FEMALE_VOICE_1_CHAT_2,
+	SFX_CHINATOWN_YOUNG_FEMALE_VOICE_1_CHAT_3,
+	SFX_CHINATOWN_YOUNG_FEMALE_VOICE_1_CHAT_4,
+	SFX_CHINATOWN_YOUNG_FEMALE_VOICE_1_CHAT_5,
+	SFX_CHINATOWN_YOUNG_FEMALE_VOICE_1_CHAT_6,
+	SFX_CHINATOWN_YOUNG_FEMALE_VOICE_1_CHAT_7,
+	SFX_CHINATOWN_YOUNG_FEMALE_VOICE_1_DODGE_1,
+	SFX_CHINATOWN_YOUNG_FEMALE_VOICE_1_DODGE_2,
+	SFX_CHINATOWN_YOUNG_FEMALE_VOICE_1_DODGE_3,
+	SFX_CHINATOWN_YOUNG_FEMALE_VOICE_1_DODGE_4,
+	SFX_CHINATOWN_YOUNG_FEMALE_VOICE_1_DODGE_5,
+	SFX_CHINATOWN_YOUNG_FEMALE_VOICE_1_DODGE_6,
+	SFX_CHINATOWN_YOUNG_FEMALE_VOICE_1_CARJACKED_1,
+	SFX_CHINATOWN_YOUNG_FEMALE_VOICE_1_CARJACKED_2,
+	SFX_CHINATOWN_YOUNG_FEMALE_VOICE_1_MUGGED_1,
+	SFX_CHINATOWN_YOUNG_FEMALE_VOICE_1_MUGGED_2,
+	SFX_CHINATOWN_YOUNG_FEMALE_VOICE_1_SHOCKED_1,
+	SFX_CHINATOWN_YOUNG_FEMALE_VOICE_1_SHOCKED_2,
+	SFX_CHINATOWN_YOUNG_FEMALE_VOICE_1_SHOCKED_3,
+	SFX_CHINATOWN_YOUNG_FEMALE_VOICE_1_SHOCKED_4,
+	SFX_CHINATOWN_OLD_FEMALE_VOICE_1_DRIVER_ABUSE_1,
+	SFX_CHINATOWN_OLD_FEMALE_VOICE_1_DRIVER_ABUSE_2,
+	SFX_CHINATOWN_OLD_FEMALE_VOICE_1_DRIVER_ABUSE_3,
+	SFX_CHINATOWN_OLD_FEMALE_VOICE_1_DRIVER_ABUSE_4,
+	SFX_CHINATOWN_OLD_FEMALE_VOICE_1_DRIVER_ABUSE_5,
+	SFX_CHINATOWN_OLD_FEMALE_VOICE_1_CHAT_1,
+	SFX_CHINATOWN_OLD_FEMALE_VOICE_1_CHAT_2,
+	SFX_CHINATOWN_OLD_FEMALE_VOICE_1_CHAT_3,
+	SFX_CHINATOWN_OLD_FEMALE_VOICE_1_CHAT_4,
+	SFX_CHINATOWN_OLD_FEMALE_VOICE_1_CHAT_5,
+	SFX_CHINATOWN_OLD_FEMALE_VOICE_1_CHAT_6,
+	SFX_CHINATOWN_OLD_FEMALE_VOICE_1_DODGE_1,
+	SFX_CHINATOWN_OLD_FEMALE_VOICE_1_DODGE_2,
+	SFX_CHINATOWN_OLD_FEMALE_VOICE_1_DODGE_3,
+	SFX_CHINATOWN_OLD_FEMALE_VOICE_1_DODGE_4,
+	SFX_CHINATOWN_OLD_FEMALE_VOICE_1_DODGE_5,
+	SFX_CHINATOWN_OLD_FEMALE_VOICE_1_GUN_PANIC_1,
+	SFX_CHINATOWN_OLD_FEMALE_VOICE_1_GUN_PANIC_2,
+	SFX_CHINATOWN_OLD_FEMALE_VOICE_1_GUN_PANIC_3,
+	SFX_CHINATOWN_OLD_FEMALE_VOICE_1_MUGGED_1,
+	SFX_CHINATOWN_OLD_FEMALE_VOICE_1_MUGGED_2,
+	SFX_CHINATOWN_OLD_FEMALE_VOICE_1_SHOCKED_1,
+	SFX_GENERIC_FEMALE_DEATH_1,
+	SFX_GENERIC_FEMALE_DEATH_2,
+	SFX_GENERIC_FEMALE_DEATH_3,
+	SFX_GENERIC_FEMALE_DEATH_4,
+	SFX_GENERIC_FEMALE_DEATH_5,
+	SFX_GENERIC_FEMALE_DEATH_6,
+	SFX_GENERIC_FEMALE_DEATH_7,
+	SFX_GENERIC_FEMALE_DEATH_8,
+	SFX_GENERIC_FEMALE_DEATH_9,
+	SFX_GENERIC_FEMALE_DEATH_10,
+	SFX_GENERIC_FEMALE_FIRE_1,
+	SFX_GENERIC_FEMALE_FIRE_2,
+	SFX_GENERIC_FEMALE_FIRE_3,
+	SFX_GENERIC_FEMALE_FIRE_4,
+	SFX_GENERIC_FEMALE_FIRE_5,
+	SFX_GENERIC_FEMALE_FIRE_6,
+	SFX_GENERIC_FEMALE_FIRE_7,
+	SFX_GENERIC_FEMALE_FIRE_8,
+	SFX_GENERIC_FEMALE_FIRE_9,
+	SFX_GENERIC_FEMALE_GRUNT_1,
+	SFX_GENERIC_FEMALE_GRUNT_2,
+	SFX_GENERIC_FEMALE_GRUNT_3,
+	SFX_GENERIC_FEMALE_GRUNT_4,
+	SFX_GENERIC_FEMALE_GRUNT_5,
+	SFX_GENERIC_FEMALE_GRUNT_6,
+	SFX_GENERIC_FEMALE_GRUNT_7,
+	SFX_GENERIC_FEMALE_GRUNT_8,
+	SFX_GENERIC_FEMALE_GRUNT_9,
+	SFX_GENERIC_FEMALE_GRUNT_10,
+	SFX_GENERIC_FEMALE_GRUNT_11,
+	SFX_GENERIC_FEMALE_PANIC_1,
+	SFX_GENERIC_FEMALE_PANIC_2,
+	SFX_GENERIC_FEMALE_PANIC_3,
+	SFX_GENERIC_FEMALE_PANIC_4,
+	SFX_GENERIC_FEMALE_PANIC_5,
+	SFX_GENERIC_FEMALE_PANIC_6,
+	SFX_GENERIC_FEMALE_PANIC_7,
+	SFX_GENERIC_FEMALE_PANIC_8,
+	SFX_BLACK_CRIMINAL_VOICE_1_DRIVER_ABUSE_1,
+	SFX_BLACK_CRIMINAL_VOICE_1_DRIVER_ABUSE_2,
+	SFX_BLACK_CRIMINAL_VOICE_1_DRIVER_ABUSE_3,
+	SFX_BLACK_CRIMINAL_VOICE_1_DRIVER_ABUSE_4,
+	SFX_BLACK_CRIMINAL_VOICE_1_DRIVER_ABUSE_5,
+	SFX_BLACK_CRIMINAL_VOICE_1_DODGE_1,
+	SFX_BLACK_CRIMINAL_VOICE_1_DODGE_2,
+	SFX_BLACK_CRIMINAL_VOICE_1_DODGE_3,
+	SFX_BLACK_CRIMINAL_VOICE_1_DODGE_4,
+	SFX_BLACK_CRIMINAL_VOICE_1_DODGE_5,
+	SFX_BLACK_CRIMINAL_VOICE_1_DODGE_6,
+	SFX_BLACK_CRIMINAL_VOICE_1_FIGHT_1,
+	SFX_BLACK_CRIMINAL_VOICE_1_FIGHT_2,
+	SFX_BLACK_CRIMINAL_VOICE_1_FIGHT_3,
+	SFX_BLACK_CRIMINAL_VOICE_1_FIGHT_4,
+	SFX_BLACK_CRIMINAL_VOICE_1_FIGHT_5,
+	SFX_BLACK_CRIMINAL_VOICE_1_GUN_COOL_1,
+	SFX_BLACK_CRIMINAL_VOICE_1_GUN_COOL_2,
+	SFX_BLACK_CRIMINAL_VOICE_1_GUN_COOL_3,
+	SFX_BLACK_CRIMINAL_VOICE_1_GUN_COOL_4,
+	SFX_BLACK_CRIMINAL_VOICE_1_CARJACKING_1,
+	SFX_BLACK_CRIMINAL_VOICE_1_MUGGING_1,
+	SFX_BLACK_CRIMINAL_VOICE_1_MUGGING_2,
+	SFX_WHITE_CRIMINAL_VOICE_1_DRIVER_ABUSE_1,
+	SFX_WHITE_CRIMINAL_VOICE_1_DRIVER_ABUSE_2,
+	SFX_WHITE_CRIMINAL_VOICE_1_DRIVER_ABUSE_3,
+	SFX_WHITE_CRIMINAL_VOICE_1_DRIVER_ABUSE_4,
+	SFX_WHITE_CRIMINAL_VOICE_1_DODGE_1,
+	SFX_WHITE_CRIMINAL_VOICE_1_DODGE_2,
+	SFX_WHITE_CRIMINAL_VOICE_1_DODGE_3,
+	SFX_WHITE_CRIMINAL_VOICE_1_DODGE_4,
+	SFX_WHITE_CRIMINAL_VOICE_1_DODGE_5,
+	SFX_WHITE_CRIMINAL_VOICE_1_FIGHT_1,
+	SFX_WHITE_CRIMINAL_VOICE_1_FIGHT_2,
+	SFX_WHITE_CRIMINAL_VOICE_1_FIGHT_3,
+	SFX_WHITE_CRIMINAL_VOICE_1_FIGHT_4,
+	SFX_WHITE_CRIMINAL_VOICE_1_GUN_COOL_1,
+	SFX_WHITE_CRIMINAL_VOICE_1_GUN_COOL_2,
+	SFX_WHITE_CRIMINAL_VOICE_1_GUN_COOL_3,
+	SFX_WHITE_CRIMINAL_VOICE_1_CARJACKING_1,
+	SFX_WHITE_CRIMINAL_VOICE_1_MUGGING_1,
+	SFX_WHITE_CRIMINAL_VOICE_1_MUGGING_2,
+	SFX_BUSINESS_MALE_OLD_VOICE_1_DRIVER_ABUSE_1,
+	SFX_BUSINESS_MALE_OLD_VOICE_1_DRIVER_ABUSE_2,
+	SFX_BUSINESS_MALE_OLD_VOICE_1_DRIVER_ABUSE_3,
+	SFX_BUSINESS_MALE_OLD_VOICE_1_DRIVER_ABUSE_4,
+	SFX_BUSINESS_MALE_OLD_VOICE_1_DRIVER_ABUSE_5,
+	SFX_BUSINESS_MALE_OLD_VOICE_1_CHAT_1,
+	SFX_BUSINESS_MALE_OLD_VOICE_1_CHAT_2,
+	SFX_BUSINESS_MALE_OLD_VOICE_1_CHAT_3,
+	SFX_BUSINESS_MALE_OLD_VOICE_1_CHAT_4,
+	SFX_BUSINESS_MALE_OLD_VOICE_1_CHAT_5,
+	SFX_BUSINESS_MALE_OLD_VOICE_1_DODGE_1,
+	SFX_BUSINESS_MALE_OLD_VOICE_1_DODGE_2,
+	SFX_BUSINESS_MALE_OLD_VOICE_1_DODGE_3,
+	SFX_BUSINESS_MALE_OLD_VOICE_1_DODGE_4,
+	SFX_BUSINESS_MALE_OLD_VOICE_1_FIGHT_1,
+	SFX_BUSINESS_MALE_OLD_VOICE_1_FIGHT_2,
+	SFX_BUSINESS_MALE_OLD_VOICE_1_FIGHT_3,
+	SFX_BUSINESS_MALE_OLD_VOICE_1_FIGHT_4,
+	SFX_BUSINESS_MALE_OLD_VOICE_1_FIGHT_5,
+	SFX_BUSINESS_MALE_OLD_VOICE_1_GUN_PANIC_1,
+	SFX_BUSINESS_MALE_OLD_VOICE_1_GUN_PANIC_2,
+	SFX_BUSINESS_MALE_OLD_VOICE_1_GUN_PANIC_3,
+	SFX_BUSINESS_MALE_OLD_VOICE_1_CARJACKED_1,
+	SFX_BUSINESS_MALE_OLD_VOICE_1_CARJACKED_2,
+	SFX_BUSINESS_MALE_OLD_VOICE_1_MUGGED_1,
+	SFX_BUSINESS_MALE_OLD_VOICE_1_MUGGED_2,
+	SFX_BUSINESS_MALE_OLD_VOICE_1_MRUN_FROM_FIGHT_1,
+	SFX_BUSINESS_MALE_OLD_VOICE_1_MRUN_FROM_FIGHT_2,
+	SFX_BUSINESS_MALE_OLD_VOICE_1_MRUN_FROM_FIGHT_3,
+	SFX_BUSINESS_MALE_OLD_VOICE_1_MRUN_FROM_FIGHT_4,
+	SFX_BUSINESS_MALE_OLD_VOICE_1_MRUN_FROM_FIGHT_5,
+	SFX_LITTLE_ITALY_MALE_VOICE_1_DRIVER_ABUSE_1,
+	SFX_LITTLE_ITALY_MALE_VOICE_1_DRIVER_ABUSE_2,
+	SFX_LITTLE_ITALY_MALE_VOICE_1_DRIVER_ABUSE_3,
+	SFX_LITTLE_ITALY_MALE_VOICE_1_DRIVER_ABUSE_4,
+	SFX_LITTLE_ITALY_MALE_VOICE_1_DRIVER_ABUSE_5,
+	SFX_LITTLE_ITALY_MALE_VOICE_1_DRIVER_ABUSE_6,
+	SFX_LITTLE_ITALY_MALE_VOICE_1_DRIVER_ABUSE_7,
+	SFX_LITTLE_ITALY_MALE_VOICE_1_CHAT_1,
+	SFX_LITTLE_ITALY_MALE_VOICE_1_CHAT_2,
+	SFX_LITTLE_ITALY_MALE_VOICE_1_CHAT_3,
+	SFX_LITTLE_ITALY_MALE_VOICE_1_CHAT_4,
+	SFX_LITTLE_ITALY_MALE_VOICE_1_CHAT_5,
+	SFX_LITTLE_ITALY_MALE_VOICE_1_CHAT_6,
+	SFX_LITTLE_ITALY_MALE_VOICE_1_DODGE_1,
+	SFX_LITTLE_ITALY_MALE_VOICE_1_DODGE_2,
+	SFX_LITTLE_ITALY_MALE_VOICE_1_DODGE_3,
+	SFX_LITTLE_ITALY_MALE_VOICE_1_DODGE_4,
+	SFX_LITTLE_ITALY_MALE_VOICE_1_DODGE_5,
+	SFX_LITTLE_ITALY_MALE_VOICE_1_FIGHT_1,
+	SFX_LITTLE_ITALY_MALE_VOICE_1_FIGHT_2,
+	SFX_LITTLE_ITALY_MALE_VOICE_1_FIGHT_3,
+	SFX_LITTLE_ITALY_MALE_VOICE_1_FIGHT_4,
+	SFX_LITTLE_ITALY_MALE_VOICE_1_FIGHT_5,
+	SFX_LITTLE_ITALY_MALE_VOICE_1_GUN_PANIC_1,
+	SFX_LITTLE_ITALY_MALE_VOICE_1_GUN_PANIC_2,
+	SFX_LITTLE_ITALY_MALE_VOICE_1_GUN_PANIC_3,
+	SFX_LITTLE_ITALY_MALE_VOICE_1_CARJACKED_1,
+	SFX_LITTLE_ITALY_MALE_VOICE_1_CARJACKED_2,
+	SFX_LITTLE_ITALY_MALE_VOICE_1_MUGGED_1,
+	SFX_LITTLE_ITALY_MALE_VOICE_1_MUGGED_2,
+	SFX_LITTLE_ITALY_MALE_VOICE_2_DRIVER_ABUSE_1,
+	SFX_LITTLE_ITALY_MALE_VOICE_2_DRIVER_ABUSE_2,
+	SFX_LITTLE_ITALY_MALE_VOICE_2_DRIVER_ABUSE_3,
+	SFX_LITTLE_ITALY_MALE_VOICE_2_DRIVER_ABUSE_4,
+	SFX_LITTLE_ITALY_MALE_VOICE_2_DRIVER_ABUSE_5,
+	SFX_LITTLE_ITALY_MALE_VOICE_2_DRIVER_ABUSE_6,
+	SFX_LITTLE_ITALY_MALE_VOICE_2_DRIVER_ABUSE_7,
+	SFX_LITTLE_ITALY_MALE_VOICE_2_CHAT_1,
+	SFX_LITTLE_ITALY_MALE_VOICE_2_CHAT_2,
+	SFX_LITTLE_ITALY_MALE_VOICE_2_CHAT_3,
+	SFX_LITTLE_ITALY_MALE_VOICE_2_CHAT_4,
+	SFX_LITTLE_ITALY_MALE_VOICE_2_CHAT_5,
+	SFX_LITTLE_ITALY_MALE_VOICE_2_CHAT_6,
+	SFX_LITTLE_ITALY_MALE_VOICE_2_DODGE_1,
+	SFX_LITTLE_ITALY_MALE_VOICE_2_DODGE_2,
+	SFX_LITTLE_ITALY_MALE_VOICE_2_DODGE_3,
+	SFX_LITTLE_ITALY_MALE_VOICE_2_DODGE_4,
+	SFX_LITTLE_ITALY_MALE_VOICE_2_DODGE_5,
+	SFX_LITTLE_ITALY_MALE_VOICE_2_FIGHT_1,
+	SFX_LITTLE_ITALY_MALE_VOICE_2_FIGHT_2,
+	SFX_LITTLE_ITALY_MALE_VOICE_2_FIGHT_3,
+	SFX_LITTLE_ITALY_MALE_VOICE_2_FIGHT_4,
+	SFX_LITTLE_ITALY_MALE_VOICE_2_FIGHT_5,
+	SFX_LITTLE_ITALY_MALE_VOICE_2_GUN_PANIC_1,
+	SFX_LITTLE_ITALY_MALE_VOICE_2_GUN_PANIC_2,
+	SFX_LITTLE_ITALY_MALE_VOICE_2_GUN_PANIC_3,
+	SFX_LITTLE_ITALY_MALE_VOICE_2_CARJACKED_1,
+	SFX_LITTLE_ITALY_MALE_VOICE_2_CARJACKED_2,
+	SFX_LITTLE_ITALY_MALE_VOICE_2_MUGGED_1,
+	SFX_LITTLE_ITALY_MALE_VOICE_2_MUGGED_2,
+	SFX_TRIAD_MALE_VOICE_1_DRIVER_ABUSE_1,
+	SFX_TRIAD_MALE_VOICE_1_DRIVER_ABUSE_2,
+	SFX_TRIAD_MALE_VOICE_1_DRIVER_ABUSE_3,
+	SFX_TRIAD_MALE_VOICE_1_DRIVER_ABUSE_4,
+	SFX_TRIAD_MALE_VOICE_1_DRIVER_ABUSE_5,
+	SFX_TRIAD_MALE_VOICE_1_DRIVER_ABUSE_6,
+	SFX_TRIAD_MALE_VOICE_1_DRIVER_ABUSE_7,
+	SFX_TRIAD_MALE_VOICE_1_CHAT_1,
+	SFX_TRIAD_MALE_VOICE_1_CHAT_2,
+	SFX_TRIAD_MALE_VOICE_1_CHAT_3,
+	SFX_TRIAD_MALE_VOICE_1_CHAT_4,
+	SFX_TRIAD_MALE_VOICE_1_CHAT_5,
+	SFX_TRIAD_MALE_VOICE_1_CHAT_6,
+	SFX_TRIAD_MALE_VOICE_1_CHAT_7,
+	SFX_TRIAD_MALE_VOICE_1_CHAT_8,
+	SFX_TRIAD_MALE_VOICE_1_DODGE_1,
+	SFX_TRIAD_MALE_VOICE_1_DODGE_2,
+	SFX_TRIAD_MALE_VOICE_1_DODGE_3,
+	SFX_TRIAD_MALE_VOICE_1_DODGE_4,
+	SFX_TRIAD_MALE_VOICE_1_EYING_1,
+	SFX_TRIAD_MALE_VOICE_1_EYING_2,
+	SFX_TRIAD_MALE_VOICE_1_EYING_3,
+	SFX_TRIAD_MALE_VOICE_1_FIGHT_1,
+	SFX_TRIAD_MALE_VOICE_1_FIGHT_2,
+	SFX_TRIAD_MALE_VOICE_1_FIGHT_3,
+	SFX_TRIAD_MALE_VOICE_1_FIGHT_4,
+	SFX_TRIAD_MALE_VOICE_1_FIGHT_5,
+	SFX_TRIAD_MALE_VOICE_1_GUN_COOL_1,
+	SFX_TRIAD_MALE_VOICE_1_GUN_COOL_2,
+	SFX_TRIAD_MALE_VOICE_1_GUN_COOL_3,
+	SFX_TRIAD_MALE_VOICE_1_CARJACKED_1,
+	SFX_TRIAD_MALE_VOICE_1_CARJACKED_2,
+	SFX_TRIAD_MALE_VOICE_1_CARJACKING_1,
+	SFX_TRIAD_MALE_VOICE_1_CARJACKING_2,
+	SFX_MAFIA_MALE_VOICE_1_DRIVER_ABUSE_1,
+	SFX_MAFIA_MALE_VOICE_1_DRIVER_ABUSE_2,
+	SFX_MAFIA_MALE_VOICE_1_DRIVER_ABUSE_3,
+	SFX_MAFIA_MALE_VOICE_1_DRIVER_ABUSE_4,
+	SFX_MAFIA_MALE_VOICE_1_DRIVER_ABUSE_5,
+	SFX_MAFIA_MALE_VOICE_1_DRIVER_ABUSE_6,
+	SFX_MAFIA_MALE_VOICE_1_CHAT_1,
+	SFX_MAFIA_MALE_VOICE_1_CHAT_2,
+	SFX_MAFIA_MALE_VOICE_1_CHAT_3,
+	SFX_MAFIA_MALE_VOICE_1_CHAT_4,
+	SFX_MAFIA_MALE_VOICE_1_CHAT_5,
+	SFX_MAFIA_MALE_VOICE_1_CHAT_6,
+	SFX_MAFIA_MALE_VOICE_1_CHAT_7,
+	SFX_MAFIA_MALE_VOICE_1_DODGE_1,
+	SFX_MAFIA_MALE_VOICE_1_DODGE_2,
+	SFX_MAFIA_MALE_VOICE_1_DODGE_3,
+	SFX_MAFIA_MALE_VOICE_1_DODGE_4,
+	SFX_MAFIA_MALE_VOICE_1_DODGE_5,
+	SFX_MAFIA_MALE_VOICE_1_EYING_1,
+	SFX_MAFIA_MALE_VOICE_1_EYING_2,
+	SFX_MAFIA_MALE_VOICE_1_EYING_3,
+	SFX_MAFIA_MALE_VOICE_1_FIGHT_1,
+	SFX_MAFIA_MALE_VOICE_1_FIGHT_2,
+	SFX_MAFIA_MALE_VOICE_1_FIGHT_3,
+	SFX_MAFIA_MALE_VOICE_1_FIGHT_4,
+	SFX_MAFIA_MALE_VOICE_1_FIGHT_5,
+	SFX_MAFIA_MALE_VOICE_1_CARJACKED_1,
+	SFX_MAFIA_MALE_VOICE_1_CARJACKED_2,
+	SFX_MAFIA_MALE_VOICE_1_CARJACKING_1,
+	SFX_MAFIA_MALE_VOICE_1_CARJACKING_2,
+	SFX_MAFIA_MALE_VOICE_2_DRIVER_ABUSE_1,
+	SFX_MAFIA_MALE_VOICE_2_DRIVER_ABUSE_2,
+	SFX_MAFIA_MALE_VOICE_2_DRIVER_ABUSE_3,
+	SFX_MAFIA_MALE_VOICE_2_DRIVER_ABUSE_4,
+	SFX_MAFIA_MALE_VOICE_2_DRIVER_ABUSE_5,
+	SFX_MAFIA_MALE_VOICE_2_DRIVER_ABUSE_6,
+	SFX_MAFIA_MALE_VOICE_2_CHAT_1,
+	SFX_MAFIA_MALE_VOICE_2_CHAT_2,
+	SFX_MAFIA_MALE_VOICE_2_CHAT_3,
+	SFX_MAFIA_MALE_VOICE_2_CHAT_4,
+	SFX_MAFIA_MALE_VOICE_2_CHAT_5,
+	SFX_MAFIA_MALE_VOICE_2_CHAT_6,
+	SFX_MAFIA_MALE_VOICE_2_CHAT_7,
+	SFX_MAFIA_MALE_VOICE_2_DODGE_1,
+	SFX_MAFIA_MALE_VOICE_2_DODGE_2,
+	SFX_MAFIA_MALE_VOICE_2_DODGE_3,
+	SFX_MAFIA_MALE_VOICE_2_DODGE_4,
+	SFX_MAFIA_MALE_VOICE_2_DODGE_5,
+	SFX_MAFIA_MALE_VOICE_2_EYING_1,
+	SFX_MAFIA_MALE_VOICE_2_EYING_2,
+	SFX_MAFIA_MALE_VOICE_2_EYING_3,
+	SFX_MAFIA_MALE_VOICE_2_FIGHT_1,
+	SFX_MAFIA_MALE_VOICE_2_FIGHT_2,
+	SFX_MAFIA_MALE_VOICE_2_FIGHT_3,
+	SFX_MAFIA_MALE_VOICE_2_FIGHT_4,
+	SFX_MAFIA_MALE_VOICE_2_FIGHT_5,
+	SFX_MAFIA_MALE_VOICE_2_CARJACKED_1,
+	SFX_MAFIA_MALE_VOICE_2_CARJACKED_2,
+	SFX_MAFIA_MALE_VOICE_2_CARJACKING_1,
+	SFX_MAFIA_MALE_VOICE_2_CARJACKING_2,
+	SFX_MAFIA_MALE_VOICE_3_DRIVER_ABUSE_1,
+	SFX_MAFIA_MALE_VOICE_3_DRIVER_ABUSE_2,
+	SFX_MAFIA_MALE_VOICE_3_DRIVER_ABUSE_3,
+	SFX_MAFIA_MALE_VOICE_3_DRIVER_ABUSE_4,
+	SFX_MAFIA_MALE_VOICE_3_DRIVER_ABUSE_5,
+	SFX_MAFIA_MALE_VOICE_3_DRIVER_ABUSE_6,
+	SFX_MAFIA_MALE_VOICE_3_CHAT_1,
+	SFX_MAFIA_MALE_VOICE_3_CHAT_2,
+	SFX_MAFIA_MALE_VOICE_3_CHAT_3,
+	SFX_MAFIA_MALE_VOICE_3_CHAT_4,
+	SFX_MAFIA_MALE_VOICE_3_CHAT_5,
+	SFX_MAFIA_MALE_VOICE_3_CHAT_6,
+	SFX_MAFIA_MALE_VOICE_3_CHAT_7,
+	SFX_MAFIA_MALE_VOICE_3_DODGE_1,
+	SFX_MAFIA_MALE_VOICE_3_DODGE_2,
+	SFX_MAFIA_MALE_VOICE_3_DODGE_3,
+	SFX_MAFIA_MALE_VOICE_3_DODGE_4,
+	SFX_MAFIA_MALE_VOICE_3_DODGE_5,
+	SFX_MAFIA_MALE_VOICE_3_EYING_1,
+	SFX_MAFIA_MALE_VOICE_3_EYING_2,
+	SFX_MAFIA_MALE_VOICE_3_EYING_3,
+	SFX_MAFIA_MALE_VOICE_3_FIGHT_1,
+	SFX_MAFIA_MALE_VOICE_3_FIGHT_2,
+	SFX_MAFIA_MALE_VOICE_3_FIGHT_3,
+	SFX_MAFIA_MALE_VOICE_3_FIGHT_4,
+	SFX_MAFIA_MALE_VOICE_3_FIGHT_5,
+	SFX_MAFIA_MALE_VOICE_3_CARJACKED_1,
+	SFX_MAFIA_MALE_VOICE_3_CARJACKED_2,
+	SFX_MAFIA_MALE_VOICE_3_CARJACKING_1,
+	SFX_MAFIA_MALE_VOICE_3_CARJACKING_2,
+	SFX_YAKUZA_MALE_VOICE_1_DRIVER_ABUSE_1,
+	SFX_YAKUZA_MALE_VOICE_1_DRIVER_ABUSE_2,
+	SFX_YAKUZA_MALE_VOICE_1_DRIVER_ABUSE_3,
+	SFX_YAKUZA_MALE_VOICE_1_DRIVER_ABUSE_4,
+	SFX_YAKUZA_MALE_VOICE_1_DRIVER_ABUSE_5,
+	SFX_YAKUZA_MALE_VOICE_1_DRIVER_ABUSE_6,
+	SFX_YAKUZA_MALE_VOICE_1_CHAT_1,
+	SFX_YAKUZA_MALE_VOICE_1_CHAT_2,
+	SFX_YAKUZA_MALE_VOICE_1_CHAT_3,
+	SFX_YAKUZA_MALE_VOICE_1_CHAT_4,
+	SFX_YAKUZA_MALE_VOICE_1_CHAT_5,
+	SFX_YAKUZA_MALE_VOICE_1_DODGE_1,
+	SFX_YAKUZA_MALE_VOICE_1_DODGE_2,
+	SFX_YAKUZA_MALE_VOICE_1_DODGE_3,
+	SFX_YAKUZA_MALE_VOICE_1_DODGE_4,
+	SFX_YAKUZA_MALE_VOICE_1_FIGHT_1,
+	SFX_YAKUZA_MALE_VOICE_1_FIGHT_2,
+	SFX_YAKUZA_MALE_VOICE_1_FIGHT_3,
+	SFX_YAKUZA_MALE_VOICE_1_FIGHT_4,
+	SFX_YAKUZA_MALE_VOICE_1_FIGHT_5,
+	SFX_YAKUZA_MALE_VOICE_1_CARJACKED_1,
+	SFX_YAKUZA_MALE_VOICE_1_CARJACKED_2,
+	SFX_YAKUZA_MALE_VOICE_1_CARJACKING_1,
+	SFX_YAKUZA_MALE_VOICE_1_CARJACKING_2,
+	SFX_YAKUZA_MALE_VOICE_2_DRIVER_ABUSE_1,
+	SFX_YAKUZA_MALE_VOICE_2_DRIVER_ABUSE_2,
+	SFX_YAKUZA_MALE_VOICE_2_DRIVER_ABUSE_3,
+	SFX_YAKUZA_MALE_VOICE_2_DRIVER_ABUSE_4,
+	SFX_YAKUZA_MALE_VOICE_2_DRIVER_ABUSE_5,
+	SFX_YAKUZA_MALE_VOICE_2_DRIVER_ABUSE_6,
+	SFX_YAKUZA_MALE_VOICE_2_CHAT_1,
+	SFX_YAKUZA_MALE_VOICE_2_CHAT_2,
+	SFX_YAKUZA_MALE_VOICE_2_CHAT_3,
+	SFX_YAKUZA_MALE_VOICE_2_CHAT_4,
+	SFX_YAKUZA_MALE_VOICE_2_CHAT_5,
+	SFX_YAKUZA_MALE_VOICE_2_DODGE_1,
+	SFX_YAKUZA_MALE_VOICE_2_DODGE_2,
+	SFX_YAKUZA_MALE_VOICE_2_DODGE_3,
+	SFX_YAKUZA_MALE_VOICE_2_DODGE_4,
+	SFX_YAKUZA_MALE_VOICE_2_FIGHT_1,
+	SFX_YAKUZA_MALE_VOICE_2_FIGHT_2,
+	SFX_YAKUZA_MALE_VOICE_2_FIGHT_3,
+	SFX_YAKUZA_MALE_VOICE_2_FIGHT_4,
+	SFX_YAKUZA_MALE_VOICE_2_FIGHT_5,
+	SFX_YAKUZA_MALE_VOICE_2_CARJACKED_1,
+	SFX_YAKUZA_MALE_VOICE_2_CARJACKED_2,
+	SFX_YAKUZA_MALE_VOICE_2_CARJACKING_1,
+	SFX_YAKUZA_MALE_VOICE_2_CARJACKING_2,
+	SFX_WHITE_MALE_CONSTRUCTION_VOICE_1_DRIVER_ABUSE_1,
+	SFX_WHITE_MALE_CONSTRUCTION_VOICE_1_DRIVER_ABUSE_2,
+	SFX_WHITE_MALE_CONSTRUCTION_VOICE_1_DRIVER_ABUSE_3,
+	SFX_WHITE_MALE_CONSTRUCTION_VOICE_1_DRIVER_ABUSE_4,
+	SFX_WHITE_MALE_CONSTRUCTION_VOICE_1_CHAT_1,
+	SFX_WHITE_MALE_CONSTRUCTION_VOICE_1_CHAT_2,
+	SFX_WHITE_MALE_CONSTRUCTION_VOICE_1_CHAT_3,
+	SFX_WHITE_MALE_CONSTRUCTION_VOICE_1_CHAT_4,
+	SFX_WHITE_MALE_CONSTRUCTION_VOICE_1_CHAT_5,
+	SFX_WHITE_MALE_CONSTRUCTION_VOICE_1_CHAT_6,
+	SFX_WHITE_MALE_CONSTRUCTION_VOICE_1_CHAT_7,
+	SFX_WHITE_MALE_CONSTRUCTION_VOICE_1_DODGE_1,
+	SFX_WHITE_MALE_CONSTRUCTION_VOICE_1_DODGE_2,
+	SFX_WHITE_MALE_CONSTRUCTION_VOICE_1_DODGE_3,
+	SFX_WHITE_MALE_CONSTRUCTION_VOICE_1_DODGE_4,
+	SFX_WHITE_MALE_CONSTRUCTION_VOICE_1_DODGE_5,
+	SFX_WHITE_MALE_CONSTRUCTION_VOICE_1_EYING_1,
+	SFX_WHITE_MALE_CONSTRUCTION_VOICE_1_EYING_2,
+	SFX_WHITE_MALE_CONSTRUCTION_VOICE_1_EYING_3,
+	SFX_WHITE_MALE_CONSTRUCTION_VOICE_1_FIGHT_1,
+	SFX_WHITE_MALE_CONSTRUCTION_VOICE_1_FIGHT_2,
+	SFX_WHITE_MALE_CONSTRUCTION_VOICE_1_FIGHT_3,
+	SFX_WHITE_MALE_CONSTRUCTION_VOICE_1_FIGHT_4,
+	SFX_WHITE_MALE_CONSTRUCTION_VOICE_1_FIGHT_5,
+	SFX_WHITE_MALE_CONSTRUCTION_VOICE_1_GUN_PANIC_1,
+	SFX_WHITE_MALE_CONSTRUCTION_VOICE_1_GUN_PANIC_2,
+	SFX_WHITE_MALE_CONSTRUCTION_VOICE_1_GUN_PANIC_3,
+	SFX_WHITE_MALE_CONSTRUCTION_VOICE_1_CARJACKED_1,
+	SFX_ASIAN_TAXI_DRIVER_VOICE_1_DRIVER_ABUSE_1,
+	SFX_ASIAN_TAXI_DRIVER_VOICE_1_DRIVER_ABUSE_2,
+	SFX_ASIAN_TAXI_DRIVER_VOICE_1_DRIVER_ABUSE_3,
+	SFX_ASIAN_TAXI_DRIVER_VOICE_1_DRIVER_ABUSE_4,
+	SFX_ASIAN_TAXI_DRIVER_VOICE_1_DRIVER_ABUSE_5,
+	SFX_ASIAN_TAXI_DRIVER_VOICE_1_DRIVER_ABUSE_6,
+	SFX_ASIAN_TAXI_DRIVER_VOICE_1_CARJACKED_1,
+	SFX_ASIAN_TAXI_DRIVER_VOICE_1_CARJACKED_2,
+	SFX_ASIAN_TAXI_DRIVER_VOICE_1_CARJACKED_3,
+	SFX_ASIAN_TAXI_DRIVER_VOICE_1_CARJACKED_4,
+	SFX_ASIAN_TAXI_DRIVER_VOICE_1_CARJACKED_5,
+	SFX_ASIAN_TAXI_DRIVER_VOICE_1_CARJACKED_6,
+	SFX_ASIAN_TAXI_DRIVER_VOICE_1_CARJACKED_7,
+	SFX_ASIAN_TAXI_DRIVER_VOICE_2_DRIVER_ABUSE_1,
+	SFX_ASIAN_TAXI_DRIVER_VOICE_2_DRIVER_ABUSE_2,
+	SFX_ASIAN_TAXI_DRIVER_VOICE_2_DRIVER_ABUSE_3,
+	SFX_ASIAN_TAXI_DRIVER_VOICE_2_DRIVER_ABUSE_4,
+	SFX_ASIAN_TAXI_DRIVER_VOICE_2_DRIVER_ABUSE_5,
+	SFX_ASIAN_TAXI_DRIVER_VOICE_2_DRIVER_ABUSE_6,
+	SFX_ASIAN_TAXI_DRIVER_VOICE_2_CARJACKED_1,
+	SFX_ASIAN_TAXI_DRIVER_VOICE_2_CARJACKED_2,
+	SFX_ASIAN_TAXI_DRIVER_VOICE_2_CARJACKED_3,
+	SFX_ASIAN_TAXI_DRIVER_VOICE_2_CARJACKED_4,
+	SFX_ASIAN_TAXI_DRIVER_VOICE_2_CARJACKED_5,
+	SFX_ASIAN_TAXI_DRIVER_VOICE_2_CARJACKED_6,
+	SFX_ASIAN_TAXI_DRIVER_VOICE_2_CARJACKED_7,
+	SFX_SECURITY_GUARD_VOICE_1_DRIVER_ABUSE_1,
+	SFX_SECURITY_GUARD_VOICE_1_DRIVER_ABUSE_2,
+	SFX_SECURITY_GUARD_VOICE_1_DRIVER_ABUSE_3,
+	SFX_SECURITY_GUARD_VOICE_1_DRIVER_ABUSE_4,
+	SFX_SECURITY_GUARD_VOICE_1_DRIVER_ABUSE_5,
+	SFX_SECURITY_GUARD_VOICE_1_DRIVER_ABUSE_6,
+	SFX_SECURITY_GUARD_VOICE_1_FIGHT_1,
+	SFX_SECURITY_GUARD_VOICE_1_FIGHT_2,
+	SFX_SECURITY_GUARD_VOICE_1_GUN_COOL_1,
+	SFX_SECURITY_GUARD_VOICE_1_GUN_COOL_2,
+	SFX_SECURITY_GUARD_VOICE_1_GUN_PANIC_1,
+	SFX_SECURITY_GUARD_VOICE_1_RUN_FROM_FIGHT_1,
+	SFX_BLACK_PROSTITUTE_VOICE_1_CHAT_1,
+	SFX_BLACK_PROSTITUTE_VOICE_1_CHAT_2,
+	SFX_BLACK_PROSTITUTE_VOICE_1_CHAT_3,
+	SFX_BLACK_PROSTITUTE_VOICE_1_CHAT_4,
+	SFX_BLACK_PROSTITUTE_VOICE_1_DODGE_1,
+	SFX_BLACK_PROSTITUTE_VOICE_1_DODGE_2,
+	SFX_BLACK_PROSTITUTE_VOICE_1_DODGE_3,
+	SFX_BLACK_PROSTITUTE_VOICE_1_MUGGED_1,
+	SFX_BLACK_PROSTITUTE_VOICE_1_DRIVER_ABUSE_1,
+	SFX_BLACK_PROSTITUTE_VOICE_1_DRIVER_ABUSE_2,
+	SFX_BLACK_PROSTITUTE_VOICE_1_DRIVER_ABUSE_3,
+	SFX_BLACK_PROSTITUTE_VOICE_1_DRIVER_ABUSE_4,
+	SFX_BLACK_PROSTITUTE_VOICE_1_FIGHT_1,
+	SFX_BLACK_PROSTITUTE_VOICE_1_FIGHT_2,
+	SFX_BLACK_PROSTITUTE_VOICE_1_FIGHT_3,
+	SFX_BLACK_PROSTITUTE_VOICE_1_FIGHT_4,
+	SFX_BLACK_PROSTITUTE_VOICE_1_SOLICIT_1,
+	SFX_BLACK_PROSTITUTE_VOICE_1_SOLICIT_2,
+	SFX_BLACK_PROSTITUTE_VOICE_1_SOLICIT_3,
+	SFX_BLACK_PROSTITUTE_VOICE_1_SOLICIT_4,
+	SFX_BLACK_PROSTITUTE_VOICE_1_SOLICIT_5,
+	SFX_BLACK_PROSTITUTE_VOICE_1_SOLICIT_6,
+	SFX_BLACK_PROSTITUTE_VOICE_1_SOLICIT_7,
+	SFX_BLACK_PROSTITUTE_VOICE_1_SOLICIT_8,
+	SFX_BLACK_PROSTITUTE_VOICE_1_GUN_COOL_1,
+	SFX_BLACK_PROSTITUTE_VOICE_1_GUN_COOL_2,
+	SFX_BLACK_PROSTITUTE_VOICE_1_GUN_COOL_3,
+	SFX_BLACK_PROSTITUTE_VOICE_1_GUN_COOL_4,
+	SFX_BLACK_PROSTITUTE_VOICE_2_CHAT_1,
+	SFX_BLACK_PROSTITUTE_VOICE_2_CHAT_2,
+	SFX_BLACK_PROSTITUTE_VOICE_2_CHAT_3,
+	SFX_BLACK_PROSTITUTE_VOICE_2_CHAT_4,
+	SFX_BLACK_PROSTITUTE_VOICE_2_DODGE_1,
+	SFX_BLACK_PROSTITUTE_VOICE_2_DODGE_2,
+	SFX_BLACK_PROSTITUTE_VOICE_2_DODGE_3,
+	SFX_BLACK_PROSTITUTE_VOICE_2_MUGGED_1,
+	SFX_BLACK_PROSTITUTE_VOICE_2_DRIVER_ABUSE_1,
+	SFX_BLACK_PROSTITUTE_VOICE_2_DRIVER_ABUSE_2,
+	SFX_BLACK_PROSTITUTE_VOICE_2_DRIVER_ABUSE_3,
+	SFX_BLACK_PROSTITUTE_VOICE_2_DRIVER_ABUSE_4,
+	SFX_BLACK_PROSTITUTE_VOICE_2_FIGHT_1,
+	SFX_BLACK_PROSTITUTE_VOICE_2_FIGHT_2,
+	SFX_BLACK_PROSTITUTE_VOICE_2_FIGHT_3,
+	SFX_BLACK_PROSTITUTE_VOICE_2_FIGHT_4,
+	SFX_BLACK_PROSTITUTE_VOICE_2_SOLICIT_1,
+	SFX_BLACK_PROSTITUTE_VOICE_2_SOLICIT_2,
+	SFX_BLACK_PROSTITUTE_VOICE_2_SOLICIT_3,
+	SFX_BLACK_PROSTITUTE_VOICE_2_SOLICIT_4,
+	SFX_BLACK_PROSTITUTE_VOICE_2_SOLICIT_5,
+	SFX_BLACK_PROSTITUTE_VOICE_2_SOLICIT_6,
+	SFX_BLACK_PROSTITUTE_VOICE_2_SOLICIT_7,
+	SFX_BLACK_PROSTITUTE_VOICE_2_SOLICIT_8,
+	SFX_BLACK_PROSTITUTE_VOICE_2_GUN_COOL_1,
+	SFX_BLACK_PROSTITUTE_VOICE_2_GUN_COOL_2,
+	SFX_BLACK_PROSTITUTE_VOICE_2_GUN_COOL_3,
+	SFX_BLACK_PROSTITUTE_VOICE_2_GUN_COOL_4,
+	SFX_WHITE_PROSTITUTE_VOICE_1_CHAT_1,
+	SFX_WHITE_PROSTITUTE_VOICE_1_CHAT_2,
+	SFX_WHITE_PROSTITUTE_VOICE_1_CHAT_3,
+	SFX_WHITE_PROSTITUTE_VOICE_1_CHAT_4,
+	SFX_WHITE_PROSTITUTE_VOICE_1_DODGE_1,
+	SFX_WHITE_PROSTITUTE_VOICE_1_DODGE_2,
+	SFX_WHITE_PROSTITUTE_VOICE_1_DODGE_3,
+	SFX_WHITE_PROSTITUTE_VOICE_1_MUGGED_1,
+	SFX_WHITE_PROSTITUTE_VOICE_1_MUGGED_2,
+	SFX_WHITE_PROSTITUTE_VOICE_1_DRIVER_ABUSE_1,
+	SFX_WHITE_PROSTITUTE_VOICE_1_DRIVER_ABUSE_2,
+	SFX_WHITE_PROSTITUTE_VOICE_1_DRIVER_ABUSE_3,
+	SFX_WHITE_PROSTITUTE_VOICE_1_DRIVER_ABUSE_4,
+	SFX_WHITE_PROSTITUTE_VOICE_1_FIGHT_1,
+	SFX_WHITE_PROSTITUTE_VOICE_1_FIGHT_2,
+	SFX_WHITE_PROSTITUTE_VOICE_1_FIGHT_3,
+	SFX_WHITE_PROSTITUTE_VOICE_1_FIGHT_4,
+	SFX_WHITE_PROSTITUTE_VOICE_1_SOLICIT_1,
+	SFX_WHITE_PROSTITUTE_VOICE_1_SOLICIT_2,
+	SFX_WHITE_PROSTITUTE_VOICE_1_SOLICIT_3,
+	SFX_WHITE_PROSTITUTE_VOICE_1_SOLICIT_4,
+	SFX_WHITE_PROSTITUTE_VOICE_1_SOLICIT_5,
+	SFX_WHITE_PROSTITUTE_VOICE_1_SOLICIT_6,
+	SFX_WHITE_PROSTITUTE_VOICE_1_SOLICIT_7,
+	SFX_WHITE_PROSTITUTE_VOICE_1_SOLICIT_8,
+	SFX_WHITE_PROSTITUTE_VOICE_2_CHAT_1,
+	SFX_WHITE_PROSTITUTE_VOICE_2_CHAT_2,
+	SFX_WHITE_PROSTITUTE_VOICE_2_CHAT_3,
+	SFX_WHITE_PROSTITUTE_VOICE_2_CHAT_4,
+	SFX_WHITE_PROSTITUTE_VOICE_2_DODGE_1,
+	SFX_WHITE_PROSTITUTE_VOICE_2_DODGE_2,
+	SFX_WHITE_PROSTITUTE_VOICE_2_DODGE_3,
+	SFX_WHITE_PROSTITUTE_VOICE_2_MUGGED_1,
+	SFX_WHITE_PROSTITUTE_VOICE_2_MUGGED_2,
+	SFX_WHITE_PROSTITUTE_VOICE_2_DRIVER_ABUSE_1,
+	SFX_WHITE_PROSTITUTE_VOICE_2_DRIVER_ABUSE_2,
+	SFX_WHITE_PROSTITUTE_VOICE_2_DRIVER_ABUSE_3,
+	SFX_WHITE_PROSTITUTE_VOICE_2_DRIVER_ABUSE_4,
+	SFX_WHITE_PROSTITUTE_VOICE_2_FIGHT_1,
+	SFX_WHITE_PROSTITUTE_VOICE_2_FIGHT_2,
+	SFX_WHITE_PROSTITUTE_VOICE_2_FIGHT_3,
+	SFX_WHITE_PROSTITUTE_VOICE_2_FIGHT_4,
+	SFX_WHITE_PROSTITUTE_VOICE_2_SOLICIT_1,
+	SFX_WHITE_PROSTITUTE_VOICE_2_SOLICIT_2,
+	SFX_WHITE_PROSTITUTE_VOICE_2_SOLICIT_3,
+	SFX_WHITE_PROSTITUTE_VOICE_2_SOLICIT_4,
+	SFX_WHITE_PROSTITUTE_VOICE_2_SOLICIT_5,
+	SFX_WHITE_PROSTITUTE_VOICE_2_SOLICIT_6,
+	SFX_WHITE_PROSTITUTE_VOICE_2_SOLICIT_7,
+	SFX_WHITE_PROSTITUTE_VOICE_2_SOLICIT_8,
+	SFX_LITTLE_ITALY_YOUNG_FEMALE_VOICE_1_CHAT_1,
+	SFX_LITTLE_ITALY_YOUNG_FEMALE_VOICE_1_CHAT_2,
+	SFX_LITTLE_ITALY_YOUNG_FEMALE_VOICE_1_CHAT_3,
+	SFX_LITTLE_ITALY_YOUNG_FEMALE_VOICE_1_CHAT_4,
+	SFX_LITTLE_ITALY_YOUNG_FEMALE_VOICE_1_CHAT_5,
+	SFX_LITTLE_ITALY_YOUNG_FEMALE_VOICE_1_CHAT_6,
+	SFX_LITTLE_ITALY_YOUNG_FEMALE_VOICE_1_DODGE_1,
+	SFX_LITTLE_ITALY_YOUNG_FEMALE_VOICE_1_DODGE_2,
+	SFX_LITTLE_ITALY_YOUNG_FEMALE_VOICE_1_DODGE_3,
+	SFX_LITTLE_ITALY_YOUNG_FEMALE_VOICE_1_DODGE_4,
+	SFX_LITTLE_ITALY_YOUNG_FEMALE_VOICE_1_DODGE_5,
+	SFX_LITTLE_ITALY_YOUNG_FEMALE_VOICE_1_DODGE_6,
+	SFX_LITTLE_ITALY_YOUNG_FEMALE_VOICE_1_DODGE_7,
+	SFX_LITTLE_ITALY_YOUNG_FEMALE_VOICE_1_CARJACKED_1,
+	SFX_LITTLE_ITALY_YOUNG_FEMALE_VOICE_1_CARJACKED_2,
+	SFX_LITTLE_ITALY_YOUNG_FEMALE_VOICE_1_MUGGED_1,
+	SFX_LITTLE_ITALY_YOUNG_FEMALE_VOICE_1_MUGGED_2,
+	SFX_LITTLE_ITALY_YOUNG_FEMALE_VOICE_1_DRIVER_ABUSE_1,
+	SFX_LITTLE_ITALY_YOUNG_FEMALE_VOICE_1_DRIVER_ABUSE_2,
+	SFX_LITTLE_ITALY_YOUNG_FEMALE_VOICE_1_DRIVER_ABUSE_3,
+	SFX_LITTLE_ITALY_YOUNG_FEMALE_VOICE_1_DRIVER_ABUSE_4,
+	SFX_LITTLE_ITALY_YOUNG_FEMALE_VOICE_1_DRIVER_ABUSE_5,
+	SFX_LITTLE_ITALY_YOUNG_FEMALE_VOICE_1_DRIVER_ABUSE_6,
+	SFX_LITTLE_ITALY_YOUNG_FEMALE_VOICE_1_SHOCKED_1,
+	SFX_LITTLE_ITALY_YOUNG_FEMALE_VOICE_1_SHOCKED_2,
+	SFX_LITTLE_ITALY_YOUNG_FEMALE_VOICE_1_SHOCKED_3,
+	SFX_LITTLE_ITALY_YOUNG_FEMALE_VOICE_1_SHOCKED_4,
+	SFX_LITTLE_ITALY_OLD_FEMALE_VOICE_1_CHAT_1,
+	SFX_LITTLE_ITALY_OLD_FEMALE_VOICE_1_CHAT_2,
+	SFX_LITTLE_ITALY_OLD_FEMALE_VOICE_1_CHAT_3,
+	SFX_LITTLE_ITALY_OLD_FEMALE_VOICE_1_CHAT_4,
+	SFX_LITTLE_ITALY_OLD_FEMALE_VOICE_1_CHAT_5,
+	SFX_LITTLE_ITALY_OLD_FEMALE_VOICE_1_CHAT_6,
+	SFX_LITTLE_ITALY_OLD_FEMALE_VOICE_1_CHAT_7,
+	SFX_LITTLE_ITALY_OLD_FEMALE_VOICE_1_DODGE_1,
+	SFX_LITTLE_ITALY_OLD_FEMALE_VOICE_1_DODGE_2,
+	SFX_LITTLE_ITALY_OLD_FEMALE_VOICE_1_DODGE_3,
+	SFX_LITTLE_ITALY_OLD_FEMALE_VOICE_1_DODGE_4,
+	SFX_LITTLE_ITALY_OLD_FEMALE_VOICE_1_DODGE_5,
+	SFX_LITTLE_ITALY_OLD_FEMALE_VOICE_1_DODGE_6,
+	SFX_LITTLE_ITALY_OLD_FEMALE_VOICE_1_CARJACKED_1,
+	SFX_LITTLE_ITALY_OLD_FEMALE_VOICE_1_CARJACKED_2,
+	SFX_LITTLE_ITALY_OLD_FEMALE_VOICE_1_MUGGED_1,
+	SFX_LITTLE_ITALY_OLD_FEMALE_VOICE_1_MUGGED_2,
+	SFX_LITTLE_ITALY_OLD_FEMALE_VOICE_1_DRIVER_ABUSE_1,
+	SFX_LITTLE_ITALY_OLD_FEMALE_VOICE_1_DRIVER_ABUSE_2,
+	SFX_LITTLE_ITALY_OLD_FEMALE_VOICE_1_DRIVER_ABUSE_3,
+	SFX_LITTLE_ITALY_OLD_FEMALE_VOICE_1_DRIVER_ABUSE_4,
+	SFX_LITTLE_ITALY_OLD_FEMALE_VOICE_1_DRIVER_ABUSE_5,
+	SFX_LITTLE_ITALY_OLD_FEMALE_VOICE_1_DRIVER_ABUSE_6,
+	SFX_LITTLE_ITALY_OLD_FEMALE_VOICE_1_DRIVER_ABUSE_7,
+	SFX_LITTLE_ITALY_OLD_FEMALE_VOICE_1_SHOCKED_1,
+	SFX_LITTLE_ITALY_OLD_FEMALE_VOICE_1_SHOCKED_2,
+	SFX_LITTLE_ITALY_OLD_FEMALE_VOICE_1_SHOCKED_3,
+	SFX_LITTLE_ITALY_OLD_FEMALE_VOICE_1_SHOCKED_4,
+	SFX_GENERIC_MALE_DEATH_1,
+	SFX_GENERIC_MALE_DEATH_2,
+	SFX_GENERIC_MALE_DEATH_3,
+	SFX_GENERIC_MALE_DEATH_4,
+	SFX_GENERIC_MALE_DEATH_5,
+	SFX_GENERIC_MALE_DEATH_6,
+	SFX_GENERIC_MALE_DEATH_7,
+	SFX_GENERIC_MALE_DEATH_8,
+	SFX_GENERIC_MALE_FIRE_1,
+	SFX_GENERIC_MALE_FIRE_2,
+	SFX_GENERIC_MALE_FIRE_3,
+	SFX_GENERIC_MALE_FIRE_4,
+	SFX_GENERIC_MALE_FIRE_5,
+	SFX_GENERIC_MALE_FIRE_6,
+	SFX_GENERIC_MALE_FIRE_7,
+	SFX_GENERIC_MALE_FIRE_8,
+	SFX_GENERIC_MALE_GRUNT_1,
+	SFX_GENERIC_MALE_GRUNT_2,
+	SFX_GENERIC_MALE_GRUNT_3,
+	SFX_GENERIC_MALE_GRUNT_4,
+	SFX_GENERIC_MALE_GRUNT_5,
+	SFX_GENERIC_MALE_GRUNT_6,
+	SFX_GENERIC_MALE_GRUNT_7,
+	SFX_GENERIC_MALE_GRUNT_8,
+	SFX_GENERIC_MALE_GRUNT_9,
+	SFX_GENERIC_MALE_GRUNT_10,
+	SFX_GENERIC_MALE_GRUNT_11,
+	SFX_GENERIC_MALE_GRUNT_12,
+	SFX_GENERIC_MALE_GRUNT_13,
+	SFX_GENERIC_MALE_GRUNT_14,
+	SFX_GENERIC_MALE_GRUNT_15,
+	SFX_GENERIC_MALE_PANIC_1,
+	SFX_GENERIC_MALE_PANIC_2,
+	SFX_GENERIC_MALE_PANIC_3,
+	SFX_GENERIC_MALE_PANIC_4,
+	SFX_GENERIC_MALE_PANIC_5,
+	SFX_GENERIC_MALE_PANIC_6,
+	SFX_WHITE_FAT_MALE_VOICE_1_CHAT_1,
+	SFX_WHITE_FAT_MALE_VOICE_1_CHAT_2,
+	SFX_WHITE_FAT_MALE_VOICE_1_CHAT_3,
+	SFX_WHITE_FAT_MALE_VOICE_1_CHAT_4,
+	SFX_WHITE_FAT_MALE_VOICE_1_CHAT_5,
+	SFX_WHITE_FAT_MALE_VOICE_1_CHAT_6,
+	SFX_WHITE_FAT_MALE_VOICE_1_CHAT_7,
+	SFX_WHITE_FAT_MALE_VOICE_1_CHAT_8,
+	SFX_WHITE_FAT_MALE_VOICE_1_CHAT_9,
+	SFX_WHITE_FAT_MALE_VOICE_1_DODGE_1,
+	SFX_WHITE_FAT_MALE_VOICE_1_DODGE_2,
+	SFX_WHITE_FAT_MALE_VOICE_1_DODGE_3,
+	SFX_WHITE_FAT_MALE_VOICE_1_DODGE_4,
+	SFX_WHITE_FAT_MALE_VOICE_1_DODGE_5,
+	SFX_WHITE_FAT_MALE_VOICE_1_DODGE_6,
+	SFX_WHITE_FAT_MALE_VOICE_1_DODGE_7,
+	SFX_WHITE_FAT_MALE_VOICE_1_DODGE_8,
+	SFX_WHITE_FAT_MALE_VOICE_1_DODGE_9,
+	SFX_WHITE_FAT_MALE_VOICE_1_CARJACKED_1,
+	SFX_WHITE_FAT_MALE_VOICE_1_CARJACKED_2,
+	SFX_WHITE_FAT_MALE_VOICE_1_CARJACKED_3,
+	SFX_WHITE_FAT_MALE_VOICE_1_MUGGED_1,
+	SFX_WHITE_FAT_MALE_VOICE_1_MUGGED_2,
+	SFX_WHITE_FAT_MALE_VOICE_1_MUGGED_3,
+	SFX_WHITE_FAT_MALE_VOICE_1_LOST_1,
+	SFX_WHITE_FAT_MALE_VOICE_1_LOST_2,
+	SFX_WHITE_FAT_MALE_VOICE_1_DRIVER_ABUSE_1,
+	SFX_WHITE_FAT_MALE_VOICE_1_DRIVER_ABUSE_2,
+	SFX_WHITE_FAT_MALE_VOICE_1_DRIVER_ABUSE_3,
+	SFX_WHITE_FAT_MALE_VOICE_1_DRIVER_ABUSE_4,
+	SFX_WHITE_FAT_MALE_VOICE_1_DRIVER_ABUSE_5,
+	SFX_WHITE_FAT_MALE_VOICE_1_DRIVER_ABUSE_6,
+	SFX_WHITE_FAT_MALE_VOICE_1_DRIVER_ABUSE_7,
+	SFX_WHITE_FAT_MALE_VOICE_1_DRIVER_ABUSE_8,
+	SFX_WHITE_FAT_MALE_VOICE_1_DRIVER_ABUSE_9,
+	SFX_WHITE_FAT_FEMALE_VOICE_1_CHAT_1,
+	SFX_WHITE_FAT_FEMALE_VOICE_1_CHAT_2,
+	SFX_WHITE_FAT_FEMALE_VOICE_1_CHAT_3,
+	SFX_WHITE_FAT_FEMALE_VOICE_1_CHAT_4,
+	SFX_WHITE_FAT_FEMALE_VOICE_1_CHAT_5,
+	SFX_WHITE_FAT_FEMALE_VOICE_1_CHAT_6,
+	SFX_WHITE_FAT_FEMALE_VOICE_1_CHAT_7,
+	SFX_WHITE_FAT_FEMALE_VOICE_1_CHAT_8,
+	SFX_WHITE_FAT_FEMALE_VOICE_1_DODGE_1,
+	SFX_WHITE_FAT_FEMALE_VOICE_1_DODGE_2,
+	SFX_WHITE_FAT_FEMALE_VOICE_1_DODGE_3,
+	SFX_WHITE_FAT_FEMALE_VOICE_1_DODGE_4,
+	SFX_WHITE_FAT_FEMALE_VOICE_1_DODGE_5,
+	SFX_WHITE_FAT_FEMALE_VOICE_1_DODGE_6,
+	SFX_WHITE_FAT_FEMALE_VOICE_1_CARJACKED_1,
+	SFX_WHITE_FAT_FEMALE_VOICE_1_CARJACKED_2,
+	SFX_WHITE_FAT_FEMALE_VOICE_1_MUGGED_1,
+	SFX_WHITE_FAT_FEMALE_VOICE_1_MUGGED_2,
+	SFX_WHITE_FAT_FEMALE_VOICE_1_LOST_1,
+	SFX_WHITE_FAT_FEMALE_VOICE_1_LOST_2,
+	SFX_WHITE_FAT_FEMALE_VOICE_1_DRIVER_ABUSE_1,
+	SFX_WHITE_FAT_FEMALE_VOICE_1_DRIVER_ABUSE_2,
+	SFX_WHITE_FAT_FEMALE_VOICE_1_DRIVER_ABUSE_3,
+	SFX_WHITE_FAT_FEMALE_VOICE_1_DRIVER_ABUSE_4,
+	SFX_WHITE_FAT_FEMALE_VOICE_1_DRIVER_ABUSE_5,
+	SFX_WHITE_FAT_FEMALE_VOICE_1_DRIVER_ABUSE_6,
+	SFX_WHITE_FAT_FEMALE_VOICE_1_DRIVER_ABUSE_7,
+	SFX_WHITE_FAT_FEMALE_VOICE_1_DRIVER_ABUSE_8,
+	SFX_WHITE_FAT_FEMALE_VOICE_1_SHOCKED_1,
+	SFX_WHITE_FAT_FEMALE_VOICE_1_SHOCKED_2,
+	SFX_WHITE_FAT_FEMALE_VOICE_1_SHOCKED_3,
+	SFX_WHITE_FAT_FEMALE_VOICE_1_SHOCKED_4,
+	SFX_WHITE_CASUAL_FEMALE_VOICE_1_CHAT_1,
+	SFX_WHITE_CASUAL_FEMALE_VOICE_1_CHAT_2,
+	SFX_WHITE_CASUAL_FEMALE_VOICE_1_CHAT_3,
+	SFX_WHITE_CASUAL_FEMALE_VOICE_1_CHAT_4,
+	SFX_WHITE_CASUAL_FEMALE_VOICE_1_DODGE_1,
+	SFX_WHITE_CASUAL_FEMALE_VOICE_1_DODGE_2,
+	SFX_WHITE_CASUAL_FEMALE_VOICE_1_DODGE_3,
+	SFX_WHITE_CASUAL_FEMALE_VOICE_1_CARJACKED_1,
+	SFX_WHITE_CASUAL_FEMALE_VOICE_1_CARJACKED_2,
+	SFX_WHITE_CASUAL_FEMALE_VOICE_1_MUGGED_1,
+	SFX_WHITE_CASUAL_FEMALE_VOICE_1_DRIVER_ABUSE_1,
+	SFX_WHITE_CASUAL_FEMALE_VOICE_1_DRIVER_ABUSE_2,
+	SFX_WHITE_CASUAL_FEMALE_VOICE_1_DRIVER_ABUSE_3,
+	SFX_WHITE_CASUAL_FEMALE_VOICE_1_DRIVER_ABUSE_4,
+	SFX_WHITE_CASUAL_FEMALE_VOICE_1_DRIVER_ABUSE_5,
+	SFX_WHITE_CASUAL_FEMALE_VOICE_1_DRIVER_ABUSE_6,
+	SFX_WHITE_CASUAL_FEMALE_VOICE_1_DRIVER_ABUSE_7,
+	SFX_WHITE_CASUAL_FEMALE_VOICE_1_DRIVER_ABUSE_8,
+	SFX_WHITE_CASUAL_FEMALE_VOICE_1_SHOCKED_1,
+	SFX_WHITE_CASUAL_FEMALE_VOICE_1_SHOCKED_2,
+	SFX_WHITE_CASUAL_FEMALE_VOICE_1_GUN_PANIC_1,
+	SFX_WHITE_CASUAL_FEMALE_VOICE_1_GUN_PANIC_2,
+	SFX_WHITE_CASUAL_FEMALE_VOICE_1_RUN_FROM_FIGHT_1,
+	SFX_WHITE_CASUAL_FEMALE_VOICE_1_RUN_FROM_FIGHT_2,
+	SFX_DIABLO_MALE_VOICE_1_CHAT_1,
+	SFX_DIABLO_MALE_VOICE_1_CHAT_2,
+	SFX_DIABLO_MALE_VOICE_1_CHAT_3,
+	SFX_DIABLO_MALE_VOICE_1_CHAT_4,
+	SFX_DIABLO_MALE_VOICE_1_CHAT_5,
+	SFX_DIABLO_MALE_VOICE_1_DODGE_1,
+	SFX_DIABLO_MALE_VOICE_1_DODGE_2,
+	SFX_DIABLO_MALE_VOICE_1_DODGE_3,
+	SFX_DIABLO_MALE_VOICE_1_DODGE_4,
+	SFX_DIABLO_MALE_VOICE_1_CARJACKED_1,
+	SFX_DIABLO_MALE_VOICE_1_CARJACKED_2,
+	SFX_DIABLO_MALE_VOICE_1_CARJACKING_1,
+	SFX_DIABLO_MALE_VOICE_1_CARJACKING_2,
+	SFX_DIABLO_MALE_VOICE_1_FIGHT_1,
+	SFX_DIABLO_MALE_VOICE_1_FIGHT_2,
+	SFX_DIABLO_MALE_VOICE_1_FIGHT_3,
+	SFX_DIABLO_MALE_VOICE_1_FIGHT_4,
+	SFX_DIABLO_MALE_VOICE_1_EYING_1,
+	SFX_DIABLO_MALE_VOICE_1_EYING_2,
+	SFX_DIABLO_MALE_VOICE_1_EYING_3,
+	SFX_DIABLO_MALE_VOICE_1_EYING_4,
+	SFX_DIABLO_MALE_VOICE_1_GUN_COOL_1,
+	SFX_DIABLO_MALE_VOICE_1_GUN_COOL_2,
+	SFX_DIABLO_MALE_VOICE_1_GUN_COOL_3,
+	SFX_DIABLO_MALE_VOICE_1_GUN_COOL_4,
+	SFX_DIABLO_MALE_VOICE_1_DRIVER_ABUSE_1,
+	SFX_DIABLO_MALE_VOICE_1_DRIVER_ABUSE_2,
+	SFX_DIABLO_MALE_VOICE_1_DRIVER_ABUSE_3,
+	SFX_DIABLO_MALE_VOICE_1_DRIVER_ABUSE_4,
+	SFX_DIABLO_MALE_VOICE_1_DRIVER_ABUSE_5,
+	SFX_DIABLO_MALE_VOICE_2_CHAT_1,
+	SFX_DIABLO_MALE_VOICE_2_CHAT_2,
+	SFX_DIABLO_MALE_VOICE_2_CHAT_3,
+	SFX_DIABLO_MALE_VOICE_2_CHAT_4,
+	SFX_DIABLO_MALE_VOICE_2_CHAT_5,
+	SFX_DIABLO_MALE_VOICE_2_DODGE_1,
+	SFX_DIABLO_MALE_VOICE_2_DODGE_2,
+	SFX_DIABLO_MALE_VOICE_2_DODGE_3,
+	SFX_DIABLO_MALE_VOICE_2_DODGE_4,
+	SFX_DIABLO_MALE_VOICE_2_CARJACKED_1,
+	SFX_DIABLO_MALE_VOICE_2_CARJACKED_2,
+	SFX_DIABLO_MALE_VOICE_2_CARJACKING_1,
+	SFX_DIABLO_MALE_VOICE_2_CARJACKING_2,
+	SFX_DIABLO_MALE_VOICE_2_FIGHT_1,
+	SFX_DIABLO_MALE_VOICE_2_FIGHT_2,
+	SFX_DIABLO_MALE_VOICE_2_FIGHT_3,
+	SFX_DIABLO_MALE_VOICE_2_FIGHT_4,
+	SFX_DIABLO_MALE_VOICE_2_EYING_1,
+	SFX_DIABLO_MALE_VOICE_2_EYING_2,
+	SFX_DIABLO_MALE_VOICE_2_EYING_3,
+	SFX_DIABLO_MALE_VOICE_2_EYING_4,
+	SFX_DIABLO_MALE_VOICE_2_GUN_COOL_1,
+	SFX_DIABLO_MALE_VOICE_2_GUN_COOL_2,
+	SFX_DIABLO_MALE_VOICE_2_GUN_COOL_3,
+	SFX_DIABLO_MALE_VOICE_2_GUN_COOL_4,
+	SFX_DIABLO_MALE_VOICE_2_DRIVER_ABUSE_1,
+	SFX_DIABLO_MALE_VOICE_2_DRIVER_ABUSE_2,
+	SFX_DIABLO_MALE_VOICE_2_DRIVER_ABUSE_3,
+	SFX_DIABLO_MALE_VOICE_2_DRIVER_ABUSE_4,
+	SFX_DIABLO_MALE_VOICE_2_DRIVER_ABUSE_5,
+	SFX_AMMU_D,
+	SFX_AMMU_E,
+	SFX_AMMU_F,
+	TOTAL_AUDIO_SAMPLES,
+	NO_SAMPLE,
 
+	// shorthands
+	SAMPLEBANK_START = SFX_CAR_HORN_JEEP,
+	SAMPLEBANK_END = SFX_PAGER,
+	SAMPLEBANK_MAX = SFX_PAGER + 1,
+	SAMPLEBANK_PED_START = SFX_COP_VOICE_1_ARREST_1,
+	SAMPLEBANK_PED_END = SFX_AMMU_F,
+	SAMPLEBANK_PED_MAX = SFX_AMMU_F + 1,
+};
\ No newline at end of file