amacocian/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2026-07-21 01:59:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Codechange: remove unneeded spaces

Browse Source
This commit is contained in:
Rubidium
2026-06-24 21:03:43 +02:00
committed by rubidium42
parent 5bb87d39b7
commit fc0ad4bb0a
28 changed files with 794 additions and 794 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/saveload/afterload.cpp
+8 -8
View File
@@ -761,26 +761,26 @@ bool AfterLoadGame()
*/
if (IsSavegameVersionBefore(SaveLoadVersion::TownTolerancePauseMode, 2)) _settings_game.station.modified_catchment = false;
if (IsSavegameVersionBefore(SaveLoadVersion::MultipleRoadStops, 1)) _settings_game.pf.forbid_90_deg = false;
if (IsSavegameVersionBefore(SaveLoadVersion::RemoveOldPbs)) _settings_game.vehicle.train_acceleration_model = AccelerationModel::Original;
if (IsSavegameVersionBefore(SaveLoadVersion::PlaneSpeedFactor)) _settings_game.vehicle.plane_speed = 4;
if (IsSavegameVersionBefore(SaveLoadVersion::MoreEngineTypes)) _settings_game.vehicle.dynamic_engines = false;
if (IsSavegameVersionBefore(SaveLoadVersion::AirportNoise)) _settings_game.economy.station_noise_level = false;
if (IsSavegameVersionBefore(SaveLoadVersion::RemoveOldPbs)) _settings_game.vehicle.train_acceleration_model = AccelerationModel::Original;
if (IsSavegameVersionBefore(SaveLoadVersion::PlaneSpeedFactor)) _settings_game.vehicle.plane_speed = 4;
if (IsSavegameVersionBefore(SaveLoadVersion::MoreEngineTypes)) _settings_game.vehicle.dynamic_engines = false;
if (IsSavegameVersionBefore(SaveLoadVersion::AirportNoise)) _settings_game.economy.station_noise_level = false;
if (IsSavegameVersionBefore(SaveLoadVersion::TrainSlopeSteepness)) {
_settings_game.vehicle.train_slope_steepness = 3;
}
if (IsSavegameVersionBefore(SaveLoadVersion::VirtualFeederSharePayment)) _settings_game.economy.feeder_payment_share = 75;
if (IsSavegameVersionBefore(SaveLoadVersion::ReducePlaneCrashes)) _settings_game.vehicle.plane_crashes = 2;
if (IsSavegameVersionBefore(SaveLoadVersion::VirtualFeederSharePayment)) _settings_game.economy.feeder_payment_share = 75;
if (IsSavegameVersionBefore(SaveLoadVersion::ReducePlaneCrashes)) _settings_game.vehicle.plane_crashes = 2;
if (IsSavegameVersionBefore(SaveLoadVersion::RvRealisticAcceleration)) {
_settings_game.vehicle.roadveh_acceleration_model = AccelerationModel::Original;
_settings_game.vehicle.roadveh_slope_steepness = 7;
}
if (IsSavegameVersionBefore(SaveLoadVersion::DisableTownLevelCrossing)) _settings_game.economy.allow_town_level_crossings = true;
if (IsSavegameVersionBefore(SaveLoadVersion::DisableTownLevelCrossing)) _settings_game.economy.allow_town_level_crossings = true;
if (IsSavegameVersionBefore(SaveLoadVersion::MaxLengthAndReverseSignals)) {
_settings_game.vehicle.max_train_length = 50;
_settings_game.construction.max_bridge_length = 64;
_settings_game.construction.max_tunnel_length = 64;
}
if (IsSavegameVersionBefore(SaveLoadVersion::InfrastructureMaintenanceCosts)) _settings_game.economy.infrastructure_maintenance = false;
if (IsSavegameVersionBefore(SaveLoadVersion::InfrastructureMaintenanceCosts)) _settings_game.economy.infrastructure_maintenance = false;
if (IsSavegameVersionBefore(SaveLoadVersion::Cargodist)) {
_settings_game.linkgraph.distribution_pax = DistributionType::Manual;
_settings_game.linkgraph.distribution_mail = DistributionType::Manual;
src/saveload/ai_sl.cpp
+5 -5
View File
@@ -31,14 +31,14 @@ static bool _ai_saveload_is_random;
static const SaveLoad _ai_company_desc[] = {
SLEG_SSTR("name", _ai_saveload_name, SLE_STR),
SLEG_SSTR("settings", _ai_saveload_settings, SLE_STR),
SLEG_CONDVAR("version", _ai_saveload_version, SLE_UINT32, SaveLoadVersion::StoreAIVersion, SaveLoadVersion::MaxVersion),
SLEG_CONDVAR("is_random", _ai_saveload_is_random, SLE_BOOL, SaveLoadVersion::SplitLoadWaitCounters, SaveLoadVersion::AILocalConfig),
SLEG_CONDVAR("version", _ai_saveload_version, SLE_UINT32, SaveLoadVersion::StoreAIVersion, SaveLoadVersion::MaxVersion),
SLEG_CONDVAR("is_random", _ai_saveload_is_random, SLE_BOOL, SaveLoadVersion::SplitLoadWaitCounters, SaveLoadVersion::AILocalConfig),
};
static const SaveLoad _ai_running_desc[] = {
SLEG_CONDSSTR("running_name", _ai_saveload_name, SLE_STR, SaveLoadVersion::AILocalConfig, SaveLoadVersion::MaxVersion),
SLEG_CONDSSTR("running_settings", _ai_saveload_settings, SLE_STR, SaveLoadVersion::AILocalConfig, SaveLoadVersion::MaxVersion),
SLEG_CONDVAR("running_version", _ai_saveload_version, SLE_UINT32, SaveLoadVersion::AILocalConfig, SaveLoadVersion::MaxVersion),
SLEG_CONDSSTR("running_name", _ai_saveload_name, SLE_STR, SaveLoadVersion::AILocalConfig, SaveLoadVersion::MaxVersion),
SLEG_CONDSSTR("running_settings", _ai_saveload_settings, SLE_STR, SaveLoadVersion::AILocalConfig, SaveLoadVersion::MaxVersion),
SLEG_CONDVAR("running_version", _ai_saveload_version, SLE_UINT32, SaveLoadVersion::AILocalConfig, SaveLoadVersion::MaxVersion),
};
static void SaveReal_AIPL(int arg)
src/saveload/company_sl.cpp
+47 -47
View File
@@ -314,18 +314,18 @@ class SlCompanySettings : public DefaultSaveLoadHandler<SlCompanySettings, Compa
public:
static inline const SaveLoad description[] = {
/* Engine renewal settings */
SLE_CONDREF(CompanyProperties, engine_renew_list, REF_ENGINE_RENEWS, SaveLoadVersion::EngineRenewPool, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(CompanyProperties, settings.engine_renew, SLE_BOOL, SaveLoadVersion::EngineRenew, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(CompanyProperties, settings.engine_renew_months, SLE_INT16, SaveLoadVersion::EngineRenew, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(CompanyProperties, settings.engine_renew_money, SLE_UINT32, SaveLoadVersion::EngineRenew, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(CompanyProperties, settings.renew_keep_length, SLE_BOOL, SaveLoadVersion::VehicleCurrencyStationChanges, SaveLoadVersion::MaxVersion),
SLE_CONDREF(CompanyProperties, engine_renew_list, REF_ENGINE_RENEWS, SaveLoadVersion::EngineRenewPool, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(CompanyProperties, settings.engine_renew, SLE_BOOL, SaveLoadVersion::EngineRenew, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(CompanyProperties, settings.engine_renew_months, SLE_INT16, SaveLoadVersion::EngineRenew, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(CompanyProperties, settings.engine_renew_money, SLE_UINT32, SaveLoadVersion::EngineRenew, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(CompanyProperties, settings.renew_keep_length, SLE_BOOL, SaveLoadVersion::VehicleCurrencyStationChanges, SaveLoadVersion::MaxVersion),
/* Default vehicle settings */
SLE_CONDVAR(CompanyProperties, settings.vehicle.servint_ispercent, SLE_BOOL, SaveLoadVersion::CompanyServiceIntervals, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(CompanyProperties, settings.vehicle.servint_trains, SLE_UINT16, SaveLoadVersion::CompanyServiceIntervals, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(CompanyProperties, settings.vehicle.servint_roadveh, SLE_UINT16, SaveLoadVersion::CompanyServiceIntervals, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(CompanyProperties, settings.vehicle.servint_aircraft, SLE_UINT16, SaveLoadVersion::CompanyServiceIntervals, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(CompanyProperties, settings.vehicle.servint_ships, SLE_UINT16, SaveLoadVersion::CompanyServiceIntervals, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(CompanyProperties, settings.vehicle.servint_ispercent, SLE_BOOL, SaveLoadVersion::CompanyServiceIntervals, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(CompanyProperties, settings.vehicle.servint_trains, SLE_UINT16, SaveLoadVersion::CompanyServiceIntervals, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(CompanyProperties, settings.vehicle.servint_roadveh, SLE_UINT16, SaveLoadVersion::CompanyServiceIntervals, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(CompanyProperties, settings.vehicle.servint_aircraft, SLE_UINT16, SaveLoadVersion::CompanyServiceIntervals, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(CompanyProperties, settings.vehicle.servint_ships, SLE_UINT16, SaveLoadVersion::CompanyServiceIntervals, SaveLoadVersion::MaxVersion),
};
static inline const SaveLoadCompatTable compat_description = _company_settings_compat;
@@ -350,16 +350,16 @@ public:
class SlCompanyEconomy : public DefaultSaveLoadHandler<SlCompanyEconomy, CompanyProperties> {
public:
static inline const SaveLoad description[] = {
SLE_CONDVAR(CompanyEconomyEntry, income, SLE_FILE_I32 | SLE_VAR_I64, SaveLoadVersion::MinVersion, SaveLoadVersion::VehicleCurrencyStationChanges),
SLE_CONDVAR(CompanyEconomyEntry, income, SLE_INT64, SaveLoadVersion::VehicleCurrencyStationChanges, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(CompanyEconomyEntry, expenses, SLE_FILE_I32 | SLE_VAR_I64, SaveLoadVersion::MinVersion, SaveLoadVersion::VehicleCurrencyStationChanges),
SLE_CONDVAR(CompanyEconomyEntry, expenses, SLE_INT64, SaveLoadVersion::VehicleCurrencyStationChanges, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(CompanyEconomyEntry, company_value, SLE_FILE_I32 | SLE_VAR_I64, SaveLoadVersion::MinVersion, SaveLoadVersion::VehicleCurrencyStationChanges),
SLE_CONDVAR(CompanyEconomyEntry, company_value, SLE_INT64, SaveLoadVersion::VehicleCurrencyStationChanges, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(CompanyEconomyEntry, income, SLE_FILE_I32 | SLE_VAR_I64, SaveLoadVersion::MinVersion, SaveLoadVersion::VehicleCurrencyStationChanges),
SLE_CONDVAR(CompanyEconomyEntry, income, SLE_INT64, SaveLoadVersion::VehicleCurrencyStationChanges, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(CompanyEconomyEntry, expenses, SLE_FILE_I32 | SLE_VAR_I64, SaveLoadVersion::MinVersion, SaveLoadVersion::VehicleCurrencyStationChanges),
SLE_CONDVAR(CompanyEconomyEntry, expenses, SLE_INT64, SaveLoadVersion::VehicleCurrencyStationChanges, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(CompanyEconomyEntry, company_value, SLE_FILE_I32 | SLE_VAR_I64, SaveLoadVersion::MinVersion, SaveLoadVersion::VehicleCurrencyStationChanges),
SLE_CONDVAR(CompanyEconomyEntry, company_value, SLE_INT64, SaveLoadVersion::VehicleCurrencyStationChanges, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(CompanyEconomyEntry, delivered_cargo[NUM_CARGO - 1], SLE_INT32, SaveLoadVersion::MinVersion, SaveLoadVersion::CountIndividualCargoes),
SLE_CONDARR(CompanyEconomyEntry, delivered_cargo, SLE_UINT32, 32, SaveLoadVersion::CountIndividualCargoes, SaveLoadVersion::ExtendCargotypes),
SLE_CONDARR(CompanyEconomyEntry, delivered_cargo, SLE_UINT32, NUM_CARGO, SaveLoadVersion::ExtendCargotypes, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(CompanyEconomyEntry, delivered_cargo[NUM_CARGO - 1], SLE_INT32, SaveLoadVersion::MinVersion, SaveLoadVersion::CountIndividualCargoes),
SLE_CONDARR(CompanyEconomyEntry, delivered_cargo, SLE_UINT32, 32, SaveLoadVersion::CountIndividualCargoes, SaveLoadVersion::ExtendCargotypes),
SLE_CONDARR(CompanyEconomyEntry, delivered_cargo, SLE_UINT32, NUM_CARGO, SaveLoadVersion::ExtendCargotypes, SaveLoadVersion::MaxVersion),
SLE_VAR(CompanyEconomyEntry, performance_history, SLE_INT32),
};
static inline const SaveLoadCompatTable compat_description = _company_economy_compat;
@@ -410,7 +410,7 @@ public:
class SlCompanyLiveries : public DefaultSaveLoadHandler<SlCompanyLiveries, CompanyProperties> {
public:
static inline const SaveLoad description[] = {
SLE_CONDVAR(Livery, in_use, SLE_UINT8, SaveLoadVersion::Liveries, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Livery, in_use, SLE_UINT8, SaveLoadVersion::Liveries, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Livery, colour1, SLE_UINT8, SaveLoadVersion::Liveries, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Livery, colour2, SLE_UINT8, SaveLoadVersion::Liveries, SaveLoadVersion::MaxVersion),
};
@@ -492,11 +492,11 @@ public:
static const SaveLoad _company_desc[] = {
SLE_VAR(CompanyProperties, name_2, SLE_UINT32),
SLE_VAR(CompanyProperties, name_1, SLE_STRINGID),
SLE_CONDSSTR(CompanyProperties, name, SLE_STR | SLF_ALLOW_CONTROL, SaveLoadVersion::ReplaceCustomNameArray, SaveLoadVersion::MaxVersion),
SLE_CONDSSTR(CompanyProperties, name, SLE_STR | SLF_ALLOW_CONTROL, SaveLoadVersion::ReplaceCustomNameArray, SaveLoadVersion::MaxVersion),
SLE_VAR(CompanyProperties, president_name_1, SLE_STRINGID),
SLE_VAR(CompanyProperties, president_name_2, SLE_UINT32),
SLE_CONDSSTR(CompanyProperties, president_name, SLE_STR | SLF_ALLOW_CONTROL, SaveLoadVersion::ReplaceCustomNameArray, SaveLoadVersion::MaxVersion),
SLE_CONDSSTR(CompanyProperties, president_name, SLE_STR | SLF_ALLOW_CONTROL, SaveLoadVersion::ReplaceCustomNameArray, SaveLoadVersion::MaxVersion),
SLE_CONDVECTOR(CompanyProperties, allow_list, SLE_STR, SaveLoadVersion::CompanyAllowList, SaveLoadVersion::CompanyAllowListV2),
SLEG_CONDSTRUCTLIST("allow_list", SlAllowListData, SaveLoadVersion::CompanyAllowListV2, SaveLoadVersion::MaxVersion),
@@ -506,48 +506,48 @@ static const SaveLoad _company_desc[] = {
SLE_CONDSSTRNAME(CompanyProperties, face.style_label, "face_style", SLE_STR, SaveLoadVersion::FaceStyles, SaveLoadVersion::MaxVersion),
/* money was changed to a 64 bit field in savegame version 1. */
SLE_CONDVAR(CompanyProperties, money, SLE_VAR_I64 | SLE_FILE_I32, SaveLoadVersion::MinVersion, SaveLoadVersion::BigCurrency),
SLE_CONDVAR(CompanyProperties, money, SLE_INT64, SaveLoadVersion::BigCurrency, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(CompanyProperties, money, SLE_VAR_I64 | SLE_FILE_I32, SaveLoadVersion::MinVersion, SaveLoadVersion::BigCurrency),
SLE_CONDVAR(CompanyProperties, money, SLE_INT64, SaveLoadVersion::BigCurrency, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(CompanyProperties, current_loan, SLE_VAR_I64 | SLE_FILE_I32, SaveLoadVersion::MinVersion, SaveLoadVersion::UnifyCurrency),
SLE_CONDVAR(CompanyProperties, current_loan, SLE_INT64, SaveLoadVersion::UnifyCurrency, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(CompanyProperties, max_loan, SLE_INT64, SaveLoadVersion::MaxLoanForCompany, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(CompanyProperties, current_loan, SLE_VAR_I64 | SLE_FILE_I32, SaveLoadVersion::MinVersion, SaveLoadVersion::UnifyCurrency),
SLE_CONDVAR(CompanyProperties, current_loan, SLE_INT64, SaveLoadVersion::UnifyCurrency, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(CompanyProperties, max_loan, SLE_INT64, SaveLoadVersion::MaxLoanForCompany, SaveLoadVersion::MaxVersion),
SLE_VAR(CompanyProperties, colour, SLE_UINT8),
SLE_VAR(CompanyProperties, money_fraction, SLE_UINT8),
SLE_VAR(CompanyProperties, block_preview, SLE_UINT8),
SLE_CONDVAR(CompanyProperties, location_of_HQ, SLE_FILE_U16 | SLE_VAR_U32, SaveLoadVersion::MinVersion, SaveLoadVersion::MultipleRoadStops),
SLE_CONDVAR(CompanyProperties, location_of_HQ, SLE_UINT32, SaveLoadVersion::MultipleRoadStops, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(CompanyProperties, last_build_coordinate, SLE_FILE_U16 | SLE_VAR_U32, SaveLoadVersion::MinVersion, SaveLoadVersion::MultipleRoadStops),
SLE_CONDVAR(CompanyProperties, last_build_coordinate, SLE_UINT32, SaveLoadVersion::MultipleRoadStops, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(CompanyProperties, inaugurated_year, SLE_FILE_U8 | SLE_VAR_I32, SaveLoadVersion::MinVersion, SaveLoadVersion::BigDates),
SLE_CONDVAR(CompanyProperties, inaugurated_year, SLE_INT32, SaveLoadVersion::BigDates, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(CompanyProperties, inaugurated_year_calendar, SLE_INT32, SaveLoadVersion::CompanyInauguratedPeriodV2, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(CompanyProperties, location_of_HQ, SLE_FILE_U16 | SLE_VAR_U32, SaveLoadVersion::MinVersion, SaveLoadVersion::MultipleRoadStops),
SLE_CONDVAR(CompanyProperties, location_of_HQ, SLE_UINT32, SaveLoadVersion::MultipleRoadStops, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(CompanyProperties, last_build_coordinate, SLE_FILE_U16 | SLE_VAR_U32, SaveLoadVersion::MinVersion, SaveLoadVersion::MultipleRoadStops),
SLE_CONDVAR(CompanyProperties, last_build_coordinate, SLE_UINT32, SaveLoadVersion::MultipleRoadStops, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(CompanyProperties, inaugurated_year, SLE_FILE_U8 | SLE_VAR_I32, SaveLoadVersion::MinVersion, SaveLoadVersion::BigDates),
SLE_CONDVAR(CompanyProperties, inaugurated_year, SLE_INT32, SaveLoadVersion::BigDates, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(CompanyProperties, inaugurated_year_calendar, SLE_INT32, SaveLoadVersion::CompanyInauguratedPeriodV2, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(CompanyProperties, num_valid_stat_ent, SLE_UINT8, SaveLoadVersion::MinVersion, SaveLoadVersion::SaveloadListLength),
SLE_CONDVAR(CompanyProperties, num_valid_stat_ent, SLE_UINT8, SaveLoadVersion::MinVersion, SaveLoadVersion::SaveloadListLength),
SLE_VAR(CompanyProperties, months_of_bankruptcy, SLE_UINT8),
SLE_CONDVAR(CompanyProperties, bankrupt_asked, SLE_FILE_U8 | SLE_VAR_U16, SaveLoadVersion::MinVersion, SaveLoadVersion::MoreCompanies),
SLE_CONDVAR(CompanyProperties, bankrupt_asked, SLE_UINT16, SaveLoadVersion::MoreCompanies, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(CompanyProperties, bankrupt_asked, SLE_FILE_U8 | SLE_VAR_U16, SaveLoadVersion::MinVersion, SaveLoadVersion::MoreCompanies),
SLE_CONDVAR(CompanyProperties, bankrupt_asked, SLE_UINT16, SaveLoadVersion::MoreCompanies, SaveLoadVersion::MaxVersion),
SLE_VAR(CompanyProperties, bankrupt_timeout, SLE_INT16),
SLE_CONDVAR(CompanyProperties, bankrupt_value, SLE_VAR_I64 | SLE_FILE_I32, SaveLoadVersion::MinVersion, SaveLoadVersion::UnifyCurrency),
SLE_CONDVAR(CompanyProperties, bankrupt_value, SLE_INT64, SaveLoadVersion::UnifyCurrency, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(CompanyProperties, bankrupt_value, SLE_VAR_I64 | SLE_FILE_I32, SaveLoadVersion::MinVersion, SaveLoadVersion::UnifyCurrency),
SLE_CONDVAR(CompanyProperties, bankrupt_value, SLE_INT64, SaveLoadVersion::UnifyCurrency, SaveLoadVersion::MaxVersion),
/* yearly expenses was changed to 64-bit in savegame version 2. */
SLE_CONDARR(CompanyProperties, yearly_expenses, SLE_FILE_I32 | SLE_VAR_I64, 3 * 13, SaveLoadVersion::MinVersion, SaveLoadVersion::VehicleCurrencyStationChanges),
SLE_CONDARR(CompanyProperties, yearly_expenses, SLE_INT64, 3 * 13, SaveLoadVersion::VehicleCurrencyStationChanges, SaveLoadVersion::MaxVersion),
SLE_CONDARR(CompanyProperties, yearly_expenses, SLE_FILE_I32 | SLE_VAR_I64, 3 * 13, SaveLoadVersion::MinVersion, SaveLoadVersion::VehicleCurrencyStationChanges),
SLE_CONDARR(CompanyProperties, yearly_expenses, SLE_INT64, 3 * 13, SaveLoadVersion::VehicleCurrencyStationChanges, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(CompanyProperties, is_ai, SLE_BOOL, SaveLoadVersion::VehicleCurrencyStationChanges, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(CompanyProperties, is_ai, SLE_BOOL, SaveLoadVersion::VehicleCurrencyStationChanges, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(CompanyProperties, terraform_limit, SLE_UINT32, SaveLoadVersion::TerraformLimits, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(CompanyProperties, clear_limit, SLE_UINT32, SaveLoadVersion::TerraformLimits, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(CompanyProperties, tree_limit, SLE_UINT32, SaveLoadVersion::AutoreplaceWhenOldTreeLimit, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(CompanyProperties, terraform_limit, SLE_UINT32, SaveLoadVersion::TerraformLimits, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(CompanyProperties, clear_limit, SLE_UINT32, SaveLoadVersion::TerraformLimits, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(CompanyProperties, tree_limit, SLE_UINT32, SaveLoadVersion::AutoreplaceWhenOldTreeLimit, SaveLoadVersion::MaxVersion),
SLEG_STRUCT("settings", SlCompanySettings),
SLEG_CONDSTRUCT("old_ai", SlCompanyOldAI, SaveLoadVersion::MinVersion, SaveLoadVersion::NoAI),
SLEG_CONDSTRUCT("old_ai", SlCompanyOldAI, SaveLoadVersion::MinVersion, SaveLoadVersion::NoAI),
SLEG_STRUCT("cur_economy", SlCompanyEconomy),
SLEG_STRUCTLIST("old_economy", SlCompanyOldEconomy),
SLEG_CONDSTRUCTLIST("liveries", SlCompanyLiveries, SaveLoadVersion::Liveries, SaveLoadVersion::MaxVersion),
SLEG_CONDSTRUCTLIST("liveries", SlCompanyLiveries, SaveLoadVersion::Liveries, SaveLoadVersion::MaxVersion),
};
struct PLYRChunkHandler : ChunkHandler {
src/saveload/compat/company_sl_compat.h
+16 -16
View File
@@ -23,27 +23,27 @@ const SaveLoadCompat _company_old_ai_buildrec_compat[] = {
/** Original field order for SlCompanyOldAI. */
const SaveLoadCompat _company_old_ai_compat[] = {
SLC_NULL(2, SaveLoadVersion::MinVersion, SaveLoadVersion::NoAI),
SLC_NULL(2, SaveLoadVersion::MinVersion, SaveLoadVersion::LargerAIStateCounter),
SLC_NULL(2, SaveLoadVersion::MinVersion, SaveLoadVersion::NoAI),
SLC_NULL(2, SaveLoadVersion::MinVersion, SaveLoadVersion::LargerAIStateCounter),
SLC_NULL(4, SaveLoadVersion::LargerAIStateCounter, SaveLoadVersion::NoAI),
SLC_NULL(8, SaveLoadVersion::MinVersion, SaveLoadVersion::NoAI),
SLC_NULL(8, SaveLoadVersion::MinVersion, SaveLoadVersion::NoAI),
SLC_VAR("num_build_rec"),
SLC_NULL(3, SaveLoadVersion::MinVersion, SaveLoadVersion::NoAI),
SLC_NULL(3, SaveLoadVersion::MinVersion, SaveLoadVersion::NoAI),
SLC_NULL(2, SaveLoadVersion::MinVersion, SaveLoadVersion::MultipleRoadStops),
SLC_NULL(4, SaveLoadVersion::MultipleRoadStops, SaveLoadVersion::NoAI),
SLC_NULL(2, SaveLoadVersion::MinVersion, SaveLoadVersion::MultipleRoadStops),
SLC_NULL(4, SaveLoadVersion::MultipleRoadStops, SaveLoadVersion::NoAI),
SLC_NULL(2, SaveLoadVersion::MinVersion, SaveLoadVersion::NoAI),
SLC_NULL(2, SaveLoadVersion::MinVersion, SaveLoadVersion::MultipleRoadStops),
SLC_NULL(4, SaveLoadVersion::MultipleRoadStops, SaveLoadVersion::NoAI),
SLC_NULL(2, SaveLoadVersion::MinVersion, SaveLoadVersion::MultipleRoadStops),
SLC_NULL(4, SaveLoadVersion::MultipleRoadStops, SaveLoadVersion::NoAI),
SLC_NULL(2, SaveLoadVersion::MinVersion, SaveLoadVersion::NoAI),
SLC_NULL(2, SaveLoadVersion::MinVersion, SaveLoadVersion::MultipleRoadStops),
SLC_NULL(4, SaveLoadVersion::MultipleRoadStops, SaveLoadVersion::NoAI),
SLC_NULL(2, SaveLoadVersion::MinVersion, SaveLoadVersion::MultipleRoadStops),
SLC_NULL(4, SaveLoadVersion::MultipleRoadStops, SaveLoadVersion::NoAI),
SLC_NULL(2, SaveLoadVersion::MinVersion, SaveLoadVersion::NoAI),
SLC_NULL(2, SaveLoadVersion::MinVersion, SaveLoadVersion::MultipleRoadStops),
SLC_NULL(4, SaveLoadVersion::MultipleRoadStops, SaveLoadVersion::NoAI),
SLC_NULL(2, SaveLoadVersion::MinVersion, SaveLoadVersion::MultipleRoadStops),
SLC_NULL(4, SaveLoadVersion::MultipleRoadStops, SaveLoadVersion::NoAI),
SLC_NULL(2, SaveLoadVersion::MinVersion, SaveLoadVersion::NoAI),
SLC_NULL(2, SaveLoadVersion::MinVersion, SaveLoadVersion::MoreCargoPackets),
SLC_NULL(4, SaveLoadVersion::MoreCargoPackets, SaveLoadVersion::NoAI),
SLC_NULL(2, SaveLoadVersion::MinVersion, SaveLoadVersion::MoreCargoPackets),
SLC_NULL(4, SaveLoadVersion::MoreCargoPackets, SaveLoadVersion::NoAI),
SLC_NULL(18, SaveLoadVersion::MinVersion, SaveLoadVersion::NoAI),
SLC_NULL(20, SaveLoadVersion::MinVersion, SaveLoadVersion::NoAI),
src/saveload/compat/engine_sl_compat.h
+1 -1
View File
@@ -30,7 +30,7 @@ const SaveLoadCompat _engine_sl_compat[] = {
SLC_VAR("preview_asked"),
SLC_VAR("preview_company"),
SLC_VAR("preview_wait"),
SLC_NULL(1, SaveLoadVersion::MinVersion, SaveLoadVersion::CountPaidForCargo),
SLC_NULL(1, SaveLoadVersion::MinVersion, SaveLoadVersion::CountPaidForCargo),
SLC_VAR("company_avail"),
SLC_VAR("company_hidden"),
SLC_VAR("name"),
src/saveload/compat/misc_sl_compat.h
+8 -8
View File
@@ -25,7 +25,7 @@ const SaveLoadCompat _date_sl_compat[] = {
SLC_NULL(2, SaveLoadVersion::MinVersion, SaveLoadVersion::CompanyServiceIntervals),
SLC_VAR("random_state[0]"),
SLC_VAR("random_state[1]"),
SLC_NULL(1, SaveLoadVersion::MinVersion, SaveLoadVersion::LargerTownCounter),
SLC_NULL(1, SaveLoadVersion::MinVersion, SaveLoadVersion::LargerTownCounter),
SLC_NULL(4, SaveLoadVersion::LargerTownCounter, SaveLoadVersion::CompanyServiceIntervals),
SLC_VAR("company_tick_counter"),
SLC_VAR("next_competitor_start"),
@@ -40,21 +40,21 @@ const SaveLoadCompat _date_check_sl_compat[] = {
SLC_NULL(2, SaveLoadVersion::MinVersion, SaveLoadVersion::MaxVersion), // date_fract
SLC_NULL(2, SaveLoadVersion::MinVersion, SaveLoadVersion::MaxVersion), // tick_counter
SLC_NULL(2, SaveLoadVersion::MinVersion, SaveLoadVersion::UnifyGroundVehicles),
SLC_NULL(1, SaveLoadVersion::MinVersion, SaveLoadVersion::NewGRFCustomCargoAging), // age_cargo_skip_counter
SLC_NULL(1, SaveLoadVersion::MinVersion, SaveLoadVersion::NewGRFCustomCargoAging), // age_cargo_skip_counter
SLC_NULL(1, SaveLoadVersion::MinVersion, SaveLoadVersion::MoreAirportBlocks),
SLC_NULL(2, SaveLoadVersion::MinVersion, SaveLoadVersion::MultipleRoadStops), // cur_tileloop_tile
SLC_NULL(4, SaveLoadVersion::MultipleRoadStops, SaveLoadVersion::MaxVersion), // cur_tileloop_tile
SLC_NULL(2, SaveLoadVersion::MinVersion, SaveLoadVersion::MultipleRoadStops), // cur_tileloop_tile
SLC_NULL(4, SaveLoadVersion::MultipleRoadStops, SaveLoadVersion::MaxVersion), // cur_tileloop_tile
SLC_NULL(2, SaveLoadVersion::MinVersion, SaveLoadVersion::MaxVersion), // disaster_delay
SLC_NULL(2, SaveLoadVersion::MinVersion, SaveLoadVersion::CompanyServiceIntervals),
SLC_NULL(4, SaveLoadVersion::MinVersion, SaveLoadVersion::MaxVersion), // random.state[0]
SLC_NULL(4, SaveLoadVersion::MinVersion, SaveLoadVersion::MaxVersion), // random.state[1]
SLC_NULL(1, SaveLoadVersion::MinVersion, SaveLoadVersion::LargerTownCounter),
SLC_NULL(1, SaveLoadVersion::MinVersion, SaveLoadVersion::LargerTownCounter),
SLC_NULL(4, SaveLoadVersion::LargerTownCounter, SaveLoadVersion::CompanyServiceIntervals),
SLC_NULL(1, SaveLoadVersion::MinVersion, SaveLoadVersion::MaxVersion), // cur_company_tick_index
SLC_NULL(2, SaveLoadVersion::MinVersion, SaveLoadVersion::NextCompetitorStartOverflow), // next_competitor_start
SLC_NULL(4, SaveLoadVersion::NextCompetitorStartOverflow, SaveLoadVersion::MaxVersion), // next_competitor_start
SLC_NULL(2, SaveLoadVersion::MinVersion, SaveLoadVersion::NextCompetitorStartOverflow), // next_competitor_start
SLC_NULL(4, SaveLoadVersion::NextCompetitorStartOverflow, SaveLoadVersion::MaxVersion), // next_competitor_start
SLC_NULL(1, SaveLoadVersion::MinVersion, SaveLoadVersion::MaxVersion), // trees_tick_ctr
SLC_NULL(1, SaveLoadVersion::TownTolerancePauseMode, SaveLoadVersion::MaxVersion), // pause_mode
SLC_NULL(1, SaveLoadVersion::TownTolerancePauseMode, SaveLoadVersion::MaxVersion), // pause_mode
SLC_NULL(4, SaveLoadVersion::LargerTownIterator, SaveLoadVersion::CompanyServiceIntervals),
};
src/saveload/depot_sl.cpp
+7 -7
View File
@@ -20,13 +20,13 @@
static TownID _town_index;
static const SaveLoad _depot_desc[] = {
SLE_CONDVAR(Depot, xy, SLE_FILE_U16 | SLE_VAR_U32, SaveLoadVersion::MinVersion, SaveLoadVersion::MultipleRoadStops),
SLE_CONDVAR(Depot, xy, SLE_UINT32, SaveLoadVersion::MultipleRoadStops, SaveLoadVersion::MaxVersion),
SLEG_CONDVAR("town_index", _town_index, SLE_UINT16, SaveLoadVersion::MinVersion, SaveLoadVersion::UniqueDepotNames),
SLE_CONDREF(Depot, town, REF_TOWN, SaveLoadVersion::UniqueDepotNames, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Depot, town_cn, SLE_UINT16, SaveLoadVersion::UniqueDepotNames, SaveLoadVersion::MaxVersion),
SLE_CONDSSTR(Depot, name, SLE_STR, SaveLoadVersion::UniqueDepotNames, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Depot, build_date, SLE_INT32, SaveLoadVersion::NewGRFDepotBuildDate, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Depot, xy, SLE_FILE_U16 | SLE_VAR_U32, SaveLoadVersion::MinVersion, SaveLoadVersion::MultipleRoadStops),
SLE_CONDVAR(Depot, xy, SLE_UINT32, SaveLoadVersion::MultipleRoadStops, SaveLoadVersion::MaxVersion),
SLEG_CONDVAR("town_index", _town_index, SLE_UINT16, SaveLoadVersion::MinVersion, SaveLoadVersion::UniqueDepotNames),
SLE_CONDREF(Depot, town, REF_TOWN, SaveLoadVersion::UniqueDepotNames, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Depot, town_cn, SLE_UINT16, SaveLoadVersion::UniqueDepotNames, SaveLoadVersion::MaxVersion),
SLE_CONDSSTR(Depot, name, SLE_STR, SaveLoadVersion::UniqueDepotNames, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Depot, build_date, SLE_INT32, SaveLoadVersion::NewGRFDepotBuildDate, SaveLoadVersion::MaxVersion),
};
struct DEPTChunkHandler : ChunkHandler {
src/saveload/economy_sl.cpp
+7 -7
View File
@@ -44,16 +44,16 @@ struct CAPRChunkHandler : ChunkHandler {
};
static const SaveLoad _economy_desc[] = {
SLE_CONDVAR(Economy, old_max_loan_unround, SLE_FILE_I32 | SLE_VAR_I64, SaveLoadVersion::MinVersion, SaveLoadVersion::UnifyCurrency),
SLE_CONDVAR(Economy, old_max_loan_unround, SLE_INT64, SaveLoadVersion::UnifyCurrency, SaveLoadVersion::CumulatedInflation),
SLE_CONDVAR(Economy, old_max_loan_unround_fract, SLE_UINT16, SaveLoadVersion::CargoPaymentOverflow, SaveLoadVersion::CumulatedInflation),
SLE_CONDVAR(Economy, inflation_prices, SLE_UINT64, SaveLoadVersion::CumulatedInflation, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Economy, inflation_payment, SLE_UINT64, SaveLoadVersion::CumulatedInflation, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Economy, old_max_loan_unround, SLE_FILE_I32 | SLE_VAR_I64, SaveLoadVersion::MinVersion, SaveLoadVersion::UnifyCurrency),
SLE_CONDVAR(Economy, old_max_loan_unround, SLE_INT64, SaveLoadVersion::UnifyCurrency, SaveLoadVersion::CumulatedInflation),
SLE_CONDVAR(Economy, old_max_loan_unround_fract, SLE_UINT16, SaveLoadVersion::CargoPaymentOverflow, SaveLoadVersion::CumulatedInflation),
SLE_CONDVAR(Economy, inflation_prices, SLE_UINT64, SaveLoadVersion::CumulatedInflation, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Economy, inflation_payment, SLE_UINT64, SaveLoadVersion::CumulatedInflation, SaveLoadVersion::MaxVersion),
SLE_VAR(Economy, fluct, SLE_INT16),
SLE_VAR(Economy, interest_rate, SLE_UINT8),
SLE_VAR(Economy, infl_amount, SLE_UINT8),
SLE_VAR(Economy, infl_amount_pr, SLE_UINT8),
SLE_CONDVAR(Economy, industry_daily_change_counter, SLE_UINT32, SaveLoadVersion::SpreadIndustryProductionChanges, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Economy, industry_daily_change_counter, SLE_UINT32, SaveLoadVersion::SpreadIndustryProductionChanges, SaveLoadVersion::MaxVersion),
};
/** Economy variables */
@@ -77,7 +77,7 @@ struct ECMYChunkHandler : ChunkHandler {
SlObject(&_economy, slt);
if (!IsSavegameVersionBefore(SaveLoadVersion::RiffToArray) && SlIterateArray() != -1) SlErrorCorrupt("Too many ECMY entries");
StartupIndustryDailyChanges(IsSavegameVersionBefore(SaveLoadVersion::SpreadIndustryProductionChanges)); // old savegames will need to be initialized
StartupIndustryDailyChanges(IsSavegameVersionBefore(SaveLoadVersion::SpreadIndustryProductionChanges)); // old savegames will need to be initialized
}
};
src/saveload/engine_sl.cpp
+10 -10
View File
@@ -19,10 +19,10 @@
#include "../safeguards.h"
static const SaveLoad _engine_desc[] = {
SLE_CONDVAR(Engine, intro_date, SLE_FILE_U16 | SLE_VAR_I32, SaveLoadVersion::MinVersion, SaveLoadVersion::BigDates),
SLE_CONDVAR(Engine, intro_date, SLE_INT32, SaveLoadVersion::BigDates, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Engine, age, SLE_FILE_U16 | SLE_VAR_I32, SaveLoadVersion::MinVersion, SaveLoadVersion::BigDates),
SLE_CONDVAR(Engine, age, SLE_INT32, SaveLoadVersion::BigDates, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Engine, intro_date, SLE_FILE_U16 | SLE_VAR_I32, SaveLoadVersion::MinVersion, SaveLoadVersion::BigDates),
SLE_CONDVAR(Engine, intro_date, SLE_INT32, SaveLoadVersion::BigDates, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Engine, age, SLE_FILE_U16 | SLE_VAR_I32, SaveLoadVersion::MinVersion, SaveLoadVersion::BigDates),
SLE_CONDVAR(Engine, age, SLE_INT32, SaveLoadVersion::BigDates, SaveLoadVersion::MaxVersion),
SLE_VAR(Engine, reliability, SLE_UINT16),
SLE_VAR(Engine, reliability_spd_dec, SLE_UINT16),
SLE_VAR(Engine, reliability_start, SLE_UINT16),
@@ -32,13 +32,13 @@ static const SaveLoad _engine_desc[] = {
SLE_VAR(Engine, duration_phase_2, SLE_UINT16),
SLE_VAR(Engine, duration_phase_3, SLE_UINT16),
SLE_VAR(Engine, flags, SLE_UINT8),
SLE_CONDVAR(Engine, preview_asked, SLE_UINT16, SaveLoadVersion::RobustEnginePreview, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Engine, preview_company, SLE_UINT8, SaveLoadVersion::RobustEnginePreview, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Engine, preview_asked, SLE_UINT16, SaveLoadVersion::RobustEnginePreview, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Engine, preview_company, SLE_UINT8, SaveLoadVersion::RobustEnginePreview, SaveLoadVersion::MaxVersion),
SLE_VAR(Engine, preview_wait, SLE_UINT8),
SLE_CONDVAR(Engine, company_avail, SLE_FILE_U8 | SLE_VAR_U16, SaveLoadVersion::MinVersion, SaveLoadVersion::MoreCompanies),
SLE_CONDVAR(Engine, company_avail, SLE_UINT16, SaveLoadVersion::MoreCompanies, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Engine, company_hidden, SLE_UINT16, SaveLoadVersion::HideEnginesForCompany, SaveLoadVersion::MaxVersion),
SLE_CONDSSTR(Engine, name, SLE_STR, SaveLoadVersion::ReplaceCustomNameArray, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Engine, company_avail, SLE_FILE_U8 | SLE_VAR_U16, SaveLoadVersion::MinVersion, SaveLoadVersion::MoreCompanies),
SLE_CONDVAR(Engine, company_avail, SLE_UINT16, SaveLoadVersion::MoreCompanies, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Engine, company_hidden, SLE_UINT16, SaveLoadVersion::HideEnginesForCompany, SaveLoadVersion::MaxVersion),
SLE_CONDSSTR(Engine, name, SLE_STR, SaveLoadVersion::ReplaceCustomNameArray, SaveLoadVersion::MaxVersion),
};
static TypedIndexContainer<std::vector<Engine>, EngineID> _temp_engine;
src/saveload/gamelog_sl.cpp
+4 -4
View File
@@ -48,8 +48,8 @@ public:
static char revision_text[GAMELOG_REVISION_LENGTH];
static inline const SaveLoad description[] = {
SLEG_CONDARR("revision.text", SlGamelogRevision::revision_text, SLE_UINT8, GAMELOG_REVISION_LENGTH, SaveLoadVersion::MinVersion, SaveLoadVersion::StringGamelog),
SLE_CONDSSTRNAME(LoggedChangeRevision, text, "revision.text", SLE_STR, SaveLoadVersion::StringGamelog, SaveLoadVersion::MaxVersion),
SLEG_CONDARR("revision.text", SlGamelogRevision::revision_text, SLE_UINT8, GAMELOG_REVISION_LENGTH, SaveLoadVersion::MinVersion, SaveLoadVersion::StringGamelog),
SLE_CONDSSTRNAME(LoggedChangeRevision, text, "revision.text", SLE_STR, SaveLoadVersion::StringGamelog, SaveLoadVersion::MaxVersion),
SLE_VARNAME(LoggedChangeRevision, newgrf, "revision.newgrf", SLE_UINT32),
SLE_VARNAME(LoggedChangeRevision, slver, "revision.slver", SLE_UINT16),
SLE_VARNAME(LoggedChangeRevision, modified, "revision.modified", SLE_UINT8),
@@ -368,9 +368,9 @@ public:
};
static const SaveLoad _gamelog_desc[] = {
SLE_CONDVAR(LoggedAction, at, SLE_UINT8, SaveLoadVersion::RiffToArray, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(LoggedAction, at, SLE_UINT8, SaveLoadVersion::RiffToArray, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(LoggedAction, tick, SLE_FILE_U16 | SLE_VAR_U64, SaveLoadVersion::MinVersion, SaveLoadVersion::U64TickCounter),
SLE_CONDVAR(LoggedAction, tick, SLE_UINT64, SaveLoadVersion::U64TickCounter, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(LoggedAction, tick, SLE_UINT64, SaveLoadVersion::U64TickCounter, SaveLoadVersion::MaxVersion),
SLEG_STRUCTLIST("action", SlGamelogAction),
};
src/saveload/goal_sl.cpp
+1 -1
View File
@@ -21,7 +21,7 @@ static const SaveLoad _goals_desc[] = {
SLE_VAR(Goal, type, SLE_FILE_U16 | SLE_VAR_U8),
SLE_VAR(Goal, dst, SLE_UINT32),
SLE_SSTR(Goal, text, SLE_STR | SLF_ALLOW_CONTROL),
SLE_CONDSSTR(Goal, progress, SLE_STR | SLF_ALLOW_CONTROL, SaveLoadVersion::GoalProgressPlaneAcceleration, SaveLoadVersion::MaxVersion),
SLE_CONDSSTR(Goal, progress, SLE_STR | SLF_ALLOW_CONTROL, SaveLoadVersion::GoalProgressPlaneAcceleration, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Goal, completed, SLE_BOOL, SaveLoadVersion::GoalProgressPlaneAcceleration, SaveLoadVersion::MaxVersion),
};
src/saveload/group_sl.cpp
+6 -6
View File
@@ -17,15 +17,15 @@
#include "../safeguards.h"
static const SaveLoad _group_desc[] = {
SLE_CONDVAR(Group, name, SLE_NAME, SaveLoadVersion::MinVersion, SaveLoadVersion::ReplaceCustomNameArray),
SLE_CONDSSTR(Group, name, SLE_STR | SLF_ALLOW_CONTROL, SaveLoadVersion::ReplaceCustomNameArray, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Group, name, SLE_NAME, SaveLoadVersion::MinVersion, SaveLoadVersion::ReplaceCustomNameArray),
SLE_CONDSSTR(Group, name, SLE_STR | SLF_ALLOW_CONTROL, SaveLoadVersion::ReplaceCustomNameArray, SaveLoadVersion::MaxVersion),
SLE_VAR(Group, owner, SLE_UINT8),
SLE_VAR(Group, vehicle_type, SLE_UINT8),
SLE_VAR(Group, flags, SLE_UINT8),
SLE_CONDVAR(Group, livery.in_use, SLE_UINT8, SaveLoadVersion::GroupLiveries, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Group, livery.colour1, SLE_UINT8, SaveLoadVersion::GroupLiveries, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Group, livery.colour2, SLE_UINT8, SaveLoadVersion::GroupLiveries, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Group, parent, SLE_UINT16, SaveLoadVersion::GroupHierarchy, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Group, livery.in_use, SLE_UINT8, SaveLoadVersion::GroupLiveries, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Group, livery.colour1, SLE_UINT8, SaveLoadVersion::GroupLiveries, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Group, livery.colour2, SLE_UINT8, SaveLoadVersion::GroupLiveries, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Group, parent, SLE_UINT16, SaveLoadVersion::GroupHierarchy, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Group, number, SLE_UINT16, SaveLoadVersion::GroupNumbers, SaveLoadVersion::MaxVersion),
};
src/saveload/industry_sl.cpp
+37 -37
View File
@@ -153,61 +153,61 @@ public:
};
static const SaveLoad _industry_desc[] = {
SLE_CONDVAR(Industry, location.tile, SLE_FILE_U16 | SLE_VAR_U32, SaveLoadVersion::MinVersion, SaveLoadVersion::MultipleRoadStops),
SLE_CONDVAR(Industry, location.tile, SLE_UINT32, SaveLoadVersion::MultipleRoadStops, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Industry, location.tile, SLE_FILE_U16 | SLE_VAR_U32, SaveLoadVersion::MinVersion, SaveLoadVersion::MultipleRoadStops),
SLE_CONDVAR(Industry, location.tile, SLE_UINT32, SaveLoadVersion::MultipleRoadStops, SaveLoadVersion::MaxVersion),
SLE_VAR(Industry, location.w, SLE_FILE_U8 | SLE_VAR_U16),
SLE_VAR(Industry, location.h, SLE_FILE_U8 | SLE_VAR_U16),
SLE_REF(Industry, town, REF_TOWN),
SLE_CONDREF(Industry, neutral_station, REF_STATION, SaveLoadVersion::ServeNeutralIndustries, SaveLoadVersion::MaxVersion),
SLEG_CONDARR("produced_cargo", SlIndustryProduced::old_cargo, SLE_UINT8, INDUSTRY_ORIGINAL_NUM_OUTPUTS, SaveLoadVersion::StoreIndustryCargo, SaveLoadVersion::ExtendIndustryCargoSlots),
SLEG_CONDARR("produced_cargo", SlIndustryProduced::old_cargo, SLE_UINT8, INDUSTRY_NUM_OUTPUTS, SaveLoadVersion::ExtendIndustryCargoSlots, SaveLoadVersion::IndustryCargoReorganise),
SLEG_CONDARR("incoming_cargo_waiting", SlIndustryAccepted::old_waiting, SLE_UINT16, INDUSTRY_ORIGINAL_NUM_INPUTS, SaveLoadVersion::CargoPaymentOverflow, SaveLoadVersion::ExtendIndustryCargoSlots),
SLEG_CONDARR("incoming_cargo_waiting", SlIndustryAccepted::old_waiting, SLE_UINT16, INDUSTRY_NUM_INPUTS, SaveLoadVersion::ExtendIndustryCargoSlots, SaveLoadVersion::IndustryCargoReorganise),
SLEG_CONDARR("produced_cargo_waiting", SlIndustryProduced::old_waiting, SLE_UINT16, INDUSTRY_ORIGINAL_NUM_OUTPUTS, SaveLoadVersion::MinVersion, SaveLoadVersion::ExtendIndustryCargoSlots),
SLEG_CONDARR("produced_cargo_waiting", SlIndustryProduced::old_waiting, SLE_UINT16, INDUSTRY_NUM_OUTPUTS, SaveLoadVersion::ExtendIndustryCargoSlots, SaveLoadVersion::IndustryCargoReorganise),
SLEG_CONDARR("production_rate", SlIndustryProduced::old_rate, SLE_UINT8, INDUSTRY_ORIGINAL_NUM_OUTPUTS, SaveLoadVersion::MinVersion, SaveLoadVersion::ExtendIndustryCargoSlots),
SLEG_CONDARR("production_rate", SlIndustryProduced::old_rate, SLE_UINT8, INDUSTRY_NUM_OUTPUTS, SaveLoadVersion::ExtendIndustryCargoSlots, SaveLoadVersion::IndustryCargoReorganise),
SLEG_CONDARR("accepts_cargo", SlIndustryAccepted::old_cargo, SLE_UINT8, INDUSTRY_ORIGINAL_NUM_INPUTS, SaveLoadVersion::StoreIndustryCargo, SaveLoadVersion::ExtendIndustryCargoSlots),
SLEG_CONDARR("accepts_cargo", SlIndustryAccepted::old_cargo, SLE_UINT8, INDUSTRY_NUM_INPUTS, SaveLoadVersion::ExtendIndustryCargoSlots, SaveLoadVersion::IndustryCargoReorganise),
SLE_CONDREF(Industry, neutral_station, REF_STATION, SaveLoadVersion::ServeNeutralIndustries, SaveLoadVersion::MaxVersion),
SLEG_CONDARR("produced_cargo", SlIndustryProduced::old_cargo, SLE_UINT8, INDUSTRY_ORIGINAL_NUM_OUTPUTS, SaveLoadVersion::StoreIndustryCargo, SaveLoadVersion::ExtendIndustryCargoSlots),
SLEG_CONDARR("produced_cargo", SlIndustryProduced::old_cargo, SLE_UINT8, INDUSTRY_NUM_OUTPUTS, SaveLoadVersion::ExtendIndustryCargoSlots, SaveLoadVersion::IndustryCargoReorganise),
SLEG_CONDARR("incoming_cargo_waiting", SlIndustryAccepted::old_waiting, SLE_UINT16, INDUSTRY_ORIGINAL_NUM_INPUTS, SaveLoadVersion::CargoPaymentOverflow, SaveLoadVersion::ExtendIndustryCargoSlots),
SLEG_CONDARR("incoming_cargo_waiting", SlIndustryAccepted::old_waiting, SLE_UINT16, INDUSTRY_NUM_INPUTS, SaveLoadVersion::ExtendIndustryCargoSlots, SaveLoadVersion::IndustryCargoReorganise),
SLEG_CONDARR("produced_cargo_waiting", SlIndustryProduced::old_waiting, SLE_UINT16, INDUSTRY_ORIGINAL_NUM_OUTPUTS, SaveLoadVersion::MinVersion, SaveLoadVersion::ExtendIndustryCargoSlots),
SLEG_CONDARR("produced_cargo_waiting", SlIndustryProduced::old_waiting, SLE_UINT16, INDUSTRY_NUM_OUTPUTS, SaveLoadVersion::ExtendIndustryCargoSlots, SaveLoadVersion::IndustryCargoReorganise),
SLEG_CONDARR("production_rate", SlIndustryProduced::old_rate, SLE_UINT8, INDUSTRY_ORIGINAL_NUM_OUTPUTS, SaveLoadVersion::MinVersion, SaveLoadVersion::ExtendIndustryCargoSlots),
SLEG_CONDARR("production_rate", SlIndustryProduced::old_rate, SLE_UINT8, INDUSTRY_NUM_OUTPUTS, SaveLoadVersion::ExtendIndustryCargoSlots, SaveLoadVersion::IndustryCargoReorganise),
SLEG_CONDARR("accepts_cargo", SlIndustryAccepted::old_cargo, SLE_UINT8, INDUSTRY_ORIGINAL_NUM_INPUTS, SaveLoadVersion::StoreIndustryCargo, SaveLoadVersion::ExtendIndustryCargoSlots),
SLEG_CONDARR("accepts_cargo", SlIndustryAccepted::old_cargo, SLE_UINT8, INDUSTRY_NUM_INPUTS, SaveLoadVersion::ExtendIndustryCargoSlots, SaveLoadVersion::IndustryCargoReorganise),
SLE_VAR(Industry, prod_level, SLE_UINT8),
SLEG_CONDARR("this_month_production", SlIndustryProduced::old_this_month_production, SLE_UINT16, INDUSTRY_ORIGINAL_NUM_OUTPUTS, SaveLoadVersion::MinVersion, SaveLoadVersion::ExtendIndustryCargoSlots),
SLEG_CONDARR("this_month_production", SlIndustryProduced::old_this_month_production, SLE_UINT16, INDUSTRY_NUM_OUTPUTS, SaveLoadVersion::ExtendIndustryCargoSlots, SaveLoadVersion::IndustryCargoReorganise),
SLEG_CONDARR("this_month_transported", SlIndustryProduced::old_this_month_transported, SLE_UINT16, INDUSTRY_ORIGINAL_NUM_OUTPUTS, SaveLoadVersion::MinVersion, SaveLoadVersion::ExtendIndustryCargoSlots),
SLEG_CONDARR("this_month_transported", SlIndustryProduced::old_this_month_transported, SLE_UINT16, INDUSTRY_NUM_OUTPUTS, SaveLoadVersion::ExtendIndustryCargoSlots, SaveLoadVersion::IndustryCargoReorganise),
SLEG_CONDARR("last_month_production", SlIndustryProduced::old_last_month_production, SLE_UINT16, INDUSTRY_ORIGINAL_NUM_OUTPUTS, SaveLoadVersion::MinVersion, SaveLoadVersion::ExtendIndustryCargoSlots),
SLEG_CONDARR("last_month_production", SlIndustryProduced::old_last_month_production, SLE_UINT16, INDUSTRY_NUM_OUTPUTS, SaveLoadVersion::ExtendIndustryCargoSlots, SaveLoadVersion::IndustryCargoReorganise),
SLEG_CONDARR("last_month_transported", SlIndustryProduced::old_last_month_transported, SLE_UINT16, INDUSTRY_ORIGINAL_NUM_OUTPUTS, SaveLoadVersion::MinVersion, SaveLoadVersion::ExtendIndustryCargoSlots),
SLEG_CONDARR("last_month_transported", SlIndustryProduced::old_last_month_transported, SLE_UINT16, INDUSTRY_NUM_OUTPUTS, SaveLoadVersion::ExtendIndustryCargoSlots, SaveLoadVersion::IndustryCargoReorganise),
SLEG_CONDARR("this_month_production", SlIndustryProduced::old_this_month_production, SLE_UINT16, INDUSTRY_ORIGINAL_NUM_OUTPUTS, SaveLoadVersion::MinVersion, SaveLoadVersion::ExtendIndustryCargoSlots),
SLEG_CONDARR("this_month_production", SlIndustryProduced::old_this_month_production, SLE_UINT16, INDUSTRY_NUM_OUTPUTS, SaveLoadVersion::ExtendIndustryCargoSlots, SaveLoadVersion::IndustryCargoReorganise),
SLEG_CONDARR("this_month_transported", SlIndustryProduced::old_this_month_transported, SLE_UINT16, INDUSTRY_ORIGINAL_NUM_OUTPUTS, SaveLoadVersion::MinVersion, SaveLoadVersion::ExtendIndustryCargoSlots),
SLEG_CONDARR("this_month_transported", SlIndustryProduced::old_this_month_transported, SLE_UINT16, INDUSTRY_NUM_OUTPUTS, SaveLoadVersion::ExtendIndustryCargoSlots, SaveLoadVersion::IndustryCargoReorganise),
SLEG_CONDARR("last_month_production", SlIndustryProduced::old_last_month_production, SLE_UINT16, INDUSTRY_ORIGINAL_NUM_OUTPUTS, SaveLoadVersion::MinVersion, SaveLoadVersion::ExtendIndustryCargoSlots),
SLEG_CONDARR("last_month_production", SlIndustryProduced::old_last_month_production, SLE_UINT16, INDUSTRY_NUM_OUTPUTS, SaveLoadVersion::ExtendIndustryCargoSlots, SaveLoadVersion::IndustryCargoReorganise),
SLEG_CONDARR("last_month_transported", SlIndustryProduced::old_last_month_transported, SLE_UINT16, INDUSTRY_ORIGINAL_NUM_OUTPUTS, SaveLoadVersion::MinVersion, SaveLoadVersion::ExtendIndustryCargoSlots),
SLEG_CONDARR("last_month_transported", SlIndustryProduced::old_last_month_transported, SLE_UINT16, INDUSTRY_NUM_OUTPUTS, SaveLoadVersion::ExtendIndustryCargoSlots, SaveLoadVersion::IndustryCargoReorganise),
SLE_VAR(Industry, counter, SLE_UINT16),
SLE_VAR(Industry, type, SLE_UINT8),
SLE_VAR(Industry, owner, SLE_UINT8),
SLE_VAR(Industry, random_colour, SLE_UINT8),
SLE_CONDVAR(Industry, last_prod_year, SLE_FILE_U8 | SLE_VAR_I32, SaveLoadVersion::MinVersion, SaveLoadVersion::BigDates),
SLE_CONDVAR(Industry, last_prod_year, SLE_INT32, SaveLoadVersion::BigDates, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Industry, last_prod_year, SLE_FILE_U8 | SLE_VAR_I32, SaveLoadVersion::MinVersion, SaveLoadVersion::BigDates),
SLE_CONDVAR(Industry, last_prod_year, SLE_INT32, SaveLoadVersion::BigDates, SaveLoadVersion::MaxVersion),
SLE_VAR(Industry, was_cargo_delivered, SLE_UINT8),
SLE_CONDVAR(Industry, ctlflags, SLE_UINT8, SaveLoadVersion::GSIndustryControl, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Industry, ctlflags, SLE_UINT8, SaveLoadVersion::GSIndustryControl, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Industry, founder, SLE_UINT8, SaveLoadVersion::CargoPaymentOverflow, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Industry, construction_date, SLE_INT32, SaveLoadVersion::CargoPaymentOverflow, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Industry, construction_type, SLE_UINT8, SaveLoadVersion::CargoPaymentOverflow, SaveLoadVersion::MaxVersion),
SLEG_CONDVAR("last_cargo_accepted_at[0]", SlIndustryAccepted::old_last_accepted[0], SLE_INT32, SaveLoadVersion::CargoPaymentOverflow, SaveLoadVersion::ExtendIndustryCargoSlots),
SLEG_CONDARR("last_cargo_accepted_at", SlIndustryAccepted::old_last_accepted, SLE_INT32, 16, SaveLoadVersion::ExtendIndustryCargoSlots, SaveLoadVersion::IndustryCargoReorganise),
SLE_CONDVAR(Industry, selected_layout, SLE_UINT8, SaveLoadVersion::NewGRFIndustryLayout, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Industry, exclusive_supplier, SLE_UINT8, SaveLoadVersion::GSIndustryControl, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Industry, exclusive_consumer, SLE_UINT8, SaveLoadVersion::GSIndustryControl, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Industry, founder, SLE_UINT8, SaveLoadVersion::CargoPaymentOverflow, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Industry, construction_date, SLE_INT32, SaveLoadVersion::CargoPaymentOverflow, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Industry, construction_type, SLE_UINT8, SaveLoadVersion::CargoPaymentOverflow, SaveLoadVersion::MaxVersion),
SLEG_CONDVAR("last_cargo_accepted_at[0]", SlIndustryAccepted::old_last_accepted[0], SLE_INT32, SaveLoadVersion::CargoPaymentOverflow, SaveLoadVersion::ExtendIndustryCargoSlots),
SLEG_CONDARR("last_cargo_accepted_at", SlIndustryAccepted::old_last_accepted, SLE_INT32, 16, SaveLoadVersion::ExtendIndustryCargoSlots, SaveLoadVersion::IndustryCargoReorganise),
SLE_CONDVAR(Industry, selected_layout, SLE_UINT8, SaveLoadVersion::NewGRFIndustryLayout, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Industry, exclusive_supplier, SLE_UINT8, SaveLoadVersion::GSIndustryControl, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Industry, exclusive_consumer, SLE_UINT8, SaveLoadVersion::GSIndustryControl, SaveLoadVersion::MaxVersion),
SLEG_CONDARR("storage", _old_ind_persistent_storage.storage, SLE_UINT32, 16, SaveLoadVersion::NewGRFPersistentStorage, SaveLoadVersion::PersistentStoragePool),
SLE_CONDREF(Industry, psa, REF_STORAGE, SaveLoadVersion::PersistentStoragePool, SaveLoadVersion::MaxVersion),
SLE_CONDREF(Industry, psa, REF_STORAGE, SaveLoadVersion::PersistentStoragePool, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Industry, random, SLE_UINT16, SaveLoadVersion::NewGRFIndustryRandomTriggers, SaveLoadVersion::MaxVersion),
SLE_CONDSSTR(Industry, text, SLE_STR | SLF_ALLOW_CONTROL, SaveLoadVersion::IndustryText, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Industry, random, SLE_UINT16, SaveLoadVersion::NewGRFIndustryRandomTriggers, SaveLoadVersion::MaxVersion),
SLE_CONDSSTR(Industry, text, SLE_STR | SLF_ALLOW_CONTROL, SaveLoadVersion::IndustryText, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Industry, valid_history, SLE_UINT64, SaveLoadVersion::IndustryNumValidHistory, SaveLoadVersion::MaxVersion),
SLEG_CONDSTRUCTLIST("accepted", SlIndustryAccepted, SaveLoadVersion::IndustryCargoReorganise, SaveLoadVersion::MaxVersion),
SLEG_CONDSTRUCTLIST("produced", SlIndustryProduced, SaveLoadVersion::IndustryCargoReorganise, SaveLoadVersion::MaxVersion),
SLEG_CONDSTRUCTLIST("accepted", SlIndustryAccepted, SaveLoadVersion::IndustryCargoReorganise, SaveLoadVersion::MaxVersion),
SLEG_CONDSTRUCTLIST("produced", SlIndustryProduced, SaveLoadVersion::IndustryCargoReorganise, SaveLoadVersion::MaxVersion),
};
struct INDYChunkHandler : ChunkHandler {
src/saveload/league_sl.cpp
+2 -2
View File
@@ -17,8 +17,8 @@
static const SaveLoad _league_table_elements_desc[] = {
SLE_VAR(LeagueTableElement, table, SLE_UINT8),
SLE_CONDVAR(LeagueTableElement, rating, SLE_FILE_U64 | SLE_VAR_I64, SaveLoadVersion::MinVersion, SaveLoadVersion::LinkgraphEdges),
SLE_CONDVAR(LeagueTableElement, rating, SLE_INT64, SaveLoadVersion::LinkgraphEdges, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(LeagueTableElement, rating, SLE_FILE_U64 | SLE_VAR_I64, SaveLoadVersion::MinVersion, SaveLoadVersion::LinkgraphEdges),
SLE_CONDVAR(LeagueTableElement, rating, SLE_INT64, SaveLoadVersion::LinkgraphEdges, SaveLoadVersion::MaxVersion),
SLE_VAR(LeagueTableElement, company, SLE_UINT8),
SLE_SSTR(LeagueTableElement, text, SLE_STR | SLF_ALLOW_CONTROL),
SLE_SSTR(LeagueTableElement, score, SLE_STR | SLF_ALLOW_CONTROL),
src/saveload/linkgraph_sl.cpp
+3 -3
View File
@@ -33,9 +33,9 @@ public:
static inline const SaveLoad description[] = {
SLE_VAR(Edge, capacity, SLE_UINT32),
SLE_VAR(Edge, usage, SLE_UINT32),
SLE_CONDVAR(Edge, travel_time_sum, SLE_UINT64, SaveLoadVersion::LinkgraphTravelTime, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Edge, travel_time_sum, SLE_UINT64, SaveLoadVersion::LinkgraphTravelTime, SaveLoadVersion::MaxVersion),
SLE_VAR(Edge, last_unrestricted_update, SLE_INT32),
SLE_CONDVAR(Edge, last_restricted_update, SLE_INT32, SaveLoadVersion::LinkgraphRestrictedFlow, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Edge, last_restricted_update, SLE_INT32, SaveLoadVersion::LinkgraphRestrictedFlow, SaveLoadVersion::MaxVersion),
SLE_VAR(Edge, dest_node, SLE_UINT16),
SLE_CONDVARNAME(Edge, dest_node, "next_edge", SLE_UINT16, SaveLoadVersion::MinVersion, SaveLoadVersion::LinkgraphEdges),
};
@@ -96,7 +96,7 @@ public:
class SlLinkgraphNode : public DefaultSaveLoadHandler<SlLinkgraphNode, LinkGraph> {
public:
static inline const SaveLoad description[] = {
SLE_CONDVAR(Node, xy, SLE_UINT32, SaveLoadVersion::LinkgraphLocationDisasterStore, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Node, xy, SLE_UINT32, SaveLoadVersion::LinkgraphLocationDisasterStore, SaveLoadVersion::MaxVersion),
SLE_VAR(Node, supply, SLE_UINT32),
SLE_VAR(Node, demand, SLE_UINT32),
SLE_VAR(Node, station, SLE_UINT16),
src/saveload/misc_sl.cpp
+24 -24
View File
@@ -84,36 +84,36 @@ uint8_t _age_cargo_skip_counter; ///< Skip aging of cargo? Used before savegame
extern TimeoutTimer<TimerGameTick> _new_competitor_timeout;
static const SaveLoad _date_desc[] = {
SLEG_CONDVAR("date", TimerGameCalendar::date, SLE_FILE_U16 | SLE_VAR_I32, SaveLoadVersion::MinVersion, SaveLoadVersion::BigDates),
SLEG_CONDVAR("date", TimerGameCalendar::date, SLE_INT32, SaveLoadVersion::BigDates, SaveLoadVersion::MaxVersion),
SLEG_CONDVAR("date", TimerGameCalendar::date, SLE_FILE_U16 | SLE_VAR_I32, SaveLoadVersion::MinVersion, SaveLoadVersion::BigDates),
SLEG_CONDVAR("date", TimerGameCalendar::date, SLE_INT32, SaveLoadVersion::BigDates, SaveLoadVersion::MaxVersion),
SLEG_VAR("date_fract", TimerGameCalendar::date_fract, SLE_UINT16),
SLEG_CONDVAR("tick_counter", TimerGameTick::counter, SLE_FILE_U16 | SLE_VAR_U64, SaveLoadVersion::MinVersion, SaveLoadVersion::U64TickCounter),
SLEG_CONDVAR("tick_counter", TimerGameTick::counter, SLE_UINT64, SaveLoadVersion::U64TickCounter, SaveLoadVersion::MaxVersion),
SLEG_CONDVAR("economy_date", TimerGameEconomy::date, SLE_INT32, SaveLoadVersion::EconomyDate, SaveLoadVersion::MaxVersion),
SLEG_CONDVAR("economy_date_fract", TimerGameEconomy::date_fract, SLE_UINT16, SaveLoadVersion::EconomyDate, SaveLoadVersion::MaxVersion),
SLEG_CONDVAR("days_since_last_month", TimerGameEconomy::days_since_last_month, SLE_UINT32, SaveLoadVersion::IndustryAcceptedHistory, SaveLoadVersion::MaxVersion),
SLEG_CONDVAR("calendar_sub_date_fract", TimerGameCalendar::sub_date_fract, SLE_UINT16, SaveLoadVersion::CalendarSubDateFract, SaveLoadVersion::MaxVersion),
SLEG_CONDVAR("age_cargo_skip_counter", _age_cargo_skip_counter, SLE_UINT8, SaveLoadVersion::MinVersion, SaveLoadVersion::NewGRFCustomCargoAging),
SLEG_CONDVAR("cur_tileloop_tile", _cur_tileloop_tile, SLE_FILE_U16 | SLE_VAR_U32, SaveLoadVersion::MinVersion, SaveLoadVersion::MultipleRoadStops),
SLEG_CONDVAR("cur_tileloop_tile", _cur_tileloop_tile, SLE_UINT32, SaveLoadVersion::MultipleRoadStops, SaveLoadVersion::MaxVersion),
SLEG_CONDVAR("tick_counter", TimerGameTick::counter, SLE_FILE_U16 | SLE_VAR_U64, SaveLoadVersion::MinVersion, SaveLoadVersion::U64TickCounter),
SLEG_CONDVAR("tick_counter", TimerGameTick::counter, SLE_UINT64, SaveLoadVersion::U64TickCounter, SaveLoadVersion::MaxVersion),
SLEG_CONDVAR("economy_date", TimerGameEconomy::date, SLE_INT32, SaveLoadVersion::EconomyDate, SaveLoadVersion::MaxVersion),
SLEG_CONDVAR("economy_date_fract", TimerGameEconomy::date_fract, SLE_UINT16, SaveLoadVersion::EconomyDate, SaveLoadVersion::MaxVersion),
SLEG_CONDVAR("days_since_last_month", TimerGameEconomy::days_since_last_month, SLE_UINT32, SaveLoadVersion::IndustryAcceptedHistory, SaveLoadVersion::MaxVersion),
SLEG_CONDVAR("calendar_sub_date_fract", TimerGameCalendar::sub_date_fract, SLE_UINT16, SaveLoadVersion::CalendarSubDateFract, SaveLoadVersion::MaxVersion),
SLEG_CONDVAR("age_cargo_skip_counter", _age_cargo_skip_counter, SLE_UINT8, SaveLoadVersion::MinVersion, SaveLoadVersion::NewGRFCustomCargoAging),
SLEG_CONDVAR("cur_tileloop_tile", _cur_tileloop_tile, SLE_FILE_U16 | SLE_VAR_U32, SaveLoadVersion::MinVersion, SaveLoadVersion::MultipleRoadStops),
SLEG_CONDVAR("cur_tileloop_tile", _cur_tileloop_tile, SLE_UINT32, SaveLoadVersion::MultipleRoadStops, SaveLoadVersion::MaxVersion),
SLEG_VAR("next_disaster_start", _disaster_delay, SLE_UINT16),
SLEG_VAR("random_state[0]", _random.state[0], SLE_UINT32),
SLEG_VAR("random_state[1]", _random.state[1], SLE_UINT32),
SLEG_VAR("company_tick_counter", _cur_company_tick_index, SLE_FILE_U8 | SLE_VAR_U32),
SLEG_VAR("trees_tick_counter", _trees_tick_ctr, SLE_UINT8),
SLEG_CONDVAR("pause_mode", _pause_mode, SLE_UINT8, SaveLoadVersion::TownTolerancePauseMode, SaveLoadVersion::MaxVersion),
SLEG_CONDSSTR("id", _game_session_stats.savegame_id, SLE_STR, SaveLoadVersion::SavegameId, SaveLoadVersion::MaxVersion),
SLEG_CONDVAR("pause_mode", _pause_mode, SLE_UINT8, SaveLoadVersion::TownTolerancePauseMode, SaveLoadVersion::MaxVersion),
SLEG_CONDSSTR("id", _game_session_stats.savegame_id, SLE_STR, SaveLoadVersion::SavegameId, SaveLoadVersion::MaxVersion),
/* For older savegames, we load the current value as the "period"; afterload will set the "fired" and "elapsed". */
SLEG_CONDVAR("next_competitor_start", _new_competitor_timeout.period.value, SLE_FILE_U16 | SLE_VAR_U32, SaveLoadVersion::MinVersion, SaveLoadVersion::NextCompetitorStartOverflow),
SLEG_CONDVAR("next_competitor_start", _new_competitor_timeout.period.value, SLE_UINT32, SaveLoadVersion::NextCompetitorStartOverflow, SaveLoadVersion::AIStartDate),
SLEG_CONDVAR("competitors_interval", _new_competitor_timeout.period.value, SLE_UINT32, SaveLoadVersion::AIStartDate, SaveLoadVersion::MaxVersion),
SLEG_CONDVAR("competitors_interval_elapsed", _new_competitor_timeout.storage.elapsed, SLE_UINT32, SaveLoadVersion::AIStartDate, SaveLoadVersion::MaxVersion),
SLEG_CONDVAR("competitors_interval_fired", _new_competitor_timeout.fired, SLE_BOOL, SaveLoadVersion::AIStartDate, SaveLoadVersion::MaxVersion),
SLEG_CONDVAR("next_competitor_start", _new_competitor_timeout.period.value, SLE_FILE_U16 | SLE_VAR_U32, SaveLoadVersion::MinVersion, SaveLoadVersion::NextCompetitorStartOverflow),
SLEG_CONDVAR("next_competitor_start", _new_competitor_timeout.period.value, SLE_UINT32, SaveLoadVersion::NextCompetitorStartOverflow, SaveLoadVersion::AIStartDate),
SLEG_CONDVAR("competitors_interval", _new_competitor_timeout.period.value, SLE_UINT32, SaveLoadVersion::AIStartDate, SaveLoadVersion::MaxVersion),
SLEG_CONDVAR("competitors_interval_elapsed", _new_competitor_timeout.storage.elapsed, SLE_UINT32, SaveLoadVersion::AIStartDate, SaveLoadVersion::MaxVersion),
SLEG_CONDVAR("competitors_interval_fired", _new_competitor_timeout.fired, SLE_BOOL, SaveLoadVersion::AIStartDate, SaveLoadVersion::MaxVersion),
};
static const SaveLoad _date_check_desc[] = {
SLEG_CONDVAR("date", _load_check_data.current_date, SLE_FILE_U16 | SLE_VAR_I32, SaveLoadVersion::MinVersion, SaveLoadVersion::BigDates),
SLEG_CONDVAR("date", _load_check_data.current_date, SLE_INT32, SaveLoadVersion::BigDates, SaveLoadVersion::MaxVersion),
SLEG_CONDVAR("date", _load_check_data.current_date, SLE_FILE_U16 | SLE_VAR_I32, SaveLoadVersion::MinVersion, SaveLoadVersion::BigDates),
SLEG_CONDVAR("date", _load_check_data.current_date, SLE_INT32, SaveLoadVersion::BigDates, SaveLoadVersion::MaxVersion),
};
/**
@@ -157,10 +157,10 @@ struct DATEChunkHandler : ChunkHandler {
};
static const SaveLoad _view_desc[] = {
SLEG_CONDVAR("x", _saved_scrollpos_x, SLE_FILE_I16 | SLE_VAR_I32, SaveLoadVersion::MinVersion, SaveLoadVersion::MultipleRoadStops),
SLEG_CONDVAR("x", _saved_scrollpos_x, SLE_INT32, SaveLoadVersion::MultipleRoadStops, SaveLoadVersion::MaxVersion),
SLEG_CONDVAR("y", _saved_scrollpos_y, SLE_FILE_I16 | SLE_VAR_I32, SaveLoadVersion::MinVersion, SaveLoadVersion::MultipleRoadStops),
SLEG_CONDVAR("y", _saved_scrollpos_y, SLE_INT32, SaveLoadVersion::MultipleRoadStops, SaveLoadVersion::MaxVersion),
SLEG_CONDVAR("x", _saved_scrollpos_x, SLE_FILE_I16 | SLE_VAR_I32, SaveLoadVersion::MinVersion, SaveLoadVersion::MultipleRoadStops),
SLEG_CONDVAR("x", _saved_scrollpos_x, SLE_INT32, SaveLoadVersion::MultipleRoadStops, SaveLoadVersion::MaxVersion),
SLEG_CONDVAR("y", _saved_scrollpos_y, SLE_FILE_I16 | SLE_VAR_I32, SaveLoadVersion::MinVersion, SaveLoadVersion::MultipleRoadStops),
SLEG_CONDVAR("y", _saved_scrollpos_y, SLE_INT32, SaveLoadVersion::MultipleRoadStops, SaveLoadVersion::MaxVersion),
SLEG_VAR("zoom", _saved_scrollpos_zoom, SLE_UINT8),
};
src/saveload/newgrf_sl.cpp
+6 -6
View File
@@ -20,10 +20,10 @@
/** Save and load the mapping between a spec and the NewGRF it came from. */
static const SaveLoad _newgrf_mapping_desc[] = {
SLE_VAR(EntityIDMapping, grfid, SLE_UINT32),
SLE_CONDVAR(EntityIDMapping, entity_id, SLE_FILE_U8 | SLE_VAR_U16, SaveLoadVersion::MinVersion, SaveLoadVersion::ExtendEntityMapping),
SLE_CONDVAR(EntityIDMapping, entity_id, SLE_UINT16, SaveLoadVersion::ExtendEntityMapping, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(EntityIDMapping, substitute_id, SLE_FILE_U8 | SLE_VAR_U16, SaveLoadVersion::MinVersion, SaveLoadVersion::ExtendEntityMapping),
SLE_CONDVAR(EntityIDMapping, substitute_id, SLE_UINT16, SaveLoadVersion::ExtendEntityMapping, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(EntityIDMapping, entity_id, SLE_FILE_U8 | SLE_VAR_U16, SaveLoadVersion::MinVersion, SaveLoadVersion::ExtendEntityMapping),
SLE_CONDVAR(EntityIDMapping, entity_id, SLE_UINT16, SaveLoadVersion::ExtendEntityMapping, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(EntityIDMapping, substitute_id, SLE_FILE_U8 | SLE_VAR_U16, SaveLoadVersion::MinVersion, SaveLoadVersion::ExtendEntityMapping),
SLE_CONDVAR(EntityIDMapping, substitute_id, SLE_UINT16, SaveLoadVersion::ExtendEntityMapping, SaveLoadVersion::MaxVersion),
};
/**
@@ -71,10 +71,10 @@ struct NGRFChunkHandler : ChunkHandler {
SLE_SSTR(GRFConfig, filename, SLE_STR),
SLE_VAR(GRFConfig, ident.grfid, SLE_UINT32),
SLE_ARR(GRFConfig, ident.md5sum, SLE_UINT8, 16),
SLE_CONDVAR(GRFConfig, version, SLE_UINT32, SaveLoadVersion::StoreNewGRFVersion, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(GRFConfig, version, SLE_UINT32, SaveLoadVersion::StoreNewGRFVersion, SaveLoadVersion::MaxVersion),
SLEG_ARR("param", param, SLE_UINT32, std::size(param)),
SLEG_VAR("num_params", num_params, SLE_UINT8),
SLE_CONDVAR(GRFConfig, palette, SLE_UINT8, SaveLoadVersion::NewGRFPalette, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(GRFConfig, palette, SLE_UINT8, SaveLoadVersion::NewGRFPalette, SaveLoadVersion::MaxVersion),
};
void SaveParameters(const GRFConfig &config) const
src/saveload/object_sl.cpp
+2 -2
View File
@@ -25,8 +25,8 @@ static const SaveLoad _object_desc[] = {
SLE_REF(Object, town, REF_TOWN),
SLE_VAR(Object, build_date, SLE_UINT32),
SLE_CONDVARNAME(Object, recolour_offset, "colour", SLE_UINT8, SaveLoadVersion::IndustryPlatform, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Object, view, SLE_UINT8, SaveLoadVersion::NewGRFObjectView, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Object, type, SLE_UINT16, SaveLoadVersion::ObjectTypeToPool, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Object, view, SLE_UINT8, SaveLoadVersion::NewGRFObjectView, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Object, type, SLE_UINT16, SaveLoadVersion::ObjectTypeToPool, SaveLoadVersion::MaxVersion),
};
struct OBJSChunkHandler : ChunkHandler {
src/saveload/order_sl.cpp
+18 -18
View File
@@ -147,12 +147,12 @@ SaveLoadTable GetOrderDescription()
SLE_VARNAME(OldOrderSaveLoadItem, order.type, "type", SLE_UINT8),
SLE_VARNAME(OldOrderSaveLoadItem, order.flags, "flags", SLE_UINT8),
SLE_VARNAME(OldOrderSaveLoadItem, order.dest, "dest", SLE_UINT16),
SLE_CONDVARNAME(OldOrderSaveLoadItem, next, "next", SLE_FILE_U16 | SLE_VAR_U32, SaveLoadVersion::MinVersion, SaveLoadVersion::MoreCargoPackets),
SLE_CONDVARNAME(OldOrderSaveLoadItem, next, "next", SLE_UINT32, SaveLoadVersion::MoreCargoPackets, SaveLoadVersion::MaxVersion),
SLE_CONDVARNAME(OldOrderSaveLoadItem, order.refit_cargo, "refit_cargo", SLE_UINT8, SaveLoadVersion::RefitOrders, SaveLoadVersion::MaxVersion),
SLE_CONDVARNAME(OldOrderSaveLoadItem, order.wait_time, "wait_time", SLE_UINT16, SaveLoadVersion::Timetables, SaveLoadVersion::MaxVersion),
SLE_CONDVARNAME(OldOrderSaveLoadItem, order.travel_time, "travel_time", SLE_UINT16, SaveLoadVersion::Timetables, SaveLoadVersion::MaxVersion),
SLE_CONDVARNAME(OldOrderSaveLoadItem, order.max_speed, "max_speed", SLE_UINT16, SaveLoadVersion::OrderMaxSpeed, SaveLoadVersion::MaxVersion),
SLE_CONDVARNAME(OldOrderSaveLoadItem, next, "next", SLE_FILE_U16 | SLE_VAR_U32, SaveLoadVersion::MinVersion, SaveLoadVersion::MoreCargoPackets),
SLE_CONDVARNAME(OldOrderSaveLoadItem, next, "next", SLE_UINT32, SaveLoadVersion::MoreCargoPackets, SaveLoadVersion::MaxVersion),
SLE_CONDVARNAME(OldOrderSaveLoadItem, order.refit_cargo, "refit_cargo", SLE_UINT8, SaveLoadVersion::RefitOrders, SaveLoadVersion::MaxVersion),
SLE_CONDVARNAME(OldOrderSaveLoadItem, order.wait_time, "wait_time", SLE_UINT16, SaveLoadVersion::Timetables, SaveLoadVersion::MaxVersion),
SLE_CONDVARNAME(OldOrderSaveLoadItem, order.travel_time, "travel_time", SLE_UINT16, SaveLoadVersion::Timetables, SaveLoadVersion::MaxVersion),
SLE_CONDVARNAME(OldOrderSaveLoadItem, order.max_speed, "max_speed", SLE_UINT16, SaveLoadVersion::OrderMaxSpeed, SaveLoadVersion::MaxVersion),
};
return _order_desc;
@@ -241,7 +241,7 @@ SaveLoadTable GetOrderListDescription()
{
static const SaveLoad _orderlist_desc[] = {
SLE_CONDVARNAME(OrderList, old_order_index, "first", SLE_FILE_U16 | SLE_VAR_U32, SaveLoadVersion::MinVersion, SaveLoadVersion::MoreCargoPackets),
SLE_CONDVARNAME(OrderList, old_order_index, "first", SLE_UINT32, SaveLoadVersion::MoreCargoPackets, SaveLoadVersion::OrdersOwnedByOrderlist),
SLE_CONDVARNAME(OrderList, old_order_index, "first", SLE_UINT32, SaveLoadVersion::MoreCargoPackets, SaveLoadVersion::OrdersOwnedByOrderlist),
SLEG_CONDSTRUCTLIST("orders", SlOrders<OrderList>, SaveLoadVersion::OrdersOwnedByOrderlist, SaveLoadVersion::MaxVersion),
};
@@ -299,20 +299,20 @@ SaveLoadTable GetOrderBackupDescription()
SLE_VAR(OrderBackup, user, SLE_UINT32),
SLE_VAR(OrderBackup, tile, SLE_UINT32),
SLE_VAR(OrderBackup, group, SLE_UINT16),
SLE_CONDVAR(OrderBackup, service_interval, SLE_FILE_U32 | SLE_VAR_U16, SaveLoadVersion::MinVersion, SaveLoadVersion::FixOrderBackup),
SLE_CONDVAR(OrderBackup, service_interval, SLE_UINT16, SaveLoadVersion::FixOrderBackup, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(OrderBackup, service_interval, SLE_FILE_U32 | SLE_VAR_U16, SaveLoadVersion::MinVersion, SaveLoadVersion::FixOrderBackup),
SLE_CONDVAR(OrderBackup, service_interval, SLE_UINT16, SaveLoadVersion::FixOrderBackup, SaveLoadVersion::MaxVersion),
SLE_SSTR(OrderBackup, name, SLE_STR),
SLE_CONDREF(OrderBackup, clone, REF_VEHICLE, SaveLoadVersion::FixOrderBackup, SaveLoadVersion::MaxVersion),
SLE_CONDREF(OrderBackup, clone, REF_VEHICLE, SaveLoadVersion::FixOrderBackup, SaveLoadVersion::MaxVersion),
SLE_VAR(OrderBackup, cur_real_order_index, SLE_UINT8),
SLE_CONDVAR(OrderBackup, cur_implicit_order_index, SLE_UINT8, SaveLoadVersion::BackupOrderState, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(OrderBackup, current_order_time, SLE_UINT32, SaveLoadVersion::BackupOrderState, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(OrderBackup, lateness_counter, SLE_INT32, SaveLoadVersion::BackupOrderState, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(OrderBackup, timetable_start, SLE_FILE_I32 | SLE_VAR_U64, SaveLoadVersion::BackupOrderState, SaveLoadVersion::TimetableStartTicksFix),
SLE_CONDVAR(OrderBackup, timetable_start, SLE_UINT64, SaveLoadVersion::TimetableStartTicksFix, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(OrderBackup, vehicle_flags, SLE_FILE_U8 | SLE_VAR_U16, SaveLoadVersion::BackupOrderState, SaveLoadVersion::ServiceIntervalPercent),
SLE_CONDVAR(OrderBackup, vehicle_flags, SLE_UINT16, SaveLoadVersion::ServiceIntervalPercent, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(OrderBackup, cur_implicit_order_index, SLE_UINT8, SaveLoadVersion::BackupOrderState, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(OrderBackup, current_order_time, SLE_UINT32, SaveLoadVersion::BackupOrderState, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(OrderBackup, lateness_counter, SLE_INT32, SaveLoadVersion::BackupOrderState, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(OrderBackup, timetable_start, SLE_FILE_I32 | SLE_VAR_U64, SaveLoadVersion::BackupOrderState, SaveLoadVersion::TimetableStartTicksFix),
SLE_CONDVAR(OrderBackup, timetable_start, SLE_UINT64, SaveLoadVersion::TimetableStartTicksFix, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(OrderBackup, vehicle_flags, SLE_FILE_U8 | SLE_VAR_U16, SaveLoadVersion::BackupOrderState, SaveLoadVersion::ServiceIntervalPercent),
SLE_CONDVAR(OrderBackup, vehicle_flags, SLE_UINT16, SaveLoadVersion::ServiceIntervalPercent, SaveLoadVersion::MaxVersion),
SLE_CONDVARNAME(OrderBackup, old_order_index, "orders", SLE_FILE_U16 | SLE_VAR_U32, SaveLoadVersion::MinVersion, SaveLoadVersion::MoreCargoPackets),
SLE_CONDVARNAME(OrderBackup, old_order_index, "orders", SLE_UINT32, SaveLoadVersion::MoreCargoPackets, SaveLoadVersion::OrdersOwnedByOrderlist),
SLE_CONDVARNAME(OrderBackup, old_order_index, "orders", SLE_UINT32, SaveLoadVersion::MoreCargoPackets, SaveLoadVersion::OrdersOwnedByOrderlist),
SLEG_CONDSTRUCTLIST("orders", SlOrders<OrderBackup>, SaveLoadVersion::OrdersOwnedByOrderlist, SaveLoadVersion::MaxVersion),
};
src/saveload/saveload.h
+316 -316
View File
@@ -28,283 +28,283 @@
* Note that this list must not be reordered.
*/
enum class SaveLoadVersion : uint16_t {
MinVersion, ///< First savegame version
MinVersion, ///< First savegame version
BigCurrency, ///< 1.0 0.1.x, 0.2.x Change currency from 32 to 64 bits
VehicleCurrencyStationChanges, /**< 2.0 0.3.0 Adding vehicle state, larger currency size for statistics, station size revamped.
* 2.1 0.3.1, 0.3.2 Unify way of storing town owner
* 2.2 lost New airports */
BiggerStationVariables, ///< 3.x lost Increase size of airport blocks/station build date
TownTolerancePauseMode, /**< 4.0 1 Town council tolerance and pause mode
* 4.1 122 0.3.3, 0.3.4 Store exclusive rights in towns
* 4.2 1222 0.3.5 Currencies are reordered
* 4.3 1417 Make water owned by OWNER_NONE
* 4.4 1426 Make vehicle references same as other references */
BigCurrency, ///< 1.0 0.1.x, 0.2.x Change currency from 32 to 64 bits
VehicleCurrencyStationChanges, /**< 2.0 0.3.0 Adding vehicle state, larger currency size for statistics, station size revamped.
* 2.1 0.3.1, 0.3.2 Unify way of storing town owner
* 2.2 lost New airports */
BiggerStationVariables, ///< 3.x lost Increase size of airport blocks/station build date
TownTolerancePauseMode, /**< 4.0 1 Town council tolerance and pause mode
* 4.1 122 0.3.3, 0.3.4 Store exclusive rights in towns
* 4.2 1222 0.3.5 Currencies are reordered
* 4.3 1417 Make water owned by OWNER_NONE
* 4.4 1426 Make vehicle references same as other references */
BigMap, /**< 5.0 1429 Making maps a different size than 256x256
* 5.1 1440 Flexible airport layouts
* 5.2 1525 0.3.6 Dynamic order array */
MultipleRoadStops, /**< 6.0 1721 Multi tile road stops, and some map size related fixes
* 6.1 1768 Town index in m2 */
LargerCargoSource, ///< 7.0 1770 With more stations, the size of the cargo source needed to be increased
LargerUnitNumber, ///< 8.0 1786 Increase size of (vehicle) unit numbers
LargerTownCargoStatistics, ///< 9.0 1909 Increase size of passenger/mail production of this and previous months
BigMap, /**< 5.0 1429 Making maps a different size than 256x256
* 5.1 1440 Flexible airport layouts
* 5.2 1525 0.3.6 Dynamic order array */
MultipleRoadStops, /**< 6.0 1721 Multi tile road stops, and some map size related fixes
* 6.1 1768 Town index in m2 */
LargerCargoSource, ///< 7.0 1770 With more stations, the size of the cargo source needed to be increased
LargerUnitNumber, ///< 8.0 1786 Increase size of (vehicle) unit numbers
LargerTownCargoStatistics, ///< 9.0 1909 Increase size of passenger/mail production of this and previous months
LargerTownCounter, ///< 10.0 2030 Increase size of the town counter
LargerTownIterator, /**< 11.0 2033 Increase size of the town iterator
* 11.1 2041 Fix vehicle counters */
LinkWaypointToTown, ///< 12.1 2046 Link waypoints to towns and remove some bit stuffing
LargerAIStateCounter, ///< 13.1 2080 0.4.0, 0.4.0.1 AI state counter increased due it storing tile indices
TransferOrder, ///< 14.0 2441 Transfer orders for feeder systems
LargerTownCounter, ///< 10.0 2030 Increase size of the town counter
LargerTownIterator, /**< 11.0 2033 Increase size of the town iterator
* 11.1 2041 Fix vehicle counters */
LinkWaypointToTown, ///< 12.1 2046 Link waypoints to towns and remove some bit stuffing
LargerAIStateCounter, ///< 13.1 2080 0.4.0, 0.4.0.1 AI state counter increased due it storing tile indices
TransferOrder, ///< 14.0 2441 Transfer orders for feeder systems
MoveSemaphoreBits, ///< 15.0 2499 Move rail signal bit for semaphores
EngineRenew, /**< 16.0 2817 Automatic replacing/renewing of vehicles
* 16.1 3155 Keep vehicle length during autoreplace */
StoreWaypointIdInMap, /**< 17.0 3212 Store the ID of waypoints in m2 of the map
* 17.1 3218 Make train subtype a bitmask */
RemoveMinorVersion, ///< 18 3227 Remove the minor versions from savegames
EngineRenewPool, ///< 19 3396 Engine renews are now stored in a pool
MoveSemaphoreBits, ///< 15.0 2499 Move rail signal bit for semaphores
EngineRenew, /**< 16.0 2817 Automatic replacing/renewing of vehicles
* 16.1 3155 Keep vehicle length during autoreplace */
StoreWaypointIdInMap, /**< 17.0 3212 Store the ID of waypoints in m2 of the map
* 17.1 3218 Make train subtype a bitmask */
RemoveMinorVersion, ///< 18 3227 Remove the minor versions from savegames
EngineRenewPool, ///< 19 3396 Engine renews are now stored in a pool
NoMultiheadReference, ///< 20 3403 Remove reference from one multihead to the other one
RemoveOldPbs, ///< 21 3472 0.4.x Remove old implementation of path based signals
SavePatches, ///< 22 3726 Save state of patches (precursor of settings) in the savegame
RemoveAutosaveInterval, ///< 23 3915 Store autosave interval locally, instead of in savegame
Elrail, ///< 24 4150 Electrified railways
NoMultiheadReference, ///< 20 3403 Remove reference from one multihead to the other one
RemoveOldPbs, ///< 21 3472 0.4.x Remove old implementation of path based signals
SavePatches, ///< 22 3726 Save state of patches (precursor of settings) in the savegame
RemoveAutosaveInterval, ///< 23 3915 Store autosave interval locally, instead of in savegame
Elrail, ///< 24 4150 Electrified railways
ImproveMultistop, ///< 25 4259 Improve the behaviour of RVs going to road stops
LastVehicleType, ///< 26 4466 Store the last vehicle type at stations instead of the vehicle ID
NewGRFStations, ///< 27 4757 NewGRF graphics for stations
Yapf, ///< 28 4987 Yet another path finder
MoreUnderBridges, ///< 29 5070 Support crossings, fields and bridge/tunnel heads under bridges
ImproveMultistop, ///< 25 4259 Improve the behaviour of RVs going to road stops
LastVehicleType, ///< 26 4466 Store the last vehicle type at stations instead of the vehicle ID
NewGRFStations, ///< 27 4757 NewGRF graphics for stations
Yapf, ///< 28 4987 Yet another path finder
MoreUnderBridges, ///< 29 5070 Support crossings, fields and bridge/tunnel heads under bridges
Tgp, ///< 30 5946 TerraGenesis Perlin
BigDates, ///< 31 5999 Change date from 1920 - 2090 to 0 - 5 000 000
LinkFarmFieldToIndustry, ///< 32 6001 Link farm fields to the industry, so it gets removed when the industry goes away
SaveYapfSettings, ///< 33 6440 Some YAPF settings were not saved properly
Liveries, ///< 34 6455 Liveries and two company colours (2cc)
Tgp, ///< 30 5946 TerraGenesis Perlin
BigDates, ///< 31 5999 Change date from 1920 - 2090 to 0 - 5 000 000
LinkFarmFieldToIndustry, ///< 32 6001 Link farm fields to the industry, so it gets removed when the industry goes away
SaveYapfSettings, ///< 33 6440 Some YAPF settings were not saved properly
Liveries, ///< 34 6455 Liveries and two company colours (2cc)
LiveryRefit, ///< 35 6602 NewGRF livery refits
RefitOrders, ///< 36 6624 Vehicles can be refitted as part of an order
Utf8, ///< 37 7182 UTF-8 strings
DisableElrailSetting, ///< 38 7195 Add setting to disable electrified rails
FreightWeight, ///< 39 7269 Setting to increase the weight of cargo on freight trains
LiveryRefit, ///< 35 6602 NewGRF livery refits
RefitOrders, ///< 36 6624 Vehicles can be refitted as part of an order
Utf8, ///< 37 7182 UTF-8 strings
DisableElrailSetting, ///< 38 7195 Add setting to disable electrified rails
FreightWeight, ///< 39 7269 Setting to increase the weight of cargo on freight trains
GradualLoading, ///< 40 7326 Gradual (un)loading of cargo
NewGRFSettings, ///< 41 7348 0.5.x Save what NewGRFs are used in the game and their settings
BridgeWormhole, ///< 42 7573 Bridges become wormholes, so more things can be built under them (e.g. signals)
UnifyAnimationState, ///< 43 7642 Put all animation state information in same map bits
CargoSourceTile, ///< 44 8144 Store the source tile of the cargo, so accurate payment can happen when the source station is removed
GradualLoading, ///< 40 7326 Gradual (un)loading of cargo
NewGRFSettings, ///< 41 7348 0.5.x Save what NewGRFs are used in the game and their settings
BridgeWormhole, ///< 42 7573 Bridges become wormholes, so more things can be built under them (e.g. signals)
UnifyAnimationState, ///< 43 7642 Put all animation state information in same map bits
CargoSourceTile, ///< 44 8144 Store the source tile of the cargo, so accurate payment can happen when the source station is removed
CountPaidForCargo, ///< 45 8501 Count the amount of cargo that was paid for
MoreAirportBlocks, ///< 46 8705 Increase number of blocks an airport can have
DriveThroughRoadStops, ///< 47 8735 Drive through road stops
RailTrackTypeUnification, ///< 48 8935 Put all the rail track type information in same map bits
SimplifyPlayerFace, ///< 49 8969 Simplify the storage of player face information
CountPaidForCargo, ///< 45 8501 Count the amount of cargo that was paid for
MoreAirportBlocks, ///< 46 8705 Increase number of blocks an airport can have
DriveThroughRoadStops, ///< 47 8735 Drive through road stops
RailTrackTypeUnification, ///< 48 8935 Put all the rail track type information in same map bits
SimplifyPlayerFace, ///< 49 8969 Simplify the storage of player face information
AircraftSpeedHolding, ///< 50 8973 Aircraft speed in km-ish/h and reduced speed in holding patterns
FeederShare, ///< 51 8978 Rewrite of transfers to retain knowledge about the already paid amount for transfered cargo
StatueOwner, ///< 52 9066 Store the owner of the statue, so the town can be informed of their removal
NewGRFHouses, ///< 53 9316 NewGRF controlled houses
TownGrowthControl, ///< 54 9613 Give the player control over the town growth
AircraftSpeedHolding, ///< 50 8973 Aircraft speed in km-ish/h and reduced speed in holding patterns
FeederShare, ///< 51 8978 Rewrite of transfers to retain knowledge about the already paid amount for transfered cargo
StatueOwner, ///< 52 9066 Store the owner of the statue, so the town can be informed of their removal
NewGRFHouses, ///< 53 9316 NewGRF controlled houses
TownGrowthControl, ///< 54 9613 Give the player control over the town growth
NewGRFCargo, ///< 55 9638 Increase number of cargos and NewGRF control of cargos
Cities, ///< 56 9667 Cities that start bigger and grow faster
FifoLoading, ///< 57 9691 First-in-first-out loading of vehicles
VeryLowTownIndustryNumber, ///< 58 9762 Difficulty settings for very low number of industries and towns
TownLayout, ///< 59 9779 More layout options for towns
NewGRFCargo, ///< 55 9638 Increase number of cargos and NewGRF control of cargos
Cities, ///< 56 9667 Cities that start bigger and grow faster
FifoLoading, ///< 57 9691 First-in-first-out loading of vehicles
VeryLowTownIndustryNumber, ///< 58 9762 Difficulty settings for very low number of industries and towns
TownLayout, ///< 59 9779 More layout options for towns
VehicleGroups, ///< 60 9874 Arbitrary grouping, by the player, of vehicles
MultipleRoadTypes, ///< 61 9892 Multiple road types for the same tile
AdjacentStations, ///< 62 9905 Allow building multiple stations directly next to eachother
TramLivery, ///< 63 9956 Add separate livery for trams
MultipleSignalTypes, ///< 64 10006 Multiple different signal types on the same (diagonal) tile, instead of the same for both directions
VehicleGroups, ///< 60 9874 Arbitrary grouping, by the player, of vehicles
MultipleRoadTypes, ///< 61 9892 Multiple road types for the same tile
AdjacentStations, ///< 62 9905 Allow building multiple stations directly next to eachother
TramLivery, ///< 63 9956 Add separate livery for trams
MultipleSignalTypes, ///< 64 10006 Multiple different signal types on the same (diagonal) tile, instead of the same for both directions
UnifyCurrency, ///< 65 10210 Make all variables related to currency 64 bits
NewGRFTownNames, ///< 66 10211 NewGRF provided town names
Timetables, ///< 67 10236 Introduce timetables for vehicles
CargoPackets, ///< 68 10266 Account for individual units of cargo, i.e. there can be cargo from multiple sources/ages in one vehicle
MoreCargoPackets, ///< 69 10319 Allow more than ~65k cargo packets
UnifyCurrency, ///< 65 10210 Make all variables related to currency 64 bits
NewGRFTownNames, ///< 66 10211 NewGRF provided town names
Timetables, ///< 67 10236 Introduce timetables for vehicles
CargoPackets, ///< 68 10266 Account for individual units of cargo, i.e. there can be cargo from multiple sources/ages in one vehicle
MoreCargoPackets, ///< 69 10319 Allow more than ~65k cargo packets
CargoPaymentOverflow, ///< 70 10541 Fix overflow of cargo payment rates, plus preparation for player founded industries
UngroupedVehicles, ///< 71 10567 Add a group with vehicles that aren't in any other group
SplitStationTypeFromGfxid, ///< 72 10601 Splits the encoding of station type from the graphics identifer
NewGRFIndustryLayout, ///< 73 10903 NewGRF provided layouts for industries
FixStationPickupAccounting, ///< 74 11030 Accounting of which cargos a station would pick up was done incorrectly
CargoPaymentOverflow, ///< 70 10541 Fix overflow of cargo payment rates, plus preparation for player founded industries
UngroupedVehicles, ///< 71 10567 Add a group with vehicles that aren't in any other group
SplitStationTypeFromGfxid, ///< 72 10601 Splits the encoding of station type from the graphics identifer
NewGRFIndustryLayout, ///< 73 10903 NewGRF provided layouts for industries
FixStationPickupAccounting, ///< 74 11030 Accounting of which cargos a station would pick up was done incorrectly
Autoslope, ///< 75 11107 Terraforming under buildings/track/anything that supports foundations
NewGRFPersistentStorage, ///< 76 11139 Persistently store some state of NewGRF objects/entities
CleanupUnconnectedRoads, ///< 77 11172 Option to remove unconnected roads during a town's road reconstruction
StoreIndustryCargo, ///< 78 11176 Store an industry's cargo, so it can be customised upon building
FairPlaySettings, ///< 79 11188 Add setting to disable exclusive rights in a town and giving money
Autoslope, ///< 75 11107 Terraforming under buildings/track/anything that supports foundations
NewGRFPersistentStorage, ///< 76 11139 Persistently store some state of NewGRF objects/entities
CleanupUnconnectedRoads, ///< 77 11172 Option to remove unconnected roads during a town's road reconstruction
StoreIndustryCargo, ///< 78 11176 Store an industry's cargo, so it can be customised upon building
FairPlaySettings, ///< 79 11188 Add setting to disable exclusive rights in a town and giving money
NewGRFMoreAnimation, ///< 80 11228 Support more types of animation for NewGRF industries
FixTreeGround, ///< 81 11244 Various fixes to improve the visuals of the ground under trees
NewGRFIndustryRandomTriggers, ///< 82 11410 NewGRF random triggers for industries
DepotWaterOwners, ///< 83 11589 Store the owner of the water under depots, so removing of the depot doesn't disown the original owner
ReplaceCustomNameArray, ///< 84 11822 Replace single fixed size array of custom names, by moving the name into the appropriate objects
NewGRFMoreAnimation, ///< 80 11228 Support more types of animation for NewGRF industries
FixTreeGround, ///< 81 11244 Various fixes to improve the visuals of the ground under trees
NewGRFIndustryRandomTriggers, ///< 82 11410 NewGRF random triggers for industries
DepotWaterOwners, ///< 83 11589 Store the owner of the water under depots, so removing of the depot doesn't disown the original owner
ReplaceCustomNameArray, ///< 84 11822 Replace single fixed size array of custom names, by moving the name into the appropriate objects
MaglevMonorailPaxWagonLivery, ///< 85 11874 Add livery for maglev/monorail passenger wagons
WaterClass, ///< 86 12042 Store the type of water (sea/ocean, canal, river) for buoys, docks, locks and depots
SimplifyPathfinderSettings, ///< 87 12129 Make it easier to select the pathfinder to use
FractionProfitRunningTicks, ///< 88 12134 Store vehicle profits as a (fixed point) fraction, and store the number of ticks a vehicle ran in a day
MoreWaypointsPerTown, ///< 89 12160 Support more than 64 waypoints per town
MaglevMonorailPaxWagonLivery, ///< 85 11874 Add livery for maglev/monorail passenger wagons
WaterClass, ///< 86 12042 Store the type of water (sea/ocean, canal, river) for buoys, docks, locks and depots
SimplifyPathfinderSettings, ///< 87 12129 Make it easier to select the pathfinder to use
FractionProfitRunningTicks, ///< 88 12134 Store vehicle profits as a (fixed point) fraction, and store the number of ticks a vehicle ran in a day
MoreWaypointsPerTown, ///< 89 12160 Support more than 64 waypoints per town
PlaneSpeedFactor, ///< 90 12293 Setting to increase aircraft speed to be on par with the other vehicles
MoreHouseAnimationFrames, ///< 91 12347 Increase number of animation frames for NewGRF houses
RemoveHouseCount, ///< 92 12381 0.6.x Remove number of houses in a town from the save
ImprovedOrders, ///< 93 12648 Orders support all full load/non stop types at the same time now
FixCompanyCargoTypes, ///< 94 12816 The company's cargo types should have increased in since with NewGRFCargo
PlaneSpeedFactor, ///< 90 12293 Setting to increase aircraft speed to be on par with the other vehicles
MoreHouseAnimationFrames, ///< 91 12347 Increase number of animation frames for NewGRF houses
RemoveHouseCount, ///< 92 12381 0.6.x Remove number of houses in a town from the save
ImprovedOrders, ///< 93 12648 Orders support all full load/non stop types at the same time now
FixCompanyCargoTypes, ///< 94 12816 The company's cargo types should have increased in since with NewGRFCargo
MoreEngineTypes, ///< 95 12924 Allow more than the original 255 engine types
AirportNoise, ///< 96 13226 Introduce noise for airports, to allow more than two airports per town
MergeOptsPats, ///< 97 13256 Merge the OPTS and PATS chunks, i.e. all settings in one chunk
Gamelog, ///< 98 13375 Logging of important actions/situations in the save
IndustryTileWaterClass, ///< 99 13838 Add water classes to industry tiles
MoreEngineTypes, ///< 95 12924 Allow more than the original 255 engine types
AirportNoise, ///< 96 13226 Introduce noise for airports, to allow more than two airports per town
MergeOptsPats, ///< 97 13256 Merge the OPTS and PATS chunks, i.e. all settings in one chunk
Gamelog, ///< 98 13375 Logging of important actions/situations in the save
IndustryTileWaterClass, ///< 99 13838 Add water classes to industry tiles
Yapp, ///< 100 13952 New version of path based signals
NewGRFPalette, ///< 101 14233 Store palette used by each of the NewGRFs
SpreadIndustryProductionChanges, ///< 102 14332 Spread the industry production changes over the month, instead of doing all on the same day
NewGRFSuppliedStationName, ///< 103 14598 NewGRF industry supplying default names for nearby stations
MoreCompanies, ///< 104 14735 Increase maximum number of companies to 15
Yapp, ///< 100 13952 New version of path based signals
NewGRFPalette, ///< 101 14233 Store palette used by each of the NewGRFs
SpreadIndustryProductionChanges, ///< 102 14332 Spread the industry production changes over the month, instead of doing all on the same day
NewGRFSuppliedStationName, ///< 103 14598 NewGRF industry supplying default names for nearby stations
MoreCompanies, ///< 104 14735 Increase maximum number of companies to 15
OrderList, ///< 105 14803 Create separate order list objects for maintaining orders
DistantStationJoining, ///< 106 14919 Distant joining of stations
NoAI, ///< 107 15027 Replace built in cheating AI with framework for externally developed (scripted) AIs
StoreAIVersion, ///< 108 15045 Store the version of the AI script
NextCompetitorStartOverflow, ///< 109 15075 Prevent overflow in the next competitor start counter
OrderList, ///< 105 14803 Create separate order list objects for maintaining orders
DistantStationJoining, ///< 106 14919 Distant joining of stations
NoAI, ///< 107 15027 Replace built in cheating AI with framework for externally developed (scripted) AIs
StoreAIVersion, ///< 108 15045 Store the version of the AI script
NextCompetitorStartOverflow, ///< 109 15075 Prevent overflow in the next competitor start counter
RemoveOldAISettings, ///< 110 15148 Remove remnants of the old AI's configuration
FreeformEdges, ///< 111 15190 Allow terraforming along the edge of the map
SplitHQ, ///< 112 15290 Split the behaviour of headquarters from the other unmovable objects
RoadLayoutPerTown, ///< 113 15340 Allow for different road layouts for each of the towns
SeparateRoadOwners, ///< 114 15601 Separate owners for road bits, tram bits and the road stop
RemoveOldAISettings, ///< 110 15148 Remove remnants of the old AI's configuration
FreeformEdges, ///< 111 15190 Allow terraforming along the edge of the map
SplitHQ, ///< 112 15290 Split the behaviour of headquarters from the other unmovable objects
RoadLayoutPerTown, ///< 113 15340 Allow for different road layouts for each of the towns
SeparateRoadOwners, ///< 114 15601 Separate owners for road bits, tram bits and the road stop
CustomTownNumber, ///< 115 15695 Configuration for specific number of towns to build
GamelogEmergency, ///< 116 15893 0.7.x Gamelog event for emergency/crash saves
PlatformStopLocation, ///< 117 16037 Set the platform stop location via train orders
DigitGroupSeparator, ///< 118 16129 Configurable digit group separator
PauseModes, ///< 119 16242 Use bitmask of reason to pause, so manual/auto pausing do not conflict
CustomTownNumber, ///< 115 15695 Configuration for specific number of towns to build
GamelogEmergency, ///< 116 15893 0.7.x Gamelog event for emergency/crash saves
PlatformStopLocation, ///< 117 16037 Set the platform stop location via train orders
DigitGroupSeparator, ///< 118 16129 Configurable digit group separator
PauseModes, ///< 119 16242 Use bitmask of reason to pause, so manual/auto pausing do not conflict
CompanyServiceIntervals, ///< 120 16439 Make service intervals configurable per company
CargoPayments, ///< 121 16694 Perform payment of cargo after unloading
WaypointMoreLikeStation, ///< 122 16855 Make waypoint data look more like stations
UnifyWaypointAndStation, ///< 123 16909 Unify stations and waypoints
MultiTileWaypoints, ///< 124 16993 Waypoints can be bigger than a single tile
CompanyServiceIntervals, ///< 120 16439 Make service intervals configurable per company
CargoPayments, ///< 121 16694 Perform payment of cargo after unloading
WaypointMoreLikeStation, ///< 122 16855 Make waypoint data look more like stations
UnifyWaypointAndStation, ///< 123 16909 Unify stations and waypoints
MultiTileWaypoints, ///< 124 16993 Waypoints can be bigger than a single tile
RemoveSubsidyStationBinding, ///< 125 17113 Awarded subsidies are not bound to stations, but to their actual source/destination
CumulatedInflation, ///< 126 17433 Store cumulated inflation, and recalculate prices/payments upon load
TownAcceptance, ///< 127 17439 Store mask of cargos accepted by town houses and head quarters
FoundTown, ///< 128 18281 Founding of new towns
TimetableStart, ///< 129 18292 Allow setting the start date of a timetable
RemoveSubsidyStationBinding, ///< 125 17113 Awarded subsidies are not bound to stations, but to their actual source/destination
CumulatedInflation, ///< 126 17433 Store cumulated inflation, and recalculate prices/payments upon load
TownAcceptance, ///< 127 17439 Store mask of cargos accepted by town houses and head quarters
FoundTown, ///< 128 18281 Founding of new towns
TimetableStart, ///< 129 18292 Allow setting the start date of a timetable
RoadStopOccupancyPenalty, ///< 130 18404 Add configurable pathfinder penalty for an occupied road stop
MaximumDepotPenalty, ///< 131 18481 Add configurable maximum pathfinder penalty for finding a depot
DisallowTreeBuilding, ///< 132 18522 Setting to partially disable building of trees
TrainSlopeSteepness, ///< 133 18674 Setting to increase steepness of slopes for trains under realistic acceleration
VirtualFeederSharePayment, ///< 134 18703 Pay a part of the virtual profit during a transfer to the intermediate vehicle
RoadStopOccupancyPenalty, ///< 130 18404 Add configurable pathfinder penalty for an occupied road stop
MaximumDepotPenalty, ///< 131 18481 Add configurable maximum pathfinder penalty for finding a depot
DisallowTreeBuilding, ///< 132 18522 Setting to partially disable building of trees
TrainSlopeSteepness, ///< 133 18674 Setting to increase steepness of slopes for trains under realistic acceleration
VirtualFeederSharePayment, ///< 134 18703 Pay a part of the virtual profit during a transfer to the intermediate vehicle
RocksStayUnderSnow, ///< 135 18719 Rocks stay under snow, i.e. they return when the snow goes away
SplitLoadWaitCounters, ///< 136 18764 Split counters for (un)loading and signal waiting/turning as otherwise they interfere
AirportAnimationFrames, ///< 137 18912 Use animation frames instead of many airport tile ids for animation
ReducePlaneCrashes, ///< 138 18942 1.0.x Setting to reduce/disable crashing of planes
RvRealisticAcceleration, ///< 139 19346 Realistic acceleration of road vehicles
RocksStayUnderSnow, ///< 135 18719 Rocks stay under snow, i.e. they return when the snow goes away
SplitLoadWaitCounters, ///< 136 18764 Split counters for (un)loading and signal waiting/turning as otherwise they interfere
AirportAnimationFrames, ///< 137 18912 Use animation frames instead of many airport tile ids for animation
ReducePlaneCrashes, ///< 138 18942 1.0.x Setting to reduce/disable crashing of planes
RvRealisticAcceleration, ///< 139 19346 Realistic acceleration of road vehicles
StoreAirportSize, ///< 140 19382 Store the size of the airport in the station
UniqueDepotNames, ///< 141 19799 Give depots unique names
NewGRFDepotBuildDate, ///< 142 20003 Depot build date for NewGRFs
DisableTownLevelCrossing, ///< 143 20048 Setting to be able to disable building rail/road crossings by towns
ReorderUnmovableRemoveReserved, ///< 144 20334 Reorder map bits of unmovable tiles and remove unused reserved zero bytes
StoreAirportSize, ///< 140 19382 Store the size of the airport in the station
UniqueDepotNames, ///< 141 19799 Give depots unique names
NewGRFDepotBuildDate, ///< 142 20003 Depot build date for NewGRFs
DisableTownLevelCrossing, ///< 143 20048 Setting to be able to disable building rail/road crossings by towns
ReorderUnmovableRemoveReserved, ///< 144 20334 Reorder map bits of unmovable tiles and remove unused reserved zero bytes
NewGRFAirportSmoke, ///< 145 20376 NewGRF support for airport and configurable amount of smoke for vehicles
UnifyWaterClass, ///< 146 20446 Unify location for storing water class in the map
UnifyAnimationFrame, ///< 147 20621 Unify location of animation frame
IndustryPlatform, ///< 148 20659 Setting to make a flat area around (new) industries
CustomSeaLevel, ///< 149 20832 Setting to influence the sea level (amount of water)
NewGRFAirportSmoke, ///< 145 20376 NewGRF support for airport and configurable amount of smoke for vehicles
UnifyWaterClass, ///< 146 20446 Unify location for storing water class in the map
UnifyAnimationFrame, ///< 147 20621 Unify location of animation frame
IndustryPlatform, ///< 148 20659 Setting to make a flat area around (new) industries
CustomSeaLevel, ///< 149 20832 Setting to influence the sea level (amount of water)
FractionalCargoDelivery, ///< 150 20857 When spreading cargo over stations, spread fractional amounts for fairness
StoreNewGRFVersion, ///< 151 20918 Store the version of the used NewGRFs
IndustryManagement, ///< 152 21171 Manage the amount of industries that ought to be spawned per type
LeaveRoadStopSeparately, ///< 153 21263 Fix issue where multiple vehicles could leave a road stop at the same time
PauseLevel, ///< 154 21426 Setting to determine what commands are allowed when paused
FractionalCargoDelivery, ///< 150 20857 When spreading cargo over stations, spread fractional amounts for fairness
StoreNewGRFVersion, ///< 151 20918 Store the version of the used NewGRFs
IndustryManagement, ///< 152 21171 Manage the amount of industries that ought to be spawned per type
LeaveRoadStopSeparately, ///< 153 21263 Fix issue where multiple vehicles could leave a road stop at the same time
PauseLevel, ///< 154 21426 Setting to determine what commands are allowed when paused
NewGRFObjectView, ///< 155 21453 Support for views in NewGRF objects
TerraformLimits, ///< 156 21728 Introduce limits for terraforming and clearing times
UnifyGroundVehicles, ///< 157 21862 Unify the way ground vehicles are handled (articulated parts, etc)
TrackRealAndAutoOrders, ///< 158 21933 Track which real and auto order is the current order
MaxLengthAndReverseSignals, ///< 159 21962 Settings for reversing at signals, and maximum train, bridge and tunnel length
NewGRFObjectView, ///< 155 21453 Support for views in NewGRF objects
TerraformLimits, ///< 156 21728 Introduce limits for terraforming and clearing times
UnifyGroundVehicles, ///< 157 21862 Unify the way ground vehicles are handled (articulated parts, etc)
TrackRealAndAutoOrders, ///< 158 21933 Track which real and auto order is the current order
MaxLengthAndReverseSignals, ///< 159 21962 Settings for reversing at signals, and maximum train, bridge and tunnel length
DisallowRoadReconstruction, ///< 160 21974 1.1.x Setting to disallow road reconstruction
PersistentStoragePool, ///< 161 22567 Store persistent storage in a pool
NewGRFCustomCargoAging, ///< 162 22713 NewGRF influence on aging of cargo in vehicles
Rivers, ///< 163 22767 Rivers
VehicleCentreAndZPos, ///< 164 23290 Vehicle centres are not fixed at 4/8 of the vehicle; change type of z-positions to prepare for higher maps
DisallowRoadReconstruction, ///< 160 21974 1.1.x Setting to disallow road reconstruction
PersistentStoragePool, ///< 161 22567 Store persistent storage in a pool
NewGRFCustomCargoAging, ///< 162 22713 NewGRF influence on aging of cargo in vehicles
Rivers, ///< 163 22767 Rivers
VehicleCentreAndZPos, ///< 164 23290 Vehicle centres are not fixed at 4/8 of the vehicle; change type of z-positions to prepare for higher maps
ScriptTownGrowth, ///< 165 23304 Storage of cargo statistics for use by game scripts
InfrastructureMaintenanceCosts, ///< 166 23415 Infrastructure can now cost some periodic fee
NewGRFAircraftRange, ///< 167 23504 NewGRF provided maximum aircraft range
ScriptTownText, ///< 168 23637 Game scripts can put a text in the town window
MoveSccEncoded, ///< 169 23816 Move SCC_ENCODED to the first StringControlCode
ScriptTownGrowth, ///< 165 23304 Storage of cargo statistics for use by game scripts
InfrastructureMaintenanceCosts, ///< 166 23415 Infrastructure can now cost some periodic fee
NewGRFAircraftRange, ///< 167 23504 NewGRF provided maximum aircraft range
ScriptTownText, ///< 168 23637 Game scripts can put a text in the town window
MoveSccEncoded, ///< 169 23816 Move SCC_ENCODED to the first StringControlCode
CountIndividualCargoes, ///< 170 23826 Store the count of individual cargo delivery for a period
ScenarioDeitySigns, ///< 171 23835 Signs made in scenarios become of OWNER_DEITY, so they are always shown
OrderMaxSpeed, ///< 172 23947 Set maximum speed for orders
FixRoadOwnership, ///< 173 23967 1.2.0-RC1 Seemingly unneeded bump supposed to fix something with road ownership
CurrentOrderMaxSpeed, ///< 174 23973 1.2.x Save maximum speed of current order
CountIndividualCargoes, ///< 170 23826 Store the count of individual cargo delivery for a period
ScenarioDeitySigns, ///< 171 23835 Signs made in scenarios become of OWNER_DEITY, so they are always shown
OrderMaxSpeed, ///< 172 23947 Set maximum speed for orders
FixRoadOwnership, ///< 173 23967 1.2.0-RC1 Seemingly unneeded bump supposed to fix something with road ownership
CurrentOrderMaxSpeed, ///< 174 23973 1.2.x Save maximum speed of current order
AutoreplaceWhenOldTreeLimit, ///< 175 24136 Autoreplace vehicle only when they are old, and putting limit on amount of trees to build (at once)
BackupOrderState, ///< 176 24446 Put more of the state of a vehicle's orders (like lateness, start point) in the order backup
MonthlyBankruptcyCheck, ///< 177 24619 Check for bankruptcy on a monthly cycle
ScriptSettingsProfile, ///< 178 24789 Setting for the difficulty profile of AIs
RobustEnginePreview, ///< 179 24810 Make engine preview offers robust when company ranking changes
AutoreplaceWhenOldTreeLimit, ///< 175 24136 Autoreplace vehicle only when they are old, and putting limit on amount of trees to build (at once)
BackupOrderState, ///< 176 24446 Put more of the state of a vehicle's orders (like lateness, start point) in the order backup
MonthlyBankruptcyCheck, ///< 177 24619 Check for bankruptcy on a monthly cycle
ScriptSettingsProfile, ///< 178 24789 Setting for the difficulty profile of AIs
RobustEnginePreview, ///< 179 24810 Make engine preview offers robust when company ranking changes
ServiceIntervalPercent, ///< 180 24998 1.3.x Service interval in percent or days stored per vehicle
CargoReservation, ///< 181 25012 Persist the reservation of cargo for vehicles instead of recalculating it each time
GoalProgressPlaneAcceleration, ///< 182 25115 FS#5492, r25259, r25296 Goal status and plane acceleration fixes
Cargodist, ///< 183 25363 Cargodist
SeparateLocaleUnits, ///< 184 25508 Unit localisation split
ServiceIntervalPercent, ///< 180 24998 1.3.x Service interval in percent or days stored per vehicle
CargoReservation, ///< 181 25012 Persist the reservation of cargo for vehicles instead of recalculating it each time
GoalProgressPlaneAcceleration, ///< 182 25115 FS#5492, r25259, r25296 Goal status and plane acceleration fixes
Cargodist, ///< 183 25363 Cargodist
SeparateLocaleUnits, ///< 184 25508 Unit localisation split
Storybooks, ///< 185 25620 Storybooks
ObjectTypeToPool, ///< 186 25833 Move object type from map to pool object
LinkgraphRestrictedFlow, ///< 187 25899 Linkgraph - restricted flows
UnifyRvTravelTime, ///< 188 26169 v1.4 FS#5831 Unify RV travel time
GroupHierarchy, ///< 189 26450 Hierarchical vehicle subgroups
Storybooks, ///< 185 25620 Storybooks
ObjectTypeToPool, ///< 186 25833 Move object type from map to pool object
LinkgraphRestrictedFlow, ///< 187 25899 Linkgraph - restricted flows
UnifyRvTravelTime, ///< 188 26169 v1.4 FS#5831 Unify RV travel time
GroupHierarchy, ///< 189 26450 Hierarchical vehicle subgroups
SeparateOrderTravelWaitTime, ///< 190 26547 Separate order travel and wait times
LinkgraphLocationDisasterStore, ///< 191 26636 FS#6026 Fix disaster vehicle storage (No bump)
///< 191 26646 FS#6041 Linkgraph - store locations
FixOrderBackup, ///< 192 26700 FS#6066 Fix saving of order backups
HideEnginesForCompany, ///< 193 26802 Hiding of engines for a company
MaxBridgeMapHeight, ///< 194 26881 v1.5 Setting for maximum bridge and map height
SeparateOrderTravelWaitTime, ///< 190 26547 Separate order travel and wait times
LinkgraphLocationDisasterStore, ///< 191 26636 FS#6026 Fix disaster vehicle storage (No bump)
///< 191 26646 FS#6041 Linkgraph - store locations
FixOrderBackup, ///< 192 26700 FS#6066 Fix saving of order backups
HideEnginesForCompany, ///< 193 26802 Hiding of engines for a company
MaxBridgeMapHeight, ///< 194 26881 v1.5 Setting for maximum bridge and map height
Distinguish16, ///< 195 27572 v1.6.1 Convenience bump to distinguish 1.6 from 1.5 saves
Distinguish17, ///< 196 27778 v1.7 Convenience bump to distinguish 1.7 from 1.6 saves
StoreMapVariety, ///< 197 27978 v1.8 Store map variety
TownGrowthInGameTicks, ///< 198 PR#6763 Switch town growth rate and counter to actual game ticks
ExtendCargotypes, ///< 199 PR#6802 Extend cargotypes to 64
Distinguish16, ///< 195 27572 v1.6.1 Convenience bump to distinguish 1.6 from 1.5 saves
Distinguish17, ///< 196 27778 v1.7 Convenience bump to distinguish 1.7 from 1.6 saves
StoreMapVariety, ///< 197 27978 v1.8 Store map variety
TownGrowthInGameTicks, ///< 198 PR#6763 Switch town growth rate and counter to actual game ticks
ExtendCargotypes, ///< 199 PR#6802 Extend cargotypes to 64
ExtendRailtypes, ///< 200 PR#6805 Extend railtypes to 64, adding uint16_t to map array.
ExtendPersistentStorage, ///< 201 PR#6885 Extend NewGRF persistent storages.
ExtendIndustryCargoSlots, ///< 202 PR#6867 Increase industry cargo slots to 16 in, 16 out
ShipPathCache, ///< 203 PR#7072 Add path cache for ships
ShipRotation, ///< 204 PR#7065 Add extra rotation stages for ships.
ExtendRailtypes, ///< 200 PR#6805 Extend railtypes to 64, adding uint16_t to map array.
ExtendPersistentStorage, ///< 201 PR#6885 Extend NewGRF persistent storages.
ExtendIndustryCargoSlots, ///< 202 PR#6867 Increase industry cargo slots to 16 in, 16 out
ShipPathCache, ///< 203 PR#7072 Add path cache for ships
ShipRotation, ///< 204 PR#7065 Add extra rotation stages for ships.
GroupLiveries, ///< 205 PR#7108 Livery storage change and group liveries.
ShipsStopInLocks, ///< 206 PR#7150 Ship/lock movement changes.
FixCargoMonitor, ///< 207 PR#7175 v1.9 Cargo monitor data packing fix to support 64 cargotypes.
TownCargogen, ///< 208 PR#6965 New algorithms for town building cargo generation.
ShipCurvePenalty, ///< 209 PR#7289 Configurable ship curve penalties.
GroupLiveries, ///< 205 PR#7108 Livery storage change and group liveries.
ShipsStopInLocks, ///< 206 PR#7150 Ship/lock movement changes.
FixCargoMonitor, ///< 207 PR#7175 v1.9 Cargo monitor data packing fix to support 64 cargotypes.
TownCargogen, ///< 208 PR#6965 New algorithms for town building cargo generation.
ShipCurvePenalty, ///< 209 PR#7289 Configurable ship curve penalties.
ServeNeutralIndustries, ///< 210 PR#7234 Company stations can serve industries with attached neutral stations.
RoadvehPathCache, ///< 211 PR#7261 Add path cache for road vehicles.
RemoveOldPathfinder, ///< 212 PR#7245 Remove OPF.
TreesWaterClass, ///< 213 PR#7405 WaterClass update for tree tiles.
RoadTypes, ///< 214 PR#6811 NewGRF road types.
ServeNeutralIndustries, ///< 210 PR#7234 Company stations can serve industries with attached neutral stations.
RoadvehPathCache, ///< 211 PR#7261 Add path cache for road vehicles.
RemoveOldPathfinder, ///< 212 PR#7245 Remove OPF.
TreesWaterClass, ///< 213 PR#7405 WaterClass update for tree tiles.
RoadTypes, ///< 214 PR#6811 NewGRF road types.
ScriptMemlimit, ///< 215 PR#7516 Limit on AI/GS memory consumption.
MultitileDocks, ///< 216 PR#7380 Multiple docks per station.
TradingAge, ///< 217 PR#7780 Configurable company trading age.
EndingYear, ///< 218 PR#7747 v1.10 Configurable ending year.
RemoveTownCargoCache, ///< 219 PR#8258 Remove town cargo acceptance and production caches.
ScriptMemlimit, ///< 215 PR#7516 Limit on AI/GS memory consumption.
MultitileDocks, ///< 216 PR#7380 Multiple docks per station.
TradingAge, ///< 217 PR#7780 Configurable company trading age.
EndingYear, ///< 218 PR#7747 v1.10 Configurable ending year.
RemoveTownCargoCache, ///< 219 PR#8258 Remove town cargo acceptance and production caches.
/* Patchpacks for a while considered it a good idea to jump a few versions
* above our version for their savegames. But as time continued, this gap
@@ -319,106 +319,106 @@ enum class SaveLoadVersion : uint16_t {
* the version is masked with 0x8000, and the true version is stored in
* its own chunk with feature toggles.
*/
StartPatchpacks, ///< 220 First known patchpack to use a version just above ours.
EndPatchpacks = 286, ///< 286 Last known patchpack to use a version just above ours.
StartPatchpacks, ///< 220 First known patchpack to use a version just above ours.
EndPatchpacks = 286, ///< 286 Last known patchpack to use a version just above ours.
GSIndustryControl, ///< 287 PR#7912 and PR#8115 GS industry control.
VehMotionCounter, ///< 288 PR#8591 Desync safe motion counter
IndustryText, ///< 289 PR#8576 v1.11.0-RC1 Additional GS text for industries.
GSIndustryControl, ///< 287 PR#7912 and PR#8115 GS industry control.
VehMotionCounter, ///< 288 PR#8591 Desync safe motion counter
IndustryText, ///< 289 PR#8576 v1.11.0-RC1 Additional GS text for industries.
MapgenSettingsRevamp, ///< 290 PR#8891 v1.11 Revamp of some mapgen settings (snow coverage, desert coverage, heightmap height, custom terrain type).
GroupReplaceWagonRemoval, ///< 291 PR#7441 Per-group wagon removal flag.
CustomSubsidyDuration, ///< 292 PR#9081 Configurable subsidy duration.
SaveloadListLength, ///< 293 PR#9374 Consistency in list length with SL_STRUCT / SL_STRUCTLIST / SL_DEQUE / SL_REFLIST.
RiffToArray, ///< 294 PR#9375 Changed many CH_RIFF chunks to CH_ARRAY chunks.
MapgenSettingsRevamp, ///< 290 PR#8891 v1.11 Revamp of some mapgen settings (snow coverage, desert coverage, heightmap height, custom terrain type).
GroupReplaceWagonRemoval, ///< 291 PR#7441 Per-group wagon removal flag.
CustomSubsidyDuration, ///< 292 PR#9081 Configurable subsidy duration.
SaveloadListLength, ///< 293 PR#9374 Consistency in list length with SL_STRUCT / SL_STRUCTLIST / SL_DEQUE / SL_REFLIST.
RiffToArray, ///< 294 PR#9375 Changed many CH_RIFF chunks to CH_ARRAY chunks.
TableChunks, ///< 295 PR#9322 Introduction of CH_TABLE and CH_SPARSE_TABLE.
ScriptInt64, ///< 296 PR#9415 SQInteger is 64bit but was saved as 32bit.
LinkgraphTravelTime, ///< 297 PR#9457 v12.0-RC1 Store travel time in the linkgraph.
DockDockingtiles, ///< 298 PR#9578 All tiles around docks may be docking tiles.
RepairObjectDockingTiles, ///< 299 PR#9594 v12.0 Fixing issue with docking tiles overlapping objects.
TableChunks, ///< 295 PR#9322 Introduction of CH_TABLE and CH_SPARSE_TABLE.
ScriptInt64, ///< 296 PR#9415 SQInteger is 64bit but was saved as 32bit.
LinkgraphTravelTime, ///< 297 PR#9457 v12.0-RC1 Store travel time in the linkgraph.
DockDockingtiles, ///< 298 PR#9578 All tiles around docks may be docking tiles.
RepairObjectDockingTiles, ///< 299 PR#9594 v12.0 Fixing issue with docking tiles overlapping objects.
U64TickCounter, ///< 300 PR#10035 Make tick counter 64bit to avoid wrapping.
LastLoadingTick, ///< 301 PR#9693 Store tick of last loading for vehicles.
MultitrackLevelCrossings, ///< 302 PR#9931 v13.0 Multi-track level crossings.
NewGRFRoadStops, ///< 303 PR#10144 NewGRF road stops.
LinkgraphEdges, ///< 304 PR#10314 Explicitly store link graph edges destination, PR#10471 int64_t instead of uint64_t league rating
U64TickCounter, ///< 300 PR#10035 Make tick counter 64bit to avoid wrapping.
LastLoadingTick, ///< 301 PR#9693 Store tick of last loading for vehicles.
MultitrackLevelCrossings, ///< 302 PR#9931 v13.0 Multi-track level crossings.
NewGRFRoadStops, ///< 303 PR#10144 NewGRF road stops.
LinkgraphEdges, ///< 304 PR#10314 Explicitly store link graph edges destination, PR#10471 int64_t instead of uint64_t league rating
VelocityNautical, ///< 305 PR#10594 Separation of land and nautical velocity (knots!)
ConsistentPartialZ, ///< 306 PR#10570 Conversion from an inconsistent partial Z calculation for slopes, to one that is (more) consistent.
MoreCargoAge, ///< 307 PR#10596 Track cargo age for a longer period.
LinkgraphSeconds, ///< 308 PR#10610 Store linkgraph update intervals in seconds instead of days.
AIStartDate, ///< 309 PR#10653 Removal of individual AI start dates and added a generic one.
VelocityNautical, ///< 305 PR#10594 Separation of land and nautical velocity (knots!)
ConsistentPartialZ, ///< 306 PR#10570 Conversion from an inconsistent partial Z calculation for slopes, to one that is (more) consistent.
MoreCargoAge, ///< 307 PR#10596 Track cargo age for a longer period.
LinkgraphSeconds, ///< 308 PR#10610 Store linkgraph update intervals in seconds instead of days.
AIStartDate, ///< 309 PR#10653 Removal of individual AI start dates and added a generic one.
ExtendVehicleRandom, ///< 310 PR#10701 Extend vehicle random bits.
ExtendEntityMapping, ///< 311 PR#10672 Extend entity mapping range.
DisasterVehState, ///< 312 PR#10798 Explicit storage of disaster vehicle state.
SavegameId, ///< 313 PR#10719 Add an unique ID to every savegame (used to deduplicate surveys).
StringGamelog, ///< 314 PR#10801 Use std::string in gamelog.
ExtendVehicleRandom, ///< 310 PR#10701 Extend vehicle random bits.
ExtendEntityMapping, ///< 311 PR#10672 Extend entity mapping range.
DisasterVehState, ///< 312 PR#10798 Explicit storage of disaster vehicle state.
SavegameId, ///< 313 PR#10719 Add an unique ID to every savegame (used to deduplicate surveys).
StringGamelog, ///< 314 PR#10801 Use std::string in gamelog.
IndustryCargoReorganise, ///< 315 PR#10853 Industry accepts/produced data reorganised.
PeriodsInTransitRename, ///< 316 PR#11112 Rename days in transit to (cargo) periods in transit.
NewGRFLastService, ///< 317 PR#11124 Added stable date_of_last_service to avoid NewGRF trouble.
RemoveLoadedAtXY, ///< 318 PR#11276 Remove loaded_at_xy variable from CargoPacket.
CargoTravelled, ///< 319 PR#11283 CargoPacket now tracks how far it travelled inside a vehicle.
IndustryCargoReorganise, ///< 315 PR#10853 Industry accepts/produced data reorganised.
PeriodsInTransitRename, ///< 316 PR#11112 Rename days in transit to (cargo) periods in transit.
NewGRFLastService, ///< 317 PR#11124 Added stable date_of_last_service to avoid NewGRF trouble.
RemoveLoadedAtXY, ///< 318 PR#11276 Remove loaded_at_xy variable from CargoPacket.
CargoTravelled, ///< 319 PR#11283 CargoPacket now tracks how far it travelled inside a vehicle.
StationRatingCheat, ///< 320 PR#11346 Add cheat to fix station ratings at 100%.
TimetableStartTicks, ///< 321 PR#11468 Convert timetable start from a date to ticks.
TimetableStartTicksFix, ///< 322 PR#11557 Fix for missing convert timetable start from a date to ticks.
TimetableTicksType, ///< 323 PR#11435 Convert timetable current order time to ticks.
WaterRegions, ///< 324 PR#10543 Water Regions for ship pathfinder.
StationRatingCheat, ///< 320 PR#11346 Add cheat to fix station ratings at 100%.
TimetableStartTicks, ///< 321 PR#11468 Convert timetable start from a date to ticks.
TimetableStartTicksFix, ///< 322 PR#11557 Fix for missing convert timetable start from a date to ticks.
TimetableTicksType, ///< 323 PR#11435 Convert timetable current order time to ticks.
WaterRegions, ///< 324 PR#10543 Water Regions for ship pathfinder.
WaterRegionEvalSimplified, ///< 325 PR#11750 Simplified Water Region evaluation.
EconomyDate, ///< 326 PR#10700 Split calendar and economy timers and dates.
EconomyModeTimekeepingUnits, ///< 327 PR#11341 Mode to display economy measurements in wallclock units.
CalendarSubDateFract, ///< 328 PR#11428 Add sub_date_fract to measure calendar days.
ShipAcceleration, ///< 329 PR#10734 Start using Vehicle's acceleration field for ships too.
WaterRegionEvalSimplified, ///< 325 PR#11750 Simplified Water Region evaluation.
EconomyDate, ///< 326 PR#10700 Split calendar and economy timers and dates.
EconomyModeTimekeepingUnits, ///< 327 PR#11341 Mode to display economy measurements in wallclock units.
CalendarSubDateFract, ///< 328 PR#11428 Add sub_date_fract to measure calendar days.
ShipAcceleration, ///< 329 PR#10734 Start using Vehicle's acceleration field for ships too.
MaxLoanForCompany, ///< 330 PR#11224 Separate max loan for each company.
DepotUnbunching, ///< 331 PR#11945 Allow unbunching shared order vehicles at a depot.
AILocalConfig, ///< 332 PR#12003 Config of running AI is stored inside Company.
ScriptRandomizer, ///< 333 PR#12063 v14.0-RC1 Save script randomizers.
VehicleEconomyAge, ///< 334 PR#12141 v14.0 Add vehicle age in economy year, for profit stats minimum age
MaxLoanForCompany, ///< 330 PR#11224 Separate max loan for each company.
DepotUnbunching, ///< 331 PR#11945 Allow unbunching shared order vehicles at a depot.
AILocalConfig, ///< 332 PR#12003 Config of running AI is stored inside Company.
ScriptRandomizer, ///< 333 PR#12063 v14.0-RC1 Save script randomizers.
VehicleEconomyAge, ///< 334 PR#12141 v14.0 Add vehicle age in economy year, for profit stats minimum age
CompanyAllowList, ///< 335 PR#12337 Saving of list of client keys that are allowed to join this company.
GroupNumbers, ///< 336 PR#12297 Add per-company group numbers.
IncreaseStationTypeFieldSize, ///< 337 PR#12572 Increase size of StationType field in map array
RoadWaypoints, ///< 338 PR#12572 Road waypoints
CompanyInauguratedPeriod, ///< 339 PR#12798 Companies show the period inaugurated in wallclock mode.
CompanyAllowList, ///< 335 PR#12337 Saving of list of client keys that are allowed to join this company.
GroupNumbers, ///< 336 PR#12297 Add per-company group numbers.
IncreaseStationTypeFieldSize, ///< 337 PR#12572 Increase size of StationType field in map array
RoadWaypoints, ///< 338 PR#12572 Road waypoints
CompanyInauguratedPeriod, ///< 339 PR#12798 Companies show the period inaugurated in wallclock mode.
RoadStopTileData, ///< 340 PR#12883 Move storage of road stop tile data, also save for road waypoints.
CompanyAllowListV2, ///< 341 PR#12908 Fixed savegame format for saving of list of client keys that are allowed to join this company.
WaterTileType, ///< 342 PR#13030 Simplify water tile type.
ProductionHistory, ///< 343 PR#10541 Industry production history.
RoadTypeLabelMap, ///< 344 PR#13021 Add road type label map to allow upgrade/conversion of road types.
RoadStopTileData, ///< 340 PR#12883 Move storage of road stop tile data, also save for road waypoints.
CompanyAllowListV2, ///< 341 PR#12908 Fixed savegame format for saving of list of client keys that are allowed to join this company.
WaterTileType, ///< 342 PR#13030 Simplify water tile type.
ProductionHistory, ///< 343 PR#10541 Industry production history.
RoadTypeLabelMap, ///< 344 PR#13021 Add road type label map to allow upgrade/conversion of road types.
NonfloodingWaterTiles, ///< 345 PR#13013 Store water tile non-flooding state.
PathCacheFormat, ///< 346 PR#12345 Vehicle path cache format changed.
AnimatedTileStateInMap, ///< 347 PR#13082 Animated tile state saved for improved performance.
IncreaseHouseLimit, ///< 348 PR#12288 Increase house limit to 4096.
CompanyInauguratedPeriodV2, ///< 349 PR#13448 Fix savegame storage for company inaugurated year in wallclock mode.
NonfloodingWaterTiles, ///< 345 PR#13013 Store water tile non-flooding state.
PathCacheFormat, ///< 346 PR#12345 Vehicle path cache format changed.
AnimatedTileStateInMap, ///< 347 PR#13082 Animated tile state saved for improved performance.
IncreaseHouseLimit, ///< 348 PR#12288 Increase house limit to 4096.
CompanyInauguratedPeriodV2, ///< 349 PR#13448 Fix savegame storage for company inaugurated year in wallclock mode.
EncodedStringFormat, ///< 350 PR#13499 Encoded String format changed.
ProtectPlacedHouses, ///< 351 PR#13270 Houses individually placed by players can be protected from town/AI removal.
ScriptSaveInstances, ///< 352 PR#13556 Scripts are allowed to save instances.
FixSccEncodedNegative, ///< 353 PR#14049 Fix encoding of negative parameters.
OrdersOwnedByOrderlist, ///< 354 PR#13948 Orders stored in OrderList, pool removed.
EncodedStringFormat, ///< 350 PR#13499 Encoded String format changed.
ProtectPlacedHouses, ///< 351 PR#13270 Houses individually placed by players can be protected from town/AI removal.
ScriptSaveInstances, ///< 352 PR#13556 Scripts are allowed to save instances.
FixSccEncodedNegative, ///< 353 PR#14049 Fix encoding of negative parameters.
OrdersOwnedByOrderlist, ///< 354 PR#13948 Orders stored in OrderList, pool removed.
FaceStyles, ///< 355 PR#14319 Addition of face styles, replacing gender and ethnicity.
IndustryNumValidHistory, ///< 356 PR#14416 Store number of valid history records for industries.
IndustryAcceptedHistory, ///< 357 PR#14321 Add per-industry history of cargo delivered and waiting.
TownSupplyHistory, ///< 358 PR#14461 Town supply history.
StationsUnderBridges, ///< 359 PR#14477 Allow stations under bridges.
FaceStyles, ///< 355 PR#14319 Addition of face styles, replacing gender and ethnicity.
IndustryNumValidHistory, ///< 356 PR#14416 Store number of valid history records for industries.
IndustryAcceptedHistory, ///< 357 PR#14321 Add per-industry history of cargo delivered and waiting.
TownSupplyHistory, ///< 358 PR#14461 Town supply history.
StationsUnderBridges, ///< 359 PR#14477 Allow stations under bridges.
DocksUnderBridges, ///< 360 PR#14594 Allow docks under bridges.
LocksUnderBridges, ///< 361 PR#14595 Allow locks under bridges.
EngineMultiRailtype, ///< 362 PR#14357 v15.0 Train engines can have multiple railtypes.
SignTextColours, ///< 363 PR#14743 Configurable sign text colors in scenario editor.
BuoysAt0_0, ///< 364 PR#14983 Allow to build buoys at (0x0).
DocksUnderBridges, ///< 360 PR#14594 Allow docks under bridges.
LocksUnderBridges, ///< 361 PR#14595 Allow locks under bridges.
EngineMultiRailtype, ///< 362 PR#14357 v15.0 Train engines can have multiple railtypes.
SignTextColours, ///< 363 PR#14743 Configurable sign text colors in scenario editor.
BuoysAt0_0, ///< 364 PR#14983 Allow to build buoys at (0x0).
DriveBackwards, ///< 365 PR#15379 Trains can drive backwards.
DriveBackwards, ///< 365 PR#15379 Trains can drive backwards.
MaxVersion, ///< Highest possible saveload version
MaxVersion, ///< Highest possible saveload version
};
/** Save or load result codes. */
@@ -1314,7 +1314,7 @@ inline bool IsSavegameVersionBeforeOrAt(SaveLoadVersion major)
* Checks if some version from/to combination falls within the range of the
* active savegame version.
* @param version_from Inclusive savegame version lower bound.
* @param version_to Exclusive savegame version upper bound. MaxVersion if no upper bound.
* @param version_to Exclusive savegame version upper bound. MaxVersion if no upper bound.
* @return Active savegame version falls within the given range.
*/
inline bool SlIsObjectCurrentlyValid(SaveLoadVersion version_from, SaveLoadVersion version_to)
src/saveload/signs_sl.cpp
+1 -1
View File
@@ -26,7 +26,7 @@ static const SaveLoad _sign_desc[] = {
SLE_CONDVAR(Sign, x, SLE_INT32, SaveLoadVersion::BigMap, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Sign, y, SLE_INT32, SaveLoadVersion::BigMap, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Sign, owner, SLE_UINT8, SaveLoadVersion::MultipleRoadStops, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Sign, z, SLE_FILE_U8 | SLE_VAR_I32, SaveLoadVersion::MinVersion, SaveLoadVersion::VehicleCentreAndZPos),
SLE_CONDVAR(Sign, z, SLE_FILE_U8 | SLE_VAR_I32, SaveLoadVersion::MinVersion, SaveLoadVersion::VehicleCentreAndZPos),
SLE_CONDVAR(Sign, z, SLE_INT32, SaveLoadVersion::VehicleCentreAndZPos, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Sign, text_colour, SLE_UINT8, SaveLoadVersion::SignTextColours, SaveLoadVersion::MaxVersion),
};
src/saveload/station_sl.cpp
+65 -65
View File
@@ -209,9 +209,9 @@ template <typename T>
class SlStationSpecList : public VectorSaveLoadHandler<SlStationSpecList<T>, BaseStation, SpecMapping<T>> {
public:
static inline const SaveLoad description[] = {
SLE_CONDVAR(SpecMapping<T>, grfid, SLE_UINT32, SaveLoadVersion::NewGRFStations, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(SpecMapping<T>, localidx, SLE_FILE_U8 | SLE_VAR_U16, SaveLoadVersion::NewGRFStations, SaveLoadVersion::ExtendEntityMapping),
SLE_CONDVAR(SpecMapping<T>, localidx, SLE_UINT16, SaveLoadVersion::ExtendEntityMapping, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(SpecMapping<T>, grfid, SLE_UINT32, SaveLoadVersion::NewGRFStations, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(SpecMapping<T>, localidx, SLE_FILE_U8 | SLE_VAR_U16, SaveLoadVersion::NewGRFStations, SaveLoadVersion::ExtendEntityMapping),
SLE_CONDVAR(SpecMapping<T>, localidx, SLE_UINT16, SaveLoadVersion::ExtendEntityMapping, SaveLoadVersion::MaxVersion),
};
static inline const SaveLoadCompatTable compat_description = _station_spec_list_sl_compat;
@@ -371,28 +371,28 @@ public:
static inline uint cargo_reserved_count;
static inline const SaveLoad description[] = {
SLEG_CONDVAR("waiting_acceptance", _waiting_acceptance, SLE_UINT16, SaveLoadVersion::MinVersion, SaveLoadVersion::CargoPackets),
SLE_CONDVAR(GoodsEntry, status, SLE_UINT8, SaveLoadVersion::CargoPackets, SaveLoadVersion::MaxVersion),
SLEG_CONDVAR("waiting_acceptance", _waiting_acceptance, SLE_UINT16, SaveLoadVersion::MinVersion, SaveLoadVersion::CargoPackets),
SLE_CONDVAR(GoodsEntry, status, SLE_UINT8, SaveLoadVersion::CargoPackets, SaveLoadVersion::MaxVersion),
SLE_VAR(GoodsEntry, time_since_pickup, SLE_UINT8),
SLE_VAR(GoodsEntry, rating, SLE_UINT8),
SLEG_CONDVAR("cargo_source", _cargo_source, SLE_FILE_U8 | SLE_VAR_U16, SaveLoadVersion::MinVersion, SaveLoadVersion::LargerCargoSource),
SLEG_CONDVAR("cargo_source", _cargo_source, SLE_UINT16, SaveLoadVersion::LargerCargoSource, SaveLoadVersion::CargoPackets),
SLEG_CONDVAR("cargo_source_xy", _cargo_source_xy, SLE_UINT32, SaveLoadVersion::CargoSourceTile, SaveLoadVersion::CargoPackets),
SLEG_CONDVAR("cargo_days", _cargo_periods, SLE_UINT8, SaveLoadVersion::MinVersion, SaveLoadVersion::CargoPackets),
SLEG_CONDVAR("cargo_source", _cargo_source, SLE_FILE_U8 | SLE_VAR_U16, SaveLoadVersion::MinVersion, SaveLoadVersion::LargerCargoSource),
SLEG_CONDVAR("cargo_source", _cargo_source, SLE_UINT16, SaveLoadVersion::LargerCargoSource, SaveLoadVersion::CargoPackets),
SLEG_CONDVAR("cargo_source_xy", _cargo_source_xy, SLE_UINT32, SaveLoadVersion::CargoSourceTile, SaveLoadVersion::CargoPackets),
SLEG_CONDVAR("cargo_days", _cargo_periods, SLE_UINT8, SaveLoadVersion::MinVersion, SaveLoadVersion::CargoPackets),
SLE_VAR(GoodsEntry, last_speed, SLE_UINT8),
SLE_VAR(GoodsEntry, last_age, SLE_UINT8),
SLEG_CONDVAR("cargo_feeder_share", _cargo_feeder_share, SLE_FILE_U32 | SLE_VAR_I64, SaveLoadVersion::TransferOrder, SaveLoadVersion::UnifyCurrency),
SLEG_CONDVAR("cargo_feeder_share", _cargo_feeder_share, SLE_INT64, SaveLoadVersion::UnifyCurrency, SaveLoadVersion::CargoPackets),
SLE_CONDVAR(GoodsEntry, amount_fract, SLE_UINT8, SaveLoadVersion::FractionalCargoDelivery, SaveLoadVersion::MaxVersion),
SLEG_CONDREFLIST("packets", _packets, REF_CARGO_PACKET, SaveLoadVersion::CargoPackets, SaveLoadVersion::Cargodist),
SLEG_CONDVAR("old_num_dests", _old_num_dests, SLE_UINT32, SaveLoadVersion::Cargodist, SaveLoadVersion::SaveloadListLength),
SLEG_CONDVAR("cargo.reserved_count", SlStationGoods::cargo_reserved_count, SLE_UINT, SaveLoadVersion::CargoReservation, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(GoodsEntry, link_graph, SLE_UINT16, SaveLoadVersion::Cargodist, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(GoodsEntry, node, SLE_UINT16, SaveLoadVersion::Cargodist, SaveLoadVersion::MaxVersion),
SLEG_CONDVAR("old_num_flows", _old_num_flows, SLE_UINT32, SaveLoadVersion::Cargodist, SaveLoadVersion::SaveloadListLength),
SLE_CONDVAR(GoodsEntry, max_waiting_cargo, SLE_UINT32, SaveLoadVersion::Cargodist, SaveLoadVersion::MaxVersion),
SLEG_CONDSTRUCTLIST("flow", SlStationFlow, SaveLoadVersion::Cargodist, SaveLoadVersion::MaxVersion),
SLEG_CONDSTRUCTLIST("cargo", SlStationCargo, SaveLoadVersion::Cargodist, SaveLoadVersion::MaxVersion),
SLEG_CONDVAR("cargo_feeder_share", _cargo_feeder_share, SLE_FILE_U32 | SLE_VAR_I64, SaveLoadVersion::TransferOrder, SaveLoadVersion::UnifyCurrency),
SLEG_CONDVAR("cargo_feeder_share", _cargo_feeder_share, SLE_INT64, SaveLoadVersion::UnifyCurrency, SaveLoadVersion::CargoPackets),
SLE_CONDVAR(GoodsEntry, amount_fract, SLE_UINT8, SaveLoadVersion::FractionalCargoDelivery, SaveLoadVersion::MaxVersion),
SLEG_CONDREFLIST("packets", _packets, REF_CARGO_PACKET, SaveLoadVersion::CargoPackets, SaveLoadVersion::Cargodist),
SLEG_CONDVAR("old_num_dests", _old_num_dests, SLE_UINT32, SaveLoadVersion::Cargodist, SaveLoadVersion::SaveloadListLength),
SLEG_CONDVAR("cargo.reserved_count", SlStationGoods::cargo_reserved_count, SLE_UINT, SaveLoadVersion::CargoReservation, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(GoodsEntry, link_graph, SLE_UINT16, SaveLoadVersion::Cargodist, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(GoodsEntry, node, SLE_UINT16, SaveLoadVersion::Cargodist, SaveLoadVersion::MaxVersion),
SLEG_CONDVAR("old_num_flows", _old_num_flows, SLE_UINT32, SaveLoadVersion::Cargodist, SaveLoadVersion::SaveloadListLength),
SLE_CONDVAR(GoodsEntry, max_waiting_cargo, SLE_UINT32, SaveLoadVersion::Cargodist, SaveLoadVersion::MaxVersion),
SLEG_CONDSTRUCTLIST("flow", SlStationFlow, SaveLoadVersion::Cargodist, SaveLoadVersion::MaxVersion),
SLEG_CONDSTRUCTLIST("cargo", SlStationCargo, SaveLoadVersion::Cargodist, SaveLoadVersion::MaxVersion),
};
static inline const SaveLoadCompatTable compat_description = _station_goods_sl_compat;
@@ -485,21 +485,21 @@ public:
};
static const SaveLoad _old_station_desc[] = {
SLE_CONDVAR(Station, xy, SLE_FILE_U16 | SLE_VAR_U32, SaveLoadVersion::MinVersion, SaveLoadVersion::MultipleRoadStops),
SLE_CONDVAR(Station, xy, SLE_UINT32, SaveLoadVersion::MultipleRoadStops, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Station, train_station.tile, SLE_FILE_U16 | SLE_VAR_U32, SaveLoadVersion::MinVersion, SaveLoadVersion::MultipleRoadStops),
SLE_CONDVAR(Station, train_station.tile, SLE_UINT32, SaveLoadVersion::MultipleRoadStops, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Station, airport.tile, SLE_FILE_U16 | SLE_VAR_U32, SaveLoadVersion::MinVersion, SaveLoadVersion::MultipleRoadStops),
SLE_CONDVAR(Station, airport.tile, SLE_UINT32, SaveLoadVersion::MultipleRoadStops, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Station, xy, SLE_FILE_U16 | SLE_VAR_U32, SaveLoadVersion::MinVersion, SaveLoadVersion::MultipleRoadStops),
SLE_CONDVAR(Station, xy, SLE_UINT32, SaveLoadVersion::MultipleRoadStops, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Station, train_station.tile, SLE_FILE_U16 | SLE_VAR_U32, SaveLoadVersion::MinVersion, SaveLoadVersion::MultipleRoadStops),
SLE_CONDVAR(Station, train_station.tile, SLE_UINT32, SaveLoadVersion::MultipleRoadStops, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Station, airport.tile, SLE_FILE_U16 | SLE_VAR_U32, SaveLoadVersion::MinVersion, SaveLoadVersion::MultipleRoadStops),
SLE_CONDVAR(Station, airport.tile, SLE_UINT32, SaveLoadVersion::MultipleRoadStops, SaveLoadVersion::MaxVersion),
SLE_REF(Station, town, REF_TOWN),
SLE_VAR(Station, train_station.w, SLE_FILE_U8 | SLE_VAR_U16),
SLE_CONDVAR(Station, train_station.h, SLE_FILE_U8 | SLE_VAR_U16, SaveLoadVersion::VehicleCurrencyStationChanges, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Station, train_station.h, SLE_FILE_U8 | SLE_VAR_U16, SaveLoadVersion::VehicleCurrencyStationChanges, SaveLoadVersion::MaxVersion),
SLE_VAR(Station, string_id, SLE_STRINGID),
SLE_CONDSSTR(Station, name, SLE_STR | SLF_ALLOW_CONTROL, SaveLoadVersion::ReplaceCustomNameArray, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Station, indtype, SLE_UINT8, SaveLoadVersion::NewGRFSuppliedStationName, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Station, had_vehicle_of_type, SLE_FILE_U16 | SLE_VAR_U8, SaveLoadVersion::MinVersion, SaveLoadVersion::WaypointMoreLikeStation),
SLE_CONDVAR(Station, had_vehicle_of_type, SLE_UINT8, SaveLoadVersion::WaypointMoreLikeStation, SaveLoadVersion::MaxVersion),
SLE_CONDSSTR(Station, name, SLE_STR | SLF_ALLOW_CONTROL, SaveLoadVersion::ReplaceCustomNameArray, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Station, indtype, SLE_UINT8, SaveLoadVersion::NewGRFSuppliedStationName, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Station, had_vehicle_of_type, SLE_FILE_U16 | SLE_VAR_U8, SaveLoadVersion::MinVersion, SaveLoadVersion::WaypointMoreLikeStation),
SLE_CONDVAR(Station, had_vehicle_of_type, SLE_UINT8, SaveLoadVersion::WaypointMoreLikeStation, SaveLoadVersion::MaxVersion),
SLE_VAR(Station, time_since_load, SLE_UINT8),
SLE_VAR(Station, time_since_unload, SLE_UINT8),
@@ -507,24 +507,24 @@ static const SaveLoad _old_station_desc[] = {
SLE_VAR(Station, owner, SLE_UINT8),
SLE_VAR(Station, facilities, SLE_UINT8),
SLE_VAR(Station, airport.type, SLE_UINT8),
SLE_CONDVARNAME(Station, airport.blocks, "airport.flags", SLE_VAR_U64 | SLE_FILE_U16, SaveLoadVersion::MinVersion, SaveLoadVersion::BiggerStationVariables),
SLE_CONDVARNAME(Station, airport.blocks, "airport.flags", SLE_VAR_U64 | SLE_FILE_U32, SaveLoadVersion::BiggerStationVariables, SaveLoadVersion::MoreAirportBlocks),
SLE_CONDVARNAME(Station, airport.blocks, "airport.flags", SLE_UINT64, SaveLoadVersion::MoreAirportBlocks, SaveLoadVersion::MaxVersion),
SLE_CONDVARNAME(Station, airport.blocks, "airport.flags", SLE_VAR_U64 | SLE_FILE_U16, SaveLoadVersion::MinVersion, SaveLoadVersion::BiggerStationVariables),
SLE_CONDVARNAME(Station, airport.blocks, "airport.flags", SLE_VAR_U64 | SLE_FILE_U32, SaveLoadVersion::BiggerStationVariables, SaveLoadVersion::MoreAirportBlocks),
SLE_CONDVARNAME(Station, airport.blocks, "airport.flags", SLE_UINT64, SaveLoadVersion::MoreAirportBlocks, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Station, last_vehicle_type, SLE_UINT8, SaveLoadVersion::LastVehicleType, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Station, last_vehicle_type, SLE_UINT8, SaveLoadVersion::LastVehicleType, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Station, build_date, SLE_FILE_U16 | SLE_VAR_I32, SaveLoadVersion::BiggerStationVariables, SaveLoadVersion::BigDates),
SLE_CONDVAR(Station, build_date, SLE_INT32, SaveLoadVersion::BigDates, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Station, build_date, SLE_FILE_U16 | SLE_VAR_I32, SaveLoadVersion::BiggerStationVariables, SaveLoadVersion::BigDates),
SLE_CONDVAR(Station, build_date, SLE_INT32, SaveLoadVersion::BigDates, SaveLoadVersion::MaxVersion),
SLE_CONDREF(Station, bus_stops, REF_ROADSTOPS, SaveLoadVersion::MultipleRoadStops, SaveLoadVersion::MaxVersion),
SLE_CONDREF(Station, truck_stops, REF_ROADSTOPS, SaveLoadVersion::MultipleRoadStops, SaveLoadVersion::MaxVersion),
SLE_CONDREF(Station, bus_stops, REF_ROADSTOPS, SaveLoadVersion::MultipleRoadStops, SaveLoadVersion::MaxVersion),
SLE_CONDREF(Station, truck_stops, REF_ROADSTOPS, SaveLoadVersion::MultipleRoadStops, SaveLoadVersion::MaxVersion),
/* Used by newstations for graphic variations */
SLE_CONDVAR(Station, random_bits, SLE_UINT16, SaveLoadVersion::NewGRFStations, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Station, random_bits, SLE_UINT16, SaveLoadVersion::NewGRFStations, SaveLoadVersion::MaxVersion),
SLE_CONDVARNAME(Station, waiting_random_triggers, "waiting_triggers", SLE_UINT8, SaveLoadVersion::NewGRFStations, SaveLoadVersion::MaxVersion),
SLEG_CONDVAR("num_specs", SlStationSpecList<StationSpec>::last_num_specs, SLE_UINT8, SaveLoadVersion::NewGRFStations, SaveLoadVersion::MaxVersion),
SLE_CONDREFLIST(Station, loading_vehicles, REF_VEHICLE, SaveLoadVersion::FifoLoading, SaveLoadVersion::MaxVersion),
SLE_CONDREFLIST(Station, loading_vehicles, REF_VEHICLE, SaveLoadVersion::FifoLoading, SaveLoadVersion::MaxVersion),
SLEG_STRUCTLIST("goods", SlStationGoods),
SLEG_CONDSTRUCTLIST("speclist", SlStationSpecList<StationSpec>, SaveLoadVersion::NewGRFStations, SaveLoadVersion::MaxVersion),
@@ -595,7 +595,7 @@ public:
SLE_VAR(BaseStation, random_bits, SLE_UINT16),
SLE_VARNAME(BaseStation, waiting_random_triggers, "waiting_triggers", SLE_UINT8),
SLEG_STRUCTLIST("tile_waiting_triggers", SlStationWaitingTriggers),
SLEG_CONDVAR("num_specs", SlStationSpecList<StationSpec>::last_num_specs, SLE_UINT8, SaveLoadVersion::MinVersion, SaveLoadVersion::SaveloadListLength),
SLEG_CONDVAR("num_specs", SlStationSpecList<StationSpec>::last_num_specs, SLE_UINT8, SaveLoadVersion::MinVersion, SaveLoadVersion::SaveloadListLength),
};
static inline const SaveLoadCompatTable compat_description = _station_base_sl_compat;
@@ -628,21 +628,21 @@ public:
SLE_REF(Station, bus_stops, REF_ROADSTOPS),
SLE_REF(Station, truck_stops, REF_ROADSTOPS),
SLE_CONDVAR(Station, ship_station.tile, SLE_UINT32, SaveLoadVersion::MultitileDocks, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Station, ship_station.w, SLE_FILE_U8 | SLE_VAR_U16, SaveLoadVersion::MultitileDocks, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Station, ship_station.h, SLE_FILE_U8 | SLE_VAR_U16, SaveLoadVersion::MultitileDocks, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Station, docking_station.tile, SLE_UINT32, SaveLoadVersion::MultitileDocks, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Station, docking_station.w, SLE_FILE_U8 | SLE_VAR_U16, SaveLoadVersion::MultitileDocks, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Station, docking_station.h, SLE_FILE_U8 | SLE_VAR_U16, SaveLoadVersion::MultitileDocks, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Station, ship_station.tile, SLE_UINT32, SaveLoadVersion::MultitileDocks, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Station, ship_station.w, SLE_FILE_U8 | SLE_VAR_U16, SaveLoadVersion::MultitileDocks, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Station, ship_station.h, SLE_FILE_U8 | SLE_VAR_U16, SaveLoadVersion::MultitileDocks, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Station, docking_station.tile, SLE_UINT32, SaveLoadVersion::MultitileDocks, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Station, docking_station.w, SLE_FILE_U8 | SLE_VAR_U16, SaveLoadVersion::MultitileDocks, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Station, docking_station.h, SLE_FILE_U8 | SLE_VAR_U16, SaveLoadVersion::MultitileDocks, SaveLoadVersion::MaxVersion),
SLE_VAR(Station, airport.tile, SLE_UINT32),
SLE_CONDVAR(Station, airport.w, SLE_FILE_U8 | SLE_VAR_U16, SaveLoadVersion::StoreAirportSize, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Station, airport.h, SLE_FILE_U8 | SLE_VAR_U16, SaveLoadVersion::StoreAirportSize, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Station, airport.w, SLE_FILE_U8 | SLE_VAR_U16, SaveLoadVersion::StoreAirportSize, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Station, airport.h, SLE_FILE_U8 | SLE_VAR_U16, SaveLoadVersion::StoreAirportSize, SaveLoadVersion::MaxVersion),
SLE_VAR(Station, airport.type, SLE_UINT8),
SLE_CONDVAR(Station, airport.layout, SLE_UINT8, SaveLoadVersion::NewGRFAirportSmoke, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Station, airport.layout, SLE_UINT8, SaveLoadVersion::NewGRFAirportSmoke, SaveLoadVersion::MaxVersion),
SLE_VARNAME(Station, airport.blocks, "airport.flags", SLE_UINT64),
SLE_CONDVAR(Station, airport.rotation, SLE_UINT8, SaveLoadVersion::NewGRFAirportSmoke, SaveLoadVersion::MaxVersion),
SLEG_CONDARR("storage", _old_st_persistent_storage.storage, SLE_UINT32, 16, SaveLoadVersion::NewGRFAirportSmoke, SaveLoadVersion::PersistentStoragePool),
SLE_CONDREF(Station, airport.psa, REF_STORAGE, SaveLoadVersion::PersistentStoragePool, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Station, airport.rotation, SLE_UINT8, SaveLoadVersion::NewGRFAirportSmoke, SaveLoadVersion::MaxVersion),
SLEG_CONDARR("storage", _old_st_persistent_storage.storage, SLE_UINT32, 16, SaveLoadVersion::NewGRFAirportSmoke, SaveLoadVersion::PersistentStoragePool),
SLE_CONDREF(Station, airport.psa, REF_STORAGE, SaveLoadVersion::PersistentStoragePool, SaveLoadVersion::MaxVersion),
SLE_VAR(Station, indtype, SLE_UINT8),
@@ -651,9 +651,9 @@ public:
SLE_VAR(Station, last_vehicle_type, SLE_UINT8),
SLE_VAR(Station, had_vehicle_of_type, SLE_UINT8),
SLE_REFLIST(Station, loading_vehicles, REF_VEHICLE),
SLE_CONDVAR(Station, always_accepted, SLE_FILE_U32 | SLE_VAR_U64, SaveLoadVersion::TownAcceptance, SaveLoadVersion::ExtendCargotypes),
SLE_CONDVAR(Station, always_accepted, SLE_UINT64, SaveLoadVersion::ExtendCargotypes, SaveLoadVersion::MaxVersion),
SLEG_CONDSTRUCTLIST("speclist", SlRoadStopTileData, SaveLoadVersion::NewGRFRoadStops, SaveLoadVersion::RoadStopTileData),
SLE_CONDVAR(Station, always_accepted, SLE_FILE_U32 | SLE_VAR_U64, SaveLoadVersion::TownAcceptance, SaveLoadVersion::ExtendCargotypes),
SLE_CONDVAR(Station, always_accepted, SLE_UINT64, SaveLoadVersion::ExtendCargotypes, SaveLoadVersion::MaxVersion),
SLEG_CONDSTRUCTLIST("speclist", SlRoadStopTileData, SaveLoadVersion::NewGRFRoadStops, SaveLoadVersion::RoadStopTileData),
SLEG_STRUCTLIST("goods", SlStationGoods),
};
static inline const SaveLoadCompatTable compat_description = _station_normal_sl_compat;
@@ -683,13 +683,13 @@ public:
SLEG_STRUCT("base", SlStationBase),
SLE_VAR(Waypoint, town_cn, SLE_UINT16),
SLE_CONDVAR(Waypoint, train_station.tile, SLE_UINT32, SaveLoadVersion::MultiTileWaypoints, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Waypoint, train_station.w, SLE_FILE_U8 | SLE_VAR_U16, SaveLoadVersion::MultiTileWaypoints, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Waypoint, train_station.h, SLE_FILE_U8 | SLE_VAR_U16, SaveLoadVersion::MultiTileWaypoints, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Waypoint, waypoint_flags, SLE_UINT16, SaveLoadVersion::RoadWaypoints, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Waypoint, road_waypoint_area.tile, SLE_UINT32, SaveLoadVersion::RoadWaypoints, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Waypoint, road_waypoint_area.w, SLE_FILE_U8 | SLE_VAR_U16, SaveLoadVersion::RoadWaypoints, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Waypoint, road_waypoint_area.h, SLE_FILE_U8 | SLE_VAR_U16, SaveLoadVersion::RoadWaypoints, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Waypoint, train_station.tile, SLE_UINT32, SaveLoadVersion::MultiTileWaypoints, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Waypoint, train_station.w, SLE_FILE_U8 | SLE_VAR_U16, SaveLoadVersion::MultiTileWaypoints, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Waypoint, train_station.h, SLE_FILE_U8 | SLE_VAR_U16, SaveLoadVersion::MultiTileWaypoints, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Waypoint, waypoint_flags, SLE_UINT16, SaveLoadVersion::RoadWaypoints, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Waypoint, road_waypoint_area.tile, SLE_UINT32, SaveLoadVersion::RoadWaypoints, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Waypoint, road_waypoint_area.w, SLE_FILE_U8 | SLE_VAR_U16, SaveLoadVersion::RoadWaypoints, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Waypoint, road_waypoint_area.h, SLE_FILE_U8 | SLE_VAR_U16, SaveLoadVersion::RoadWaypoints, SaveLoadVersion::MaxVersion),
};
static inline const SaveLoadCompatTable compat_description = _station_waypoint_sl_compat;
src/saveload/storage_sl.cpp
+3 -3
View File
@@ -18,9 +18,9 @@
/** Description of the data to save and load in #PersistentStorage. */
static const SaveLoad _storage_desc[] = {
SLE_CONDVAR(PersistentStorage, grfid, SLE_UINT32, SaveLoadVersion::MultipleRoadStops, SaveLoadVersion::MaxVersion),
SLE_CONDARR(PersistentStorage, storage, SLE_UINT32, 16, SaveLoadVersion::PersistentStoragePool, SaveLoadVersion::ExtendPersistentStorage),
SLE_CONDARR(PersistentStorage, storage, SLE_UINT32, 256, SaveLoadVersion::ExtendPersistentStorage, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(PersistentStorage, grfid, SLE_UINT32, SaveLoadVersion::MultipleRoadStops, SaveLoadVersion::MaxVersion),
SLE_CONDARR(PersistentStorage, storage, SLE_UINT32, 16, SaveLoadVersion::PersistentStoragePool, SaveLoadVersion::ExtendPersistentStorage),
SLE_CONDARR(PersistentStorage, storage, SLE_UINT32, 256, SaveLoadVersion::ExtendPersistentStorage, SaveLoadVersion::MaxVersion),
};
/** Persistent storage data. */
src/saveload/story_sl.cpp
+8 -8
View File
@@ -29,11 +29,11 @@ void AfterLoadStoryBook()
}
static const SaveLoad _story_page_elements_desc[] = {
SLE_CONDVAR(StoryPageElement, sort_value, SLE_FILE_U16 | SLE_VAR_U32, SaveLoadVersion::MinVersion, SaveLoadVersion::Storybooks),
SLE_CONDVAR(StoryPageElement, sort_value, SLE_UINT32, SaveLoadVersion::Storybooks, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(StoryPageElement, sort_value, SLE_FILE_U16 | SLE_VAR_U32, SaveLoadVersion::MinVersion, SaveLoadVersion::Storybooks),
SLE_CONDVAR(StoryPageElement, sort_value, SLE_UINT32, SaveLoadVersion::Storybooks, SaveLoadVersion::MaxVersion),
SLE_VAR(StoryPageElement, page, SLE_UINT16),
SLE_CONDVAR(StoryPageElement, type, SLE_FILE_U16 | SLE_VAR_U8, SaveLoadVersion::MinVersion, SaveLoadVersion::Storybooks),
SLE_CONDVAR(StoryPageElement, type, SLE_UINT8, SaveLoadVersion::Storybooks, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(StoryPageElement, type, SLE_FILE_U16 | SLE_VAR_U8, SaveLoadVersion::MinVersion, SaveLoadVersion::Storybooks),
SLE_CONDVAR(StoryPageElement, type, SLE_UINT8, SaveLoadVersion::Storybooks, SaveLoadVersion::MaxVersion),
SLE_VAR(StoryPageElement, referenced_id, SLE_UINT32),
SLE_SSTR(StoryPageElement, text, SLE_STR | SLF_ALLOW_CONTROL),
};
@@ -72,11 +72,11 @@ struct STPEChunkHandler : ChunkHandler {
};
static const SaveLoad _story_pages_desc[] = {
SLE_CONDVAR(StoryPage, sort_value, SLE_FILE_U16 | SLE_VAR_U32, SaveLoadVersion::MinVersion, SaveLoadVersion::Storybooks),
SLE_CONDVAR(StoryPage, sort_value, SLE_UINT32, SaveLoadVersion::Storybooks, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(StoryPage, sort_value, SLE_FILE_U16 | SLE_VAR_U32, SaveLoadVersion::MinVersion, SaveLoadVersion::Storybooks),
SLE_CONDVAR(StoryPage, sort_value, SLE_UINT32, SaveLoadVersion::Storybooks, SaveLoadVersion::MaxVersion),
SLE_VAR(StoryPage, date, SLE_UINT32),
SLE_CONDVAR(StoryPage, company, SLE_FILE_U16 | SLE_VAR_U8, SaveLoadVersion::MinVersion, SaveLoadVersion::Storybooks),
SLE_CONDVAR(StoryPage, company, SLE_UINT8, SaveLoadVersion::Storybooks, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(StoryPage, company, SLE_FILE_U16 | SLE_VAR_U8, SaveLoadVersion::MinVersion, SaveLoadVersion::Storybooks),
SLE_CONDVAR(StoryPage, company, SLE_UINT8, SaveLoadVersion::Storybooks, SaveLoadVersion::MaxVersion),
SLE_SSTR(StoryPage, title, SLE_STR | SLF_ALLOW_CONTROL),
};
src/saveload/subsidy_sl.cpp
+9 -9
View File
@@ -18,15 +18,15 @@
static const SaveLoad _subsidies_desc[] = {
SLE_VAR(Subsidy, cargo_type, SLE_UINT8),
SLE_CONDVAR(Subsidy, remaining, SLE_FILE_U8 | SLE_VAR_U16, SaveLoadVersion::MinVersion, SaveLoadVersion::CustomSubsidyDuration),
SLE_CONDVAR(Subsidy, remaining, SLE_UINT16, SaveLoadVersion::CustomSubsidyDuration, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Subsidy, awarded, SLE_UINT8, SaveLoadVersion::RemoveSubsidyStationBinding, SaveLoadVersion::MaxVersion),
SLE_CONDVARNAME(Subsidy, src.type, "src_type", SLE_UINT8, SaveLoadVersion::RemoveSubsidyStationBinding, SaveLoadVersion::MaxVersion),
SLE_CONDVARNAME(Subsidy, dst.type, "dst_type", SLE_UINT8, SaveLoadVersion::RemoveSubsidyStationBinding, SaveLoadVersion::MaxVersion),
SLE_CONDVARNAME(Subsidy, src.id, "src", SLE_FILE_U8 | SLE_VAR_U16, SaveLoadVersion::MinVersion, SaveLoadVersion::BigMap),
SLE_CONDVARNAME(Subsidy, src.id, "src", SLE_UINT16, SaveLoadVersion::BigMap, SaveLoadVersion::MaxVersion),
SLE_CONDVARNAME(Subsidy, dst.id, "dst", SLE_FILE_U8 | SLE_VAR_U16, SaveLoadVersion::MinVersion, SaveLoadVersion::BigMap),
SLE_CONDVARNAME(Subsidy, dst.id, "dst", SLE_UINT16, SaveLoadVersion::BigMap, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Subsidy, remaining, SLE_FILE_U8 | SLE_VAR_U16, SaveLoadVersion::MinVersion, SaveLoadVersion::CustomSubsidyDuration),
SLE_CONDVAR(Subsidy, remaining, SLE_UINT16, SaveLoadVersion::CustomSubsidyDuration, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Subsidy, awarded, SLE_UINT8, SaveLoadVersion::RemoveSubsidyStationBinding, SaveLoadVersion::MaxVersion),
SLE_CONDVARNAME(Subsidy, src.type, "src_type", SLE_UINT8, SaveLoadVersion::RemoveSubsidyStationBinding, SaveLoadVersion::MaxVersion),
SLE_CONDVARNAME(Subsidy, dst.type, "dst_type", SLE_UINT8, SaveLoadVersion::RemoveSubsidyStationBinding, SaveLoadVersion::MaxVersion),
SLE_CONDVARNAME(Subsidy, src.id, "src", SLE_FILE_U8 | SLE_VAR_U16, SaveLoadVersion::MinVersion, SaveLoadVersion::BigMap),
SLE_CONDVARNAME(Subsidy, src.id, "src", SLE_UINT16, SaveLoadVersion::BigMap, SaveLoadVersion::MaxVersion),
SLE_CONDVARNAME(Subsidy, dst.id, "dst", SLE_FILE_U8 | SLE_VAR_U16, SaveLoadVersion::MinVersion, SaveLoadVersion::BigMap),
SLE_CONDVARNAME(Subsidy, dst.id, "dst", SLE_UINT16, SaveLoadVersion::BigMap, SaveLoadVersion::MaxVersion),
};
struct SUBSChunkHandler : ChunkHandler {
src/saveload/town_sl.cpp
+45 -45
View File
@@ -296,77 +296,77 @@ static std::array<Town::SuppliedHistory, 2> _old_pass_supplied{};
static std::array<Town::SuppliedHistory, 2> _old_mail_supplied{};
static const SaveLoad _town_desc[] = {
SLE_CONDVAR(Town, xy, SLE_FILE_U16 | SLE_VAR_U32, SaveLoadVersion::MinVersion, SaveLoadVersion::MultipleRoadStops),
SLE_CONDVAR(Town, xy, SLE_UINT32, SaveLoadVersion::MultipleRoadStops, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Town, xy, SLE_FILE_U16 | SLE_VAR_U32, SaveLoadVersion::MinVersion, SaveLoadVersion::MultipleRoadStops),
SLE_CONDVAR(Town, xy, SLE_UINT32, SaveLoadVersion::MultipleRoadStops, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Town, townnamegrfid, SLE_UINT32, SaveLoadVersion::NewGRFTownNames, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Town, townnamegrfid, SLE_UINT32, SaveLoadVersion::NewGRFTownNames, SaveLoadVersion::MaxVersion),
SLE_VAR(Town, townnametype, SLE_UINT16),
SLE_VAR(Town, townnameparts, SLE_UINT32),
SLE_CONDSSTR(Town, name, SLE_STR | SLF_ALLOW_CONTROL, SaveLoadVersion::ReplaceCustomNameArray, SaveLoadVersion::MaxVersion),
SLE_CONDSSTR(Town, name, SLE_STR | SLF_ALLOW_CONTROL, SaveLoadVersion::ReplaceCustomNameArray, SaveLoadVersion::MaxVersion),
SLE_VAR(Town, flags, SLE_UINT8),
SLE_CONDVAR(Town, statues, SLE_FILE_U8 | SLE_VAR_U16, SaveLoadVersion::MinVersion, SaveLoadVersion::MoreCompanies),
SLE_CONDVAR(Town, statues, SLE_UINT16, SaveLoadVersion::MoreCompanies, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Town, statues, SLE_FILE_U8 | SLE_VAR_U16, SaveLoadVersion::MinVersion, SaveLoadVersion::MoreCompanies),
SLE_CONDVAR(Town, statues, SLE_UINT16, SaveLoadVersion::MoreCompanies, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Town, have_ratings, SLE_FILE_U8 | SLE_VAR_U16, SaveLoadVersion::MinVersion, SaveLoadVersion::MoreCompanies),
SLE_CONDVAR(Town, have_ratings, SLE_UINT16, SaveLoadVersion::MoreCompanies, SaveLoadVersion::MaxVersion),
SLE_CONDARR(Town, ratings, SLE_INT16, 8, SaveLoadVersion::MinVersion, SaveLoadVersion::MoreCompanies),
SLE_CONDARR(Town, ratings, SLE_INT16, MAX_COMPANIES, SaveLoadVersion::MoreCompanies, SaveLoadVersion::MaxVersion),
SLE_CONDARR(Town, unwanted, SLE_INT8, 8, SaveLoadVersion::TownTolerancePauseMode, SaveLoadVersion::MoreCompanies),
SLE_CONDARR(Town, unwanted, SLE_INT8, MAX_COMPANIES, SaveLoadVersion::MoreCompanies, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Town, have_ratings, SLE_FILE_U8 | SLE_VAR_U16, SaveLoadVersion::MinVersion, SaveLoadVersion::MoreCompanies),
SLE_CONDVAR(Town, have_ratings, SLE_UINT16, SaveLoadVersion::MoreCompanies, SaveLoadVersion::MaxVersion),
SLE_CONDARR(Town, ratings, SLE_INT16, 8, SaveLoadVersion::MinVersion, SaveLoadVersion::MoreCompanies),
SLE_CONDARR(Town, ratings, SLE_INT16, MAX_COMPANIES, SaveLoadVersion::MoreCompanies, SaveLoadVersion::MaxVersion),
SLE_CONDARR(Town, unwanted, SLE_INT8, 8, SaveLoadVersion::TownTolerancePauseMode, SaveLoadVersion::MoreCompanies),
SLE_CONDARR(Town, unwanted, SLE_INT8, MAX_COMPANIES, SaveLoadVersion::MoreCompanies, SaveLoadVersion::MaxVersion),
/* Slots 0 and 2 are passengers and mail respectively for old saves. */
SLEG_CONDVAR("supplied[CT_PASSENGERS].old_max", _old_pass_supplied[LAST_MONTH].production, SLE_FILE_U16 | SLE_VAR_U32, SaveLoadVersion::MinVersion, SaveLoadVersion::LargerTownCargoStatistics),
SLEG_CONDVAR("supplied[CT_PASSENGERS].old_max", _old_pass_supplied[LAST_MONTH].production, SLE_UINT32, SaveLoadVersion::LargerTownCargoStatistics, SaveLoadVersion::ScriptTownGrowth),
SLEG_CONDVAR( "supplied[CT_MAIL].old_max", _old_mail_supplied[LAST_MONTH].production, SLE_FILE_U16 | SLE_VAR_U32, SaveLoadVersion::MinVersion, SaveLoadVersion::LargerTownCargoStatistics),
SLEG_CONDVAR( "supplied[CT_MAIL].old_max", _old_mail_supplied[LAST_MONTH].production, SLE_UINT32, SaveLoadVersion::LargerTownCargoStatistics, SaveLoadVersion::ScriptTownGrowth),
SLEG_CONDVAR("supplied[CT_PASSENGERS].old_max", _old_pass_supplied[LAST_MONTH].production, SLE_UINT32, SaveLoadVersion::LargerTownCargoStatistics, SaveLoadVersion::ScriptTownGrowth),
SLEG_CONDVAR( "supplied[CT_MAIL].old_max", _old_mail_supplied[LAST_MONTH].production, SLE_FILE_U16 | SLE_VAR_U32, SaveLoadVersion::MinVersion, SaveLoadVersion::LargerTownCargoStatistics),
SLEG_CONDVAR( "supplied[CT_MAIL].old_max", _old_mail_supplied[LAST_MONTH].production, SLE_UINT32, SaveLoadVersion::LargerTownCargoStatistics, SaveLoadVersion::ScriptTownGrowth),
SLEG_CONDVAR("supplied[CT_PASSENGERS].new_max", _old_pass_supplied[THIS_MONTH].production, SLE_FILE_U16 | SLE_VAR_U32, SaveLoadVersion::MinVersion, SaveLoadVersion::LargerTownCargoStatistics),
SLEG_CONDVAR("supplied[CT_PASSENGERS].new_max", _old_pass_supplied[THIS_MONTH].production, SLE_UINT32, SaveLoadVersion::LargerTownCargoStatistics, SaveLoadVersion::ScriptTownGrowth),
SLEG_CONDVAR( "supplied[CT_MAIL].new_max", _old_mail_supplied[THIS_MONTH].production, SLE_FILE_U16 | SLE_VAR_U32, SaveLoadVersion::MinVersion, SaveLoadVersion::LargerTownCargoStatistics),
SLEG_CONDVAR( "supplied[CT_MAIL].new_max", _old_mail_supplied[THIS_MONTH].production, SLE_UINT32, SaveLoadVersion::LargerTownCargoStatistics, SaveLoadVersion::ScriptTownGrowth),
SLEG_CONDVAR("supplied[CT_PASSENGERS].new_max", _old_pass_supplied[THIS_MONTH].production, SLE_UINT32, SaveLoadVersion::LargerTownCargoStatistics, SaveLoadVersion::ScriptTownGrowth),
SLEG_CONDVAR( "supplied[CT_MAIL].new_max", _old_mail_supplied[THIS_MONTH].production, SLE_FILE_U16 | SLE_VAR_U32, SaveLoadVersion::MinVersion, SaveLoadVersion::LargerTownCargoStatistics),
SLEG_CONDVAR( "supplied[CT_MAIL].new_max", _old_mail_supplied[THIS_MONTH].production, SLE_UINT32, SaveLoadVersion::LargerTownCargoStatistics, SaveLoadVersion::ScriptTownGrowth),
SLEG_CONDVAR("supplied[CT_PASSENGERS].old_act", _old_pass_supplied[LAST_MONTH].transported, SLE_FILE_U16 | SLE_VAR_U32, SaveLoadVersion::MinVersion, SaveLoadVersion::LargerTownCargoStatistics),
SLEG_CONDVAR("supplied[CT_PASSENGERS].old_act", _old_pass_supplied[LAST_MONTH].transported, SLE_UINT32, SaveLoadVersion::LargerTownCargoStatistics, SaveLoadVersion::ScriptTownGrowth),
SLEG_CONDVAR( "supplied[CT_MAIL].old_act", _old_mail_supplied[LAST_MONTH].transported, SLE_FILE_U16 | SLE_VAR_U32, SaveLoadVersion::MinVersion, SaveLoadVersion::LargerTownCargoStatistics),
SLEG_CONDVAR( "supplied[CT_MAIL].old_act", _old_mail_supplied[LAST_MONTH].transported, SLE_UINT32, SaveLoadVersion::LargerTownCargoStatistics, SaveLoadVersion::ScriptTownGrowth),
SLEG_CONDVAR("supplied[CT_PASSENGERS].old_act", _old_pass_supplied[LAST_MONTH].transported, SLE_UINT32, SaveLoadVersion::LargerTownCargoStatistics, SaveLoadVersion::ScriptTownGrowth),
SLEG_CONDVAR( "supplied[CT_MAIL].old_act", _old_mail_supplied[LAST_MONTH].transported, SLE_FILE_U16 | SLE_VAR_U32, SaveLoadVersion::MinVersion, SaveLoadVersion::LargerTownCargoStatistics),
SLEG_CONDVAR( "supplied[CT_MAIL].old_act", _old_mail_supplied[LAST_MONTH].transported, SLE_UINT32, SaveLoadVersion::LargerTownCargoStatistics, SaveLoadVersion::ScriptTownGrowth),
SLEG_CONDVAR("supplied[CT_PASSENGERS].new_act", _old_pass_supplied[THIS_MONTH].transported, SLE_FILE_U16 | SLE_VAR_U32, SaveLoadVersion::MinVersion, SaveLoadVersion::LargerTownCargoStatistics),
SLEG_CONDVAR("supplied[CT_PASSENGERS].new_act", _old_pass_supplied[THIS_MONTH].transported, SLE_UINT32, SaveLoadVersion::LargerTownCargoStatistics, SaveLoadVersion::ScriptTownGrowth),
SLEG_CONDVAR( "supplied[CT_MAIL].new_act", _old_mail_supplied[THIS_MONTH].transported, SLE_FILE_U16 | SLE_VAR_U32, SaveLoadVersion::MinVersion, SaveLoadVersion::LargerTownCargoStatistics),
SLEG_CONDVAR( "supplied[CT_MAIL].new_act", _old_mail_supplied[THIS_MONTH].transported, SLE_UINT32, SaveLoadVersion::LargerTownCargoStatistics, SaveLoadVersion::ScriptTownGrowth),
SLEG_CONDVAR("supplied[CT_PASSENGERS].new_act", _old_pass_supplied[THIS_MONTH].transported, SLE_UINT32, SaveLoadVersion::LargerTownCargoStatistics, SaveLoadVersion::ScriptTownGrowth),
SLEG_CONDVAR( "supplied[CT_MAIL].new_act", _old_mail_supplied[THIS_MONTH].transported, SLE_FILE_U16 | SLE_VAR_U32, SaveLoadVersion::MinVersion, SaveLoadVersion::LargerTownCargoStatistics),
SLEG_CONDVAR( "supplied[CT_MAIL].new_act", _old_mail_supplied[THIS_MONTH].transported, SLE_UINT32, SaveLoadVersion::LargerTownCargoStatistics, SaveLoadVersion::ScriptTownGrowth),
SLE_CONDVARNAME(Town, received[TownAcceptanceEffect::Food].old_act, "received[TE_FOOD].old_act", SLE_UINT16, SaveLoadVersion::MinVersion, SaveLoadVersion::ScriptTownGrowth),
SLE_CONDVARNAME(Town, received[TownAcceptanceEffect::Water].old_act, "received[TE_WATER].old_act", SLE_UINT16, SaveLoadVersion::MinVersion, SaveLoadVersion::ScriptTownGrowth),
SLE_CONDVARNAME(Town, received[TownAcceptanceEffect::Food].new_act, "received[TE_FOOD].new_act", SLE_UINT16, SaveLoadVersion::MinVersion, SaveLoadVersion::ScriptTownGrowth),
SLE_CONDVARNAME(Town, received[TownAcceptanceEffect::Water].new_act, "received[TE_WATER].new_act", SLE_UINT16, SaveLoadVersion::MinVersion, SaveLoadVersion::ScriptTownGrowth),
SLE_CONDVARNAME(Town, received[TownAcceptanceEffect::Food].old_act, "received[TE_FOOD].old_act", SLE_UINT16, SaveLoadVersion::MinVersion, SaveLoadVersion::ScriptTownGrowth),
SLE_CONDVARNAME(Town, received[TownAcceptanceEffect::Water].old_act, "received[TE_WATER].old_act", SLE_UINT16, SaveLoadVersion::MinVersion, SaveLoadVersion::ScriptTownGrowth),
SLE_CONDVARNAME(Town, received[TownAcceptanceEffect::Food].new_act, "received[TE_FOOD].new_act", SLE_UINT16, SaveLoadVersion::MinVersion, SaveLoadVersion::ScriptTownGrowth),
SLE_CONDVARNAME(Town, received[TownAcceptanceEffect::Water].new_act, "received[TE_WATER].new_act", SLE_UINT16, SaveLoadVersion::MinVersion, SaveLoadVersion::ScriptTownGrowth),
SLE_CONDARR(Town, goal, SLE_UINT32, to_underlying(TownAcceptanceEffect::End), SaveLoadVersion::ScriptTownGrowth, SaveLoadVersion::MaxVersion),
SLE_CONDSSTR(Town, text, SLE_STR | SLF_ALLOW_CONTROL, SaveLoadVersion::ScriptTownText, SaveLoadVersion::MaxVersion),
SLE_CONDSSTR(Town, text, SLE_STR | SLF_ALLOW_CONTROL, SaveLoadVersion::ScriptTownText, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Town, time_until_rebuild, SLE_FILE_U8 | SLE_VAR_U16, SaveLoadVersion::MinVersion, SaveLoadVersion::TownGrowthControl),
SLE_CONDVAR(Town, time_until_rebuild, SLE_UINT16, SaveLoadVersion::TownGrowthControl, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Town, grow_counter, SLE_FILE_U8 | SLE_VAR_U16, SaveLoadVersion::MinVersion, SaveLoadVersion::TownGrowthControl),
SLE_CONDVAR(Town, grow_counter, SLE_UINT16, SaveLoadVersion::TownGrowthControl, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Town, growth_rate, SLE_FILE_U8 | SLE_VAR_I16, SaveLoadVersion::MinVersion, SaveLoadVersion::TownGrowthControl),
SLE_CONDVAR(Town, growth_rate, SLE_FILE_I16 | SLE_VAR_U16, SaveLoadVersion::TownGrowthControl, SaveLoadVersion::ScriptTownGrowth),
SLE_CONDVAR(Town, growth_rate, SLE_UINT16, SaveLoadVersion::ScriptTownGrowth, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Town, time_until_rebuild, SLE_FILE_U8 | SLE_VAR_U16, SaveLoadVersion::MinVersion, SaveLoadVersion::TownGrowthControl),
SLE_CONDVAR(Town, time_until_rebuild, SLE_UINT16, SaveLoadVersion::TownGrowthControl, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Town, grow_counter, SLE_FILE_U8 | SLE_VAR_U16, SaveLoadVersion::MinVersion, SaveLoadVersion::TownGrowthControl),
SLE_CONDVAR(Town, grow_counter, SLE_UINT16, SaveLoadVersion::TownGrowthControl, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Town, growth_rate, SLE_FILE_U8 | SLE_VAR_I16, SaveLoadVersion::MinVersion, SaveLoadVersion::TownGrowthControl),
SLE_CONDVAR(Town, growth_rate, SLE_FILE_I16 | SLE_VAR_U16, SaveLoadVersion::TownGrowthControl, SaveLoadVersion::ScriptTownGrowth),
SLE_CONDVAR(Town, growth_rate, SLE_UINT16, SaveLoadVersion::ScriptTownGrowth, SaveLoadVersion::MaxVersion),
SLE_VAR(Town, fund_buildings_months, SLE_UINT8),
SLE_VAR(Town, road_build_months, SLE_UINT8),
SLE_CONDVAR(Town, exclusivity, SLE_UINT8, SaveLoadVersion::VehicleCurrencyStationChanges, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Town, exclusive_counter, SLE_UINT8, SaveLoadVersion::VehicleCurrencyStationChanges, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Town, exclusivity, SLE_UINT8, SaveLoadVersion::VehicleCurrencyStationChanges, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Town, exclusive_counter, SLE_UINT8, SaveLoadVersion::VehicleCurrencyStationChanges, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Town, larger_town, SLE_BOOL, SaveLoadVersion::Cities, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Town, layout, SLE_UINT8, SaveLoadVersion::RoadLayoutPerTown, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Town, larger_town, SLE_BOOL, SaveLoadVersion::Cities, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Town, layout, SLE_UINT8, SaveLoadVersion::RoadLayoutPerTown, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Town, valid_history, SLE_UINT64, SaveLoadVersion::TownSupplyHistory, SaveLoadVersion::MaxVersion),
SLE_CONDREFVECTOR(Town, psa_list, REF_STORAGE, SaveLoadVersion::PersistentStoragePool, SaveLoadVersion::MaxVersion),
SLE_CONDREFVECTOR(Town, psa_list, REF_STORAGE, SaveLoadVersion::PersistentStoragePool, SaveLoadVersion::MaxVersion),
SLEG_CONDSTRUCTLIST("supplied", SlTownOldSupplied, SaveLoadVersion::ScriptTownGrowth, SaveLoadVersion::TownSupplyHistory),
SLEG_CONDSTRUCTLIST("supplied", SlTownSupplied, SaveLoadVersion::TownSupplyHistory, SaveLoadVersion::MaxVersion),
SLEG_CONDSTRUCTLIST("supplied", SlTownOldSupplied, SaveLoadVersion::ScriptTownGrowth, SaveLoadVersion::TownSupplyHistory),
SLEG_CONDSTRUCTLIST("supplied", SlTownSupplied, SaveLoadVersion::TownSupplyHistory, SaveLoadVersion::MaxVersion),
SLEG_STRUCTLIST("accepted", SlTownAccepted),
SLEG_CONDSTRUCTLIST("received", SlTownReceived, SaveLoadVersion::ScriptTownGrowth, SaveLoadVersion::MaxVersion),
SLEG_CONDSTRUCTLIST("acceptance_matrix", SlTownAcceptanceMatrix, SaveLoadVersion::InfrastructureMaintenanceCosts, SaveLoadVersion::RemoveTownCargoCache),
SLEG_CONDSTRUCTLIST("received", SlTownReceived, SaveLoadVersion::ScriptTownGrowth, SaveLoadVersion::MaxVersion),
SLEG_CONDSTRUCTLIST("acceptance_matrix", SlTownAcceptanceMatrix, SaveLoadVersion::InfrastructureMaintenanceCosts, SaveLoadVersion::RemoveTownCargoCache),
};
struct HIDSChunkHandler : NewGRFMappingChunkHandler {
src/saveload/vehicle_sl.cpp
+122 -122
View File
@@ -657,22 +657,22 @@ public:
SLE_VAR(Vehicle, subtype, SLE_UINT8),
SLE_REF(Vehicle, next, REF_VEHICLE_OLD),
SLE_CONDVAR(Vehicle, name, SLE_NAME, SaveLoadVersion::MinVersion, SaveLoadVersion::ReplaceCustomNameArray),
SLE_CONDSSTR(Vehicle, name, SLE_STR | SLF_ALLOW_CONTROL, SaveLoadVersion::ReplaceCustomNameArray, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Vehicle, unitnumber, SLE_FILE_U8 | SLE_VAR_U16, SaveLoadVersion::MinVersion, SaveLoadVersion::LargerUnitNumber),
SLE_CONDVAR(Vehicle, unitnumber, SLE_UINT16, SaveLoadVersion::LargerUnitNumber, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Vehicle, name, SLE_NAME, SaveLoadVersion::MinVersion, SaveLoadVersion::ReplaceCustomNameArray),
SLE_CONDSSTR(Vehicle, name, SLE_STR | SLF_ALLOW_CONTROL, SaveLoadVersion::ReplaceCustomNameArray, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Vehicle, unitnumber, SLE_FILE_U8 | SLE_VAR_U16, SaveLoadVersion::MinVersion, SaveLoadVersion::LargerUnitNumber),
SLE_CONDVAR(Vehicle, unitnumber, SLE_UINT16, SaveLoadVersion::LargerUnitNumber, SaveLoadVersion::MaxVersion),
SLE_VAR(Vehicle, owner, SLE_UINT8),
SLE_CONDVAR(Vehicle, tile, SLE_FILE_U16 | SLE_VAR_U32, SaveLoadVersion::MinVersion, SaveLoadVersion::MultipleRoadStops),
SLE_CONDVAR(Vehicle, tile, SLE_UINT32, SaveLoadVersion::MultipleRoadStops, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Vehicle, dest_tile, SLE_FILE_U16 | SLE_VAR_U32, SaveLoadVersion::MinVersion, SaveLoadVersion::MultipleRoadStops),
SLE_CONDVAR(Vehicle, dest_tile, SLE_UINT32, SaveLoadVersion::MultipleRoadStops, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Vehicle, tile, SLE_FILE_U16 | SLE_VAR_U32, SaveLoadVersion::MinVersion, SaveLoadVersion::MultipleRoadStops),
SLE_CONDVAR(Vehicle, tile, SLE_UINT32, SaveLoadVersion::MultipleRoadStops, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Vehicle, dest_tile, SLE_FILE_U16 | SLE_VAR_U32, SaveLoadVersion::MinVersion, SaveLoadVersion::MultipleRoadStops),
SLE_CONDVAR(Vehicle, dest_tile, SLE_UINT32, SaveLoadVersion::MultipleRoadStops, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Vehicle, x_pos, SLE_FILE_U16 | SLE_VAR_U32, SaveLoadVersion::MinVersion, SaveLoadVersion::MultipleRoadStops),
SLE_CONDVAR(Vehicle, x_pos, SLE_UINT32, SaveLoadVersion::MultipleRoadStops, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Vehicle, y_pos, SLE_FILE_U16 | SLE_VAR_U32, SaveLoadVersion::MinVersion, SaveLoadVersion::MultipleRoadStops),
SLE_CONDVAR(Vehicle, y_pos, SLE_UINT32, SaveLoadVersion::MultipleRoadStops, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Vehicle, z_pos, SLE_FILE_U8 | SLE_VAR_I32, SaveLoadVersion::MinVersion, SaveLoadVersion::VehicleCentreAndZPos),
SLE_CONDVAR(Vehicle, z_pos, SLE_INT32, SaveLoadVersion::VehicleCentreAndZPos, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Vehicle, x_pos, SLE_FILE_U16 | SLE_VAR_U32, SaveLoadVersion::MinVersion, SaveLoadVersion::MultipleRoadStops),
SLE_CONDVAR(Vehicle, x_pos, SLE_UINT32, SaveLoadVersion::MultipleRoadStops, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Vehicle, y_pos, SLE_FILE_U16 | SLE_VAR_U32, SaveLoadVersion::MinVersion, SaveLoadVersion::MultipleRoadStops),
SLE_CONDVAR(Vehicle, y_pos, SLE_UINT32, SaveLoadVersion::MultipleRoadStops, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Vehicle, z_pos, SLE_FILE_U8 | SLE_VAR_I32, SaveLoadVersion::MinVersion, SaveLoadVersion::VehicleCentreAndZPos),
SLE_CONDVAR(Vehicle, z_pos, SLE_INT32, SaveLoadVersion::VehicleCentreAndZPos, SaveLoadVersion::MaxVersion),
SLE_VAR(Vehicle, direction, SLE_UINT8),
SLE_VAR(Vehicle, spritenum, SLE_UINT8),
@@ -680,108 +680,108 @@ public:
SLE_VAR(Vehicle, cur_speed, SLE_UINT16),
SLE_VAR(Vehicle, subspeed, SLE_UINT8),
SLE_VAR(Vehicle, acceleration, SLE_UINT8),
SLE_CONDVAR(Vehicle, motion_counter, SLE_UINT32, SaveLoadVersion::VehMotionCounter, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Vehicle, motion_counter, SLE_UINT32, SaveLoadVersion::VehMotionCounter, SaveLoadVersion::MaxVersion),
SLE_VAR(Vehicle, progress, SLE_UINT8),
SLE_VAR(Vehicle, vehstatus, SLE_UINT8),
SLE_CONDVAR(Vehicle, last_station_visited, SLE_FILE_U8 | SLE_VAR_U16, SaveLoadVersion::MinVersion, SaveLoadVersion::BigMap),
SLE_CONDVAR(Vehicle, last_station_visited, SLE_UINT16, SaveLoadVersion::BigMap, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Vehicle, last_loading_station, SLE_UINT16, SaveLoadVersion::GoalProgressPlaneAcceleration, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Vehicle, last_station_visited, SLE_FILE_U8 | SLE_VAR_U16, SaveLoadVersion::MinVersion, SaveLoadVersion::BigMap),
SLE_CONDVAR(Vehicle, last_station_visited, SLE_UINT16, SaveLoadVersion::BigMap, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Vehicle, last_loading_station, SLE_UINT16, SaveLoadVersion::GoalProgressPlaneAcceleration, SaveLoadVersion::MaxVersion),
SLE_VAR(Vehicle, cargo_type, SLE_UINT8),
SLE_CONDVAR(Vehicle, cargo_subtype, SLE_UINT8, SaveLoadVersion::LiveryRefit, SaveLoadVersion::MaxVersion),
SLEG_CONDVAR("cargo_days", _cargo_periods, SLE_UINT8, SaveLoadVersion::MinVersion, SaveLoadVersion::CargoPackets),
SLEG_CONDVAR("cargo_source", _cargo_source, SLE_FILE_U8 | SLE_VAR_U16, SaveLoadVersion::MinVersion, SaveLoadVersion::LargerCargoSource),
SLEG_CONDVAR("cargo_source", _cargo_source, SLE_UINT16, SaveLoadVersion::LargerCargoSource, SaveLoadVersion::CargoPackets),
SLEG_CONDVAR("cargo_source_xy", _cargo_source_xy, SLE_UINT32, SaveLoadVersion::CargoSourceTile, SaveLoadVersion::CargoPackets),
SLE_CONDVAR(Vehicle, cargo_subtype, SLE_UINT8, SaveLoadVersion::LiveryRefit, SaveLoadVersion::MaxVersion),
SLEG_CONDVAR("cargo_days", _cargo_periods, SLE_UINT8, SaveLoadVersion::MinVersion, SaveLoadVersion::CargoPackets),
SLEG_CONDVAR("cargo_source", _cargo_source, SLE_FILE_U8 | SLE_VAR_U16, SaveLoadVersion::MinVersion, SaveLoadVersion::LargerCargoSource),
SLEG_CONDVAR("cargo_source", _cargo_source, SLE_UINT16, SaveLoadVersion::LargerCargoSource, SaveLoadVersion::CargoPackets),
SLEG_CONDVAR("cargo_source_xy", _cargo_source_xy, SLE_UINT32, SaveLoadVersion::CargoSourceTile, SaveLoadVersion::CargoPackets),
SLE_VAR(Vehicle, cargo_cap, SLE_UINT16),
SLE_CONDVAR(Vehicle, refit_cap, SLE_UINT16, SaveLoadVersion::GoalProgressPlaneAcceleration, SaveLoadVersion::MaxVersion),
SLEG_CONDVAR("cargo_count", _cargo_count, SLE_UINT16, SaveLoadVersion::MinVersion, SaveLoadVersion::CargoPackets),
SLE_CONDREFLIST(Vehicle, cargo.packets, REF_CARGO_PACKET, SaveLoadVersion::CargoPackets, SaveLoadVersion::MaxVersion),
SLE_CONDARR(Vehicle, cargo.action_counts, SLE_UINT, to_underlying(VehicleCargoList::MoveToAction::End), SaveLoadVersion::CargoReservation, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Vehicle, cargo_age_counter, SLE_UINT16, SaveLoadVersion::NewGRFCustomCargoAging, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Vehicle, refit_cap, SLE_UINT16, SaveLoadVersion::GoalProgressPlaneAcceleration, SaveLoadVersion::MaxVersion),
SLEG_CONDVAR("cargo_count", _cargo_count, SLE_UINT16, SaveLoadVersion::MinVersion, SaveLoadVersion::CargoPackets),
SLE_CONDREFLIST(Vehicle, cargo.packets, REF_CARGO_PACKET, SaveLoadVersion::CargoPackets, SaveLoadVersion::MaxVersion),
SLE_CONDARR(Vehicle, cargo.action_counts, SLE_UINT, to_underlying(VehicleCargoList::MoveToAction::End), SaveLoadVersion::CargoReservation, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Vehicle, cargo_age_counter, SLE_UINT16, SaveLoadVersion::NewGRFCustomCargoAging, SaveLoadVersion::MaxVersion),
SLE_VAR(Vehicle, day_counter, SLE_UINT8),
SLE_VAR(Vehicle, tick_counter, SLE_UINT8),
SLE_CONDVAR(Vehicle, running_ticks, SLE_UINT8, SaveLoadVersion::FractionProfitRunningTicks, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Vehicle, running_ticks, SLE_UINT8, SaveLoadVersion::FractionProfitRunningTicks, SaveLoadVersion::MaxVersion),
SLE_VAR(Vehicle, cur_implicit_order_index, SLE_UINT8),
SLE_CONDVAR(Vehicle, cur_real_order_index, SLE_UINT8, SaveLoadVersion::TrackRealAndAutoOrders, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Vehicle, cur_real_order_index, SLE_UINT8, SaveLoadVersion::TrackRealAndAutoOrders, SaveLoadVersion::MaxVersion),
/* This next line is for version 4 and prior compatibility.. it temporarily reads
type and flags (which were both 4 bits) into type. Later on this is
converted correctly */
SLE_CONDVAR(Vehicle, current_order.type, SLE_UINT8, SaveLoadVersion::MinVersion, SaveLoadVersion::BigMap),
SLE_CONDVAR(Vehicle, current_order.dest, SLE_FILE_U8 | SLE_VAR_U16, SaveLoadVersion::MinVersion, SaveLoadVersion::BigMap),
SLE_CONDVAR(Vehicle, current_order.type, SLE_UINT8, SaveLoadVersion::MinVersion, SaveLoadVersion::BigMap),
SLE_CONDVAR(Vehicle, current_order.dest, SLE_FILE_U8 | SLE_VAR_U16, SaveLoadVersion::MinVersion, SaveLoadVersion::BigMap),
/* Orders for version 5 and on */
SLE_CONDVAR(Vehicle, current_order.type, SLE_UINT8, SaveLoadVersion::BigMap, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Vehicle, current_order.flags, SLE_UINT8, SaveLoadVersion::BigMap, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Vehicle, current_order.dest, SLE_UINT16, SaveLoadVersion::BigMap, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Vehicle, current_order.type, SLE_UINT8, SaveLoadVersion::BigMap, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Vehicle, current_order.flags, SLE_UINT8, SaveLoadVersion::BigMap, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Vehicle, current_order.dest, SLE_UINT16, SaveLoadVersion::BigMap, SaveLoadVersion::MaxVersion),
/* Refit in current order */
SLE_CONDVAR(Vehicle, current_order.refit_cargo, SLE_UINT8, SaveLoadVersion::RefitOrders, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Vehicle, current_order.refit_cargo, SLE_UINT8, SaveLoadVersion::RefitOrders, SaveLoadVersion::MaxVersion),
/* Timetable in current order */
SLE_CONDVAR(Vehicle, current_order.wait_time, SLE_UINT16, SaveLoadVersion::Timetables, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Vehicle, current_order.travel_time, SLE_UINT16, SaveLoadVersion::Timetables, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Vehicle, current_order.max_speed, SLE_UINT16, SaveLoadVersion::CurrentOrderMaxSpeed, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Vehicle, timetable_start, SLE_FILE_I32 | SLE_VAR_U64, SaveLoadVersion::TimetableStart, SaveLoadVersion::TimetableStartTicks),
SLE_CONDVAR(Vehicle, timetable_start, SLE_UINT64, SaveLoadVersion::TimetableStartTicks, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Vehicle, current_order.wait_time, SLE_UINT16, SaveLoadVersion::Timetables, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Vehicle, current_order.travel_time, SLE_UINT16, SaveLoadVersion::Timetables, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Vehicle, current_order.max_speed, SLE_UINT16, SaveLoadVersion::CurrentOrderMaxSpeed, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Vehicle, timetable_start, SLE_FILE_I32 | SLE_VAR_U64, SaveLoadVersion::TimetableStart, SaveLoadVersion::TimetableStartTicks),
SLE_CONDVAR(Vehicle, timetable_start, SLE_UINT64, SaveLoadVersion::TimetableStartTicks, SaveLoadVersion::MaxVersion),
SLE_CONDVARNAME(Vehicle, old_orders, "orders", SLE_FILE_U16 | SLE_VAR_U32, SaveLoadVersion::MinVersion, SaveLoadVersion::MoreCargoPackets),
SLE_CONDVARNAME(Vehicle, old_orders, "orders", SLE_UINT32, SaveLoadVersion::MoreCargoPackets, SaveLoadVersion::OrderList),
SLE_CONDREF(Vehicle, orders, REF_ORDERLIST, SaveLoadVersion::OrderList, SaveLoadVersion::MaxVersion),
SLE_CONDVARNAME(Vehicle, old_orders, "orders", SLE_UINT32, SaveLoadVersion::MoreCargoPackets, SaveLoadVersion::OrderList),
SLE_CONDREF(Vehicle, orders, REF_ORDERLIST, SaveLoadVersion::OrderList, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Vehicle, age, SLE_FILE_U16 | SLE_VAR_I32, SaveLoadVersion::MinVersion, SaveLoadVersion::BigDates),
SLE_CONDVAR(Vehicle, age, SLE_INT32, SaveLoadVersion::BigDates, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Vehicle, economy_age, SLE_INT32, SaveLoadVersion::VehicleEconomyAge, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Vehicle, max_age, SLE_FILE_U16 | SLE_VAR_I32, SaveLoadVersion::MinVersion, SaveLoadVersion::BigDates),
SLE_CONDVAR(Vehicle, max_age, SLE_INT32, SaveLoadVersion::BigDates, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Vehicle, date_of_last_service, SLE_FILE_U16 | SLE_VAR_I32, SaveLoadVersion::MinVersion, SaveLoadVersion::BigDates),
SLE_CONDVAR(Vehicle, date_of_last_service, SLE_INT32, SaveLoadVersion::BigDates, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Vehicle, date_of_last_service_newgrf, SLE_INT32, SaveLoadVersion::NewGRFLastService, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Vehicle, service_interval, SLE_UINT16, SaveLoadVersion::MinVersion, SaveLoadVersion::BigDates),
SLE_CONDVAR(Vehicle, service_interval, SLE_FILE_U32 | SLE_VAR_U16, SaveLoadVersion::BigDates, SaveLoadVersion::ServiceIntervalPercent),
SLE_CONDVAR(Vehicle, service_interval, SLE_UINT16, SaveLoadVersion::ServiceIntervalPercent, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Vehicle, age, SLE_FILE_U16 | SLE_VAR_I32, SaveLoadVersion::MinVersion, SaveLoadVersion::BigDates),
SLE_CONDVAR(Vehicle, age, SLE_INT32, SaveLoadVersion::BigDates, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Vehicle, economy_age, SLE_INT32, SaveLoadVersion::VehicleEconomyAge, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Vehicle, max_age, SLE_FILE_U16 | SLE_VAR_I32, SaveLoadVersion::MinVersion, SaveLoadVersion::BigDates),
SLE_CONDVAR(Vehicle, max_age, SLE_INT32, SaveLoadVersion::BigDates, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Vehicle, date_of_last_service, SLE_FILE_U16 | SLE_VAR_I32, SaveLoadVersion::MinVersion, SaveLoadVersion::BigDates),
SLE_CONDVAR(Vehicle, date_of_last_service, SLE_INT32, SaveLoadVersion::BigDates, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Vehicle, date_of_last_service_newgrf, SLE_INT32, SaveLoadVersion::NewGRFLastService, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Vehicle, service_interval, SLE_UINT16, SaveLoadVersion::MinVersion, SaveLoadVersion::BigDates),
SLE_CONDVAR(Vehicle, service_interval, SLE_FILE_U32 | SLE_VAR_U16, SaveLoadVersion::BigDates, SaveLoadVersion::ServiceIntervalPercent),
SLE_CONDVAR(Vehicle, service_interval, SLE_UINT16, SaveLoadVersion::ServiceIntervalPercent, SaveLoadVersion::MaxVersion),
SLE_VAR(Vehicle, reliability, SLE_UINT16),
SLE_VAR(Vehicle, reliability_spd_dec, SLE_UINT16),
SLE_VAR(Vehicle, breakdown_ctr, SLE_UINT8),
SLE_VAR(Vehicle, breakdown_delay, SLE_UINT8),
SLE_VAR(Vehicle, breakdowns_since_last_service, SLE_UINT8),
SLE_VAR(Vehicle, breakdown_chance, SLE_UINT8),
SLE_CONDVAR(Vehicle, build_year, SLE_FILE_U8 | SLE_VAR_I32, SaveLoadVersion::MinVersion, SaveLoadVersion::BigDates),
SLE_CONDVAR(Vehicle, build_year, SLE_INT32, SaveLoadVersion::BigDates, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Vehicle, build_year, SLE_FILE_U8 | SLE_VAR_I32, SaveLoadVersion::MinVersion, SaveLoadVersion::BigDates),
SLE_CONDVAR(Vehicle, build_year, SLE_INT32, SaveLoadVersion::BigDates, SaveLoadVersion::MaxVersion),
SLE_VAR(Vehicle, load_unload_ticks, SLE_UINT16),
SLEG_CONDVAR("cargo_paid_for", _cargo_paid_for, SLE_UINT16, SaveLoadVersion::CountPaidForCargo, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Vehicle, vehicle_flags, SLE_FILE_U8 | SLE_VAR_U16, SaveLoadVersion::GradualLoading, SaveLoadVersion::ServiceIntervalPercent),
SLE_CONDVAR(Vehicle, vehicle_flags, SLE_UINT16, SaveLoadVersion::ServiceIntervalPercent, SaveLoadVersion::MaxVersion),
SLEG_CONDVAR("cargo_paid_for", _cargo_paid_for, SLE_UINT16, SaveLoadVersion::CountPaidForCargo, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Vehicle, vehicle_flags, SLE_FILE_U8 | SLE_VAR_U16, SaveLoadVersion::GradualLoading, SaveLoadVersion::ServiceIntervalPercent),
SLE_CONDVAR(Vehicle, vehicle_flags, SLE_UINT16, SaveLoadVersion::ServiceIntervalPercent, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Vehicle, profit_this_year, SLE_FILE_I32 | SLE_VAR_I64, SaveLoadVersion::MinVersion, SaveLoadVersion::UnifyCurrency),
SLE_CONDVAR(Vehicle, profit_this_year, SLE_INT64, SaveLoadVersion::UnifyCurrency, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Vehicle, profit_last_year, SLE_FILE_I32 | SLE_VAR_I64, SaveLoadVersion::MinVersion, SaveLoadVersion::UnifyCurrency),
SLE_CONDVAR(Vehicle, profit_last_year, SLE_INT64, SaveLoadVersion::UnifyCurrency, SaveLoadVersion::MaxVersion),
SLEG_CONDVAR("cargo_feeder_share", _cargo_feeder_share, SLE_FILE_I32 | SLE_VAR_I64, SaveLoadVersion::FeederShare, SaveLoadVersion::UnifyCurrency),
SLEG_CONDVAR("cargo_feeder_share", _cargo_feeder_share, SLE_INT64, SaveLoadVersion::UnifyCurrency, SaveLoadVersion::CargoPackets),
SLE_CONDVAR(Vehicle, value, SLE_FILE_I32 | SLE_VAR_I64, SaveLoadVersion::MinVersion, SaveLoadVersion::UnifyCurrency),
SLE_CONDVAR(Vehicle, value, SLE_INT64, SaveLoadVersion::UnifyCurrency, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Vehicle, profit_this_year, SLE_FILE_I32 | SLE_VAR_I64, SaveLoadVersion::MinVersion, SaveLoadVersion::UnifyCurrency),
SLE_CONDVAR(Vehicle, profit_this_year, SLE_INT64, SaveLoadVersion::UnifyCurrency, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Vehicle, profit_last_year, SLE_FILE_I32 | SLE_VAR_I64, SaveLoadVersion::MinVersion, SaveLoadVersion::UnifyCurrency),
SLE_CONDVAR(Vehicle, profit_last_year, SLE_INT64, SaveLoadVersion::UnifyCurrency, SaveLoadVersion::MaxVersion),
SLEG_CONDVAR("cargo_feeder_share", _cargo_feeder_share, SLE_FILE_I32 | SLE_VAR_I64, SaveLoadVersion::FeederShare, SaveLoadVersion::UnifyCurrency),
SLEG_CONDVAR("cargo_feeder_share", _cargo_feeder_share, SLE_INT64, SaveLoadVersion::UnifyCurrency, SaveLoadVersion::CargoPackets),
SLE_CONDVAR(Vehicle, value, SLE_FILE_I32 | SLE_VAR_I64, SaveLoadVersion::MinVersion, SaveLoadVersion::UnifyCurrency),
SLE_CONDVAR(Vehicle, value, SLE_INT64, SaveLoadVersion::UnifyCurrency, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Vehicle, random_bits, SLE_FILE_U8 | SLE_VAR_U16, SaveLoadVersion::VehicleCurrencyStationChanges, SaveLoadVersion::ExtendVehicleRandom),
SLE_CONDVAR(Vehicle, random_bits, SLE_UINT16, SaveLoadVersion::ExtendVehicleRandom, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Vehicle, random_bits, SLE_FILE_U8 | SLE_VAR_U16, SaveLoadVersion::VehicleCurrencyStationChanges, SaveLoadVersion::ExtendVehicleRandom),
SLE_CONDVAR(Vehicle, random_bits, SLE_UINT16, SaveLoadVersion::ExtendVehicleRandom, SaveLoadVersion::MaxVersion),
SLE_CONDVARNAME(Vehicle, waiting_random_triggers, "waiting_triggers", SLE_UINT8, SaveLoadVersion::VehicleCurrencyStationChanges, SaveLoadVersion::MaxVersion),
SLE_CONDREF(Vehicle, next_shared, REF_VEHICLE, SaveLoadVersion::VehicleCurrencyStationChanges, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Vehicle, group_id, SLE_UINT16, SaveLoadVersion::VehicleGroups, SaveLoadVersion::MaxVersion),
SLE_CONDREF(Vehicle, next_shared, REF_VEHICLE, SaveLoadVersion::VehicleCurrencyStationChanges, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Vehicle, group_id, SLE_UINT16, SaveLoadVersion::VehicleGroups, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Vehicle, current_order_time, SLE_FILE_U32 | SLE_VAR_I32, SaveLoadVersion::Timetables, SaveLoadVersion::TimetableTicksType),
SLE_CONDVAR(Vehicle, current_order_time, SLE_INT32, SaveLoadVersion::TimetableTicksType, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Vehicle, last_loading_tick, SLE_UINT64, SaveLoadVersion::LastLoadingTick, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Vehicle, lateness_counter, SLE_INT32, SaveLoadVersion::Timetables, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Vehicle, current_order_time, SLE_FILE_U32 | SLE_VAR_I32, SaveLoadVersion::Timetables, SaveLoadVersion::TimetableTicksType),
SLE_CONDVAR(Vehicle, current_order_time, SLE_INT32, SaveLoadVersion::TimetableTicksType, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Vehicle, last_loading_tick, SLE_UINT64, SaveLoadVersion::LastLoadingTick, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Vehicle, lateness_counter, SLE_INT32, SaveLoadVersion::Timetables, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Vehicle, depot_unbunching_last_departure, SLE_UINT64, SaveLoadVersion::DepotUnbunching, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Vehicle, depot_unbunching_next_departure, SLE_UINT64, SaveLoadVersion::DepotUnbunching, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Vehicle, round_trip_time, SLE_INT32, SaveLoadVersion::DepotUnbunching, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Vehicle, depot_unbunching_last_departure, SLE_UINT64, SaveLoadVersion::DepotUnbunching, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Vehicle, depot_unbunching_next_departure, SLE_UINT64, SaveLoadVersion::DepotUnbunching, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Vehicle, round_trip_time, SLE_INT32, SaveLoadVersion::DepotUnbunching, SaveLoadVersion::MaxVersion),
};
static inline const SaveLoadCompatTable compat_description = _vehicle_common_sl_compat;
@@ -810,10 +810,10 @@ public:
SLE_VAR(Train, force_proceed, SLE_UINT8),
SLE_VAR(Train, track, SLE_UINT8),
SLE_CONDVAR(Train, flags, SLE_FILE_U8 | SLE_VAR_U16, SaveLoadVersion::VehicleCurrencyStationChanges, SaveLoadVersion::Yapp),
SLE_CONDVAR(Train, flags, SLE_UINT16, SaveLoadVersion::Yapp, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Train, wait_counter, SLE_UINT16, SaveLoadVersion::SplitLoadWaitCounters, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Train, gv_flags, SLE_UINT16, SaveLoadVersion::RvRealisticAcceleration, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Train, flags, SLE_FILE_U8 | SLE_VAR_U16, SaveLoadVersion::VehicleCurrencyStationChanges, SaveLoadVersion::Yapp),
SLE_CONDVAR(Train, flags, SLE_UINT16, SaveLoadVersion::Yapp, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Train, wait_counter, SLE_UINT16, SaveLoadVersion::SplitLoadWaitCounters, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Train, gv_flags, SLE_UINT16, SaveLoadVersion::RvRealisticAcceleration, SaveLoadVersion::MaxVersion),
};
static inline const SaveLoadCompatTable compat_description = _vehicle_train_sl_compat;
@@ -864,10 +864,10 @@ public:
SLE_VAR(RoadVehicle, overtaking_ctr, SLE_UINT8),
SLE_VAR(RoadVehicle, crashed_ctr, SLE_UINT16),
SLE_VAR(RoadVehicle, reverse_ctr, SLE_UINT8),
SLEG_CONDVECTOR("path.td", rv_path_td, SLE_UINT8, SaveLoadVersion::RoadvehPathCache, SaveLoadVersion::PathCacheFormat),
SLEG_CONDVECTOR("path.tile", rv_path_tile, SLE_UINT32, SaveLoadVersion::RoadvehPathCache, SaveLoadVersion::PathCacheFormat),
SLEG_CONDVECTOR("path.td", rv_path_td, SLE_UINT8, SaveLoadVersion::RoadvehPathCache, SaveLoadVersion::PathCacheFormat),
SLEG_CONDVECTOR("path.tile", rv_path_tile, SLE_UINT32, SaveLoadVersion::RoadvehPathCache, SaveLoadVersion::PathCacheFormat),
SLEG_CONDSTRUCTLIST("path", SlVehicleRoadVehPath, SaveLoadVersion::PathCacheFormat, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(RoadVehicle, gv_flags, SLE_UINT16, SaveLoadVersion::RvRealisticAcceleration, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(RoadVehicle, gv_flags, SLE_UINT16, SaveLoadVersion::RvRealisticAcceleration, SaveLoadVersion::MaxVersion),
};
static inline const SaveLoadCompatTable compat_description = _vehicle_roadveh_sl_compat;
@@ -931,7 +931,7 @@ public:
SLE_VAR(Ship, state, SLE_UINT8),
SLEG_CONDVECTOR("path", ship_path_td, SLE_UINT8, SaveLoadVersion::ShipPathCache, SaveLoadVersion::PathCacheFormat),
SLEG_CONDSTRUCTLIST("path", SlVehicleShipPath, SaveLoadVersion::PathCacheFormat, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Ship, rotation, SLE_UINT8, SaveLoadVersion::ShipRotation, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Ship, rotation, SLE_UINT8, SaveLoadVersion::ShipRotation, SaveLoadVersion::MaxVersion),
};
static inline const SaveLoadCompatTable compat_description = _vehicle_ship_sl_compat;
@@ -967,17 +967,17 @@ public:
SLE_VAR(Aircraft, crashed_counter, SLE_UINT16),
SLE_VAR(Aircraft, pos, SLE_UINT8),
SLE_CONDVAR(Aircraft, targetairport, SLE_FILE_U8 | SLE_VAR_U16, SaveLoadVersion::MinVersion, SaveLoadVersion::BigMap),
SLE_CONDVAR(Aircraft, targetairport, SLE_UINT16, SaveLoadVersion::BigMap, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Aircraft, targetairport, SLE_FILE_U8 | SLE_VAR_U16, SaveLoadVersion::MinVersion, SaveLoadVersion::BigMap),
SLE_CONDVAR(Aircraft, targetairport, SLE_UINT16, SaveLoadVersion::BigMap, SaveLoadVersion::MaxVersion),
SLE_VAR(Aircraft, state, SLE_UINT8),
SLE_CONDVAR(Aircraft, previous_pos, SLE_UINT8, SaveLoadVersion::VehicleCurrencyStationChanges, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Aircraft, last_direction, SLE_UINT8, SaveLoadVersion::VehicleCurrencyStationChanges, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Aircraft, number_consecutive_turns, SLE_UINT8, SaveLoadVersion::VehicleCurrencyStationChanges, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Aircraft, previous_pos, SLE_UINT8, SaveLoadVersion::VehicleCurrencyStationChanges, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Aircraft, last_direction, SLE_UINT8, SaveLoadVersion::VehicleCurrencyStationChanges, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Aircraft, number_consecutive_turns, SLE_UINT8, SaveLoadVersion::VehicleCurrencyStationChanges, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Aircraft, turn_counter, SLE_UINT8, SaveLoadVersion::SplitLoadWaitCounters, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Aircraft, flags, SLE_UINT8, SaveLoadVersion::NewGRFAircraftRange, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Aircraft, turn_counter, SLE_UINT8, SaveLoadVersion::SplitLoadWaitCounters, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Aircraft, flags, SLE_UINT8, SaveLoadVersion::NewGRFAircraftRange, SaveLoadVersion::MaxVersion),
};
static inline const SaveLoadCompatTable compat_description = _vehicle_aircraft_sl_compat;
@@ -1005,15 +1005,15 @@ public:
static inline const SaveLoad description[] = {
SLE_VAR(Vehicle, subtype, SLE_UINT8),
SLE_CONDVAR(Vehicle, tile, SLE_FILE_U16 | SLE_VAR_U32, SaveLoadVersion::MinVersion, SaveLoadVersion::MultipleRoadStops),
SLE_CONDVAR(Vehicle, tile, SLE_UINT32, SaveLoadVersion::MultipleRoadStops, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Vehicle, tile, SLE_FILE_U16 | SLE_VAR_U32, SaveLoadVersion::MinVersion, SaveLoadVersion::MultipleRoadStops),
SLE_CONDVAR(Vehicle, tile, SLE_UINT32, SaveLoadVersion::MultipleRoadStops, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Vehicle, x_pos, SLE_FILE_I16 | SLE_VAR_I32, SaveLoadVersion::MinVersion, SaveLoadVersion::MultipleRoadStops),
SLE_CONDVAR(Vehicle, x_pos, SLE_INT32, SaveLoadVersion::MultipleRoadStops, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Vehicle, y_pos, SLE_FILE_I16 | SLE_VAR_I32, SaveLoadVersion::MinVersion, SaveLoadVersion::MultipleRoadStops),
SLE_CONDVAR(Vehicle, y_pos, SLE_INT32, SaveLoadVersion::MultipleRoadStops, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Vehicle, z_pos, SLE_FILE_U8 | SLE_VAR_I32, SaveLoadVersion::MinVersion, SaveLoadVersion::VehicleCentreAndZPos),
SLE_CONDVAR(Vehicle, z_pos, SLE_INT32, SaveLoadVersion::VehicleCentreAndZPos, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Vehicle, x_pos, SLE_FILE_I16 | SLE_VAR_I32, SaveLoadVersion::MinVersion, SaveLoadVersion::MultipleRoadStops),
SLE_CONDVAR(Vehicle, x_pos, SLE_INT32, SaveLoadVersion::MultipleRoadStops, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Vehicle, y_pos, SLE_FILE_I16 | SLE_VAR_I32, SaveLoadVersion::MinVersion, SaveLoadVersion::MultipleRoadStops),
SLE_CONDVAR(Vehicle, y_pos, SLE_INT32, SaveLoadVersion::MultipleRoadStops, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Vehicle, z_pos, SLE_FILE_U8 | SLE_VAR_I32, SaveLoadVersion::MinVersion, SaveLoadVersion::VehicleCentreAndZPos),
SLE_CONDVAR(Vehicle, z_pos, SLE_INT32, SaveLoadVersion::VehicleCentreAndZPos, SaveLoadVersion::MaxVersion),
SLE_VAR(Vehicle, sprite_cache.sprite_seq.seq[0].sprite, SLE_FILE_U16 | SLE_VAR_U32),
SLE_VAR(Vehicle, progress, SLE_UINT8),
@@ -1022,7 +1022,7 @@ public:
SLE_VAR(EffectVehicle, animation_state, SLE_UINT16),
SLE_VAR(EffectVehicle, animation_substate, SLE_UINT8),
SLE_CONDVAR(Vehicle, spritenum, SLE_UINT8, SaveLoadVersion::VehicleCurrencyStationChanges, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Vehicle, spritenum, SLE_UINT8, SaveLoadVersion::VehicleCurrencyStationChanges, SaveLoadVersion::MaxVersion),
};
static inline const SaveLoadCompatTable compat_description = _vehicle_effect_sl_compat;
@@ -1051,35 +1051,35 @@ public:
SLE_REF(Vehicle, next, REF_VEHICLE_OLD),
SLE_VAR(Vehicle, subtype, SLE_UINT8),
SLE_CONDVAR(Vehicle, tile, SLE_FILE_U16 | SLE_VAR_U32, SaveLoadVersion::MinVersion, SaveLoadVersion::MultipleRoadStops),
SLE_CONDVAR(Vehicle, tile, SLE_UINT32, SaveLoadVersion::MultipleRoadStops, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Vehicle, dest_tile, SLE_FILE_U16 | SLE_VAR_U32, SaveLoadVersion::MinVersion, SaveLoadVersion::MultipleRoadStops),
SLE_CONDVAR(Vehicle, dest_tile, SLE_UINT32, SaveLoadVersion::MultipleRoadStops, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Vehicle, tile, SLE_FILE_U16 | SLE_VAR_U32, SaveLoadVersion::MinVersion, SaveLoadVersion::MultipleRoadStops),
SLE_CONDVAR(Vehicle, tile, SLE_UINT32, SaveLoadVersion::MultipleRoadStops, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Vehicle, dest_tile, SLE_FILE_U16 | SLE_VAR_U32, SaveLoadVersion::MinVersion, SaveLoadVersion::MultipleRoadStops),
SLE_CONDVAR(Vehicle, dest_tile, SLE_UINT32, SaveLoadVersion::MultipleRoadStops, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Vehicle, x_pos, SLE_FILE_I16 | SLE_VAR_I32, SaveLoadVersion::MinVersion, SaveLoadVersion::MultipleRoadStops),
SLE_CONDVAR(Vehicle, x_pos, SLE_INT32, SaveLoadVersion::MultipleRoadStops, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Vehicle, y_pos, SLE_FILE_I16 | SLE_VAR_I32, SaveLoadVersion::MinVersion, SaveLoadVersion::MultipleRoadStops),
SLE_CONDVAR(Vehicle, y_pos, SLE_INT32, SaveLoadVersion::MultipleRoadStops, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Vehicle, z_pos, SLE_FILE_U8 | SLE_VAR_I32, SaveLoadVersion::MinVersion, SaveLoadVersion::VehicleCentreAndZPos),
SLE_CONDVAR(Vehicle, z_pos, SLE_INT32, SaveLoadVersion::VehicleCentreAndZPos, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Vehicle, x_pos, SLE_FILE_I16 | SLE_VAR_I32, SaveLoadVersion::MinVersion, SaveLoadVersion::MultipleRoadStops),
SLE_CONDVAR(Vehicle, x_pos, SLE_INT32, SaveLoadVersion::MultipleRoadStops, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Vehicle, y_pos, SLE_FILE_I16 | SLE_VAR_I32, SaveLoadVersion::MinVersion, SaveLoadVersion::MultipleRoadStops),
SLE_CONDVAR(Vehicle, y_pos, SLE_INT32, SaveLoadVersion::MultipleRoadStops, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Vehicle, z_pos, SLE_FILE_U8 | SLE_VAR_I32, SaveLoadVersion::MinVersion, SaveLoadVersion::VehicleCentreAndZPos),
SLE_CONDVAR(Vehicle, z_pos, SLE_INT32, SaveLoadVersion::VehicleCentreAndZPos, SaveLoadVersion::MaxVersion),
SLE_VAR(Vehicle, direction, SLE_UINT8),
SLE_VAR(Vehicle, owner, SLE_UINT8),
SLE_VAR(Vehicle, vehstatus, SLE_UINT8),
SLE_CONDVARNAME(DisasterVehicle, state, "current_order.dest", SLE_FILE_U8 | SLE_VAR_U16, SaveLoadVersion::MinVersion, SaveLoadVersion::BigMap),
SLE_CONDVARNAME(DisasterVehicle, state, "current_order.dest", SLE_UINT16, SaveLoadVersion::BigMap, SaveLoadVersion::DisasterVehState),
SLE_CONDVAR(DisasterVehicle, state, SLE_UINT16, SaveLoadVersion::DisasterVehState, SaveLoadVersion::MaxVersion),
SLE_CONDVARNAME(DisasterVehicle, state, "current_order.dest", SLE_FILE_U8 | SLE_VAR_U16, SaveLoadVersion::MinVersion, SaveLoadVersion::BigMap),
SLE_CONDVARNAME(DisasterVehicle, state, "current_order.dest", SLE_UINT16, SaveLoadVersion::BigMap, SaveLoadVersion::DisasterVehState),
SLE_CONDVAR(DisasterVehicle, state, SLE_UINT16, SaveLoadVersion::DisasterVehState, SaveLoadVersion::MaxVersion),
SLE_VAR(Vehicle, sprite_cache.sprite_seq.seq[0].sprite, SLE_FILE_U16 | SLE_VAR_U32),
SLE_CONDVAR(Vehicle, age, SLE_FILE_U16 | SLE_VAR_I32, SaveLoadVersion::MinVersion, SaveLoadVersion::BigDates),
SLE_CONDVAR(Vehicle, age, SLE_INT32, SaveLoadVersion::BigDates, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(Vehicle, age, SLE_FILE_U16 | SLE_VAR_I32, SaveLoadVersion::MinVersion, SaveLoadVersion::BigDates),
SLE_CONDVAR(Vehicle, age, SLE_INT32, SaveLoadVersion::BigDates, SaveLoadVersion::MaxVersion),
SLE_VAR(Vehicle, tick_counter, SLE_UINT8),
SLE_CONDVAR(DisasterVehicle, image_override, SLE_FILE_U16 | SLE_VAR_U32, SaveLoadVersion::MinVersion, SaveLoadVersion::LinkgraphLocationDisasterStore),
SLE_CONDVAR(DisasterVehicle, image_override, SLE_UINT32, SaveLoadVersion::LinkgraphLocationDisasterStore, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(DisasterVehicle, big_ufo_destroyer_target, SLE_FILE_U16 | SLE_VAR_U32, SaveLoadVersion::MinVersion, SaveLoadVersion::LinkgraphLocationDisasterStore),
SLE_CONDVAR(DisasterVehicle, big_ufo_destroyer_target, SLE_UINT32, SaveLoadVersion::LinkgraphLocationDisasterStore, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(DisasterVehicle, flags, SLE_UINT8, SaveLoadVersion::MaxBridgeMapHeight, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(DisasterVehicle, image_override, SLE_FILE_U16 | SLE_VAR_U32, SaveLoadVersion::MinVersion, SaveLoadVersion::LinkgraphLocationDisasterStore),
SLE_CONDVAR(DisasterVehicle, image_override, SLE_UINT32, SaveLoadVersion::LinkgraphLocationDisasterStore, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(DisasterVehicle, big_ufo_destroyer_target, SLE_FILE_U16 | SLE_VAR_U32, SaveLoadVersion::MinVersion, SaveLoadVersion::LinkgraphLocationDisasterStore),
SLE_CONDVAR(DisasterVehicle, big_ufo_destroyer_target, SLE_UINT32, SaveLoadVersion::LinkgraphLocationDisasterStore, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(DisasterVehicle, flags, SLE_UINT8, SaveLoadVersion::MaxBridgeMapHeight, SaveLoadVersion::MaxVersion),
};
static inline const SaveLoadCompatTable compat_description = _vehicle_disaster_sl_compat;
src/saveload/waypoint_sl.cpp
+13 -13
View File
@@ -168,21 +168,21 @@ void ResetOldWaypoints()
}
static const SaveLoad _old_waypoint_desc[] = {
SLE_CONDVAR(OldWaypoint, xy, SLE_FILE_U16 | SLE_VAR_U32, SaveLoadVersion::MinVersion, SaveLoadVersion::MultipleRoadStops),
SLE_CONDVAR(OldWaypoint, xy, SLE_UINT32, SaveLoadVersion::MultipleRoadStops, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(OldWaypoint, town_index, SLE_UINT16, SaveLoadVersion::LinkWaypointToTown, SaveLoadVersion::WaypointMoreLikeStation),
SLE_CONDREF(OldWaypoint, town, REF_TOWN, SaveLoadVersion::WaypointMoreLikeStation, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(OldWaypoint, town_cn, SLE_FILE_U8 | SLE_VAR_U16, SaveLoadVersion::LinkWaypointToTown, SaveLoadVersion::MoreWaypointsPerTown),
SLE_CONDVAR(OldWaypoint, town_cn, SLE_UINT16, SaveLoadVersion::MoreWaypointsPerTown, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(OldWaypoint, string_id, SLE_STRINGID, SaveLoadVersion::MinVersion, SaveLoadVersion::ReplaceCustomNameArray),
SLE_CONDSSTR(OldWaypoint, name, SLE_STR, SaveLoadVersion::ReplaceCustomNameArray, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(OldWaypoint, xy, SLE_FILE_U16 | SLE_VAR_U32, SaveLoadVersion::MinVersion, SaveLoadVersion::MultipleRoadStops),
SLE_CONDVAR(OldWaypoint, xy, SLE_UINT32, SaveLoadVersion::MultipleRoadStops, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(OldWaypoint, town_index, SLE_UINT16, SaveLoadVersion::LinkWaypointToTown, SaveLoadVersion::WaypointMoreLikeStation),
SLE_CONDREF(OldWaypoint, town, REF_TOWN, SaveLoadVersion::WaypointMoreLikeStation, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(OldWaypoint, town_cn, SLE_FILE_U8 | SLE_VAR_U16, SaveLoadVersion::LinkWaypointToTown, SaveLoadVersion::MoreWaypointsPerTown),
SLE_CONDVAR(OldWaypoint, town_cn, SLE_UINT16, SaveLoadVersion::MoreWaypointsPerTown, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(OldWaypoint, string_id, SLE_STRINGID, SaveLoadVersion::MinVersion, SaveLoadVersion::ReplaceCustomNameArray),
SLE_CONDSSTR(OldWaypoint, name, SLE_STR, SaveLoadVersion::ReplaceCustomNameArray, SaveLoadVersion::MaxVersion),
SLE_VAR(OldWaypoint, delete_ctr, SLE_UINT8),
SLE_CONDVAR(OldWaypoint, build_date, SLE_FILE_U16 | SLE_VAR_I32, SaveLoadVersion::BiggerStationVariables, SaveLoadVersion::BigDates),
SLE_CONDVAR(OldWaypoint, build_date, SLE_INT32, SaveLoadVersion::BigDates, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(OldWaypoint, localidx, SLE_UINT8, SaveLoadVersion::BiggerStationVariables, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(OldWaypoint, grfid, SLE_UINT32, SaveLoadVersion::StoreWaypointIdInMap, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(OldWaypoint, owner, SLE_UINT8, SaveLoadVersion::NewGRFPalette, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(OldWaypoint, build_date, SLE_FILE_U16 | SLE_VAR_I32, SaveLoadVersion::BiggerStationVariables, SaveLoadVersion::BigDates),
SLE_CONDVAR(OldWaypoint, build_date, SLE_INT32, SaveLoadVersion::BigDates, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(OldWaypoint, localidx, SLE_UINT8, SaveLoadVersion::BiggerStationVariables, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(OldWaypoint, grfid, SLE_UINT32, SaveLoadVersion::StoreWaypointIdInMap, SaveLoadVersion::MaxVersion),
SLE_CONDVAR(OldWaypoint, owner, SLE_UINT8, SaveLoadVersion::NewGRFPalette, SaveLoadVersion::MaxVersion),
};
struct CHKPChunkHandler : ChunkHandler {