From 13c258ad874cf338c88eee990ecc39d4708458c8 Mon Sep 17 00:00:00 2001 From: NovaBot <154629622+NovaBot13@users.noreply.github.com> Date: Sun, 21 Apr 2024 20:32:24 -0400 Subject: [PATCH] [MIRROR] Update highest available sound channel (#2124) * Update highest available sound channel * Update sound.dm --------- Co-authored-by: larentoun <31931237+larentoun@users.noreply.github.com> Co-authored-by: Mal <13398309+vinylspiders@users.noreply.github.com> --- code/__DEFINES/sound.dm | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/code/__DEFINES/sound.dm b/code/__DEFINES/sound.dm index dc9a0926ef5..fe002fef14f 100644 --- a/code/__DEFINES/sound.dm +++ b/code/__DEFINES/sound.dm @@ -2,7 +2,7 @@ #define CHANNEL_LOBBYMUSIC 1024 #define CHANNEL_ADMIN 1023 #define CHANNEL_VOX 1022 -#define CHANNEL_JUKEBOX 1011 // NOVA EDIT - JUKEBOX - ORIGINAL: #define CHANNEL_JUKEBOX 1021 +#define CHANNEL_JUKEBOX 1021 #define CHANNEL_HEARTBEAT 1020 //sound channel for heartbeats #define CHANNEL_BOSS_MUSIC 1019 #define CHANNEL_AMBIENCE 1018 @@ -10,6 +10,11 @@ #define CHANNEL_TRAITOR 1016 #define CHANNEL_CHARGED_SPELL 1015 #define CHANNEL_ELEVATOR 1014 +//THIS SHOULD ALWAYS BE THE LOWEST ONE! +//KEEP IT UPDATED +#define CHANNEL_HIGHEST_AVAILABLE 1013 + +#define MAX_INSTRUMENT_CHANNELS (128 * 6) // NOVA EDIT START - JUKEBOX #define CHANNEL_JUKEBOX_START 1006 @@ -28,13 +33,6 @@ ///The default exponent of sound falloff #define SOUND_FALLOFF_EXPONENT 6 -//THIS SHOULD ALWAYS BE THE LOWEST ONE! -//KEEP IT UPDATED - -#define CHANNEL_HIGHEST_AVAILABLE 1005 //NOVA EDIT CHANGE - JUKEBOX > ORIGINAL VALUE 1015 - -#define MAX_INSTRUMENT_CHANNELS (128 * 6) - #define SOUND_MINIMUM_PRESSURE 10 #define INTERACTION_SOUND_RANGE_MODIFIER -3