9 files changed, 1309 insertions, 204 deletions

diff --git a/.github/workflows/reVC_msvc_amd64.yml b/.github/workflows/reVC_msvc_amd64.yml
index ad883d32..a00c5d2c 100644
--- a/.github/workflows/reVC_msvc_amd64.yml
+++ b/.github/workflows/reVC_msvc_amd64.yml
@@ -16,7 +16,7 @@ jobs:
     strategy:
       matrix:
         platform: [win-amd64-librw_d3d9-oal, win-amd64-librw_gl3_glfw-oal]
-        buildtype: [Debug, Release, Vanilla]
+        buildtype: [Debug, Release]
     steps:
     - name: Add msbuild to PATH
       uses: microsoft/setup-msbuild@v1.0.2
diff --git a/premake5.lua b/premake5.lua
index 69090d49..f1287011 100644
--- a/premake5.lua
+++ b/premake5.lua
@@ -68,7 +68,7 @@ end
 

 workspace "reVC"

 	language "C++"

-	configurations { "Debug", "Release", "Vanilla" }

+	configurations { "Debug", "Release" }

 	startproject "reVC"

 	location "build"

 	symbols "Full"

@@ -80,6 +80,7 @@ workspace "reVC"
 	end

 

 	filter { "system:windows" }

+		configurations { "Vanilla" }

 		platforms {

 			"win-x86-RW34_d3d8-mss",

 			"win-x86-librw_d3d9-mss",

@@ -123,9 +124,6 @@ workspace "reVC"
 			flags { "LinkTimeOptimization" }

 		end

 

-	filter "configurations:Vanilla"

-		defines { "VANILLA_DEFINES" }

-

 	filter { "platforms:win*" }

 		system "windows"

 

@@ -315,6 +313,9 @@ project "reVC"
 		includedirs { "vendor/opusfile/include" }

 	end

 

+	filter "configurations:Vanilla"

+		defines { "VANILLA_DEFINES" }

+

 	filter "platforms:*mss"

 		defines { "AUDIO_MSS" }

 		includedirs { "vendor/milessdk/include" }

diff --git a/src/audio/sampman.h b/src/audio/sampman.h
index 8243f342..9b21ddb3 100644
--- a/src/audio/sampman.h
+++ b/src/audio/sampman.h
@@ -245,43 +245,8 @@ public:
 extern cSampleManager SampleManager;
 extern uint32 BankStartOffset[MAX_SFX_BANKS];
 
-#if defined(OPUS_AUDIO_PATHS)
-static char StreamedNameTable[][25] = {
-    "AUDIO\\HEAD.OPUS",    "AUDIO\\CLASS.OPUS",   "AUDIO\\KJAH.OPUS",    "AUDIO\\RISE.OPUS",    "AUDIO\\LIPS.OPUS",    "AUDIO\\GAME.OPUS",
-    "AUDIO\\MSX.OPUS",     "AUDIO\\FLASH.OPUS",   "AUDIO\\CHAT.OPUS",    "AUDIO\\HEAD.OPUS",    "AUDIO\\POLICE.OPUS",  "AUDIO\\CITY.OPUS",
-    "AUDIO\\WATER.OPUS",   "AUDIO\\COMOPEN.OPUS", "AUDIO\\SUBOPEN.OPUS", "AUDIO\\JB.OPUS",      "AUDIO\\BET.OPUS",     "AUDIO\\L1_LG.OPUS",
-    "AUDIO\\L2_DSB.OPUS",  "AUDIO\\L3_DM.OPUS",   "AUDIO\\L4_PAP.OPUS",  "AUDIO\\L5_TFB.OPUS",  "AUDIO\\J0_DM2.OPUS",  "AUDIO\\J1_LFL.OPUS",
-    "AUDIO\\J2_KCL.OPUS",  "AUDIO\\J3_VH.OPUS",   "AUDIO\\J4_ETH.OPUS",  "AUDIO\\J5_DST.OPUS",  "AUDIO\\J6_TBJ.OPUS",  "AUDIO\\T1_TOL.OPUS",
-    "AUDIO\\T2_TPU.OPUS",  "AUDIO\\T3_MAS.OPUS",  "AUDIO\\T4_TAT.OPUS",  "AUDIO\\T5_BF.OPUS",   "AUDIO\\S0_MAS.OPUS",  "AUDIO\\S1_PF.OPUS",
-    "AUDIO\\S2_CTG.OPUS",  "AUDIO\\S3_RTC.OPUS",  "AUDIO\\S5_LRQ.OPUS",  "AUDIO\\S4_BDBA.OPUS", "AUDIO\\S4_BDBB.OPUS", "AUDIO\\S2_CTG2.OPUS",
-    "AUDIO\\S4_BDBD.OPUS", "AUDIO\\S5_LRQB.OPUS", "AUDIO\\S5_LRQC.OPUS", "AUDIO\\A1_SSO.OPUS",  "AUDIO\\A2_PP.OPUS",   "AUDIO\\A3_SS.OPUS",
-    "AUDIO\\A4_PDR.OPUS",  "AUDIO\\A5_K2FT.OPUS", "AUDIO\\K1_KBO.OPUS",  "AUDIO\\K2_GIS.OPUS",  "AUDIO\\K3_DS.OPUS",   "AUDIO\\K4_SHI.OPUS",
-    "AUDIO\\K5_SD.OPUS",   "AUDIO\\R0_PDR2.OPUS", "AUDIO\\R1_SW.OPUS",   "AUDIO\\R2_AP.OPUS",   "AUDIO\\R3_ED.OPUS",   "AUDIO\\R4_GF.OPUS",
-    "AUDIO\\R5_PB.OPUS",   "AUDIO\\R6_MM.OPUS",   "AUDIO\\D1_STOG.OPUS", "AUDIO\\D2_KK.OPUS",   "AUDIO\\D3_ADO.OPUS",  "AUDIO\\D5_ES.OPUS",
-    "AUDIO\\D7_MLD.OPUS",  "AUDIO\\D4_GTA.OPUS",  "AUDIO\\D4_GTA2.OPUS", "AUDIO\\D6_STS.OPUS",  "AUDIO\\A6_BAIT.OPUS", "AUDIO\\A7_ETG.OPUS",
-    "AUDIO\\A8_PS.OPUS",   "AUDIO\\A9_ASD.OPUS",  "AUDIO\\K4_SHI2.OPUS", "AUDIO\\C1_TEX.OPUS",  "AUDIO\\EL_PH1.OPUS",  "AUDIO\\EL_PH2.OPUS",
-    "AUDIO\\EL_PH3.OPUS",  "AUDIO\\EL_PH4.OPUS",  "AUDIO\\YD_PH1.OPUS",  "AUDIO\\YD_PH2.OPUS",  "AUDIO\\YD_PH3.OPUS",  "AUDIO\\YD_PH4.OPUS",
-    "AUDIO\\HD_PH1.OPUS",  "AUDIO\\HD_PH2.OPUS",  "AUDIO\\HD_PH3.OPUS",  "AUDIO\\HD_PH4.OPUS",  "AUDIO\\HD_PH5.OPUS",  "AUDIO\\MT_PH1.OPUS",
-    "AUDIO\\MT_PH2.OPUS",  "AUDIO\\MT_PH3.OPUS",  "AUDIO\\MT_PH4.OPUS",  "AUDIO\\MISCOM.OPUS",  "AUDIO\\END.OPUS",     "AUDIO\\lib_a1.OPUS",
-    "AUDIO\\lib_a2.OPUS",  "AUDIO\\lib_a.OPUS",   "AUDIO\\lib_b.OPUS",   "AUDIO\\lib_c.OPUS",   "AUDIO\\lib_d.OPUS",   "AUDIO\\l2_a.OPUS",
-    "AUDIO\\j4t_1.OPUS",   "AUDIO\\j4t_2.OPUS",   "AUDIO\\j4t_3.OPUS",   "AUDIO\\j4t_4.OPUS",   "AUDIO\\j4_a.OPUS",    "AUDIO\\j4_b.OPUS",
-    "AUDIO\\j4_c.OPUS",    "AUDIO\\j4_d.OPUS",    "AUDIO\\j4_e.OPUS",    "AUDIO\\j4_f.OPUS",    "AUDIO\\j6_1.OPUS",    "AUDIO\\j6_a.OPUS",
-    "AUDIO\\j6_b.OPUS",    "AUDIO\\j6_c.OPUS",    "AUDIO\\j6_d.OPUS",    "AUDIO\\t4_a.OPUS",    "AUDIO\\s1_a.OPUS",    "AUDIO\\s1_a1.OPUS",
-    "AUDIO\\s1_b.OPUS",    "AUDIO\\s1_c.OPUS",    "AUDIO\\s1_c1.OPUS",   "AUDIO\\s1_d.OPUS",    "AUDIO\\s1_e.OPUS",    "AUDIO\\s1_f.OPUS",
-    "AUDIO\\s1_g.OPUS",    "AUDIO\\s1_h.OPUS",    "AUDIO\\s1_i.OPUS",    "AUDIO\\s1_j.OPUS",    "AUDIO\\s1_k.OPUS",    "AUDIO\\s1_l.OPUS",
-    "AUDIO\\s3_a.OPUS",    "AUDIO\\s3_b.OPUS",    "AUDIO\\el3_a.OPUS",   "AUDIO\\mf1_a.OPUS",   "AUDIO\\mf2_a.OPUS",   "AUDIO\\mf3_a.OPUS",
-    "AUDIO\\mf3_b.OPUS",   "AUDIO\\mf3_b1.OPUS",  "AUDIO\\mf3_c.OPUS",   "AUDIO\\mf4_a.OPUS",   "AUDIO\\mf4_b.OPUS",   "AUDIO\\mf4_c.OPUS",
-    "AUDIO\\a1_a.OPUS",    "AUDIO\\a3_a.OPUS",    "AUDIO\\a5_a.OPUS",    "AUDIO\\a4_a.OPUS",    "AUDIO\\a4_b.OPUS",    "AUDIO\\a4_c.OPUS",
-    "AUDIO\\a4_d.OPUS",    "AUDIO\\k1_a.OPUS",    "AUDIO\\k3_a.OPUS",    "AUDIO\\r1_a.OPUS",    "AUDIO\\r2_a.OPUS",    "AUDIO\\r2_b.OPUS",
-    "AUDIO\\r2_c.OPUS",    "AUDIO\\r2_d.OPUS",    "AUDIO\\r2_e.OPUS",    "AUDIO\\r2_f.OPUS",    "AUDIO\\r2_g.OPUS",    "AUDIO\\r2_h.OPUS",
-    "AUDIO\\r5_a.OPUS",    "AUDIO\\r6_a.OPUS",    "AUDIO\\r6_a1.OPUS",   "AUDIO\\r6_b.OPUS",    "AUDIO\\lo2_a.OPUS",   "AUDIO\\lo6_a.OPUS",
-    "AUDIO\\yd2_a.OPUS",   "AUDIO\\yd2_b.OPUS",   "AUDIO\\yd2_c.OPUS",   "AUDIO\\yd2_c1.OPUS",  "AUDIO\\yd2_d.OPUS",   "AUDIO\\yd2_e.OPUS",
-    "AUDIO\\yd2_f.OPUS",   "AUDIO\\yd2_g.OPUS",   "AUDIO\\yd2_h.OPUS",   "AUDIO\\yd2_ass.OPUS", "AUDIO\\yd2_ok.OPUS",  "AUDIO\\h5_a.OPUS",
-    "AUDIO\\h5_b.OPUS",    "AUDIO\\h5_c.OPUS",    "AUDIO\\ammu_a.OPUS",  "AUDIO\\ammu_b.OPUS",  "AUDIO\\ammu_c.OPUS",  "AUDIO\\door_1.OPUS",
-    "AUDIO\\door_2.OPUS",  "AUDIO\\door_3.OPUS",  "AUDIO\\door_4.OPUS",  "AUDIO\\door_5.OPUS",  "AUDIO\\door_6.OPUS",  "AUDIO\\t3_a.OPUS",
-    "AUDIO\\t3_b.OPUS",    "AUDIO\\t3_c.OPUS",    "AUDIO\\k1_b.OPUS",    "AUDIO\\cat1.OPUS"};
-#elif defined(PS2_AUDIO_PATHS)
-static char StreamedNameTable[][40] =
+#ifdef PS2_AUDIO_PATHS
+static char PS2StreamedNameTable[][40] =
 {
 	"AUDIO\\MUSIC\\WILD.VB",
 	"AUDIO\\MUSIC\\FLASH.VB",
@@ -386,7 +351,1130 @@ static char StreamedNameTable[][40] =
 	"AUDIO\\MUSIC\\MISCOM.VB",
 	"AUDIO\\MUSIC\\MISCOM.VB",
 	"AUDIO\\MUSIC\\MISCOM.VB",
-#else
+	"AUDIO\\MOBR1.WAV",
+	"AUDIO\\PAGER.WAV",
+	"AUDIO\\CARREV.WAV",
+	"AUDIO\\BIKEREV.WAV",
+	"AUDIO\\LIFTOP.WAV",
+	"AUDIO\\LIFTCL.WAV",
+	"AUDIO\\LIFTRUN.WAV",
+	"AUDIO\\LIFTBEL.WAV",
+	"AUDIO\\INLIFT.WAV",
+	"AUDIO\\SFX_01.WAV",
+	"AUDIO\\SFX_02.WAV",
+	"AUDIO\\CAMERAL.WAV",
+	"AUDIO\\CAMERAR.WAV",
+	"AUDIO\\CHEER1.WAV",
+	"AUDIO\\CHEER2.WAV",
+	"AUDIO\\CHEER3.WAV",
+	"AUDIO\\CHEER4.WAV",
+	"AUDIO\\OOH1.WAV",
+	"AUDIO\\OOH2.WAV",
+	"AUDIO\\RACE1.WAV",
+	"AUDIO\\RACE2.WAV",
+	"AUDIO\\RACE3.WAV",
+	"AUDIO\\RACE4.WAV",
+	"AUDIO\\RACE5.WAV",
+	"AUDIO\\RACE6.WAV",
+	"AUDIO\\RACE7.WAV",
+	"AUDIO\\RACE8.WAV",
+	"AUDIO\\RACE9.WAV",
+	"AUDIO\\RACE10.WAV",
+	"AUDIO\\RACE11.WAV",
+	"AUDIO\\RACE12.WAV",
+	"AUDIO\\RACE13.WAV",
+	"AUDIO\\RACE14.WAV",
+	"AUDIO\\RACE15.WAV",
+	"AUDIO\\HOT1.WAV",
+	"AUDIO\\HOT2.WAV",
+	"AUDIO\\HOT3.WAV",
+	"AUDIO\\HOT4.WAV",
+	"AUDIO\\HOT5.WAV",
+	"AUDIO\\HOT6.WAV",
+	"AUDIO\\HOT7.WAV",
+	"AUDIO\\HOT8.WAV",
+	"AUDIO\\HOT9.WAV",
+	"AUDIO\\HOT10.WAV",
+	"AUDIO\\HOT11.WAV",
+	"AUDIO\\HOT12.WAV",
+	"AUDIO\\HOT13.WAV",
+	"AUDIO\\HOT14.WAV",
+	"AUDIO\\HOT15.WAV",
+	"AUDIO\\LANSTP1.WAV",
+	"AUDIO\\LANSTP2.WAV",
+	"AUDIO\\LANAMU1.WAV",
+	"AUDIO\\LANAMU2.WAV",
+	"AUDIO\\AIRHORNL.WAV",
+	"AUDIO\\AIRHORNR.WAV",
+	"AUDIO\\SNIPSCRL.WAV",
+	"AUDIO\\SNIPSHORT.WAV",
+	"AUDIO\\BLOWROOF.WAV",
+	"AUDIO\\ASS_1.WAV",
+	"AUDIO\\ASS_2.WAV",
+	"AUDIO\\ASS_3.WAV",
+	"AUDIO\\ASS_4.WAV",
+	"AUDIO\\ASS_5.WAV",
+	"AUDIO\\ASS_6.WAV",
+	"AUDIO\\ASS_7.WAV",
+	"AUDIO\\ASS_8.WAV",
+	"AUDIO\\ASS_9.WAV",
+	"AUDIO\\ASS_10.WAV",
+	"AUDIO\\ASS_11.WAV",
+	"AUDIO\\ASS_12.WAV",
+	"AUDIO\\ASS_13.WAV",
+	"AUDIO\\ASS_14.WAV",
+	"AUDIO\\BIKE1_1.WAV",
+	"AUDIO\\BIKE1_2.WAV",
+	"AUDIO\\BIKE1_3.WAV",
+	"AUDIO\\BNK1_1.WAV",
+	"AUDIO\\BNK1_2.WAV",
+	"AUDIO\\BNK1_3.WAV",
+	"AUDIO\\BNK1_4.WAV",
+	"AUDIO\\BNK1_5.WAV",
+	"AUDIO\\BNK1_6.WAV",
+	"AUDIO\\BNK1_7.WAV",
+	"AUDIO\\BNK1_8.WAV",
+	"AUDIO\\BNK1_10.WAV",
+	"AUDIO\\BNK1_11.WAV",
+	"AUDIO\\BNK1_12.WAV",
+	"AUDIO\\BNK1_13.WAV",
+	"AUDIO\\BNK1_14.WAV",
+	"AUDIO\\BNK2_1.WAV",
+	"AUDIO\\BNK2_2.WAV",
+	"AUDIO\\BNK2_3.WAV",
+	"AUDIO\\BNK2_4.WAV",
+	"AUDIO\\BNK2_5.WAV",
+	"AUDIO\\BNK2_6.WAV",
+	"AUDIO\\BNK2_7.WAV",
+	"AUDIO\\BNK2_8.WAV",
+	"AUDIO\\BNK2_9.WAV",
+	"AUDIO\\BNK3_1.WAV",
+	"AUDIO\\BNK3_2.WAV",
+	"AUDIO\\BNK3_3A.WAV",
+	"AUDIO\\BNK3_3B.WAV",
+	"AUDIO\\BNK3_3C.WAV",
+	"AUDIO\\BNK3_4A.WAV",
+	"AUDIO\\BNK3_4B.WAV",
+	"AUDIO\\BNK3_4C.WAV",
+	"AUDIO\\BNK4_1.WAV",
+	"AUDIO\\BNK4_2.WAV",
+	"AUDIO\\BNK4_3A.WAV",
+	"AUDIO\\BNK4_3B.WAV",
+	"AUDIO\\BNK4_3C.WAV",
+	"AUDIO\\BNK4_3D.WAV",
+	"AUDIO\\BNK4_3E.WAV",
+	"AUDIO\\BNK4_3F.WAV",
+	"AUDIO\\BNK4_3G.WAV",
+	"AUDIO\\BNK4_3H.WAV",
+	"AUDIO\\BNK4_3I.WAV",
+	"AUDIO\\BNK4_3J.WAV",
+	"AUDIO\\BNK4_3K.WAV",
+	"AUDIO\\BNK4_3M.WAV",
+	"AUDIO\\BNK4_3O.WAV",
+	"AUDIO\\BNK4_3P.WAV",
+	"AUDIO\\BNK4_3Q.WAV",
+	"AUDIO\\BNK4_3R.WAV",
+	"AUDIO\\BNK4_3S.WAV",
+	"AUDIO\\BNK4_3T.WAV",
+	"AUDIO\\BNK4_3U.WAV",
+	"AUDIO\\BNK4_3V.WAV",
+	"AUDIO\\BNK4_4A.WAV",
+	"AUDIO\\BNK4_4B.WAV",
+	"AUDIO\\BNK4_5.WAV",
+	"AUDIO\\BNK4_6.WAV",
+	"AUDIO\\BNK4_7.WAV",
+	"AUDIO\\BNK4_8.WAV",
+	"AUDIO\\BNK4_9.WAV",
+	"AUDIO\\BNK4_10.WAV",
+	"AUDIO\\BNK4_11.WAV",
+	"AUDIO\\BK4_12A.WAV",
+	"AUDIO\\BK4_12B.WAV",
+	"AUDIO\\BK4_12C.WAV",
+	"AUDIO\\BNK4_13.WAV",
+	"AUDIO\\BK4_14A.WAV",
+	"AUDIO\\BK4_14B.WAV",
+	"AUDIO\\BNK4_15.WAV",
+	"AUDIO\\BNK4_16.WAV",
+	"AUDIO\\BNK4_17.WAV",
+	"AUDIO\\BNK4_18.WAV",
+	"AUDIO\\BK4_19A.WAV",
+	"AUDIO\\BK4_19B.WAV",
+	"AUDIO\\BK4_20A.WAV",
+	"AUDIO\\BK4_20B.WAV",
+	"AUDIO\\BNK4_21.WAV",
+	"AUDIO\\BNK422A.WAV",
+	"AUDIO\\BNK422B.WAV",
+	"AUDIO\\BK4_23A.WAV",
+	"AUDIO\\BK4_23B.WAV",
+	"AUDIO\\BK4_23C.WAV",
+	"AUDIO\\BK4_23D.WAV",
+	"AUDIO\\BK4_24A.WAV",
+	"AUDIO\\BK4_24B.WAV",
+	"AUDIO\\BNK4_25.WAV",
+	"AUDIO\\BNK4_26.WAV",
+	"AUDIO\\BNK4_27.WAV",
+	"AUDIO\\BNK4_28.WAV",
+	"AUDIO\\BNK4_29.WAV",
+	"AUDIO\\BNK4_30.WAV",
+	"AUDIO\\BK4_31A.WAV",
+	"AUDIO\\BK4_31B.WAV",
+	"AUDIO\\BNK4_32.WAV",
+	"AUDIO\\BK4_34A.WAV",
+	"AUDIO\\BK4_34B.WAV",
+	"AUDIO\\BK4_35A.WAV",
+	"AUDIO\\BK4_35B.WAV",
+	"AUDIO\\BNK4_36.WAV",
+	"AUDIO\\BNK4_37.WAV",
+	"AUDIO\\BNK4_38.WAV",
+	"AUDIO\\BNK4_39.WAV",
+	"AUDIO\\BK4_40A.WAV",
+	"AUDIO\\BK4_40B.WAV",
+	"AUDIO\\BNK4_41.WAV",
+	"AUDIO\\BNK4_42.WAV",
+	"AUDIO\\BNK4_43.WAV",
+	"AUDIO\\BNK4_44.WAV",
+	"AUDIO\\BNK4_45.WAV",
+	"AUDIO\\BNK4_46.WAV",
+	"AUDIO\\BNK4_47.WAV",
+	"AUDIO\\BNK4_48.WAV",
+	"AUDIO\\BNK4_49.WAV",
+	"AUDIO\\BNK450A.WAV",
+	"AUDIO\\BNK450B.WAV",
+	"AUDIO\\BNK4_51.WAV",
+	"AUDIO\\BNK4_94.WAV",
+	"AUDIO\\BNK4_95.WAV",
+	"AUDIO\\BNK4_96.WAV",
+	"AUDIO\\BNK4_97.WAV",
+	"AUDIO\\BNK4_98.WAV",
+	"AUDIO\\BNK4_99.WAV",
+	"AUDIO\\BUD1_1.WAV",
+	"AUDIO\\BUD1_2.WAV",
+	"AUDIO\\BUD1_3.WAV",
+	"AUDIO\\BUD1_4.WAV",
+	"AUDIO\\BUD1_5.WAV",
+	"AUDIO\\BUD1_9.WAV",
+	"AUDIO\\BUD1_10.WAV",
+	"AUDIO\\BUD2_1.WAV",
+	"AUDIO\\BUD2_2.WAV",
+	"AUDIO\\BUD2_3.WAV",
+	"AUDIO\\BUD2_4.WAV",
+	"AUDIO\\BUD2_5.WAV",
+	"AUDIO\\BUD2_6.WAV",
+	"AUDIO\\BUD2_7.WAV",
+	"AUDIO\\BUD3_1.WAV",
+	"AUDIO\\BUD3_1A.WAV",
+	"AUDIO\\BUD3_1B.WAV",
+	"AUDIO\\BUD3_1C.WAV",
+	"AUDIO\\BUD3_2.WAV",
+	"AUDIO\\BUD3_3.WAV",
+	"AUDIO\\BUD3_4.WAV",
+	"AUDIO\\BUD3_5.WAV",
+	"AUDIO\\BUD3_6.WAV",
+	"AUDIO\\BUD3_7.WAV",
+	"AUDIO\\BUD3_8A.WAV",
+	"AUDIO\\BUD3_8B.WAV",
+	"AUDIO\\BUD3_8C.WAV",
+	"AUDIO\\BUD3_9A.WAV",
+	"AUDIO\\BUD3_9B.WAV",
+	"AUDIO\\BUD3_9C.WAV",
+	"AUDIO\\CAP1_2.WAV",
+	"AUDIO\\CAP1_3.WAV",
+	"AUDIO\\CAP1_4.WAV",
+	"AUDIO\\CAP1_5.WAV",
+	"AUDIO\\CAP1_6.WAV",
+	"AUDIO\\CAP1_7.WAV",
+	"AUDIO\\CAP1_8.WAV",
+	"AUDIO\\CAP1_9.WAV",
+	"AUDIO\\CAP1_10.WAV",
+	"AUDIO\\CAP1_11.WAV",
+	"AUDIO\\CAP1_12.WAV",
+	"AUDIO\\CNT1_1.WAV",
+	"AUDIO\\CNT1_2.WAV",
+	"AUDIO\\CNT1_3.WAV",
+	"AUDIO\\CNT1_4.WAV",
+	"AUDIO\\CNT1_5.WAV",
+	"AUDIO\\CNT2_1.WAV",
+	"AUDIO\\CNT2_2.WAV",
+	"AUDIO\\CNT2_3.WAV",
+	"AUDIO\\CNT2_4.WAV",
+	"AUDIO\\COK1_1.WAV",
+	"AUDIO\\COK1_2.WAV",
+	"AUDIO\\COK1_3.WAV",
+	"AUDIO\\COK1_4.WAV",
+	"AUDIO\\COK1_5.WAV",
+	"AUDIO\\COK1_6.WAV",
+	"AUDIO\\COK2_1.WAV",
+	"AUDIO\\COK2_2.WAV",
+	"AUDIO\\COK2_3.WAV",
+	"AUDIO\\COK2_4.WAV",
+	"AUDIO\\COK2_5.WAV",
+	"AUDIO\\COK2_6.WAV",
+	"AUDIO\\COK2_7A.WAV",
+	"AUDIO\\COK2_7B.WAV",
+	"AUDIO\\COK2_7C.WAV",
+	"AUDIO\\COK2_8A.WAV",
+	"AUDIO\\COK2_8B.WAV",
+	"AUDIO\\COK2_8C.WAV",
+	"AUDIO\\COK2_8D.WAV",
+	"AUDIO\\COK2_9.WAV",
+	"AUDIO\\COK210A.WAV",
+	"AUDIO\\COK210B.WAV",
+	"AUDIO\\COK210C.WAV",
+	"AUDIO\\COK212A.WAV",
+	"AUDIO\\COK212B.WAV",
+	"AUDIO\\COK2_13.WAV",
+	"AUDIO\\COK2_14.WAV",
+	"AUDIO\\COK2_15.WAV",
+	"AUDIO\\COK2_16.WAV",
+	"AUDIO\\COK2_20.WAV",
+	"AUDIO\\COK2_21.WAV",
+	"AUDIO\\COK2_2.WAV", // this is probably a typo of COK2_22
+	"AUDIO\\COK3_1.WAV",
+	"AUDIO\\COK3_2.WAV",
+	"AUDIO\\COK3_3.WAV",
+	"AUDIO\\COK3_4.WAV",
+	"AUDIO\\COK4_1.WAV",
+	"AUDIO\\COK4_2.WAV",
+	"AUDIO\\COK4_3.WAV",
+	"AUDIO\\COK4_4.WAV",
+	"AUDIO\\COK4_5.WAV",
+	"AUDIO\\COK4_6.WAV",
+	"AUDIO\\COK4_7.WAV",
+	"AUDIO\\COK4_8.WAV",
+	"AUDIO\\COK4_9.WAV",
+	"AUDIO\\COK4_9A.WAV",
+	"AUDIO\\COK4_10.WAV",
+	"AUDIO\\COK4_11.WAV",
+	"AUDIO\\COK4_12.WAV",
+	"AUDIO\\COK4_13.WAV",
+	"AUDIO\\COK4_14.WAV",
+	"AUDIO\\COK4_15.WAV",
+	"AUDIO\\COK4_16.WAV",
+	"AUDIO\\COK4_17.WAV",
+	"AUDIO\\COK4_18.WAV",
+	"AUDIO\\COK4_19.WAV",
+	"AUDIO\\COK4_20.WAV",
+	"AUDIO\\COK4_21.WAV",
+	"AUDIO\\COK4_22.WAV",
+	"AUDIO\\COK4_23.WAV",
+	"AUDIO\\COK4_24.WAV",
+	"AUDIO\\COK4_25.WAV",
+	"AUDIO\\COK4_26.WAV",
+	"AUDIO\\COK4_27.WAV",
+	"AUDIO\\COL1_1.WAV",
+	"AUDIO\\COL1_2.WAV",
+	"AUDIO\\COL1_3.WAV",
+	"AUDIO\\COL1_4.WAV",
+	"AUDIO\\COL1_5.WAV",
+	"AUDIO\\COL1_6.WAV",
+	"AUDIO\\COL1_7.WAV",
+	"AUDIO\\COL1_8.WAV",
+	"AUDIO\\COL2_1.WAV",
+	"AUDIO\\COL2_2.WAV",
+	"AUDIO\\COL2_3.WAV",
+	"AUDIO\\COL2_4.WAV",
+	"AUDIO\\COL2_5.WAV",
+	"AUDIO\\COL2_6A.WAV",
+	"AUDIO\\COL2_7.WAV",
+	"AUDIO\\COL2_8.WAV",
+	"AUDIO\\COL2_9.WAV",
+	"AUDIO\\COL2_10.WAV",
+	"AUDIO\\COL2_11.WAV",
+	"AUDIO\\COL2_12.WAV",
+	"AUDIO\\COL2_13.WAV",
+	"AUDIO\\COL2_14.WAV",
+	"AUDIO\\COL2_15.WAV",
+	"AUDIO\\COL2_16.WAV",
+	"AUDIO\\COL3_1.WAV",
+	"AUDIO\\COL3_2.WAV",
+	"AUDIO\\COL3_2A.WAV",
+	"AUDIO\\COL3_2B.WAV",
+	"AUDIO\\COL3_3.WAV",
+	"AUDIO\\COL3_4.WAV",
+	"AUDIO\\COL3_5.WAV",
+	"AUDIO\\COL3_6.WAV",
+	"AUDIO\\COL3_7.WAV",
+	"AUDIO\\COL3_8.WAV",
+	"AUDIO\\COL3_9.WAV",
+	"AUDIO\\COL3_10.WAV",
+	"AUDIO\\COL3_11.WAV",
+	"AUDIO\\COL3_12.WAV",
+	"AUDIO\\COL3_13.WAV",
+	"AUDIO\\COL3_14.WAV",
+	"AUDIO\\COL3_15.WAV",
+	"AUDIO\\COL3_16.WAV",
+	"AUDIO\\COL3_17.WAV",
+	"AUDIO\\COL3_18.WAV",
+	"AUDIO\\COL3_19.WAV",
+	"AUDIO\\COL3_20.WAV",
+	"AUDIO\\COL3_21.WAV",
+	"AUDIO\\COL3_23.WAV",
+	"AUDIO\\COL3_24.WAV",
+	"AUDIO\\COL3_25.WAV",
+	"AUDIO\\COL4_1.WAV",
+	"AUDIO\\COL4_2.WAV",
+	"AUDIO\\COL4_3.WAV",
+	"AUDIO\\COL4_4.WAV",
+	"AUDIO\\COL4_5.WAV",
+	"AUDIO\\COL4_6.WAV",
+	"AUDIO\\COL4_7.WAV",
+	"AUDIO\\COL4_8.WAV",
+	"AUDIO\\COL4_9.WAV",
+	"AUDIO\\COL4_10.WAV",
+	"AUDIO\\COL4_11.WAV",
+	"AUDIO\\COL4_12.WAV",
+	"AUDIO\\COL4_13.WAV",
+	"AUDIO\\COL4_14.WAV",
+	"AUDIO\\COL4_15.WAV",
+	"AUDIO\\COL4_16.WAV",
+	"AUDIO\\COL4_17.WAV",
+	"AUDIO\\COL4_18.WAV",
+	"AUDIO\\COL4_19.WAV",
+	"AUDIO\\COL4_20.WAV",
+	"AUDIO\\COL4_21.WAV",
+	"AUDIO\\COL4_22.WAV",
+	"AUDIO\\COL4_23.WAV",
+	"AUDIO\\COL4_24.WAV",
+	"AUDIO\\COL4_25.WAV",
+	"AUDIO\\COL4_26.WAV",
+	"AUDIO\\COL5_1.WAV",
+	"AUDIO\\COL5_2.WAV",
+	"AUDIO\\COL5_3.WAV",
+	"AUDIO\\COL5_4.WAV",
+	"AUDIO\\COL5_5.WAV",
+	"AUDIO\\COL5_6.WAV",
+	"AUDIO\\COL5_7.WAV",
+	"AUDIO\\COL5_8.WAV",
+	"AUDIO\\COL5_9.WAV",
+	"AUDIO\\COL5_10.WAV",
+	"AUDIO\\COL5_11.WAV",
+	"AUDIO\\COL5_12.WAV",
+	"AUDIO\\COL5_13.WAV",
+	"AUDIO\\COL5_14.WAV",
+	"AUDIO\\COL5_15.WAV",
+	"AUDIO\\COL5_16.WAV",
+	"AUDIO\\COL5_17.WAV",
+	"AUDIO\\COL5_18.WAV",
+	"AUDIO\\COL5_19.WAV",
+	"AUDIO\\COL5_20.WAV",
+	"AUDIO\\COL5_21.WAV",
+	"AUDIO\\COL5_22.WAV",
+	"AUDIO\\CUB1_1.WAV",
+	"AUDIO\\CUB1_2.WAV",
+	"AUDIO\\CUB1_3.WAV",
+	"AUDIO\\CUB1_4.WAV",
+	"AUDIO\\CUB1_5.WAV",
+	"AUDIO\\CUB1_6.WAV",
+	"AUDIO\\CUB1_7.WAV",
+	"AUDIO\\CUB1_8.WAV",
+	"AUDIO\\CUB1_9.WAV",
+	"AUDIO\\CUB1_10.WAV",
+	"AUDIO\\CUB2_1.WAV",
+	"AUDIO\\CUB2_2.WAV",
+	"AUDIO\\CUB2_3A.WAV",
+	"AUDIO\\CUB2_3B.WAV",
+	"AUDIO\\CUB2_3C.WAV",
+	"AUDIO\\CUB2_4A.WAV",
+	"AUDIO\\CUB2_5.WAV",
+	"AUDIO\\CUB2_6.WAV",
+	"AUDIO\\CUB2_7.WAV",
+	"AUDIO\\CUB2_8.WAV",
+	"AUDIO\\CUB2_9.WAV",
+	"AUDIO\\CUB2_10.WAV",
+	"AUDIO\\CUB2_11.WAV",
+	"AUDIO\\CUB3_1.WAV",
+	"AUDIO\\CUB3_2.WAV",
+	"AUDIO\\CUB3_3.WAV",
+	"AUDIO\\CUB3_4.WAV",
+	"AUDIO\\CUB4_1.WAV",
+	"AUDIO\\CUB4_2.WAV",
+	"AUDIO\\CUB4_3.WAV",
+	"AUDIO\\CUB4_4.WAV",
+	"AUDIO\\CUB4_5.WAV",
+	"AUDIO\\CUB4_5A.WAV",
+	"AUDIO\\CUB4_6.WAV",
+	"AUDIO\\CUB4_7.WAV",
+	"AUDIO\\CUB4_8.WAV",
+	"AUDIO\\CUB4_9.WAV",
+	"AUDIO\\CUB4_10.WAV",
+	"AUDIO\\CUB4_11.WAV",
+	"AUDIO\\CUB4_12.WAV",
+	"AUDIO\\CUB4_13.WAV",
+	"AUDIO\\CUB4_14.WAV",
+	"AUDIO\\CUB4_15.WAV",
+	"AUDIO\\CUB4_16.WAV",
+	"AUDIO\\GOLF_1.WAV",
+	"AUDIO\\GOLF_2.WAV",
+	"AUDIO\\GOLF_3.WAV",
+	"AUDIO\\BAR_1.WAV",
+	"AUDIO\\BAR_2.WAV",
+	"AUDIO\\BAR_3.WAV",
+	"AUDIO\\BAR_4.WAV",
+	"AUDIO\\BAR_5.WAV",
+	"AUDIO\\BAR_6.WAV",
+	"AUDIO\\BAR_7.WAV",
+	"AUDIO\\BAR_8.WAV",
+	"AUDIO\\STRIP_1.WAV",
+	"AUDIO\\STRIP_2.WAV",
+	"AUDIO\\STRIP_3.WAV",
+	"AUDIO\\STRIP_4.WAV",
+	"AUDIO\\STRIP_5.WAV",
+	"AUDIO\\STRIP_6.WAV",
+	"AUDIO\\STRIP_7.WAV",
+	"AUDIO\\STRIP_8.WAV",
+	"AUDIO\\STRIP_9.WAV",
+	"AUDIO\\STAR_1.WAV",
+	"AUDIO\\STAR_2.WAV",
+	"AUDIO\\STAR_3.WAV",
+	"AUDIO\\STAR_4.WAV",
+	"AUDIO\\FIN_1A.WAV",
+	"AUDIO\\FIN_1B.WAV",
+	"AUDIO\\FIN_1C.WAV",
+	"AUDIO\\FIN_2B.WAV",
+	"AUDIO\\FIN_2C.WAV",
+	"AUDIO\\FIN_3.WAV",
+	"AUDIO\\FIN_4.WAV",
+	"AUDIO\\FIN_5.WAV",
+	"AUDIO\\FIN_6.WAV",
+	"AUDIO\\FIN_10.WAV",
+	"AUDIO\\FIN_11A.WAV",
+	"AUDIO\\FIN_11B.WAV",
+	"AUDIO\\FIN_12A.WAV",
+	"AUDIO\\FIN_12B.WAV",
+	"AUDIO\\FIN_12C.WAV",
+	"AUDIO\\FIN_13.WAV",
+	"AUDIO\\FINKILL.WAV",
+	"AUDIO\\LAW1_1.WAV",
+	"AUDIO\\LAW1_2.WAV",
+	"AUDIO\\LAW1_3.WAV",
+	"AUDIO\\LAW1_4.WAV",
+	"AUDIO\\LAW1_5.WAV",
+	"AUDIO\\LAW1_6.WAV",
+	"AUDIO\\LAW1_7.WAV",
+	"AUDIO\\LAW1_8.WAV",
+	"AUDIO\\LAW1_9.WAV",
+	"AUDIO\\LAW1_10.WAV",
+	"AUDIO\\LAW2_1.WAV",
+	"AUDIO\\LAW2_2.WAV",
+	"AUDIO\\LAW2_3.WAV",
+	"AUDIO\\LAW2_4.WAV",
+	"AUDIO\\LAW2_5.WAV",
+	"AUDIO\\LAW2_6.WAV",
+	"AUDIO\\LAW2_7.WAV",
+	"AUDIO\\LAW2_8.WAV",
+	"AUDIO\\LAW2_9.WAV",
+	"AUDIO\\LAW2_10.WAV",
+	"AUDIO\\LAW3_1.WAV",
+	"AUDIO\\LAW3_2.WAV",
+	"AUDIO\\LAW3_3.WAV",
+	"AUDIO\\LAW3_4.WAV",
+	"AUDIO\\LAW3_5.WAV",
+	"AUDIO\\LAW3_6.WAV",
+	"AUDIO\\LAW3_10.WAV",
+	"AUDIO\\LAW3_11.WAV",
+	"AUDIO\\LAW3_12.WAV",
+	"AUDIO\\LAW3_13.WAV",
+	"AUDIO\\LAW3_14.WAV",
+	"AUDIO\\LAW3_16.WAV",
+	"AUDIO\\LAW3_17.WAV",
+	"AUDIO\\LAW3_18.WAV",
+	"AUDIO\\LAW3_19.WAV",
+	"AUDIO\\LAW3_20.WAV",
+	"AUDIO\\LAW3_21.WAV",
+	"AUDIO\\LAW3_22.WAV",
+	"AUDIO\\LAW3_23.WAV",
+	"AUDIO\\LAW3_24.WAV",
+	"AUDIO\\LAW3_25.WAV",
+	"AUDIO\\LAW4_1A.WAV",
+	"AUDIO\\LAW4_1B.WAV",
+	"AUDIO\\LAW4_1C.WAV",
+	"AUDIO\\LAW4_1D.WAV",
+	"AUDIO\\LAW4_10.WAV",
+	"AUDIO\\LAW4_3.WAV",
+	"AUDIO\\LAW4_4.WAV",
+	"AUDIO\\LAW4_5.WAV",
+	"AUDIO\\LAW4_6.WAV",
+	"AUDIO\\LAW4_7.WAV",
+	"AUDIO\\LAW4_8.WAV",
+	"AUDIO\\LAW4_9.WAV",
+	"AUDIO\\PHIL1_2.WAV",
+	"AUDIO\\PHIL1_3.WAV",
+	"AUDIO\\PHIL2_1.WAV",
+	"AUDIO\\PHIL2_2.WAV",
+	"AUDIO\\PHIL2_3.WAV",
+	"AUDIO\\PHIL2_4.WAV",
+	"AUDIO\\PHIL2_5.WAV",
+	"AUDIO\\PHIL2_6.WAV",
+	"AUDIO\\PHIL2_7.WAV",
+	"AUDIO\\PHIL2_8.WAV",
+	"AUDIO\\PHIL2_9.WAV",
+	"AUDIO\\PHIL210.WAV",
+	"AUDIO\\PHIL211.WAV",
+	"AUDIO\\PORN1_1.WAV",
+	"AUDIO\\PORN1_2.WAV",
+	"AUDIO\\PORN1_3.WAV",
+	"AUDIO\\PRN1_3A.WAV",
+	"AUDIO\\PORN1_4.WAV",
+	"AUDIO\\PORN1_5.WAV",
+	"AUDIO\\PORN1_6.WAV",
+	"AUDIO\\PORN1_7.WAV",
+	"AUDIO\\PORN1_8.WAV",
+	"AUDIO\\PORN1_9.WAV",
+	"AUDIO\\PRN1_10.WAV",
+	"AUDIO\\PRN1_11.WAV",
+	"AUDIO\\PRN1_12.WAV",
+	"AUDIO\\PRN1_13.WAV",
+	"AUDIO\\PRN1_14.WAV",
+	"AUDIO\\PRN1_15.WAV",
+	"AUDIO\\PRN1_16.WAV",
+	"AUDIO\\PRN1_17.WAV",
+	"AUDIO\\PRN1_18.WAV",
+	"AUDIO\\PRN1_19.WAV",
+	"AUDIO\\PRN1_20.WAV",
+	"AUDIO\\PRN1_21.WAV",
+	"AUDIO\\PORN3_1.WAV",
+	"AUDIO\\PORN3_2.WAV",
+	"AUDIO\\PORN3_3.WAV",
+	"AUDIO\\PORN3_4.WAV",
+	"AUDIO\\PSYCH_1.WAV",
+	"AUDIO\\PSYCH_2.WAV",
+	"AUDIO\\ROK2_01.WAV",
+	"AUDIO\\ROK3_1.WAV",
+	"AUDIO\\ROK3_2.WAV",
+	"AUDIO\\ROK3_3.WAV",
+	"AUDIO\\ROK3_4.WAV",
+	"AUDIO\\ROK3_5.WAV",
+	"AUDIO\\ROK3_6.WAV",
+	"AUDIO\\ROK3_7.WAV",
+	"AUDIO\\ROK3_8.WAV",
+	"AUDIO\\ROK3_9.WAV",
+	"AUDIO\\ROK3_10.WAV",
+	"AUDIO\\ROK3_11.WAV",
+	"AUDIO\\ROK3_12.WAV",
+	"AUDIO\\ROK3_13.WAV",
+	"AUDIO\\ROK3_14.WAV",
+	"AUDIO\\ROK3_15.WAV",
+	"AUDIO\\ROK3_16.WAV",
+	"AUDIO\\ROK3_17.WAV",
+	"AUDIO\\ROK3_18.WAV",
+	"AUDIO\\ROK3_19.WAV",
+	"AUDIO\\ROK3_20.WAV",
+	"AUDIO\\ROK3_21.WAV",
+	"AUDIO\\ROK3_22.WAV",
+	"AUDIO\\ROK3_23.WAV",
+	"AUDIO\\ROK3_24.WAV",
+	"AUDIO\\ROK3_25.WAV",
+	"AUDIO\\ROK3_26.WAV",
+	"AUDIO\\ROK3_27.WAV",
+	"AUDIO\\ROK3_62.WAV",
+	"AUDIO\\ROK3_63.WAV",
+	"AUDIO\\ROK3_64.WAV",
+	"AUDIO\\ROK3_65.WAV",
+	"AUDIO\\ROK3_66.WAV",
+	"AUDIO\\ROK3_67.WAV",
+	"AUDIO\\ROK3_68.WAV",
+	"AUDIO\\ROK3_69.WAV",
+	"AUDIO\\ROK3_70.WAV",
+	"AUDIO\\ROK3_71.WAV",
+	"AUDIO\\ROK3_73.WAV",
+	"AUDIO\\RESC_1.WAV",
+	"AUDIO\\RESC_2.WAV",
+	"AUDIO\\RESC_3.WAV",
+	"AUDIO\\RESC_4.WAV",
+	"AUDIO\\RESC_5.WAV",
+	"AUDIO\\RESC_6.WAV",
+	"AUDIO\\RESC_7.WAV",
+	"AUDIO\\RESC_8.WAV",
+	"AUDIO\\RESC_9.WAV",
+	"AUDIO\\RESC_10.WAV",
+	"AUDIO\\ROK1_1A.WAV",
+	"AUDIO\\ROK1_1B.WAV",
+	"AUDIO\\ROK1_5.WAV",
+	"AUDIO\\ROK1_6.WAV",
+	"AUDIO\\ROK1_7.WAV",
+	"AUDIO\\ROK1_8.WAV",
+	"AUDIO\\ROK1_9.WAV",
+	"AUDIO\\TAX1_1.WAV",
+	"AUDIO\\TAX1_2.WAV",
+	"AUDIO\\TAX1_3.WAV",
+	"AUDIO\\TAX1_4.WAV",
+	"AUDIO\\TAX1_5.WAV",
+	"AUDIO\\TAX2_1.WAV",
+	"AUDIO\\TAX2_2.WAV",
+	"AUDIO\\TAX2_3.WAV",
+	"AUDIO\\TAX2_4.WAV",
+	"AUDIO\\TAX2_5.WAV",
+	"AUDIO\\TAX2_6.WAV",
+	"AUDIO\\TAX2_7.WAV",
+	"AUDIO\\TAX3_1.WAV",
+	"AUDIO\\TAX3_2.WAV",
+	"AUDIO\\TAX3_3.WAV",
+	"AUDIO\\TAX3_4.WAV",
+	"AUDIO\\TAX3_5.WAV",
+	"AUDIO\\TEX1_1.WAV",
+	"AUDIO\\TEX1_2.WAV",
+	"AUDIO\\TEX1_3.WAV",
+	"AUDIO\\TEX1_4.WAV",
+	"AUDIO\\TEX1_5.WAV",
+	"AUDIO\\TEX1_6.WAV",
+	"AUDIO\\TEX2_1.WAV",
+	"AUDIO\\TEX3_1.WAV",
+	"AUDIO\\TEX3_2.WAV",
+	"AUDIO\\TEX3_3.WAV",
+	"AUDIO\\TEX3_4.WAV",
+	"AUDIO\\TEX3_5.WAV",
+	"AUDIO\\TEX3_6.WAV",
+	"AUDIO\\TEX3_7.WAV",
+	"AUDIO\\TEX3_8.WAV",
+	"AUDIO\\HAT_1A.WAV",
+	"AUDIO\\INTRO1.WAV",
+	"AUDIO\\INTRO2.WAV",
+	"AUDIO\\INTRO3.WAV",
+	"AUDIO\\INTRO4.WAV",
+	"AUDIO\\MOB_01A.WAV",
+	"AUDIO\\MOB_01B.WAV",
+	"AUDIO\\MOB_01C.WAV",
+	"AUDIO\\MOB_02A.WAV",
+	"AUDIO\\MOB_02B.WAV",
+	"AUDIO\\MOB_02C.WAV",
+	"AUDIO\\MOB_03A.WAV",
+	"AUDIO\\MOB_03B.WAV",
+	"AUDIO\\MOB_03C.WAV",
+	"AUDIO\\MOB_03D.WAV",
+	"AUDIO\\MOB_03E.WAV",
+	"AUDIO\\SHARK_1.WAV",
+	"AUDIO\\SHARK_2.WAV",
+	"AUDIO\\SHARK_3.WAV",
+	"AUDIO\\SHARK_4.WAV",
+	"AUDIO\\SHARK_5.WAV",
+	"AUDIO\\MOB_04A.WAV",
+	"AUDIO\\MOB_04B.WAV",
+	"AUDIO\\MOB_04C.WAV",
+	"AUDIO\\MOB_04D.WAV",
+	"AUDIO\\MOB_05A.WAV",
+	"AUDIO\\MOB_05B.WAV",
+	"AUDIO\\MOB_05C.WAV",
+	"AUDIO\\MOB_05D.WAV",
+	"AUDIO\\MOB_06A.WAV",
+	"AUDIO\\MOB_06B.WAV",
+	"AUDIO\\MOB_06C.WAV",
+	"AUDIO\\MOB_07A.WAV",
+	"AUDIO\\MOB_07B.WAV",
+	"AUDIO\\MOB_08A.WAV",
+	"AUDIO\\MOB_08B.WAV",
+	"AUDIO\\MOB_08C.WAV",
+	"AUDIO\\MOB_08D.WAV",
+	"AUDIO\\MOB_08E.WAV",
+	"AUDIO\\MOB_08F.WAV",
+	"AUDIO\\MOB_08G.WAV",
+	"AUDIO\\MOB_09A.WAV",
+	"AUDIO\\MOB_09B.WAV",
+	"AUDIO\\MOB_09C.WAV",
+	"AUDIO\\MOB_09D.WAV",
+	"AUDIO\\MOB_09E.WAV",
+	"AUDIO\\MOB_09F.WAV",
+	"AUDIO\\MOB_10A.WAV",
+	"AUDIO\\MOB_10B.WAV",
+	"AUDIO\\MOB_10C.WAV",
+	"AUDIO\\MOB_10D.WAV",
+	"AUDIO\\MOB_10E.WAV",
+	"AUDIO\\MOB_11A.WAV",
+	"AUDIO\\MOB_11B.WAV",
+	"AUDIO\\MOB_11C.WAV",
+	"AUDIO\\MOB_11D.WAV",
+	"AUDIO\\MOB_11E.WAV",
+	"AUDIO\\MOB_11F.WAV",
+	"AUDIO\\MOB_14A.WAV",
+	"AUDIO\\MOB_14B.WAV",
+	"AUDIO\\MOB_14C.WAV",
+	"AUDIO\\MOB_14D.WAV",
+	"AUDIO\\MOB_14E.WAV",
+	"AUDIO\\MOB_14F.WAV",
+	"AUDIO\\MOB_14G.WAV",
+	"AUDIO\\MOB_14H.WAV",
+	"AUDIO\\MOB_16A.WAV",
+	"AUDIO\\MOB_16B.WAV",
+	"AUDIO\\MOB_16C.WAV",
+	"AUDIO\\MOB_16D.WAV",
+	"AUDIO\\MOB_16E.WAV",
+	"AUDIO\\MOB_16F.WAV",
+	"AUDIO\\MOB_16G.WAV",
+	"AUDIO\\MOB_17A.WAV",
+	"AUDIO\\MOB_17B.WAV",
+	"AUDIO\\MOB_17C.WAV",
+	"AUDIO\\MOB_17D.WAV",
+	"AUDIO\\MOB_17E.WAV",
+	"AUDIO\\MOB_17G.WAV",
+	"AUDIO\\MOB_17H.WAV",
+	"AUDIO\\MOB_17I.WAV",
+	"AUDIO\\MOB_17J.WAV",
+	"AUDIO\\MOB_17K.WAV",
+	"AUDIO\\MOB_17L.WAV",
+	"AUDIO\\MOB_18A.WAV",
+	"AUDIO\\MOB_18B.WAV",
+	"AUDIO\\MOB_18C.WAV",
+	"AUDIO\\MOB_18D.WAV",
+	"AUDIO\\MOB_18E.WAV",
+	"AUDIO\\MOB_18F.WAV",
+	"AUDIO\\MOB_18G.WAV",
+	"AUDIO\\MOB_20A.WAV",
+	"AUDIO\\MOB_20B.WAV",
+	"AUDIO\\MOB_20C.WAV",
+	"AUDIO\\MOB_20D.WAV",
+	"AUDIO\\MOB_20E.WAV",
+	"AUDIO\\MOB_24A.WAV",
+	"AUDIO\\MOB_24B.WAV",
+	"AUDIO\\MOB_24C.WAV",
+	"AUDIO\\MOB_24D.WAV",
+	"AUDIO\\MOB_24E.WAV",
+	"AUDIO\\MOB_24F.WAV",
+	"AUDIO\\MOB_24G.WAV",
+	"AUDIO\\MOB_24H.WAV",
+	"AUDIO\\MOB_25A.WAV",
+	"AUDIO\\MOB_25B.WAV",
+	"AUDIO\\MOB_25C.WAV",
+	"AUDIO\\MOB_25D.WAV",
+	"AUDIO\\MOB_26A.WAV",
+	"AUDIO\\MOB_26B.WAV",
+	"AUDIO\\MOB_26C.WAV",
+	"AUDIO\\MOB_26D.WAV",
+	"AUDIO\\MOB_26E.WAV",
+	"AUDIO\\MOB_29A.WAV",
+	"AUDIO\\MOB_29B.WAV",
+	"AUDIO\\MOB_29C.WAV",
+	"AUDIO\\MOB_29D.WAV",
+	"AUDIO\\MOB_29E.WAV",
+	"AUDIO\\MOB_29F.WAV",
+	"AUDIO\\MOB_29G.WAV",
+	"AUDIO\\MOB_30A.WAV",
+	"AUDIO\\MOB_30B.WAV",
+	"AUDIO\\MOB_30C.WAV",
+	"AUDIO\\MOB_30D.WAV",
+	"AUDIO\\MOB_30E.WAV",
+	"AUDIO\\MOB_30F.WAV",
+	"AUDIO\\MOB_33A.WAV",
+	"AUDIO\\MOB_33B.WAV",
+	"AUDIO\\MOB_33C.WAV",
+	"AUDIO\\MOB_33D.WAV",
+	"AUDIO\\MOB_34A.WAV",
+	"AUDIO\\MOB_34B.WAV",
+	"AUDIO\\MOB_34C.WAV",
+	"AUDIO\\MOB_34D.WAV",
+	"AUDIO\\MOB_35A.WAV",
+	"AUDIO\\MOB_35B.WAV",
+	"AUDIO\\MOB_35C.WAV",
+	"AUDIO\\MOB_35D.WAV",
+	"AUDIO\\MOB_36A.WAV",
+	"AUDIO\\MOB_36B.WAV",
+	"AUDIO\\MOB_36C.WAV",
+	"AUDIO\\MOB_40A.WAV",
+	"AUDIO\\MOB_40B.WAV",
+	"AUDIO\\MOB_40C.WAV",
+	"AUDIO\\MOB_40D.WAV",
+	"AUDIO\\MOB_40E.WAV",
+	"AUDIO\\MOB_40F.WAV",
+	"AUDIO\\MOB_40G.WAV",
+	"AUDIO\\MOB_40H.WAV",
+	"AUDIO\\MOB_40I.WAV",
+	"AUDIO\\MOB_41A.WAV",
+	"AUDIO\\MOB_41B.WAV",
+	"AUDIO\\MOB_41C.WAV",
+	"AUDIO\\MOB_41D.WAV",
+	"AUDIO\\MOB_41E.WAV",
+	"AUDIO\\MOB_41F.WAV",
+	"AUDIO\\MOB_41G.WAV",
+	"AUDIO\\MOB_41H.WAV",
+	"AUDIO\\MOB_42A.WAV",
+	"AUDIO\\MOB_42B.WAV",
+	"AUDIO\\MOB_42C.WAV",
+	"AUDIO\\MOB_42D.WAV",
+	"AUDIO\\MOB_42E.WAV",
+	"AUDIO\\MOB_43A.WAV",
+	"AUDIO\\MOB_43B.WAV",
+	"AUDIO\\MOB_43C.WAV",
+	"AUDIO\\MOB_43D.WAV",
+	"AUDIO\\MOB_43E.WAV",
+	"AUDIO\\MOB_43F.WAV",
+	"AUDIO\\MOB_43G.WAV",
+	"AUDIO\\MOB_43H.WAV",
+	"AUDIO\\MOB_45A.WAV",
+	"AUDIO\\MOB_45B.WAV",
+	"AUDIO\\MOB_45C.WAV",
+	"AUDIO\\MOB_45D.WAV",
+	"AUDIO\\MOB_45E.WAV",
+	"AUDIO\\MOB_45F.WAV",
+	"AUDIO\\MOB_45G.WAV",
+	"AUDIO\\MOB_45H.WAV",
+	"AUDIO\\MOB_45I.WAV",
+	"AUDIO\\MOB_45J.WAV",
+	"AUDIO\\MOB_45K.WAV",
+	"AUDIO\\MOB_45L.WAV",
+	"AUDIO\\MOB_45M.WAV",
+	"AUDIO\\MOB_45N.WAV",
+	"AUDIO\\MOB_46A.WAV",
+	"AUDIO\\MOB_46B.WAV",
+	"AUDIO\\MOB_46C.WAV",
+	"AUDIO\\MOB_46D.WAV",
+	"AUDIO\\MOB_46E.WAV",
+	"AUDIO\\MOB_46F.WAV",
+	"AUDIO\\MOB_46G.WAV",
+	"AUDIO\\MOB_46H.WAV",
+	"AUDIO\\MOB_47A.WAV",
+	"AUDIO\\MOB_52A.WAV",
+	"AUDIO\\MOB_52B.WAV",
+	"AUDIO\\MOB_52C.WAV",
+	"AUDIO\\MOB_52D.WAV",
+	"AUDIO\\MOB_52E.WAV",
+	"AUDIO\\MOB_52F.WAV",
+	"AUDIO\\MOB_52G.WAV",
+	"AUDIO\\MOB_52H.WAV",
+	"AUDIO\\MOB_54A.WAV",
+	"AUDIO\\MOB_54B.WAV",
+	"AUDIO\\MOB_54C.WAV",
+	"AUDIO\\MOB_54D.WAV",
+	"AUDIO\\MOB_54E.WAV",
+	"AUDIO\\MOB_55A.WAV",
+	"AUDIO\\MOB_55B.WAV",
+	"AUDIO\\MOB_55C.WAV",
+	"AUDIO\\MOB_55D.WAV",
+	"AUDIO\\MOB_55E.WAV",
+	"AUDIO\\MOB_55F.WAV",
+	"AUDIO\\MOB_56A.WAV",
+	"AUDIO\\MOB_56B.WAV",
+	"AUDIO\\MOB_56C.WAV",
+	"AUDIO\\MOB_56D.WAV",
+	"AUDIO\\MOB_56E.WAV",
+	"AUDIO\\MOB_56F.WAV",
+	"AUDIO\\MOB_57A.WAV",
+	"AUDIO\\MOB_57B.WAV",
+	"AUDIO\\MOB_57C.WAV",
+	"AUDIO\\MOB_57D.WAV",
+	"AUDIO\\MOB_57E.WAV",
+	"AUDIO\\MOB_58A.WAV",
+	"AUDIO\\MOB_58B.WAV",
+	"AUDIO\\MOB_58C.WAV",
+	"AUDIO\\MOB_58D.WAV",
+	"AUDIO\\MOB_58E.WAV",
+	"AUDIO\\MOB_58F.WAV",
+	"AUDIO\\MOB_58G.WAV",
+	"AUDIO\\MOB_61A.WAV",
+	"AUDIO\\MOB_61B.WAV",
+	"AUDIO\\MOB_62A.WAV",
+	"AUDIO\\MOB_62B.WAV",
+	"AUDIO\\MOB_62C.WAV",
+	"AUDIO\\MOB_62D.WAV",
+	"AUDIO\\MOB_63A.WAV",
+	"AUDIO\\MOB_63B.WAV",
+	"AUDIO\\MOB_63C.WAV",
+	"AUDIO\\MOB_63D.WAV",
+	"AUDIO\\MOB_63E.WAV",
+	"AUDIO\\MOB_63F.WAV",
+	"AUDIO\\MOB_63G.WAV",
+	"AUDIO\\MOB_63H.WAV",
+	"AUDIO\\MOB_63I.WAV",
+	"AUDIO\\MOB_63J.WAV",
+	"AUDIO\\MOB_66A.WAV",
+	"AUDIO\\MOB_66B.WAV",
+	"AUDIO\\MOB_68A.WAV",
+	"AUDIO\\MOB_68B.WAV",
+	"AUDIO\\MOB_68C.WAV",
+	"AUDIO\\MOB_68D.WAV",
+	"AUDIO\\MOB_70A.WAV",
+	"AUDIO\\MOB_70B.WAV",
+	"AUDIO\\MOB_71A.WAV",
+	"AUDIO\\MOB_71B.WAV",
+	"AUDIO\\MOB_71C.WAV",
+	"AUDIO\\MOB_71D.WAV",
+	"AUDIO\\MOB_71E.WAV",
+	"AUDIO\\MOB_71F.WAV",
+	"AUDIO\\MOB_71G.WAV",
+	"AUDIO\\MOB_71H.WAV",
+	"AUDIO\\MOB_71I.WAV",
+	"AUDIO\\MOB_71J.WAV",
+	"AUDIO\\MOB_71K.WAV",
+	"AUDIO\\MOB_71L.WAV",
+	"AUDIO\\MOB_71M.WAV",
+	"AUDIO\\MOB_71N.WAV",
+	"AUDIO\\MOB_72A.WAV",
+	"AUDIO\\MOB_72B.WAV",
+	"AUDIO\\MOB_72C.WAV",
+	"AUDIO\\MOB_72D.WAV",
+	"AUDIO\\MOB_72E.WAV",
+	"AUDIO\\MOB_72F.WAV",
+	"AUDIO\\MOB_72G.WAV",
+	"AUDIO\\MOB_73A.WAV",
+	"AUDIO\\MOB_73C.WAV",
+	"AUDIO\\MOB_73D.WAV",
+	"AUDIO\\MOB_73F.WAV",
+	"AUDIO\\MOB_73G.WAV",
+	"AUDIO\\MOB_73I.WAV",
+	"AUDIO\\MOB_95A.WAV",
+	"AUDIO\\MOB_96A.WAV",
+	"AUDIO\\MOB_98A.WAV",
+	"AUDIO\\MOB_99A.WAV",
+	"AUDIO\\JOB1_1B.WAV",
+	"AUDIO\\JOB1_1C.WAV",
+	"AUDIO\\JOB1_1D.WAV",
+	"AUDIO\\JOB2_1B.WAV",
+	"AUDIO\\JOB2_2.WAV",
+	"AUDIO\\JOB2_3.WAV",
+	"AUDIO\\JOB2_4.WAV",
+	"AUDIO\\JOB2_5.WAV",
+	"AUDIO\\JOB2_6.WAV",
+	"AUDIO\\JOB2_7.WAV",
+	"AUDIO\\JOB2_8.WAV",
+	"AUDIO\\JOB2_9.WAV",
+	"AUDIO\\JOB3_1.WAV",
+	"AUDIO\\JOB3_2.WAV",
+	"AUDIO\\JOB3_3.WAV",
+	"AUDIO\\JOB4_1.WAV",
+	"AUDIO\\JOB4_2.WAV",
+	"AUDIO\\JOB4_3.WAV",
+	"AUDIO\\JOB5_1.WAV",
+	"AUDIO\\JOB5_2.WAV",
+	"AUDIO\\JOB5_3.WAV",
+	"AUDIO\\BJM1_20.WAV",
+	"AUDIO\\BJM1_4.WAV",
+	"AUDIO\\BJM1_5.WAV",
+	"AUDIO\\MERC_39.WAV",
+	"AUDIO\\MONO_1.WAV",
+	"AUDIO\\MONO_2.WAV",
+	"AUDIO\\MONO_3.WAV",
+	"AUDIO\\MONO_4.WAV",
+	"AUDIO\\MONO_5.WAV",
+	"AUDIO\\MONO_6.WAV",
+	"AUDIO\\MONO_7.WAV",
+	"AUDIO\\MONO_8.WAV",
+	"AUDIO\\MONO_9.WAV",
+	"AUDIO\\MONO10.WAV",
+	"AUDIO\\MONO11.WAV",
+	"AUDIO\\MONO12.WAV",
+	"AUDIO\\MONO13.WAV",
+	"AUDIO\\MONO14.WAV",
+	"AUDIO\\MONO15.WAV",
+	"AUDIO\\MONO16.WAV",
+	"AUDIO\\FUD_01.WAV",
+	"AUDIO\\FUD_02.WAV",
+	"AUDIO\\FUD_03.WAV",
+	"AUDIO\\FUD_04.WAV",
+	"AUDIO\\FUD_05.WAV",
+	"AUDIO\\FUD_06.WAV",
+	"AUDIO\\FUD_07.WAV",
+	"AUDIO\\FUD_08.WAV",
+	"AUDIO\\FUD_09.WAV",
+	"AUDIO\\FUD_10.WAV",
+	"AUDIO\\FUD_11.WAV",
+	"AUDIO\\FUD_12.WAV",
+	"AUDIO\\FUD_13.WAV",
+	"AUDIO\\FUD_14.WAV",
+	"AUDIO\\FUD_15.WAV",
+	"AUDIO\\FUD_16.WAV",
+	"AUDIO\\FUD_17.WAV",
+	"AUDIO\\FUD_18.WAV",
+	"AUDIO\\FUD_19.WAV",
+	"AUDIO\\FUD_20.WAV",
+	"AUDIO\\BURG_01.WAV",
+	"AUDIO\\BURG_02.WAV",
+	"AUDIO\\BURG_03.WAV",
+	"AUDIO\\BURG_04.WAV",
+	"AUDIO\\BURG_05.WAV",
+	"AUDIO\\BURG_06.WAV",
+	"AUDIO\\BURG_07.WAV",
+	"AUDIO\\BURG_08.WAV",
+	"AUDIO\\BURG_09.WAV",
+	"AUDIO\\BURG_10.WAV",
+	"AUDIO\\BURG_11.WAV",
+	"AUDIO\\BURG_12.WAV",
+	"AUDIO\\CRUST01.WAV",
+	"AUDIO\\CRUST02.WAV",
+	"AUDIO\\CRUST03.WAV",
+	"AUDIO\\CRUST04.WAV",
+	"AUDIO\\CRUST05.WAV",
+	"AUDIO\\CRUST06.WAV",
+	"AUDIO\\CRUST07.WAV",
+	"AUDIO\\CRUST08.WAV",
+	"AUDIO\\CRUST09.WAV",
+	"AUDIO\\BAND_01.WAV",
+	"AUDIO\\BAND_02.WAV",
+	"AUDIO\\BAND_03.WAV",
+	"AUDIO\\BAND_04.WAV",
+	"AUDIO\\BAND_05.WAV",
+	"AUDIO\\BAND_06.WAV",
+	"AUDIO\\BAND_07.WAV",
+	"AUDIO\\BAND_08.WAV",
+	"AUDIO\\SHAFT01.WAV",
+	"AUDIO\\SHAFT02.WAV",
+	"AUDIO\\SHAFT03.WAV",
+	"AUDIO\\SHAFT04.WAV",
+	"AUDIO\\SHAFT05.WAV",
+	"AUDIO\\SHAFT06.WAV",
+	"AUDIO\\SHAFT07.WAV",
+	"AUDIO\\SHAFT08.WAV",
+	"AUDIO\\PISS_01.WAV",
+	"AUDIO\\PISS_02.WAV",
+	"AUDIO\\PISS_03.WAV",
+	"AUDIO\\PISS_04.WAV",
+	"AUDIO\\PISS_05.WAV",
+	"AUDIO\\PISS_06.WAV",
+	"AUDIO\\PISS_07.WAV",
+	"AUDIO\\PISS_08.WAV",
+	"AUDIO\\PISS_09.WAV",
+	"AUDIO\\PISS_10.WAV",
+	"AUDIO\\PISS_11.WAV",
+	"AUDIO\\PISS_12.WAV",
+	"AUDIO\\PISS_13.WAV",
+	"AUDIO\\PISS_14.WAV",
+	"AUDIO\\PISS_15.WAV",
+	"AUDIO\\PISS_16.WAV",
+	"AUDIO\\PISS_17.WAV",
+	"AUDIO\\PISS_18.WAV",
+	"AUDIO\\PISS_19.WAV",
+	"AUDIO\\GIMME01.WAV",
+	"AUDIO\\GIMME02.WAV",
+	"AUDIO\\GIMME03.WAV",
+	"AUDIO\\GIMME04.WAV",
+	"AUDIO\\GIMME05.WAV",
+	"AUDIO\\GIMME06.WAV",
+	"AUDIO\\GIMME07.WAV",
+	"AUDIO\\GIMME08.WAV",
+	"AUDIO\\GIMME09.WAV",
+	"AUDIO\\GIMME10.WAV",
+	"AUDIO\\GIMME11.WAV",
+	"AUDIO\\GIMME12.WAV",
+	"AUDIO\\GIMME13.WAV",
+	"AUDIO\\GIMME14.WAV",
+	"AUDIO\\GIMME15.WAV",
+	"AUDIO\\BUST_01.WAV",
+	"AUDIO\\BUST_02.WAV",
+	"AUDIO\\BUST_03.WAV",
+	"AUDIO\\BUST_04.WAV",
+	"AUDIO\\BUST_05.WAV",
+	"AUDIO\\BUST_06.WAV",
+	"AUDIO\\BUST_07.WAV",
+	"AUDIO\\BUST_08.WAV",
+	"AUDIO\\BUST_09.WAV",
+	"AUDIO\\BUST_10.WAV",
+	"AUDIO\\BUST_11.WAV",
+	"AUDIO\\BUST_12.WAV",
+	"AUDIO\\BUST_13.WAV",
+	"AUDIO\\BUST_14.WAV",
+	"AUDIO\\BUST_15.WAV",
+	"AUDIO\\BUST_16.WAV",
+	"AUDIO\\BUST_17.WAV",
+	"AUDIO\\BUST_18.WAV",
+	"AUDIO\\BUST_19.WAV",
+	"AUDIO\\BUST_20.WAV",
+	"AUDIO\\BUST_21.WAV",
+	"AUDIO\\BUST_22.WAV",
+	"AUDIO\\BUST_23.WAV",
+	"AUDIO\\BUST_24.WAV",
+	"AUDIO\\BUST_25.WAV",
+	"AUDIO\\BUST_26.WAV",
+	"AUDIO\\BUST_27.WAV",
+	"AUDIO\\BUST_28.WAV",
+};
+#endif
+
 static char StreamedNameTable[][25] =
 {
 	"AUDIO\\WILD.ADF",
@@ -492,7 +1580,6 @@ static char StreamedNameTable[][25] =
 	"AUDIO\\MISCOM.MP3",
 	"AUDIO\\MISCOM.MP3",
 	"AUDIO\\MISCOM.MP3",
-#endif
 	"AUDIO\\MOBR1.WAV",
 	"AUDIO\\PAGER.WAV",
 	"AUDIO\\CARREV.WAV",
diff --git a/src/audio/sampman_miles.cpp b/src/audio/sampman_miles.cpp
index 49f2f10f..b77584d0 100644
--- a/src/audio/sampman_miles.cpp
+++ b/src/audio/sampman_miles.cpp
@@ -1061,10 +1061,20 @@ cSampleManager::Initialise(void)
 #endif
 			for ( int32 i = STREAMED_SOUND_MISSION_MOBR1; i < TOTAL_STREAMED_SOUNDS; i++ )
 			{
+#ifdef PS2_AUDIO_PATHS
 				strcpy(filepath, m_szCDRomRootPath);
-				strcat(filepath, StreamedNameTable[i]);
-				
+				strcat(filepath, PS2StreamedNameTable[i]);
+
 				mp3Stream[0] = AIL_open_stream(DIG, filepath, 0);
+
+				if ( !mp3Stream[0] )
+#endif
+				{
+					strcpy(filepath, m_szCDRomRootPath);
+					strcat(filepath, StreamedNameTable[i]);
+
+					mp3Stream[0] = AIL_open_stream(DIG, filepath, 0);
+				}
 				
 				if ( mp3Stream[0] )
 				{
@@ -1102,11 +1112,21 @@ cSampleManager::Initialise(void)
 
 				for (int32 i = 0; i < STREAMED_SOUND_MISSION_MOBR1; i++)
 				{
+#ifdef PS2_AUDIO_PATHS
 					strcpy(filepath, m_MP3FilesPath);
-					strcat(filepath, StreamedNameTable[i]);
+					strcat(filepath, PS2StreamedNameTable[i]);
 
 					mp3Stream[0] = AIL_open_stream(DIG, filepath, 0);
 
+					if ( !mp3Stream[0] )
+#endif
+					{
+						strcpy(filepath, m_MP3FilesPath);
+						strcat(filepath, StreamedNameTable[i]);
+
+						mp3Stream[0] = AIL_open_stream(DIG, filepath, 0);
+					}
+
 					if (mp3Stream[0])
 					{
 						AIL_stream_ms_position(mp3Stream[0], &tatalms, NULL);
@@ -1147,10 +1167,20 @@ cSampleManager::Initialise(void)
 #endif
 				for ( int32 i = STREAMED_SOUND_MISSION_COMPLETED4; i < STREAMED_SOUND_MISSION_PAGER; i++ )
 				{
+#ifdef PS2_AUDIO_PATHS
 					strcpy(filepath, m_MiscomPath);
-					strcat(filepath, StreamedNameTable[i]);
-					
+					strcat(filepath, PS2StreamedNameTable[i]);
+
 					mp3Stream[0] = AIL_open_stream(DIG, filepath, 0);
+
+					if ( !mp3Stream[0] )
+#endif
+					{
+						strcpy(filepath, m_MiscomPath);
+						strcat(filepath, StreamedNameTable[i]);
+					
+						mp3Stream[0] = AIL_open_stream(DIG, filepath, 0);
+					}
 					
 					if ( mp3Stream[0] )
 					{
@@ -2043,11 +2073,20 @@ cSampleManager::PreloadStreamedFile(uint32 nFile, uint8 nStream)
 			}
 			
 			char filepath[MAX_PATH];
-			
+#ifdef PS2_AUDIO_PATHS
 			strcpy(filepath, nFile < STREAMED_SOUND_MISSION_COMPLETED4 ? m_MP3FilesPath : (nFile < STREAMED_SOUND_MISSION_MOBR1 ? m_MiscomPath : m_WavFilesPath));
-			strcat(filepath, StreamedNameTable[nFile]);
-			
+			strcat(filepath, PS2StreamedNameTable[nFile]);
+
 			mp3Stream[nStream] = AIL_open_stream(DIG, filepath, 0);
+
+			if ( !mp3Stream[nStream] )
+#endif
+			{
+				strcpy(filepath, nFile < STREAMED_SOUND_MISSION_COMPLETED4 ? m_MP3FilesPath : (nFile < STREAMED_SOUND_MISSION_MOBR1 ? m_MiscomPath : m_WavFilesPath));
+				strcat(filepath, StreamedNameTable[nFile]);
+			
+				mp3Stream[nStream] = AIL_open_stream(DIG, filepath, 0);
+			}
 	
 			if ( mp3Stream[nStream] )
 			{
@@ -2109,10 +2148,20 @@ cSampleManager::StartStreamedFile(uint32 nFile, uint32 nPos, uint8 nStream)
 				// Try to continue from previous song, if already started
 				if(!_GetMP3PosFromStreamPos(&position, &e) && !e) {
 					nFile = 0;
+#ifdef PS2_AUDIO_PATHS
 					strcpy(filename, m_MiscomPath);
-					strcat(filename, StreamedNameTable[nFile]);
-					mp3Stream[nStream] =
-					    AIL_open_stream(DIG, filename, 0);
+					strcat(filename, PS2StreamedNameTable[nFile]);
+
+					mp3Stream[nStream] = AIL_open_stream(DIG, filename, 0);
+
+					if ( !mp3Stream[nStream] )
+#endif
+					{
+						strcpy(filename, m_MiscomPath);
+						strcat(filename, StreamedNameTable[nFile]);
+						mp3Stream[nStream] =
+						    AIL_open_stream(DIG, filename, 0);
+					}
 					if(mp3Stream[nStream]) {
 						AIL_set_stream_loop_count(mp3Stream[nStream], nStreamLoopedFlag[nStream] ? 0 : 1);
 						nStreamLoopedFlag[nStream] = TRUE;
@@ -2156,11 +2205,20 @@ cSampleManager::StartStreamedFile(uint32 nFile, uint32 nPos, uint8 nStream)
 					{
 						nFile = 0;
 						_bIsMp3Active = 0;
+#ifdef PS2_AUDIO_PATHS
 						strcpy(filename, m_MiscomPath);
-						strcat(filename, StreamedNameTable[nFile]);
+						strcat(filename, PS2StreamedNameTable[nFile]);
 
-						mp3Stream[nStream] =
-						    AIL_open_stream(DIG, filename, 0);
+						mp3Stream[nStream] = AIL_open_stream(DIG, filename, 0);
+
+						if ( !mp3Stream[nStream] )
+#endif
+						{
+							strcpy(filename, m_MiscomPath);
+							strcat(filename, StreamedNameTable[nFile]);
+							mp3Stream[nStream] =
+							    AIL_open_stream(DIG, filename, 0);
+						}
 						if(mp3Stream[nStream]) {
 							AIL_set_stream_loop_count(
 							    mp3Stream[nStream], nStreamLoopedFlag[nStream] ? 0 : 1);
@@ -2201,10 +2259,20 @@ cSampleManager::StartStreamedFile(uint32 nFile, uint32 nPos, uint8 nStream)
 		position = 0;
 		nFile = 0;
 	}
+#ifdef PS2_AUDIO_PATHS
 	strcpy(filename, m_MiscomPath);
-	strcat(filename, StreamedNameTable[nFile]);
-	
+	strcat(filename, PS2StreamedNameTable[nFile]);
+
 	mp3Stream[nStream] = AIL_open_stream(DIG, filename, 0);
+
+	if ( !mp3Stream[nStream] )
+#endif
+	{
+		strcpy(filename, m_MiscomPath);
+		strcat(filename, StreamedNameTable[nFile]);
+		mp3Stream[nStream] = AIL_open_stream(DIG, filename, 0);
+	}
+
 	if ( mp3Stream[nStream] )
 	{
 		AIL_set_stream_loop_count(mp3Stream[nStream], nStreamLoopedFlag[nStream] ? 0 : 1);
diff --git a/src/audio/sampman_oal.cpp b/src/audio/sampman_oal.cpp
index 6740f08f..73f6900b 100644
--- a/src/audio/sampman_oal.cpp
+++ b/src/audio/sampman_oal.cpp
@@ -920,7 +920,11 @@ cSampleManager::Initialise(void)
 
 		for ( int32 i = 0; i < TOTAL_STREAMED_SOUNDS; i++ )
 		{	
-			if ( aStream[0] && aStream[0]->Open(StreamedNameTable[i], IsThisTrackAt16KHz(i) ? 16000 : 32000) )
+			if ( aStream[0] && (
+#ifdef PS2_AUDIO_PATHS
+				aStream[0]->Open(PS2StreamedNameTable[i], IsThisTrackAt16KHz(i) ? 16000 : 32000) || 
+#endif
+				aStream[0]->Open(StreamedNameTable[i], IsThisTrackAt16KHz(i) ? 16000 : 32000)) )
 			{
 				uint32 tatalms = aStream[0]->GetLengthMS();
 				aStream[0]->Close();
@@ -1627,9 +1631,7 @@ cSampleManager::StopChannel(uint32 nChannel)
 
 void
 cSampleManager::PreloadStreamedFile(uint32 nFile, uint8 nStream)
-{
-	char filename[MAX_PATH];
-	
+{	
 	ASSERT( nStream < MAX_STREAMS );
 
 	if ( nFile < TOTAL_STREAMED_SOUNDS )
@@ -1637,10 +1639,10 @@ cSampleManager::PreloadStreamedFile(uint32 nFile, uint8 nStream)
 		CStream *stream = aStream[nStream];
 
 		stream->Close();
-
-		strcpy(filename, StreamedNameTable[nFile]);
-		
-		stream->Open(filename, IsThisTrackAt16KHz(nFile) ? 16000 : 32000);
+#ifdef PS2_AUDIO_PATHS
+		if(!stream->Open(PS2StreamedNameTable[nFile], IsThisTrackAt16KHz(nFile) ? 16000 : 32000))
+#endif
+			stream->Open(StreamedNameTable[nFile], IsThisTrackAt16KHz(nFile) ? 16000 : 32000);
 		if ( !stream->Setup() )
 		{
 			stream->Close();
@@ -1701,10 +1703,11 @@ cSampleManager::StartStreamedFile(uint32 nFile, uint32 nPos, uint8 nStream)
 				if(!_GetMP3PosFromStreamPos(&position, &e) && !e) {
 					nFile = 0;
 
-					strcpy(filename, StreamedNameTable[nFile]);
-
 					CStream *stream = aStream[nStream];
-					stream->Open(filename, IsThisTrackAt16KHz(nFile) ? 16000 : 32000);
+#ifdef PS2_AUDIO_PATHS
+					if(!stream->Open(PS2StreamedNameTable[nFile], IsThisTrackAt16KHz(nFile) ? 16000 : 32000))
+#endif
+						stream->Open(StreamedNameTable[nFile], IsThisTrackAt16KHz(nFile) ? 16000 : 32000);
 					if ( stream->Setup() ) {
 						stream->SetLoopCount(nStreamLoopedFlag[nStream] ? 0 : 1);
 						nStreamLoopedFlag[nStream] = TRUE;
@@ -1756,10 +1759,12 @@ cSampleManager::StartStreamedFile(uint32 nFile, uint32 nPos, uint8 nStream)
 					{
 						nFile = 0;
 						_bIsMp3Active = 0;
-						strcpy(filename, StreamedNameTable[nFile]);
 
-						CStream* stream = aStream[nStream];
-						stream->Open(filename, IsThisTrackAt16KHz(nFile) ? 16000 : 32000);
+						CStream *stream = aStream[nStream];
+#ifdef PS2_AUDIO_PATHS
+						if(!stream->Open(PS2StreamedNameTable[nFile], IsThisTrackAt16KHz(nFile) ? 16000 : 32000))
+#endif
+							stream->Open(StreamedNameTable[nFile], IsThisTrackAt16KHz(nFile) ? 16000 : 32000);
 
 						if (stream->Setup()) {
 							stream->SetLoopCount(nStreamLoopedFlag[nStream] ? 0 : 1);
@@ -1806,7 +1811,10 @@ cSampleManager::StartStreamedFile(uint32 nFile, uint32 nPos, uint8 nStream)
 	
 	CStream *stream = aStream[nStream];
 
-	aStream[nStream]->Open(filename, IsThisTrackAt16KHz(nFile) ? 16000 : 32000);
+#ifdef PS2_AUDIO_PATHS
+	if(!stream->Open(PS2StreamedNameTable[nFile], IsThisTrackAt16KHz(nFile) ? 16000 : 32000))
+#endif
+		stream->Open(StreamedNameTable[nFile], IsThisTrackAt16KHz(nFile) ? 16000 : 32000);
 	
 	if ( stream->Setup() ) {
 		stream->SetLoopCount(nStreamLoopedFlag[nStream] ? 0 : 1);
diff --git a/src/core/Fire.cpp b/src/core/Fire.cpp
index 8a6db0da..57315b15 100644
--- a/src/core/Fire.cpp
+++ b/src/core/Fire.cpp
@@ -457,7 +457,7 @@ CFireManager::StartScriptFire(const CVector &pos, CEntity *target, float strengt
 	if (target) {
 		if (target->IsPed()) {
 			ped->m_pFire = fire;
-			if (target != (CVehicle *)FindPlayerPed()) {
+			if (target != FindPlayerPed()) {
 				CVector2D pos = target->GetPosition();
 				ped->SetFlee(pos, 10000);
 				ped->SetMoveAnim();
diff --git a/src/core/config.h b/src/core/config.h
index c7d01861..307f55d3 100644
--- a/src/core/config.h
+++ b/src/core/config.h
@@ -1,7 +1,9 @@
 #pragma once
 
-// disables (most) stuff that wasn't in original gta-vc.exe - check section at the bottom of this file
-//#define VANILLA_DEFINES
+// disables (most) stuff that wasn't in original gta-vc.exe
+#ifdef __MWERKS__
+#define VANILLA_DEFINES
+#endif
 
 enum Config {
 	NUMPLAYERS = 1,
@@ -154,8 +156,33 @@ enum Config {
 //#define GTA_PS2
 //#define GTA_XBOX
 
-// This enables things from the PS2 version on PC
-#define GTA_PS2_STUFF
+// Version defines
+#define GTAVC_PS2	400
+#define GTAVC_PC_10	410
+#define GTAVC_PC_11	411
+#define GTAVC_PC_JAP	412
+// TODO? maybe something for xbox or android?
+
+#define GTA_VERSION	GTAVC_PC_11
+
+// TODO(MIAMI): someone ought to find and check out uses of these defines:
+//#define GTA3_STEAM_PATCH
+//#define GTAVC_JP_PATCH
+
+#if defined GTA_PS2
+#	define GTA_PS2_STUFF
+#	define RANDOMSPLASH
+//#	define USE_CUSTOM_ALLOCATOR
+#	define VU_COLLISION
+#	define PS2_MENU
+#elif defined GTA_PC
+#	define PC_PLAYER_CONTROLS	// mouse player/cam mode
+#	define GTA_REPLAY
+#	define GTA_SCENE_EDIT
+#	define PC_MENU
+#	define PC_WATER
+#elif defined GTA_XBOX
+#endif
 
 // This is enabled for all released games.
 // any debug stuff that isn't left in any game is not in FINAL
@@ -174,22 +201,28 @@ enum Config {
 #define FINAL
 #endif
 
-// Version defines
-#define GTAVC_PS2	400
-#define GTAVC_PC_10	410
-#define GTAVC_PC_11	411
-#define GTAVC_PC_JAP	412
-// TODO? maybe something for xbox or android?
+// these are placed here to work with VANILLA_DEFINES for compatibility
+#define NO_CDCHECK // skip audio CD check
+#define DEFAULT_NATIVE_RESOLUTION // Set default video mode to your native resolution (fixes Windows 10 launch)
 
-#define GTA_VERSION	GTAVC_PC_11
+#ifdef VANILLA_DEFINES
+#if !defined(_WIN32) || defined(__LP64__) || defined(_WIN64)
+#error Vanilla can only be built for win-x86
+#endif
 
-// TODO(MIAMI): someone ought to find and check out uses of these defines:
-//#define GTA3_STEAM_PATCH
-//#define GTAVC_JP_PATCH
+#define FINAL
+#define MASTER
+//#define USE_MY_DOCUMENTS
+#define THIS_IS_STUPID
+#define DONT_FIX_REPLAY_BUGS
+#define USE_TXD_CDIMAGE // generate and load textures from txd.img
+//#define USE_TEXTURE_POOL // not possible because R* used custom RW33
+#else
+// This enables things from the PS2 version on PC
+#define GTA_PS2_STUFF
 
 // quality of life fixes that should also be in FINAL
 #define NASTY_GAME	// nasty game for all languages
-#define NO_CDCHECK
 
 // those infamous texts
 #define DRAW_GAME_VERSION_TEXT
@@ -204,21 +237,10 @@ enum Config {
 //#define COMPRESSED_COL_VECTORS	// use compressed vectors for collision vertices
 //#define ANIM_COMPRESSION	// only keep most recently used anims uncompressed
 
-#if defined GTA_PS2
-#	define GTA_PS2_STUFF
-#	define RANDOMSPLASH
-//#	define USE_CUSTOM_ALLOCATOR
-#	define VU_COLLISION
-#elif defined GTA_PC
-#	ifdef GTA_PS2_STUFF
-#		define USE_PS2_RAND
-#		define RANDOMSPLASH	// use random splash as on PS2
-#		define PS2_MATFX
-#	endif
-#	define PC_PLAYER_CONTROLS	// mouse player/cam mode
-#	define GTA_REPLAY
-#	define GTA_SCENE_EDIT
-#elif defined GTA_XBOX
+#if defined GTA_PC && defined GTA_PS2_STUFF
+#	define USE_PS2_RAND
+#	define RANDOMSPLASH	// use random splash as on PS2
+#	define PS2_MATFX
 #endif
 
 #ifdef VU_COLLISION
@@ -258,7 +280,7 @@ enum Config {
 
 #define ASCII_STRCMP // use faster ascii str comparisons
 
-#if !defined _WIN32 || defined __MWERKS__ || defined __MINGW32__ || defined VANILLA_DEFINES
+#if !defined _WIN32 || defined __MINGW32__
 #undef ASCII_STRCMP
 #endif
 
@@ -293,11 +315,11 @@ enum Config {
 #endif
 
 // Water & Particle
-// #define PC_WATER
+#undef PC_WATER
 #define WATER_CHEATS
 
-//#define USE_CUTSCENE_SHADOW_FOR_PED
-#define DISABLE_CUTSCENE_SHADOWS
+//#define USE_CUTSCENE_SHADOW_FOR_PED // requires COMPATIBLE_SAVES
+//#define DISABLE_CUTSCENE_SHADOWS
 
 // Pad
 #if !defined(RW_GL3) && defined(_WIN32)
@@ -397,7 +419,7 @@ static_assert(false, "SUPPORT_XBOX_SCRIPT and SUPPORT_MOBILE_SCRIPT are mutually
 #define RADIO_SCROLL_TO_PREV_STATION // Won't work without FIX_BUGS
 #define AUDIO_CACHE // cache sound lengths to speed up the cold boot
 #define PS2_AUDIO_CHANNELS // increases the maximum number of audio channels to PS2 value of 43 (PC has 28 originally)
-//#define PS2_AUDIO_PATHS // changes audio paths for cutscenes and radio to PS2 paths (needs vbdec on MSS builds)
+#define PS2_AUDIO_PATHS // changes audio paths for cutscenes and radio to PS2 paths (needs vbdec on MSS builds)
 //#define AUDIO_OAL_USE_SNDFILE // use libsndfile to decode WAVs instead of our internal decoder
 #define AUDIO_OAL_USE_MPG123 // use mpg123 to support mp3 files
 #define MULTITHREADED_AUDIO // for streams. requires C++11 or later
@@ -429,98 +451,9 @@ static_assert(false, "SUPPORT_XBOX_SCRIPT and SUPPORT_MOBILE_SCRIPT are mutually
 	#undef PS2_AUDIO_CHANNELS
 #endif
 
-// -------
-
-#if defined __MWERKS__ || defined VANILLA_DEFINES
-#define FINAL
-#undef CHATTYSPLASH
-#undef TIMEBARS
-
-#define MASTER
-#undef VALIDATE_SAVE_SIZE
-#undef NO_MOVIES
-#undef DEBUGMENU
-
-#undef DRAW_GAME_VERSION_TEXT
-
-//#undef NASTY_GAME
-//#undef NO_CDCHECK
-
-#undef GTA_PS2_STUFF
-#undef USE_PS2_RAND
-#undef RANDOMSPLASH
-#undef PS2_MATFX
-
-#undef FIX_BUGS
-#define THIS_IS_STUPID
-#undef MORE_LANGUAGES
-#undef COMPATIBLE_SAVES
-#undef FIX_INCOMPATIBLE_SAVES
-#undef LOAD_INI_SETTINGS
-
-#undef ASPECT_RATIO_SCALE
-#undef PROPER_SCALING
-//#undef DEFAULT_NATIVE_RESOLUTION
-#undef PS2_ALPHA_TEST
-#undef IMPROVED_VIDEOMODE
-#undef DISABLE_LOADING_SCREEN
-#undef DISABLE_VSYNC_ON_TEXTURE_CONVERSION
-
-#undef EXTENDED_COLOURFILTER
-#undef EXTENDED_PIPELINES
-#undef SCREEN_DROPLETS
-#undef NEW_RENDERER
-
-#undef FIX_SPRITES
-
-#define PC_WATER
-#undef WATER_CHEATS
-
+// if these defines are enabled saves are not vanilla compatible without COMPATIBLE_SAVES
+#ifndef COMPATIBLE_SAVES
 #undef USE_CUTSCENE_SHADOW_FOR_PED
-#undef DISABLE_CUTSCENE_SHADOWS
-
-#undef XINPUT
-#undef DETECT_PAD_INPUT_SWITCH
-#undef KANGAROO_CHEAT
-#undef RESTORE_ALLCARSHELI_CHEAT
-#undef BETTER_ALLCARSAREDODO_CHEAT
-#undef WALLCLIMB_CHEAT
-#undef REGISTER_START_BUTTON
-#undef BIND_VEHICLE_FIREWEAPON
-#undef BUTTON_ICONS
-
-#undef FIX_RADAR
-#undef RADIO_OFF_TEXT
-
-#undef MAP_ENHANCEMENTS
-#undef GAMEPAD_MENU
-#undef MUCH_SHORTER_OUTRO_SCREEN
-#undef CUSTOM_FRONTEND_OPTIONS
-
-#undef GRAPHICS_MENU_OPTIONS
-#undef NO_ISLAND_LOADING
-#undef CUTSCENE_BORDERS_SWITCH
-#undef MULTISAMPLING
-#undef INVERT_LOOK_FOR_PAD
-
-#undef USE_DEBUG_SCRIPT_LOADER
-#undef USE_MEASUREMENTS_IN_METERS
-#undef USE_PRECISE_MEASUREMENT_CONVERTION
-#undef SUPPORT_JAPANESE_SCRIPT
-#undef MISSION_REPLAY
-#undef USE_ADVANCED_SCRIPT_DEBUG_OUTPUT
-#undef USE_BASIC_SCRIPT_DEBUG_OUTPUT
-
-#define DONT_FIX_REPLAY_BUGS
-
-#undef EXPLODING_AIRTRAIN
-#undef CPLANE_ROTORS
-#undef CAMERA_PICKUP
-#undef CANCELLABLE_CAR_ENTER
-#undef IMPROVED_CAMERA
-#undef FREE_CAM
-#undef BIG_IMG
-#undef PS2_AUDIO_CHANNELS
-#undef MULTITHREADED_AUDIO
-#undef RADIO_SCROLL_TO_PREV_STATION
 #endif
+
+#endif // VANILLA_DEFINES
diff --git a/src/peds/Ped.cpp b/src/peds/Ped.cpp
index 7fe2520d..cad10d8a 100644
--- a/src/peds/Ped.cpp
+++ b/src/peds/Ped.cpp
@@ -421,6 +421,7 @@ CPed::~CPed(void)
 					nearPed->m_nearPeds[k] = nearPed->m_nearPeds[k + 1];
 					nearPed->m_nearPeds[k + 1] = nil;
 				}
+				nearPed->m_nearPeds[ARRAY_SIZE(m_nearPeds) - 1] = nil;
 				nearPed->m_numNearPeds--;
 			} else
 				j++;
diff --git a/src/save/GenericGameStorage.cpp b/src/save/GenericGameStorage.cpp
index 12565e3f..d080512e 100644
--- a/src/save/GenericGameStorage.cpp
+++ b/src/save/GenericGameStorage.cpp
@@ -828,6 +828,13 @@ FixGarages(uint8 save_type, uint8 *buf, uint8 *buf2, uint32 *size)
 
 		SkipBuf(buf2, sizeof(CStoredCar));
 	}
+
+	*size = 0;
+
+	assert(buf - buf_start == read);
+	assert(buf2 - buf2_start == written);
+
+	*size = 7876;
 }
 
 static void