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

(svn r22199) -Cleanup-ish: replace the shortcut macros for (gui)flags with their more clearly named (longer) constant names

This commit is contained in:
rubidium 2011-03-05 11:34:31 +00:00
parent e48967541a
commit b8d3c42de2
9 changed files with 248 additions and 325 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/table/company_settings.ini
View File

@ -9,7 +9,7 @@ SDT_END = SDT_END()
[defaults]
flags = 0
guiflags = 0
guiflags = SGF_PER_COMPANY
interval = 0
str = STR_NULL
proc = NULL
@ -22,7 +22,6 @@ to = SL_MAX_VERSION
[SDT_BOOL]
base = CompanySettings
var = engine_renew
guiflags = PC
def = false
str = STR_CONFIG_SETTING_AUTORENEW_VEHICLE
@ -30,7 +29,6 @@ str = STR_CONFIG_SETTING_AUTORENEW_VEHICLE
base = CompanySettings
var = engine_renew_months
type = SLE_INT16
guiflags = PC
def = 6
min = -12
max = 12
@ -40,7 +38,7 @@ str = STR_CONFIG_SETTING_AUTORENEW_MONTHS
base = CompanySettings
var = engine_renew_money
type = SLE_UINT
guiflags = PC|CR
guiflags = SGF_PER_COMPANY | SGF_CURRENCY
def = 100000
min = 0
max = 2000000
@ -49,13 +47,11 @@ str = STR_CONFIG_SETTING_AUTORENEW_MONEY
[SDT_BOOL]
base = CompanySettings
var = renew_keep_length
guiflags = PC
def = false
[SDT_BOOL]
base = CompanySettings
var = vehicle.servint_ispercent
guiflags = PC
def = false
str = STR_CONFIG_SETTING_SERVINT_ISPERCENT
proc = CheckInterval
@ -64,7 +60,7 @@ proc = CheckInterval
base = CompanySettings
var = vehicle.servint_trains
type = SLE_UINT16
guiflags = PC|D0
guiflags = SGF_PER_COMPANY | SGF_0ISDISABLED
def = 150
min = 5
max = 800
@ -75,7 +71,7 @@ proc = InvalidateDetailsWindow
base = CompanySettings
var = vehicle.servint_roadveh
type = SLE_UINT16
guiflags = PC|D0
guiflags = SGF_PER_COMPANY | SGF_0ISDISABLED
def = 150
min = 5
max = 800
@ -86,7 +82,7 @@ proc = InvalidateDetailsWindow
base = CompanySettings
var = vehicle.servint_ships
type = SLE_UINT16
guiflags = PC|D0
guiflags = SGF_PER_COMPANY | SGF_0ISDISABLED
def = 360
min = 5
max = 800
@ -97,7 +93,7 @@ proc = InvalidateDetailsWindow
base = CompanySettings
var = vehicle.servint_aircraft
type = SLE_UINT16
guiflags = PC|D0
guiflags = SGF_PER_COMPANY | SGF_0ISDISABLED
def = 100
min = 5
max = 800

7
src/table/currency_settings.ini
View File

