(svn r22197) -Cleanup: remove the distinction between conditional and non-conditional settings; with default from and to savegame versions all can be conditional. They previously were as well; the non-conditional ones were macros of the conditionals with to/from saveload versions hardcoded

This commit is contained in:
rubidium
2011-03-05 10:47:49 +00:00
parent 13a31bf9b9
commit 8ead62cdc1
8 changed files with 207 additions and 254 deletions

View File

@@ -5,12 +5,12 @@ static const SettingDescGlobVarList _misc_settings[] = {
[post-amble]
};
[templates]
SDTG_CONDLIST = SDTG_CONDLIST($name, $type, $length, $flags, $guiflags, $var, $def, $str, $proc, $from, $to),
SDTG_MMANY = SDTG_MMANY($name, $type, $flags, $guiflags, $var, $def, $full, $str, $proc),
SDTG_STR = SDTG_STR($name, $type, $flags, $guiflags, $var, $def, $str, $proc),
SDTG_BOOL = SDTG_BOOL($name, $flags, $guiflags, $var, $def, $str, $proc),
SDTG_VAR = SDTG_VAR($name, $type, $flags, $guiflags, $var, $def, $min, $max, $interval, $str, $proc),
SDTG_END = SDTG_END()
SDTG_LIST = SDTG_LIST($name, $type, $length, $flags, $guiflags, $var, $def, $str, $proc, $from, $to),
SDTG_MMANY = SDTG_MMANY($name, $type, $flags, $guiflags, $var, $def, $full, $str, $proc, $from, $to),
SDTG_STR = SDTG_STR($name, $type, $flags, $guiflags, $var, $def, $str, $proc, $from, $to),
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),
SDTG_END = SDTG_END()
[defaults]
flags = 0
@@ -101,7 +101,7 @@ var = _config_language_file
def = NULL
; workaround for implicit lengthof() in SDTG_LIST
[SDTG_CONDLIST]
[SDTG_LIST]
name = ""resolution""
type = SLE_INT
length = 2