diff --git a/src/saveload/afterload.cpp b/src/saveload/afterload.cpp index 9476b015dd..8aa8e23a1f 100644 --- a/src/saveload/afterload.cpp +++ b/src/saveload/afterload.cpp @@ -582,7 +582,7 @@ bool AfterLoadGame() if (IsSavegameVersionBefore(SLV_GAMELOG)) _gamelog.GRFAddList(_grfconfig); - if (IsSavegameVersionBefore(SLV_119)) { + if (IsSavegameVersionBefore(SLV_PAUSE_MODES)) { _pause_mode = (_pause_mode.base() == 2) ? PauseMode::Normal : PauseModes{}; } else if (_network_dedicated && _pause_mode.Test(PauseMode::Error)) { Debug(net, 0, "The loading savegame was paused due to an error state"); @@ -765,16 +765,16 @@ bool AfterLoadGame() if (IsSavegameVersionBefore(SLV_PLANE_SPEED_FACTOR)) _settings_game.vehicle.plane_speed = 4; if (IsSavegameVersionBefore(SLV_MORE_ENGINE_TYPES)) _settings_game.vehicle.dynamic_engines = false; if (IsSavegameVersionBefore(SLV_AIRPORT_NOISE)) _settings_game.economy.station_noise_level = false; - if (IsSavegameVersionBefore(SLV_133)) { + if (IsSavegameVersionBefore(SLV_TRAIN_SLOPE_STEEPNESS)) { _settings_game.vehicle.train_slope_steepness = 3; } - if (IsSavegameVersionBefore(SLV_134)) _settings_game.economy.feeder_payment_share = 75; - if (IsSavegameVersionBefore(SLV_138)) _settings_game.vehicle.plane_crashes = 2; - if (IsSavegameVersionBefore(SLV_139)) { + if (IsSavegameVersionBefore(SLV_VIRTUAL_FEEDER_SHARE_PAYMENT)) _settings_game.economy.feeder_payment_share = 75; + if (IsSavegameVersionBefore(SLV_REDUCE_PLANE_CRASHES)) _settings_game.vehicle.plane_crashes = 2; + if (IsSavegameVersionBefore(SLV_RV_REALISTIC_ACCELERATION)) { _settings_game.vehicle.roadveh_acceleration_model = AccelerationModel::Original; _settings_game.vehicle.roadveh_slope_steepness = 7; } - if (IsSavegameVersionBefore(SLV_143)) _settings_game.economy.allow_town_level_crossings = true; + if (IsSavegameVersionBefore(SLV_DISABLE_TOWN_LEVEL_CROSSING)) _settings_game.economy.allow_town_level_crossings = true; if (IsSavegameVersionBefore(SLV_159)) { _settings_game.vehicle.max_train_length = 50; _settings_game.construction.max_bridge_length = 64; @@ -1382,7 +1382,7 @@ bool AfterLoadGame() for (Company *c : Company::Iterate()) c->settings.renew_keep_length = false; } - if (IsSavegameVersionBefore(SLV_123)) { + if (IsSavegameVersionBefore(SLV_UNIFY_WAYPOINT_AND_STATION)) { /* Waypoints became subclasses of stations ... */ MoveWaypointsToBaseStations(); /* ... and buoys were moved to waypoints. */ @@ -2115,7 +2115,7 @@ bool AfterLoadGame() } } } - if (IsSavegameVersionBefore(SLV_144)) { + if (IsSavegameVersionBefore(SLV_REORDER_UNMOVABLE_REMOVE_RESERVED)) { for (auto t : Map::Iterate()) { if (!IsTileType(t, TileType::Object)) continue; @@ -2212,7 +2212,7 @@ bool AfterLoadGame() } /* Trains could now stop in a specific location. */ - if (IsSavegameVersionBefore(SLV_117)) { + if (IsSavegameVersionBefore(SLV_PLATFORM_STOP_LOCATION)) { for (OrderList *orderlist : OrderList::Iterate()) { for (Order &o : orderlist->GetOrders()) { if (o.IsType(OT_GOTO_STATION)) o.SetStopLocation(OrderStopLocation::FarEnd); @@ -2220,7 +2220,7 @@ bool AfterLoadGame() } } - if (IsSavegameVersionBefore(SLV_120)) { + if (IsSavegameVersionBefore(SLV_COMPANY_SERVICE_INTERVALS)) { extern VehicleDefaultSettings _old_vds; for (Company *c : Company::Iterate()) { c->settings.vehicle = _old_vds; @@ -2234,7 +2234,7 @@ bool AfterLoadGame() } } - if (IsSavegameVersionBefore(SLV_121)) { + if (IsSavegameVersionBefore(SLV_CARGO_PAYMENTS)) { /* Delete small ufos heading for non-existing vehicles */ for (DisasterVehicle *v : DisasterVehicle::Iterate()) { if (v->subtype == 2 /* ST_SMALL_UFO */ && v->state != 0) { @@ -2262,7 +2262,7 @@ bool AfterLoadGame() } } - if (IsSavegameVersionBefore(SLV_122)) { + if (IsSavegameVersionBefore(SLV_WAYPOINT_MORE_LIKE_STATION)) { /* Animated tiles would sometimes not be actually animated or * in case of old savegames duplicate. */ @@ -2309,7 +2309,7 @@ bool AfterLoadGame() } } - if (IsSavegameVersionBefore(SLV_124) && !IsSavegameVersionBeforeOrAt(SL_MIN_VERSION)) { + if (IsSavegameVersionBefore(SLV_MULTI_TILE_WAYPOINTS) && !IsSavegameVersionBeforeOrAt(SL_MIN_VERSION)) { /* The train station tile area was added, but for really old (TTDPatch) it's already valid. */ for (Waypoint *wp : Waypoint::Iterate()) { if (wp->facilities.Test(StationFacility::Train)) { @@ -2324,7 +2324,7 @@ bool AfterLoadGame() } } - if (IsSavegameVersionBefore(SLV_125)) { + if (IsSavegameVersionBefore(SLV_REMOVE_SUBSIDY_STATION_BINDING)) { /* Convert old subsidies */ for (Subsidy *s : Subsidy::Iterate()) { if (s->remaining < 12) { @@ -2383,7 +2383,7 @@ bool AfterLoadGame() } } - if (IsSavegameVersionBefore(SLV_126)) { + if (IsSavegameVersionBefore(SLV_CUMULATED_INFLATION)) { /* Recompute inflation based on old unround loan limit * Note: Max loan is 500000. With an inflation of 4% across 170 years * that results in a max loan of about 0.7 * 2^31. @@ -2401,7 +2401,7 @@ bool AfterLoadGame() } } - if (IsSavegameVersionBefore(SLV_128)) { + if (IsSavegameVersionBefore(SLV_FOUND_TOWN)) { for (const Depot *d : Depot::Iterate()) { Tile tile = d->xy; /* At some point, invalid depots were saved into the game (possibly those removed in the past?) @@ -2419,7 +2419,7 @@ bool AfterLoadGame() /* The behaviour of force_proceed has been changed. Now * it counts signals instead of some random time out. */ - if (IsSavegameVersionBefore(SLV_131)) { + if (IsSavegameVersionBefore(SLV_MAXIMUM_DEPOT_PENALTY)) { for (Train *t : Train::Iterate()) { if (t->force_proceed != TFP_NONE) { t->force_proceed = TFP_STUCK; @@ -2429,7 +2429,7 @@ bool AfterLoadGame() /* The bits for the tree ground and tree density have * been swapped (m2 bits 7..6 and 5..4. */ - if (IsSavegameVersionBefore(SLV_135)) { + if (IsSavegameVersionBefore(SLV_ROCKS_STAY_UNDER_SNOW)) { for (auto t : Map::Iterate()) { if (IsTileType(t, TileType::Clear)) { if (GetClearGround(t) == ClearGround{4}) { // CLEAR_SNOW becomes ClearGround::Grass with IsSnowTile() set. @@ -2448,7 +2448,7 @@ bool AfterLoadGame() } /* Wait counter and load/unload ticks got split. */ - if (IsSavegameVersionBefore(SLV_136)) { + if (IsSavegameVersionBefore(SLV_SPLIT_LOAD_WAIT_COUNTERS)) { for (Aircraft *a : Aircraft::Iterate()) { a->turn_counter = a->current_order.IsType(OT_LOADING) ? 0 : a->load_unload_ticks; } @@ -2459,7 +2459,7 @@ bool AfterLoadGame() } /* Airport tile animation uses animation frame instead of other graphics id */ - if (IsSavegameVersionBefore(SLV_137)) { + if (IsSavegameVersionBefore(SLV_AIRPORT_ANIMATION_FRAMES)) { struct AirportTileConversion { uint8_t old_start; uint8_t num_frames; @@ -2496,7 +2496,7 @@ bool AfterLoadGame() } /* Oilrig was moved from id 15 to 9. */ - if (IsSavegameVersionBefore(SLV_139)) { + if (IsSavegameVersionBefore(SLV_RV_REALISTIC_ACCELERATION)) { for (Station *st : Station::Iterate()) { if (st->airport.tile != INVALID_TILE && st->airport.type == 15) { st->airport.type = AT_OILRIG; @@ -2504,7 +2504,7 @@ bool AfterLoadGame() } } - if (IsSavegameVersionBefore(SLV_140)) { + if (IsSavegameVersionBefore(SLV_STORE_AIRPORT_SIZE)) { for (Station *st : Station::Iterate()) { if (st->airport.tile != INVALID_TILE) { st->airport.w = st->airport.GetSpec()->size_x; @@ -2513,7 +2513,7 @@ bool AfterLoadGame() } } - if (IsSavegameVersionBefore(SLV_141)) { + if (IsSavegameVersionBefore(SLV_UNIQUE_DEPOT_NAMES)) { for (const auto t : Map::Iterate()) { /* Reset tropic zone for VOID tiles, they shall not have any. */ if (IsTileType(t, TileType::Void)) SetTropicZone(t, TropicZone::Normal); @@ -2527,7 +2527,7 @@ bool AfterLoadGame() for (Depot *d : Depot::Iterate()) MakeDefaultName(d); } - if (IsSavegameVersionBefore(SLV_142)) { + if (IsSavegameVersionBefore(SLV_NEWGRF_DEPOT_BUILD_DATE)) { for (Depot *d : Depot::Iterate()) d->build_date = TimerGameCalendar::date; } @@ -3350,7 +3350,7 @@ bool AfterLoadGame() Station::RecomputeCatchmentForAll(); /* Station acceptance is some kind of cache */ - if (IsSavegameVersionBefore(SLV_127)) { + if (IsSavegameVersionBefore(SLV_TOWN_ACCEPTANCE)) { for (Station *st : Station::Iterate()) UpdateStationAcceptance(st, false); } diff --git a/src/saveload/ai_sl.cpp b/src/saveload/ai_sl.cpp index 55160ae1b0..dbe64e81bb 100644 --- a/src/saveload/ai_sl.cpp +++ b/src/saveload/ai_sl.cpp @@ -32,7 +32,7 @@ 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, SLV_STORE_AI_VERSION, SL_MAX_VERSION), - SLEG_CONDVAR("is_random", _ai_saveload_is_random, SLE_BOOL, SLV_136, SLV_AI_LOCAL_CONFIG), + SLEG_CONDVAR("is_random", _ai_saveload_is_random, SLE_BOOL, SLV_SPLIT_LOAD_WAIT_COUNTERS, SLV_AI_LOCAL_CONFIG), }; static const SaveLoad _ai_running_desc[] = { diff --git a/src/saveload/cargopacket_sl.cpp b/src/saveload/cargopacket_sl.cpp index 5df2a99aaf..c38b0e6ab8 100644 --- a/src/saveload/cargopacket_sl.cpp +++ b/src/saveload/cargopacket_sl.cpp @@ -54,7 +54,7 @@ } } - if (IsSavegameVersionBefore(SLV_120)) { + if (IsSavegameVersionBefore(SLV_COMPANY_SERVICE_INTERVALS)) { /* CargoPacket's source should be either StationID::Invalid() or a valid station */ for (CargoPacket *cp : CargoPacket::Iterate()) { if (!Station::IsValidID(cp->first_station)) cp->first_station = StationID::Invalid(); @@ -134,8 +134,8 @@ SaveLoadTable GetCargoPacketDesc() SLE_CONDVARNAME(CargoPacket, periods_in_transit, "days_in_transit", SLE_UINT16, SLV_MORE_CARGO_AGE, SLV_PERIODS_IN_TRANSIT_RENAME), SLE_CONDVAR(CargoPacket, periods_in_transit, SLE_UINT16, SLV_PERIODS_IN_TRANSIT_RENAME, SL_MAX_VERSION), SLE_VAR(CargoPacket, feeder_share, SLE_INT64), - SLE_CONDVARNAME(CargoPacket, source.type, "source_type", SLE_UINT8, SLV_125, SL_MAX_VERSION), - SLE_CONDVARNAME(CargoPacket, source.id, "source_id", SLE_UINT16, SLV_125, SL_MAX_VERSION), + SLE_CONDVARNAME(CargoPacket, source.type, "source_type", SLE_UINT8, SLV_REMOVE_SUBSIDY_STATION_BINDING, SL_MAX_VERSION), + SLE_CONDVARNAME(CargoPacket, source.id, "source_id", SLE_UINT16, SLV_REMOVE_SUBSIDY_STATION_BINDING, SL_MAX_VERSION), SLE_CONDVAR(CargoPacket, travelled.x, SLE_INT16, SLV_CARGO_TRAVELLED, SL_MAX_VERSION), SLE_CONDVAR(CargoPacket, travelled.y, SLE_INT16, SLV_CARGO_TRAVELLED, SL_MAX_VERSION), }; diff --git a/src/saveload/company_sl.cpp b/src/saveload/company_sl.cpp index 2458618672..53ed41c519 100644 --- a/src/saveload/company_sl.cpp +++ b/src/saveload/company_sl.cpp @@ -321,11 +321,11 @@ public: SLE_CONDVAR(CompanyProperties, settings.renew_keep_length, SLE_BOOL, SLV_VEHICLE_CURRENCY_STATION_CHANGES, SL_MAX_VERSION), /* Default vehicle settings */ - SLE_CONDVAR(CompanyProperties, settings.vehicle.servint_ispercent, SLE_BOOL, SLV_120, SL_MAX_VERSION), - SLE_CONDVAR(CompanyProperties, settings.vehicle.servint_trains, SLE_UINT16, SLV_120, SL_MAX_VERSION), - SLE_CONDVAR(CompanyProperties, settings.vehicle.servint_roadveh, SLE_UINT16, SLV_120, SL_MAX_VERSION), - SLE_CONDVAR(CompanyProperties, settings.vehicle.servint_aircraft, SLE_UINT16, SLV_120, SL_MAX_VERSION), - SLE_CONDVAR(CompanyProperties, settings.vehicle.servint_ships, SLE_UINT16, SLV_120, SL_MAX_VERSION), + SLE_CONDVAR(CompanyProperties, settings.vehicle.servint_ispercent, SLE_BOOL, SLV_COMPANY_SERVICE_INTERVALS, SL_MAX_VERSION), + SLE_CONDVAR(CompanyProperties, settings.vehicle.servint_trains, SLE_UINT16, SLV_COMPANY_SERVICE_INTERVALS, SL_MAX_VERSION), + SLE_CONDVAR(CompanyProperties, settings.vehicle.servint_roadveh, SLE_UINT16, SLV_COMPANY_SERVICE_INTERVALS, SL_MAX_VERSION), + SLE_CONDVAR(CompanyProperties, settings.vehicle.servint_aircraft, SLE_UINT16, SLV_COMPANY_SERVICE_INTERVALS, SL_MAX_VERSION), + SLE_CONDVAR(CompanyProperties, settings.vehicle.servint_ships, SLE_UINT16, SLV_COMPANY_SERVICE_INTERVALS, SL_MAX_VERSION), }; static inline const SaveLoadCompatTable compat_description = _company_settings_compat; diff --git a/src/saveload/compat/cargopacket_sl_compat.h b/src/saveload/compat/cargopacket_sl_compat.h index 25b6e78f1e..dcb5f6e9e7 100644 --- a/src/saveload/compat/cargopacket_sl_compat.h +++ b/src/saveload/compat/cargopacket_sl_compat.h @@ -22,7 +22,7 @@ const SaveLoadCompat _cargopacket_sl_compat[] = { SLC_VAR("feeder_share"), SLC_VAR("source_type"), SLC_VAR("source_id"), - SLC_NULL(1, SL_MIN_VERSION, SLV_121), + SLC_NULL(1, SL_MIN_VERSION, SLV_CARGO_PAYMENTS), }; #endif /* SAVELOAD_COMPAT_CARGOPACKET_H */ diff --git a/src/saveload/compat/company_sl_compat.h b/src/saveload/compat/company_sl_compat.h index 1840768cd6..d9ba39387f 100644 --- a/src/saveload/compat/company_sl_compat.h +++ b/src/saveload/compat/company_sl_compat.h @@ -66,7 +66,7 @@ const SaveLoadCompat _company_settings_compat[] = { SLC_VAR("settings.vehicle.servint_roadveh"), SLC_VAR("settings.vehicle.servint_aircraft"), SLC_VAR("settings.vehicle.servint_ships"), - SLC_NULL(63, SLV_VEHICLE_CURRENCY_STATION_CHANGES, SLV_144), + SLC_NULL(63, SLV_VEHICLE_CURRENCY_STATION_CHANGES, SLV_REORDER_UNMOVABLE_REMOVE_RESERVED), }; /** Original field order for SlCompanyEconomy. */ diff --git a/src/saveload/compat/economy_sl_compat.h b/src/saveload/compat/economy_sl_compat.h index 99aedaf2cb..a613dd2917 100644 --- a/src/saveload/compat/economy_sl_compat.h +++ b/src/saveload/compat/economy_sl_compat.h @@ -15,7 +15,7 @@ /** Original field order for _economy_desc. */ const SaveLoadCompat _economy_sl_compat[] = { SLC_NULL(4, SL_MIN_VERSION, SLV_UNIFY_CURRENCY), - SLC_NULL(8, SLV_UNIFY_CURRENCY, SLV_144), + SLC_NULL(8, SLV_UNIFY_CURRENCY, SLV_REORDER_UNMOVABLE_REMOVE_RESERVED), SLC_VAR("old_max_loan_unround"), SLC_VAR("old_max_loan_unround_fract"), SLC_VAR("inflation_prices"), diff --git a/src/saveload/compat/engine_sl_compat.h b/src/saveload/compat/engine_sl_compat.h index 93cf7859e3..b883a168cc 100644 --- a/src/saveload/compat/engine_sl_compat.h +++ b/src/saveload/compat/engine_sl_compat.h @@ -24,7 +24,7 @@ const SaveLoadCompat _engine_sl_compat[] = { SLC_VAR("duration_phase_1"), SLC_VAR("duration_phase_2"), SLC_VAR("duration_phase_3"), - SLC_NULL(1, SL_MIN_VERSION, SLV_121), + SLC_NULL(1, SL_MIN_VERSION, SLV_CARGO_PAYMENTS), SLC_VAR("flags"), SLC_NULL(1, SL_MIN_VERSION, SLV_179), SLC_VAR("preview_asked"), @@ -34,7 +34,7 @@ const SaveLoadCompat _engine_sl_compat[] = { SLC_VAR("company_avail"), SLC_VAR("company_hidden"), SLC_VAR("name"), - SLC_NULL(16, SLV_VEHICLE_CURRENCY_STATION_CHANGES, SLV_144), + SLC_NULL(16, SLV_VEHICLE_CURRENCY_STATION_CHANGES, SLV_REORDER_UNMOVABLE_REMOVE_RESERVED), }; /** Original field order for _engine_id_mapping_desc. */ diff --git a/src/saveload/compat/industry_sl_compat.h b/src/saveload/compat/industry_sl_compat.h index 3445c6ae24..30b7891f68 100644 --- a/src/saveload/compat/industry_sl_compat.h +++ b/src/saveload/compat/industry_sl_compat.h @@ -70,7 +70,7 @@ const SaveLoadCompat _industry_sl_compat[] = { SLC_NULL(1, SLV_NEWGRF_INDUSTRY_RANDOM_TRIGGERS, SLV_197), SLC_VAR("random"), SLC_VAR("text"), - SLC_NULL(32, SLV_VEHICLE_CURRENCY_STATION_CHANGES, SLV_144), + SLC_NULL(32, SLV_VEHICLE_CURRENCY_STATION_CHANGES, SLV_REORDER_UNMOVABLE_REMOVE_RESERVED), }; /** Original field order for _industry_builder_desc. */ diff --git a/src/saveload/compat/misc_sl_compat.h b/src/saveload/compat/misc_sl_compat.h index d117016544..addcf47ecb 100644 --- a/src/saveload/compat/misc_sl_compat.h +++ b/src/saveload/compat/misc_sl_compat.h @@ -22,16 +22,16 @@ const SaveLoadCompat _date_sl_compat[] = { SLC_NULL(1, SL_MIN_VERSION, SLV_MORE_AIRPORT_BLOCKS), SLC_VAR("cur_tileloop_tile"), SLC_VAR("next_disaster_start"), - SLC_NULL(2, SL_MIN_VERSION, SLV_120), + SLC_NULL(2, SL_MIN_VERSION, SLV_COMPANY_SERVICE_INTERVALS), SLC_VAR("random_state[0]"), SLC_VAR("random_state[1]"), SLC_NULL(1, SL_MIN_VERSION, SLV_LARGER_TOWN_COUNTER), - SLC_NULL(4, SLV_LARGER_TOWN_COUNTER, SLV_120), + SLC_NULL(4, SLV_LARGER_TOWN_COUNTER, SLV_COMPANY_SERVICE_INTERVALS), SLC_VAR("company_tick_counter"), SLC_VAR("next_competitor_start"), SLC_VAR("trees_tick_counter"), SLC_VAR("pause_mode"), - SLC_NULL(4, SLV_LARGER_TOWN_ITERATOR, SLV_120), + SLC_NULL(4, SLV_LARGER_TOWN_ITERATOR, SLV_COMPANY_SERVICE_INTERVALS), }; /** Original field order for _date_check_desc. */ @@ -45,17 +45,17 @@ const SaveLoadCompat _date_check_sl_compat[] = { SLC_NULL(2, SL_MIN_VERSION, SLV_MULTIPLE_ROAD_STOPS), // cur_tileloop_tile SLC_NULL(4, SLV_MULTIPLE_ROAD_STOPS, SL_MAX_VERSION), // cur_tileloop_tile SLC_NULL(2, SL_MIN_VERSION, SL_MAX_VERSION), // disaster_delay - SLC_NULL(2, SL_MIN_VERSION, SLV_120), + SLC_NULL(2, SL_MIN_VERSION, SLV_COMPANY_SERVICE_INTERVALS), SLC_NULL(4, SL_MIN_VERSION, SL_MAX_VERSION), // random.state[0] SLC_NULL(4, SL_MIN_VERSION, SL_MAX_VERSION), // random.state[1] SLC_NULL(1, SL_MIN_VERSION, SLV_LARGER_TOWN_COUNTER), - SLC_NULL(4, SLV_LARGER_TOWN_COUNTER, SLV_120), + SLC_NULL(4, SLV_LARGER_TOWN_COUNTER, SLV_COMPANY_SERVICE_INTERVALS), SLC_NULL(1, SL_MIN_VERSION, SL_MAX_VERSION), // cur_company_tick_index SLC_NULL(2, SL_MIN_VERSION, SLV_NEXT_COMPETITOR_START_OVERFLOW), // next_competitor_start SLC_NULL(4, SLV_NEXT_COMPETITOR_START_OVERFLOW, SL_MAX_VERSION), // next_competitor_start SLC_NULL(1, SL_MIN_VERSION, SL_MAX_VERSION), // trees_tick_ctr SLC_NULL(1, SLV_TOWN_TOLERANCE_PAUSE_MODE, SL_MAX_VERSION), // pause_mode - SLC_NULL(4, SLV_LARGER_TOWN_ITERATOR, SLV_120), + SLC_NULL(4, SLV_LARGER_TOWN_ITERATOR, SLV_COMPANY_SERVICE_INTERVALS), }; /** Original field order for _view_desc. */ diff --git a/src/saveload/compat/settings_sl_compat.h b/src/saveload/compat/settings_sl_compat.h index 1ccc9e4aea..acf4621576 100644 --- a/src/saveload/compat/settings_sl_compat.h +++ b/src/saveload/compat/settings_sl_compat.h @@ -136,7 +136,7 @@ const SaveLoadCompat _settings_sl_compat[] = { SLC_VAR("construction.raw_industry_construction"), SLC_VAR("construction.industry_platform"), SLC_VAR("economy.multiple_industry_per_town"), - SLC_NULL(1, SL_MIN_VERSION, SLV_141), + SLC_NULL(1, SL_MIN_VERSION, SLV_UNIQUE_DEPOT_NAMES), SLC_VAR("economy.bribe"), SLC_VAR("economy.exclusive_rights"), SLC_VAR("economy.fund_buildings"), @@ -145,7 +145,7 @@ const SaveLoadCompat _settings_sl_compat[] = { SLC_VAR("game_creation.snow_line_height"), SLC_VAR("game_creation.snow_coverage"), SLC_VAR("game_creation.desert_coverage"), - SLC_NULL(4, SL_MIN_VERSION, SLV_144), + SLC_NULL(4, SL_MIN_VERSION, SLV_REORDER_UNMOVABLE_REMOVE_RESERVED), SLC_VAR("game_creation.starting_year"), SLC_NULL(4, SL_MIN_VERSION, SLV_ORDER_LIST), SLC_VAR("game_creation.ending_year"), @@ -183,8 +183,8 @@ const SaveLoadCompat _settings_sl_compat[] = { SLC_NULL(8, SLV_YAPP, SLV_TABLE_CHUNKS), SLC_NULL(16, SL_MIN_VERSION, SLV_TABLE_CHUNKS), SLC_NULL(4, SLV_DRIVE_THROUGH_ROAD_STOPS, SLV_TABLE_CHUNKS), - SLC_NULL(8, SLV_130, SLV_TABLE_CHUNKS), - SLC_NULL(4, SLV_131, SLV_TABLE_CHUNKS), + SLC_NULL(8, SLV_ROAD_STOP_OCCUPANCY_PENALTY, SLV_TABLE_CHUNKS), + SLC_NULL(4, SLV_MAXIMUM_DEPOT_PENALTY, SLV_TABLE_CHUNKS), SLC_NULL(1, SLV_YAPF, SLV_TABLE_CHUNKS), SLC_VAR("pf.yapf.max_search_nodes"), SLC_VAR("pf.yapf.rail_firstred_twoway_eol"), diff --git a/src/saveload/compat/vehicle_sl_compat.h b/src/saveload/compat/vehicle_sl_compat.h index 16bb0270fc..3ef8e22516 100644 --- a/src/saveload/compat/vehicle_sl_compat.h +++ b/src/saveload/compat/vehicle_sl_compat.h @@ -92,7 +92,7 @@ const SaveLoadCompat _vehicle_common_sl_compat[] = { SLC_VAR("group_id"), SLC_VAR("current_order_time"), SLC_VAR("lateness_counter"), - SLC_NULL(10, SLV_VEHICLE_CURRENCY_STATION_CHANGES, SLV_144), + SLC_NULL(10, SLV_VEHICLE_CURRENCY_STATION_CHANGES, SLV_REORDER_UNMOVABLE_REMOVE_RESERVED), }; /** Original field order for SlVehicleTrain. */ @@ -107,7 +107,7 @@ const SaveLoadCompat _vehicle_train_sl_compat[] = { SLC_VAR("wait_counter"), SLC_NULL(2, SLV_VEHICLE_CURRENCY_STATION_CHANGES, SLV_NO_MULTIHEAD_REFERENCE), SLC_VAR("gv_flags"), - SLC_NULL(11, SLV_VEHICLE_CURRENCY_STATION_CHANGES, SLV_144), + SLC_NULL(11, SLV_VEHICLE_CURRENCY_STATION_CHANGES, SLV_REORDER_UNMOVABLE_REMOVE_RESERVED), }; /** Original field order for SlVehicleRoadVeh. */ @@ -124,9 +124,9 @@ const SaveLoadCompat _vehicle_roadveh_sl_compat[] = { SLC_VAR("path.tile"), SLC_NULL(2, SLV_MULTIPLE_ROAD_STOPS, SLV_MORE_CARGO_PACKETS), SLC_VAR("gv_flags"), - SLC_NULL(4, SLV_MORE_CARGO_PACKETS, SLV_131), - SLC_NULL(2, SLV_MULTIPLE_ROAD_STOPS, SLV_131), - SLC_NULL(16, SLV_VEHICLE_CURRENCY_STATION_CHANGES, SLV_144), + SLC_NULL(4, SLV_MORE_CARGO_PACKETS, SLV_MAXIMUM_DEPOT_PENALTY), + SLC_NULL(2, SLV_MULTIPLE_ROAD_STOPS, SLV_MAXIMUM_DEPOT_PENALTY), + SLC_NULL(16, SLV_VEHICLE_CURRENCY_STATION_CHANGES, SLV_REORDER_UNMOVABLE_REMOVE_RESERVED), }; /** Original field order for SlVehicleShip. */ @@ -135,7 +135,7 @@ const SaveLoadCompat _vehicle_ship_sl_compat[] = { SLC_VAR("state"), SLC_VAR("path"), SLC_VAR("rotation"), - SLC_NULL(16, SLV_VEHICLE_CURRENCY_STATION_CHANGES, SLV_144), + SLC_NULL(16, SLV_VEHICLE_CURRENCY_STATION_CHANGES, SLV_REORDER_UNMOVABLE_REMOVE_RESERVED), }; /** Original field order for SlVehicleAircraft. */ @@ -150,7 +150,7 @@ const SaveLoadCompat _vehicle_aircraft_sl_compat[] = { SLC_VAR("number_consecutive_turns"), SLC_VAR("turn_counter"), SLC_VAR("flags"), - SLC_NULL(13, SLV_VEHICLE_CURRENCY_STATION_CHANGES, SLV_144), + SLC_NULL(13, SLV_VEHICLE_CURRENCY_STATION_CHANGES, SLV_REORDER_UNMOVABLE_REMOVE_RESERVED), }; /** Original field order for SlVehicleEffect. */ @@ -167,7 +167,7 @@ const SaveLoadCompat _vehicle_effect_sl_compat[] = { SLC_VAR("animation_state"), SLC_VAR("animation_substate"), SLC_VAR("spritenum"), - SLC_NULL(15, SLV_VEHICLE_CURRENCY_STATION_CHANGES, SLV_144), + SLC_NULL(15, SLV_VEHICLE_CURRENCY_STATION_CHANGES, SLV_REORDER_UNMOVABLE_REMOVE_RESERVED), }; /** Original field order for SlVehicleDisaster. */ @@ -190,7 +190,7 @@ const SaveLoadCompat _vehicle_disaster_sl_compat[] = { SLC_VAR("image_override"), SLC_VAR("big_ufo_destroyer_target"), SLC_VAR("flags"), - SLC_NULL(16, SLV_VEHICLE_CURRENCY_STATION_CHANGES, SLV_144), + SLC_NULL(16, SLV_VEHICLE_CURRENCY_STATION_CHANGES, SLV_REORDER_UNMOVABLE_REMOVE_RESERVED), }; /** Original field order for vehicle_desc. */ diff --git a/src/saveload/depot_sl.cpp b/src/saveload/depot_sl.cpp index 22ed22a287..b8dcb5c759 100644 --- a/src/saveload/depot_sl.cpp +++ b/src/saveload/depot_sl.cpp @@ -22,11 +22,11 @@ static TownID _town_index; static const SaveLoad _depot_desc[] = { SLE_CONDVAR(Depot, xy, SLE_FILE_U16 | SLE_VAR_U32, SL_MIN_VERSION, SLV_MULTIPLE_ROAD_STOPS), SLE_CONDVAR(Depot, xy, SLE_UINT32, SLV_MULTIPLE_ROAD_STOPS, SL_MAX_VERSION), - SLEG_CONDVAR("town_index", _town_index, SLE_UINT16, SL_MIN_VERSION, SLV_141), - SLE_CONDREF(Depot, town, REF_TOWN, SLV_141, SL_MAX_VERSION), - SLE_CONDVAR(Depot, town_cn, SLE_UINT16, SLV_141, SL_MAX_VERSION), - SLE_CONDSSTR(Depot, name, SLE_STR, SLV_141, SL_MAX_VERSION), - SLE_CONDVAR(Depot, build_date, SLE_INT32, SLV_142, SL_MAX_VERSION), + SLEG_CONDVAR("town_index", _town_index, SLE_UINT16, SL_MIN_VERSION, SLV_UNIQUE_DEPOT_NAMES), + SLE_CONDREF(Depot, town, REF_TOWN, SLV_UNIQUE_DEPOT_NAMES, SL_MAX_VERSION), + SLE_CONDVAR(Depot, town_cn, SLE_UINT16, SLV_UNIQUE_DEPOT_NAMES, SL_MAX_VERSION), + SLE_CONDSSTR(Depot, name, SLE_STR, SLV_UNIQUE_DEPOT_NAMES, SL_MAX_VERSION), + SLE_CONDVAR(Depot, build_date, SLE_INT32, SLV_NEWGRF_DEPOT_BUILD_DATE, SL_MAX_VERSION), }; struct DEPTChunkHandler : ChunkHandler { @@ -53,7 +53,7 @@ struct DEPTChunkHandler : ChunkHandler { SlObject(depot, slt); /* Set the town 'pointer' so we can restore it later. */ - if (IsSavegameVersionBefore(SLV_141)) depot->town = reinterpret_cast(static_cast(_town_index.base())); + if (IsSavegameVersionBefore(SLV_UNIQUE_DEPOT_NAMES)) depot->town = reinterpret_cast(static_cast(_town_index.base())); } } @@ -61,7 +61,7 @@ struct DEPTChunkHandler : ChunkHandler { { for (Depot *depot : Depot::Iterate()) { SlObject(depot, _depot_desc); - if (IsSavegameVersionBefore(SLV_141)) depot->town = Town::Get((size_t)depot->town); + if (IsSavegameVersionBefore(SLV_UNIQUE_DEPOT_NAMES)) depot->town = Town::Get((size_t)depot->town); } } }; diff --git a/src/saveload/economy_sl.cpp b/src/saveload/economy_sl.cpp index 18b9fd7f1c..2ef7c3a499 100644 --- a/src/saveload/economy_sl.cpp +++ b/src/saveload/economy_sl.cpp @@ -45,10 +45,10 @@ struct CAPRChunkHandler : ChunkHandler { static const SaveLoad _economy_desc[] = { SLE_CONDVAR(Economy, old_max_loan_unround, SLE_FILE_I32 | SLE_VAR_I64, SL_MIN_VERSION, SLV_UNIFY_CURRENCY), - SLE_CONDVAR(Economy, old_max_loan_unround, SLE_INT64, SLV_UNIFY_CURRENCY, SLV_126), - SLE_CONDVAR(Economy, old_max_loan_unround_fract, SLE_UINT16, SLV_CARGO_PAYMENT_OVERFLOW, SLV_126), - SLE_CONDVAR(Economy, inflation_prices, SLE_UINT64, SLV_126, SL_MAX_VERSION), - SLE_CONDVAR(Economy, inflation_payment, SLE_UINT64, SLV_126, SL_MAX_VERSION), + SLE_CONDVAR(Economy, old_max_loan_unround, SLE_INT64, SLV_UNIFY_CURRENCY, SLV_CUMULATED_INFLATION), + SLE_CONDVAR(Economy, old_max_loan_unround_fract, SLE_UINT16, SLV_CARGO_PAYMENT_OVERFLOW, SLV_CUMULATED_INFLATION), + SLE_CONDVAR(Economy, inflation_prices, SLE_UINT64, SLV_CUMULATED_INFLATION, SL_MAX_VERSION), + SLE_CONDVAR(Economy, inflation_payment, SLE_UINT64, SLV_CUMULATED_INFLATION, SL_MAX_VERSION), SLE_VAR(Economy, fluct, SLE_INT16), SLE_VAR(Economy, interest_rate, SLE_UINT8), SLE_VAR(Economy, infl_amount, SLE_UINT8), diff --git a/src/saveload/saveload.h b/src/saveload/saveload.h index 6e56aee0f2..e7936f5599 100644 --- a/src/saveload/saveload.h +++ b/src/saveload/saveload.h @@ -179,41 +179,41 @@ enum SaveLoadVersion : uint16_t { SLV_ROAD_LAYOUT_PER_TOWN, ///< 113 15340 Allow for different road layouts for each of the towns SLV_SEPARATE_ROAD_OWNERS, ///< 114 15601 Separate owners for road bits, tram bits and the road stop - SLV_115, ///< 115 15695 - SLV_116, ///< 116 15893 0.7.x - SLV_117, ///< 117 16037 - SLV_118, ///< 118 16129 - SLV_119, ///< 119 16242 + SLV_CUSTOM_TOWN_NUMBER, ///< 115 15695 Configuration for specific number of towns to build + SLV_GAMELOG_EMERGENCY, ///< 116 15893 0.7.x Gamelog event for emergency/crash saves + SLV_PLATFORM_STOP_LOCATION, ///< 117 16037 Set the platform stop location via train orders + SLV_DIGIT_GROUP_SEPARATOR, ///< 118 16129 Configurable digit group separator + SLV_PAUSE_MODES, ///< 119 16242 Use bitmask of reason to pause, so manual/auto pausing do not conflict - SLV_120, ///< 120 16439 - SLV_121, ///< 121 16694 - SLV_122, ///< 122 16855 - SLV_123, ///< 123 16909 - SLV_124, ///< 124 16993 + SLV_COMPANY_SERVICE_INTERVALS, ///< 120 16439 Make service intervals configurable per company + SLV_CARGO_PAYMENTS, ///< 121 16694 Perform payment of cargo after unloading + SLV_WAYPOINT_MORE_LIKE_STATION, ///< 122 16855 Make waypoint data look more like stations + SLV_UNIFY_WAYPOINT_AND_STATION, ///< 123 16909 Unify stations and waypoints + SLV_MULTI_TILE_WAYPOINTS, ///< 124 16993 Waypoints can be bigger than a single tile - SLV_125, ///< 125 17113 - SLV_126, ///< 126 17433 - SLV_127, ///< 127 17439 - SLV_128, ///< 128 18281 - SLV_129, ///< 129 18292 + SLV_REMOVE_SUBSIDY_STATION_BINDING, ///< 125 17113 Awarded subsidies are not bound to stations, but to their actual source/destination + SLV_CUMULATED_INFLATION, ///< 126 17433 Store cumulated inflation, and recalculate prices/payments upon load + SLV_TOWN_ACCEPTANCE, ///< 127 17439 Store mask of cargos accepted by town houses and head quarters + SLV_FOUND_TOWN, ///< 128 18281 Founding of new towns + SLV_TIMETABLE_START, ///< 129 18292 Allow setting the start date of a timetable - SLV_130, ///< 130 18404 - SLV_131, ///< 131 18481 - SLV_132, ///< 132 18522 - SLV_133, ///< 133 18674 - SLV_134, ///< 134 18703 + SLV_ROAD_STOP_OCCUPANCY_PENALTY, ///< 130 18404 Add configurable pathfinder penalty for an occupied road stop + SLV_MAXIMUM_DEPOT_PENALTY, ///< 131 18481 Add configurable maximum pathfinder penalty for finding a depot + SLV_DISALLOW_TREE_BUILDING, ///< 132 18522 Setting to partially disable building of trees + SLV_TRAIN_SLOPE_STEEPNESS, ///< 133 18674 Setting to increase steepness of slopes for trains under realistic acceleration + SLV_VIRTUAL_FEEDER_SHARE_PAYMENT, ///< 134 18703 Pay a part of the virtual profit during a transfer to the intermediate vehicle - SLV_135, ///< 135 18719 - SLV_136, ///< 136 18764 - SLV_137, ///< 137 18912 - SLV_138, ///< 138 18942 1.0.x - SLV_139, ///< 139 19346 + SLV_ROCKS_STAY_UNDER_SNOW, ///< 135 18719 Rocks stay under snow, i.e. they return when the snow goes away + SLV_SPLIT_LOAD_WAIT_COUNTERS, ///< 136 18764 Split counters for (un)loading and signal waiting/turning as otherwise they interfere + SLV_AIRPORT_ANIMATION_FRAMES, ///< 137 18912 Use animation frames instead of many airport tile ids for animation + SLV_REDUCE_PLANE_CRASHES, ///< 138 18942 1.0.x Setting to reduce/disable crashing of planes + SLV_RV_REALISTIC_ACCELERATION, ///< 139 19346 Realistic acceleration of road vehicles - SLV_140, ///< 140 19382 - SLV_141, ///< 141 19799 - SLV_142, ///< 142 20003 - SLV_143, ///< 143 20048 - SLV_144, ///< 144 20334 + SLV_STORE_AIRPORT_SIZE, ///< 140 19382 Store the size of the airport in the station + SLV_UNIQUE_DEPOT_NAMES, ///< 141 19799 Give depots unique names + SLV_NEWGRF_DEPOT_BUILD_DATE, ///< 142 20003 Depot build date for NewGRFs + SLV_DISABLE_TOWN_LEVEL_CROSSING, ///< 143 20048 Setting to be able to disable building rail/road crossings by towns + SLV_REORDER_UNMOVABLE_REMOVE_RESERVED, ///< 144 20334 Reorder map bits of unmovable tiles and remove unused reserved zero bytes SLV_145, ///< 145 20376 SLV_146, ///< 146 20446 diff --git a/src/saveload/station_sl.cpp b/src/saveload/station_sl.cpp index 6b9db05eb3..c815b85d51 100644 --- a/src/saveload/station_sl.cpp +++ b/src/saveload/station_sl.cpp @@ -498,8 +498,8 @@ static const SaveLoad _old_station_desc[] = { SLE_VAR(Station, string_id, SLE_STRINGID), SLE_CONDSSTR(Station, name, SLE_STR | SLF_ALLOW_CONTROL, SLV_REPLACE_CUSTOM_NAME_ARRAY, SL_MAX_VERSION), SLE_CONDVAR(Station, indtype, SLE_UINT8, SLV_NEWGRF_SUPPLIED_STATION_NAME, SL_MAX_VERSION), - SLE_CONDVAR(Station, had_vehicle_of_type, SLE_FILE_U16 | SLE_VAR_U8, SL_MIN_VERSION, SLV_122), - SLE_CONDVAR(Station, had_vehicle_of_type, SLE_UINT8, SLV_122, SL_MAX_VERSION), + SLE_CONDVAR(Station, had_vehicle_of_type, SLE_FILE_U16 | SLE_VAR_U8, SL_MIN_VERSION, SLV_WAYPOINT_MORE_LIKE_STATION), + SLE_CONDVAR(Station, had_vehicle_of_type, SLE_UINT8, SLV_WAYPOINT_MORE_LIKE_STATION, SL_MAX_VERSION), SLE_VAR(Station, time_since_load, SLE_UINT8), SLE_VAR(Station, time_since_unload, SLE_UINT8), @@ -552,10 +552,10 @@ struct STNSChunkHandler : ChunkHandler { void FixPointers() const override { - /* From SLV_123 we store stations in STNN; before that in STNS. So do not - * fix pointers when the version is SLV_123 or up, as that would fix + /* From SLV_UNIFY_WAYPOINT_AND_STATION we store stations in STNN; before that in STNS. So do not + * fix pointers when the version is SLV_UNIFY_WAYPOINT_AND_STATION or up, as that would fix * pointers twice: once in STNN chunk and once here. */ - if (!IsSavegameVersionBefore(SLV_123)) return; + if (!IsSavegameVersionBefore(SLV_UNIFY_WAYPOINT_AND_STATION)) return; for (Station *st : Station::Iterate()) { SlObject(st, _old_station_desc); @@ -635,8 +635,8 @@ public: SLE_CONDVAR(Station, docking_station.w, SLE_FILE_U8 | SLE_VAR_U16, SLV_MULTITILE_DOCKS, SL_MAX_VERSION), SLE_CONDVAR(Station, docking_station.h, SLE_FILE_U8 | SLE_VAR_U16, SLV_MULTITILE_DOCKS, SL_MAX_VERSION), SLE_VAR(Station, airport.tile, SLE_UINT32), - SLE_CONDVAR(Station, airport.w, SLE_FILE_U8 | SLE_VAR_U16, SLV_140, SL_MAX_VERSION), - SLE_CONDVAR(Station, airport.h, SLE_FILE_U8 | SLE_VAR_U16, SLV_140, SL_MAX_VERSION), + SLE_CONDVAR(Station, airport.w, SLE_FILE_U8 | SLE_VAR_U16, SLV_STORE_AIRPORT_SIZE, SL_MAX_VERSION), + SLE_CONDVAR(Station, airport.h, SLE_FILE_U8 | SLE_VAR_U16, SLV_STORE_AIRPORT_SIZE, SL_MAX_VERSION), SLE_VAR(Station, airport.type, SLE_UINT8), SLE_CONDVAR(Station, airport.layout, SLE_UINT8, SLV_145, SL_MAX_VERSION), SLE_VARNAME(Station, airport.blocks, "airport.flags", SLE_UINT64), @@ -651,7 +651,7 @@ 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, SLV_127, SLV_EXTEND_CARGOTYPES), + SLE_CONDVAR(Station, always_accepted, SLE_FILE_U32 | SLE_VAR_U64, SLV_TOWN_ACCEPTANCE, SLV_EXTEND_CARGOTYPES), SLE_CONDVAR(Station, always_accepted, SLE_UINT64, SLV_EXTEND_CARGOTYPES, SL_MAX_VERSION), SLEG_CONDSTRUCTLIST("speclist", SlRoadStopTileData, SLV_NEWGRF_ROAD_STOPS, SLV_ROAD_STOP_TILE_DATA), SLEG_STRUCTLIST("goods", SlStationGoods), @@ -683,9 +683,9 @@ public: SLEG_STRUCT("base", SlStationBase), SLE_VAR(Waypoint, town_cn, SLE_UINT16), - SLE_CONDVAR(Waypoint, train_station.tile, SLE_UINT32, SLV_124, SL_MAX_VERSION), - SLE_CONDVAR(Waypoint, train_station.w, SLE_FILE_U8 | SLE_VAR_U16, SLV_124, SL_MAX_VERSION), - SLE_CONDVAR(Waypoint, train_station.h, SLE_FILE_U8 | SLE_VAR_U16, SLV_124, SL_MAX_VERSION), + SLE_CONDVAR(Waypoint, train_station.tile, SLE_UINT32, SLV_MULTI_TILE_WAYPOINTS, SL_MAX_VERSION), + SLE_CONDVAR(Waypoint, train_station.w, SLE_FILE_U8 | SLE_VAR_U16, SLV_MULTI_TILE_WAYPOINTS, SL_MAX_VERSION), + SLE_CONDVAR(Waypoint, train_station.h, SLE_FILE_U8 | SLE_VAR_U16, SLV_MULTI_TILE_WAYPOINTS, SL_MAX_VERSION), SLE_CONDVAR(Waypoint, waypoint_flags, SLE_UINT16, SLV_ROAD_WAYPOINTS, SL_MAX_VERSION), SLE_CONDVAR(Waypoint, road_waypoint_area.tile, SLE_UINT32, SLV_ROAD_WAYPOINTS, SL_MAX_VERSION), SLE_CONDVAR(Waypoint, road_waypoint_area.w, SLE_FILE_U8 | SLE_VAR_U16, SLV_ROAD_WAYPOINTS, SL_MAX_VERSION), @@ -753,10 +753,10 @@ struct STNNChunkHandler : ChunkHandler { void FixPointers() const override { - /* From SLV_123 we store stations in STNN; before that in STNS. So do not - * fix pointers when the version is below SLV_123, as that would fix + /* From SLV_UNIFY_WAYPOINT_AND_STATION we store stations in STNN; before that in STNS. So do not + * fix pointers when the version is below SLV_UNIFY_WAYPOINT_AND_STATION, as that would fix * pointers twice: once in STNS chunk and once here. */ - if (IsSavegameVersionBefore(SLV_123)) return; + if (IsSavegameVersionBefore(SLV_UNIFY_WAYPOINT_AND_STATION)) return; for (BaseStation *bst : BaseStation::Iterate()) { SlObject(bst, _station_desc); diff --git a/src/saveload/subsidy_sl.cpp b/src/saveload/subsidy_sl.cpp index a32c3a67f7..e416d4b414 100644 --- a/src/saveload/subsidy_sl.cpp +++ b/src/saveload/subsidy_sl.cpp @@ -20,9 +20,9 @@ static const SaveLoad _subsidies_desc[] = { SLE_VAR(Subsidy, cargo_type, SLE_UINT8), SLE_CONDVAR(Subsidy, remaining, SLE_FILE_U8 | SLE_VAR_U16, SL_MIN_VERSION, SLV_CUSTOM_SUBSIDY_DURATION), SLE_CONDVAR(Subsidy, remaining, SLE_UINT16, SLV_CUSTOM_SUBSIDY_DURATION, SL_MAX_VERSION), - SLE_CONDVAR(Subsidy, awarded, SLE_UINT8, SLV_125, SL_MAX_VERSION), - SLE_CONDVARNAME(Subsidy, src.type, "src_type", SLE_UINT8, SLV_125, SL_MAX_VERSION), - SLE_CONDVARNAME(Subsidy, dst.type, "dst_type", SLE_UINT8, SLV_125, SL_MAX_VERSION), + SLE_CONDVAR(Subsidy, awarded, SLE_UINT8, SLV_REMOVE_SUBSIDY_STATION_BINDING, SL_MAX_VERSION), + SLE_CONDVARNAME(Subsidy, src.type, "src_type", SLE_UINT8, SLV_REMOVE_SUBSIDY_STATION_BINDING, SL_MAX_VERSION), + SLE_CONDVARNAME(Subsidy, dst.type, "dst_type", SLE_UINT8, SLV_REMOVE_SUBSIDY_STATION_BINDING, SL_MAX_VERSION), SLE_CONDVARNAME(Subsidy, src.id, "src", SLE_FILE_U8 | SLE_VAR_U16, SL_MIN_VERSION, SLV_BIG_MAP), SLE_CONDVARNAME(Subsidy, src.id, "src", SLE_UINT16, SLV_BIG_MAP, SL_MAX_VERSION), SLE_CONDVARNAME(Subsidy, dst.id, "dst", SLE_FILE_U8 | SLE_VAR_U16, SL_MIN_VERSION, SLV_BIG_MAP), diff --git a/src/saveload/vehicle_sl.cpp b/src/saveload/vehicle_sl.cpp index bf15222a18..b0bff53af2 100644 --- a/src/saveload/vehicle_sl.cpp +++ b/src/saveload/vehicle_sl.cpp @@ -726,7 +726,7 @@ public: SLE_CONDVAR(Vehicle, current_order.wait_time, SLE_UINT16, SLV_TIMETABLES, SL_MAX_VERSION), SLE_CONDVAR(Vehicle, current_order.travel_time, SLE_UINT16, SLV_TIMETABLES, SL_MAX_VERSION), SLE_CONDVAR(Vehicle, current_order.max_speed, SLE_UINT16, SLV_174, SL_MAX_VERSION), - SLE_CONDVAR(Vehicle, timetable_start, SLE_FILE_I32 | SLE_VAR_U64, SLV_129, SLV_TIMETABLE_START_TICKS), + SLE_CONDVAR(Vehicle, timetable_start, SLE_FILE_I32 | SLE_VAR_U64, SLV_TIMETABLE_START, SLV_TIMETABLE_START_TICKS), SLE_CONDVAR(Vehicle, timetable_start, SLE_UINT64, SLV_TIMETABLE_START_TICKS, SL_MAX_VERSION), SLE_CONDVARNAME(Vehicle, old_orders, "orders", SLE_FILE_U16 | SLE_VAR_U32, SL_MIN_VERSION, SLV_MORE_CARGO_PACKETS), @@ -812,8 +812,8 @@ public: SLE_CONDVAR(Train, flags, SLE_FILE_U8 | SLE_VAR_U16, SLV_VEHICLE_CURRENCY_STATION_CHANGES, SLV_YAPP), SLE_CONDVAR(Train, flags, SLE_UINT16, SLV_YAPP, SL_MAX_VERSION), - SLE_CONDVAR(Train, wait_counter, SLE_UINT16, SLV_136, SL_MAX_VERSION), - SLE_CONDVAR(Train, gv_flags, SLE_UINT16, SLV_139, SL_MAX_VERSION), + SLE_CONDVAR(Train, wait_counter, SLE_UINT16, SLV_SPLIT_LOAD_WAIT_COUNTERS, SL_MAX_VERSION), + SLE_CONDVAR(Train, gv_flags, SLE_UINT16, SLV_RV_REALISTIC_ACCELERATION, SL_MAX_VERSION), }; static inline const SaveLoadCompatTable compat_description = _vehicle_train_sl_compat; @@ -867,7 +867,7 @@ public: SLEG_CONDVECTOR("path.td", rv_path_td, SLE_UINT8, SLV_ROADVEH_PATH_CACHE, SLV_PATH_CACHE_FORMAT), SLEG_CONDVECTOR("path.tile", rv_path_tile, SLE_UINT32, SLV_ROADVEH_PATH_CACHE, SLV_PATH_CACHE_FORMAT), SLEG_CONDSTRUCTLIST("path", SlVehicleRoadVehPath, SLV_PATH_CACHE_FORMAT, SL_MAX_VERSION), - SLE_CONDVAR(RoadVehicle, gv_flags, SLE_UINT16, SLV_139, SL_MAX_VERSION), + SLE_CONDVAR(RoadVehicle, gv_flags, SLE_UINT16, SLV_RV_REALISTIC_ACCELERATION, SL_MAX_VERSION), }; static inline const SaveLoadCompatTable compat_description = _vehicle_roadveh_sl_compat; @@ -976,7 +976,7 @@ public: SLE_CONDVAR(Aircraft, last_direction, SLE_UINT8, SLV_VEHICLE_CURRENCY_STATION_CHANGES, SL_MAX_VERSION), SLE_CONDVAR(Aircraft, number_consecutive_turns, SLE_UINT8, SLV_VEHICLE_CURRENCY_STATION_CHANGES, SL_MAX_VERSION), - SLE_CONDVAR(Aircraft, turn_counter, SLE_UINT8, SLV_136, SL_MAX_VERSION), + SLE_CONDVAR(Aircraft, turn_counter, SLE_UINT8, SLV_SPLIT_LOAD_WAIT_COUNTERS, SL_MAX_VERSION), SLE_CONDVAR(Aircraft, flags, SLE_UINT8, SLV_167, SL_MAX_VERSION), }; static inline const SaveLoadCompatTable compat_description = _vehicle_aircraft_sl_compat; diff --git a/src/saveload/waypoint_sl.cpp b/src/saveload/waypoint_sl.cpp index a6ed0a80a2..3cb1078df9 100644 --- a/src/saveload/waypoint_sl.cpp +++ b/src/saveload/waypoint_sl.cpp @@ -170,8 +170,8 @@ void ResetOldWaypoints() static const SaveLoad _old_waypoint_desc[] = { SLE_CONDVAR(OldWaypoint, xy, SLE_FILE_U16 | SLE_VAR_U32, SL_MIN_VERSION, SLV_MULTIPLE_ROAD_STOPS), SLE_CONDVAR(OldWaypoint, xy, SLE_UINT32, SLV_MULTIPLE_ROAD_STOPS, SL_MAX_VERSION), - SLE_CONDVAR(OldWaypoint, town_index, SLE_UINT16, SLV_LINK_WAYPOINT_TO_TOWN, SLV_122), - SLE_CONDREF(OldWaypoint, town, REF_TOWN, SLV_122, SL_MAX_VERSION), + SLE_CONDVAR(OldWaypoint, town_index, SLE_UINT16, SLV_LINK_WAYPOINT_TO_TOWN, SLV_WAYPOINT_MORE_LIKE_STATION), + SLE_CONDREF(OldWaypoint, town, REF_TOWN, SLV_WAYPOINT_MORE_LIKE_STATION, SL_MAX_VERSION), SLE_CONDVAR(OldWaypoint, town_cn, SLE_FILE_U8 | SLE_VAR_U16, SLV_LINK_WAYPOINT_TO_TOWN, SLV_MORE_WAYPOINTS_PER_TOWN), SLE_CONDVAR(OldWaypoint, town_cn, SLE_UINT16, SLV_MORE_WAYPOINTS_PER_TOWN, SL_MAX_VERSION), SLE_CONDVAR(OldWaypoint, string_id, SLE_STRINGID, SL_MIN_VERSION, SLV_REPLACE_CUSTOM_NAME_ARRAY), @@ -211,7 +211,7 @@ struct CHKPChunkHandler : ChunkHandler { if (IsSavegameVersionBefore(SLV_LINK_WAYPOINT_TO_TOWN)) { wp.town_cn = (wp.string_id & 0xC000) == 0xC000 ? (wp.string_id >> 8) & 0x3F : 0; wp.town = ClosestTownFromTile(wp.xy, UINT_MAX); - } else if (IsSavegameVersionBefore(SLV_122)) { + } else if (IsSavegameVersionBefore(SLV_WAYPOINT_MORE_LIKE_STATION)) { /* Only for versions 12 .. 122 */ if (!Town::IsValidID(wp.town_index)) { /* Upon a corrupted waypoint we'll likely get here. The next step will be to diff --git a/src/table/settings/economy_settings.ini b/src/table/settings/economy_settings.ini index 52535b0f60..63ab2fd863 100644 --- a/src/table/settings/economy_settings.ini +++ b/src/table/settings/economy_settings.ini @@ -71,7 +71,7 @@ strhelp = STR_CONFIG_SETTING_ALLOW_TOWN_ROADS_HELPTEXT [SDT_VAR] var = economy.found_town type = SLE_UINT8 -from = SLV_128 +from = SLV_FOUND_TOWN flags = SettingFlag::GuiDropdown def = TF_FORBIDDEN min = TF_BEGIN @@ -98,7 +98,7 @@ cat = SC_ADVANCED [SDT_BOOL] var = economy.allow_town_level_crossings -from = SLV_143 +from = SLV_DISABLE_TOWN_LEVEL_CROSSING flags = SettingFlag::NoNetwork def = true str = STR_CONFIG_SETTING_ALLOW_TOWN_LEVEL_CROSSINGS @@ -203,7 +203,7 @@ cat = SC_BASIC [SDT_VAR] var = economy.feeder_payment_share type = SLE_UINT8 -from = SLV_134 +from = SLV_VIRTUAL_FEEDER_SHARE_PAYMENT def = 75 min = 0 max = 100 diff --git a/src/table/settings/game_settings.ini b/src/table/settings/game_settings.ini index 27b2b5cf22..10fde398f5 100644 --- a/src/table/settings/game_settings.ini +++ b/src/table/settings/game_settings.ini @@ -171,7 +171,7 @@ post_cb = TrainAccelerationModelChanged [SDT_VAR] var = vehicle.roadveh_acceleration_model type = SLE_UINT8 -from = SLV_139 +from = SLV_RV_REALISTIC_ACCELERATION flags = SettingFlag::GuiDropdown def = AccelerationModel::Realistic min = AccelerationModel::Original @@ -185,7 +185,7 @@ post_cb = RoadVehAccelerationModelChanged [SDT_VAR] var = vehicle.train_slope_steepness type = SLE_UINT8 -from = SLV_133 +from = SLV_TRAIN_SLOPE_STEEPNESS def = 3 min = 0 max = 10 @@ -199,7 +199,7 @@ cat = SC_EXPERT [SDT_VAR] var = vehicle.roadveh_slope_steepness type = SLE_UINT8 -from = SLV_139 +from = SLV_RV_REALISTIC_ACCELERATION def = 7 min = 0 max = 10 @@ -345,7 +345,7 @@ cat = SC_EXPERT [SDT_VAR] var = vehicle.plane_crashes type = SLE_UINT8 -from = SLV_138 +from = SLV_REDUCE_PLANE_CRASHES flags = SettingFlag::GuiDropdown def = 2 min = 0 @@ -380,7 +380,7 @@ name = ""vehicle.servint_ispercent"" flags = SettingFlag::NoNetwork var = _old_vds.servint_ispercent def = false -to = SLV_120 +to = SLV_COMPANY_SERVICE_INTERVALS [SDTG_VAR] name = ""vehicle.servint_trains"" @@ -390,7 +390,7 @@ var = _old_vds.servint_trains def = 150 min = 5 max = 800 -to = SLV_120 +to = SLV_COMPANY_SERVICE_INTERVALS [SDTG_VAR] name = ""vehicle.servint_roadveh"" @@ -400,7 +400,7 @@ var = _old_vds.servint_roadveh def = 150 min = 5 max = 800 -to = SLV_120 +to = SLV_COMPANY_SERVICE_INTERVALS [SDTG_VAR] name = ""vehicle.servint_ships"" @@ -410,7 +410,7 @@ var = _old_vds.servint_ships def = 360 min = 5 max = 800 -to = SLV_120 +to = SLV_COMPANY_SERVICE_INTERVALS [SDTG_VAR] name = ""vehicle.servint_aircraft"" @@ -420,7 +420,7 @@ var = _old_vds.servint_aircraft def = 150 min = 5 max = 800 -to = SLV_120 +to = SLV_COMPANY_SERVICE_INTERVALS ## These were once in the "gui" section, but they really are related to orders. diff --git a/src/table/settings/locale_settings.ini b/src/table/settings/locale_settings.ini index db4feab53f..3125b03264 100644 --- a/src/table/settings/locale_settings.ini +++ b/src/table/settings/locale_settings.ini @@ -174,7 +174,7 @@ strval = STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_IMPERIAL [SDT_SSTR] var = locale.digit_group_separator type = SLE_STRQ -from = SLV_118 +from = SLV_DIGIT_GROUP_SEPARATOR flags = SettingFlag::NoNetworkSync def = """" post_cb = [](auto) { MarkWholeScreenDirty(); } @@ -183,7 +183,7 @@ cat = SC_BASIC [SDT_SSTR] var = locale.digit_group_separator_currency type = SLE_STRQ -from = SLV_118 +from = SLV_DIGIT_GROUP_SEPARATOR flags = SettingFlag::NoNetworkSync def = """" post_cb = [](auto) { MarkWholeScreenDirty(); } @@ -192,7 +192,7 @@ cat = SC_BASIC [SDT_SSTR] var = locale.digit_decimal_separator type = SLE_STRQ -from = SLV_126 +from = SLV_CUMULATED_INFLATION flags = SettingFlag::NoNetworkSync def = """" post_cb = [](auto) { MarkWholeScreenDirty(); } diff --git a/src/table/settings/pathfinding_settings.ini b/src/table/settings/pathfinding_settings.ini index 0a3f63393c..8dd0fe1fb5 100644 --- a/src/table/settings/pathfinding_settings.ini +++ b/src/table/settings/pathfinding_settings.ini @@ -350,7 +350,7 @@ cat = SC_EXPERT [SDT_VAR] var = pf.yapf.road_stop_occupied_penalty type = SLE_UINT -from = SLV_130 +from = SLV_ROAD_STOP_OCCUPANCY_PENALTY def = 8 * YAPF_TILE_LENGTH min = 0 max = 1000000 @@ -359,7 +359,7 @@ cat = SC_EXPERT [SDT_VAR] var = pf.yapf.road_stop_bay_occupied_penalty type = SLE_UINT -from = SLV_130 +from = SLV_ROAD_STOP_OCCUPANCY_PENALTY def = 15 * YAPF_TILE_LENGTH min = 0 max = 1000000 @@ -368,7 +368,7 @@ cat = SC_EXPERT [SDT_VAR] var = pf.yapf.maximum_go_to_depot_penalty type = SLE_UINT -from = SLV_131 +from = SLV_MAXIMUM_DEPOT_PENALTY def = 20 * YAPF_TILE_LENGTH min = 0 max = 1000000 diff --git a/src/table/settings/world_settings.ini b/src/table/settings/world_settings.ini index 4eade78555..46611f3c9d 100644 --- a/src/table/settings/world_settings.ini +++ b/src/table/settings/world_settings.ini @@ -290,7 +290,7 @@ max = BorderFlagPresets::InfiniteWater [SDT_VAR] var = game_creation.custom_town_number type = SLE_UINT16 -from = SLV_115 +from = SLV_CUSTOM_TOWN_NUMBER def = 1 min = 1 max = 5000 @@ -591,7 +591,7 @@ cat = SC_EXPERT [SDT_VAR] var = construction.extra_tree_placement type = SLE_UINT8 -from = SLV_132 +from = SLV_DISALLOW_TREE_BUILDING flags = SettingFlag::GuiDropdown def = 2 min = 0