diff --git a/src/saveload/extended_ver_sl.cpp b/src/saveload/extended_ver_sl.cpp index 9dc4ee333a..f07936c6c2 100644 --- a/src/saveload/extended_ver_sl.cpp +++ b/src/saveload/extended_ver_sl.cpp @@ -193,6 +193,7 @@ const SlxiSubChunkInfo _sl_xv_sub_chunk_infos[] = { { XSLFI_LINKGRAPH_TRAVEL_TIME, XSCF_NULL, 1, 1, "linkgraph_travel_time", nullptr, nullptr, nullptr }, { XSLFI_LAST_LOADING_TICK, XSCF_NULL, 2, 2, "last_loading_tick", nullptr, nullptr, nullptr }, { XSLFI_SCRIPT_LEAGUE_TABLES, XSCF_NULL, 1, 1, "script_league_tables", nullptr, nullptr, "LEAE,LEAT" }, + { XSLFI_VELOCITY_NAUTICAL, XSCF_IGNORABLE_ALL, 1, 1, "velocity_nautical", nullptr, nullptr, nullptr }, { XSLFI_NULL, XSCF_NULL, 0, 0, nullptr, nullptr, nullptr, nullptr },// This is the end marker }; diff --git a/src/saveload/extended_ver_sl.h b/src/saveload/extended_ver_sl.h index 4f4074a801..bf64ae591f 100644 --- a/src/saveload/extended_ver_sl.h +++ b/src/saveload/extended_ver_sl.h @@ -145,6 +145,7 @@ enum SlXvFeatureIndex { XSLFI_LINKGRAPH_TRAVEL_TIME, ///< See: SLV_LINKGRAPH_TRAVEL_TIME XSLFI_LAST_LOADING_TICK, ///< See: SLV_LAST_LOADING_TICK XSLFI_SCRIPT_LEAGUE_TABLES, ///< See: Scriptable league tables (PR #10001) + XSLFI_VELOCITY_NAUTICAL, ///< See: SLV_VELOCITY_NAUTICAL (PR #10594) XSLFI_RIFF_HEADER_60_BIT, ///< Size field in RIFF chunk header is 60 bit XSLFI_HEIGHT_8_BIT, ///< Map tile height is 8 bit instead of 4 bit, but savegame version may be before this became true in trunk diff --git a/src/table/settings/settings.ini b/src/table/settings/settings.ini index 45da994744..5dcd0136fa 100644 --- a/src/table/settings/settings.ini +++ b/src/table/settings/settings.ini @@ -4203,7 +4203,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 +flags = SF_NO_NETWORK_SYNC | SF_GUI_DROPDOWN | SF_ENABLE_UPSTREAM_LOAD def = 1 max = 4 full = _locale_units @@ -4212,6 +4212,8 @@ cat = SC_BASIC str = STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_NAUTICAL strhelp = STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_HELPTEXT strval = STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_IMPERIAL +extver = SlXvFeatureTest(XSLFTO_OR, XSLFI_VELOCITY_NAUTICAL) +patxname = ""locale.units_velocity_nautical"" [SDT_OMANY] var = locale.units_power