(svn r22202) -Codechange: make MusicFileSettings a proper citizen of the client settings

This commit is contained in:
rubidium
2011-03-05 18:00:48 +00:00
parent ec798d27df
commit 2e5b1f178e
14 changed files with 109 additions and 149 deletions

View File

@@ -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. */