From a37a08b60185e4120bd035214c9b678107dbfd90 Mon Sep 17 00:00:00 2001 From: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> Date: Wed, 24 Feb 2021 13:08:12 +0000 Subject: [PATCH] Reverb preference --- code/__DEFINES/preferences.dm | 4 +++- code/game/sound.dm | 6 ++++-- code/modules/client/preference/preferences_toggles.dm | 8 ++++++++ 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/code/__DEFINES/preferences.dm b/code/__DEFINES/preferences.dm index 74bbe68d566..878dab544d9 100644 --- a/code/__DEFINES/preferences.dm +++ b/code/__DEFINES/preferences.dm @@ -52,8 +52,10 @@ #define PREFTOGGLE_2_RUNECHAT 64 #define PREFTOGGLE_2_DEATHMESSAGE 128 #define PREFTOGGLE_2_EMOTE_BUBBLE 256 +// Yes I know this being an "enable to disable" is misleading, but it avoids having to tweak all existing pref entries +#define PREFTOGGLE_2_REVERB_DISABLE 512 -#define TOGGLES_2_TOTAL 511 // If you add or remove a preference toggle above, make sure you update this define with the total value of the toggles combined. +#define TOGGLES_2_TOTAL 1023 // If you add or remove a preference toggle above, make sure you update this define with the total value of the toggles combined. #define TOGGLES_2_DEFAULT (PREFTOGGLE_2_FANCYUI|PREFTOGGLE_2_ITEMATTACK|PREFTOGGLE_2_WINDOWFLASHING|PREFTOGGLE_2_RUNECHAT|PREFTOGGLE_2_DEATHMESSAGE|PREFTOGGLE_2_EMOTE_BUBBLE) diff --git a/code/game/sound.dm b/code/game/sound.dm index dbd8022c2b8..c2dfa3bb5b6 100644 --- a/code/game/sound.dm +++ b/code/game/sound.dm @@ -125,8 +125,10 @@ S.environment = A.sound_environment if(use_reverb && S.environment != SOUND_ENVIRONMENT_NONE) //We have reverb, reset our echo setting - S.echo[3] = 0 //Room setting, 0 means normal reverb - S.echo[4] = 0 //RoomHF setting, 0 means normal reverb. + // Check that the user has reverb enabled in their prefs + if(!(client?.prefs?.toggles2 & PREFTOGGLE_2_REVERB_DISABLE)) + S.echo[3] = 0 //Room setting, 0 means normal reverb + S.echo[4] = 0 //RoomHF setting, 0 means normal reverb. SEND_SOUND(src, S) diff --git a/code/modules/client/preference/preferences_toggles.dm b/code/modules/client/preference/preferences_toggles.dm index 054fd5ccd39..eb2cc451e5d 100644 --- a/code/modules/client/preference/preferences_toggles.dm +++ b/code/modules/client/preference/preferences_toggles.dm @@ -331,3 +331,11 @@ prefs.toggles2 ^= PREFTOGGLE_2_DEATHMESSAGE prefs.save_preferences(src) to_chat(src, "You will [(prefs.toggles2 & PREFTOGGLE_2_DEATHMESSAGE) ? "now" : "no longer"] see a notification in deadchat when a player dies.") + +/client/verb/toggle_reverb() + set name = "Enable/Disable Reverb" + set category = "Preferences" + set desc = "Toggle ingame reverb effects" + prefs.toggles2 ^= PREFTOGGLE_2_REVERB_DISABLE + prefs.save_preferences(src) + to_chat(src, "You will [(prefs.toggles2 & PREFTOGGLE_2_REVERB_DISABLE) ? "no longer" : "now"] get reverb on ingame sounds.")