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

(svn r22210) -Add: Add a variable for the value strings in the settings tables.

Browse Source
This commit is contained in:
alberth
2011-03-06 15:51:44 +00:00
parent 26ba8bd23e
commit a7e7e76f7f
9 changed files with 127 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
src/table/settings.ini
View File

@@ -60,17 +60,17 @@ const SettingDesc _settings[] = {
[post-amble]
};
[templates]
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),
SDTC_BOOL = SDTC_BOOL( $var, $flags, $guiflags, $def, $str, $proc, $from, $to),
SDTC_LIST = SDTC_LIST( $var, $type, $flags, $guiflags, $def, $str, $proc, $from, $to),
SDTC_OMANY = SDTC_OMANY( $var, $type, $flags, $guiflags, $def, $max, $full, $str, $proc, $from, $to),
SDTC_STR = SDTC_STR( $var, $type, $flags, $guiflags, $def, $str, $proc, $from, $to),
SDTC_VAR = SDTC_VAR( $var, $type, $flags, $guiflags, $def, $min, $max, $interval, $str, $proc, $from, $to),
SDT_BOOL = SDT_BOOL($base, $var, $flags, $guiflags, $def, $str, $proc, $from, $to),
SDT_OMANY = SDT_OMANY($base, $var, $type, $flags, $guiflags, $def, $max, $full, $str, $proc, $from, $to, $load),
SDT_STR = SDT_STR($base, $var, $type, $flags, $guiflags, $def, $str, $proc, $from, $to),
SDT_VAR = SDT_VAR($base, $var, $type, $flags, $guiflags, $def, $min, $max, $interval, $str, $proc, $from, $to),
SDTG_BOOL = SDTG_BOOL($name, $flags, $guiflags, $var, $def, $str, $strval, $proc, $from, $to),
SDTG_VAR = SDTG_VAR($name, $type, $flags, $guiflags, $var, $def, $min, $max, $interval, $str, $strval, $proc, $from, $to),
SDTC_BOOL = SDTC_BOOL( $var, $flags, $guiflags, $def, $str, $strval, $proc, $from, $to),
SDTC_LIST = SDTC_LIST( $var, $type, $flags, $guiflags, $def, $str, $strval, $proc, $from, $to),
SDTC_OMANY = SDTC_OMANY( $var, $type, $flags, $guiflags, $def, $max, $full, $str, $strval, $proc, $from, $to),
SDTC_STR = SDTC_STR( $var, $type, $flags, $guiflags, $def, $str, $strval, $proc, $from, $to),
SDTC_VAR = SDTC_VAR( $var, $type, $flags, $guiflags, $def, $min, $max, $interval, $str, $strval, $proc, $from, $to),
SDT_BOOL = SDT_BOOL($base, $var, $flags, $guiflags, $def, $str, $strval, $proc, $from, $to),
SDT_OMANY = SDT_OMANY($base, $var, $type, $flags, $guiflags, $def, $max, $full, $str, $strval, $proc, $from, $to, $load),
SDT_STR = SDT_STR($base, $var, $type, $flags, $guiflags, $def, $str, $strval, $proc, $from, $to),
SDT_VAR = SDT_VAR($base, $var, $type, $flags, $guiflags, $def, $min, $max, $interval, $str, $strval, $proc, $from, $to),
SDT_NULL = SDT_NULL($length, $from, $to),
SDT_END = SDT_END()
@@ -79,6 +79,7 @@ flags = 0
guiflags = 0
interval = 0
str = STR_NULL
strval = STR_NULL
proc = NULL
load = NULL
from = 0
@@ -114,7 +115,7 @@ def = 2
min = 0
max = 4
interval = 1
str = STR_NUM_VERY_LOW
strval = STR_NUM_VERY_LOW
proc = DifficultyChange
[SDT_VAR]
@@ -127,7 +128,7 @@ def = ID_END - 1
min = 0
max = ID_END - 1
interval = 1
str = STR_FUNDING_ONLY
strval = STR_FUNDING_ONLY
proc = DifficultyChange
[SDT_VAR]
@@ -164,7 +165,7 @@ def = 0
min = 0
max = 2
interval = 1
str = STR_SEA_LEVEL_LOW
strval = STR_SEA_LEVEL_LOW
proc = DifficultyChange
[SDT_VAR]
@@ -176,7 +177,7 @@ def = 2
min = 0
max = 4
interval = 1
str = STR_AI_SPEED_VERY_SLOW
strval = STR_AI_SPEED_VERY_SLOW
proc = DifficultyChange
[SDT_NULL]
@@ -193,7 +194,7 @@ def = 1
min = 0
max = 2
interval = 1
str = STR_DISASTER_NONE
strval = STR_DISASTER_NONE
proc = DifficultyChange
[SDT_VAR]
@@ -205,7 +206,7 @@ def = 2
min = 0
max = 3
interval = 1
str = STR_SUBSIDY_X1_5
strval = STR_SUBSIDY_X1_5
proc = DifficultyChange
[SDT_VAR]
@@ -218,7 +219,7 @@ def = 0
min = 0
max = 2
interval = 1
str = STR_SEA_LEVEL_LOW
strval = STR_SEA_LEVEL_LOW
proc = DifficultyChange
[SDT_VAR]
@@ -231,7 +232,7 @@ def = 1
min = 0
max = 3
interval = 1
str = STR_TERRAIN_TYPE_VERY_FLAT
strval = STR_TERRAIN_TYPE_VERY_FLAT
proc = DifficultyChange
[SDT_VAR]
@@ -244,7 +245,7 @@ def = 0
min = 0
max = 4
interval = 1
str = STR_SEA_LEVEL_VERY_LOW
strval = STR_SEA_LEVEL_VERY_LOW
proc = DifficultyChange
[SDT_VAR]
@@ -256,7 +257,7 @@ def = 0
min = 0
max = 1
interval = 1
str = STR_ECONOMY_STEADY
strval = STR_ECONOMY_STEADY
proc = DifficultyChange
[SDT_VAR]
@@ -268,7 +269,7 @@ def = 0
min = 0
max = 1
interval = 1
str = STR_REVERSE_AT_END_OF_LINE_AND_AT_STATIONS
strval = STR_REVERSE_AT_END_OF_LINE_AND_AT_STATIONS
proc = DifficultyChange
[SDT_VAR]
@@ -280,7 +281,7 @@ def = 0
min = 0
max = 1
interval = 1
str = STR_DISASTERS_OFF
strval = STR_DISASTERS_OFF
proc = DifficultyChange
[SDT_VAR]
@@ -292,7 +293,7 @@ def = 0
min = 0
max = 2
interval = 1
str = STR_CITY_APPROVAL_PERMISSIVE
strval = STR_CITY_APPROVAL_PERMISSIVE
proc = DifficultyNoiseChange
[SDT_VAR]
@@ -369,6 +370,7 @@ min = 0
max = 3
interval = 1
str = STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL
str = STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL_NO_ACTIONS
[SDT_VAR]
base = GameSettings
@@ -479,6 +481,7 @@ min = TL_BEGIN
max = NUM_TLS - 1
interval = 1
str = STR_CONFIG_SETTING_TOWN_LAYOUT
strval = STR_CONFIG_SETTING_TOWN_LAYOUT_DEFAULT
proc = TownFoundingChanged
[SDT_BOOL]
@@ -500,6 +503,7 @@ min = TF_BEGIN
max = TF_END - 1
interval = 1
str = STR_CONFIG_SETTING_TOWN_FOUNDING
strval = STR_CONFIG_SETTING_TOWN_FOUNDING_FORBIDDEN
proc = TownFoundingChanged
[SDT_BOOL]
@@ -522,6 +526,7 @@ min = 0
max = 1
interval = 1
str = STR_CONFIG_SETTING_TRAIN_ACCELERATION_MODEL
strval = STR_CONFIG_SETTING_TRAIN_ACCELERATION_MODEL_ORIGINAL
proc = TrainAccelerationModelChanged
[SDT_VAR]
@@ -535,6 +540,7 @@ min = 0
max = 1
interval = 1
str = STR_CONFIG_SETTING_ROAD_VEHICLE_ACCELERATION_MODEL
strval = STR_CONFIG_SETTING_ROAD_VEHICLE_ACCELERATION_MODEL_ORIGINAL
proc = RoadVehAccelerationModelChanged
[SDT_VAR]
@@ -593,6 +599,7 @@ def = 1
min = 0
max = 2
str = STR_CONFIG_SETTING_SMOKE_AMOUNT
strval = STR_CONFIG_SETTING_SMOKE_AMOUNT_NONE
; order.gotodepot
[SDT_NULL]
@@ -646,6 +653,7 @@ min = 1
max = 2
interval = 1
str = STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS
strval = STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS_NPF
[SDT_VAR]
base = GameSettings
@@ -658,6 +666,7 @@ min = 1
max = 2
interval = 1
str = STR_CONFIG_SETTING_PATHFINDER_FOR_ROAD_VEHICLES
strval = STR_CONFIG_SETTING_PATHFINDER_FOR_ROAD_VEHICLES_NPF
[SDT_VAR]
base = GameSettings
@@ -670,6 +679,7 @@ min = 0
max = 2
interval = 1
str = STR_CONFIG_SETTING_PATHFINDER_FOR_SHIPS
strval = STR_CONFIG_SETTING_PATHFINDER_FOR_SHIPS_OPF
[SDT_BOOL]
base = GameSettings
@@ -838,6 +848,7 @@ min = 0
max = 2
interval = 1
str = STR_CONFIG_SETTING_PLANE_CRASHES
strval = STR_CONFIG_SETTING_PLANE_CRASHES_NONE
; station.join_stations
[SDT_NULL]
@@ -959,6 +970,7 @@ def = 0
min = 0
max = 2
str = STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD
strval = STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NONE
proc = InvalidateBuildIndustryWindow
[SDT_VAR]
@@ -1072,6 +1084,7 @@ def = 2
min = 0
max = 4
str = STR_CONFIG_SETTING_TOWN_GROWTH
strval = STR_CONFIG_SETTING_TOWN_GROWTH_NONE
[SDT_VAR]
base = GameSettings
@@ -1704,6 +1717,7 @@ def = 1
min = 0
max = 1
str = STR_CONFIG_SETTING_LAND_GENERATOR
strval = STR_CONFIG_SETTING_LAND_GENERATOR_ORIGINAL
[SDT_VAR]
base = GameSettings
@@ -1725,6 +1739,7 @@ def = 1
min = 0
max = 3
str = STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN
strval = STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN_VERY_SMOOTH
[SDT_VAR]
base = GameSettings
@@ -1754,6 +1769,7 @@ def = 2
min = 0
max = 2
str = STR_CONFIG_SETTING_TREE_PLACER
strval = STR_CONFIG_SETTING_TREE_PLACER_NONE
[SDT_VAR]
base = GameSettings
@@ -1765,6 +1781,7 @@ def = 0
min = 0
max = 1
str = STR_CONFIG_SETTING_HEIGHTMAP_ROTATION
strval = STR_CONFIG_SETTING_HEIGHTMAP_ROTATION_COUNTER_CLOCKWISE
[SDT_VAR]
base = GameSettings
@@ -1831,6 +1848,7 @@ def = 2
min = 0
max = 2
str = STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT
strval = STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE
[SDT_VAR]
base = GameSettings
@@ -1918,6 +1936,7 @@ def = 0
max = 2
full = _savegame_date
str = STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES
strval = STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_LONG
[SDTC_BOOL]
var = gui.show_finances
@@ -1983,6 +2002,7 @@ def = 1
min = 0
max = 2
str = STR_CONFIG_SETTING_TOOLBAR_POS
strval = STR_CONFIG_SETTING_TOOLBAR_POS_LEFT
proc = v_PositionMainToolbar
[SDTC_VAR]
@@ -1994,6 +2014,7 @@ def = 1
min = 0
max = 2
str = STR_CONFIG_SETTING_STATUSBAR_POS
strval = STR_CONFIG_SETTING_STATUSBAR_POS_LEFT
proc = v_PositionStatusbar
[SDTC_VAR]
@@ -2039,6 +2060,7 @@ def = 0
min = 0
max = 2
str = STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR
strval = STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR_GREEN
proc = RedrawSmallmap
[SDTC_VAR]
@@ -2050,6 +2072,7 @@ def = 2
min = 0
max = 2
str = STR_CONFIG_SETTING_LIVERIES
strval = STR_CONFIG_SETTING_LIVERIES_NONE
proc = InvalidateCompanyLiveryWindow
[SDTC_BOOL]
@@ -2067,6 +2090,7 @@ def = 0
min = 0
max = 2
str = STR_CONFIG_SETTING_SCROLLWHEEL_SCROLLING
strval = STR_CONFIG_SETTING_SCROLLWHEEL_ZOOM
[SDTC_VAR]
var = gui.scrollwheel_multiplier
@@ -2093,6 +2117,7 @@ def = 1
min = 0
max = 2
str = STR_CONFIG_SETTING_ADVANCED_VEHICLE_LISTS
strval = STR_CONFIG_SETTING_ADVANCED_VEHICLE_LISTS_OFF
[SDTC_BOOL]
var = gui.timetable_in_ticks
@@ -2123,6 +2148,7 @@ def = 1
min = 0
max = 2
str = STR_CONFIG_SETTING_LOADING_INDICATORS
strval = STR_CONFIG_SETTING_LOADING_INDICATORS_OFF
proc = RedrawScreen
[SDTC_VAR]
@@ -2134,6 +2160,7 @@ def = 0
min = 0
max = 2
str = STR_CONFIG_SETTING_DEFAULT_RAIL_TYPE
strval = STR_CONFIG_SETTING_DEFAULT_RAIL_TYPE_FIRST
[SDTC_BOOL]
var = gui.enable_signal_gui
@@ -2190,6 +2217,7 @@ def = 2
min = 0
max = 2
str = STR_CONFIG_SETTING_ORDER_REVIEW
strval = STR_CONFIG_SETTING_ORDER_REVIEW_OFF
[SDTC_BOOL]
var = gui.lost_vehicle_warn
@@ -2220,6 +2248,7 @@ min = 0
max = 2
interval = 1
str = STR_CONFIG_SETTING_STOP_LOCATION
strval = STR_CONFIG_SETTING_STOP_LOCATION_NEAR_END
[SDTC_BOOL]
var = gui.keep_all_autosave
@@ -2269,6 +2298,7 @@ min = 0
max = 2
interval = 1
str = STR_CONFIG_SETTING_DEFAULT_SIGNAL_TYPE
strval = STR_CONFIG_SETTING_DEFAULT_SIGNAL_NORMAL
[SDTC_VAR]
var = gui.cycle_signal_types
@@ -2280,6 +2310,7 @@ min = 0
max = 2
interval = 1
str = STR_CONFIG_SETTING_CYCLE_SIGNAL_TYPES
strval = STR_CONFIG_SETTING_CYCLE_SIGNAL_NORMAL
[SDTC_VAR]
var = gui.station_numtracks
@@ -2787,6 +2818,7 @@ def = 0
min = 0
max = 2
str = STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU
strval = STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU_COMMAND
[SDT_END]