From f90044d343ff97ca54c09e9f5360eba87744b613 Mon Sep 17 00:00:00 2001
From: rubidium <rubidium@openttd.org>
Date: Sat, 5 Mar 2011 18:00:48 +0000
Subject: (svn r22202) -Codechange: make MusicFileSettings a proper citizen of
 the client settings

---
 src/table/settings.ini | 58 +++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 53 insertions(+), 5 deletions(-)

(limited to 'src/table/settings.ini')

diff --git a/src/table/settings.ini b/src/table/settings.ini
index 8d97878a9..b921b4b1e 100644
--- a/src/table/settings.ini
+++ b/src/table/settings.ini
@@ -15,14 +15,13 @@ const SettingDesc _settings[] = {
 SDTG_BOOL  =  SDTG_BOOL($name,              $flags, $guiflags, $var, $def,                        $str, $proc, $from, $to),
 SDTG_VAR   =   SDTG_VAR($name,       $type, $flags, $guiflags, $var, $def, $min, $max, $interval, $str, $proc, $from, $to),
 SDTC_BOOL  =  SDTC_BOOL(       $var,        $flags, $guiflags, $def,                              $str, $proc, $from, $to),
-SDT_BOOL   =   SDT_BOOL($base, $var,        $flags, $guiflags, $def,                              $str, $proc, $from, $to),
-SDTC_DBOOL =  SDTC_BOOL(       $var,        $flags, $guiflags, $def,                              $str, $proc, $from, $to),
-SDT_DBOOL  =   SDT_BOOL($base, $var,        $flags, $guiflags, $def,                              $str, $proc, $from, $to),
+SDTC_LIST  =  SDTC_LIST(       $var, $type, $flags, $guiflags, $def,                              $str, $proc, $from, $to),
 SDTC_OMANY = SDTC_OMANY(       $var, $type, $flags, $guiflags, $def,             $max, $full,     $str, $proc, $from, $to),
-SDT_OMANY  =  SDT_OMANY($base, $var, $type, $flags, $guiflags, $def,             $max, $full,     $str, $proc, $from, $to, $load),
-SDT_STR    =    SDT_STR($base, $var, $type, $flags, $guiflags, $def,                              $str, $proc, $from, $to),
 SDTC_STR   =   SDTC_STR(       $var, $type, $flags, $guiflags, $def,                              $str, $proc, $from, $to),
 SDTC_VAR   =   SDTC_VAR(       $var, $type, $flags, $guiflags, $def,       $min, $max, $interval, $str, $proc, $from, $to),
+SDT_BOOL   =   SDT_BOOL($base, $var,        $flags, $guiflags, $def,                              $str, $proc, $from, $to),
+SDT_OMANY  =  SDT_OMANY($base, $var, $type, $flags, $guiflags, $def,             $max, $full,     $str, $proc, $from, $to, $load),
+SDT_STR    =    SDT_STR($base, $var, $type, $flags, $guiflags, $def,                              $str, $proc, $from, $to),
 SDT_VAR    =    SDT_VAR($base, $var, $type, $flags, $guiflags, $def,       $min, $max, $interval, $str, $proc, $from, $to),
 SDT_NULL   =   SDT_NULL($length, $from, $to),
 SDT_END    = SDT_END()
@@ -2333,6 +2332,55 @@ def      = 100
 min      = 10
 max      = 65500
 
+[SDTC_VAR]
+var      = music.playlist
+type     = SLE_UINT8
+flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
+def      = 0
+min      = 0
+max      = 5
+interval = 1
+
+[SDTC_VAR]
+var      = music.music_vol
+type     = SLE_UINT8
+flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
+def      = 127
+min      = 0
+max      = 127
+interval = 1
+
+[SDTC_VAR]
+var      = music.effect_vol
+type     = SLE_UINT8
+flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
+def      = 127
+min      = 0
+max      = 127
+interval = 1
+
+[SDTC_LIST]
+var      = music.custom_1
+type     = SLE_UINT8
+flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
+def      = NULL
+
+[SDTC_LIST]
+var      = music.custom_2
+type     = SLE_UINT8
+flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
+def      = NULL
+
+[SDTC_BOOL]
+var      = music.playing
+flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
+def      = true
+
+[SDTC_BOOL]
+var      = music.shuffle
+flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
+def      = false
+
 [SDTC_VAR]
 ifdef    = ENABLE_NETWORK
 var      = gui.network_chat_box_width
-- 
cgit v1.2.3-54-g00ecf