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

Import departure boards patch

Browse Source
This commit is contained in:
patch-import
2015-08-01 19:47:09 +01:00
committed by Jonathan G Rennison
parent 4dbabbd9e2
commit 79138de1b9
31 changed files with 2446 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/table/control_codes.h
View File

@@ -66,6 +66,10 @@ enum StringControlCode {
SCC_DATE_SHORT,
SCC_DATE_LONG,
SCC_DATE_ISO,
SCC_DATE_WALLCLOCK_TINY,
SCC_DATE_WALLCLOCK_SHORT,
SCC_DATE_WALLCLOCK_LONG,
SCC_DATE_WALLCLOCK_ISO,
/* Must be consecutive */
SCC_STRING1,

186
src/table/settings.ini
View File

@@ -2814,6 +2814,59 @@ strhelp = STR_CONFIG_SETTING_TIMETABLE_IN_TICKS_HELPTEXT
proc = InvalidateVehTimetableWindow
cat = SC_EXPERT
[SDTC_BOOL]
var = gui.time_in_minutes
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
def = false
str = STR_CONFIG_SETTING_TIME_IN_MINUTES
strhelp = STR_CONFIG_SETTING_TIME_IN_MINUTES_HELPTEXT
proc = InvalidateVehTimetableWindow
[SDTC_BOOL]
var = gui.timetable_start_text_entry
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
def = false
str = STR_CONFIG_SETTING_TIMETABLE_START_TEXT_ENTRY
strhelp = STR_CONFIG_SETTING_TIMETABLE_START_TEXT_ENTRY_HELPTEXT
[SDTC_VAR]
var = gui.ticks_per_minute
type = SLE_UINT8
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
strval = STR_JUST_INT
def = 74
min = 1
max = 255
str = STR_CONFIG_SETTING_TICKS_PER_MINUTE
strhelp = STR_CONFIG_SETTING_TICKS_PER_MINUTE_HELPTEXT
proc = RedrawScreen
[SDTC_VAR]
var = gui.date_with_time
type = SLE_UINT8
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
guiflags = SGF_MULTISTRING
def = 0
min = 0
max = 3
str = STR_CONFIG_SETTING_DATE_WITH_TIME
strval = STR_CONFIG_SETTING_DATE_WITH_TIME_NONE
strhelp = STR_CONFIG_SETTING_DATE_WITH_TIME_HELPTEXT
proc = RedrawScreen
[SDTC_VAR]
var = gui.clock_offset
type = SLE_UINT16
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
strval = STR_JUST_INT
def = 0
min = 0
max = 1439
interval = 60
str = STR_CONFIG_SETTING_CLOCK_OFFSET
strhelp = STR_CONFIG_SETTING_CLOCK_OFFSET_HELPTEXT
proc = RedrawScreen
[SDTC_BOOL]
var = gui.timetable_arrival_departure
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ -2822,6 +2875,139 @@ str = STR_CONFIG_SETTING_TIMETABLE_SHOW_ARRIVAL_DEPARTURE
strhelp = STR_CONFIG_SETTING_TIMETABLE_SHOW_ARRIVAL_DEPARTURE_HELPTEXT
proc = InvalidateVehTimetableWindow
[SDTC_VAR]
var = gui.max_departures
type = SLE_UINT8
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
strval = STR_JUST_INT
def = 10
min = 1
max = 30
interval = 1
str = STR_CONFIG_MAX_DEPARTURES
strhelp = STR_CONFIG_MAX_DEPARTURES_HELPTEXT
[SDTC_VAR]
var = gui.max_departure_time
type = SLE_UINT16
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
strval = STR_JUST_INT
def = 120
min = 30
max = 240
interval = 1
str = STR_CONFIG_MAX_DEPARTURE_TIME
strhelp = STR_CONFIG_MAX_DEPARTURE_TIME_HELPTEXT
[SDTC_VAR]
var = gui.departure_calc_frequency
type = SLE_UINT16
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
strval = STR_JUST_INT
def = 10
min = 1
max = 120
interval = 1
str = STR_CONFIG_DEPARTURE_CALC_FREQUENCY
strhelp = STR_CONFIG_DEPARTURE_CALC_FREQUENCY_HELPTEXT
[SDTC_BOOL]
var = gui.departure_show_vehicle
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
def = false
str = STR_CONFIG_DEPARTURE_VEHICLE_NAME
strhelp = STR_CONFIG_DEPARTURE_VEHICLE_NAME_HELPTEXT
[SDTC_BOOL]
var = gui.departure_show_group
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
def = false
str = STR_CONFIG_DEPARTURE_GROUP_NAME
strhelp = STR_CONFIG_DEPARTURE_GROUP_NAME_HELPTEXT
[SDTC_BOOL]
var = gui.departure_show_company
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
def = false
str = STR_CONFIG_DEPARTURE_COMPANY_NAME
strhelp = STR_CONFIG_DEPARTURE_COMPANY_NAME_HELPTEXT
[SDTC_BOOL]
var = gui.departure_show_vehicle_type
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
def = false
str = STR_CONFIG_DEPARTURE_VEHICLE_TYPE
strhelp = STR_CONFIG_DEPARTURE_VEHICLE_TYPE_HELPTEXT
[SDTC_BOOL]
var = gui.departure_show_vehicle_color
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
def = false
str = STR_CONFIG_DEPARTURE_VEHICLE_COLOR
strhelp = STR_CONFIG_DEPARTURE_VEHICLE_COLOR_HELPTEXT
[SDTC_BOOL]
var = gui.departure_larger_font
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
def = false
str = STR_CONFIG_DEPARTURE_LARGER_FONT
strhelp = STR_CONFIG_DEPARTURE_LARGER_FONT_HELPTEXT
[SDTC_BOOL]
var = gui.departure_destination_type
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
def = false
str = STR_CONFIG_DEPARTURE_DESTINATION_TYPE
strhelp = STR_CONFIG_DEPARTURE_DESTINATION_TYPE_HELPTEXT
[SDTC_BOOL]
var = gui.departure_show_both
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
def = false
str = STR_CONFIG_DEPARTURE_SHOW_BOTH
strhelp = STR_CONFIG_DEPARTURE_SHOW_BOTH_HELPTEXT
[SDTC_BOOL]
var = gui.departure_only_passengers
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
def = false
str = STR_CONFIG_DEPARTURE_ONLY_PASSENGERS
strhelp = STR_CONFIG_DEPARTURE_ONLY_PASSENGERS_HELPTEXT
[SDTC_BOOL]
var = gui.departure_smart_terminus
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
def = false
str = STR_CONFIG_DEPARTURE_SMART_TERMINUS
strhelp = STR_CONFIG_DEPARTURE_SMART_TERMINUS_HELPTEXT
[SDTC_BOOL]
var = gui.departure_show_all_stops
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
def = false
str = STR_CONFIG_DEPARTURE_SHOW_ALL_STOPS
strhelp = STR_CONFIG_DEPARTURE_SHOW_ALL_STOPS_HELPTEXT
[SDTC_BOOL]
var = gui.departure_merge_identical
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
def = false
str = STR_CONFIG_DEPARTURE_MERGE_IDENTICAL
strhelp = STR_CONFIG_DEPARTURE_MERGE_IDENTICAL_HELPTEXT
[SDTC_VAR]
var = gui.departure_conditionals
type = SLE_UINT8
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
guiflags = SGF_MULTISTRING
def = 0
min = 0
max = 2
str = STR_CONFIG_DEPARTURE_CONDITIONALS
strval = STR_CONFIG_DEPARTURE_CONDITIONALS_1
strhelp = STR_CONFIG_DEPARTURE_CONDITIONALS_HELPTEXT
proc = RedrawScreen
[SDTC_BOOL]
var = gui.quick_goto
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC

4
src/table/strgen_tables.h
View File

@@ -90,6 +90,10 @@ static const CmdStruct _cmd_structs[] = {
{"DATE_SHORT", EmitSingleChar, SCC_DATE_SHORT, 1, C_CASE},
{"DATE_LONG", EmitSingleChar, SCC_DATE_LONG, 1, C_CASE},
{"DATE_ISO", EmitSingleChar, SCC_DATE_ISO, 1, C_NONE},
{"DATE_WALLCLOCK_TINY", EmitSingleChar, SCC_DATE_WALLCLOCK_TINY, 1, C_NONE},
{"DATE_WALLCLOCK_SHORT", EmitSingleChar, SCC_DATE_WALLCLOCK_SHORT, 1, C_NONE},
{"DATE_WALLCLOCK_LONG", EmitSingleChar, SCC_DATE_WALLCLOCK_LONG, 1, C_NONE},
{"DATE_WALLCLOCK_ISO", EmitSingleChar, SCC_DATE_WALLCLOCK_ISO, 1, C_NONE},
{"STRING", EmitSingleChar, SCC_STRING, 1, C_CASE | C_GENDER},
{"RAW_STRING", EmitSingleChar, SCC_RAW_STRING_POINTER, 1, C_NONE | C_GENDER},