Save/load changes for order occupancy

src/saveload/extended_ver_sl.cpp

@@ -45,6 +45,7 @@ std::vector<uint32> _sl_xv_discardable_chunk_ids;           ///< list of chunks
 static const uint32 _sl_xv_slxi_chunk_version = 0;          ///< current version os SLXI chunk
 
 const SlxiSubChunkInfo _sl_xv_sub_chunk_infos[] = {
+	{ XSLFI_ORDER_OCCUPANCY,        XSCF_NULL,              1,                                    1, "order_occupancy",       NULL, NULL, NULL        },
 	{ XSLFI_NULL, XSCF_NULL, 0, 0, NULL, NULL, NULL, NULL },// This is the end marker
 };
 

src/saveload/extended_ver_sl.h

@@ -21,6 +21,7 @@
  */
 enum SlXvFeatureIndex {
 	XSLFI_NULL                          = 0,      ///< Unused value, to indicate that no extended feature test is in use
+	XSLFI_ORDER_OCCUPANCY,                        ///< Running average of order occupancy
 
 	XSLFI_SIZE,                                   ///< Total count of features, including null feature
 };

src/saveload/order_sl.cpp

@@ -110,7 +110,7 @@ const SaveLoad *GetOrderDescription()
 		     SLE_REF(Order, next,           REF_ORDER),
 		 SLE_CONDVAR(Order, refit_cargo,    SLE_UINT8,   36, SL_MAX_VERSION),
 		SLE_CONDNULL(1,                                  36, 181), // refit_subtype
-		 SLE_CONDVAR(Order, occupancy,      SLE_UINT8,  300, SL_MAX_VERSION),
+		SLE_CONDVAR_X(Order, occupancy,     SLE_UINT8,    0, SL_MAX_VERSION, SlXvFeatureTest(XSLFTO_AND, XSLFI_ORDER_OCCUPANCY)),
 		 SLE_CONDVAR(Order, wait_time,      SLE_UINT16,  67, SL_MAX_VERSION),
 		 SLE_CONDVAR(Order, travel_time,    SLE_UINT16,  67, SL_MAX_VERSION),
 		 SLE_CONDVAR(Order, max_speed,      SLE_UINT16, 172, SL_MAX_VERSION),

src/table/settings.ini

@@ -2151,7 +2151,6 @@ cat      = SC_EXPERT
 base     = GameSettings
 var      = order.occupancy_smoothness
 type     = SLE_UINT8
-from     = 300
 def      = 75
 min      = 0
 max      = 100
@@ -2160,6 +2159,8 @@ str      = STR_CONFIG_OCCUPANCY_SMOOTHNESS
 strhelp  = STR_CONFIG_OCCUPANCY_SMOOTHNESS_HELPTEXT
 strval   = STR_CONFIG_SETTING_PERCENTAGE
 cat      = SC_EXPERT
+extver   = SlXvFeatureTest(XSLFTO_AND, XSLFI_ORDER_OCCUPANCY)
+patxname = ""order_occupancy.order.occupancy_smoothness""
 
 ##
 [SDT_VAR]