@ -9,7 +9,7 @@ SDT_STR = SDT_STR($base, $var, $type, $flags, $guiflags, $def,
SDT_END = SDT_END()
[defaults]
flags = 0
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
guiflags = 0
interval = 0
str = STR_NULL
@ -24,7 +24,6 @@ to = SL_MAX_VERSION
base = CurrencySpec
var = rate
type = SLE_UINT16
flags = S
def = 1
min = 0
max = UINT16_MAX
@ -32,14 +31,12 @@ max = UINT16_MAX
[SDT_CHR]
base = CurrencySpec
var = separator
flags = S
def = "".""
[SDT_VAR]
base = CurrencySpec
var = to_euro
type = SLE_INT32
flags = S
def = 0
min = MIN_YEAR
max = MAX_YEAR
@ -48,14 +45,12 @@ max = MAX_YEAR
base = CurrencySpec
var = prefix
type = SLE_STRBQ
flags = S
def = NULL
[SDT_STR]
base = CurrencySpec
var = suffix
type = SLE_STRBQ
flags = S
def = "" credits""
[SDT_END]

10
src/table/gameopt_settings.ini
View File

@ -52,7 +52,7 @@ name = ""diff_custom""
sdt_cmd = SDT_INTLIST
sle_cmd = SL_ARR
type = SLE_FILE_I16 | SLE_VAR_U16
flags = C
flags = SLF_NOT_IN_CONFIG
var = _old_diff_custom
length = 17
def = 0
@ -66,7 +66,7 @@ name = ""diff_custom""
sdt_cmd = SDT_INTLIST
sle_cmd = SL_ARR
type = SLE_UINT16
flags = C
flags = SLF_NOT_IN_CONFIG
var = _old_diff_custom
length = 18
def = 0
@ -88,7 +88,7 @@ max = 3
base = GameSettings
var = locale.currency
type = SLE_UINT8
flags = N
flags = SLF_NO_NETWORK_SYNC
def = 0
max = CUSTOM_CURRENCY_ID
full = _locale_currencies
@ -97,7 +97,7 @@ full = _locale_currencies
base = GameSettings
var = locale.units
type = SLE_UINT8
flags = N
flags = SLF_NO_NETWORK_SYNC
def = 1
max = 2
full = _locale_units
@ -137,7 +137,7 @@ to = 22
var = gui.autosave
type = SLE_UINT8
from = 23
flags = S
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
def = 1
max = 4
full = _autosave_interval

33
src/table/misc_settings.ini
View File

@ -13,7 +13,7 @@ SDTG_VAR = SDTG_VAR($name, $type, $flags, $guiflags, $var, $def, $m
SDTG_END = SDTG_END()
[defaults]
flags = 0
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
guiflags = 0
interval = 0
str = STR_NULL
@ -27,76 +27,65 @@ to = SL_MAX_VERSION
[SDTG_MMANY]
name = ""display_opt""
type = SLE_UINT8
flags = S
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""
[SDTG_BOOL]
name = ""news_ticker_sound""
flags = S
var = _news_ticker_sound
def = true
[SDTG_BOOL]
name = ""fullscreen""
flags = S
var = _fullscreen
def = false
[SDTG_STR]
name = ""graphicsset""
type = SLE_STRQ
flags = S
var = BaseGraphics::ini_set
def = NULL
[SDTG_STR]
name = ""soundsset""
type = SLE_STRQ
flags = S
var = BaseSounds::ini_set
def = NULL
[SDTG_STR]
name = ""musicset""
type = SLE_STRQ
flags = S
var = BaseMusic::ini_set
def = NULL
[SDTG_STR]
name = ""videodriver""
type = SLE_STRQ
flags = S
var = _ini_videodriver
def = NULL
[SDTG_STR]
name = ""musicdriver""
type = SLE_STRQ
flags = S
var = _ini_musicdriver
def = NULL
[SDTG_STR]
name = ""sounddriver""
type = SLE_STRQ
flags = S
var = _ini_sounddriver
def = NULL
[SDTG_STR]
name = ""blitter""
type = SLE_STRQ
flags = S
var = _ini_blitter
def = NULL
[SDTG_STR]
name = ""language""
type = SLE_STRB
flags = S
var = _config_language_file
def = NULL
@ -105,27 +94,23 @@ def = NULL
name = ""resolution""
type = SLE_INT
length = 2
flags = S
var = _cur_resolution
def = ""640,480""
[SDTG_STR]
name = ""screenshot_format""
type = SLE_STRB
flags = S
var = _screenshot_format_name
def = NULL
[SDTG_STR]
name = ""savegame_format""
type = SLE_STRB
flags = S
var = _savegame_format
def = NULL
[SDTG_BOOL]
name = ""rightclick_emulate""
flags = S
var = _rightclick_emulate
def = false
@ -133,7 +118,6 @@ def = false
ifdef = WITH_FREETYPE
name = ""small_font""
type = SLE_STRB
flags = S
var = _freetype.small_font
def = NULL
@ -141,7 +125,6 @@ def = NULL
ifdef = WITH_FREETYPE
name = ""medium_font""
type = SLE_STRB
flags = S
var = _freetype.medium_font
def = NULL
@ -149,7 +132,6 @@ def = NULL
ifdef = WITH_FREETYPE
name = ""large_font""
type = SLE_STRB
flags = S
var = _freetype.large_font
def = NULL
@ -157,7 +139,6 @@ def = NULL
ifdef = WITH_FREETYPE
name = ""small_size""
type = SLE_UINT
flags = S
var = _freetype.small_size
def = 8
min = 0
@ -167,7 +148,6 @@ max = 72
ifdef = WITH_FREETYPE
name = ""medium_size""
type = SLE_UINT
flags = S
var = _freetype.medium_size
def = 10
min = 0
@ -177,7 +157,6 @@ max = 72
ifdef = WITH_FREETYPE
name = ""large_size""
type = SLE_UINT
flags = S
var = _freetype.large_size
def = 16
min = 0
@ -186,28 +165,24 @@ max = 72
[SDTG_BOOL]
ifdef = WITH_FREETYPE
name = ""small_aa""
flags = S
var = _freetype.small_aa
def = false
[SDTG_BOOL]
ifdef = WITH_FREETYPE
name = ""medium_aa""
flags = S
var = _freetype.medium_aa
def = false
[SDTG_BOOL]
ifdef = WITH_FREETYPE
name = ""large_aa""
flags = S
var = _freetype.large_aa
def = false
[SDTG_VAR]
name = ""sprite_cache_size""
type = SLE_UINT
flags = S
var = _sprite_cache_size
def = 4
min = 1
@ -216,7 +191,6 @@ max = 64
[SDTG_VAR]
name = ""player_face""
type = SLE_UINT32
flags = S
var = _company_manager_face
def = 0
min = 0
@ -225,7 +199,6 @@ max = 0xFFFFFFFF
[SDTG_VAR]
name = ""transparency_options""
type = SLE_UINT
flags = S
var = _transparency_opt
def = 0
min = 0
@ -234,7 +207,6 @@ max = 0x1FF
[SDTG_VAR]
name = ""transparency_locks""
type = SLE_UINT
flags = S
var = _transparency_lock
def = 0
min = 0
@ -243,7 +215,6 @@ max = 0x1FF
[SDTG_VAR]
name = ""invisibility_options""
type = SLE_UINT
flags = S
var = _invisibility_opt
def = 0
min = 0
@ -252,14 +223,12 @@ max = 0xFF
[SDTG_STR]
name = ""keyboard""
type = SLE_STRB
flags = S
var = _keyboard_opt[0]
def = NULL
[SDTG_STR]
name = ""keyboard_caps""
type = SLE_STRB
flags = S
var = _keyboard_opt[1]
def = NULL

9
src/table/music_settings.ini
View File

@ -9,7 +9,7 @@ SDT_LIST = SDT_LIST($base, $var, $type, $flags, $guiflags, $def,
SDT_END = SDT_END()
[defaults]
flags = 0
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
guiflags = 0
interval = 0
str = STR_NULL
@ -24,7 +24,6 @@ to = SL_MAX_VERSION
base = MusicFileSettings
var = playlist
type = SLE_UINT8
flags = S
def = 0
min = 0
max = 5
@ -34,7 +33,6 @@ interval = 1
base = MusicFileSettings
var = music_vol
type = SLE_UINT8
flags = S
def = 127
min = 0
max = 127
@ -44,7 +42,6 @@ interval = 1
base = MusicFileSettings
var = effect_vol
type = SLE_UINT8
flags = S
def = 127
min = 0
max = 127
@ -54,26 +51,22 @@ interval = 1
base = MusicFileSettings
var = custom_1
type = SLE_UINT8
flags = S
def = NULL
[SDT_LIST]
base = MusicFileSettings
var = custom_2
type = SLE_UINT8
flags = S
def = NULL
[SDT_BOOL]
base = MusicFileSettings
var = playing
flags = S
def = true
[SDT_BOOL]
base = MusicFileSettings
var = shuffle
flags = S
def = false
[SDT_END]

10
src/table/settings.h.postamble
View File

@ -1,10 +0,0 @@
/* Undefine for the shortcut macros above */
#undef S
#undef C
#undef N
#undef D0
#undef NC
#undef MS
#undef NO
#undef CR

16
src/table/settings.h.preamble
View File

@ -164,19 +164,3 @@ static bool UpdateClientConfigValues(int32 p1);
#define SDT_END() {{NULL, NULL, {0}, {0}, 0, 0, 0, NULL, STR_NULL, NULL, NULL}, SLE_END()}
/* Shortcuts for macros below. Logically if we don't save the value
* we also don't sync it in a network game */
#define S SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
#define C SLF_NOT_IN_CONFIG
#define N SLF_NO_NETWORK_SYNC
#define D0 SGF_0ISDISABLED
#define NC SGF_NOCOMMA
#define MS SGF_MULTISTRING
#define NO SGF_NETWORK_ONLY
#define CR SGF_CURRENCY
#define NN SGF_NO_NETWORK
#define NG SGF_NEWGAME_ONLY
#define NS SGF_NEWGAME_ONLY | SGF_SCENEDIT_TOO
#define PC SGF_PER_COMPANY

466
src/table/settings.ini
View File

File diff suppressed because it is too large Load Diff

6
src/table/win32_settings.ini
View File

@ -14,7 +14,7 @@ SDTG_VAR = SDTG_VAR($name, $type, $flags, $guiflags, $var, $def, $min, $max, $
SDTG_END = SDTG_END()
[defaults]
flags = 0
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
guiflags = 0
interval = 0
str = STR_NULL
@ -28,7 +28,6 @@ to = SL_MAX_VERSION
[SDTG_VAR]
name = ""display_hz""
type = SLE_UINT
flags = S
var = _display_hz
def = 0
min = 0
@ -36,14 +35,12 @@ max = 120
[SDTG_BOOL]
name = ""force_full_redraw""
flags = S
var = _force_full_redraw
def = false
[SDTG_VAR]
name = ""fullscreen_bpp""
type = SLE_UINT
flags = S
var = _fullscreen_bpp
def = 8
min = 8
@ -51,7 +48,6 @@ max = 32
[SDTG_BOOL]
name = ""window_maximize""
flags = S
var = _window_maximize
def = false