From 7e0b2be0516dce9fea768c64f5e6e2e39c268863 Mon Sep 17 00:00:00 2001 From: Cmdr-Thrawn Date: Sat, 25 Apr 2015 06:10:53 -0500 Subject: [PATCH] Changes to sound muting menus * Fixed completely broken hitsound mute toggle * Moved bullet sound toggles into appropriate menu * Changed heartbeat toggle to use muteitem (for consistency) * Fixed footsteps toggle (Previous behavior was to turn off all footstep sounds, a toggle already existing elsewhere, rather than muting the specific sound as it's intended to) * Sorted sound menu (At grenadier's request) --- config/menus_settings.cfg | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/config/menus_settings.cfg b/config/menus_settings.cfg index 88b4b375..fc3710eb 100644 --- a/config/menus_settings.cfg +++ b/config/menus_settings.cfg @@ -529,12 +529,13 @@ menuitem [] -1 menuitem [Mute/Un-mute specific sounds...] [ showmenu [Mute specific sounds] ] menuitem [] -1 menuitem [Advanced settings:] -1 -menuitemcheckbox [ Footsteps: ] "$footsteps" [ footsteps $arg1 ] -menuitemcheckbox [ Disable own footsteps: ] "(= $localfootsteps)" [ localfootsteps (! $arg1) ] menuitemslider [ Sounds at once: ] 0 100 "$maxsoundsatonce" 2 [] [ maxsoundsatonce $arg1 ] menuitemslider [ Voice-coms: ] 0 2 "$voicecomsounds" 1 [Off On "Team only"] [ voicecomsounds $arg1 ] -menuitemslider [ Heartbeat: ] 0 99 "$heartbeat" 5 [] [ heartbeat $arg1 ] - +menuitemslider [ Heartbeat: ] 0 99 "$heartbeat" 5 [] [ heartbeat $arg1 ] +menuitemcheckbox [ Footsteps: ] "$footsteps" [ footsteps $arg1 ] +menuitemcheckbox [ Disable own footsteps: ] "(= $localfootsteps)" [ localfootsteps (! $arg1) ] +menuitemcheckbox [ Bullet hit: ] "$bulletbouncesound" [ bulletbouncesound $arg1 ] +menuitemcheckbox [ Bullet near-miss: ] "$bulletairsound" [ bulletairsound $arg1 ] const muteitem [ menuitemcheckbox (concatword $arg1 [: ]) (concat ! "(soundmuted" $arg2 ")") (concat mutesound $arg2 "$arg1") ] @@ -548,7 +549,7 @@ menuitem [Movement sounds] [ showmenu [Mute movement sounds] ] menuitem [Voice-com sounds] [ showmenu [Mute voice-coms] ] menuitem [Other sounds] [ showmenu [Mute other sounds] ] menuitem [] -1 -menuitem [Un-mute all sounds...] [ unmuteallsounds; heartbeat $oldheartbeat ] +menuitem [Un-mute all sounds...] [ unmuteallsounds ] newmenu [Mute weapon sounds] @@ -582,8 +583,6 @@ muteitem [Akimbo pickup] 23 muteitem [Akimbo finished] 25 muteitem [Helmet pickup] 99 -oldheartbeat = 0 - newmenu [Mute pain/death sounds] muteitem [Pain 1] 26 @@ -596,11 +595,11 @@ muteitem [Die 1] 32 muteitem [Die 2] 33 muteitem [Gib sounds] 48 muteitem [Tinnitus] 62 -menuitemcheckbox [Heartbeat] "$heartbeat" [ if (! $arg1) [ oldheartbeat = $heartbeat; heartbeat 0 ] [ heartbeat $oldheartbeat ] ] +muteitem [Heartbeat] 100 newmenu [Mute movement sounds] -menuitemcheckbox [Footsteps: ] "$footsteps" [ footsteps $arg1 ] +muteitem [Footsteps] 53 muteitem [Crouch] 54 muteitem [Water footsteps] 55 muteitem [Water crouching] 56 @@ -620,9 +619,7 @@ muteitem [Ricochet air 2] 4 muteitem [Ricochet hit] 5 muteitem [Bullet (water impact)] 6 muteitem [Grenade explosion] 34 -menuitemcheckbox [Bullet hit: ] "$bulletbouncesound" [ bulletbouncesound $arg1 ] -menuitemcheckbox [Bullet near-miss: ] "$bulletairsound" [ bulletairsound $arg1 ] -muteitem [HitSound: ] "(! $hitsound)" [ hitsound (! $hitsound) ] +muteitem [Hit sound] 47 newmenu [Mute other sounds]