summaryrefslogtreecommitdiffstats
path: root/src/audio/sampman.h
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2021-01-07 21:01:44 +0100
committerSergeanur <s.anureev@yandex.ua>2021-01-07 21:01:44 +0100
commit6b0fa20b8b40b7211b18129ebad108f314a0d5e0 (patch)
treefd182df7fd7ffb931823256c256e0bf492f44824 /src/audio/sampman.h
parentFix pickup text (diff)
downloadre3-6b0fa20b8b40b7211b18129ebad108f314a0d5e0.tar
re3-6b0fa20b8b40b7211b18129ebad108f314a0d5e0.tar.gz
re3-6b0fa20b8b40b7211b18129ebad108f314a0d5e0.tar.bz2
re3-6b0fa20b8b40b7211b18129ebad108f314a0d5e0.tar.lz
re3-6b0fa20b8b40b7211b18129ebad108f314a0d5e0.tar.xz
re3-6b0fa20b8b40b7211b18129ebad108f314a0d5e0.tar.zst
re3-6b0fa20b8b40b7211b18129ebad108f314a0d5e0.zip
Diffstat (limited to '')
-rw-r--r--src/audio/sampman.h8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/audio/sampman.h b/src/audio/sampman.h
index d3e4415f..2db29244 100644
--- a/src/audio/sampman.h
+++ b/src/audio/sampman.h
@@ -240,7 +240,7 @@ public:
extern cSampleManager SampleManager;
extern uint32 BankStartOffset[MAX_SFX_BANKS];
-#ifdef AUDIO_OPUS
+#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",
@@ -275,8 +275,7 @@ static char StreamedNameTable[][25] = {
"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"};
-#else
-#ifdef PS2_AUDIO
+#elif defined(PS2_AUDIO_PATHS)
static char StreamedNameTable[][40] =
{
"AUDIO\\MUSIC\\WILD.VB",
@@ -1610,5 +1609,4 @@ static char StreamedNameTable[][25] =
"AUDIO\\BUST_26.WAV",
"AUDIO\\BUST_27.WAV",
"AUDIO\\BUST_28.WAV",
-};
-#endif \ No newline at end of file
+}; \ No newline at end of file