1 files changed, 85 insertions, 69 deletions

diff --git a/src/audio/sampman.h b/src/audio/sampman.h
index a96704a1..dc4a8e3e 100644
--- a/src/audio/sampman.h
+++ b/src/audio/sampman.h
@@ -16,85 +16,101 @@ struct tSample {
 #ifdef GTA_PS2
 #define PS2BANK(e) e
 #else
-#define PS2BANK(e) e = SAMPLEBANK_MAIN
+#define PS2BANK(e) e = SFX_BANK_0
 #endif // GTA_PS2
 
 
 enum
 {
-	SAMPLEBANK_MAIN,
-
-	CAR_SAMPLEBANKS_OFFSET,
-	SAMPLEBANK_CAR_PACARD = CAR_SAMPLEBANKS_OFFSET,
-	SAMPLEBANK_CAR_PATHFINDER,
-	SAMPLEBANK_CAR_PORSCHE,
-	SAMPLEBANK_CAR_SPIDER,
-	SAMPLEBANK_CAR_MERC,
-	SAMPLEBANK_CAR_MACKTRUCK,
-	SAMPLEBANK_CAR_HOTROD,
-	SAMPLEBANK_CAR_COBRA,
-	SAMPLEBANK_CAR_NONE,
-
-	PS2BANK(SAMPLEBANK_FRONTEND),
+	SFX_BANK_0,
+#ifdef GTA_PS2
+	SFX_BANK_GENERIC_EXTRA,
+	SFX_BANK_PED_COMMENTS,
+	SFX_BANK_FRONT_END_MENU,
+#else
+	SFX_BANK_GENERIC_EXTRA = SFX_BANK_0,
+	SFX_BANK_FRONT_END_MENU = SFX_BANK_0,
 
-	PS2BANK(SAMPLEBANK_TRAIN),
+	SFX_BANK_PED_COMMENTS,
+	MAX_SFX_BANKS,
+	INVALID_SFX_BANK,
+#endif
 
-	PS2BANK(SAMPLEBANK_BUILDING_CLUB_1),
-	PS2BANK(SAMPLEBANK_BUILDING_CLUB_2),
-	PS2BANK(SAMPLEBANK_BUILDING_CLUB_3),
-	PS2BANK(SAMPLEBANK_BUILDING_CLUB_4),
-	PS2BANK(SAMPLEBANK_BUILDING_CLUB_5),
-	PS2BANK(SAMPLEBANK_BUILDING_CLUB_6),
-	PS2BANK(SAMPLEBANK_BUILDING_CLUB_7),
-	PS2BANK(SAMPLEBANK_BUILDING_CLUB_8),
-	PS2BANK(SAMPLEBANK_BUILDING_CLUB_9),
-	PS2BANK(SAMPLEBANK_BUILDING_CLUB_10),
-	PS2BANK(SAMPLEBANK_BUILDING_CLUB_11),
-	PS2BANK(SAMPLEBANK_BUILDING_CLUB_12),
-	PS2BANK(SAMPLEBANK_BUILDING_CLUB_RAGGA),
-	PS2BANK(SAMPLEBANK_BUILDING_STRIP_CLUB_1),
-	PS2BANK(SAMPLEBANK_BUILDING_STRIP_CLUB_2),
-	PS2BANK(SAMPLEBANK_BUILDING_WORKSHOP),
-	PS2BANK(SAMPLEBANK_BUILDING_PIANO_BAR),
-	PS2BANK(SAMPLEBANK_BUILDING_SAWMILL),
-	PS2BANK(SAMPLEBANK_BUILDING_DOG_FOOD_FACTORY),
-	PS2BANK(SAMPLEBANK_BUILDING_LAUNDERETTE),
-	PS2BANK(SAMPLEBANK_BUILDING_RESTAURANT_CHINATOWN),
-	PS2BANK(SAMPLEBANK_BUILDING_RESTAURANT_ITALY),
-	PS2BANK(SAMPLEBANK_BUILDING_RESTAURANT_GENERIC_1),
-	PS2BANK(SAMPLEBANK_BUILDING_RESTAURANT_GENERIC_2),
-	PS2BANK(SAMPLEBANK_BUILDING_AIRPORT),
-	PS2BANK(SAMPLEBANK_BUILDING_SHOP),
-	PS2BANK(SAMPLEBANK_BUILDING_CINEMA),
-	PS2BANK(SAMPLEBANK_BUILDING_DOCKS),
-	PS2BANK(SAMPLEBANK_BUILDING_HOME),
-	PS2BANK(SAMPLEBANK_BUILDING_PORN_1),
-	PS2BANK(SAMPLEBANK_BUILDING_PORN_2),
-	PS2BANK(SAMPLEBANK_BUILDING_PORN_3),
-	PS2BANK(SAMPLEBANK_BUILDING_POLICE_BALL),
-	PS2BANK(SAMPLEBANK_BUILDING_BANK_ALARM),
-	PS2BANK(SAMPLEBANK_BUILDING_RAVE_INDUSTRIAL),
-	PS2BANK(SAMPLEBANK_BUILDING_RAVE_COMMERCIAL),
-	PS2BANK(SAMPLEBANK_BUILDING_RAVE_SUBURBAN),
-	PS2BANK(SAMPLEBANK_BUILDING_RAVE_COMMERCIAL_2),
+	CAR_SFX_BANKS_OFFSET,
+	SFX_BANK_PONTIAC = CAR_SFX_BANKS_OFFSET,
+	SFX_BANK_PORSCHE,
+	SFX_BANK_SPIDER,
+	SFX_BANK_MERC,
+	SFX_BANK_TRUCK,
+	SFX_BANK_HOTROD,
+	SFX_BANK_COBRA,
+	SFX_BANK_PONTIAC_SLOW,
+	SFX_BANK_CADILLAC,
+	SFX_BANK_PATHFINDER,
+	SFX_BANK_PACARD,
+	SFX_BANK_GOLF_CART,
+	SFX_BANK_CAR_CHAINSAW,
+	SFX_BANK_RC,
+	SFX_BANK_RC_HELI,
+	SFX_BANK_CAR_UNUSED_4,
 
-	PS2BANK(SAMPLEBANK_BUILDING_39),
-	PS2BANK(SAMPLEBANK_BUILDING_40),
-	PS2BANK(SAMPLEBANK_BUILDING_41),
-	PS2BANK(SAMPLEBANK_BUILDING_42),
-	PS2BANK(SAMPLEBANK_BUILDING_43),
-	PS2BANK(SAMPLEBANK_BUILDING_44),
-	PS2BANK(SAMPLEBANK_BUILDING_45),
-	PS2BANK(SAMPLEBANK_BUILDING_46),
-	PS2BANK(SAMPLEBANK_BUILDING_47),
+	// bikes
+	SFX_BANK_VTWIN,
+	SFX_BANK_MOPED,
+	SFX_BANK_HONDA250,
+	SFX_BANK_SPORTS_BIKE,
+	SFX_BANK_BIKE_UNUSED_1,
+	SFX_BANK_BIKE_UNUSED_2,
+	SFX_BANK_BIKE_UNUSED_3,
+	SFX_BANK_BIKE_UNUSED_4,
+	SFX_BANK_BIKE_UNUSED_5,
+	SFX_BANK_BIKE_UNUSED_6,
 
-	PS2BANK(SAMPLEBANK_EXTRAS),
+	// heli
+	SFX_BANK_HELI_APACHE,
+	SFX_BANK_HELI_UNUSED_1,
+	SFX_BANK_HELI_UNUSED_2,
+	SFX_BANK_HELI_UNUSED_3,
+	SFX_BANK_HELI_UNUSED_4,
 
-	SAMPLEBANK_PED,
-	MAX_SAMPLEBANKS,
-	SAMPLEBANK_INVALID
+	// plane
+	SFX_BANK_PLANE_SEAPLANE,
+	SFX_BANK_PLANE_UNUSED_1,
+	SFX_BANK_PLANE_UNUSED_2,
+	SFX_BANK_PLANE_UNUSED_3,
+	SFX_BANK_PLANE_UNUSED_4,
+	PS2BANK(SFX_BANK_BUILDING_BANK_ALARM),
+	PS2BANK(SFX_BANK_BUILDING_SNORING),
+	PS2BANK(SFX_BANK_BUILDING_BAR_1),
+	PS2BANK(SFX_BANK_BUILDING_BAR_2),
+	PS2BANK(SFX_BANK_BUILDING_BAR_3),
+	PS2BANK(SFX_BANK_BUILDING_BAR_4),
+	PS2BANK(SFX_BANK_BUILDING_MALIBU_1),
+	PS2BANK(SFX_BANK_BUILDING_MALIBU_2),
+	PS2BANK(SFX_BANK_BUILDING_MALIBU_3),
+	PS2BANK(SFX_BANK_BUILDING_STRIP_1),
+	PS2BANK(SFX_BANK_BUILDING_STRIP_2),
+	PS2BANK(SFX_BANK_BUILDING_STRIP_3),
+	PS2BANK(SFX_BANK_BUILDING_CHURCH),
+	PS2BANK(SFX_BANK_BUILDING_FAN_1),
+	PS2BANK(SFX_BANK_BUILDING_FAN_2),
+	PS2BANK(SFX_BANK_BUILDING_INSECT_1),
+	PS2BANK(SFX_BANK_BUILDING_INSECT_2),
+	PS2BANK(SFX_BANK_BUILDING_18),
+	PS2BANK(SFX_BANK_BUILDING_19),
+	PS2BANK(SFX_BANK_BUILDING_20),
+	PS2BANK(SFX_BANK_BUILDING_21),
+	PS2BANK(SFX_BANK_FOOTSTEPS_GRASS),
+	PS2BANK(SFX_BANK_FOOTSTEPS_GRAVEL),
+	PS2BANK(SFX_BANK_FOOTSTEPS_WOOD),
+	PS2BANK(SFX_BANK_FOOTSTEPS_METAL),
+	PS2BANK(SFX_BANK_FOOTSTEPS_WATER),
+	PS2BANK(SFX_BANK_FOOTSTEPS_SAND),
+#ifdef GTA_PS2
+	MAX_SFX_BANKS,
+	INVALID_SFX_BANK
+#endif
 };
-
 #define MAX_PEDSFX                 7
 #define PED_BLOCKSIZE              79000
 
@@ -226,7 +242,7 @@ public:
 };
 
 extern cSampleManager SampleManager;
-extern uint32 BankStartOffset[MAX_SAMPLEBANKS];
+extern uint32 BankStartOffset[MAX_SFX_BANKS];
 
 #ifdef AUDIO_OPUS
 static char StreamedNameTable[][25] = {