Merge remote-tracking branch 'upstream/master'

librw

@@ -1 +1 @@
-Subproject commit 4f118dcd975bab1b19cde31264e2917a958293db
+Subproject commit a3120078932053ddd61d696536d8b371e9d65b37

src/audio/AudioCollision.cpp

@@ -164,16 +164,16 @@ cAudioManager::SetUpLoopingCollisionSound(cAudioCollision *col, uint8 counter)
 		uint8 emittingVol = SetLoopingCollisionRequestedSfxFreqAndGetVol(col);
 		if(emittingVol) {
 			m_sQueueSample.m_fDistance = Sqrt(col->m_fDistance);
-			m_sQueueSample.m_bVolume =
+			m_sQueueSample.m_nVolume =
 			    ComputeVolume(emittingVol, CollisionSoundIntensity, m_sQueueSample.m_fDistance);
-			if(m_sQueueSample.m_bVolume) {
+			if(m_sQueueSample.m_nVolume) {
 				m_sQueueSample.m_nCounter = counter;
 				m_sQueueSample.m_vecPos = col->m_vecPosition;
-				m_sQueueSample.m_bBankIndex = SAMPLEBANK_MAIN;
+				m_sQueueSample.m_nBankIndex = SAMPLEBANK_MAIN;
 				m_sQueueSample.m_bIs2D = false;
 				m_sQueueSample.m_nReleasingVolumeModificator = 7;
 				m_sQueueSample.m_nLoopCount = 0;
-				m_sQueueSample.m_bEmittingVolume = emittingVol;
+				m_sQueueSample.m_nEmittingVolume = emittingVol;
 				m_sQueueSample.m_nLoopStart =
 				    SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
 				m_sQueueSample.m_nLoopEnd =
@@ -231,9 +231,9 @@ cAudioManager::SetUpOneShotCollisionSound(cAudioCollision *col)
 		emittingVol = 40.f * ratio;
 		if(emittingVol) {
 			m_sQueueSample.m_fDistance = Sqrt(col->m_fDistance);
-			m_sQueueSample.m_bVolume =
+			m_sQueueSample.m_nVolume =
 			    ComputeVolume(emittingVol, CollisionSoundIntensity, m_sQueueSample.m_fDistance);
-			if(m_sQueueSample.m_bVolume) {
+			if(m_sQueueSample.m_nVolume) {
 				m_sQueueSample.m_nSampleIndex = gOneShotCol[s1];
 				switch(m_sQueueSample.m_nSampleIndex) {
 				case SFX_COL_TARMAC_1:
@@ -289,11 +289,11 @@ cAudioManager::SetUpOneShotCollisionSound(cAudioCollision *col)
 				m_sQueueSample.m_nCounter = counter++;
 				if(counter >= 255) counter = 28;
 				m_sQueueSample.m_vecPos = col->m_vecPosition;
-				m_sQueueSample.m_bBankIndex = SAMPLEBANK_MAIN;
+				m_sQueueSample.m_nBankIndex = SAMPLEBANK_MAIN;
 				m_sQueueSample.m_bIs2D = false;
 				m_sQueueSample.m_nReleasingVolumeModificator = 11;
 				m_sQueueSample.m_nLoopCount = 1;
-				m_sQueueSample.m_bEmittingVolume = emittingVol;
+				m_sQueueSample.m_nEmittingVolume = emittingVol;
 				m_sQueueSample.m_nLoopStart = 0;
 				m_sQueueSample.m_nLoopEnd = -1;
 				m_sQueueSample.m_fSpeedMultiplier = 4.0f;
@@ -380,7 +380,7 @@ cAudioManager::ReportCollision(CEntity *entity1, CEntity *entity2, uint8 surface
 	CVector v1;
 	CVector v2;
 
-	if(!m_bIsInitialised || m_nCollisionEntity < 0 || m_bUserPause ||
+	if(!m_bIsInitialised || m_nCollisionEntity < 0 || m_nUserPause ||
 	   (velocity < 0.0016f && collisionPower < 0.01f))
 		return;
 

src/audio/AudioCollision.h

@@ -2,6 +2,8 @@
 
 #define NUMAUDIOCOLLISIONS 10
 
+class CEntity;
+
 class cAudioCollision
 {
 public:

src/audio/AudioManager.h

@@ -1,164 +1,33 @@
 #pragma once
 
-#include "common.h"
+#include "audio_enums.h"
-#include "config.h"
-
-#include "DMAudio.h"
-
 #include "AudioCollision.h"
 #include "PoliceRadio.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_S = 46,
-	SCRIPT_SOUND_47_L = 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_BULLET_HIT_WATER = 109, //no sound
-	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 tSound
 {
 public:
 	int32 m_nEntityIndex;
 	int32 m_nCounter;
 	int32 m_nSampleIndex;
-	uint8 m_bBankIndex;
+	uint8 m_nBankIndex;
 	bool m_bIs2D;
 	int32 m_nReleasingVolumeModificator;
-	int32 m_nFrequency;
+	uint32 m_nFrequency;
-	uint8 m_bVolume;
+	uint8 m_nVolume;
 	float m_fDistance;
 	int32 m_nLoopCount;
 	int32 m_nLoopStart;
 	int32 m_nLoopEnd;
-	uint8 m_bEmittingVolume;
+	uint8 m_nEmittingVolume;
 	float m_fSpeedMultiplier;
 	float m_fSoundIntensity;
 	bool m_bReleasingSoundFlag;
 	CVector m_vecPos;
 	bool m_bReverbFlag;
-	uint8 m_bLoopsRemaining;
+	uint8 m_nLoopsRemaining;
 	bool m_bRequireReflection; // Used for oneshots
-	uint8 m_bOffset;
+	uint8 m_nOffset;
 	int32 m_nReleasingVolumeDivider;
 	bool m_bIsProcessed;
 	bool m_bLoopEnded;
@@ -177,7 +46,7 @@ public:
 	eAudioType m_nType;
 	void *m_pEntity;
 	bool m_bIsUsed;
-	uint8 m_bStatus;
+	uint8 m_nStatus;
 	int16 m_awAudioEvent[NUM_AUDIOENTITY_EVENTS];
 	float m_afVolume[NUM_AUDIOENTITY_EVENTS];
 	uint8 m_AudioEvents;
@@ -220,9 +89,9 @@ class cMissionAudio
 public:
 	CVector m_vecPos;
 	bool m_bPredefinedProperties;
-	int m_nSampleIndex;
+	int32 m_nSampleIndex;
-	uint8 m_bLoadingStatus;
+	uint8 m_nLoadingStatus;
-	uint8 m_bPlayStatus;
+	uint8 m_nPlayStatus;
 	uint8 field_22; // todo find a name
 	int32 m_nMissionAudioCounter;
 	bool m_bIsPlayed;
@@ -262,7 +131,7 @@ public:
 	float m_fDistance;
 	CVehicle *m_pVehicle;
 	cTransmission *m_pTransmission;
-	int m_nIndex;
+	int32 m_nIndex;
 	float m_fVelocityChange;
 };
 
@@ -291,7 +160,7 @@ public:
 	bool m_bIsInitialised;
 	uint8 field_1; // unused
 	bool m_bFifthFrameFlag;
-	uint8 m_bActiveSamples;
+	uint8 m_nActiveSamples;
 	uint8 field_4; // unused
 	bool m_bDynamicAcousticModelingStatus;
 	float m_fSpeedOfSound;
@@ -301,7 +170,7 @@ public:
 	bool m_bActiveSampleQueue;
 	tSound m_asSamples[NUM_SOUNDS_SAMPLES_BANKS][NUM_SOUNDS_SAMPLES_SLOTS];
 	uint8 m_abSampleQueueIndexTable[NUM_SOUNDS_SAMPLES_BANKS][NUM_SOUNDS_SAMPLES_SLOTS];
-	uint8 m_bSampleRequestQueuesStatus[NUM_SOUNDS_SAMPLES_BANKS];
+	uint8 m_SampleRequestQueuesStatus[NUM_SOUNDS_SAMPLES_BANKS];
 	tSound m_asActiveSamples[NUM_SOUNDS_SAMPLES_SLOTS];
 	tAudioEntity m_asAudioEntities[NUM_AUDIOENTITIES];
 	int32 m_anAudioEntityIndices[NUM_AUDIOENTITIES];
@@ -321,9 +190,9 @@ public:
 	int32 m_nBridgeEntity;
 	cMissionAudio m_sMissionAudio;
 	int32 m_anRandomTable[5];
-	uint8 m_bTimeSpent;
+	uint8 m_nTimeSpent;
-	uint8 m_bUserPause;
+	uint8 m_nUserPause;
-	uint8 m_bPreviousUserPause;
+	uint8 m_nPreviousUserPause;
 	uint32 m_FrameCounter;
 
 	cAudioManager();
@@ -333,7 +202,7 @@ public:
 	uint32 GetFrameCounter() const { return m_FrameCounter; }
 	float GetReflectionsDistance(int32 idx) const { return m_afReflectionsDistances[idx]; }
 	int32 GetRandomNumber(int32 idx) const { return m_anRandomTable[idx]; }
-	bool IsMissionAudioPlaying() const { return m_sMissionAudio.m_bPlayStatus == 1; }
+	bool IsMissionAudioPlaying() const { return m_sMissionAudio.m_nPlayStatus == 1; }
 
 	// "Should" be in alphabetic order, except "getXTalkSfx"
 	void AddDetailsToRequestedOrderList(uint8 sample);

src/audio/DMAudio.h

@@ -1,180 +1,9 @@
 #pragma once
 
 #include "audio_enums.h"
+#include "soundlist.h"
 #include "Crime.h"
 
-enum eSound : int16
-{
-	SOUND_CAR_DOOR_CLOSE_BONNET = 0,
-	SOUND_CAR_DOOR_CLOSE_BUMPER = 1,
-	SOUND_CAR_DOOR_CLOSE_FRONT_LEFT = 2,
-	SOUND_CAR_DOOR_CLOSE_FRONT_RIGHT = 3,
-	SOUND_CAR_DOOR_CLOSE_BACK_LEFT = 4,
-	SOUND_CAR_DOOR_CLOSE_BACK_RIGHT = 5,
-	SOUND_CAR_DOOR_OPEN_BONNET = 6,
-	SOUND_CAR_DOOR_OPEN_BUMPER = 7,
-	SOUND_CAR_DOOR_OPEN_FRONT_LEFT = 8,
-	SOUND_CAR_DOOR_OPEN_FRONT_RIGHT = 9,
-	SOUND_CAR_DOOR_OPEN_BACK_LEFT = 10,
-	SOUND_CAR_DOOR_OPEN_BACK_RIGHT = 11,
-	SOUND_CAR_WINDSHIELD_CRACK = 12,
-	SOUND_CAR_JUMP = 13,
-	SOUND_E = 14,
-	SOUND_F = 15,
-	SOUND_CAR_ENGINE_START = 16,
-	SOUND_CAR_LIGHT_BREAK = 17,
-	SOUND_CAR_HYDRAULIC_1 = 18,
-	SOUND_CAR_HYDRAULIC_2 = 19,
-	SOUND_CAR_HYDRAULIC_3 = 20,
-	SOUND_CAR_JERK = 21,
-	SOUND_CAR_SPLASH = 22,
-	SOUND_17 = 23,
-	SOUND_18 = 24,
-	SOUND_19 = 25,
-	SOUND_CAR_TANK_TURRET_ROTATE = 26,
-	SOUND_CAR_BOMB_TICK = 27,
-	SOUND_PLANE_ON_GROUND = 28,
-	SOUND_STEP_START = 29,
-	SOUND_STEP_END = 30,
-	SOUND_FALL_LAND = 31,
-	SOUND_FALL_COLLAPSE = 32,
-	SOUND_FIGHT_PUNCH_33 = 33,
-	SOUND_FIGHT_KICK_34 = 34,
-	SOUND_FIGHT_HEADBUTT_35 = 35,
-	SOUND_FIGHT_PUNCH_36 = 36,
-	SOUND_FIGHT_PUNCH_37 = 37,
-	SOUND_FIGHT_CLOSE_PUNCH_38 = 38,
-	SOUND_FIGHT_PUNCH_39 = 39,
-	SOUND_FIGHT_PUNCH_OR_KICK_BELOW_40 = 40,
-	SOUND_FIGHT_PUNCH_41 = 41,
-	SOUND_FIGHT_PUNCH_FROM_BEHIND_42 = 42,
-	SOUND_FIGHT_KNEE_OR_KICK_43 = 43,
-	SOUND_FIGHT_KICK_44 = 44,
-	SOUND_2D = 45,
-	SOUND_WEAPON_BAT_ATTACK = 46,
-	SOUND_WEAPON_SHOT_FIRED = 47,
-	SOUND_WEAPON_RELOAD = 48,
-	SOUND_WEAPON_AK47_BULLET_ECHO = 49,
-	SOUND_WEAPON_UZI_BULLET_ECHO = 50,
-	SOUND_WEAPON_M16_BULLET_ECHO = 51,
-	SOUND_WEAPON_FLAMETHROWER_FIRE = 52,
-	SOUND_WEAPON_SNIPER_SHOT_NO_ZOOM = 53,
-	SOUND_WEAPON_ROCKET_SHOT_NO_ZOOM = 54,
-	SOUND_WEAPON_HIT_PED = 55,
-	SOUND_WEAPON_HIT_VEHICLE = 56,
-	SOUND_GARAGE_NO_MONEY = 57,
-	SOUND_GARAGE_BAD_VEHICLE = 58,
-	SOUND_GARAGE_OPENING = 59,
-	SOUND_GARAGE_BOMB_ALREADY_SET = 60,
-	SOUND_GARAGE_BOMB1_SET = 61,
-	SOUND_GARAGE_BOMB2_SET = 62,
-	SOUND_GARAGE_BOMB3_SET = 63,
-	SOUND_40 = 64,
-	SOUND_41 = 65,
-	SOUND_GARAGE_VEHICLE_DECLINED = 66,
-	SOUND_GARAGE_VEHICLE_ACCEPTED = 67,
-	SOUND_GARAGE_DOOR_CLOSED = 68,
-	SOUND_GARAGE_DOOR_OPENED = 69,
-	SOUND_CRANE_PICKUP = 70,
-	SOUND_PICKUP_WEAPON_BOUGHT = 71,
-	SOUND_PICKUP_WEAPON = 72,
-	SOUND_PICKUP_HEALTH = 73,
-	SOUND_4A = 74,
-	SOUND_4B = 75,
-	SOUND_PICKUP_ADRENALINE = 76,
-	SOUND_PICKUP_ARMOUR = 77,
-	SOUND_PICKUP_BONUS = 78,
-	SOUND_PICKUP_MONEY = 79,
-	SOUND_PICKUP_HIDDEN_PACKAGE = 80,
-	SOUND_PICKUP_PACMAN_PILL = 81,
-	SOUND_PICKUP_PACMAN_PACKAGE = 82,
-	SOUND_PICKUP_FLOAT_PACKAGE = 83,
-	SOUND_BOMB_TIMED_ACTIVATED = 84,
-	SOUND_55 = 85,
-	SOUND_BOMB_ONIGNITION_ACTIVATED = 86,
-	SOUND_BOMB_TICK = 87,
-	SOUND_RAMPAGE_START = 88,
-	SOUND_RAMPAGE_ONGOING = 89,
-	SOUND_RAMPAGE_PASSED = 90,
-	SOUND_RAMPAGE_FAILED = 91,
-	SOUND_RAMPAGE_KILL = 92,
-	SOUND_RAMPAGE_CAR_BLOWN = 93,
-	SOUND_EVIDENCE_PICKUP = 94,
-	SOUND_UNLOAD_GOLD = 95,
-	SOUND_PAGER = 96,
-	SOUND_PED_DEATH = 97, // 103 in VC
-	SOUND_PED_DAMAGE = 98, // 104 in VC
-	SOUND_PED_HIT = 99, // 105 in VC
-	SOUND_PED_LAND = 100, // hopefully 106 in VC
-	SOUND_PED_BULLET_HIT = 101,
-	SOUND_PED_BOMBER = 102,
-	SOUND_PED_BURNING = 103, // 108 in VC
-	SOUND_PED_ARREST_FBI = 104,
-	SOUND_PED_ARREST_SWAT = 105,
-	SOUND_PED_ARREST_COP = 106,
-	SOUND_PED_HELI_PLAYER_FOUND = 107,
-	SOUND_PED_HANDS_UP = 108,
-	SOUND_PED_HANDS_COWER = 109,
-	SOUND_PED_FLEE_SPRINT = 110, // 120 in VC
-	SOUND_PED_CAR_JACKING = 111,
-	SOUND_PED_MUGGING = 112,
-	SOUND_PED_CAR_JACKED = 113,
-	SOUND_PED_ROBBED = 114,
-	SOUND_PED_TAXI_WAIT = 115, // 137 in VC
-	SOUND_PED_ATTACK = 116,
-	SOUND_PED_DEFEND = 117,
-	SOUND_PED_PURSUIT_ARMY = 118,
-	SOUND_PED_PURSUIT_FBI = 119,
-	SOUND_PED_PURSUIT_SWAT = 120,
-	SOUND_PED_PURSUIT_COP = 121,
-	SOUND_PED_HEALING = 122,
-	SOUND_PED_7B = 123,
-	SOUND_PED_LEAVE_VEHICLE = 124,
-	SOUND_PED_EVADE = 125, // 142 in VC
-	SOUND_PED_FLEE_RUN = 126,
-	SOUND_PED_CAR_COLLISION = 127, // 144-145-146 in VC
-	SOUND_PED_SOLICIT = 128,
-	SOUND_PED_EXTINGUISHING_FIRE = 129,
-	SOUND_PED_WAIT_DOUBLEBACK = 130,
-	SOUND_PED_CHAT_SEXY = 131,
-	SOUND_PED_CHAT_EVENT = 132,
-	SOUND_PED_CHAT = 133,
-	SOUND_PED_BODYCAST_HIT = 134,
-	SOUND_PED_TAXI_CALL = 135,
-	SOUND_INJURED_PED_MALE_OUCH = 136,
-	SOUND_INJURED_PED_FEMALE = 137,
-	SOUND_8A = 138,
-	SOUND_RACE_START_3 = 139,
-	SOUND_RACE_START_2 = 140,
-	SOUND_RACE_START_1 = 141,
-	SOUND_RACE_START_GO = 142,
-	SOUND_SPLASH = 143,
-	SOUND_WATER_FALL = 144,
-	SOUND_SPLATTER = 145,
-	SOUND_CAR_PED_COLLISION = 146,
-	SOUND_CLOCK_TICK = 147,
-	SOUND_PART_MISSION_COMPLETE = 148,
-	SOUND_FRONTEND_MENU_STARTING = 149,
-	SOUND_FRONTEND_MENU_COMPLETED = 150,
-	SOUND_FRONTEND_MENU_DENIED = 151,
-	SOUND_FRONTEND_MENU_SUCCESS = 152,
-	SOUND_FRONTEND_EXIT = 153,
-	SOUND_9A = 154,
-	SOUND_9B = 155,
-	SOUND_FRONTEND_AUDIO_TEST = 156,
-	SOUND_FRONTEND_FAIL = 157,
-	SOUND_FRONTEND_NO_RADIO = 158,
-	SOUND_FRONTEND_RADIO_CHANGE = 159,
-	SOUND_A0 = 160,
-	SOUND_AMMUNATION_WELCOME_1 = 161,
-	SOUND_AMMUNATION_WELCOME_2 = 162,
-	SOUND_AMMUNATION_WELCOME_3 = 163,
-	SOUND_LIGHTNING = 164,
-	SOUND_A5 = 165,
-	SOUND_TOTAL_SOUNDS = 166,
-	SOUND_TOTAL_PED_SOUNDS = 167,
-};
-
 #define AEHANDLE_IS_FAILED(h) ((h)<0)
 #define AEHANDLE_IS_OK(h)     ((h)>=0)
 

src/audio/MusicManager.cpp

@@ -1,5 +1,6 @@
 #include "common.h"
 #include <time.h>
+#include "soundlist.h"
 #include "MusicManager.h"
 #include "AudioManager.h"
 #include "ControllerConfig.h"
@@ -302,14 +303,14 @@ cMusicManager::GetRadioInCar(void)
 		CVehicle *veh = FindPlayerVehicle();
 		if (veh != nil){
 			if (UsesPoliceRadio(veh)) {
-				if (m_nRadioInCar == NO_STREAMED_SOUND || CReplay::IsPlayingBack() && AudioManager.m_bUserPause)
+				if (m_nRadioInCar == NO_STREAMED_SOUND || CReplay::IsPlayingBack() && AudioManager.m_nUserPause)
 					return POLICE_RADIO;
 				return m_nRadioInCar;
 			} else return veh->m_nRadioStation;
 		}
 	}
 
-	if (m_nRadioInCar == NO_STREAMED_SOUND || CReplay::IsPlayingBack() && AudioManager.m_bUserPause)
+	if (m_nRadioInCar == NO_STREAMED_SOUND || CReplay::IsPlayingBack() && AudioManager.m_nUserPause)
 		return RADIO_OFF;
 	return m_nRadioInCar;
 }
@@ -402,7 +403,7 @@ cMusicManager::ServiceFrontEndMode()
 				switch (m_nCurrentStreamedSound)
 				{
 				case STREAMED_SOUND_MISSION_COMPLETED:
-					if (!AudioManager.m_bUserPause)
+					if (!AudioManager.m_nUserPause)
 						ChangeMusicMode(MUSICMODE_GAME);
 					break;
 				case STREAMED_SOUND_GAME_COMPLETED:
@@ -458,7 +459,7 @@ cMusicManager::ServiceGameMode()
 		nFramesSinceCutsceneEnded = -1;
 	}
 
-	if (AudioManager.m_bPreviousUserPause)
+	if (AudioManager.m_nPreviousUserPause)
 		m_bPreviousPlayerInCar = false;
 	if (!m_bPlayerInCar) {
 		if (m_bPreviousPlayerInCar) {

src/audio/PoliceRadio.cpp

@@ -130,18 +130,18 @@ cAudioManager::DoPoliceRadioCrackle()
 	m_sQueueSample.m_nEntityIndex = m_nPoliceChannelEntity;
 	m_sQueueSample.m_nCounter = 0;
 	m_sQueueSample.m_nSampleIndex = SFX_POLICE_RADIO_CRACKLE;
-	m_sQueueSample.m_bBankIndex = SAMPLEBANK_MAIN;
+	m_sQueueSample.m_nBankIndex = SAMPLEBANK_MAIN;
 	m_sQueueSample.m_bIs2D = true;
 	m_sQueueSample.m_nReleasingVolumeModificator = 10;
 	m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_POLICE_RADIO_CRACKLE);
-	m_sQueueSample.m_bVolume = m_anRandomTable[2] % 20 + 15;
+	m_sQueueSample.m_nVolume = m_anRandomTable[2] % 20 + 15;
 	m_sQueueSample.m_nLoopCount = 0;
-	m_sQueueSample.m_bEmittingVolume = m_sQueueSample.m_bVolume;
+	m_sQueueSample.m_nEmittingVolume = m_sQueueSample.m_nVolume;
 	m_sQueueSample.m_nLoopStart = SampleManager.GetSampleLoopStartOffset(SFX_POLICE_RADIO_CRACKLE);
 	m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(SFX_POLICE_RADIO_CRACKLE);
 	m_sQueueSample.m_bReleasingSoundFlag = false;
 	m_sQueueSample.m_bReverbFlag = false;
-	m_sQueueSample.m_bOffset = 63;
+	m_sQueueSample.m_nOffset = 63;
 	m_sQueueSample.m_nReleasingVolumeDivider = 3;
 	m_sQueueSample.m_bRequireReflection = false;
 	AddSampleToRequestedQueue();
@@ -155,7 +155,7 @@ cAudioManager::ServicePoliceRadio()
 
 	if(!m_bIsInitialised) return;
 
-	if(!m_bUserPause) {
+	if(!m_nUserPause) {
 		bool crimeReport = SetupCrimeReport();
 #ifdef FIX_BUGS // Crash at 0x5fe6ef
 		if(CReplay::IsPlayingBack() || !FindPlayerPed() || !FindPlayerPed()->m_pWanted)
@@ -190,14 +190,14 @@ cAudioManager::ServicePoliceRadioChannel(int32 wantedLevel)
 
 	if (!m_bIsInitialised) return;
 
-	if (m_bUserPause) {
+	if (m_nUserPause) {
 		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 &&
+		if (m_nPreviousUserPause && g_nMissionAudioSfx != TOTAL_AUDIO_SAMPLES &&
 			bMissionAudioPhysicalPlayingStatus == 1) {
 			SampleManager.PauseStream(0, 1);
 		}

src/audio/soundlist.h

@@ -0,0 +1,301 @@
+#pragma once
+
+enum eSound : int16
+{
+	SOUND_CAR_DOOR_CLOSE_BONNET = 0,
+	SOUND_CAR_DOOR_CLOSE_BUMPER = 1,
+	SOUND_CAR_DOOR_CLOSE_FRONT_LEFT = 2,
+	SOUND_CAR_DOOR_CLOSE_FRONT_RIGHT = 3,
+	SOUND_CAR_DOOR_CLOSE_BACK_LEFT = 4,
+	SOUND_CAR_DOOR_CLOSE_BACK_RIGHT = 5,
+	SOUND_CAR_DOOR_OPEN_BONNET = 6,
+	SOUND_CAR_DOOR_OPEN_BUMPER = 7,
+	SOUND_CAR_DOOR_OPEN_FRONT_LEFT = 8,
+	SOUND_CAR_DOOR_OPEN_FRONT_RIGHT = 9,
+	SOUND_CAR_DOOR_OPEN_BACK_LEFT = 10,
+	SOUND_CAR_DOOR_OPEN_BACK_RIGHT = 11,
+	SOUND_CAR_WINDSHIELD_CRACK = 12,
+	SOUND_CAR_JUMP = 13,
+	SOUND_E = 14,
+	SOUND_F = 15,
+	SOUND_CAR_ENGINE_START = 16,
+	SOUND_CAR_LIGHT_BREAK = 17,
+	SOUND_CAR_HYDRAULIC_1 = 18,
+	SOUND_CAR_HYDRAULIC_2 = 19,
+	SOUND_CAR_HYDRAULIC_3 = 20,
+	SOUND_CAR_JERK = 21,
+	SOUND_CAR_SPLASH = 22,
+	SOUND_17 = 23,
+	SOUND_18 = 24,
+	SOUND_19 = 25,
+	SOUND_CAR_TANK_TURRET_ROTATE = 26,
+	SOUND_CAR_BOMB_TICK = 27,
+	SOUND_PLANE_ON_GROUND = 28,
+	SOUND_STEP_START = 29,
+	SOUND_STEP_END = 30,
+	SOUND_FALL_LAND = 31,
+	SOUND_FALL_COLLAPSE = 32,
+	SOUND_FIGHT_PUNCH_33 = 33,
+	SOUND_FIGHT_KICK_34 = 34,
+	SOUND_FIGHT_HEADBUTT_35 = 35,
+	SOUND_FIGHT_PUNCH_36 = 36,
+	SOUND_FIGHT_PUNCH_37 = 37,
+	SOUND_FIGHT_CLOSE_PUNCH_38 = 38,
+	SOUND_FIGHT_PUNCH_39 = 39,
+	SOUND_FIGHT_PUNCH_OR_KICK_BELOW_40 = 40,
+	SOUND_FIGHT_PUNCH_41 = 41,
+	SOUND_FIGHT_PUNCH_FROM_BEHIND_42 = 42,
+	SOUND_FIGHT_KNEE_OR_KICK_43 = 43,
+	SOUND_FIGHT_KICK_44 = 44,
+	SOUND_2D = 45,
+	SOUND_WEAPON_BAT_ATTACK = 46,
+	SOUND_WEAPON_SHOT_FIRED = 47,
+	SOUND_WEAPON_RELOAD = 48,
+	SOUND_WEAPON_AK47_BULLET_ECHO = 49,
+	SOUND_WEAPON_UZI_BULLET_ECHO = 50,
+	SOUND_WEAPON_M16_BULLET_ECHO = 51,
+	SOUND_WEAPON_FLAMETHROWER_FIRE = 52,
+	SOUND_WEAPON_SNIPER_SHOT_NO_ZOOM = 53,
+	SOUND_WEAPON_ROCKET_SHOT_NO_ZOOM = 54,
+	SOUND_WEAPON_HIT_PED = 55,
+	SOUND_WEAPON_HIT_VEHICLE = 56,
+	SOUND_GARAGE_NO_MONEY = 57,
+	SOUND_GARAGE_BAD_VEHICLE = 58,
+	SOUND_GARAGE_OPENING = 59,
+	SOUND_GARAGE_BOMB_ALREADY_SET = 60,
+	SOUND_GARAGE_BOMB1_SET = 61,
+	SOUND_GARAGE_BOMB2_SET = 62,
+	SOUND_GARAGE_BOMB3_SET = 63,
+	SOUND_40 = 64,
+	SOUND_41 = 65,
+	SOUND_GARAGE_VEHICLE_DECLINED = 66,
+	SOUND_GARAGE_VEHICLE_ACCEPTED = 67,
+	SOUND_GARAGE_DOOR_CLOSED = 68,
+	SOUND_GARAGE_DOOR_OPENED = 69,
+	SOUND_CRANE_PICKUP = 70,
+	SOUND_PICKUP_WEAPON_BOUGHT = 71,
+	SOUND_PICKUP_WEAPON = 72,
+	SOUND_PICKUP_HEALTH = 73,
+	SOUND_4A = 74,
+	SOUND_4B = 75,
+	SOUND_PICKUP_ADRENALINE = 76,
+	SOUND_PICKUP_ARMOUR = 77,
+	SOUND_PICKUP_BONUS = 78,
+	SOUND_PICKUP_MONEY = 79,
+	SOUND_PICKUP_HIDDEN_PACKAGE = 80,
+	SOUND_PICKUP_PACMAN_PILL = 81,
+	SOUND_PICKUP_PACMAN_PACKAGE = 82,
+	SOUND_PICKUP_FLOAT_PACKAGE = 83,
+	SOUND_BOMB_TIMED_ACTIVATED = 84,
+	SOUND_55 = 85,
+	SOUND_BOMB_ONIGNITION_ACTIVATED = 86,
+	SOUND_BOMB_TICK = 87,
+	SOUND_RAMPAGE_START = 88,
+	SOUND_RAMPAGE_ONGOING = 89,
+	SOUND_RAMPAGE_PASSED = 90,
+	SOUND_RAMPAGE_FAILED = 91,
+	SOUND_RAMPAGE_KILL = 92,
+	SOUND_RAMPAGE_CAR_BLOWN = 93,
+	SOUND_EVIDENCE_PICKUP = 94,
+	SOUND_UNLOAD_GOLD = 95,
+	SOUND_PAGER = 96,
+	SOUND_PED_DEATH = 97, // 103 in VC
+	SOUND_PED_DAMAGE = 98, // 104 in VC
+	SOUND_PED_HIT = 99, // 105 in VC
+	SOUND_PED_LAND = 100, // hopefully 106 in VC
+	SOUND_PED_BULLET_HIT = 101,
+	SOUND_PED_BOMBER = 102,
+	SOUND_PED_BURNING = 103, // 108 in VC
+	SOUND_PED_ARREST_FBI = 104,
+	SOUND_PED_ARREST_SWAT = 105,
+	SOUND_PED_ARREST_COP = 106,
+	SOUND_PED_HELI_PLAYER_FOUND = 107,
+	SOUND_PED_HANDS_UP = 108,
+	SOUND_PED_HANDS_COWER = 109,
+	SOUND_PED_FLEE_SPRINT = 110, // 120 in VC
+	SOUND_PED_CAR_JACKING = 111,
+	SOUND_PED_MUGGING = 112,
+	SOUND_PED_CAR_JACKED = 113,
+	SOUND_PED_ROBBED = 114,
+	SOUND_PED_TAXI_WAIT = 115, // 137 in VC
+	SOUND_PED_ATTACK = 116,
+	SOUND_PED_DEFEND = 117,
+	SOUND_PED_PURSUIT_ARMY = 118,
+	SOUND_PED_PURSUIT_FBI = 119,
+	SOUND_PED_PURSUIT_SWAT = 120,
+	SOUND_PED_PURSUIT_COP = 121,
+	SOUND_PED_HEALING = 122,
+	SOUND_PED_7B = 123,
+	SOUND_PED_LEAVE_VEHICLE = 124,
+	SOUND_PED_EVADE = 125, // 142 in VC
+	SOUND_PED_FLEE_RUN = 126,
+	SOUND_PED_CAR_COLLISION = 127, // 144-145-146 in VC
+	SOUND_PED_SOLICIT = 128,
+	SOUND_PED_EXTINGUISHING_FIRE = 129,
+	SOUND_PED_WAIT_DOUBLEBACK = 130,
+	SOUND_PED_CHAT_SEXY = 131,
+	SOUND_PED_CHAT_EVENT = 132,
+	SOUND_PED_CHAT = 133,
+	SOUND_PED_BODYCAST_HIT = 134,
+	SOUND_PED_TAXI_CALL = 135,
+	SOUND_INJURED_PED_MALE_OUCH = 136,
+	SOUND_INJURED_PED_FEMALE = 137,
+	SOUND_8A = 138,
+	SOUND_RACE_START_3 = 139,
+	SOUND_RACE_START_2 = 140,
+	SOUND_RACE_START_1 = 141,
+	SOUND_RACE_START_GO = 142,
+	SOUND_SPLASH = 143,
+	SOUND_WATER_FALL = 144,
+	SOUND_SPLATTER = 145,
+	SOUND_CAR_PED_COLLISION = 146,
+	SOUND_CLOCK_TICK = 147,
+	SOUND_PART_MISSION_COMPLETE = 148,
+	SOUND_FRONTEND_MENU_STARTING = 149,
+	SOUND_FRONTEND_MENU_COMPLETED = 150,
+	SOUND_FRONTEND_MENU_DENIED = 151,
+	SOUND_FRONTEND_MENU_SUCCESS = 152,
+	SOUND_FRONTEND_EXIT = 153,
+	SOUND_9A = 154,
+	SOUND_9B = 155,
+	SOUND_FRONTEND_AUDIO_TEST = 156,
+	SOUND_FRONTEND_FAIL = 157,
+	SOUND_FRONTEND_NO_RADIO = 158,
+	SOUND_FRONTEND_RADIO_CHANGE = 159,
+	SOUND_A0 = 160,
+	SOUND_AMMUNATION_WELCOME_1 = 161,
+	SOUND_AMMUNATION_WELCOME_2 = 162,
+	SOUND_AMMUNATION_WELCOME_3 = 163,
+	SOUND_LIGHTNING = 164,
+	SOUND_A5 = 165,
+	SOUND_TOTAL_SOUNDS = 166,
+	SOUND_TOTAL_PED_SOUNDS = 167,
+};
+
+
+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_S = 46,
+	SCRIPT_SOUND_47_L = 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_BULLET_HIT_WATER = 109, //no sound
+	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,
+};

src/objects/ParticleObject.cpp

@@ -7,6 +7,7 @@
 #include "Particle.h"
 #include "Camera.h"
 #include "Game.h"
+#include "DMAudio.h"
 
 
 CParticleObject gPObjectArray[MAX_PARTICLEOBJECTS];

src/save/GenericGameStorage.cpp

@@ -3,6 +3,7 @@
 #include "crossplatform.h"
 #include "main.h"
 
+#include "DMAudio.h"
 #include "AudioScriptObject.h"
 #include "Camera.h"
 #include "CarGen.h"

src/weapons/BulletInfo.cpp

@@ -3,7 +3,7 @@
 #include "BulletInfo.h"
 
 #include "AnimBlendAssociation.h"
-#include "AudioManager.h"
+#include "DMAudio.h"
 #include "AudioScriptObject.h"
 #ifdef FIX_BUGS
 #include "Collision.h"