From ccfdf626ad3c250c8f4997a78c3ff7156d1ee06a Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Sat, 18 Nov 2023 14:52:30 +0000 Subject: [PATCH] Replace SF_ENABLE_TABLE_PATS flag and SC_PATCH with SF_PATCH --- src/saveload/settings_sl.cpp | 2 +- src/settings.cpp | 1 - src/settings_gui.cpp | 2 +- src/settings_internal.h | 4 +- src/table/settings/company_settings.ini | 41 +-- src/table/settings/gui_settings.ini | 280 ++++++------------ src/table/settings/multimedia_settings.ini | 7 +- src/table/settings/news_display_settings.ini | 3 +- src/table/settings/scenario_settings.ini | 19 +- src/table/settings/settings.ini | 291 +++++++++---------- 10 files changed, 253 insertions(+), 397 deletions(-) diff --git a/src/saveload/settings_sl.cpp b/src/saveload/settings_sl.cpp index 1571dc8fe5..a484b6df27 100644 --- a/src/saveload/settings_sl.cpp +++ b/src/saveload/settings_sl.cpp @@ -36,7 +36,7 @@ static std::vector GetSettingsDesc(bool is_loading) std::vector saveloads; for (auto &sd : GetSettingsTableInternal()) { if (sd->flags & SF_NOT_IN_SAVE) continue; - if (!SlXvIsFeaturePresent(XSLFI_TABLE_PATS) && sd->patx_name != nullptr && !(sd->flags & SF_ENABLE_TABLE_PATS)) continue; + if (is_loading && !SlXvIsFeaturePresent(XSLFI_TABLE_PATS) && (sd->flags & SF_PATCH)) continue; if (!sd->save.ext_feature_test.IsFeaturePresent(_sl_version, sd->save.version_from, sd->save.version_to)) continue; VarType new_type = 0; diff --git a/src/settings.cpp b/src/settings.cpp index bda076c413..4c6570445a 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -3218,7 +3218,6 @@ static std::vector MakeSettingsPatxList(const SettingTable for (auto &sd : settings) { if (sd->patx_name == nullptr) continue; - if ((sd->flags & SF_ENABLE_TABLE_PATS) && SlXvIsFeaturePresent(XSLFI_TABLE_PATS)) continue; sorted_patx_settings.push_back(sd.get()); } diff --git a/src/settings_gui.cpp b/src/settings_gui.cpp index 95b1a824f6..865659b37f 100644 --- a/src/settings_gui.cpp +++ b/src/settings_gui.cpp @@ -1385,7 +1385,7 @@ bool SettingEntry::IsVisibleByRestrictionMode(RestrictionMode mode) const if (mode == RM_BASIC) return (this->setting->cat & SC_BASIC_LIST) != 0; if (mode == RM_ADVANCED) return (this->setting->cat & SC_ADVANCED_LIST) != 0; - if (mode == RM_PATCH) return (this->setting->cat & SC_PATCH_LIST) != 0; + if (mode == RM_PATCH) return (this->setting->flags & SF_PATCH) != 0; /* Read the current value. */ const void *object = ResolveObject(&GetGameSettings(), sd); diff --git a/src/settings_internal.h b/src/settings_internal.h index df4b0bf036..dae2676582 100644 --- a/src/settings_internal.h +++ b/src/settings_internal.h @@ -41,7 +41,7 @@ enum SettingFlag : uint32 { SF_GUI_ADVISE_DEFAULT = 1 << 19, ///< Advise the user to leave this setting at its default value SF_ENUM_PRE_CB_VALIDATE = 1 << 20, ///< Call the pre_check callback for enum incoming value validation SF_CONVERT_BOOL_TO_INT = 1 << 21, ///< Accept a boolean value when loading an int-type setting from the config file - SF_ENABLE_TABLE_PATS = 1 << 22, ///< Enable saving/loading from table mode PATS chunks even when patx_name is set + SF_PATCH = 1 << 22, ///< Do not load from upstream table-mode PATS, also for GUI filtering of "patch" settings SF_PRIVATE = 1 << 23, ///< Setting is in private ini SF_SECRET = 1 << 24, ///< Setting is in secrets ini }; @@ -62,13 +62,11 @@ enum SettingCategory { SC_BASIC_LIST = 1 << 0, ///< Settings displayed in the list of basic settings. SC_ADVANCED_LIST = 1 << 1, ///< Settings displayed in the list of advanced settings. SC_EXPERT_LIST = 1 << 2, ///< Settings displayed in the list of expert settings. - SC_PATCH_LIST = 1 << 3, ///< Settings displayed in the list of non-vanilla settings. /* Setting classification */ SC_BASIC = SC_BASIC_LIST | SC_ADVANCED_LIST | SC_EXPERT_LIST, ///< Basic settings are part of all lists. SC_ADVANCED = SC_ADVANCED_LIST | SC_EXPERT_LIST, ///< Advanced settings are part of advanced and expert list. SC_EXPERT = SC_EXPERT_LIST, ///< Expert settings can only be seen in the expert list. - SC_PATCH = SC_PATCH_LIST, ///< Patch settings which are shown in the patch list. SC_END, }; diff --git a/src/table/settings/company_settings.ini b/src/table/settings/company_settings.ini index 790a3c2a72..fcc1f6bf7b 100644 --- a/src/table/settings/company_settings.ini +++ b/src/table/settings/company_settings.ini @@ -16,8 +16,8 @@ static const SettingTable _company_settings{ [post-amble] }; [templates] -SDT_BOOL = SDT_BOOL(CompanySettings, $var, $flags, $def, $str, $strhelp, $strval, $pre_cb, $post_cb, $from, $to, $extver, $cat | $patchcat, $guiproc, $startup, $patxname), -SDT_VAR = SDT_VAR(CompanySettings, $var, $type, $flags, $def, $min, $max, $interval, $str, $strhelp, $strval, $pre_cb, $post_cb, $from, $to, $extver, $cat | $patchcat, $guiproc, $startup, $patxname), +SDT_BOOL = SDT_BOOL(CompanySettings, $var, $flags, $def, $str, $strhelp, $strval, $pre_cb, $post_cb, $from, $to, $extver, $cat, $guiproc, $startup, $patxname), +SDT_VAR = SDT_VAR(CompanySettings, $var, $type, $flags, $def, $min, $max, $interval, $str, $strhelp, $strval, $pre_cb, $post_cb, $from, $to, $extver, $cat, $guiproc, $startup, $patxname), SDT_NULL = SDT_NULL($length, $from, $to, $extver), [validation] @@ -36,7 +36,6 @@ load = nullptr from = SL_MIN_VERSION to = SL_MAX_VERSION cat = SC_ADVANCED -patchcat = SC_NONE startup = false extver = SlXvFeatureTest() patxname = nullptr @@ -147,28 +146,26 @@ post_cb = [](auto new_value) { UpdateServiceInterval(VEH_AIRCRAFT, new_value); [SDT_BOOL] base = CompanySettings var = vehicle.auto_timetable_by_default -flags = SF_PER_COMPANY +flags = SF_PER_COMPANY | SF_PATCH def = false str = STR_CONFIG_SETTING_AUTO_TIMETABLE_BY_DEFAULT strhelp = STR_CONFIG_SETTING_AUTO_TIMETABLE_BY_DEFAULT_HELPTEXT -patchcat = SC_PATCH patxname = ""vehicle.auto_timetable_by_default"" [SDT_BOOL] base = CompanySettings var = vehicle.auto_separation_by_default -flags = SF_PER_COMPANY +flags = SF_PER_COMPANY | SF_PATCH def = true str = STR_CONFIG_SETTING_TIMETABLE_SEPARATION_BY_DEFAULT strhelp = STR_CONFIG_SETTING_TIMETABLE_SEPARATION_BY_DEFAULT_HELPTEXT -patchcat = SC_PATCH patxname = ""vehicle.auto_separation_by_default"" [SDT_VAR] base = CompanySettings var = auto_timetable_separation_rate type = SLE_UINT8 -flags = SF_PER_COMPANY +flags = SF_PER_COMPANY | SF_PATCH def = 40 min = 0 max = 100 @@ -177,14 +174,13 @@ str = STR_CONFIG_SETTING_TIMETABLE_SEPARATION_RATE strhelp = STR_CONFIG_SETTING_TIMETABLE_SEPARATION_RATE_HELPTEXT strval = STR_CONFIG_SETTING_PERCENTAGE cat = SC_EXPERT -patchcat = SC_PATCH patxname = ""auto_timetable_separation_rate"" [SDT_VAR] base = CompanySettings var = timetable_autofill_rounding type = SLE_UINT16 -flags = SF_PER_COMPANY | SF_GUI_0_IS_SPECIAL +flags = SF_PER_COMPANY | SF_GUI_0_IS_SPECIAL | SF_PATCH def = 0 min = 0 max = 1000 @@ -193,14 +189,13 @@ str = STR_CONFIG_SETTING_TIMETABLE_AUTOFILL_ROUNDING_TICKS strhelp = STR_CONFIG_SETTING_TIMETABLE_AUTOFILL_ROUNDING_TICKS_HELPTEXT strval = STR_CONFIG_SETTING_TIMETABLE_AUTOFILL_ROUNDING_TICKS_VALUE cat = SC_EXPERT -patchcat = SC_PATCH patxname = ""timetable_autofill_rounding"" [SDT_VAR] base = CompanySettings var = order_occupancy_smoothness type = SLE_UINT8 -flags = SF_PER_COMPANY +flags = SF_PER_COMPANY | SF_PATCH def = 75 min = 0 max = 100 @@ -209,74 +204,66 @@ str = STR_CONFIG_OCCUPANCY_SMOOTHNESS strhelp = STR_CONFIG_OCCUPANCY_SMOOTHNESS_HELPTEXT strval = STR_CONFIG_SETTING_PERCENTAGE cat = SC_EXPERT -patchcat = SC_PATCH patxname = ""order_occupancy_smoothness"" [SDT_BOOL] base = CompanySettings var = infra_others_buy_in_depot[0] -flags = SF_PER_COMPANY +flags = SF_PER_COMPANY | SF_PATCH def = false str = STR_CONFIG_SETTING_INFRA_OTHERS_BUY_IN_DEPOT_RAIL -patchcat = SC_PATCH patxname = ""infra_sharing.infra_others_buy_in_depot.rail"" [SDT_BOOL] base = CompanySettings var = infra_others_buy_in_depot[1] -flags = SF_PER_COMPANY +flags = SF_PER_COMPANY | SF_PATCH def = false str = STR_CONFIG_SETTING_INFRA_OTHERS_BUY_IN_DEPOT_ROAD -patchcat = SC_PATCH patxname = ""infra_sharing.infra_others_buy_in_depot.road"" [SDT_BOOL] base = CompanySettings var = infra_others_buy_in_depot[2] -flags = SF_PER_COMPANY +flags = SF_PER_COMPANY | SF_PATCH def = false str = STR_CONFIG_SETTING_INFRA_OTHERS_BUY_IN_DEPOT_WATER -patchcat = SC_PATCH patxname = ""infra_sharing.infra_others_buy_in_depot.water"" [SDT_BOOL] base = CompanySettings var = infra_others_buy_in_depot[3] -flags = SF_PER_COMPANY +flags = SF_PER_COMPANY | SF_PATCH def = false str = STR_CONFIG_SETTING_INFRA_OTHERS_BUY_IN_DEPOT_AIR -patchcat = SC_PATCH patxname = ""infra_sharing.infra_others_buy_in_depot.air"" [SDT_BOOL] base = CompanySettings var = advance_order_on_clone -flags = SF_PER_COMPANY +flags = SF_PER_COMPANY | SF_PATCH def = false str = STR_CONFIG_SETTING_ADVANCE_ORDER_ON_CLONE strhelp = STR_CONFIG_SETTING_ADVANCE_ORDER_ON_CLONE_HELPTEXT -patchcat = SC_PATCH patxname = ""advance_order_on_clone"" [SDT_BOOL] base = CompanySettings var = copy_clone_add_to_group -flags = SF_PER_COMPANY +flags = SF_PER_COMPANY | SF_PATCH def = true str = STR_CONFIG_SETTING_COPY_CLONE_ADD_TO_GROUP strhelp = STR_CONFIG_SETTING_COPY_CLONE_ADD_TO_GROUP_HELPTEXT -patchcat = SC_PATCH patxname = ""copy_clone_add_to_group"" [SDT_BOOL] base = CompanySettings var = remain_if_next_order_same_station -flags = SF_PER_COMPANY +flags = SF_PER_COMPANY | SF_PATCH def = true str = STR_CONFIG_SETTING_REMAIN_IF_NEXT_ORDER_SAME_STATION strhelp = STR_CONFIG_SETTING_REMAIN_IF_NEXT_ORDER_SAME_STATION_HELPTEXT -patchcat = SC_PATCH patxname = ""remain_if_next_order_same_station"" [SDT_VAR] diff --git a/src/table/settings/gui_settings.ini b/src/table/settings/gui_settings.ini index b5e065f5fc..7fbb71b965 100644 --- a/src/table/settings/gui_settings.ini +++ b/src/table/settings/gui_settings.ini @@ -65,12 +65,12 @@ const SettingTable _gui_settings{ [post-amble] }; [templates] -SDTC_BOOL = SDTC_BOOL( $var, $flags, $def, $str, $strhelp, $strval, $pre_cb, $post_cb, $from, $to, $extver, $cat | $patchcat, $guiproc, $startup, $patxname), -SDTC_LIST = SDTC_LIST( $var, $type, $flags, $def, $from, $to, $extver, $cat | $patchcat, $guiproc, $startup, $patxname), -SDTC_OMANY = SDTC_OMANY( $var, $type, $flags, $def, $max, $full, $str, $strhelp, $strval, $pre_cb, $post_cb, $from, $to, $extver, $cat | $patchcat, $guiproc, $startup, $patxname), -SDTC_SSTR = SDTC_SSTR( $var, $type, $flags, $def, $length, $pre_cb, $post_cb, $from, $to, $extver, $cat | $patchcat, $guiproc, $startup, $patxname), -SDTC_VAR = SDTC_VAR( $var, $type, $flags, $def, $min, $max, $interval, $str, $strhelp, $strval, $pre_cb, $post_cb, $from, $to, $extver, $cat | $patchcat, $guiproc, $startup, $patxname), -SDTC_ENUM = SDTC_ENUM( $var, $type, $flags, $def, $str, $strhelp, $pre_cb, $post_cb, $from, $to, $extver, $cat | $patchcat, $guiproc, $startup, $patxname, $enumlist), +SDTC_BOOL = SDTC_BOOL( $var, $flags, $def, $str, $strhelp, $strval, $pre_cb, $post_cb, $from, $to, $extver, $cat, $guiproc, $startup, $patxname), +SDTC_LIST = SDTC_LIST( $var, $type, $flags, $def, $from, $to, $extver, $cat, $guiproc, $startup, $patxname), +SDTC_OMANY = SDTC_OMANY( $var, $type, $flags, $def, $max, $full, $str, $strhelp, $strval, $pre_cb, $post_cb, $from, $to, $extver, $cat, $guiproc, $startup, $patxname), +SDTC_SSTR = SDTC_SSTR( $var, $type, $flags, $def, $length, $pre_cb, $post_cb, $from, $to, $extver, $cat, $guiproc, $startup, $patxname), +SDTC_VAR = SDTC_VAR( $var, $type, $flags, $def, $min, $max, $interval, $str, $strhelp, $strval, $pre_cb, $post_cb, $from, $to, $extver, $cat, $guiproc, $startup, $patxname), +SDTC_ENUM = SDTC_ENUM( $var, $type, $flags, $def, $str, $strhelp, $pre_cb, $post_cb, $from, $to, $extver, $cat, $guiproc, $startup, $patxname, $enumlist), [validation] SDTC_OMANY = static_assert($max <= MAX_$type, "Maximum value for $var exceeds storage size"); @@ -89,7 +89,6 @@ load = nullptr from = SL_MIN_VERSION to = SL_MAX_VERSION cat = SC_ADVANCED -patchcat = SC_NONE startup = false extver = SlXvFeatureTest() patxname = nullptr @@ -112,12 +111,11 @@ cat = SC_BASIC [SDTC_BOOL] var = gui.autosave_realtime -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC +flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_PATCH def = true str = STR_CONFIG_SETTING_AUTOSAVE_REALTIME strhelp = STR_CONFIG_SETTING_AUTOSAVE_REALTIME_HELPTEXT post_cb = AutosaveModeChanged -patchcat = SC_PATCH cat = SC_EXPERT [SDTC_BOOL] @@ -251,120 +249,108 @@ post_cb = [](auto) { InvalidateWindowClassesData(WC_GAME_OPTIONS); } [SDTC_BOOL] var = gui.instant_tile_tooltip -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC +flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_PATCH def = false str = STR_CONFIG_SETTING_INSTANT_TILE_TOOLTIP strhelp = STR_CONFIG_SETTING_INSTANT_TILE_TOOLTIP_HELPTEXT -patchcat = SC_PATCH [SDTC_VAR] var = gui.town_name_tooltip_mode type = SLE_UINT8 -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_GUI_DROPDOWN +flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_GUI_DROPDOWN | SF_PATCH def = 1 min = 0 max = 2 str = STR_CONFIG_SETTING_TOWN_NAME_TOOLTIP_MODE strhelp = STR_CONFIG_SETTING_TOWN_NAME_TOOLTIP_MODE_HELPTEXT strval = STR_CONFIG_SETTING_TOWN_NAME_TOOLTIP_MODE_OFF -patchcat = SC_PATCH [SDTC_BOOL] var = gui.industry_tooltip_show -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC +flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_PATCH def = true str = STR_CONFIG_SETTING_INDUSTRY_TOOLTIP_SHOW strhelp = STR_CONFIG_SETTING_INDUSTRY_TOOLTIP_SHOW_HELPTEXT post_cb = [](auto) { InvalidateWindowClassesData(WC_GAME_OPTIONS); } -patchcat = SC_PATCH [SDTC_BOOL] var = gui.industry_tooltip_show_name -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC +flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_PATCH def = true str = STR_CONFIG_SETTING_INDUSTRY_TOOLTIP_NAME strhelp = STR_CONFIG_SETTING_INDUSTRY_TOOLTIP_NAME_HELPTEXT -patchcat = SC_PATCH [SDTC_BOOL] var = gui.industry_tooltip_show_required -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC +flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_PATCH def = false str = STR_CONFIG_SETTING_INDUSTRY_TOOLTIP_REQUIRED strhelp = STR_CONFIG_SETTING_INDUSTRY_TOOLTIP_REQUIRED_HELPTEXT -patchcat = SC_PATCH [SDTC_BOOL] var = gui.industry_tooltip_show_stockpiled -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC +flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_PATCH def = false str = STR_CONFIG_SETTING_INDUSTRY_TOOLTIP_STOCKPILED strhelp = STR_CONFIG_SETTING_INDUSTRY_TOOLTIP_STOCKPILED_HELPTEXT -patchcat = SC_PATCH [SDTC_BOOL] var = gui.industry_tooltip_show_produced -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC +flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_PATCH def = true str = STR_CONFIG_SETTING_INDUSTRY_TOOLTIP_PRODUCED strhelp = STR_CONFIG_SETTING_INDUSTRY_TOOLTIP_PRODUCED_HELPTEXT -patchcat = SC_PATCH [SDTC_VAR] var = gui.depot_tooltip_mode type = SLE_UINT8 -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_GUI_DROPDOWN +flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_GUI_DROPDOWN | SF_PATCH def = 1 min = 0 max = 2 str = STR_CONFIG_SETTING_DEPOT_TOOLTIP_MODE strhelp = STR_CONFIG_SETTING_DEPOT_TOOLTIP_MODE_HELPTEXT strval = STR_CONFIG_SETTING_DEPOT_TOOLTIP_MODE_OFF -patchcat = SC_PATCH [SDTC_VAR] var = gui.waypoint_viewport_tooltip_name type = SLE_UINT8 -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_GUI_DROPDOWN +flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_GUI_DROPDOWN | SF_PATCH def = 1 min = 0 max = 2 str = STR_CONFIG_SETTING_WAYPOINT_VIEWPORT_TOOLTIP_NAME strhelp = STR_CONFIG_SETTING_WAYPOINT_VIEWPORT_TOOLTIP_NAME_HELPTEXT strval = STR_CONFIG_SETTING_WAYPOINT_VIEWPORT_TOOLTIP_NAME_OFF -patchcat = SC_PATCH [SDTC_VAR] var = gui.station_viewport_tooltip_name type = SLE_UINT8 -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_GUI_DROPDOWN +flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_GUI_DROPDOWN | SF_PATCH def = 1 min = 0 max = 2 str = STR_CONFIG_SETTING_STATION_VIEWPORT_TOOLTIP_NAME strhelp = STR_CONFIG_SETTING_STATION_VIEWPORT_TOOLTIP_NAME_HELPTEXT strval = STR_CONFIG_SETTING_STATION_VIEWPORT_TOOLTIP_NAME_OFF -patchcat = SC_PATCH [SDTC_BOOL] var = gui.station_viewport_tooltip_cargo -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC +flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_PATCH def = true str = STR_CONFIG_SETTING_STATION_VIEWPORT_TOOLTIP_CARGO strhelp = STR_CONFIG_SETTING_STATION_VIEWPORT_TOOLTIP_CARGO_HELPTEXT -patchcat = SC_PATCH [SDTC_VAR] var = gui.station_rating_tooltip_mode type = SLE_UINT8 -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_GUI_DROPDOWN +flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_GUI_DROPDOWN | SF_PATCH def = 1 min = 0 max = 2 str = STR_CONFIG_SETTING_STATION_RATING_TOOLTIP_MODE strhelp = STR_CONFIG_SETTING_STATION_RATING_TOOLTIP_MODE_HELPTEXT strval = STR_CONFIG_SETTING_STATION_RATING_TOOLTIP_MODE_OFF -patchcat = SC_PATCH [SDTC_OMANY] var = gui.osk_activation @@ -479,12 +465,11 @@ post_cb = [](auto) { UpdateAllTownVirtCoords(); } [SDTC_BOOL] var = gui.city_in_label -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC +flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_PATCH def = false str = STR_CONFIG_SETTING_CITY_IN_LABEL strhelp = STR_CONFIG_SETTING_CITY_IN_LABEL_HELPTEXT post_cb = [](auto) { UpdateAllTownVirtCoords(); } -patchcat = SC_PATCH [SDTC_BOOL] var = gui.link_terraform_toolbar @@ -595,44 +580,40 @@ cat = SC_BASIC [SDTC_BOOL] var = gui.show_slopes_on_viewport_map -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC +flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_PATCH def = true str = STR_CONFIG_SETTING_VIEWPORT_MAP_SHOW_SLOPES strhelp = STR_CONFIG_SETTING_VIEWPORT_MAP_SHOW_SLOPES_HELPTEXT -patchcat = SC_PATCH post_cb = ViewportMapLandscapeModeChanged [SDTC_BOOL] var = gui.show_height_on_viewport_map -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC +flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_PATCH def = true str = STR_CONFIG_SETTING_VIEWPORT_MAP_SHOW_HEIGHT strhelp = STR_CONFIG_SETTING_VIEWPORT_MAP_SHOW_HEIGHT_HELPTEXT -patchcat = SC_PATCH post_cb = ViewportMapLandscapeModeChanged [SDTC_BOOL] var = gui.show_bridges_on_map -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC +flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_PATCH def = true str = STR_CONFIG_SETTING_VIEWPORT_MAP_SHOW_BRIDGES strhelp = STR_CONFIG_SETTING_VIEWPORT_MAP_SHOW_BRIDGES_HELPTEXT -patchcat = SC_PATCH post_cb = ViewportMapLandscapeModeChanged [SDTC_BOOL] var = gui.show_tunnels_on_map -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC +flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_PATCH def = true str = STR_CONFIG_SETTING_VIEWPORT_MAP_SHOW_TUNNELS strhelp = STR_CONFIG_SETTING_VIEWPORT_MAP_SHOW_TUNNELS_HELPTEXT -patchcat = SC_PATCH post_cb = ViewportMapShowTunnelModeChanged [SDTC_VAR] var = gui.show_vehicle_route_mode type = SLE_UINT8 -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_GUI_DROPDOWN +flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_GUI_DROPDOWN | SF_PATCH def = 1 min = 0 max = 2 @@ -640,31 +621,28 @@ interval = 1 str = STR_CONFIG_SETTING_SHOW_VEHICLE_ROUTE_MODE strhelp = STR_CONFIG_SETTING_SHOW_VEHICLE_ROUTE_MODE_HELPTEXT strval = STR_CONFIG_SETTING_SHOW_VEHICLE_ROUTE_MODE_OFF -patchcat = SC_PATCH post_cb = [](auto) { InvalidateWindowClassesData(WC_GAME_OPTIONS); MarkWholeScreenDirty(); } [SDTC_BOOL] var = gui.show_vehicle_route_steps -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC +flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_PATCH def = true str = STR_CONFIG_SETTING_SHOW_VEHICLE_ROUTE_STEPS strhelp = STR_CONFIG_SETTING_SHOW_VEHICLE_ROUTE_STEPS_HELPTEXT -patchcat = SC_PATCH post_cb = [](auto) { InvalidateWindowClassesData(WC_GAME_OPTIONS); MarkWholeScreenDirty(); } [SDTC_BOOL] var = gui.show_vehicle_route -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC +flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_PATCH def = true str = STR_CONFIG_SETTING_VIEWPORT_MAP_SHOW_VEHICLE_ROUTE strhelp = STR_CONFIG_SETTING_VIEWPORT_MAP_SHOW_VEHICLE_ROUTE_HELPTEXT -patchcat = SC_PATCH post_cb = [](auto) { InvalidateWindowClassesData(WC_GAME_OPTIONS); MarkWholeScreenDirty(); } [SDTC_VAR] var = gui.dash_level_of_route_lines type = SLE_UINT8 -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_GUI_0_IS_SPECIAL +flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_GUI_0_IS_SPECIAL | SF_PATCH def = 0 min = 0 max = 10 @@ -672,23 +650,21 @@ interval = 1 str = STR_CONFIG_SETTING_VIEWPORT_MAP_DRAW_ROUTE_DASH strhelp = STR_CONFIG_SETTING_VIEWPORT_MAP_DRAW_ROUTE_DASH_HELPTEXT strval = STR_CONFIG_SETTING_VIEWPORT_MAP_DRAW_ROUTE_DASH_VALUE -patchcat = SC_PATCH post_cb = [](auto) { MarkWholeScreenDirty(); } cat = SC_EXPERT [SDTC_BOOL] var = gui.use_owner_colour_for_tunnelbridge -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC +flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_PATCH def = false str = STR_CONFIG_SETTING_VIEWPORT_MAP_USE_OWNER_COLOUR_BRIDGE_TUNNEL strhelp = STR_CONFIG_SETTING_VIEWPORT_MAP_USE_OWNER_COLOUR_BRIDGE_TUNNEL_HELPTEXT -patchcat = SC_PATCH post_cb = ViewportMapLandscapeModeChanged [SDTC_VAR] var = gui.show_scrolling_viewport_on_map type = SLE_UINT32 -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_GUI_DROPDOWN +flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_GUI_DROPDOWN | SF_PATCH def = 3 min = 0 max = 3 @@ -696,22 +672,20 @@ interval = 1 str = STR_CONFIG_SETTING_VIEWPORT_MAP_SHOW_SCROLLING_VP strhelp = STR_CONFIG_SETTING_VIEWPORT_MAP_SHOW_SCROLLING_VP_HELPTEXT strval = STR_CONFIG_SETTING_VIEWPORT_MAP_SHOW_SCROLLING_VP_NOTHING -patchcat = SC_PATCH [SDTC_ENUM] var = gui.default_viewport_map_mode type = SLE_UINT32 -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC +flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_PATCH def = 0 enumlist = _viewport_map_modes str = STR_CONFIG_SETTING_VIEWPORT_MAP_DEFAULT_MODE strhelp = STR_CONFIG_SETTING_VIEWPORT_MAP_DEFAULT_MODE_HELPTEXT -patchcat = SC_PATCH [SDTC_VAR] var = gui.action_when_viewport_map_is_dblclicked type = SLE_UINT32 -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_GUI_DROPDOWN +flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_GUI_DROPDOWN | SF_PATCH def = 1 min = 0 max = 2 @@ -719,7 +693,6 @@ interval = 1 str = STR_CONFIG_SETTING_VIEWPORT_MAP_ACTION_DBLCLICK strhelp = STR_CONFIG_SETTING_VIEWPORT_MAP_ACTION_DBLCLICK_HELPTEXT strval = STR_CONFIG_SETTING_VIEWPORT_MAP_ACTION_DBLCLICK_DO_NOTHING -patchcat = SC_PATCH [SDTC_BOOL] var = gui.pause_on_newgame @@ -751,36 +724,33 @@ cat = SC_EXPERT [SDTC_BOOL] var = gui.timetable_leftover_ticks -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC +flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_PATCH def = false str = STR_CONFIG_SETTING_TIMETABLE_LEFTOVER_TICKS strhelp = STR_CONFIG_SETTING_TIMETABLE_LEFTOVER_TICKS_HELPTEXT post_cb = InvalidateVehTimetableWindow -patchcat = SC_PATCH cat = SC_EXPERT [SDTC_BOOL] var = gui.override_time_settings -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC +flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_PATCH def = false str = STR_CONFIG_SETTING_OVERRIDE_TIME_SETTINGS strhelp = STR_CONFIG_SETTING_OVERRIDE_TIME_SETTINGS_HELPTEXT -patchcat = SC_PATCH post_cb = ChangeTimeOverrideMode [SDTC_BOOL] var = gui.time_in_minutes -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC +flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_PATCH def = false str = STR_CONFIG_SETTING_TIME_IN_MINUTES strhelp = STR_CONFIG_SETTING_TIME_IN_MINUTES_HELPTEXT -patchcat = SC_PATCH post_cb = UpdateTimeSettings [SDTC_VAR] var = gui.ticks_per_minute type = SLE_UINT16 -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC +flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_PATCH strval = STR_JUST_INT def = 74 min = 1 @@ -788,13 +758,12 @@ max = 8192 interval = 10 str = STR_CONFIG_SETTING_TICKS_PER_MINUTE strhelp = STR_CONFIG_SETTING_TICKS_PER_MINUTE_HELPTEXT -patchcat = SC_PATCH post_cb = UpdateTimeSettings [SDTC_VAR] var = gui.clock_offset type = SLE_UINT16 -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC +flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_PATCH strval = STR_JUST_INT def = 0 min = 0 @@ -802,29 +771,26 @@ max = 1439 interval = 60 str = STR_CONFIG_SETTING_CLOCK_OFFSET strhelp = STR_CONFIG_SETTING_CLOCK_OFFSET_HELPTEXT -patchcat = SC_PATCH post_cb = UpdateTimeSettings [SDTC_VAR] var = gui.date_with_time type = SLE_UINT8 -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_GUI_DROPDOWN +flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_GUI_DROPDOWN | SF_PATCH 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 -patchcat = SC_PATCH post_cb = UpdateTimeSettings [SDTC_BOOL] var = gui.timetable_start_text_entry -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC +flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_PATCH def = false str = STR_CONFIG_SETTING_TIMETABLE_START_TEXT_ENTRY strhelp = STR_CONFIG_SETTING_TIMETABLE_START_TEXT_ENTRY_HELPTEXT -patchcat = SC_PATCH [SDTC_BOOL] var = gui.timetable_arrival_departure @@ -837,7 +803,7 @@ post_cb = InvalidateVehTimetableWindow [SDTC_VAR] var = gui.max_departures type = SLE_UINT8 -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC +flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_PATCH strval = STR_JUST_INT def = 10 min = 1 @@ -845,13 +811,12 @@ max = 30 interval = 1 str = STR_CONFIG_MAX_DEPARTURES strhelp = STR_CONFIG_MAX_DEPARTURES_HELPTEXT -patchcat = SC_PATCH post_cb = [](auto) { InvalidateWindowClassesData(WC_DEPARTURES_BOARD, 1); } [SDTC_VAR] var = gui.max_departure_time type = SLE_UINT16 -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC +flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_PATCH strval = STR_JUST_COMMA def = 120 min = 30 @@ -859,13 +824,12 @@ max = 365 interval = 1 str = STR_CONFIG_MAX_DEPARTURE_TIME strhelp = STR_CONFIG_MAX_DEPARTURE_TIME_HELPTEXT -patchcat = SC_PATCH post_cb = [](auto) { InvalidateWindowClassesData(WC_DEPARTURES_BOARD, 1); } [SDTC_VAR] var = gui.max_departure_time_minutes type = SLE_UINT16 -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC +flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_PATCH strval = STR_JUST_COMMA def = 1440 min = 30 @@ -873,13 +837,12 @@ max = 5000 interval = 30 str = STR_CONFIG_MAX_DEPARTURE_TIME_MINUTES strhelp = STR_CONFIG_MAX_DEPARTURE_TIME_MINUTES_HELPTEXT -patchcat = SC_PATCH post_cb = [](auto) { InvalidateWindowClassesData(WC_DEPARTURES_BOARD, 1); } [SDTC_VAR] var = gui.departure_calc_frequency type = SLE_UINT16 -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC +flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_PATCH strval = STR_JUST_INT def = 10 min = 1 @@ -887,127 +850,113 @@ max = 120 interval = 1 str = STR_CONFIG_DEPARTURE_CALC_FREQUENCY strhelp = STR_CONFIG_DEPARTURE_CALC_FREQUENCY_HELPTEXT -patchcat = SC_PATCH [SDTC_BOOL] var = gui.departure_show_vehicle -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC +flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_PATCH def = false str = STR_CONFIG_DEPARTURE_VEHICLE_NAME strhelp = STR_CONFIG_DEPARTURE_VEHICLE_NAME_HELPTEXT -patchcat = SC_PATCH post_cb = [](auto) { InvalidateWindowClassesData(WC_DEPARTURES_BOARD, 1); } [SDTC_BOOL] var = gui.departure_show_group -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC +flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_PATCH def = false str = STR_CONFIG_DEPARTURE_GROUP_NAME strhelp = STR_CONFIG_DEPARTURE_GROUP_NAME_HELPTEXT -patchcat = SC_PATCH post_cb = [](auto) { InvalidateWindowClassesData(WC_DEPARTURES_BOARD, 1); } [SDTC_BOOL] var = gui.departure_show_company -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC +flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_PATCH def = false str = STR_CONFIG_DEPARTURE_COMPANY_NAME strhelp = STR_CONFIG_DEPARTURE_COMPANY_NAME_HELPTEXT -patchcat = SC_PATCH post_cb = [](auto) { InvalidateWindowClassesData(WC_DEPARTURES_BOARD, 1); } [SDTC_BOOL] var = gui.departure_show_vehicle_type -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC +flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_PATCH def = false str = STR_CONFIG_DEPARTURE_VEHICLE_TYPE strhelp = STR_CONFIG_DEPARTURE_VEHICLE_TYPE_HELPTEXT -patchcat = SC_PATCH post_cb = [](auto) { InvalidateWindowClassesData(WC_DEPARTURES_BOARD, 1); } [SDTC_BOOL] var = gui.departure_show_vehicle_color -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC +flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_PATCH def = false str = STR_CONFIG_DEPARTURE_VEHICLE_COLOR strhelp = STR_CONFIG_DEPARTURE_VEHICLE_COLOR_HELPTEXT -patchcat = SC_PATCH post_cb = [](auto) { InvalidateWindowClassesData(WC_DEPARTURES_BOARD, 1); } [SDTC_BOOL] var = gui.departure_larger_font -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC +flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_PATCH def = false str = STR_CONFIG_DEPARTURE_LARGER_FONT strhelp = STR_CONFIG_DEPARTURE_LARGER_FONT_HELPTEXT -patchcat = SC_PATCH post_cb = [](auto) { InvalidateWindowClassesData(WC_DEPARTURES_BOARD, 1); } [SDTC_BOOL] var = gui.departure_destination_type -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC +flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_PATCH def = false str = STR_CONFIG_DEPARTURE_DESTINATION_TYPE strhelp = STR_CONFIG_DEPARTURE_DESTINATION_TYPE_HELPTEXT -patchcat = SC_PATCH post_cb = [](auto) { InvalidateWindowClassesData(WC_DEPARTURES_BOARD, 1); } [SDTC_BOOL] var = gui.departure_show_both -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC +flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_PATCH def = false str = STR_CONFIG_DEPARTURE_SHOW_BOTH strhelp = STR_CONFIG_DEPARTURE_SHOW_BOTH_HELPTEXT -patchcat = SC_PATCH post_cb = [](auto) { InvalidateWindowClassesData(WC_DEPARTURES_BOARD, 1); } [SDTC_BOOL] var = gui.departure_only_passengers -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC +flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_PATCH def = false str = STR_CONFIG_DEPARTURE_ONLY_PASSENGERS strhelp = STR_CONFIG_DEPARTURE_ONLY_PASSENGERS_HELPTEXT -patchcat = SC_PATCH post_cb = [](auto) { InvalidateWindowClassesData(WC_DEPARTURES_BOARD, 1); } [SDTC_BOOL] var = gui.departure_smart_terminus -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC +flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_PATCH def = false str = STR_CONFIG_DEPARTURE_SMART_TERMINUS strhelp = STR_CONFIG_DEPARTURE_SMART_TERMINUS_HELPTEXT -patchcat = SC_PATCH post_cb = [](auto) { InvalidateWindowClassesData(WC_DEPARTURES_BOARD, 1); } [SDTC_BOOL] var = gui.departure_show_all_stops -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC +flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_PATCH def = false str = STR_CONFIG_DEPARTURE_SHOW_ALL_STOPS strhelp = STR_CONFIG_DEPARTURE_SHOW_ALL_STOPS_HELPTEXT -patchcat = SC_PATCH post_cb = [](auto) { InvalidateWindowClassesData(WC_DEPARTURES_BOARD, 1); } [SDTC_BOOL] var = gui.departure_merge_identical -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC +flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_PATCH def = false str = STR_CONFIG_DEPARTURE_MERGE_IDENTICAL strhelp = STR_CONFIG_DEPARTURE_MERGE_IDENTICAL_HELPTEXT -patchcat = SC_PATCH post_cb = [](auto) { InvalidateWindowClassesData(WC_DEPARTURES_BOARD, 1); } [SDTC_VAR] var = gui.departure_conditionals type = SLE_UINT8 -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_GUI_DROPDOWN +flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_GUI_DROPDOWN | SF_PATCH def = 0 min = 0 max = 2 str = STR_CONFIG_DEPARTURE_CONDITIONALS strval = STR_CONFIG_DEPARTURE_CONDITIONALS_1 strhelp = STR_CONFIG_DEPARTURE_CONDITIONALS_HELPTEXT -patchcat = SC_PATCH post_cb = [](auto) { InvalidateWindowClassesData(WC_DEPARTURES_BOARD, 1); } [SDTC_BOOL] @@ -1046,7 +995,7 @@ cat = SC_BASIC [SDTC_VAR] var = gui.default_road_type type = SLE_UINT8 -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_GUI_DROPDOWN +flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_GUI_DROPDOWN | SF_PATCH def = 0 min = 0 max = 3 @@ -1054,7 +1003,6 @@ str = STR_CONFIG_SETTING_DEFAULT_ROAD_TYPE strhelp = STR_CONFIG_SETTING_DEFAULT_ROAD_TYPE_HELPTEXT strval = STR_CONFIG_SETTING_DEFAULT_RAIL_TYPE_FIRST cat = SC_BASIC -patchcat = SC_PATCH [SDTC_VAR] var = gui.signal_gui_mode @@ -1160,28 +1108,25 @@ cat = SC_BASIC [SDTC_ENUM] var = gui.no_depot_order_warn type = SLE_UINT8 -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_CONVERT_BOOL_TO_INT +flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_CONVERT_BOOL_TO_INT | SF_PATCH def = 0 enumlist = _no_depot_order_warn str = STR_CONFIG_SETTING_WARN_NO_DEPOT_ORDER strhelp = STR_CONFIG_SETTING_WARN_NO_DEPOT_ORDER_HELPTEXT -patchcat = SC_PATCH [SDTC_BOOL] var = gui.lost_vehicle_warn -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC +flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_PATCH def = true str = STR_CONFIG_SETTING_WARN_LOST_VEHICLE strhelp = STR_CONFIG_SETTING_WARN_LOST_VEHICLE_HELPTEXT -patchcat = SC_PATCH [SDTC_BOOL] var = gui.restriction_wait_vehicle_warn -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC +flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_PATCH def = false str = STR_CONFIG_SETTING_WARN_RESTRICTION_WAIT_VEHICLE strhelp = STR_CONFIG_SETTING_WARN_RESTRICTION_WAIT_VEHICLE_HELPTEXT -patchcat = SC_PATCH [SDTC_BOOL] var = gui.new_nonstop @@ -1235,16 +1180,15 @@ max = 255 [SDTC_VAR] var = gui.max_num_lt_autosaves type = SLE_UINT8 -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC +flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_PATCH def = 8 min = 0 max = 255 -patchcat = SC_PATCH [SDTC_OMANY] var = gui.savegame_overwrite_confirm type = SLE_UINT8 -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_GUI_DROPDOWN +flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_GUI_DROPDOWN | SF_PATCH str = STR_CONFIG_SETTING_SAVEGAME_OVERWRITE_CONFIRM strhelp = STR_CONFIG_SETTING_SAVEGAME_OVERWRITE_CONFIRM_HELPTEXT strval = STR_CONFIG_SETTING_SAVEGAME_OVERWRITE_CONFIRM_DISABLED @@ -1252,7 +1196,6 @@ full = _savegame_overwrite_confirm def = 3 min = 0 max = 3 -patchcat = SC_PATCH [SDTC_BOOL] var = gui.auto_euro @@ -1363,166 +1306,149 @@ post_cb = [](auto) { MarkWholeScreenDirty(); } [SDTC_BOOL] var = gui.show_train_length_in_details -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC +flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_PATCH def = true str = STR_CONFIG_SETTING_SHOW_TRAIN_LENGTH_IN_DETAILS strhelp = STR_CONFIG_SETTING_SHOW_TRAIN_LENGTH_IN_DETAILS_HELPTEXT post_cb = [](auto) { MarkWholeScreenDirty(); } cat = SC_BASIC -patchcat = SC_PATCH [SDTC_BOOL] var = gui.show_train_weight_ratios_in_details -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC +flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_PATCH def = false str = STR_CONFIG_SETTING_SHOW_TRAIN_WEIGHT_RATIOS_IN_DETAILS strhelp = STR_CONFIG_SETTING_SHOW_TRAIN_WEIGHT_RATIOS_IN_DETAILS_HELPTEXT post_cb = [](auto) { MarkWholeScreenDirty(); } cat = SC_EXPERT -patchcat = SC_PATCH [SDTC_BOOL] var = gui.show_vehicle_group_in_details -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC +flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_PATCH def = true str = STR_CONFIG_SETTING_SHOW_VEHICLE_GROUP_IN_DETAILS strhelp = STR_CONFIG_SETTING_SHOW_VEHICLE_GROUP_IN_DETAILS_HELPTEXT post_cb = [](auto) { MarkWholeScreenDirty(); } cat = SC_BASIC -patchcat = SC_PATCH [SDTC_BOOL] var = gui.show_vehicle_list_company_colour -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC +flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_PATCH def = true str = STR_CONFIG_SETTING_SHOW_VEHICLE_LIST_COMPANY_COLOUR strhelp = STR_CONFIG_SETTING_SHOW_VEHICLE_LIST_COMPANY_COLOUR_HELPTEXT post_cb = [](auto) { MarkWholeScreenDirty(); } cat = SC_BASIC -patchcat = SC_PATCH [SDTC_BOOL] var = gui.show_restricted_signal_default -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC +flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_PATCH def = false str = STR_CONFIG_SETTING_SHOW_RESTRICTED_SIG_DEF strhelp = STR_CONFIG_SETTING_SHOW_RESTRICTED_SIG_DEF_HELPTEXT -patchcat = SC_PATCH post_cb = [](auto) { MarkWholeScreenDirty(); } [SDTC_BOOL] var = gui.show_all_signal_default -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC +flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_PATCH def = false str = STR_CONFIG_SETTING_SHOW_ALL_SIG_DEF strhelp = STR_CONFIG_SETTING_SHOW_ALL_SIG_DEF_HELPTEXT -patchcat = SC_PATCH post_cb = [](auto) { UpdateRailGuiSprites(); MarkWholeScreenDirty(); } [SDTC_BOOL] var = gui.show_adv_tracerestrict_features -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC +flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_PATCH def = false str = STR_CONFIG_SETTING_SHOW_ADV_TRACE_RESTRICT_FEATURES strhelp = STR_CONFIG_SETTING_SHOW_ADV_TRACE_RESTRICT_FEATURES_HELPTEXT post_cb = [](auto) { MarkWholeScreenDirty(); } cat = SC_EXPERT -patchcat = SC_PATCH [SDTC_BOOL] var = gui.show_progsig_ui -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC +flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_PATCH def = false str = STR_CONFIG_SETTING_SHOW_PROGSIG_FEATURES strhelp = STR_CONFIG_SETTING_SHOW_PROGSIG_FEATURES_HELPTEXT post_cb = ProgrammableSignalsShownChanged cat = SC_ADVANCED -patchcat = SC_PATCH [SDTC_BOOL] var = gui.show_noentrysig_ui -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC +flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_PATCH def = false str = STR_CONFIG_SETTING_SHOW_NOENTRYSIG_FEATURES strhelp = STR_CONFIG_SETTING_SHOW_NOENTRYSIG_FEATURES_HELPTEXT post_cb = ProgrammableSignalsShownChanged cat = SC_ADVANCED -patchcat = SC_PATCH [SDTC_BOOL] var = gui.show_veh_list_cargo_filter -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC +flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_PATCH def = true str = STR_CONFIG_SETTING_SHOW_VEH_LIST_CARGO_FILTER strhelp = STR_CONFIG_SETTING_SHOW_VEH_LIST_CARGO_FILTER_HELPTEXT -patchcat = SC_PATCH post_cb = VehListCargoFilterShownChanged [SDTC_BOOL] var = gui.enable_single_veh_shared_order_gui -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC +flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_PATCH def = false str = STR_CONFIG_SETTING_ENABLE_SINGLE_VEH_SHARED_ORDER_GUI strhelp = STR_CONFIG_SETTING_ENABLE_SINGLE_VEH_SHARED_ORDER_GUI_HELPTEXT post_cb = EnableSingleVehSharedOrderGuiChanged cat = SC_EXPERT -patchcat = SC_PATCH [SDTC_BOOL] var = gui.show_adv_load_mode_features -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC +flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_PATCH def = false str = STR_CONFIG_SETTING_SHOW_ADV_LOADING_MODE_FEATURES strhelp = STR_CONFIG_SETTING_SHOW_ADV_LOADING_MODE_FEATURES_HELPTEXT cat = SC_EXPERT -patchcat = SC_PATCH [SDTC_BOOL] var = gui.disable_top_veh_list_mass_actions -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC +flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_PATCH def = false str = STR_CONFIG_SETTING_DISABLE_TOP_VEH_LIST_MASS_ACTIONS strhelp = STR_CONFIG_SETTING_DISABLE_TOP_VEH_LIST_MASS_ACTIONS_HELPTEXT post_cb = [](auto) { MarkWholeScreenDirty(); } cat = SC_EXPERT -patchcat = SC_PATCH [SDTC_BOOL] var = gui.adv_sig_bridge_tun_modes -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC +flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_PATCH def = false str = STR_CONFIG_SETTING_ADV_SIG_BRIDGE_TUN_MODES strhelp = STR_CONFIG_SETTING_ADV_SIG_BRIDGE_TUN_MODES_HELPTEXT cat = SC_EXPERT -patchcat = SC_PATCH [SDTC_BOOL] var = gui.sort_track_types_by_speed -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC +flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_PATCH def = false str = STR_CONFIG_SETTING_SORT_TRACK_TYPES_BY_SPEED strhelp = STR_CONFIG_SETTING_SORT_TRACK_TYPES_BY_SPEED_HELPTEXT post_cb = ChangeTrackTypeSortMode cat = SC_EXPERT -patchcat = SC_PATCH [SDTC_BOOL] var = gui.show_depot_sell_gui -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC +flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_PATCH def = false str = STR_CONFIG_SETTING_SHOW_DEPOT_SELL_GUI strhelp = STR_CONFIG_SETTING_SHOW_DEPOT_SELL_GUI_HELPTEXT cat = SC_EXPERT -patchcat = SC_PATCH [SDTC_BOOL] var = gui.open_vehicle_gui_clone_share -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC +flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_PATCH def = false str = STR_CONFIG_SETTING_OPEN_VEHICLE_GUI_CLONE_SHARE strhelp = STR_CONFIG_SETTING_OPEN_VEHICLE_GUI_CLONE_SHARE_HELPTEXT cat = SC_EXPERT -patchcat = SC_PATCH [SDTC_BOOL] var = gui.show_newgrf_name @@ -1544,27 +1470,25 @@ cat = SC_ADVANCED [SDTC_BOOL] var = gui.bigger_main_toolbar -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC +flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_PATCH def = false post_cb = [](auto) { ReInitAllWindows(true); } cat = SC_BASIC -patchcat = SC_PATCH startup = true [SDTC_BOOL] var = gui.show_wagon_intro_year -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC +flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_PATCH def = false str = STR_CONFIG_SETTING_SHOW_WAGON_INTRO_YEAR strhelp = STR_CONFIG_SETTING_SHOW_WAGON_INTRO_YEAR_HELPTEXT post_cb = [](auto) { MarkWholeScreenDirty(); } cat = SC_ADVANCED -patchcat = SC_PATCH [SDTC_VAR] var = gui.vehicle_names type = SLE_UINT8 -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_GUI_DROPDOWN +flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_GUI_DROPDOWN | SF_PATCH def = 1 min = 0 max = 2 @@ -1573,22 +1497,20 @@ strhelp = STR_CONFIG_SETTING_VEHICLE_NAMES_HELPTEXT strval = STR_CONFIG_SETTING_VEHICLE_NAMES_TRADITIONAL post_cb = [](auto) { MarkWholeScreenDirty(); } cat = SC_BASIC -patchcat = SC_PATCH [SDTC_BOOL] var = gui.shade_trees_on_slopes -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC +flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_PATCH def = true str = STR_CONFIG_SETTING_SHADED_TREES_ON_SLOPES strhelp = STR_CONFIG_SETTING_SHADED_TREES_ON_SLOPES_HELPTEXT post_cb = [](auto) { MarkWholeScreenDirty(); } cat = SC_BASIC -patchcat = SC_PATCH [SDTC_VAR] var = gui.demolish_confirm_mode type = SLE_UINT8 -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_GUI_DROPDOWN +flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_GUI_DROPDOWN | SF_PATCH def = 2 min = 0 max = 2 @@ -1596,91 +1518,81 @@ str = STR_CONFIG_SETTING_DEMOLISH_CONFIRM_MODE strhelp = STR_CONFIG_SETTING_DEMOLISH_CONFIRM_MODE_HELPTEXT strval = STR_CONFIG_SETTING_DEMOLISH_CONFIRM_MODE_OFF cat = SC_BASIC -patchcat = SC_PATCH [SDTC_BOOL] var = gui.dual_pane_train_purchase_window -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC +flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_PATCH def = true str = STR_CONFIG_SETTING_DUAL_PANE_TRAIN_PURCHASE_WINDOW strhelp = STR_CONFIG_SETTING_DUAL_PANE_TRAIN_PURCHASE_WINDOW_HELPTEXT -patchcat = SC_PATCH post_cb = [](auto) { InvalidateWindowClassesData(WC_GAME_OPTIONS); } [SDTC_BOOL] var = gui.dual_pane_train_purchase_window_dual_buttons -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC +flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_PATCH def = true str = STR_CONFIG_SETTING_DUAL_PANE_TRAIN_PURCHASE_WINDOW_DUAL_BUTTONS strhelp = STR_CONFIG_SETTING_DUAL_PANE_TRAIN_PURCHASE_WINDOW_DUAL_BUTTONS_HELPTEXT -patchcat = SC_PATCH post_cb = [](auto) { InvalidateWindowClassesData(WC_BUILD_VEHICLE); InvalidateWindowClassesData(WC_BUILD_VIRTUAL_TRAIN); } [SDTC_BOOL] var = gui.allow_hiding_waypoint_labels -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC +flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_PATCH def = false str = STR_CONFIG_SETTING_ALLOW_HIDE_WAYPOINT_LABEL strhelp = STR_CONFIG_SETTING_ALLOW_HIDE_WAYPOINT_LABEL_HELPTEXT -patchcat = SC_PATCH post_cb = [](auto) { MarkWholeScreenDirty(); InvalidateWindowClassesData(WC_WAYPOINT_VIEW, 0); } [SDTC_ENUM] var = gui.disable_water_animation type = SLE_UINT8 -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC +flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_PATCH def = 255 enumlist = _disable_water_animation str = STR_CONFIG_SETTING_DISABLE_WATER_ANIMATION strhelp = STR_CONFIG_SETTING_DISABLE_WATER_ANIMATION_HELPTEXT -patchcat = SC_PATCH post_cb = SpriteZoomMinChanged [SDTC_BOOL] var = gui.show_order_occupancy_by_default -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC +flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_PATCH def = false str = STR_CONFIG_SETTING_SHOW_ORDER_OCCUPANCY_BY_DEFAULT strhelp = STR_CONFIG_SETTING_SHOW_ORDER_OCCUPANCY_BY_DEFAULT_HELPTEXT cat = SC_BASIC -patchcat = SC_PATCH [SDTC_BOOL] var = gui.show_group_hierarchy_name -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC +flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_PATCH def = false str = STR_CONFIG_SETTING_SHOW_GROUP_HIERARCHY_NAME strhelp = STR_CONFIG_SETTING_SHOW_GROUP_HIERARCHY_NAME_HELPTEXT post_cb = [](auto) { InvalidateWindowClassesData(WC_GAME_OPTIONS); MarkWholeScreenDirty(); } cat = SC_BASIC -patchcat = SC_PATCH [SDTC_BOOL] var = gui.show_vehicle_group_hierarchy_name -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC +flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_PATCH def = false str = STR_CONFIG_SETTING_SHOW_VEHICLE_GROUP_HIERARCHY_NAME strhelp = STR_CONFIG_SETTING_SHOW_VEHICLE_GROUP_HIERARCHY_NAME_HELPTEXT post_cb = [](auto) { MarkWholeScreenDirty(); } cat = SC_ADVANCED -patchcat = SC_PATCH [SDTC_BOOL] var = gui.show_order_number_vehicle_view -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC +flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_PATCH def = false str = STR_CONFIG_SETTING_SHOW_ORDER_NUMBER_IN_VEHICLE_VIEW strhelp = STR_CONFIG_SETTING_SHOW_ORDER_NUMBER_IN_VEHICLE_VIEW_HELPTEXT -patchcat = SC_PATCH post_cb = [](auto) { SetWindowClassesDirty(WC_VEHICLE_VIEW); } [SDTC_BOOL] var = gui.hide_default_stop_location -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC +flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_PATCH def = true str = STR_CONFIG_SETTING_HIDE_DEFAULT_STOP_LOCATION strhelp = STR_CONFIG_SETTING_HIDE_DEFAULT_STOP_LOCATION_HELPTEXT -patchcat = SC_PATCH post_cb = [](auto) { SetWindowClassesDirty(WC_VEHICLE_ORDERS); } ; For the dedicated build we'll enable dates in logs by default. @@ -1753,17 +1665,15 @@ cat = SC_EXPERT [SDTC_BOOL] var = gui.console_show_unlisted -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC +flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_PATCH def = false cat = SC_EXPERT -patchcat = SC_PATCH [SDTC_BOOL] var = gui.newgrf_disable_big_gui -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC +flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_PATCH def = false cat = SC_EXPERT -patchcat = SC_PATCH [SDTC_VAR] var = gui.console_backlog_timeout diff --git a/src/table/settings/multimedia_settings.ini b/src/table/settings/multimedia_settings.ini index 962cdfbbc9..0a70988a5d 100644 --- a/src/table/settings/multimedia_settings.ini +++ b/src/table/settings/multimedia_settings.ini @@ -12,9 +12,9 @@ const SettingTable _multimedia_settings = { [post-amble] }; [templates] -SDTC_BOOL = SDTC_BOOL( $var, $flags, $def, $str, $strhelp, $strval, $pre_cb, $post_cb, $from, $to, $extver, $cat | $patchcat, $guiproc, $startup, $patxname), -SDTC_LIST = SDTC_LIST( $var, $type, $flags, $def, $from, $to, $extver, $cat | $patchcat, $guiproc, $startup, $patxname), -SDTC_VAR = SDTC_VAR( $var, $type, $flags, $def, $min, $max, $interval, $str, $strhelp, $strval, $pre_cb, $post_cb, $from, $to, $extver, $cat | $patchcat, $guiproc, $startup, $patxname), +SDTC_BOOL = SDTC_BOOL( $var, $flags, $def, $str, $strhelp, $strval, $pre_cb, $post_cb, $from, $to, $extver, $cat, $guiproc, $startup, $patxname), +SDTC_LIST = SDTC_LIST( $var, $type, $flags, $def, $from, $to, $extver, $cat, $guiproc, $startup, $patxname), +SDTC_VAR = SDTC_VAR( $var, $type, $flags, $def, $min, $max, $interval, $str, $strhelp, $strval, $pre_cb, $post_cb, $from, $to, $extver, $cat, $guiproc, $startup, $patxname), [validation] SDTC_VAR = static_assert($max <= MAX_$type, "Maximum value for $var exceeds storage size"); @@ -32,7 +32,6 @@ load = nullptr from = SL_MIN_VERSION to = SL_MAX_VERSION cat = SC_ADVANCED -patchcat = SC_NONE startup = false extver = SlXvFeatureTest() patxname = nullptr diff --git a/src/table/settings/news_display_settings.ini b/src/table/settings/news_display_settings.ini index d2b0aa7688..ba7d5bcebc 100644 --- a/src/table/settings/news_display_settings.ini +++ b/src/table/settings/news_display_settings.ini @@ -13,7 +13,7 @@ const SettingTable _news_display_settings = { [post-amble] }; [templates] -SDTC_OMANY = SDTC_OMANY( $var, $type, $flags, $def, $max, $full, $str, $strhelp, $strval, $pre_cb, $post_cb, $from, $to, $extver, $cat | $patchcat, $guiproc, $startup, $patxname), +SDTC_OMANY = SDTC_OMANY( $var, $type, $flags, $def, $max, $full, $str, $strhelp, $strval, $pre_cb, $post_cb, $from, $to, $extver, $cat, $guiproc, $startup, $patxname), [validation] SDTC_OMANY = static_assert($max <= MAX_$type, "Maximum value for $var exceeds storage size"); @@ -31,7 +31,6 @@ load = nullptr from = SL_MIN_VERSION to = SL_MAX_VERSION cat = SC_ADVANCED -patchcat = SC_NONE startup = false extver = SlXvFeatureTest() patxname = nullptr diff --git a/src/table/settings/scenario_settings.ini b/src/table/settings/scenario_settings.ini index 74dedfdd4c..c3c79da0aa 100644 --- a/src/table/settings/scenario_settings.ini +++ b/src/table/settings/scenario_settings.ini @@ -12,9 +12,9 @@ const SettingTable _scenario_settings = { [post-amble] }; [templates] -SDTC_BOOL = SDTC_BOOL( $var, $flags, $def, $str, $strhelp, $strval, $pre_cb, $post_cb, $from, $to, $extver, $cat | $patchcat, $guiproc, $startup, $patxname), -SDTC_LIST = SDTC_LIST( $var, $type, $flags, $def, $from, $to, $extver, $cat | $patchcat, $guiproc, $startup, $patxname), -SDTC_VAR = SDTC_VAR( $var, $type, $flags, $def, $min, $max, $interval, $str, $strhelp, $strval, $pre_cb, $post_cb, $from, $to, $extver, $cat | $patchcat, $guiproc, $startup, $patxname), +SDTC_BOOL = SDTC_BOOL( $var, $flags, $def, $str, $strhelp, $strval, $pre_cb, $post_cb, $from, $to, $extver, $cat, $guiproc, $startup, $patxname), +SDTC_LIST = SDTC_LIST( $var, $type, $flags, $def, $from, $to, $extver, $cat, $guiproc, $startup, $patxname), +SDTC_VAR = SDTC_VAR( $var, $type, $flags, $def, $min, $max, $interval, $str, $strhelp, $strval, $pre_cb, $post_cb, $from, $to, $extver, $cat, $guiproc, $startup, $patxname), [validation] SDTC_VAR = static_assert($max <= MAX_$type, "Maximum value for $var exceeds storage size"); @@ -32,7 +32,6 @@ load = nullptr from = SL_MIN_VERSION to = SL_MAX_VERSION cat = SC_ADVANCED -patchcat = SC_NONE startup = false extver = SlXvFeatureTest() patxname = nullptr @@ -40,24 +39,22 @@ patxname = nullptr [SDTC_BOOL] var = scenario.multiple_buildings -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC +flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_PATCH def = false str = STR_CONFIG_SETTING_SCENARIO_MULTIPLE_BUILDINGS strhelp = STR_CONFIG_SETTING_SCENARIO_MULTIPLE_BUILDINGS_HELPTEXT -patchcat = SC_PATCH [SDTC_BOOL] var = scenario.house_ignore_dates -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC +flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_PATCH def = false str = STR_CONFIG_SETTING_SCENARIO_HOUSE_IGNORE_DATES strhelp = STR_CONFIG_SETTING_SCENARIO_HOUSE_IGNORE_DATES_HELPTEXT -patchcat = SC_PATCH [SDTC_VAR] var = scenario.house_ignore_zones type = SLE_UINT8 -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_GUI_DROPDOWN +flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_GUI_DROPDOWN | SF_PATCH def = 0 min = 0 max = 2 @@ -65,12 +62,10 @@ interval = 1 str = STR_CONFIG_SETTING_SCENARIO_HOUSE_IGNORE_ZONES strhelp = STR_CONFIG_SETTING_SCENARIO_HOUSE_IGNORE_ZONES_HELPTEXT strval = STR_CONFIG_SETTING_SCENARIO_HOUSE_IGNORE_ZONES_OFF -patchcat = SC_PATCH [SDTC_BOOL] var = scenario.house_ignore_grf -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC +flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_PATCH def = false str = STR_CONFIG_SETTING_SCENARIO_HOUSE_IGNORE_GRF strhelp = STR_CONFIG_SETTING_SCENARIO_HOUSE_IGNORE_GRF_HELPTEXT -patchcat = SC_PATCH diff --git a/src/table/settings/settings.ini b/src/table/settings/settings.ini index ffc3fa8d5a..cb7be608a8 100644 --- a/src/table/settings/settings.ini +++ b/src/table/settings/settings.ini @@ -142,24 +142,24 @@ const SettingTable _settings{ [post-amble] }; [templates] -SDTG_BOOL = SDTG_BOOL($name, $flags, $var, $def, $str, $strhelp, $strval, $pre_cb, $post_cb, $from, $to, $extver, $cat | $patchcat, $guiproc, $startup, $patxname), -SDTG_VAR = SDTG_VAR($name, $type, $flags, $var, $def, $min, $max, $interval, $str, $strhelp, $strval, $pre_cb, $post_cb, $from, $to, $extver, $cat | $patchcat, $guiproc, $startup, $patxname), -SDTG_ENUM = SDTG_ENUM($name, $type, $flags, $var, $def, $str, $strhelp, $pre_cb, $post_cb, $from, $to, $extver, $cat | $patchcat, $guiproc, $startup, $patxname, $enumlist), -SDTG_OMANY = SDTG_OMANY($name, $type, $flags, $var, $def, $max, $full, $str, $strhelp, $strval, $pre_cb, $post_cb, $from, $to, $extver, $cat | $patchcat, $guiproc, $startup, $patxname), -SDTC_BOOL = SDTC_BOOL( $var, $flags, $def, $str, $strhelp, $strval, $pre_cb, $post_cb, $from, $to, $extver, $cat | $patchcat, $guiproc, $startup, $patxname), -SDTC_LIST = SDTC_LIST( $var, $type, $flags, $def, $from, $to, $extver, $cat | $patchcat, $guiproc, $startup, $patxname), -SDTC_OMANY = SDTC_OMANY( $var, $type, $flags, $def, $max, $full, $str, $strhelp, $strval, $pre_cb, $post_cb, $from, $to, $extver, $cat | $patchcat, $guiproc, $startup, $patxname), -SDTC_SSTR = SDTC_SSTR( $var, $type, $flags, $def, $length, $pre_cb, $post_cb, $from, $to, $extver, $cat | $patchcat, $guiproc, $startup, $patxname), -SDTC_VAR = SDTC_VAR( $var, $type, $flags, $def, $min, $max, $interval, $str, $strhelp, $strval, $pre_cb, $post_cb, $from, $to, $extver, $cat | $patchcat, $guiproc, $startup, $patxname), -SDTC_ENUM = SDTC_ENUM( $var, $type, $flags, $def, $str, $strhelp, $pre_cb, $post_cb, $from, $to, $extver, $cat | $patchcat, $guiproc, $startup, $patxname, $enumlist), -SDT_BOOL = SDT_BOOL(GameSettings, $var, $flags, $def, $str, $strhelp, $strval, $pre_cb, $post_cb, $from, $to, $extver, $cat | $patchcat, $guiproc, $startup, $patxname), -SDT_OMANY = SDT_OMANY(GameSettings, $var, $type, $flags, $def, $max, $full, $str, $strhelp, $strval, $pre_cb, $post_cb, $from, $to, $extver, $load, $cat | $patchcat, $guiproc, $startup, $patxname), -SDT_SSTR = SDT_SSTR(GameSettings, $var, $type, $flags, $def, $pre_cb, $post_cb, $from, $to, $extver, $cat | $patchcat, $guiproc, $startup, $patxname), -SDT_VAR = SDT_VAR(GameSettings, $var, $type, $flags, $def, $min, $max, $interval, $str, $strhelp, $strval, $pre_cb, $post_cb, $from, $to, $extver, $cat | $patchcat, $guiproc, $startup, $patxname), -SDT_ENUM = SDT_ENUM(GameSettings, $var, $type, $flags, $def, $str, $strhelp, $pre_cb, $post_cb, $from, $to, $extver, $cat | $patchcat, $guiproc, $startup, $patxname, $enumlist), +SDTG_BOOL = SDTG_BOOL($name, $flags, $var, $def, $str, $strhelp, $strval, $pre_cb, $post_cb, $from, $to, $extver, $cat, $guiproc, $startup, $patxname), +SDTG_VAR = SDTG_VAR($name, $type, $flags, $var, $def, $min, $max, $interval, $str, $strhelp, $strval, $pre_cb, $post_cb, $from, $to, $extver, $cat, $guiproc, $startup, $patxname), +SDTG_ENUM = SDTG_ENUM($name, $type, $flags, $var, $def, $str, $strhelp, $pre_cb, $post_cb, $from, $to, $extver, $cat, $guiproc, $startup, $patxname, $enumlist), +SDTG_OMANY = SDTG_OMANY($name, $type, $flags, $var, $def, $max, $full, $str, $strhelp, $strval, $pre_cb, $post_cb, $from, $to, $extver, $cat, $guiproc, $startup, $patxname), +SDTC_BOOL = SDTC_BOOL( $var, $flags, $def, $str, $strhelp, $strval, $pre_cb, $post_cb, $from, $to, $extver, $cat, $guiproc, $startup, $patxname), +SDTC_LIST = SDTC_LIST( $var, $type, $flags, $def, $from, $to, $extver, $cat, $guiproc, $startup, $patxname), +SDTC_OMANY = SDTC_OMANY( $var, $type, $flags, $def, $max, $full, $str, $strhelp, $strval, $pre_cb, $post_cb, $from, $to, $extver, $cat, $guiproc, $startup, $patxname), +SDTC_SSTR = SDTC_SSTR( $var, $type, $flags, $def, $length, $pre_cb, $post_cb, $from, $to, $extver, $cat, $guiproc, $startup, $patxname), +SDTC_VAR = SDTC_VAR( $var, $type, $flags, $def, $min, $max, $interval, $str, $strhelp, $strval, $pre_cb, $post_cb, $from, $to, $extver, $cat, $guiproc, $startup, $patxname), +SDTC_ENUM = SDTC_ENUM( $var, $type, $flags, $def, $str, $strhelp, $pre_cb, $post_cb, $from, $to, $extver, $cat, $guiproc, $startup, $patxname, $enumlist), +SDT_BOOL = SDT_BOOL(GameSettings, $var, $flags, $def, $str, $strhelp, $strval, $pre_cb, $post_cb, $from, $to, $extver, $cat, $guiproc, $startup, $patxname), +SDT_OMANY = SDT_OMANY(GameSettings, $var, $type, $flags, $def, $max, $full, $str, $strhelp, $strval, $pre_cb, $post_cb, $from, $to, $extver, $load, $cat, $guiproc, $startup, $patxname), +SDT_SSTR = SDT_SSTR(GameSettings, $var, $type, $flags, $def, $pre_cb, $post_cb, $from, $to, $extver, $cat, $guiproc, $startup, $patxname), +SDT_VAR = SDT_VAR(GameSettings, $var, $type, $flags, $def, $min, $max, $interval, $str, $strhelp, $strval, $pre_cb, $post_cb, $from, $to, $extver, $cat, $guiproc, $startup, $patxname), +SDT_ENUM = SDT_ENUM(GameSettings, $var, $type, $flags, $def, $str, $strhelp, $pre_cb, $post_cb, $from, $to, $extver, $cat, $guiproc, $startup, $patxname, $enumlist), SDT_NAMED_NULL = SDT_NAMED_NULL($name, $length, $from, $to, $extver, $patxname), -SDT_LINKGRAPH_PER_CARGO = SDT_ENUM(GameSettings, linkgraph.distribution_per_cargo[$linkgraph_cargo], SLE_UINT8, $flags | SF_NOT_IN_CONFIG | SF_NO_NEWGAME, DT_PER_CARGO_DEFAULT, STR_CONFIG_SETTING_DISTRIBUTION_PER_CARGO, STR_CONFIG_SETTING_DISTRIBUTION_PER_CARGO_HELPTEXT, $pre_cb, $post_cb, $from, $to, SlXvFeatureTest(XSLFTO_AND, XSLFI_LINKGRAPH_MODES), SC_EXPERT | SC_PATCH, LinkGraphDistributionSettingGUI, false, nullptr, _linkgraph_mode_per_cargo), +SDT_LINKGRAPH_PER_CARGO = SDT_ENUM(GameSettings, linkgraph.distribution_per_cargo[$linkgraph_cargo], SLE_UINT8, $flags | SF_NOT_IN_CONFIG | SF_NO_NEWGAME | SF_PATCH, DT_PER_CARGO_DEFAULT, STR_CONFIG_SETTING_DISTRIBUTION_PER_CARGO, STR_CONFIG_SETTING_DISTRIBUTION_PER_CARGO_HELPTEXT, $pre_cb, $post_cb, $from, $to, SlXvFeatureTest(XSLFTO_AND, XSLFI_LINKGRAPH_MODES), SC_EXPERT, LinkGraphDistributionSettingGUI, false, nullptr, _linkgraph_mode_per_cargo), [validation] SDTG_VAR = static_assert($max <= MAX_$type, "Maximum value for $var exceeds storage size"); @@ -182,7 +182,6 @@ load = nullptr from = SL_MIN_VERSION to = SL_MAX_VERSION cat = SC_ADVANCED -patchcat = SC_NONE startup = false extver = SlXvFeatureTest() patxname = nullptr @@ -206,7 +205,6 @@ cat = SC_BASIC [SDT_VAR] var = difficulty.competitors_interval type = SLE_UINT16 -flags = SF_ENABLE_TABLE_PATS def = 10 min = MIN_COMPETITORS_INTERVAL max = MAX_COMPETITORS_INTERVAL @@ -293,18 +291,19 @@ cat = SC_BASIC [SDT_VAR] var = difficulty.vehicle_costs_in_depot type = SLE_UINT8 +flags = SF_PATCH def = 1 min = 1 max = 8 str = STR_CONFIG_SETTING_RUNNING_COSTS_IN_DEPOT strhelp = STR_CONFIG_SETTING_RUNNING_COSTS_IN_DEPOT_HELPTEXT strval = STR_CONFIG_SETTING_RUNNING_COSTS_IN_DEPOT_VALUE -patchcat = SC_PATCH patxname = ""difficulty.vehicle_costs_in_depot"" [SDT_VAR] var = difficulty.vehicle_costs_when_stopped type = SLE_UINT8 +flags = SF_PATCH def = 1 min = 1 max = 8 @@ -312,7 +311,6 @@ str = STR_CONFIG_SETTING_RUNNING_COSTS_WHEN_STOPPED strhelp = STR_CONFIG_SETTING_RUNNING_COSTS_WHEN_STOPPED_HELPTEXT strval = STR_CONFIG_SETTING_RUNNING_COSTS_WHEN_STOPPED_VALUE strval = STR_CONFIG_SETTING_RUNNING_COSTS_IN_DEPOT_VALUE -patchcat = SC_PATCH patxname = ""difficulty.vehicle_costs_when_stopped"" [SDT_VAR] @@ -450,32 +448,32 @@ post_cb = DifficultyNoiseChange [SDT_BOOL] var = difficulty.money_cheat_in_multiplayer +flags = SF_PATCH def = false str = STR_CONFIG_SETTING_MONEY_CHEAT_MULTIPLAYER strhelp = STR_CONFIG_SETTING_MONEY_CHEAT_MULTIPLAYER_HELPTEXT post_cb = DifficultyMoneyCheatMultiplayerChange cat = SC_EXPERT -patchcat = SC_PATCH patxname = ""cheat.difficulty.money_cheat_in_multiplayer"" [SDT_BOOL] var = difficulty.rename_towns_in_multiplayer +flags = SF_PATCH def = false str = STR_CONFIG_SETTING_RENAME_TOWNS_MULTIPLAYER strhelp = STR_CONFIG_SETTING_RENAME_TOWNS_MULTIPLAYER_HELPTEXT post_cb = DifficultyRenameTownsMultiplayerChange cat = SC_EXPERT -patchcat = SC_PATCH patxname = ""cheat.difficulty.rename_towns_in_multiplayer"" [SDT_BOOL] var = difficulty.override_town_settings_in_multiplayer +flags = SF_PATCH def = false str = STR_CONFIG_SETTING_OVERRIDE_TOWN_SETTINGS_MULTIPLAYER strhelp = STR_CONFIG_SETTING_OVERRIDE_TOWN_SETTINGS_MULTIPLAYER_HELPTEXT post_cb = DifficultyOverrideTownSettingsMultiplayerChange cat = SC_EXPERT -patchcat = SC_PATCH patxname = ""cheat.difficulty.override_town_settings_in_multiplayer"" [SDTG_VAR] @@ -492,6 +490,7 @@ cat = SC_BASIC [SDT_BOOL] var = order.old_timetable_separation +flags = SF_PATCH def = true cat = SC_EXPERT extver = SlXvFeatureTest(XSLFTO_AND, XSLFI_AUTO_TIMETABLE, 1, 3) @@ -499,6 +498,7 @@ patxname = ""auto_timetables.order.timetable_separation"" [SDT_VAR] var = order.old_timetable_separation_rate +flags = SF_PATCH type = SLE_UINT8 def = 100 min = 0 @@ -602,20 +602,20 @@ strval = STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL_NO_ACTIONS [SDT_BOOL] var = construction.enable_build_river +flags = SF_PATCH def = false cat = SC_BASIC str = STR_CONFIG_SETTING_ENABLE_BUILD_RIVER strhelp = STR_CONFIG_SETTING_ENABLE_BUILD_RIVER_HELPTEXT -patchcat = SC_PATCH patxname = ""enable_build_river.construction.enable_build_river"" [SDT_BOOL] var = construction.enable_remove_water +flags = SF_PATCH def = true cat = SC_BASIC str = STR_CONFIG_SETTING_ENABLE_REMOVE_WATER strhelp = STR_CONFIG_SETTING_ENABLE_REMOVE_WATER_HELPTEXT -patchcat = SC_PATCH patxname = ""enable_build_river.construction.enable_remove_water"" [SDT_VAR] @@ -681,29 +681,28 @@ cat = SC_EXPERT [SDT_VAR] var = construction.purchase_land_per_64k_frames type = SLE_UINT32 +flags = SF_PATCH def = 16 << 16 min = 0 max = 1 << 30 interval = 1 cat = SC_EXPERT -patchcat = SC_PATCH patxname = ""buy_land_rate_limit.construction.purchase_land_per_64k_frames"" [SDT_VAR] var = construction.purchase_land_frame_burst type = SLE_UINT16 +flags = SF_PATCH def = 1024 min = 0 max = 1 << 15 interval = 1 cat = SC_EXPERT -patchcat = SC_PATCH patxname = ""buy_land_rate_limit.construction.purchase_land_frame_burst"" [SDT_VAR] var = construction.build_object_per_64k_frames type = SLE_UINT32 -flags = SF_ENABLE_TABLE_PATS def = 32 << 16 min = 0 max = 1 << 30 @@ -714,7 +713,6 @@ patxname = ""build_object_rate_limit.construction.build_object_per_64k_frames"" [SDT_VAR] var = construction.build_object_frame_burst type = SLE_UINT16 -flags = SF_ENABLE_TABLE_PATS def = 2048 min = 0 max = 1 << 15 @@ -778,16 +776,17 @@ strval = STR_CONFIG_SETTING_TILE_LENGTH [SDT_BOOL] var = construction.chunnel +flags = SF_PATCH def = false str = STR_CONFIG_SETTING_CHUNNEL strhelp = STR_CONFIG_SETTING_CHUNNEL_HELPTEXT cat = SC_BASIC -patchcat = SC_PATCH patxname = ""chunnel.construction.chunnel"" [SDT_VAR] var = construction.old_simulated_wormhole_signals type = SLE_UINT8 +flags = SF_PATCH def = 2 min = 1 max = 16 @@ -865,7 +864,7 @@ strhelp = STR_CONFIG_SETTING_ALLOW_TOWN_LEVEL_CROSSINGS_HELPTEXT [SDT_VAR] var = economy.town_build_tunnels type = SLE_UINT8 -flags = SF_GUI_DROPDOWN +flags = SF_GUI_DROPDOWN | SF_PATCH def = TTM_ALLOWED min = TTM_BEGIN max = TTM_END - 1 @@ -874,13 +873,12 @@ str = STR_CONFIG_SETTING_TOWN_TUNNELS strhelp = STR_CONFIG_SETTING_TOWN_TUNNELS_HELPTEXT strval = STR_CONFIG_SETTING_TOWN_TUNNELS_FORBIDDEN cat = SC_BASIC -patchcat = SC_PATCH patxname = ""economy.town_build_tunnels"" [SDT_VAR] var = economy.town_max_road_slope type = SLE_UINT8 -flags = SF_GUI_0_IS_SPECIAL +flags = SF_GUI_0_IS_SPECIAL | SF_PATCH def = 4 min = 0 max = 8 @@ -889,16 +887,15 @@ str = STR_CONFIG_SETTING_TOWN_MAX_ROAD_SLOPE strhelp = STR_CONFIG_SETTING_TOWN_MAX_ROAD_SLOPE_HELPTEXT strval = STR_CONFIG_SETTING_TOWN_MAX_ROAD_SLOPE_VALUE cat = SC_BASIC -patchcat = SC_PATCH patxname = ""economy.town_max_road_slope"" [SDT_BOOL] var = economy.allow_town_bridges +flags = SF_PATCH def = true str = STR_CONFIG_SETTING_ALLOW_TOWN_BRIDGES strhelp = STR_CONFIG_SETTING_ALLOW_TOWN_BRIDGES_HELPTEXT cat = SC_BASIC -patchcat = SC_PATCH patxname = ""economy.allow_town_bridges"" [SDT_VAR] @@ -918,6 +915,7 @@ cat = SC_ADVANCED [SDT_VAR] var = economy.max_town_heightlevel type = SLE_UINT8 +flags = SF_PATCH def = MAX_MAP_HEIGHT_LIMIT min = 2 max = MAX_MAP_HEIGHT_LIMIT @@ -926,14 +924,13 @@ str = STR_CONFIG_SETTING_TOWN_ABOVE_HEIGHT strhelp = STR_CONFIG_SETTING_TOWN_ABOVE_HEIGHT_HELPTEXT strval = STR_JUST_INT cat = SC_BASIC -patchcat = SC_PATCH patxname = ""max_town_heightlevel.economy.max_town_heightlevel"" [SDT_VAR] base = GameSettings var = economy.min_town_land_area type = SLE_UINT16 -flags = SF_GUI_0_IS_SPECIAL +flags = SF_GUI_0_IS_SPECIAL | SF_PATCH def = 0 min = 0 max = 400 @@ -942,14 +939,13 @@ str = STR_CONFIG_SETTING_MIN_TOWN_LAND_AREA strhelp = STR_CONFIG_SETTING_MIN_TOWN_LAND_AREA_HELPTEXT strval = STR_CONFIG_SETTING_MIN_LAND_AREA_VALUE cat = SC_BASIC -patchcat = SC_PATCH patxname = ""max_town_heightlevel.economy.min_town_land_area"" [SDT_VAR] base = GameSettings var = economy.min_city_land_area type = SLE_UINT16 -flags = SF_GUI_0_IS_SPECIAL +flags = SF_GUI_0_IS_SPECIAL | SF_PATCH def = 75 min = 0 max = 400 @@ -958,7 +954,6 @@ str = STR_CONFIG_SETTING_MIN_CITY_LAND_AREA strhelp = STR_CONFIG_SETTING_MIN_CITY_LAND_AREA_HELPTEXT strval = STR_CONFIG_SETTING_MIN_LAND_AREA_VALUE cat = SC_BASIC -patchcat = SC_PATCH patxname = ""max_town_heightlevel.economy.min_city_land_area"" ; link graph @@ -1213,6 +1208,7 @@ strhelp = STR_CONFIG_SETTING_SHORT_PATH_SATURATION_HELPTEXT [SDT_VAR] var = linkgraph.aircraft_link_scale type = SLE_UINT16 +flags = SF_PATCH def = 100 min = 100 max = 1000 @@ -1220,12 +1216,12 @@ interval = 50 str = STR_CONFIG_SETTING_AIRCRAFT_PATH_COST strval = STR_CONFIG_SETTING_PERCENTAGE strhelp = STR_CONFIG_SETTING_AIRCRAFT_PATH_COST_HELPTEXT -patchcat = SC_PATCH extver = SlXvFeatureTest(XSLFTO_AND, XSLFI_LINKGRAPH_AIRCRAFT) [SDT_VAR] var = economy.old_town_cargo_factor type = SLE_INT8 +flags = SF_PATCH def = 0 min = -16 max = +8 @@ -1238,7 +1234,7 @@ patxname = ""town_cargo_adj.economy.town_cargo_factor"" [SDT_VAR] var = economy.town_cargo_scale_factor type = SLE_INT16 -flags = SF_DECIMAL1 | SF_DEC1SCALE +flags = SF_DECIMAL1 | SF_DEC1SCALE | SF_PATCH def = 0 min = -160 max = +80 @@ -1251,7 +1247,7 @@ patxname = ""town_cargo_adj.economy.town_cargo_scale_factor"" [SDT_VAR] var = economy.industry_cargo_scale_factor type = SLE_INT16 -flags = SF_DECIMAL1 | SF_DEC1SCALE +flags = SF_DECIMAL1 | SF_DEC1SCALE | SF_PATCH def = 0 min = -50 max = +50 @@ -1259,7 +1255,6 @@ interval = 1 str = STR_CONFIG_SETTING_INDUSTRY_CARGO_FACTOR strval = STR_DECIMAL1_WITH_SCALE strhelp = STR_CONFIG_SETTING_INDUSTRY_CARGO_FACTOR_HELPTEXT -patchcat = SC_PATCH patxname = ""industry_cargo_adj.economy.industry_cargo_scale_factor"" ; Vehicles @@ -1280,6 +1275,7 @@ post_cb = TrainAccelerationModelChanged [SDT_ENUM] var = vehicle.train_braking_model type = SLE_UINT8 +flags = SF_PATCH def = TBM_ORIGINAL enumlist = _train_braking_model str = STR_CONFIG_SETTING_TRAIN_BRAKING_MODEL @@ -1287,27 +1283,26 @@ strhelp = STR_CONFIG_SETTING_TRAIN_BRAKING_MODEL_HELPTEXT pre_cb = CheckTrainBrakingModelChange post_cb = TrainBrakingModelChanged cat = SC_EXPERT -patchcat = SC_PATCH patxname = ""realistic_braking.vehicle.train_braking_model"" [SDT_ENUM] var = vehicle.realistic_braking_aspect_limited type = SLE_UINT8 +flags = SF_PATCH def = TRBALM_OFF enumlist = _realistic_braking_aspect_limited str = STR_CONFIG_SETTING_REALISTIC_BRAKING_ASPECT_LIMITED strhelp = STR_CONFIG_SETTING_REALISTIC_BRAKING_ASPECT_LIMITED_HELPTEXT cat = SC_EXPERT -patchcat = SC_PATCH patxname = ""realistic_braking.vehicle.realistic_braking_aspect_limited"" [SDT_BOOL] var = vehicle.limit_train_acceleration +flags = SF_PATCH def = false str = STR_CONFIG_SETTING_LIMIT_TRAIN_ACCELERATION strhelp = STR_CONFIG_SETTING_LIMIT_TRAIN_ACCELERATION_HELPTEXT cat = SC_EXPERT -patchcat = SC_PATCH patxname = ""realistic_braking.vehicle.limit_train_acceleration"" [SDT_VAR] @@ -1355,7 +1350,7 @@ cat = SC_EXPERT [SDT_VAR] var = vehicle.through_load_speed_limit type = SLE_UINT16 -flags = SF_GUI_VELOCITY +flags = SF_GUI_VELOCITY | SF_PATCH def = 15 min = 5 max = 500 @@ -1364,13 +1359,12 @@ str = STR_CONFIG_SETTING_THROUGH_LOAD_SPEED_LIMIT strhelp = STR_CONFIG_SETTING_THROUGH_LOAD_SPEED_LIMIT_HELPTEXT strval = STR_JUST_VELOCITY cat = SC_EXPERT -patchcat = SC_PATCH patxname = ""vehicle.through_load_speed_limit"" [SDT_VAR] var = vehicle.rail_depot_speed_limit type = SLE_UINT16 -flags = SF_GUI_VELOCITY +flags = SF_GUI_VELOCITY | SF_PATCH def = 61 min = 5 max = 100 @@ -1379,16 +1373,15 @@ str = STR_CONFIG_SETTING_RAIL_DEPOT_SPEED_LIMIT strhelp = STR_CONFIG_SETTING_RAIL_DEPOT_SPEED_LIMIT_HELPTEXT strval = STR_JUST_VELOCITY cat = SC_EXPERT -patchcat = SC_PATCH patxname = ""vehicle.rail_depot_speed_limit"" [SDT_BOOL] var = vehicle.non_leading_engines_keep_name +flags = SF_PATCH def = false str = STR_CONFIG_SETTING_NON_LEADING_ENGINES_KEEP_NAME strhelp = STR_CONFIG_SETTING_NON_LEADING_ENGINES_KEEP_NAME_HELPTEXT cat = SC_ADVANCED -patchcat = SC_PATCH patxname = ""vehicle.non_leading_engines_keep_name"" [SDT_BOOL] @@ -1400,11 +1393,11 @@ cat = SC_EXPERT [SDT_BOOL] var = pf.back_of_one_way_pbs_waiting_point +flags = SF_PATCH def = true str = STR_CONFIG_SETTING_BACK_ONE_WAY_PBS_SAFE_WAITING str = STR_CONFIG_SETTING_BACK_ONE_WAY_PBS_SAFE_WAITING_HELPTEXT cat = SC_EXPERT -patchcat = SC_PATCH patxname = ""pf.back_of_one_way_pbs_waiting_point"" [SDT_VAR] @@ -1442,7 +1435,7 @@ cat = SC_EXPERT [SDT_VAR] var = pf.reroute_rv_on_layout_change type = SLE_UINT8 -flags = SF_GUI_DROPDOWN +flags = SF_GUI_DROPDOWN | SF_PATCH def = 1 min = 0 max = 2 @@ -1451,7 +1444,6 @@ str = STR_CONFIG_SETTING_REROUTE_RV_ON_LAYOUT_CHANGE strhelp = STR_CONFIG_SETTING_REROUTE_RV_ON_LAYOUT_CHANGE_HELPTEXT strval = STR_CONFIG_SETTING_REROUTE_RV_ON_LAYOUT_CHANGE_NO cat = SC_ADVANCED -patchcat = SC_PATCH patxname = ""pf.reroute_rv_on_layout_change"" [SDT_BOOL] @@ -1534,7 +1526,7 @@ strhelp = STR_CONFIG_SETTING_NEVER_EXPIRE_VEHICLES_HELPTEXT [SDT_VAR] var = vehicle.no_expire_vehicles_after type = SLE_INT32 -flags = SF_NO_NETWORK | SF_GUI_0_IS_SPECIAL +flags = SF_NO_NETWORK | SF_GUI_0_IS_SPECIAL | SF_PATCH def = 0 min = MIN_YEAR max = MAX_YEAR @@ -1543,13 +1535,12 @@ str = STR_CONFIG_SETTING_NO_EXPIRE_VEHICLES_AFTER strhelp = STR_CONFIG_SETTING_NO_EXPIRE_VEHICLES_AFTER_HELPTEXT strval = STR_CONFIG_SETTING_NO_EXPIRE_VEHICLES_AFTER_VALUE cat = SC_EXPERT -patchcat = SC_PATCH patxname = ""vehicle.no_expire_vehicles_after"" [SDT_VAR] var = vehicle.no_introduce_vehicles_after type = SLE_INT32 -flags = SF_NO_NETWORK | SF_GUI_0_IS_SPECIAL +flags = SF_NO_NETWORK | SF_GUI_0_IS_SPECIAL | SF_PATCH def = 0 min = MIN_YEAR max = MAX_YEAR @@ -1558,7 +1549,6 @@ str = STR_CONFIG_SETTING_NO_INTRODUCE_VEHICLES_AFTER strhelp = STR_CONFIG_SETTING_NO_INTRODUCE_VEHICLES_AFTER_HELPTEXT strval = STR_CONFIG_SETTING_NO_INTRODUCE_VEHICLES_AFTER_VALUE cat = SC_EXPERT -patchcat = SC_PATCH patxname = ""vehicle.no_introduce_vehicles_after"" [SDT_VAR] @@ -1672,15 +1662,16 @@ post_cb = UpdateConsists [SDT_BOOL] var = vehicle.slow_road_vehicles_in_curves +flags = SF_PATCH def = true str = STR_CONFIG_SETTING_SLOW_ROAD_VEHICLES_IN_CURVES strhelp = STR_CONFIG_SETTING_SLOW_ROAD_VEHICLES_IN_CURVES_HELPTEXT cat = SC_BASIC -patchcat = SC_PATCH patxname = ""slow_road_vehicles_in_curves.vehicle.slow_road_vehicles_in_curves"" [SDT_BOOL] var = vehicle.train_speed_adaptation +flags = SF_PATCH def = false str = STR_CONFIG_SETTING_TRAIN_SPEED_ADAPTATION strhelp = STR_CONFIG_SETTING_TRAIN_SPEED_ADAPTATION_HELPTEXT @@ -1748,54 +1739,54 @@ cat = SC_BASIC [SDT_BOOL] var = vehicle.improved_breakdowns +flags = SF_PATCH def = false str = STR_CONFIG_SETTING_IMPROVED_BREAKDOWNS post_cb = ImprovedBreakdownsSettingChanged -patchcat = SC_PATCH patxname = ""improved_breakdowns.vehicle.improved_breakdowns"" [SDT_BOOL] var = vehicle.ship_collision_avoidance +flags = SF_PATCH def = true str = STR_CONFIG_SETTING_SHIP_COLLISION_AVOIDANCE strhelp = STR_CONFIG_SETTING_SHIP_COLLISION_AVOIDANCE_HELPTEXT patxname = ""ship_collision_avoidance.vehicle.ship_collision_avoidance"" cat = SC_BASIC -patchcat = SC_PATCH [SDT_BOOL] var = vehicle.no_train_crash_other_company +flags = SF_PATCH def = false str = STR_CONFIG_SETTING_NO_TRAIN_CRASH_OTHER_COMPANY strhelp = STR_CONFIG_SETTING_NO_TRAIN_CRASH_OTHER_COMPANY_HELPTEXT extver = SlXvFeatureTest(XSLFTO_AND, XSLFI_INFRA_SHARING) -patchcat = SC_PATCH patxname = ""infra_sharing.vehicle.no_train_crash_other_company"" [SDT_BOOL] var = vehicle.roadveh_articulated_overtaking +flags = SF_PATCH def = true str = STR_CONFIG_SETTING_ROADVEH_ARTICULATED_OVERTAKING strhelp = STR_CONFIG_SETTING_ROADVEH_ARTICULATED_OVERTAKING_HELPTEXT patxname = ""roadveh_articulated_overtaking.vehicle.roadveh_articulated_overtaking"" cat = SC_BASIC -patchcat = SC_PATCH [SDT_BOOL] var = vehicle.roadveh_cant_quantum_tunnel +flags = SF_PATCH def = false str = STR_CONFIG_SETTING_ROADVEH_CANT_QUANTUM_TUNNEL strhelp = STR_CONFIG_SETTING_ROADVEH_CANT_QUANTUM_TUNNEL_HELPTEXT patxname = ""roadveh_cant_quantum_tunnel.vehicle.roadveh_cant_quantum_tunnel"" cat = SC_BASIC -patchcat = SC_PATCH [SDT_BOOL] var = vehicle.drive_through_train_depot +flags = SF_PATCH def = false str = STR_CONFIG_SETTING_DRIVE_THROUGH_TRAIN_DEPOT strhelp = STR_CONFIG_SETTING_DRIVE_THROUGH_TRAIN_DEPOT_HELPTEXT -patchcat = SC_PATCH patxname = ""drive_through_train_depot.vehicle.drive_through_train_depot"" [SDTC_BOOL] @@ -1842,11 +1833,11 @@ cat = SC_EXPERT [SDT_BOOL] var = order.nonstop_only +flags = SF_PATCH def = false str = STR_CONFIG_SETTING_NONSTOP_ORDER_ONLY strhelp = STR_CONFIG_SETTING_NONSTOP_ORDER_ONLY_HELPTEXT cat = SC_EXPERT -patchcat = SC_PATCH patxname = ""nonstop_only.order.nonstop_only"" [SDT_BOOL] @@ -1860,6 +1851,7 @@ cat = SC_EXPERT [SDT_VAR] var = station.catchment_increase type = SLE_UINT8 +flags = SF_PATCH def = 0 min = 0 max = 5 @@ -1868,23 +1860,22 @@ strhelp = STR_CONFIG_SETTING_CATCHMENT_INCREASE_HELPTEXT strval = STR_JUST_COMMA post_cb = StationCatchmentChanged extver = SlXvFeatureTest(XSLFTO_AND, XSLFI_STATION_CATCHMENT_INC) -patchcat = SC_PATCH patxname = ""station_catchment_inc.station.catchment_increase"" [SDT_BOOL] var = station.cargo_class_rating_wait_time +flags = SF_PATCH def = false str = STR_CONFIG_SETTING_STATION_RATING_CARGO_CLASS_WAIT_TIME strhelp = STR_CONFIG_SETTING_STATION_RATING_CARGO_CLASS_WAIT_TIME_HELPTEXT -patchcat = SC_PATCH patxname = ""station_rating.station.cargo_class_rating_wait_time"" [SDT_BOOL] var = station.station_size_rating_cargo_amount +flags = SF_PATCH def = false str = STR_CONFIG_SETTING_STATION_RATING_SIZE_CARGO_AMOUNT strhelp = STR_CONFIG_SETTING_STATION_RATING_SIZE_CARGO_AMOUNT_HELPTEXT -patchcat = SC_PATCH patxname = ""station_rating.station.station_size_rating_cargo_amount"" [SDT_BOOL] @@ -1898,11 +1889,11 @@ post_cb = StationCatchmentChanged [SDT_ENUM] var = station.station_delivery_mode type = SLE_UINT8 +flags = SF_PATCH def = SD_NEAREST_FIRST enumlist = _station_delivery_mode str = STR_CONFIG_SETTING_CARGO_DELIVERY_MODE strhelp = STR_CONFIG_SETTING_CARGO_DELIVERY_MODE_HELPTEXT -patchcat = SC_PATCH patxname = ""station.station_delivery_mode"" [SDT_BOOL] @@ -1930,63 +1921,63 @@ cat = SC_BASIC [SDT_BOOL] var = construction.road_custom_bridge_heads +flags = SF_PATCH def = true cat = SC_BASIC str = STR_CONFIG_SETTING_ENABLE_ROAD_CUSTOM_BRIDGE_HEADS strhelp = STR_CONFIG_SETTING_ENABLE_ROAD_CUSTOM_BRIDGE_HEADS_HELPTEXT -patchcat = SC_PATCH patxname = ""custom_bridge_heads.construction.road_custom_bridge_heads"" [SDT_BOOL] var = construction.rail_custom_bridge_heads +flags = SF_PATCH def = true cat = SC_BASIC str = STR_CONFIG_SETTING_ENABLE_RAIL_CUSTOM_BRIDGE_HEADS strhelp = STR_CONFIG_SETTING_ENABLE_RAIL_CUSTOM_BRIDGE_HEADS_HELPTEXT -patchcat = SC_PATCH patxname = ""custom_bridge_heads.construction.rail_custom_bridge_heads"" [SDT_BOOL] var = construction.allow_grf_objects_under_bridges +flags = SF_PATCH def = false cat = SC_ADVANCED str = STR_CONFIG_SETTING_ALLOW_GRF_OBJECTS_UNDER_BRIDGES strhelp = STR_CONFIG_SETTING_ALLOW_GRF_OBJECTS_UNDER_BRIDGES_HELPTEXT -patchcat = SC_PATCH patxname = ""allow_grf_objects_under_bridges.construction.allow_grf_objects_under_bridges"" [SDT_BOOL] var = construction.allow_stations_under_bridges +flags = SF_PATCH def = false cat = SC_ADVANCED str = STR_CONFIG_SETTING_ALLOW_GRF_STATIONS_UNDER_BRIDGES strhelp = STR_CONFIG_SETTING_ALLOW_GRF_STATIONS_UNDER_BRIDGES_HELPTEXT -patchcat = SC_PATCH patxname = ""allow_stations_under_bridges.construction.allow_stations_under_bridges"" [SDT_BOOL] var = construction.allow_road_stops_under_bridges +flags = SF_PATCH def = true cat = SC_ADVANCED str = STR_CONFIG_SETTING_ALLOW_ROAD_STATIONS_UNDER_BRIDGES strhelp = STR_CONFIG_SETTING_ALLOW_ROAD_STATIONS_UNDER_BRIDGES_HELPTEXT -patchcat = SC_PATCH patxname = ""allow_stations_under_bridges.construction.allow_road_stops_under_bridges"" guiproc = AllowRoadStopsUnderBridgesSettingGUI [SDT_BOOL] var = construction.allow_docks_under_bridges +flags = SF_PATCH def = false cat = SC_ADVANCED str = STR_CONFIG_SETTING_ALLOW_DOCKS_UNDER_BRIDGES strhelp = STR_CONFIG_SETTING_ALLOW_DOCKS_UNDER_BRIDGES_HELPTEXT -patchcat = SC_PATCH patxname = ""allow_stations_under_bridges.construction.allow_docks_under_bridges"" [SDT_VAR] var = construction.purchase_land_permitted type = SLE_UINT8 -flags = SF_GUI_DROPDOWN +flags = SF_GUI_DROPDOWN | SF_PATCH def = 1 min = 0 max = 2 @@ -1994,21 +1985,20 @@ interval = 1 str = STR_CONFIG_SETTING_PURCHASE_LAND_PERMITTED strhelp = STR_CONFIG_SETTING_PURCHASE_LAND_PERMITTED_HELPTEXT strval = STR_PURCHASE_LAND_PERMITTED_NO -patchcat = SC_PATCH patxname = ""purchase_land_permitted.construction.purchase_land_permitted"" [SDT_BOOL] var = construction.build_object_area_permitted +flags = SF_PATCH def = true str = STR_CONFIG_SETTING_BUILD_OBJECT_PERMITTED strhelp = STR_CONFIG_SETTING_BUILD_OBJECT_PERMITTED_HELPTEXT -patchcat = SC_PATCH patxname = ""build_object_area_permitted.construction.build_object_area_permitted"" [SDT_VAR] var = construction.no_expire_objects_after type = SLE_INT32 -flags = SF_GUI_0_IS_SPECIAL +flags = SF_GUI_0_IS_SPECIAL | SF_PATCH def = 0 min = MIN_YEAR max = MAX_YEAR @@ -2017,26 +2007,25 @@ str = STR_CONFIG_SETTING_NO_EXPIRE_OBJECTS_AFTER strhelp = STR_CONFIG_SETTING_NO_EXPIRE_OBJECTS_AFTER_HELPTEXT strval = STR_CONFIG_SETTING_NO_EXPIRE_OBJECTS_AFTER_VALUE cat = SC_ADVANCED -patchcat = SC_PATCH patxname = ""construction.no_expire_objects_after"" post_cb = [](auto) { InvalidateWindowClassesData(WC_BUILD_OBJECT, 0); } [SDT_BOOL] var = construction.ignore_object_intro_dates +flags = SF_PATCH def = false str = STR_CONFIG_SETTING_IGNORE_OBJECT_INTRO_DATES strhelp = STR_CONFIG_SETTING_IGNORE_OBJECT_INTRO_DATES_HELPTEXT patxname = ""construction.ignore_object_intro_dates"" -patchcat = SC_PATCH post_cb = [](auto) { InvalidateWindowClassesData(WC_BUILD_OBJECT, 0); } [SDT_BOOL] var = construction.convert_town_road_no_houses +flags = SF_PATCH def = false str = STR_CONFIG_SETTING_ALLOW_CONVERT_TOWN_ROAD_NO_HOUSES strhelp = STR_CONFIG_SETTING_ALLOW_CONVERT_TOWN_ROAD_NO_HOUSES_HELPTEXT cat = SC_EXPERT -patchcat = SC_PATCH patxname = ""construction.convert_town_road_no_houses"" [SDT_BOOL] @@ -2072,15 +2061,16 @@ pre_cb = [](int32 &new_value) -> bool { return CheckTTDPatchSettingFlag(0x81); [SDT_BOOL] var = economy.inflation_fixed_dates +flags = SF_PATCH def = true str = STR_CONFIG_SETTING_INFLATION_FIXED_DATES strhelp = STR_CONFIG_SETTING_INFLATION_FIXED_DATES_HELPTEXT -patchcat = SC_PATCH patxname = ""inflation_fixed_dates.economy.inflation_fixed_dates"" [SDT_VAR] var = economy.day_length_factor type = SLE_UINT8 +flags = SF_PATCH def = 1 min = 1 max = 125 @@ -2090,7 +2080,6 @@ strval = STR_JUST_COMMA pre_cb = DayLengthPreChange post_cb = DayLengthChanged cat = SC_BASIC -patchcat = SC_PATCH extver = SlXvFeatureTest(XSLFTO_AND, XSLFI_VARIABLE_DAY_LENGTH) patxname = ""variable_day_length.economy.day_length_factor"" @@ -2184,7 +2173,7 @@ cat = SC_BASIC [SDT_VAR] var = game_creation.rainforest_line_height type = SLE_UINT8 -flags = SF_NEWGAME_ONLY | SF_SCENEDIT_TOO +flags = SF_NEWGAME_ONLY | SF_SCENEDIT_TOO | SF_PATCH def = DEF_RAINFOREST_HEIGHT min = MIN_RAINFOREST_HEIGHT max = MAX_RAINFOREST_HEIGHT @@ -2193,13 +2182,12 @@ str = STR_CONFIG_SETTING_RAINFORESTLINE_HEIGHT strhelp = STR_CONFIG_SETTING_RAINFORESTLINE_HEIGHT_HELPTEXT strval = STR_JUST_COMMA cat = SC_BASIC -patchcat = SC_PATCH patxname = ""rainforest_line_height.game_creation.rainforest_line_height"" [SDT_VAR] var = game_creation.climate_threshold_mode type = SLE_UINT8 -flags = SF_GUI_DROPDOWN | SF_NEWGAME_ONLY +flags = SF_GUI_DROPDOWN | SF_NEWGAME_ONLY | SF_PATCH def = 0 min = 0 max = 1 @@ -2207,7 +2195,6 @@ str = STR_CONFIG_SETTING_CLIMATE_THRESHOLD_MODE strhelp = STR_CONFIG_SETTING_CLIMATE_THRESHOLD_MODE_HELPTEXT strval = STR_CONFIG_SETTING_CLIMATE_THRESHOLD_COVERAGE post_cb = ClimateThresholdModeChanged -patchcat = SC_PATCH patxname = ""climate.game_creation.climate_threshold_mode"" [SDT_VAR] @@ -2324,17 +2311,18 @@ guiproc = OrderTownGrowthRate [SDT_BOOL] var = economy.town_zone_calc_mode +flags = SF_PATCH def = false str = STR_CONFIG_SETTING_TOWN_ZONE_CALC_MODE strhelp = STR_CONFIG_SETTING_TOWN_ZONE_CALC_MODE_HELPTEXT cat = SC_EXPERT -patchcat = SC_PATCH post_cb = TownZoneModeChanged patxname = ""town_zone.economy.town_zone_calc_mode"" [SDT_VAR] var = economy.town_zone_0_mult type = SLE_UINT16 +flags = SF_PATCH def = 15 min = 0 max = 255 @@ -2343,13 +2331,13 @@ str = STR_CONFIG_SETTING_TOWN_ZONE_0_MULT strhelp = STR_CONFIG_SETTING_TOWN_ZONE_0_MULT_HELPTEXT strval = STR_JUST_COMMA cat = SC_EXPERT -patchcat = SC_PATCH post_cb = TownZoneCustomValueChanged patxname = ""town_zone.economy.town_zone_0_mult"" [SDT_VAR] var = economy.town_zone_1_mult type = SLE_UINT16 +flags = SF_PATCH def = 9 min = 0 max = 255 @@ -2358,13 +2346,13 @@ str = STR_CONFIG_SETTING_TOWN_ZONE_1_MULT strhelp = STR_CONFIG_SETTING_TOWN_ZONE_1_MULT_HELPTEXT strval = STR_JUST_COMMA cat = SC_EXPERT -patchcat = SC_PATCH post_cb = TownZoneCustomValueChanged patxname = ""town_zone.economy.town_zone_1_mult"" [SDT_VAR] var = economy.town_zone_2_mult type = SLE_UINT16 +flags = SF_PATCH def = 0 min = 0 max = 255 @@ -2373,13 +2361,13 @@ str = STR_CONFIG_SETTING_TOWN_ZONE_2_MULT strhelp = STR_CONFIG_SETTING_TOWN_ZONE_2_MULT_HELPTEXT strval = STR_JUST_COMMA cat = SC_EXPERT -patchcat = SC_PATCH post_cb = TownZoneCustomValueChanged patxname = ""town_zone.economy.town_zone_2_mult"" [SDT_VAR] var = economy.town_zone_3_mult type = SLE_UINT16 +flags = SF_PATCH def = 5 min = 0 max = 255 @@ -2388,13 +2376,13 @@ str = STR_CONFIG_SETTING_TOWN_ZONE_3_MULT strhelp = STR_CONFIG_SETTING_TOWN_ZONE_3_MULT_HELPTEXT strval = STR_JUST_COMMA cat = SC_EXPERT -patchcat = SC_PATCH post_cb = TownZoneCustomValueChanged patxname = ""town_zone.economy.town_zone_3_mult"" [SDT_VAR] var = economy.town_zone_4_mult type = SLE_UINT16 +flags = SF_PATCH def = 3 min = 0 max = 255 @@ -2403,13 +2391,13 @@ str = STR_CONFIG_SETTING_TOWN_ZONE_4_MULT strhelp = STR_CONFIG_SETTING_TOWN_ZONE_4_MULT_HELPTEXT strval = STR_JUST_COMMA cat = SC_EXPERT -patchcat = SC_PATCH post_cb = TownZoneCustomValueChanged patxname = ""town_zone.economy.town_zone_4_mult"" [SDT_VAR] var = economy.city_zone_0_mult type = SLE_UINT16 +flags = SF_PATCH def = 15 min = 0 max = 255 @@ -2418,13 +2406,13 @@ str = STR_CONFIG_SETTING_CITY_ZONE_0_MULT strhelp = STR_CONFIG_SETTING_CITY_ZONE_0_MULT_HELPTEXT strval = STR_JUST_COMMA cat = SC_EXPERT -patchcat = SC_PATCH post_cb = TownZoneCustomValueChanged patxname = ""town_zone.economy.city_zone_0_mult"" [SDT_VAR] var = economy.city_zone_1_mult type = SLE_UINT16 +flags = SF_PATCH def = 9 min = 0 max = 255 @@ -2433,13 +2421,13 @@ str = STR_CONFIG_SETTING_CITY_ZONE_1_MULT strhelp = STR_CONFIG_SETTING_CITY_ZONE_1_MULT_HELPTEXT strval = STR_JUST_COMMA cat = SC_EXPERT -patchcat = SC_PATCH post_cb = TownZoneCustomValueChanged patxname = ""town_zone.economy.city_zone_1_mult"" [SDT_VAR] var = economy.city_zone_2_mult type = SLE_UINT16 +flags = SF_PATCH def = 0 min = 0 max = 255 @@ -2448,14 +2436,13 @@ str = STR_CONFIG_SETTING_CITY_ZONE_2_MULT strhelp = STR_CONFIG_SETTING_CITY_ZONE_2_MULT_HELPTEXT strval = STR_JUST_COMMA cat = SC_EXPERT -patchcat = SC_PATCH post_cb = TownZoneCustomValueChanged - patxname = ""town_zone.economy.city_zone_2_mult"" [SDT_VAR] var = economy.city_zone_3_mult type = SLE_UINT16 +flags = SF_PATCH def = 5 min = 0 max = 255 @@ -2464,13 +2451,13 @@ str = STR_CONFIG_SETTING_CITY_ZONE_3_MULT strhelp = STR_CONFIG_SETTING_CITY_ZONE_3_MULT_HELPTEXT strval = STR_JUST_COMMA cat = SC_EXPERT -patchcat = SC_PATCH post_cb = TownZoneCustomValueChanged patxname = ""town_zone.economy.city_zone_3_mult"" [SDT_VAR] var = economy.city_zone_4_mult type = SLE_UINT16 +flags = SF_PATCH def = 3 min = 0 max = 255 @@ -2479,13 +2466,13 @@ str = STR_CONFIG_SETTING_CITY_ZONE_4_MULT strhelp = STR_CONFIG_SETTING_CITY_ZONE_4_MULT_HELPTEXT strval = STR_JUST_COMMA cat = SC_EXPERT -patchcat = SC_PATCH post_cb = TownZoneCustomValueChanged patxname = ""town_zone.economy.city_zone_4_mult"" [SDT_VAR] var = economy.town_growth_cargo_transported type = SLE_UINT8 +flags = SF_PATCH def = 0 min = 0 max = 100 @@ -2494,7 +2481,6 @@ str = STR_CONFIG_SETTING_TOWN_GROWTH_CARGO_TRANSPORTED strhelp = STR_CONFIG_SETTING_TOWN_GROWTH_CARGO_TRANSPORTED_HELPTEXT strval = STR_CONFIG_SETTING_PERCENTAGE cat = SC_EXPERT -patchcat = SC_PATCH patxname = ""town_growth.economy.town_growth_cargo_transported"" [SDT_VAR] @@ -2531,6 +2517,7 @@ cat = SC_EXPERT [SDT_VAR] var = economy.town_min_distance type = SLE_UINT16 +flags = SF_PATCH def = 20 min = 15 max = 500 @@ -2538,12 +2525,12 @@ interval = 5 str = STR_CONFIG_SETTING_TOWN_MIN_DISTANCE strhelp = STR_CONFIG_SETTING_TOWN_MIN_DISTANCE_HELPTEXT strval = STR_JUST_INT -patchcat = SC_PATCH patxname = ""town_min_distance.economy.town_min_distance"" [SDT_VAR] var = construction.maximum_signal_evaluations type = SLE_UINT16 +flags = SF_PATCH def = 256 min = 64 max = 4096 @@ -2553,50 +2540,49 @@ strhelp = STR_CONFIG_SETTING_MAX_SIGNAL_EVALUATIONS_HELPTEXT strval = STR_JUST_COMMA cat = SC_EXPERT extver = SlXvFeatureTest(XSLFTO_AND, XSLFI_PROG_SIGS) -patchcat = SC_PATCH patxname = ""programmable_signals.construction.maximum_signal_evaluations"" [SDT_BOOL] var = economy.infrastructure_sharing[0] +flags = SF_PATCH def = false str = STR_CONFIG_SETTING_SHARING_RAIL pre_cb = CheckSharingRail post_cb = SharingRailChanged extver = SlXvFeatureTest(XSLFTO_AND, XSLFI_INFRA_SHARING) -patchcat = SC_PATCH patxname = ""infra_sharing.economy.infrastructure_sharing.rail"" [SDT_BOOL] var = economy.infrastructure_sharing[1] +flags = SF_PATCH def = false str = STR_CONFIG_SETTING_SHARING_ROAD pre_cb = CheckSharingRoad extver = SlXvFeatureTest(XSLFTO_AND, XSLFI_INFRA_SHARING) -patchcat = SC_PATCH patxname = ""infra_sharing.economy.infrastructure_sharing.road"" [SDT_BOOL] var = economy.infrastructure_sharing[2] +flags = SF_PATCH def = false str = STR_CONFIG_SETTING_SHARING_WATER pre_cb = CheckSharingWater extver = SlXvFeatureTest(XSLFTO_AND, XSLFI_INFRA_SHARING) -patchcat = SC_PATCH patxname = ""infra_sharing.economy.infrastructure_sharing.water"" [SDT_BOOL] var = economy.infrastructure_sharing[3] +flags = SF_PATCH def = false str = STR_CONFIG_SETTING_SHARING_AIR pre_cb = CheckSharingAir extver = SlXvFeatureTest(XSLFTO_AND, XSLFI_INFRA_SHARING) -patchcat = SC_PATCH patxname = ""infra_sharing.economy.infrastructure_sharing.air"" [SDT_VAR] var = economy.sharing_fee[0] type = SLE_UINT -flags = SF_GUI_CURRENCY +flags = SF_GUI_CURRENCY | SF_PATCH def = 100 min = 0 max = 1000000 @@ -2605,13 +2591,12 @@ str = STR_CONFIG_SETTING_SHARING_FEE_RAIL strhelp = STR_CONFIG_SETTING_SHARING_FEE_HELPTEXT strval = STR_JUST_CURRENCY_LONG extver = SlXvFeatureTest(XSLFTO_AND, XSLFI_INFRA_SHARING) -patchcat = SC_PATCH patxname = ""infra_sharing.economy.sharing_fee.rail"" [SDT_VAR] var = economy.sharing_fee[1] type = SLE_UINT -flags = SF_GUI_CURRENCY +flags = SF_GUI_CURRENCY | SF_PATCH def = 100 min = 0 max = 1000000 @@ -2620,13 +2605,12 @@ str = STR_CONFIG_SETTING_SHARING_FEE_ROAD strhelp = STR_CONFIG_SETTING_SHARING_FEE_HELPTEXT strval = STR_JUST_CURRENCY_LONG extver = SlXvFeatureTest(XSLFTO_AND, XSLFI_INFRA_SHARING) -patchcat = SC_PATCH patxname = ""infra_sharing.economy.sharing_fee.road"" [SDT_VAR] var = economy.sharing_fee[2] type = SLE_UINT -flags = SF_GUI_CURRENCY +flags = SF_GUI_CURRENCY | SF_PATCH def = 100 min = 0 max = 1000000 @@ -2635,13 +2619,12 @@ str = STR_CONFIG_SETTING_SHARING_FEE_WATER strhelp = STR_CONFIG_SETTING_SHARING_FEE_HELPTEXT strval = STR_JUST_CURRENCY_LONG extver = SlXvFeatureTest(XSLFTO_AND, XSLFI_INFRA_SHARING) -patchcat = SC_PATCH patxname = ""infra_sharing.economy.sharing_fee.water"" [SDT_VAR] var = economy.sharing_fee[3] type = SLE_UINT -flags = SF_GUI_CURRENCY +flags = SF_GUI_CURRENCY | SF_PATCH def = 100 min = 0 max = 1000000 @@ -2650,15 +2633,14 @@ str = STR_CONFIG_SETTING_SHARING_FEE_AIR strhelp = STR_CONFIG_SETTING_SHARING_FEE_HELPTEXT strval = STR_JUST_CURRENCY_LONG extver = SlXvFeatureTest(XSLFTO_AND, XSLFI_INFRA_SHARING) -patchcat = SC_PATCH patxname = ""infra_sharing.economy.sharing_fee.air"" [SDT_BOOL] var = economy.sharing_payment_in_debt +flags = SF_PATCH def = false str = STR_CONFIG_SETTING_SHARING_PAYMENT_IN_DEBT extver = SlXvFeatureTest(XSLFTO_AND, XSLFI_INFRA_SHARING) -patchcat = SC_PATCH patxname = ""infra_sharing.economy.sharing_payment_in_debt"" [SDT_OMANY] @@ -2814,6 +2796,7 @@ cat = SC_BASIC [SDT_VAR] var = economy.random_road_reconstruction type = SLE_UINT16 +flags = SF_PATCH def = 0 min = 0 max = 1000 @@ -2821,20 +2804,19 @@ str = STR_CONFIG_SETTING_RANDOM_ROAD_RECONSTRUCTION strhelp = STR_CONFIG_SETTING_RANDOM_ROAD_RECONSTRUCTION_HELPTEXT strval = STR_JUST_COMMA cat = SC_BASIC -patchcat = SC_PATCH patxname = ""economy.random_road_reconstruction"" [SDT_BOOL] var = economy.disable_inflation_newgrf_flag +flags = SF_PATCH def = false cat = SC_EXPERT -patchcat = SC_PATCH patxname = ""economy.disable_inflation_newgrf_flag"" [SDT_VAR] var = economy.payment_algorithm type = SLE_UINT8 -flags = SF_GUI_DROPDOWN +flags = SF_GUI_DROPDOWN | SF_PATCH def = CPA_MODERN min = CPA_BEGIN max = CPA_END - 1 @@ -2843,13 +2825,12 @@ str = STR_CONFIG_SETTING_CARGO_PAYMENT_ALGORITHM strhelp = STR_CONFIG_SETTING_CARGO_PAYMENT_ALGORITHM_HELPTEXT strval = STR_CONFIG_SETTING_CARGO_PAYMENT_ALGORITHM_TRADITIONAL cat = SC_BASIC -patchcat = SC_PATCH patxname = ""economy.payment_algorithm"" [SDT_VAR] var = economy.tick_rate type = SLE_UINT8 -flags = SF_GUI_DROPDOWN +flags = SF_GUI_DROPDOWN | SF_PATCH def = TRM_TRADITIONAL min = TRM_BEGIN max = TRM_END - 1 @@ -2858,7 +2839,6 @@ str = STR_CONFIG_SETTING_TICK_RATE strhelp = STR_CONFIG_SETTING_TICK_RATE_HELPTEXT strval = STR_CONFIG_SETTING_TICK_RATE_TRADITIONAL cat = SC_EXPERT -patchcat = SC_PATCH post_cb = [](auto) { SetupTickRate(); } patxname = ""economy.tick_rate"" @@ -3345,6 +3325,7 @@ cat = SC_EXPERT [SDT_VAR] var = order.old_occupancy_smoothness type = SLE_UINT8 +flags = SF_PATCH def = 75 min = 0 max = 100 @@ -3416,6 +3397,7 @@ cat = SC_EXPERT [SDT_VAR] var = game_creation.generation_unique_id +flags = SF_PATCH type = SLE_UINT32 def = 0 min = 0 @@ -3487,11 +3469,11 @@ cat = SC_EXPERT [SDT_BOOL] var = construction.flood_from_edges +flags = SF_PATCH def = true str = STR_CONFIG_SETTING_FLOOD_FROM_EDGES strhelp = STR_CONFIG_SETTING_FLOOD_FROM_EDGES_HELPTEXT cat = SC_ADVANCED -patchcat = SC_PATCH patxname = ""construction.flood_from_edges"" [SDT_VAR] @@ -3514,7 +3496,6 @@ cat = SC_BASIC [SDT_VAR] var = game_creation.custom_industry_number type = SLE_UINT16 -flags = SF_ENABLE_TABLE_PATS def = 1 min = 1 max = 64000 @@ -3536,16 +3517,17 @@ cat = SC_BASIC [SDT_BOOL] var = construction.trees_around_snow_line_enabled +flags = SF_PATCH def = true str = STR_CONFIG_SETTING_TREES_AROUND_SNOWLINE strhelp = STR_CONFIG_SETTING_TREES_AROUND_SNOWLINE_HELPTEXT cat = SC_BASIC -patchcat = SC_PATCH patxname = ""everest_treeline.construction.trees_around_snow_line_enabled"" [SDT_VAR] var = construction.trees_around_snow_line_range type = SLE_UINT8 +flags = SF_PATCH def = 8 min = 1 max = 64 @@ -3553,12 +3535,12 @@ str = STR_CONFIG_SETTING_TREES_AROUND_SNOWLINE_RANGE strhelp = STR_CONFIG_SETTING_TREES_AROUND_SNOWLINE_RANGE_HELPTEXT strval = STR_JUST_COMMA cat = SC_BASIC -patchcat = SC_PATCH patxname = ""everest_treeline.construction.trees_around_snow_line_range"" [SDT_VAR] var = construction.trees_around_snow_line_dynamic_range type = SLE_UINT8 +flags = SF_PATCH def = 75 min = 0 max = 100 @@ -3567,14 +3549,13 @@ str = STR_CONFIG_SETTING_TREES_AROUND_SNOWLINE_DYNAMIC_RANGE strhelp = STR_CONFIG_SETTING_TREES_AROUND_SNOWLINE_DYNAMIC_RANGE_HELPTEXT strval = STR_CONFIG_SETTING_PERCENTAGE cat = SC_EXPERT -patchcat = SC_PATCH patxname = ""everest_treeline.construction.trees_around_snow_line_dynamic_range"" post_cb = [](auto) { UpdateCachedSnowLineBounds(); } [SDT_VAR] var = construction.tree_growth_rate type = SLE_UINT8 -flags = SF_GUI_DROPDOWN +flags = SF_GUI_DROPDOWN | SF_PATCH def = 0 min = 0 max = 4 @@ -3582,7 +3563,6 @@ str = STR_CONFIG_SETTING_TREE_GROWTH strhelp = STR_CONFIG_SETTING_TREE_GROWTH_HELPTEXT strval = STR_CONFIG_SETTING_TREE_GROWTH_NORMAL cat = SC_BASIC -patchcat = SC_PATCH patxname = ""reduced_tree_growth.construction.tree_growth_rate"" [SDT_VAR] @@ -3632,18 +3612,17 @@ strval = STR_JUST_COMMA [SDT_BOOL] var = game_creation.rivers_top_of_hill -flags = SF_NEWGAME_ONLY | SF_SCENEDIT_TOO +flags = SF_NEWGAME_ONLY | SF_SCENEDIT_TOO | SF_PATCH def = true cat = SC_EXPERT str = STR_CONFIG_SETTING_RIVERS_TOP_OF_HILL strhelp = STR_CONFIG_SETTING_RIVERS_TOP_OF_HILL_HELPTEXT -patchcat = SC_PATCH patxname = ""rivers.game_creation.rivers_top_of_hill"" [SDT_VAR] var = game_creation.river_tropics_width type = SLE_UINT8 -flags = SF_NEWGAME_ONLY | SF_SCENEDIT_TOO +flags = SF_NEWGAME_ONLY | SF_SCENEDIT_TOO | SF_PATCH def = 5 min = 2 max = 51 @@ -3652,13 +3631,12 @@ str = STR_CONFIG_SETTING_RIVER_TROPICS_WIDTH strhelp = STR_CONFIG_SETTING_RIVER_TROPICS_WIDTH_HELPTEXT strval = STR_JUST_COMMA cat = SC_BASIC -patchcat = SC_PATCH patxname = ""rivers.game_creation.river_tropics_width"" [SDT_VAR] var = game_creation.lake_tropics_width type = SLE_UINT8 -flags = SF_NEWGAME_ONLY | SF_SCENEDIT_TOO +flags = SF_NEWGAME_ONLY | SF_SCENEDIT_TOO | SF_PATCH def = 5 min = 2 max = 51 @@ -3667,13 +3645,12 @@ str = STR_CONFIG_SETTING_LAKE_TROPICS_WIDTH strhelp = STR_CONFIG_SETTING_LAKE_TROPICS_WIDTH_HELPTEXT strval = STR_JUST_COMMA cat = SC_BASIC -patchcat = SC_PATCH patxname = ""rivers.game_creation.lake_tropics_width"" [SDT_VAR] var = game_creation.coast_tropics_width type = SLE_UINT8 -flags = SF_GUI_DROPDOWN | SF_NEWGAME_ONLY +flags = SF_GUI_DROPDOWN | SF_NEWGAME_ONLY | SF_PATCH def = 0 min = 0 max = 3 @@ -3682,13 +3659,12 @@ str = STR_CONFIG_SETTING_COAST_TROPICS_WIDTH strhelp = STR_CONFIG_SETTING_COAST_TROPICS_WIDTH_HELPTEXT strval = STR_CONFIG_SETTING_COAST_TROPICS_WIDTH_DEFAULT cat = SC_BASIC -patchcat = SC_PATCH patxname = ""rivers.game_creation.coast_tropics_width"" [SDT_VAR] var = game_creation.lake_size type = SLE_UINT8 -flags = SF_NEWGAME_ONLY | SF_SCENEDIT_TOO | SF_GUI_0_IS_SPECIAL +flags = SF_NEWGAME_ONLY | SF_SCENEDIT_TOO | SF_GUI_0_IS_SPECIAL | SF_PATCH def = 8 min = 0 max = 100 @@ -3696,17 +3672,15 @@ cat = SC_EXPERT str = STR_CONFIG_SETTING_LAKE_SIZE strhelp = STR_CONFIG_SETTING_LAKE_SIZE_HELPTEXT strval = STR_CONFIG_SETTING_LAKE_SIZE_VALUE -patchcat = SC_PATCH patxname = ""rivers.game_creation.lake_size"" [SDT_BOOL] var = game_creation.lakes_allowed_in_deserts -flags = SF_NEWGAME_ONLY | SF_SCENEDIT_TOO +flags = SF_NEWGAME_ONLY | SF_SCENEDIT_TOO | SF_PATCH def = false cat = SC_EXPERT str = STR_CONFIG_SETTING_LAKES_ALLOWED_IN_DESERTS strhelp = STR_CONFIG_SETTING_LAKES_ALLOWED_IN_DESERTS_HELPTEXT -patchcat = SC_PATCH patxname = ""rivers.game_creation.lakes_allowed_in_deserts"" [SDT_VAR] @@ -3724,7 +3698,7 @@ strval = STR_RIVERS_NONE [SDT_VAR] var = game_creation.amount_of_rocks type = SLE_UINT8 -flags = SF_NEWGAME_ONLY | SF_SCENEDIT_TOO +flags = SF_NEWGAME_ONLY | SF_SCENEDIT_TOO | SF_PATCH def = 5 min = 1 max = 255 @@ -3732,13 +3706,12 @@ interval = 1 str = STR_CONFIG_SETTING_ROCKS_AMOUNT strhelp = STR_CONFIG_SETTING_ROCKS_AMOUNT_HELPTEXT strval = STR_JUST_COMMA -patchcat = SC_PATCH patxname = ""rocks.game_creation.amount_of_rocks"" [SDT_VAR] var = game_creation.height_affects_rocks type = SLE_UINT8 -flags = SF_NEWGAME_ONLY | SF_SCENEDIT_TOO +flags = SF_NEWGAME_ONLY | SF_SCENEDIT_TOO | SF_PATCH def = 0 min = 0 max = 25 @@ -3746,13 +3719,12 @@ interval = 1 str = STR_CONFIG_SETTING_HEIGHT_ROCKS strhelp = STR_CONFIG_SETTING_HEIGHT_ROCKS_HELPTEXT strval = STR_JUST_COMMA -patchcat = SC_PATCH patxname = ""rocks.game_creation.height_affects_rocks"" [SDT_VAR] var = game_creation.build_public_roads type = SLE_UINT8 -flags = SF_GUI_DROPDOWN | SF_NEWGAME_ONLY | SF_SCENEDIT_TOO +flags = SF_GUI_DROPDOWN | SF_NEWGAME_ONLY | SF_SCENEDIT_TOO | SF_PATCH def = 0 min = 0 max = 2 @@ -3760,7 +3732,6 @@ str = STR_CONFIG_SETTING_BUILD_PUBLIC_ROADS strhelp = STR_CONFIG_SETTING_BUILD_PUBLIC_ROADS_HELPTEXT strval = STR_CONFIG_SETTING_BUILD_PUBLIC_ROADS_NONE post_cb = PublicRoadsSettingChange -patchcat = SC_PATCH patxname = ""public_roads.game_creation.build_public_roads"" ; locale @@ -3807,7 +3778,7 @@ strval = STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_IMPERIAL var = locale.units_velocity_nautical type = SLE_UINT8 from = SLV_VELOCITY_NAUTICAL -flags = SF_NO_NETWORK_SYNC | SF_GUI_DROPDOWN | SF_ENABLE_TABLE_PATS +flags = SF_NO_NETWORK_SYNC | SF_GUI_DROPDOWN def = 1 max = 4 full = _locale_units @@ -3926,34 +3897,35 @@ cat = SC_BASIC [SDT_BOOL] var = vehicle.adjacent_crossings +flags = SF_PATCH def = true str = STR_CONFIG_SETTING_ADJACENT_CROSSINGS strhelp = STR_CONFIG_SETTING_ADJACENT_CROSSINGS_HELPTEXT cat = SC_BASIC -patchcat = SC_PATCH patxname = ""adjacent_crossings.vehicle.adjacent_crossings"" [SDT_BOOL] var = vehicle.safer_crossings +flags = SF_PATCH def = false str = STR_CONFIG_SETTING_SAFER_CROSSINGS strhelp = STR_CONFIG_SETTING_SAFER_CROSSINGS_HELPTEXT cat = SC_BASIC -patchcat = SC_PATCH patxname = ""safer_crossings.vehicle.safer_crossings"" [SDT_BOOL] var = game_time.time_in_minutes +flags = SF_PATCH def = false str = STR_CONFIG_SETTING_TIME_IN_MINUTES strhelp = STR_CONFIG_SETTING_TIME_IN_MINUTES_HELPTEXT post_cb = UpdateTimeSettings -patchcat = SC_PATCH patxname = ""game_time.time_in_minutes"" [SDT_VAR] var = game_time.ticks_per_minute type = SLE_UINT16 +flags = SF_PATCH strval = STR_JUST_INT def = 74 min = 1 @@ -3962,12 +3934,12 @@ interval = 10 str = STR_CONFIG_SETTING_TICKS_PER_MINUTE strhelp = STR_CONFIG_SETTING_TICKS_PER_MINUTE_HELPTEXT post_cb = UpdateTimeSettings -patchcat = SC_PATCH patxname = ""game_time.ticks_per_minute"" [SDT_VAR] var = game_time.clock_offset type = SLE_UINT16 +flags = SF_PATCH strval = STR_JUST_INT def = 0 min = 0 @@ -3976,22 +3948,22 @@ interval = 60 str = STR_CONFIG_SETTING_CLOCK_OFFSET strhelp = STR_CONFIG_SETTING_CLOCK_OFFSET_HELPTEXT post_cb = UpdateTimeSettings -patchcat = SC_PATCH patxname = ""game_time.clock_offset"" [SDT_BOOL] var = vehicle.pay_for_repair def = true +flags = SF_PATCH str = STR_CONFIG_SETTING_PAY_FOR_REPAIR_VEHICLE strhelp = STR_CONFIG_SETTING_PAY_FOR_REPAIR_VEHICLE_HELPTEXT cat = SC_EXPERT extver = SlXvFeatureTest(XSLFTO_AND, XSLFI_VEHICLE_REPAIR_COST) -patchcat = SC_PATCH patxname = ""vehicle_repair_cost.vehicle.pay_for_repair"" [SDT_VAR] var = vehicle.repair_cost type = SLE_UINT8 +flags = SF_PATCH def = 100 min = 1 max = 255 @@ -4001,27 +3973,24 @@ strhelp = STR_CONFIG_SETTING_REPAIR_COST_HELPTEXT strval = STR_JUST_INT cat = SC_EXPERT extver = SlXvFeatureTest(XSLFTO_AND, XSLFI_VEHICLE_REPAIR_COST) -patchcat = SC_PATCH patxname = ""vehicle_repair_cost.vehicle.repair_cost"" [SDT_VAR] var = debug.chicken_bits type = SLE_UINT32 -flags = SF_NOT_IN_CONFIG | SF_NO_NEWGAME +flags = SF_NOT_IN_CONFIG | SF_NO_NEWGAME | SF_PATCH def = 0 min = 0 max = 0xFFFFFFFF cat = SC_EXPERT -patchcat = SC_PATCH patxname = ""debug.chicken_bits"" [SDT_VAR] var = debug.newgrf_optimiser_flags type = SLE_UINT32 -flags = SF_NOT_IN_CONFIG | SF_NO_NEWGAME | SF_NO_NETWORK +flags = SF_NOT_IN_CONFIG | SF_NO_NEWGAME | SF_NO_NETWORK | SF_PATCH def = 0 min = 0 max = 0xFFFFFFFF cat = SC_EXPERT -patchcat = SC_PATCH patxname = ""debug.newgrf_optimiser_flags""