mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r22194) -Codechange: use the defaults feature of settingsgen to remove the need to state the "default" value for all items

This commit is contained in:
rubidium 2011-03-05 10:12:03 +00:00
parent ca61ae0b0a
commit 8b9f99ec44
7 changed files with 64 additions and 1093 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/table/company_settings.ini
View File

@ -7,56 +7,52 @@ SDT_BOOL = SDT_BOOL($base, $var, $flags, $guiflags, $def,
SDT_VAR = SDT_VAR($base, $var, $type, $flags, $guiflags, $def, $min, $max, $interval, $str, $proc),
SDT_END = SDT_END()
[defaults]
flags = 0
guiflags = 0
interval = 0
str = STR_NULL
proc = NULL
load = NULL
[SDT_BOOL]
base = CompanySettings
var = engine_renew
flags = 0
guiflags = PC
def = false
str = STR_CONFIG_SETTING_AUTORENEW_VEHICLE
proc = NULL
[SDT_VAR]
base = CompanySettings
var = engine_renew_months
type = SLE_INT16
flags = 0
guiflags = PC
def = 6
min = -12
max = 12
interval = 0
str = STR_CONFIG_SETTING_AUTORENEW_MONTHS
proc = NULL
[SDT_VAR]
base = CompanySettings
var = engine_renew_money
type = SLE_UINT
flags = 0
guiflags = PC|CR
def = 100000
min = 0
max = 2000000
interval = 0
str = STR_CONFIG_SETTING_AUTORENEW_MONEY
proc = NULL
[SDT_BOOL]
base = CompanySettings
var = renew_keep_length
flags = 0
guiflags = PC
def = false
str = STR_NULL
proc = NULL
[SDT_BOOL]
base = CompanySettings
var = vehicle.servint_ispercent
flags = 0
guiflags = PC
def = false
str = STR_CONFIG_SETTING_SERVINT_ISPERCENT
@ -66,12 +62,10 @@ proc = CheckInterval
base = CompanySettings
var = vehicle.servint_trains
type = SLE_UINT16
flags = 0
guiflags = PC|D0
def = 150
min = 5
max = 800
interval = 0
str = STR_CONFIG_SETTING_SERVINT_TRAINS
proc = InvalidateDetailsWindow
@ -79,12 +73,10 @@ proc = InvalidateDetailsWindow
base = CompanySettings
var = vehicle.servint_roadveh
type = SLE_UINT16
flags = 0
guiflags = PC|D0
def = 150
min = 5
max = 800
interval = 0
str = STR_CONFIG_SETTING_SERVINT_ROAD_VEHICLES
proc = InvalidateDetailsWindow
@ -92,12 +84,10 @@ proc = InvalidateDetailsWindow
base = CompanySettings
var = vehicle.servint_ships
type = SLE_UINT16
flags = 0
guiflags = PC|D0
def = 360
min = 5
max = 800
interval = 0
str = STR_CONFIG_SETTING_SERVINT_SHIPS
proc = InvalidateDetailsWindow
@ -105,12 +95,10 @@ proc = InvalidateDetailsWindow
base = CompanySettings
var = vehicle.servint_aircraft
type = SLE_UINT16
flags = 0
guiflags = PC|D0
def = 100
min = 5
max = 800
interval = 0
str = STR_CONFIG_SETTING_SERVINT_AIRCRAFT
proc = InvalidateDetailsWindow

27
src/table/currency_settings.ini
View File

@ -8,60 +8,53 @@ SDT_CHR = SDT_CHR($base, $var, $flags, $guiflags, $def,
SDT_STR = SDT_STR($base, $var, $type, $flags, $guiflags, $def, $str, $proc),
SDT_END = SDT_END()
[defaults]
flags = 0
guiflags = 0
interval = 0
str = STR_NULL
proc = NULL
load = NULL
[SDT_VAR]
base = CurrencySpec
var = rate
type = SLE_UINT16
flags = S
guiflags = 0
def = 1
min = 0
max = UINT16_MAX
interval = 0
str = STR_NULL
proc = NULL
[SDT_CHR]
base = CurrencySpec
var = separator
flags = S
guiflags = 0
def = "".""
str = STR_NULL
proc = NULL
[SDT_VAR]
base = CurrencySpec
var = to_euro
type = SLE_INT32
flags = S
guiflags = 0
def = 0
min = MIN_YEAR
max = MAX_YEAR
interval = 0
str = STR_NULL
proc = NULL
[SDT_STR]
base = CurrencySpec
var = prefix
type = SLE_STRBQ
flags = S
guiflags = 0
def = NULL
str = STR_NULL
proc = NULL
[SDT_STR]
base = CurrencySpec
var = suffix
type = SLE_STRBQ
flags = S
guiflags = 0
def = "" credits""
str = STR_NULL
proc = NULL
[SDT_END]

52
src/table/gameopt_settings.ini
View File

@ -35,6 +35,15 @@ SDT_OMANY = SDT_OMANY($base, $var, $type, $flags, $guiflags, $d
SDT_VAR = SDT_VAR($base, $var, $type, $flags, $guiflags, $def, $min, $max, $interval, $str, $proc),
SDT_END = SDT_END()
[defaults]
flags = 0
guiflags = 0
interval = 0
str = STR_NULL
proc = NULL
load = NULL
[SDTG_GENERAL]
name = ""diff_custom""
@ -42,16 +51,12 @@ sdt_cmd = SDT_INTLIST
sle_cmd = SL_ARR
type = SLE_FILE_I16 | SLE_VAR_U16
flags = C
guiflags = 0
var = _old_diff_custom
length = 17
def = 0
min = 0
max = 0
interval = 0
full = NULL
str = STR_NULL
proc = NULL
from = 0
to = 3
@ -61,16 +66,12 @@ sdt_cmd = SDT_INTLIST
sle_cmd = SL_ARR
type = SLE_UINT16
flags = C
guiflags = 0
var = _old_diff_custom
length = 18
def = 0
min = 0
max = 0
interval = 0
full = NULL
str = STR_NULL
proc = NULL
from = 4
to = SL_MAX_VERSION
@ -79,40 +80,27 @@ to = SL_MAX_VERSION
base = GameSettings
var = difficulty.diff_level
type = SLE_UINT8
flags = 0
guiflags = 0
def = 3
min = 0
max = 3
interval = 0
str = STR_NULL
proc = NULL
[SDT_OMANY]
base = GameSettings
var = locale.currency
type = SLE_UINT8
flags = N
guiflags = 0
def = 0
max = CUSTOM_CURRENCY_ID
full = _locale_currencies
str = STR_NULL
proc = NULL
load = NULL
[SDT_OMANY]
base = GameSettings
var = locale.units
type = SLE_UINT8
flags = N
guiflags = 0
def = 1
max = 2
full = _locale_units
str = STR_NULL
proc = NULL
load = NULL
# There are only 21 predefined town_name values (0-20), but you can have more with newgrf action F so allow
# these bigger values (21-255). Invalid values will fallback to english on use and (undefined string) in GUI.
@ -120,40 +108,26 @@ load = NULL
base = GameSettings
var = game_creation.town_name
type = SLE_UINT8
flags = 0
guiflags = 0
def = 0
max = 255
full = _town_names
str = STR_NULL
proc = NULL
load = NULL
[SDT_OMANY]
base = GameSettings
var = game_creation.landscape
type = SLE_UINT8
flags = 0
guiflags = 0
def = 0
max = 3
full = _climates
str = STR_NULL
proc = NULL
load = ConvertLandscape
[SDT_VAR]
base = GameSettings
var = game_creation.snow_line
type = SLE_UINT8
flags = 0
guiflags = 0
def = DEF_SNOWLINE_HEIGHT * TILE_HEIGHT
min = MIN_SNOWLINE_HEIGHT * TILE_HEIGHT
max = MAX_SNOWLINE_HEIGHT * TILE_HEIGHT
interval = 0
str = STR_NULL
proc = NULL
[SDT_CONDNULL]
length = 1
@ -166,25 +140,17 @@ type = SLE_UINT8
from = 23
to = SL_MAX_VERSION
flags = S
guiflags = 0
def = 1
max = 4
full = _autosave_interval
str = STR_NULL
proc = NULL
[SDT_OMANY]
base = GameSettings
var = vehicle.road_side
type = SLE_UINT8
flags = 0
guiflags = 0
def = 1
max = 1
full = _roadsides
str = STR_NULL
proc = NULL
load = NULL
[SDT_END]

111
src/table/misc_settings.ini
View File

@ -12,114 +12,91 @@ SDTG_BOOL = SDTG_BOOL($name, $flags, $guiflags, $var, $d
SDTG_VAR = SDTG_VAR($name, $type, $flags, $guiflags, $var, $def, $min, $max, $interval, $str, $proc),
SDTG_END = SDTG_END()
[defaults]
flags = 0
guiflags = 0
interval = 0
str = STR_NULL
proc = NULL
load = NULL
[SDTG_MMANY]
name = ""display_opt""
type = SLE_UINT8
flags = S
guiflags = 0
var = _display_opt
def = (1 << DO_SHOW_TOWN_NAMES | 1 << DO_SHOW_STATION_NAMES | 1 << DO_SHOW_SIGNS | 1 << DO_FULL_ANIMATION | 1 << DO_FULL_DETAIL | 1 << DO_SHOW_WAYPOINT_NAMES)
full = ""SHOW_TOWN_NAMES|SHOW_STATION_NAMES|SHOW_SIGNS|FULL_ANIMATION||FULL_DETAIL|WAYPOINTS""
str = STR_NULL
proc = NULL
[SDTG_BOOL]
name = ""news_ticker_sound""
flags = S
guiflags = 0
var = _news_ticker_sound
def = true
str = STR_NULL
proc = NULL
[SDTG_BOOL]
name = ""fullscreen""
flags = S
guiflags = 0
var = _fullscreen
def = false
str = STR_NULL
proc = NULL
[SDTG_STR]
name = ""graphicsset""
type = SLE_STRQ
flags = S
guiflags = 0
var = BaseGraphics::ini_set
def = NULL
str = STR_NULL
proc = NULL
[SDTG_STR]
name = ""soundsset""
type = SLE_STRQ
flags = S
guiflags = 0
var = BaseSounds::ini_set
def = NULL
str = STR_NULL
proc = NULL
[SDTG_STR]
name = ""musicset""
type = SLE_STRQ
flags = S
guiflags = 0
var = BaseMusic::ini_set
def = NULL
str = STR_NULL
proc = NULL
[SDTG_STR]
name = ""videodriver""
type = SLE_STRQ
flags = S
guiflags = 0
var = _ini_videodriver
def = NULL
str = STR_NULL
proc = NULL
[SDTG_STR]
name = ""musicdriver""
type = SLE_STRQ
flags = S
guiflags = 0
var = _ini_musicdriver
def = NULL
str = STR_NULL
proc = NULL
[SDTG_STR]
name = ""sounddriver""
type = SLE_STRQ
flags = S
guiflags = 0
var = _ini_sounddriver
def = NULL
str = STR_NULL
proc = NULL
[SDTG_STR]
name = ""blitter""
type = SLE_STRQ
flags = S
guiflags = 0
var = _ini_blitter
def = NULL
str = STR_NULL
proc = NULL
[SDTG_STR]
name = ""language""
type = SLE_STRB
flags = S
guiflags = 0
var = _config_language_file
def = NULL
str = STR_NULL
proc = NULL
; workaround for implicit lengthof() in SDTG_LIST
[SDTG_CONDLIST]
@ -127,11 +104,8 @@ name = ""resolution""
type = SLE_INT
length = 2
flags = S
guiflags = 0
var = _cur_resolution
def = ""640,480""
str = STR_NULL
proc = NULL
from = 0
to = SL_MAX_VERSION
@ -139,220 +113,155 @@ to = SL_MAX_VERSION
name = ""screenshot_format""
type = SLE_STRB
flags = S
guiflags = 0
var = _screenshot_format_name
def = NULL
str = STR_NULL
proc = NULL
[SDTG_STR]
name = ""savegame_format""
type = SLE_STRB
flags = S
guiflags = 0
var = _savegame_format
def = NULL
str = STR_NULL
proc = NULL
[SDTG_BOOL]
name = ""rightclick_emulate""
flags = S
guiflags = 0
var = _rightclick_emulate
def = false
str = STR_NULL
proc = NULL
[SDTG_STR]
ifdef = WITH_FREETYPE
name = ""small_font""
type = SLE_STRB
flags = S
guiflags = 0
var = _freetype.small_font
def = NULL
str = STR_NULL
proc = NULL
[SDTG_STR]
ifdef = WITH_FREETYPE
name = ""medium_font""
type = SLE_STRB
flags = S
guiflags = 0
var = _freetype.medium_font
def = NULL
str = STR_NULL
proc = NULL
[SDTG_STR]
ifdef = WITH_FREETYPE
name = ""large_font""
type = SLE_STRB
flags = S
guiflags = 0
var = _freetype.large_font
def = NULL
str = STR_NULL
proc = NULL
[SDTG_VAR]
ifdef = WITH_FREETYPE
name = ""small_size""
type = SLE_UINT
flags = S
guiflags = 0
var = _freetype.small_size
def = 8
min = 0
max = 72
interval = 0
str = STR_NULL
proc = NULL
[SDTG_VAR]
ifdef = WITH_FREETYPE
name = ""medium_size""
type = SLE_UINT
flags = S
guiflags = 0
var = _freetype.medium_size
def = 10
min = 0
max = 72
interval = 0
str = STR_NULL
proc = NULL
[SDTG_VAR]
ifdef = WITH_FREETYPE
name = ""large_size""
type = SLE_UINT
flags = S
guiflags = 0
var = _freetype.large_size
def = 16
min = 0
max = 72
interval = 0
str = STR_NULL
proc = NULL
[SDTG_BOOL]
ifdef = WITH_FREETYPE
name = ""small_aa""
flags = S
guiflags = 0
var = _freetype.small_aa
def = false
str = STR_NULL
proc = NULL
[SDTG_BOOL]
ifdef = WITH_FREETYPE
name = ""medium_aa""
flags = S
guiflags = 0
var = _freetype.medium_aa
def = false
str = STR_NULL
proc = NULL
[SDTG_BOOL]
ifdef = WITH_FREETYPE
name = ""large_aa""
flags = S
guiflags = 0
var = _freetype.large_aa
def = false
str = STR_NULL
proc = NULL
[SDTG_VAR]
name = ""sprite_cache_size""
type = SLE_UINT
flags = S
guiflags = 0
var = _sprite_cache_size
def = 4
min = 1
max = 64
interval = 0
str = STR_NULL
proc = NULL
[SDTG_VAR]
name = ""player_face""
type = SLE_UINT32
flags = S
guiflags = 0
var = _company_manager_face
def = 0
min = 0
max = 0xFFFFFFFF
interval = 0
str = STR_NULL
proc = NULL
[SDTG_VAR]
name = ""transparency_options""
type = SLE_UINT
flags = S
guiflags = 0
var = _transparency_opt
def = 0
min = 0
max = 0x1FF
interval = 0
str = STR_NULL
proc = NULL
[SDTG_VAR]
name = ""transparency_locks""
type = SLE_UINT
flags = S
guiflags = 0
var = _transparency_lock
def = 0
min = 0
max = 0x1FF
interval = 0
str = STR_NULL
proc = NULL
[SDTG_VAR]
name = ""invisibility_options""
type = SLE_UINT
flags = S
guiflags = 0
var = _invisibility_opt
def = 0
min = 0
max = 0xFF
interval = 0
str = STR_NULL
proc = NULL
[SDTG_STR]
name = ""keyboard""
type = SLE_STRB
flags = S
guiflags = 0
var = _keyboard_opt[0]
def = NULL
str = STR_NULL
proc = NULL
[SDTG_STR]
name = ""keyboard_caps""
type = SLE_STRB
flags = S
guiflags = 0
var = _keyboard_opt[1]
def = NULL
str = STR_NULL
proc = NULL
[SDTG_END]

31
src/table/music_settings.ini
View File

@ -8,82 +8,71 @@ SDT_VAR = SDT_VAR($base, $var, $type, $flags, $guiflags, $def, $min, $max, $in
SDT_LIST = SDT_LIST($base, $var, $type, $flags, $guiflags, $def, $str, $proc),
SDT_END = SDT_END()
[defaults]
flags = 0
guiflags = 0
interval = 0
str = STR_NULL
proc = NULL
load = NULL
[SDT_VAR]
base = MusicFileSettings
var = playlist
type = SLE_UINT8
flags = S
guiflags = 0
def = 0
min = 0
max = 5
interval = 1
str = STR_NULL
proc = NULL
[SDT_VAR]
base = MusicFileSettings
var = music_vol
type = SLE_UINT8
flags = S
guiflags = 0
def = 127
min = 0
max = 127
interval = 1
str = STR_NULL
proc = NULL
[SDT_VAR]
base = MusicFileSettings
var = effect_vol
type = SLE_UINT8
flags = S
guiflags = 0
def = 127
min = 0
max = 127
interval = 1
str = STR_NULL
proc = NULL
[SDT_LIST]
base = MusicFileSettings
var = custom_1
type = SLE_UINT8
flags = S
guiflags = 0
def = NULL
str = STR_NULL
proc = NULL
[SDT_LIST]
base = MusicFileSettings
var = custom_2
type = SLE_UINT8
flags = S
guiflags = 0
def = NULL
str = STR_NULL
proc = NULL
[SDT_BOOL]
base = MusicFileSettings
var = playing
flags = S
guiflags = 0
def = true
str = STR_NULL
proc = NULL
[SDT_BOOL]
base = MusicFileSettings
var = shuffle
flags = S
guiflags = 0
def = false
str = STR_NULL
proc = NULL
[SDT_END]

885
src/table/settings.ini
View File

File diff suppressed because it is too large Load Diff

23
src/table/win32_settings.ini
View File

@ -13,50 +13,45 @@ SDTG_BOOL = SDTG_BOOL($name, $flags, $guiflags, $var, $def,
SDTG_VAR = SDTG_VAR($name, $type, $flags, $guiflags, $var, $def, $min, $max, $interval, $str, $proc),
SDTG_END = SDTG_END()
[defaults]
flags = 0
guiflags = 0
interval = 0
str = STR_NULL
proc = NULL
load = NULL
[SDTG_VAR]
name = ""display_hz""
type = SLE_UINT
flags = S
guiflags = 0
var = _display_hz
def = 0
min = 0
max = 120
interval = 0
str = STR_NULL
proc = NULL
[SDTG_BOOL]
name = ""force_full_redraw""
flags = S
guiflags = 0
var = _force_full_redraw
def = false
str = STR_NULL
proc = NULL
[SDTG_VAR]
name = ""fullscreen_bpp""
type = SLE_UINT
flags = S
guiflags = 0
var = _fullscreen_bpp
def = 8
min = 8
max = 32
interval = 0
str = STR_NULL
proc = NULL
[SDTG_BOOL]
name = ""window_maximize""
flags = S
guiflags = 0
var = _window_maximize
def = false
str = STR_NULL
proc = NULL
[SDTG_END]