miguel.horta/openttd-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source 
Conflicts:
	src/console_gui.cpp
	src/genworld_gui.cpp
	src/group_gui.cpp
	src/misc_gui.cpp
	src/settings_gui.cpp
	src/widgets/settings_widget.h
This commit is contained in:
Sergii Pylypenko
2014-06-04 17:09:23 +03:00
parent 19472fd0d2 bb3544e086
commit 91ebce1a9c
550 changed files with 7396 additions and 6552 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/table/misc_settings.ini
View File

@@ -9,12 +9,15 @@
[pre-amble]
extern char _config_language_file[MAX_PATH];
static const char *_support8bppmodes = "no|system|hardware";
static const SettingDescGlobVarList _misc_settings[] = {
[post-amble]
};
[templates]
SDTG_LIST = SDTG_LIST($name, $type, $length, $flags, $guiflags, $var, $def, $str, $strhelp, $strval, $proc, $from, $to, $cat),
SDTG_MMANY = SDTG_MMANY($name, $type, $flags, $guiflags, $var, $def, $full, $str, $strhelp, $strval, $proc, $from, $to, $cat),
SDTG_OMANY = SDTG_OMANY($name, $type, $flags, $guiflags, $var, $def, $max, $full, $str, $strhelp, $strval, $proc, $from, $to, $cat),
SDTG_STR = SDTG_STR($name, $type, $flags, $guiflags, $var, $def, $str, $strhelp, $strval, $proc, $from, $to, $cat),
SDTG_BOOL = SDTG_BOOL($name, $flags, $guiflags, $var, $def, $str, $strhelp, $strval, $proc, $from, $to, $cat),
SDTG_VAR = SDTG_VAR($name, $type, $flags, $guiflags, $var, $def, $min, $max, $interval, $str, $strhelp, $strval, $proc, $from, $to, $cat),
@@ -48,6 +51,15 @@ var = _fullscreen
def = false
cat = SC_BASIC
[SDTG_OMANY]
name = ""support8bpp""
type = SLE_UINT8
var = _support8bpp
def = 0
max = 2
full = _support8bppmodes
cat = SC_BASIC
[SDTG_STR]
name = ""graphicsset""
type = SLE_STRQ

63
src/table/settings.ini
View File

