From 01608baeb6ba740693b0ee6d0c02cbabd512ea29 Mon Sep 17 00:00:00 2001 From: Hielke Morsink Date: Fri, 17 Aug 2018 22:02:36 +0200 Subject: [PATCH] Draw sound effects and music checkboxes as disabled when appropirate --- data/language/en-GB.txt | 2 +- src/openrct2-ui/windows/Options.cpp | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/data/language/en-GB.txt b/data/language/en-GB.txt index b538e1454a..d4e341f003 100644 --- a/data/language/en-GB.txt +++ b/data/language/en-GB.txt @@ -1149,7 +1149,7 @@ STR_1770 :{SMALLFONT}{BLACK}Number of complete swings STR_1771 :{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{COMMA16} STR_1773 :Only one on-ride photo section allowed per ride STR_1774 :Only one cable lift hill allowed per ride -STR_1777 :{WINDOW_COLOUR_2}Ride music +STR_1777 :Ride music STR_1778 :{STRINGID} - - STR_1779 :{INLINE_SPRITE}{254}{19}{00}{00} Panda costume STR_1780 :{INLINE_SPRITE}{255}{19}{00}{00} Tiger costume diff --git a/src/openrct2-ui/windows/Options.cpp b/src/openrct2-ui/windows/Options.cpp index 0fab6ff8b2..6b3199e510 100644 --- a/src/openrct2-ui/windows/Options.cpp +++ b/src/openrct2-ui/windows/Options.cpp @@ -1808,6 +1808,8 @@ static void window_options_invalidate(rct_window* w) widget_set_checkbox_value(w, WIDX_MASTER_SOUND_CHECKBOX, gConfigSound.master_sound_enabled); widget_set_checkbox_value(w, WIDX_MUSIC_CHECKBOX, gConfigSound.ride_music_enabled); widget_set_checkbox_value(w, WIDX_AUDIO_FOCUS_CHECKBOX, gConfigSound.audio_focus); + widget_set_enabled(w, WIDX_SOUND_CHECKBOX, gConfigSound.master_sound_enabled); + widget_set_enabled(w, WIDX_MUSIC_CHECKBOX, gConfigSound.master_sound_enabled); // Initialize only on first frame, otherwise the scrollbars wont be able to be modified if (w->frame_no == 0)