dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into town_cargo_adj

Browse Source 
Conflicts:
	src/settings_gui.cpp
This commit is contained in:
Jonathan G Rennison
2015-08-02 00:04:04 +01:00
parent 1c9801e6b6 67366cf03d
commit 60377f2262
940 changed files with 57198 additions and 38591 deletions
Download Patch File Download Diff File Expand all files Collapse all files

135
src/table/settings.ini
View File

@@ -28,6 +28,7 @@ static bool TownFoundingChanged(int32 p1);
static bool DifficultyNoiseChange(int32 i);
static bool MaxNoAIsChange(int32 i);
static bool CheckRoadSide(int p1);
static bool ChangeMaxHeightLevel(int32 p1);
static bool CheckFreeformEdges(int32 p1);
static bool ChangeDynamicEngines(int32 p1);
static bool StationCatchmentChanged(int32 p1);
@@ -40,6 +41,7 @@ static bool RedrawTownAuthority(int32 p1);
static bool InvalidateCompanyInfrastructureWindow(int32 p1);
static bool InvalidateCompanyWindow(int32 p1);
static bool ZoomMinMaxChanged(int32 p1);
static bool MaxVehiclesChanged(int32 p1);
#ifdef ENABLE_NETWORK
static bool UpdateClientName(int32 p1);
@@ -129,11 +131,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
@@ -250,11 +254,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
max = 4
interval = 1
str = STR_CONFIG_SETTING_TERRAIN_TYPE
strhelp = STR_CONFIG_SETTING_TERRAIN_TYPE_HELPTEXT
strval = STR_TERRAIN_TYPE_VERY_FLAT
cat = SC_BASIC
@@ -341,11 +347,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)
@@ -359,21 +368,38 @@ 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
[SDT_VAR]
base = GameSettings
var = construction.max_heightlevel
type = SLE_UINT8
from = 194
guiflags = SGF_NEWGAME_ONLY | SGF_SCENEDIT_TOO
def = DEF_MAX_HEIGHTLEVEL
min = MIN_MAX_HEIGHTLEVEL
max = MAX_MAX_HEIGHTLEVEL
interval = 1
str = STR_CONFIG_SETTING_MAX_HEIGHTLEVEL
strhelp = STR_CONFIG_SETTING_MAX_HEIGHTLEVEL_HELPTEXT
strval = STR_JUST_INT
proc = ChangeMaxHeightLevel
cat = SC_BASIC
[SDT_BOOL]
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]
@@ -480,12 +506,27 @@ from = 159
guiflags = SGF_NO_NETWORK
def = 64
min = 1
max = 2048
max = MAX_MAP_SIZE
interval = 1
str = STR_CONFIG_SETTING_MAX_BRIDGE_LENGTH
strhelp = STR_CONFIG_SETTING_MAX_BRIDGE_LENGTH_HELPTEXT
strval = STR_CONFIG_SETTING_TILE_LENGTH
[SDT_VAR]
base = GameSettings
var = construction.max_bridge_height
type = SLE_UINT8
from = 194
guiflags = SGF_NO_NETWORK
def = 12
min = 1
max = MAX_TILE_HEIGHT
interval = 1
str = STR_CONFIG_SETTING_MAX_BRIDGE_HEIGHT
strhelp = STR_CONFIG_SETTING_MAX_BRIDGE_HEIGHT_HELPTEXT
strval = STR_JUST_COMMA
cat = SC_EXPERT
[SDT_VAR]
base = GameSettings
var = construction.max_tunnel_length
@@ -494,7 +535,7 @@ from = 159
guiflags = SGF_NO_NETWORK
def = 64
min = 1
max = 2048
max = MAX_MAP_SIZE
interval = 1
str = STR_CONFIG_SETTING_MAX_TUNNEL_LENGTH
strhelp = STR_CONFIG_SETTING_MAX_TUNNEL_LENGTH_HELPTEXT
@@ -836,8 +877,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]
@@ -935,7 +974,7 @@ max = 5000
str = STR_CONFIG_SETTING_MAX_TRAINS
strhelp = STR_CONFIG_SETTING_MAX_TRAINS_HELPTEXT
strval = STR_JUST_COMMA
proc = RedrawScreen
proc = MaxVehiclesChanged
cat = SC_BASIC
[SDT_VAR]
@@ -948,7 +987,7 @@ max = 5000
str = STR_CONFIG_SETTING_MAX_ROAD_VEHICLES
strhelp = STR_CONFIG_SETTING_MAX_ROAD_VEHICLES_HELPTEXT
strval = STR_JUST_COMMA
proc = RedrawScreen
proc = MaxVehiclesChanged
cat = SC_BASIC
[SDT_VAR]
@@ -961,7 +1000,7 @@ max = 5000
str = STR_CONFIG_SETTING_MAX_AIRCRAFT
strhelp = STR_CONFIG_SETTING_MAX_AIRCRAFT_HELPTEXT
strval = STR_JUST_COMMA
proc = RedrawScreen
proc = MaxVehiclesChanged
cat = SC_BASIC
[SDT_VAR]
@@ -974,7 +1013,7 @@ max = 5000
str = STR_CONFIG_SETTING_MAX_SHIPS
strhelp = STR_CONFIG_SETTING_MAX_SHIPS_HELPTEXT
strval = STR_JUST_COMMA
proc = RedrawScreen
proc = MaxVehiclesChanged
cat = SC_BASIC
[SDTG_BOOL]
@@ -1091,8 +1130,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
@@ -1127,16 +1164,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
@@ -1185,8 +1219,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]
@@ -1212,8 +1244,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]
@@ -1334,10 +1364,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
@@ -1436,8 +1468,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.
@@ -2133,11 +2163,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]
@@ -2157,11 +2188,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
min = TGEN_SMOOTHNESS_BEGIN
max = TGEN_SMOOTHNESS_END - 1
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
@@ -2170,9 +2202,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
@@ -2189,11 +2225,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]
@@ -2247,8 +2284,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
@@ -2320,9 +2355,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
@@ -2485,9 +2524,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]
@@ -2572,13 +2615,14 @@ strhelp = STR_CONFIG_SETTING_ERRMSG_DURATION_HELPTEXT
strval = STR_CONFIG_SETTING_ERRMSG_DURATION_VALUE
[SDTC_VAR]
var = gui.hover_delay
type = SLE_UINT8
var = gui.hover_delay_ms
type = SLE_UINT16
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
guiflags = SGF_0ISDISABLED
def = 2
min = 1
max = 5
def = 250
min = 50
max = 6000
interval = 50
str = STR_CONFIG_SETTING_HOVER_DELAY
strhelp = STR_CONFIG_SETTING_HOVER_DELAY_HELPTEXT
strval = STR_CONFIG_SETTING_HOVER_DELAY_VALUE
@@ -2659,7 +2703,7 @@ flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
guiflags = SGF_MULTISTRING
def = ZOOM_LVL_MIN
min = ZOOM_LVL_MIN
max = ZOOM_LVL_GUI
max = ZOOM_LVL_OUT_4X
str = STR_CONFIG_SETTING_ZOOM_MIN
strhelp = STR_CONFIG_SETTING_ZOOM_MIN_HELPTEXT
strval = STR_CONFIG_SETTING_ZOOM_LVL_MIN
@@ -3165,9 +3209,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
@@ -3481,12 +3522,12 @@ strval = STR_CONFIG_SETTING_NEWS_MESSAGES_OFF
[SDTC_VAR]
ifdef = ENABLE_NETWORK
var = gui.network_chat_box_width
var = gui.network_chat_box_width_pct
type = SLE_UINT16
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
def = 620
min = 200
max = 65535
def = 40
min = 10
max = 100
cat = SC_EXPERT
[SDTC_VAR]