diff --git a/src/saveload/afterload.cpp b/src/saveload/afterload.cpp index 1d97223dea..2df4747b2e 100644 --- a/src/saveload/afterload.cpp +++ b/src/saveload/afterload.cpp @@ -1057,7 +1057,7 @@ bool AfterLoadGame() } } - if (IsSavegameVersionBefore(SLV_48)) { + if (IsSavegameVersionBefore(SLV_RAIL_TRACK_TYPE_UNIFICATION)) { for (auto t : Map::Iterate()) { switch (GetTileType(t)) { case TileType::Railway: @@ -1085,9 +1085,9 @@ bool AfterLoadGame() } } - if (IsSavegameVersionBefore(SLV_61)) { + if (IsSavegameVersionBefore(SLV_MULTIPLE_ROAD_TYPES)) { /* Added the RoadType */ - bool old_bridge = IsSavegameVersionBefore(SLV_42); + bool old_bridge = IsSavegameVersionBefore(SLV_BRIDGE_WORMHOLE); for (auto t : Map::Iterate()) { switch (GetTileType(t)) { case TileType::Road: @@ -1125,8 +1125,8 @@ bool AfterLoadGame() } if (IsSavegameVersionBefore(SLV_114)) { - bool fix_roadtypes = !IsSavegameVersionBefore(SLV_61); - bool old_bridge = IsSavegameVersionBefore(SLV_42); + bool fix_roadtypes = !IsSavegameVersionBefore(SLV_MULTIPLE_ROAD_TYPES); + bool old_bridge = IsSavegameVersionBefore(SLV_BRIDGE_WORMHOLE); for (auto t : Map::Iterate()) { switch (GetTileType(t)) { @@ -1223,7 +1223,7 @@ bool AfterLoadGame() } } - if (IsSavegameVersionBefore(SLV_42)) { + if (IsSavegameVersionBefore(SLV_BRIDGE_WORMHOLE)) { for (auto t : Map::Iterate()) { if (MayHaveBridgeAbove(t)) ClearBridgeMiddle(t); if (IsBridgeTile(t)) { @@ -1514,7 +1514,7 @@ bool AfterLoadGame() /* From version 53, the map array was changed for house tiles to allow * space for newhouses grf features. A new byte, m7, was also added. */ - if (IsSavegameVersionBefore(SLV_53)) { + if (IsSavegameVersionBefore(SLV_NEWGRF_HOUSES)) { for (auto t : Map::Iterate()) { if (IsTileType(t, TileType::House)) { if (GB(t.m3(), 6, 2) != TOWN_HOUSE_COMPLETED) { @@ -1572,7 +1572,7 @@ bool AfterLoadGame() /* Check and update house and town values */ UpdateHousesAndTowns(); - if (IsSavegameVersionBefore(SLV_43)) { + if (IsSavegameVersionBefore(SLV_UNIFY_ANIMATION_STATE)) { for (auto t : Map::Iterate()) { if (IsTileType(t, TileType::Industry)) { switch (GetIndustryGfx(t)) { @@ -1599,7 +1599,7 @@ bool AfterLoadGame() } } - if (IsSavegameVersionBefore(SLV_45)) { + if (IsSavegameVersionBefore(SLV_COUNT_PAID_FOR_CARGO)) { /* Originally just the fact that some cargo had been paid for was * stored to stop people cheating and cashing in several times. This * wasn't enough though as it was cleared when the vehicle started @@ -1612,13 +1612,13 @@ bool AfterLoadGame() /* Buoys do now store the owner of the previous water tile, which can never * be OWNER_NONE. So replace OWNER_NONE with OWNER_WATER. */ - if (IsSavegameVersionBefore(SLV_46)) { + if (IsSavegameVersionBefore(SLV_MORE_AIRPORT_BLOCKS)) { for (Waypoint *wp : Waypoint::Iterate()) { if (wp->facilities.Test(StationFacility::Dock) && IsTileOwner(wp->xy, OWNER_NONE) && TileHeight(wp->xy) == 0) SetTileOwner(wp->xy, OWNER_WATER); } } - if (IsSavegameVersionBefore(SLV_50)) { + if (IsSavegameVersionBefore(SLV_AIRCRAFT_SPEED_HOLDING)) { /* Aircraft units changed from 8 mph to 1 km-ish/h */ for (Aircraft *v : Aircraft::Iterate()) { if (v->subtype <= AIR_AIRCRAFT) { @@ -1630,7 +1630,7 @@ bool AfterLoadGame() } } - if (IsSavegameVersionBefore(SLV_49)) { + if (IsSavegameVersionBefore(SLV_SIMPLIFY_PLAYER_FACE)) { /* Perform conversion of very old face bits. */ for (Company *c : Company::Iterate()) { c->face = ConvertFromOldCompanyManagerFace(c->face.bits); @@ -1653,7 +1653,7 @@ bool AfterLoadGame() } } - if (IsSavegameVersionBefore(SLV_52)) { + if (IsSavegameVersionBefore(SLV_STATUE_OWNER)) { for (auto t : Map::Iterate()) { if (IsTileType(t, TileType::Object) && t.m5() == OBJECT_STATUE) { t.m2() = CalcClosestTownFromTile(t)->index.base(); @@ -1664,7 +1664,7 @@ bool AfterLoadGame() /* A setting containing the proportion of towns that grow twice as * fast was added in version 54. From version 56 this is now saved in the * town as cities can be built specifically in the scenario editor. */ - if (IsSavegameVersionBefore(SLV_56)) { + if (IsSavegameVersionBefore(SLV_CITIES)) { for (Town *t : Town::Iterate()) { if (_settings_game.economy.larger_towns != 0 && (t->index % _settings_game.economy.larger_towns) == 0) { t->larger_town = true; @@ -1672,7 +1672,7 @@ bool AfterLoadGame() } } - if (IsSavegameVersionBefore(SLV_57)) { + if (IsSavegameVersionBefore(SLV_FIFO_LOADING)) { /* Added a FIFO queue of vehicles loading at stations */ for (Vehicle *v : Vehicle::Iterate()) { if ((v->type != VehicleType::Train || Train::From(v)->IsFrontEngine()) && // for all locs @@ -1685,7 +1685,7 @@ bool AfterLoadGame() v->vehicle_flags.Reset(VehicleFlag::LoadingFinished); } } - } else if (IsSavegameVersionBefore(SLV_59)) { + } else if (IsSavegameVersionBefore(SLV_TOWN_LAYOUT)) { /* For some reason non-loading vehicles could be in the station's loading vehicle list */ for (Station *st : Station::Iterate()) { @@ -1700,7 +1700,7 @@ bool AfterLoadGame() } } - if (IsSavegameVersionBefore(SLV_58)) { + if (IsSavegameVersionBefore(SLV_VERY_LOW_TOWN_INDUSTRY_NUMBER)) { /* Setting difficulty industry_density other than zero get bumped to +1 * since a new option (very low at position 1) has been added */ if (_settings_game.difficulty.industry_density > IndustryDensity::FundedOnly) { @@ -1711,7 +1711,7 @@ bool AfterLoadGame() _settings_game.difficulty.number_towns++; } - if (IsSavegameVersionBefore(SLV_64)) { + if (IsSavegameVersionBefore(SLV_MULTIPLE_SIGNAL_TYPES)) { /* Since now we allow different signal types and variants on a single tile. * Move signal states to m4 to make room and clone the signal type/variant. */ for (auto t : Map::Iterate()) { @@ -1984,7 +1984,7 @@ bool AfterLoadGame() } } - if (IsSavegameVersionBefore(SLV_62)) { + if (IsSavegameVersionBefore(SLV_ADJACENT_STATIONS)) { GroupStatistics::UpdateAfterLoad(); // Ensure statistics pool is initialised before trying to delete vehicles /* Remove all trams from savegames without tram support. * There would be trams without tram track under causing crashes sooner or later. */ diff --git a/src/saveload/autoreplace_sl.cpp b/src/saveload/autoreplace_sl.cpp index 369585dd26..5e68784570 100644 --- a/src/saveload/autoreplace_sl.cpp +++ b/src/saveload/autoreplace_sl.cpp @@ -21,7 +21,7 @@ static const SaveLoad _engine_renew_desc[] = { SLE_VAR(EngineRenew, to, SLE_UINT16), SLE_REF(EngineRenew, next, REF_ENGINE_RENEWS), - SLE_CONDVAR(EngineRenew, group_id, SLE_UINT16, SLV_60, SL_MAX_VERSION), + SLE_CONDVAR(EngineRenew, group_id, SLE_UINT16, SLV_VEHICLE_GROUPS, SL_MAX_VERSION), SLE_CONDVAR(EngineRenew, replace_when_old, SLE_BOOL, SLV_175, SL_MAX_VERSION), }; @@ -49,7 +49,7 @@ struct ERNWChunkHandler : ChunkHandler { SlObject(er, slt); /* Advanced vehicle lists, ungrouped vehicles got added */ - if (IsSavegameVersionBefore(SLV_60)) { + if (IsSavegameVersionBefore(SLV_VEHICLE_GROUPS)) { er->group_id = ALL_GROUP; } else if (IsSavegameVersionBefore(SLV_71)) { if (er->group_id == DEFAULT_GROUP) er->group_id = ALL_GROUP; diff --git a/src/saveload/cargopacket_sl.cpp b/src/saveload/cargopacket_sl.cpp index a6da6cd0a4..d606596d7e 100644 --- a/src/saveload/cargopacket_sl.cpp +++ b/src/saveload/cargopacket_sl.cpp @@ -22,7 +22,7 @@ */ /* static */ void CargoPacket::AfterLoad() { - if (IsSavegameVersionBefore(SLV_44)) { + if (IsSavegameVersionBefore(SLV_CARGO_SOURCE_TILE)) { /* If we remove a station while cargo from it is still en route, payment calculation will assume * 0, 0 to be the source of the cargo, resulting in very high payments usually. v->source_xy * stores the coordinates, preserving them even if the station is removed. However, if a game is loaded diff --git a/src/saveload/company_sl.cpp b/src/saveload/company_sl.cpp index 301e7afe2b..26095c3bdf 100644 --- a/src/saveload/company_sl.cpp +++ b/src/saveload/company_sl.cpp @@ -422,7 +422,7 @@ public: */ size_t GetNumLiveries() const { - if (IsSavegameVersionBefore(SLV_63)) return to_underlying(LiveryScheme::End) - 4; + if (IsSavegameVersionBefore(SLV_TRAM_LIVERY)) return to_underlying(LiveryScheme::End) - 4; if (IsSavegameVersionBefore(SLV_85)) return to_underlying(LiveryScheme::End) - 2; if (IsSavegameVersionBefore(SLV_SAVELOAD_LIST_LENGTH)) return to_underlying(LiveryScheme::End); /* Read from the savegame how long the list is. */ @@ -462,7 +462,7 @@ public: c->livery[LiveryScheme::PassengerWagonMaglev] = c->livery[LiveryScheme::Maglev]; } - if (IsSavegameVersionBefore(SLV_63)) { + if (IsSavegameVersionBefore(SLV_TRAM_LIVERY)) { /* Copy bus/truck liveries over to trams */ c->livery[LiveryScheme::PassengerTram] = c->livery[LiveryScheme::Bus]; c->livery[LiveryScheme::FreightTram] = c->livery[LiveryScheme::Truck]; diff --git a/src/saveload/compat/company_sl_compat.h b/src/saveload/compat/company_sl_compat.h index 852cd592a7..544034c8ab 100644 --- a/src/saveload/compat/company_sl_compat.h +++ b/src/saveload/compat/company_sl_compat.h @@ -99,7 +99,7 @@ const SaveLoadCompat _company_sl_compat[] = { SLC_VAR("current_loan"), SLC_VAR("colour"), SLC_VAR("money_fraction"), - SLC_NULL(1, SL_MIN_VERSION, SLV_58), + SLC_NULL(1, SL_MIN_VERSION, SLV_VERY_LOW_TOWN_INDUSTRY_NUMBER), SLC_VAR("block_preview"), SLC_NULL(2, SL_MIN_VERSION, SLV_94), SLC_NULL(4, SLV_94, SLV_170), diff --git a/src/saveload/compat/engine_sl_compat.h b/src/saveload/compat/engine_sl_compat.h index d883521b7e..93cf7859e3 100644 --- a/src/saveload/compat/engine_sl_compat.h +++ b/src/saveload/compat/engine_sl_compat.h @@ -30,7 +30,7 @@ const SaveLoadCompat _engine_sl_compat[] = { SLC_VAR("preview_asked"), SLC_VAR("preview_company"), SLC_VAR("preview_wait"), - SLC_NULL(1, SL_MIN_VERSION, SLV_45), + SLC_NULL(1, SL_MIN_VERSION, SLV_COUNT_PAID_FOR_CARGO), SLC_VAR("company_avail"), SLC_VAR("company_hidden"), SLC_VAR("name"), diff --git a/src/saveload/compat/industry_sl_compat.h b/src/saveload/compat/industry_sl_compat.h index f6f8dbb68f..ba5ab3f48d 100644 --- a/src/saveload/compat/industry_sl_compat.h +++ b/src/saveload/compat/industry_sl_compat.h @@ -36,12 +36,12 @@ const SaveLoadCompat _industry_sl_compat[] = { SLC_VAR("location.h"), SLC_VAR("town"), SLC_VAR("neutral_station"), - SLC_NULL(2, SL_MIN_VERSION, SLV_61), + SLC_NULL(2, SL_MIN_VERSION, SLV_MULTIPLE_ROAD_TYPES), SLC_VAR("produced_cargo"), SLC_VAR("incoming_cargo_waiting"), SLC_VAR("produced_cargo_waiting"), SLC_VAR("production_rate"), - SLC_NULL(3, SL_MIN_VERSION, SLV_61), + SLC_NULL(3, SL_MIN_VERSION, SLV_MULTIPLE_ROAD_TYPES), SLC_VAR("accepts_cargo"), SLC_VAR("prod_level"), SLC_VAR("this_month_production"), diff --git a/src/saveload/compat/misc_sl_compat.h b/src/saveload/compat/misc_sl_compat.h index cc0c6ac301..0ccaa47e47 100644 --- a/src/saveload/compat/misc_sl_compat.h +++ b/src/saveload/compat/misc_sl_compat.h @@ -19,7 +19,7 @@ const SaveLoadCompat _date_sl_compat[] = { SLC_VAR("tick_counter"), SLC_NULL(2, SL_MIN_VERSION, SLV_157), SLC_VAR("age_cargo_skip_counter"), - SLC_NULL(1, SL_MIN_VERSION, SLV_46), + 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), @@ -41,7 +41,7 @@ const SaveLoadCompat _date_check_sl_compat[] = { SLC_NULL(2, SL_MIN_VERSION, SL_MAX_VERSION), // tick_counter SLC_NULL(2, SL_MIN_VERSION, SLV_157), SLC_NULL(1, SL_MIN_VERSION, SLV_162), // age_cargo_skip_counter - SLC_NULL(1, SL_MIN_VERSION, SLV_46), + SLC_NULL(1, SL_MIN_VERSION, SLV_MORE_AIRPORT_BLOCKS), 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 diff --git a/src/saveload/compat/settings_sl_compat.h b/src/saveload/compat/settings_sl_compat.h index e648092620..9c2cfd06c0 100644 --- a/src/saveload/compat/settings_sl_compat.h +++ b/src/saveload/compat/settings_sl_compat.h @@ -129,7 +129,7 @@ const SaveLoadCompat _settings_sl_compat[] = { SLC_VAR("order.gradual_loading"), SLC_VAR("construction.road_stop_on_town_road"), SLC_VAR("construction.road_stop_on_competitor_road"), - SLC_NULL(1, SLV_62, SLV_TABLE_CHUNKS), + SLC_NULL(1, SLV_ADJACENT_STATIONS, SLV_TABLE_CHUNKS), SLC_VAR("economy.station_noise_level"), SLC_VAR("station.distant_join_stations"), SLC_VAR("economy.inflation"), @@ -182,7 +182,7 @@ const SaveLoadCompat _settings_sl_compat[] = { SLC_NULL(32, SL_MIN_VERSION, SLV_TABLE_CHUNKS), SLC_NULL(8, SLV_100, SLV_TABLE_CHUNKS), SLC_NULL(16, SL_MIN_VERSION, SLV_TABLE_CHUNKS), - SLC_NULL(4, SLV_47, 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(1, SLV_YAPF, SLV_TABLE_CHUNKS), diff --git a/src/saveload/compat/station_sl_compat.h b/src/saveload/compat/station_sl_compat.h index 54e69b4f3b..2181d26489 100644 --- a/src/saveload/compat/station_sl_compat.h +++ b/src/saveload/compat/station_sl_compat.h @@ -15,13 +15,13 @@ /** Original field order for _roadstop_desc. */ const SaveLoadCompat _roadstop_sl_compat[] = { SLC_VAR("xy"), - SLC_NULL(1, SL_MIN_VERSION, SLV_45), + SLC_NULL(1, SL_MIN_VERSION, SLV_COUNT_PAID_FOR_CARGO), SLC_VAR("status"), SLC_NULL(4, SL_MIN_VERSION, SLV_LARGER_TOWN_CARGO_STATISTICS), - SLC_NULL(2, SL_MIN_VERSION, SLV_45), + SLC_NULL(2, SL_MIN_VERSION, SLV_COUNT_PAID_FOR_CARGO), SLC_NULL(1, SL_MIN_VERSION, SLV_LAST_VEHICLE_TYPE), SLC_VAR("next"), - SLC_NULL(2, SL_MIN_VERSION, SLV_45), + SLC_NULL(2, SL_MIN_VERSION, SLV_COUNT_PAID_FOR_CARGO), SLC_NULL(4, SL_MIN_VERSION, SLV_IMPROVE_MULTISTOP), SLC_NULL(1, SLV_IMPROVE_MULTISTOP, SLV_LAST_VEHICLE_TYPE), }; @@ -50,7 +50,7 @@ const SaveLoadCompat _station_flow_sl_compat[] = { const SaveLoadCompat _station_goods_sl_compat[] = { SLC_VAR("waiting_acceptance"), SLC_VAR("status"), - SLC_NULL(2, SLV_51, SLV_68), + SLC_NULL(2, SLV_FEEDER_SHARE, SLV_68), SLC_VAR("time_since_pickup"), SLC_VAR("rating"), SLC_VAR("cargo_source"), diff --git a/src/saveload/compat/vehicle_sl_compat.h b/src/saveload/compat/vehicle_sl_compat.h index e5e1e57010..c1b9262683 100644 --- a/src/saveload/compat/vehicle_sl_compat.h +++ b/src/saveload/compat/vehicle_sl_compat.h @@ -25,9 +25,9 @@ const SaveLoadCompat _vehicle_common_sl_compat[] = { SLC_VAR("y_pos"), SLC_VAR("z_pos"), SLC_VAR("direction"), - SLC_NULL(2, SL_MIN_VERSION, SLV_58), + SLC_NULL(2, SL_MIN_VERSION, SLV_VERY_LOW_TOWN_INDUSTRY_NUMBER), SLC_VAR("spritenum"), - SLC_NULL(5, SL_MIN_VERSION, SLV_58), + SLC_NULL(5, SL_MIN_VERSION, SLV_VERY_LOW_TOWN_INDUSTRY_NUMBER), SLC_VAR("engine_type"), SLC_NULL(2, SL_MIN_VERSION, SLV_152), SLC_VAR("cur_speed"), @@ -82,7 +82,7 @@ const SaveLoadCompat _vehicle_common_sl_compat[] = { SLC_VAR("profit_this_year"), SLC_VAR("profit_last_year"), SLC_VAR("cargo_feeder_share"), - SLC_NULL(4, SLV_51, SLV_68), + SLC_NULL(4, SLV_FEEDER_SHARE, SLV_68), SLC_VAR("value"), SLC_VAR("random_bits"), SLC_VAR("waiting_triggers"), @@ -103,7 +103,7 @@ const SaveLoadCompat _vehicle_train_sl_compat[] = { SLC_NULL(1, SL_MIN_VERSION, SLV_ENGINE_MULTI_RAILTYPE), SLC_VAR("track"), SLC_VAR("flags"), - SLC_NULL(2, SLV_VEHICLE_CURRENCY_STATION_CHANGES, SLV_60), + SLC_NULL(2, SLV_VEHICLE_CURRENCY_STATION_CHANGES, SLV_VEHICLE_GROUPS), SLC_VAR("wait_counter"), SLC_NULL(2, SLV_VEHICLE_CURRENCY_STATION_CHANGES, SLV_NO_MULTIHEAD_REFERENCE), SLC_VAR("gv_flags"), @@ -161,7 +161,7 @@ const SaveLoadCompat _vehicle_effect_sl_compat[] = { SLC_VAR("y_pos"), SLC_VAR("z_pos"), SLC_VAR("sprite_cache.sprite_seq.seq[0].sprite"), - SLC_NULL(5, SL_MIN_VERSION, SLV_59), + SLC_NULL(5, SL_MIN_VERSION, SLV_TOWN_LAYOUT), SLC_VAR("progress"), SLC_VAR("vehstatus"), SLC_VAR("animation_state"), @@ -180,7 +180,7 @@ const SaveLoadCompat _vehicle_disaster_sl_compat[] = { SLC_VAR("y_pos"), SLC_VAR("z_pos"), SLC_VAR("direction"), - SLC_NULL(5, SL_MIN_VERSION, SLV_58), + SLC_NULL(5, SL_MIN_VERSION, SLV_VERY_LOW_TOWN_INDUSTRY_NUMBER), SLC_VAR("owner"), SLC_VAR("vehstatus"), SLC_VAR("current_order.dest"), diff --git a/src/saveload/economy_sl.cpp b/src/saveload/economy_sl.cpp index 3618bb8865..00e26c34e7 100644 --- a/src/saveload/economy_sl.cpp +++ b/src/saveload/economy_sl.cpp @@ -36,7 +36,7 @@ struct CAPRChunkHandler : ChunkHandler { void Load() const override { - uint num_cargo = IsSavegameVersionBefore(SLV_55) ? 12 : IsSavegameVersionBefore(SLV_EXTEND_CARGOTYPES) ? 32 : NUM_CARGO; + uint num_cargo = IsSavegameVersionBefore(SLV_NEWGRF_CARGO) ? 12 : IsSavegameVersionBefore(SLV_EXTEND_CARGOTYPES) ? 32 : NUM_CARGO; int vt = IsSavegameVersionBefore(SLV_65) ? SLE_FILE_I32 : SLE_FILE_I64; SlCopy(nullptr, num_cargo, vt | SLE_VAR_NULL); SlCopy(nullptr, num_cargo, SLE_FILE_U16 | SLE_VAR_NULL); diff --git a/src/saveload/map_sl.cpp b/src/saveload/map_sl.cpp index 4606e14980..fac92f2928 100644 --- a/src/saveload/map_sl.cpp +++ b/src/saveload/map_sl.cpp @@ -266,7 +266,7 @@ struct MAPEChunkHandler : ChunkHandler { std::array buf; uint size = Map::Size(); - if (IsSavegameVersionBefore(SLV_42)) { + if (IsSavegameVersionBefore(SLV_BRIDGE_WORMHOLE)) { for (TileIndex i{}; i != size;) { /* 1024, otherwise we overflow on 64x64 maps! */ SlCopy(buf.data(), 1024, SLE_UINT8); diff --git a/src/saveload/saveload.h b/src/saveload/saveload.h index 81971c374a..dd13a84c98 100644 --- a/src/saveload/saveload.h +++ b/src/saveload/saveload.h @@ -89,35 +89,35 @@ enum SaveLoadVersion : uint16_t { SLV_DISABLE_ELRAIL_SETTING, ///< 38 7195 Add setting to disable electrified rails SLV_FREIGHT_WEIGHT, ///< 39 7269 Setting to increase the weight of cargo on freight trains - SLV_40, ///< 40 7326 - SLV_41, ///< 41 7348 0.5.x - SLV_42, ///< 42 7573 - SLV_43, ///< 43 7642 - SLV_44, ///< 44 8144 + SLV_GRADUAL_LOADING, ///< 40 7326 Gradual (un)loading of cargo + SLV_NEWGRF_SETTINGS, ///< 41 7348 0.5.x Save what NewGRFs are used in the game and their settings + SLV_BRIDGE_WORMHOLE, ///< 42 7573 Bridges become wormholes, so more things can be built under them (e.g. signals) + SLV_UNIFY_ANIMATION_STATE, ///< 43 7642 Put all animation state information in same map bits + SLV_CARGO_SOURCE_TILE, ///< 44 8144 Store the source tile of the cargo, so accurate payment can happen when the source station is removed - SLV_45, ///< 45 8501 - SLV_46, ///< 46 8705 - SLV_47, ///< 47 8735 - SLV_48, ///< 48 8935 - SLV_49, ///< 49 8969 + SLV_COUNT_PAID_FOR_CARGO, ///< 45 8501 Count the amount of cargo that was paid for + SLV_MORE_AIRPORT_BLOCKS, ///< 46 8705 Increase number of blocks an airport can have + SLV_DRIVE_THROUGH_ROAD_STOPS, ///< 47 8735 Drive through road stops + SLV_RAIL_TRACK_TYPE_UNIFICATION, ///< 48 8935 Put all the rail track type information in same map bits + SLV_SIMPLIFY_PLAYER_FACE, ///< 49 8969 Simplify the storage of player face information - SLV_50, ///< 50 8973 - SLV_51, ///< 51 8978 - SLV_52, ///< 52 9066 - SLV_53, ///< 53 9316 - SLV_54, ///< 54 9613 + SLV_AIRCRAFT_SPEED_HOLDING, ///< 50 8973 Aircraft speed in km-ish/h and reduced speed in holding patterns + SLV_FEEDER_SHARE, ///< 51 8978 Rewrite of transfers to retain knowledge about the already paid amount for transfered cargo + SLV_STATUE_OWNER, ///< 52 9066 Store the owner of the statue, so the town can be informed of their removal + SLV_NEWGRF_HOUSES, ///< 53 9316 NewGRF controlled houses + SLV_TOWN_GROWTH_CONTROL, ///< 54 9613 Give the player control over the town growth - SLV_55, ///< 55 9638 - SLV_56, ///< 56 9667 - SLV_57, ///< 57 9691 - SLV_58, ///< 58 9762 - SLV_59, ///< 59 9779 + SLV_NEWGRF_CARGO, ///< 55 9638 Increase number of cargos and NewGRF control of cargos + SLV_CITIES, ///< 56 9667 Cities that start bigger and grow faster + SLV_FIFO_LOADING, ///< 57 9691 First-in-first-out loading of vehicles + SLV_VERY_LOW_TOWN_INDUSTRY_NUMBER, ///< 58 9762 Difficulty settings for very low number of industries and towns + SLV_TOWN_LAYOUT, ///< 59 9779 More layout options for towns - SLV_60, ///< 60 9874 - SLV_61, ///< 61 9892 - SLV_62, ///< 62 9905 - SLV_63, ///< 63 9956 - SLV_64, ///< 64 10006 + SLV_VEHICLE_GROUPS, ///< 60 9874 Arbitrary grouping, by the player, of vehicles + SLV_MULTIPLE_ROAD_TYPES, ///< 61 9892 Multiple road types for the same tile + SLV_ADJACENT_STATIONS, ///< 62 9905 Allow building multiple stations directly next to eachother + SLV_TRAM_LIVERY, ///< 63 9956 Add separate livery for trams + SLV_MULTIPLE_SIGNAL_TYPES, ///< 64 10006 Multiple different signal types on the same (diagonal) tile, instead of the same for both directions SLV_65, ///< 65 10210 SLV_66, ///< 66 10211 diff --git a/src/saveload/station_sl.cpp b/src/saveload/station_sl.cpp index b2b63bc7f5..ca2e54f4aa 100644 --- a/src/saveload/station_sl.cpp +++ b/src/saveload/station_sl.cpp @@ -377,7 +377,7 @@ public: SLE_VAR(GoodsEntry, rating, SLE_UINT8), SLEG_CONDVAR("cargo_source", _cargo_source, SLE_FILE_U8 | SLE_VAR_U16, SL_MIN_VERSION, SLV_LARGER_CARGO_SOURCE), SLEG_CONDVAR("cargo_source", _cargo_source, SLE_UINT16, SLV_LARGER_CARGO_SOURCE, SLV_68), - SLEG_CONDVAR("cargo_source_xy", _cargo_source_xy, SLE_UINT32, SLV_44, SLV_68), + SLEG_CONDVAR("cargo_source_xy", _cargo_source_xy, SLE_UINT32, SLV_CARGO_SOURCE_TILE, SLV_68), SLEG_CONDVAR("cargo_days", _cargo_periods, SLE_UINT8, SL_MIN_VERSION, SLV_68), SLE_VAR(GoodsEntry, last_speed, SLE_UINT8), SLE_VAR(GoodsEntry, last_age, SLE_UINT8), @@ -403,7 +403,7 @@ public: */ size_t GetNumCargo() const { - if (IsSavegameVersionBefore(SLV_55)) return 12; + if (IsSavegameVersionBefore(SLV_NEWGRF_CARGO)) return 12; if (IsSavegameVersionBefore(SLV_EXTEND_CARGOTYPES)) return 32; if (IsSavegameVersionBefore(SLV_SAVELOAD_LIST_LENGTH)) return NUM_CARGO; /* Read from the savegame how long the list is. */ @@ -469,7 +469,7 @@ public: { Station *st = Station::From(bst); - size_t num_cargo = IsSavegameVersionBefore(SLV_55) ? 12 : IsSavegameVersionBefore(SLV_EXTEND_CARGOTYPES) ? 32 : NUM_CARGO; + size_t num_cargo = IsSavegameVersionBefore(SLV_NEWGRF_CARGO) ? 12 : IsSavegameVersionBefore(SLV_EXTEND_CARGOTYPES) ? 32 : NUM_CARGO; auto end = std::next(std::begin(st->goods), std::min(num_cargo, std::size(st->goods))); for (auto it = std::begin(st->goods); it != end; ++it) { GoodsEntry &ge = *it; @@ -508,8 +508,8 @@ static const SaveLoad _old_station_desc[] = { 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, SL_MIN_VERSION, SLV_BIGGER_STATION_VARIABLES), - SLE_CONDVARNAME(Station, airport.blocks, "airport.flags", SLE_VAR_U64 | SLE_FILE_U32, SLV_BIGGER_STATION_VARIABLES, SLV_46), - SLE_CONDVARNAME(Station, airport.blocks, "airport.flags", SLE_UINT64, SLV_46, SL_MAX_VERSION), + SLE_CONDVARNAME(Station, airport.blocks, "airport.flags", SLE_VAR_U64 | SLE_FILE_U32, SLV_BIGGER_STATION_VARIABLES, SLV_MORE_AIRPORT_BLOCKS), + SLE_CONDVARNAME(Station, airport.blocks, "airport.flags", SLE_UINT64, SLV_MORE_AIRPORT_BLOCKS, SL_MAX_VERSION), SLE_CONDVAR(Station, last_vehicle_type, SLE_UINT8, SLV_LAST_VEHICLE_TYPE, SL_MAX_VERSION), @@ -524,7 +524,7 @@ static const SaveLoad _old_station_desc[] = { SLE_CONDVARNAME(Station, waiting_random_triggers, "waiting_triggers", SLE_UINT8, SLV_NEWGRF_STATIONS, SL_MAX_VERSION), SLEG_CONDVAR("num_specs", SlStationSpecList::last_num_specs, SLE_UINT8, SLV_NEWGRF_STATIONS, SL_MAX_VERSION), - SLE_CONDREFLIST(Station, loading_vehicles, REF_VEHICLE, SLV_57, SL_MAX_VERSION), + SLE_CONDREFLIST(Station, loading_vehicles, REF_VEHICLE, SLV_FIFO_LOADING, SL_MAX_VERSION), SLEG_STRUCTLIST("goods", SlStationGoods), SLEG_CONDSTRUCTLIST("speclist", SlStationSpecList, SLV_NEWGRF_STATIONS, SL_MAX_VERSION), diff --git a/src/saveload/town_sl.cpp b/src/saveload/town_sl.cpp index fab354d9bf..4122d46c57 100644 --- a/src/saveload/town_sl.cpp +++ b/src/saveload/town_sl.cpp @@ -342,12 +342,12 @@ static const SaveLoad _town_desc[] = { SLE_CONDSSTR(Town, text, SLE_STR | SLF_ALLOW_CONTROL, SLV_168, SL_MAX_VERSION), - SLE_CONDVAR(Town, time_until_rebuild, SLE_FILE_U8 | SLE_VAR_U16, SL_MIN_VERSION, SLV_54), - SLE_CONDVAR(Town, time_until_rebuild, SLE_UINT16, SLV_54, SL_MAX_VERSION), - SLE_CONDVAR(Town, grow_counter, SLE_FILE_U8 | SLE_VAR_U16, SL_MIN_VERSION, SLV_54), - SLE_CONDVAR(Town, grow_counter, SLE_UINT16, SLV_54, SL_MAX_VERSION), - SLE_CONDVAR(Town, growth_rate, SLE_FILE_U8 | SLE_VAR_I16, SL_MIN_VERSION, SLV_54), - SLE_CONDVAR(Town, growth_rate, SLE_FILE_I16 | SLE_VAR_U16, SLV_54, SLV_165), + SLE_CONDVAR(Town, time_until_rebuild, SLE_FILE_U8 | SLE_VAR_U16, SL_MIN_VERSION, SLV_TOWN_GROWTH_CONTROL), + SLE_CONDVAR(Town, time_until_rebuild, SLE_UINT16, SLV_TOWN_GROWTH_CONTROL, SL_MAX_VERSION), + SLE_CONDVAR(Town, grow_counter, SLE_FILE_U8 | SLE_VAR_U16, SL_MIN_VERSION, SLV_TOWN_GROWTH_CONTROL), + SLE_CONDVAR(Town, grow_counter, SLE_UINT16, SLV_TOWN_GROWTH_CONTROL, SL_MAX_VERSION), + SLE_CONDVAR(Town, growth_rate, SLE_FILE_U8 | SLE_VAR_I16, SL_MIN_VERSION, SLV_TOWN_GROWTH_CONTROL), + SLE_CONDVAR(Town, growth_rate, SLE_FILE_I16 | SLE_VAR_U16, SLV_TOWN_GROWTH_CONTROL, SLV_165), SLE_CONDVAR(Town, growth_rate, SLE_UINT16, SLV_165, SL_MAX_VERSION), SLE_VAR(Town, fund_buildings_months, SLE_UINT8), @@ -356,7 +356,7 @@ static const SaveLoad _town_desc[] = { SLE_CONDVAR(Town, exclusivity, SLE_UINT8, SLV_VEHICLE_CURRENCY_STATION_CHANGES, SL_MAX_VERSION), SLE_CONDVAR(Town, exclusive_counter, SLE_UINT8, SLV_VEHICLE_CURRENCY_STATION_CHANGES, SL_MAX_VERSION), - SLE_CONDVAR(Town, larger_town, SLE_BOOL, SLV_56, SL_MAX_VERSION), + SLE_CONDVAR(Town, larger_town, SLE_BOOL, SLV_CITIES, SL_MAX_VERSION), SLE_CONDVAR(Town, layout, SLE_UINT8, SLV_113, SL_MAX_VERSION), SLE_CONDVAR(Town, valid_history, SLE_UINT64, SLV_TOWN_SUPPLY_HISTORY, SL_MAX_VERSION), diff --git a/src/saveload/vehicle_sl.cpp b/src/saveload/vehicle_sl.cpp index 4c0ea689a4..69be1a65eb 100644 --- a/src/saveload/vehicle_sl.cpp +++ b/src/saveload/vehicle_sl.cpp @@ -693,7 +693,7 @@ public: SLEG_CONDVAR("cargo_days", _cargo_periods, SLE_UINT8, SL_MIN_VERSION, SLV_68), SLEG_CONDVAR("cargo_source", _cargo_source, SLE_FILE_U8 | SLE_VAR_U16, SL_MIN_VERSION, SLV_LARGER_CARGO_SOURCE), SLEG_CONDVAR("cargo_source", _cargo_source, SLE_UINT16, SLV_LARGER_CARGO_SOURCE, SLV_68), - SLEG_CONDVAR("cargo_source_xy", _cargo_source_xy, SLE_UINT32, SLV_44, SLV_68), + SLEG_CONDVAR("cargo_source_xy", _cargo_source_xy, SLE_UINT32, SLV_CARGO_SOURCE_TILE, SLV_68), SLE_VAR(Vehicle, cargo_cap, SLE_UINT16), SLE_CONDVAR(Vehicle, refit_cap, SLE_UINT16, SLV_182, SL_MAX_VERSION), SLEG_CONDVAR("cargo_count", _cargo_count, SLE_UINT16, SL_MIN_VERSION, SLV_68), @@ -754,15 +754,15 @@ public: SLE_CONDVAR(Vehicle, build_year, SLE_INT32, SLV_BIG_DATES, SL_MAX_VERSION), SLE_VAR(Vehicle, load_unload_ticks, SLE_UINT16), - SLEG_CONDVAR("cargo_paid_for", _cargo_paid_for, SLE_UINT16, SLV_45, SL_MAX_VERSION), - SLE_CONDVAR(Vehicle, vehicle_flags, SLE_FILE_U8 | SLE_VAR_U16, SLV_40, SLV_180), + SLEG_CONDVAR("cargo_paid_for", _cargo_paid_for, SLE_UINT16, SLV_COUNT_PAID_FOR_CARGO, SL_MAX_VERSION), + SLE_CONDVAR(Vehicle, vehicle_flags, SLE_FILE_U8 | SLE_VAR_U16, SLV_GRADUAL_LOADING, SLV_180), SLE_CONDVAR(Vehicle, vehicle_flags, SLE_UINT16, SLV_180, SL_MAX_VERSION), SLE_CONDVAR(Vehicle, profit_this_year, SLE_FILE_I32 | SLE_VAR_I64, SL_MIN_VERSION, SLV_65), SLE_CONDVAR(Vehicle, profit_this_year, SLE_INT64, SLV_65, SL_MAX_VERSION), SLE_CONDVAR(Vehicle, profit_last_year, SLE_FILE_I32 | SLE_VAR_I64, SL_MIN_VERSION, SLV_65), SLE_CONDVAR(Vehicle, profit_last_year, SLE_INT64, SLV_65, SL_MAX_VERSION), - SLEG_CONDVAR("cargo_feeder_share", _cargo_feeder_share, SLE_FILE_I32 | SLE_VAR_I64, SLV_51, SLV_65), + SLEG_CONDVAR("cargo_feeder_share", _cargo_feeder_share, SLE_FILE_I32 | SLE_VAR_I64, SLV_FEEDER_SHARE, SLV_65), SLEG_CONDVAR("cargo_feeder_share", _cargo_feeder_share, SLE_INT64, SLV_65, SLV_68), SLE_CONDVAR(Vehicle, value, SLE_FILE_I32 | SLE_VAR_I64, SL_MIN_VERSION, SLV_65), SLE_CONDVAR(Vehicle, value, SLE_INT64, SLV_65, SL_MAX_VERSION), @@ -772,7 +772,7 @@ public: SLE_CONDVARNAME(Vehicle, waiting_random_triggers, "waiting_triggers", SLE_UINT8, SLV_VEHICLE_CURRENCY_STATION_CHANGES, SL_MAX_VERSION), SLE_CONDREF(Vehicle, next_shared, REF_VEHICLE, SLV_VEHICLE_CURRENCY_STATION_CHANGES, SL_MAX_VERSION), - SLE_CONDVAR(Vehicle, group_id, SLE_UINT16, SLV_60, SL_MAX_VERSION), + SLE_CONDVAR(Vehicle, group_id, SLE_UINT16, SLV_VEHICLE_GROUPS, SL_MAX_VERSION), SLE_CONDVAR(Vehicle, current_order_time, SLE_FILE_U32 | SLE_VAR_I32, SLV_67, SLV_TIMETABLE_TICKS_TYPE), SLE_CONDVAR(Vehicle, current_order_time, SLE_INT32, SLV_TIMETABLE_TICKS_TYPE, SL_MAX_VERSION), @@ -1173,7 +1173,7 @@ struct VEHSChunkHandler : ChunkHandler { } /* Advanced vehicle lists got added */ - if (IsSavegameVersionBefore(SLV_60)) v->group_id = DEFAULT_GROUP; + if (IsSavegameVersionBefore(SLV_VEHICLE_GROUPS)) v->group_id = DEFAULT_GROUP; } } diff --git a/src/table/settings/economy_settings.ini b/src/table/settings/economy_settings.ini index 2ebac9562b..a8202bccc1 100644 --- a/src/table/settings/economy_settings.ini +++ b/src/table/settings/economy_settings.ini @@ -49,7 +49,7 @@ startup = false [SDT_VAR] var = economy.town_layout type = SLE_UINT8 -from = SLV_59 +from = SLV_TOWN_LAYOUT flags = SettingFlag::GuiDropdown def = TL_ORIGINAL min = TL_BEGIN @@ -215,7 +215,7 @@ cat = SC_EXPERT [SDT_VAR] var = economy.town_growth_rate type = SLE_UINT8 -from = SLV_54 +from = SLV_TOWN_GROWTH_CONTROL flags = SettingFlag::GuiDropdown def = 2 min = 0 @@ -227,7 +227,7 @@ strval = STR_CONFIG_SETTING_TOWN_GROWTH_NONE [SDT_VAR] var = economy.larger_towns type = SLE_UINT8 -from = SLV_54 +from = SLV_TOWN_GROWTH_CONTROL flags = SettingFlag::GuiZeroIsSpecial def = 4 min = 0 @@ -240,7 +240,7 @@ strval = STR_CONFIG_SETTING_LARGER_TOWNS_VALUE [SDT_VAR] var = economy.initial_city_size type = SLE_UINT8 -from = SLV_56 +from = SLV_CITIES def = 2 min = 1 max = 10 diff --git a/src/table/settings/game_settings.ini b/src/table/settings/game_settings.ini index 232a1e9183..e92e27786f 100644 --- a/src/table/settings/game_settings.ini +++ b/src/table/settings/game_settings.ini @@ -93,7 +93,7 @@ cat = SC_EXPERT [SDT_BOOL] var = order.gradual_loading -from = SLV_40 +from = SLV_GRADUAL_LOADING flags = SettingFlag::NoNetwork def = true cat = SC_EXPERT diff --git a/src/table/settings/pathfinding_settings.ini b/src/table/settings/pathfinding_settings.ini index eff8529cca..6367711346 100644 --- a/src/table/settings/pathfinding_settings.ini +++ b/src/table/settings/pathfinding_settings.ini @@ -341,7 +341,7 @@ cat = SC_EXPERT [SDT_VAR] var = pf.yapf.road_stop_penalty type = SLE_UINT -from = SLV_47 +from = SLV_DRIVE_THROUGH_ROAD_STOPS def = 8 * YAPF_TILE_LENGTH min = 0 max = 1000000 diff --git a/src/table/settings/world_settings.ini b/src/table/settings/world_settings.ini index 5ed9411eb0..4735c38a64 100644 --- a/src/table/settings/world_settings.ini +++ b/src/table/settings/world_settings.ini @@ -534,7 +534,7 @@ cat = SC_BASIC [SDT_BOOL] var = construction.road_stop_on_town_road -from = SLV_47 +from = SLV_DRIVE_THROUGH_ROAD_STOPS def = true str = STR_CONFIG_SETTING_STOP_ON_TOWN_ROAD strhelp = STR_CONFIG_SETTING_STOP_ON_TOWN_ROAD_HELPTEXT