diff options
Diffstat (limited to 'src/settings_gui.cpp')
| -rw-r--r-- | src/settings_gui.cpp | 95 |
1 files changed, 71 insertions, 24 deletions
diff --git a/src/settings_gui.cpp b/src/settings_gui.cpp index 0b5917490..9a17ab1c7 100644 --- a/src/settings_gui.cpp +++ b/src/settings_gui.cpp @@ -1459,44 +1459,67 @@ static SettingEntry _settings_ui_interaction[] = { static SettingsPage _settings_ui_interaction_page = {_settings_ui_interaction, lengthof(_settings_ui_interaction)}; static SettingEntry _settings_ui_sound[] = { - SettingEntry("sound.click_beep"), - SettingEntry("sound.confirm"), - SettingEntry("sound.news_ticker"), - SettingEntry("sound.news_full"), - SettingEntry("sound.new_year"), - SettingEntry("sound.disaster"), - SettingEntry("sound.vehicle"), - SettingEntry("sound.ambient"), + SettingEntry("sound.click_beep"), + SettingEntry("sound.confirm"), + SettingEntry("sound.news_ticker"), + SettingEntry("sound.news_full"), + SettingEntry("sound.new_year"), + SettingEntry("sound.disaster"), + SettingEntry("sound.vehicle"), + SettingEntry("sound.ambient"), }; /** Sound effects sub-page */ static SettingsPage _settings_ui_sound_page = {_settings_ui_sound, lengthof(_settings_ui_sound)}; static SettingEntry _settings_ui_news[] = { - SettingEntry("news_display.arrival_player"), - SettingEntry("news_display.arrival_other"), - SettingEntry("news_display.accident"), - SettingEntry("news_display.company_info"), - SettingEntry("news_display.open"), - SettingEntry("news_display.close"), - SettingEntry("news_display.economy"), - SettingEntry("news_display.production_player"), - SettingEntry("news_display.production_other"), - SettingEntry("news_display.production_nobody"), - SettingEntry("news_display.advice"), - SettingEntry("news_display.new_vehicles"), - SettingEntry("news_display.acceptance"), - SettingEntry("news_display.subsidies"), - SettingEntry("news_display.general"), - SettingEntry("gui.coloured_news_year"), + SettingEntry("news_display.arrival_player"), + SettingEntry("news_display.arrival_other"), + SettingEntry("news_display.accident"), + SettingEntry("news_display.company_info"), + SettingEntry("news_display.open"), + SettingEntry("news_display.close"), + SettingEntry("news_display.economy"), + SettingEntry("news_display.production_player"), + SettingEntry("news_display.production_other"), + SettingEntry("news_display.production_nobody"), + SettingEntry("news_display.advice"), + SettingEntry("news_display.new_vehicles"), + SettingEntry("news_display.acceptance"), + SettingEntry("news_display.subsidies"), + SettingEntry("news_display.general"), + SettingEntry("gui.coloured_news_year"), }; /** News sub-page */ static SettingsPage _settings_ui_news_page = {_settings_ui_news, lengthof(_settings_ui_news)}; + +static SettingEntry _settings_ui_departureboards[] = { + SettingEntry("gui.max_departures"), + SettingEntry("gui.max_departure_time"), + SettingEntry("gui.departure_calc_frequency"), + SettingEntry("gui.departure_show_vehicle"), + SettingEntry("gui.departure_show_group"), + SettingEntry("gui.departure_show_company"), + SettingEntry("gui.departure_show_vehicle_type"), + SettingEntry("gui.departure_show_vehicle_color"), + SettingEntry("gui.departure_larger_font"), + SettingEntry("gui.departure_destination_type"), + SettingEntry("gui.departure_show_both"), + SettingEntry("gui.departure_only_passengers"), + SettingEntry("gui.departure_smart_terminus"), + SettingEntry("gui.departure_conditionals"), + SettingEntry("gui.departure_show_all_stops"), + SettingEntry("gui.departure_merge_identical"), +}; +/** Departureboards sub-page */ +static SettingsPage _settings_ui_departureboards_page = {_settings_ui_departureboards, lengthof(_settings_ui_departureboards)}; + static SettingEntry _settings_ui[] = { SettingEntry(&_settings_ui_display_page, STR_CONFIG_SETTING_DISPLAY_OPTIONS), SettingEntry(&_settings_ui_interaction_page, STR_CONFIG_SETTING_INTERACTION), SettingEntry(&_settings_ui_sound_page, STR_CONFIG_SETTING_SOUND), SettingEntry(&_settings_ui_news_page, STR_CONFIG_SETTING_NEWS), + SettingEntry(&_settings_ui_departureboards_page, STR_CONFIG_SETTING_DEPARTUREBOARDS), SettingEntry("gui.show_finances"), SettingEntry("gui.errmsg_duration"), SettingEntry("gui.hover_delay"), @@ -1506,6 +1529,11 @@ static SettingEntry _settings_ui[] = { SettingEntry("gui.pause_on_newgame"), SettingEntry("gui.advanced_vehicle_list"), SettingEntry("gui.timetable_in_ticks"), + SettingEntry("gui.time_in_minutes"), + SettingEntry("gui.timetable_start_text_entry"), + SettingEntry("gui.ticks_per_minute"), + SettingEntry("gui.date_with_time"), + SettingEntry("gui.clock_offset"), SettingEntry("gui.timetable_arrival_departure"), SettingEntry("gui.quick_goto"), SettingEntry("gui.default_rail_type"), @@ -1518,6 +1546,7 @@ static SettingsPage _settings_ui_page = {_settings_ui, lengthof(_settings_ui)}; static SettingEntry _settings_construction_signals[] = { SettingEntry("construction.train_signal_side"), SettingEntry("gui.enable_signal_gui"), + SettingEntry("gui.simulated_wormhole_signals"), SettingEntry("gui.drag_signals_fixed_distance"), SettingEntry("gui.semaphore_build_before"), SettingEntry("gui.default_signal_type"), @@ -1526,8 +1555,21 @@ static SettingEntry _settings_construction_signals[] = { /** Signals subpage */ static SettingsPage _settings_construction_signals_page = {_settings_construction_signals, lengthof(_settings_construction_signals)}; +static SettingEntry _settings_construction_trafficlights[] = { + SettingEntry("construction.traffic_lights"), + SettingEntry("construction.towns_build_traffic_lights"), + SettingEntry("construction.allow_building_tls_in_towns"), + SettingEntry("construction.traffic_lights_green_phase"), + SettingEntry("construction.max_tlc_size"), + SettingEntry("construction.max_tlc_distance"), +}; + +/** Traffic lights subpage */ +static SettingsPage _settings_construction_trafficlights_page = {_settings_construction_trafficlights, lengthof(_settings_construction_trafficlights)}; + static SettingEntry _settings_construction[] = { SettingEntry(&_settings_construction_signals_page, STR_CONFIG_SETTING_CONSTRUCTION_SIGNALS), + SettingEntry(&_settings_construction_trafficlights_page, STR_CONFIG_SETTING_CONSTRUCTION_TRAFFIC_LIGHTS), SettingEntry("construction.build_on_slopes"), SettingEntry("construction.autoslope"), SettingEntry("construction.extra_dynamite"), @@ -1576,6 +1618,7 @@ static SettingEntry _settings_economy_towns[] = { SettingEntry("economy.town_growth_rate"), SettingEntry("economy.larger_towns"), SettingEntry("economy.initial_city_size"), + SettingEntry("economy.random_road_construction"), }; /** Towns sub-page */ static SettingsPage _settings_economy_towns_page = {_settings_economy_towns, lengthof(_settings_economy_towns)}; @@ -1601,6 +1644,9 @@ static SettingEntry _settings_economy[] = { SettingEntry("economy.smooth_economy"), SettingEntry("economy.feeder_payment_share"), SettingEntry("economy.infrastructure_maintenance"), + SettingEntry("economy.cargodest.mode_pax_mail"), + SettingEntry("economy.cargodest.mode_town_cargo"), + SettingEntry("economy.cargodest.mode_others"), SettingEntry("difficulty.vehicle_costs"), SettingEntry("difficulty.construction_cost"), SettingEntry("difficulty.disasters"), @@ -1690,6 +1736,7 @@ static SettingEntry _settings_vehicles[] = { SettingEntry("vehicle.max_ships"), SettingEntry("vehicle.plane_speed"), SettingEntry("vehicle.plane_crashes"), + SettingEntry("order.automatic_timetable_separation"), SettingEntry("vehicle.dynamic_engines"), SettingEntry("vehicle.roadveh_acceleration_model"), SettingEntry("vehicle.roadveh_slope_steepness"), |