dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into jgrpp

Browse Source 
Remove 'byte' typedef
This commit is contained in:
Jonathan G Rennison
2024-05-07 17:21:50 +01:00
parent f1c0f864f5 6c5a8f55df
commit 18a42664fc
376 changed files with 2220 additions and 2152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/settings_type.h
View File

@@ -368,11 +368,11 @@ struct SoundSettings {
/** 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
uint8_t playlist; ///< The playlist (number) to play
uint8_t music_vol; ///< The requested music volume
uint8_t effect_vol; ///< The requested effects volume
uint8_t custom_1[33]; ///< The order of the first custom playlist
uint8_t custom_2[33]; ///< The order of the second custom playlist
bool playing; ///< Whether music is playing
bool shuffle; ///< Whether to shuffle the music
};