From f90044d343ff97ca54c09e9f5360eba87744b613 Mon Sep 17 00:00:00 2001 From: rubidium Date: Sat, 5 Mar 2011 18:00:48 +0000 Subject: (svn r22202) -Codechange: make MusicFileSettings a proper citizen of the client settings --- src/settings_type.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'src/settings_type.h') diff --git a/src/settings_type.h b/src/settings_type.h index 2556aaf54..3b8b3242c 100644 --- a/src/settings_type.h +++ b/src/settings_type.h @@ -136,6 +136,17 @@ struct GUISettings { } }; +/** Settings related to music. */ +struct MusicSettings { + byte playlist; ///< The playlist (number) to play + byte music_vol; ///< The requested music volume + byte effect_vol; ///< The requested effects volume + byte custom_1[33]; ///< The order of the first custom playlist + byte custom_2[33]; ///< The order of the second custom playlist + bool playing; ///< Whether music is playing + bool shuffle; ///< Whether to shuffle the music +}; + /** Settings related to currency/unit systems. */ struct LocaleSettings { byte currency; ///< currency we currently use @@ -441,6 +452,7 @@ struct ClientSettings { GUISettings gui; ///< settings related to the GUI NetworkSettings network; ///< settings related to the network CompanySettings company; ///< default values for per-company settings + MusicSettings music; ///< settings related to music/sound }; /** The current settings for this game. */ -- cgit v1.2.3-54-g00ecf