@@ -130,11 +130,13 @@ base = GameSettings
var = difficulty.industry_density
type = SLE_UINT8
from = 97
guiflags = SGF_NEWGAME_ONLY
guiflags = SGF_MULTISTRING
def = ID_END - 1
min = 0
max = ID_END - 1
interval = 1
str = STR_CONFIG_SETTING_INDUSTRY_DENSITY
strhelp = STR_CONFIG_SETTING_INDUSTRY_DENSITY_HELPTEXT
strval = STR_FUNDING_ONLY
cat = SC_BASIC
@@ -251,11 +253,13 @@ base = GameSettings
var = difficulty.terrain_type
type = SLE_UINT8
from = 97
guiflags = SGF_NEWGAME_ONLY
guiflags = SGF_MULTISTRING | SGF_NEWGAME_ONLY
def = 1
min = 0
max = 3
interval = 1
str = STR_CONFIG_SETTING_TERRAIN_TYPE
strhelp = STR_CONFIG_SETTING_TERRAIN_TYPE_HELPTEXT
strval = STR_TERRAIN_TYPE_VERY_FLAT
cat = SC_BASIC
@@ -342,11 +346,14 @@ base = GameSettings
var = game_creation.landscape
type = SLE_UINT8
from = 97
guiflags = SGF_NO_NETWORK
guiflags = SGF_MULTISTRING | SGF_NEWGAME_ONLY
def = 0
max = 3
full = _climates
load = ConvertLandscape
str = STR_CONFIG_SETTING_LANDSCAPE
strhelp = STR_CONFIG_SETTING_LANDSCAPE_HELPTEXT
strval = STR_CHEAT_SWITCH_CLIMATE_TEMPERATE_LANDSCAPE
cat = SC_BASIC
; Snow line (or snow_line_height * TILE_HEIGHT)
@@ -360,10 +367,13 @@ base = GameSettings
var = vehicle.road_side
type = SLE_UINT8
from = 97
guiflags = SGF_NO_NETWORK
guiflags = SGF_MULTISTRING | SGF_NO_NETWORK
def = 1
max = 1
full = _roadsides
str = STR_CONFIG_SETTING_ROAD_SIDE
strhelp = STR_CONFIG_SETTING_ROAD_SIDE_HELPTEXT
strval = STR_GAME_OPTIONS_ROAD_VEHICLES_DROPDOWN_LEFT
proc = CheckRoadSide
; Construction
@@ -373,8 +383,6 @@ base = GameSettings
var = construction.build_on_slopes
guiflags = SGF_NO_NETWORK
def = true
str = STR_CONFIG_SETTING_BUILDONSLOPES
strhelp = STR_CONFIG_SETTING_BUILDONSLOPES_HELPTEXT
cat = SC_EXPERT
[SDT_VAR]
@@ -825,8 +833,6 @@ to = 158
base = GameSettings
var = pf.roadveh_queue
def = true
str = STR_CONFIG_SETTING_ROAD_VEHICLE_QUEUEING
strhelp = STR_CONFIG_SETTING_ROAD_VEHICLE_QUEUEING_HELPTEXT
cat = SC_EXPERT
[SDT_BOOL]
@@ -1080,8 +1086,6 @@ var = vehicle.dynamic_engines
from = 95
guiflags = SGF_NO_NETWORK
def = true
str = STR_CONFIG_SETTING_DYNAMIC_ENGINES
strhelp = STR_CONFIG_SETTING_DYNAMIC_ENGINES_HELPTEXT
proc = ChangeDynamicEngines
cat = SC_EXPERT
@@ -1116,16 +1120,13 @@ base = GameSettings
var = order.improved_load
guiflags = SGF_NO_NETWORK
def = true
str = STR_CONFIG_SETTING_IMPROVEDLOAD
strhelp = STR_CONFIG_SETTING_IMPROVEDLOAD_HELPTEXT
cat = SC_EXPERT
[SDT_BOOL]
base = GameSettings
var = order.selectgoods
def = true
str = STR_CONFIG_SETTING_SELECTGOODS
strhelp = STR_CONFIG_SETTING_SELECTGOODS_HELPTEXT
cat = SC_EXPERT
[SDTC_BOOL]
var = gui.sg_new_nonstop
@@ -1174,8 +1175,6 @@ var = order.gradual_loading
from = 40
guiflags = SGF_NO_NETWORK
def = true
str = STR_CONFIG_SETTING_GRADUAL_LOADING
strhelp = STR_CONFIG_SETTING_GRADUAL_LOADING_HELPTEXT
cat = SC_EXPERT
[SDT_BOOL]
@@ -1201,8 +1200,6 @@ base = GameSettings
var = station.adjacent_stations
from = 62
def = true
str = STR_CONFIG_SETTING_ADJACENT_STATIONS
strhelp = STR_CONFIG_SETTING_ADJACENT_STATIONS_HELPTEXT
cat = SC_EXPERT
[SDT_BOOL]
@@ -1323,10 +1320,12 @@ cat = SC_BASIC
base = GameSettings
var = game_creation.snow_line_height
type = SLE_UINT8
guiflags = SGF_NO_NETWORK
def = DEF_SNOWLINE_HEIGHT
min = MIN_SNOWLINE_HEIGHT
max = MAX_SNOWLINE_HEIGHT
str = STR_CONFIG_SETTING_SNOWLINE_HEIGHT
strhelp = STR_CONFIG_SETTING_SNOWLINE_HEIGHT_HELPTEXT
strval = STR_JUST_COMMA
cat = SC_BASIC
@@ -1425,8 +1424,6 @@ base = GameSettings
var = economy.mod_road_rebuild
from = 77
def = true
str = STR_CONFIG_SETTING_MODIFIED_ROAD_REBUILD
strhelp = STR_CONFIG_SETTING_MODIFIED_ROAD_REBUILD_HELPTEXT
cat = SC_EXPERT
; previously ai-new setting.
@@ -2122,11 +2119,12 @@ base = GameSettings
var = game_creation.land_generator
type = SLE_UINT8
from = 30
guiflags = SGF_MULTISTRING
guiflags = SGF_MULTISTRING | SGF_NEWGAME_ONLY
def = 1
min = 0
max = 1
str = STR_CONFIG_SETTING_LAND_GENERATOR
strhelp = STR_CONFIG_SETTING_LAND_GENERATOR_HELPTEXT
strval = STR_CONFIG_SETTING_LAND_GENERATOR_ORIGINAL
[SDT_VAR]
@@ -2146,11 +2144,12 @@ base = GameSettings
var = game_creation.tgen_smoothness
type = SLE_UINT8
from = 30
guiflags = SGF_MULTISTRING
guiflags = SGF_MULTISTRING | SGF_NEWGAME_ONLY
def = 1
min = 0
max = 3
str = STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN
strhelp = STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN_HELPTEXT
strval = STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN_VERY_SMOOTH
cat = SC_BASIC
@@ -2159,9 +2158,13 @@ base = GameSettings
var = game_creation.variety
type = SLE_UINT8
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
guiflags = SGF_MULTISTRING | SGF_NEWGAME_ONLY
def = 0
min = 0
max = 5
str = STR_CONFIG_SETTING_VARIETY
strhelp = STR_CONFIG_SETTING_VARIETY_HELPTEXT
strval = STR_VARIETY_NONE
[SDT_VAR]
base = GameSettings
@@ -2178,11 +2181,12 @@ base = GameSettings
var = game_creation.tree_placer
type = SLE_UINT8
from = 30
guiflags = SGF_MULTISTRING
guiflags = SGF_MULTISTRING | SGF_NEWGAME_ONLY | SGF_SCENEDIT_TOO
def = 2
min = 0
max = 2
str = STR_CONFIG_SETTING_TREE_PLACER
strhelp = STR_CONFIG_SETTING_TREE_PLACER_HELPTEXT
strval = STR_CONFIG_SETTING_TREE_PLACER_NONE
[SDT_VAR]
@@ -2236,8 +2240,6 @@ base = GameSettings
var = construction.freeform_edges
from = 111
def = true
str = STR_CONFIG_SETTING_ENABLE_FREEFORM_EDGES
strhelp = STR_CONFIG_SETTING_ENABLE_FREEFORM_EDGES_HELPTEXT
proc = CheckFreeformEdges
cat = SC_EXPERT
@@ -2309,9 +2311,13 @@ base = GameSettings
var = game_creation.amount_of_rivers
type = SLE_UINT8
from = 163
guiflags = SGF_MULTISTRING | SGF_NEWGAME_ONLY
def = 2
min = 0
max = 3
str = STR_CONFIG_SETTING_RIVER_AMOUNT
strhelp = STR_CONFIG_SETTING_RIVER_AMOUNT_HELPTEXT
strval = STR_RIVERS_NONE
; locale
@@ -2474,9 +2480,13 @@ cat = SC_BASIC
var = gui.autosave
type = SLE_UINT8
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
guiflags = SGF_MULTISTRING
def = 1
max = 4
full = _autosave_interval
str = STR_CONFIG_SETTING_AUTOSAVE
strhelp = STR_CONFIG_SETTING_AUTOSAVE_HELPTEXT
strval = STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_OFF
cat = SC_BASIC
[SDTC_BOOL]
@@ -3163,9 +3173,6 @@ guiflags = SGF_MULTISTRING
def = 1
min = 0
max = 1
str = STR_CONFIG_SETTING_NEWGRF_DEFAULT_PALETTE
strhelp = STR_CONFIG_SETTING_NEWGRF_DEFAULT_PALETTE_HELPTEXT
strval = STR_CONFIG_SETTING_NEWGRF_DEFAULT_PALETTE_DOS
proc = UpdateNewGRFConfigPalette
cat = SC_EXPERT

11
src/table/win32_settings.ini
View File

@@ -10,7 +10,7 @@
/* win32_v.cpp only settings */
#if defined(WIN32) && !defined(DEDICATED)
extern bool _force_full_redraw, _window_maximize;
extern uint _display_hz, _fullscreen_bpp;
extern uint _display_hz;
static const SettingDescGlobVarList _win32_settings[] = {
[post-amble]
@@ -51,15 +51,6 @@ var = _force_full_redraw
def = false
cat = SC_EXPERT
[SDTG_VAR]
name = ""fullscreen_bpp""
type = SLE_UINT
var = _fullscreen_bpp
def = 8
min = 8
max = 32
cat = SC_EXPERT
[SDTG_BOOL]
name = ""window_maximize""
var = _window_maximize