From 366ec786f1e2458f660fa063d94e6c3e43aa6768 Mon Sep 17 00:00:00 2001 From: rubidium42 Date: Mon, 22 Jun 2026 14:57:49 +0200 Subject: [PATCH] Codechange: use proper names for SLV_20 - SLV_39 (#15762) * Codechange: rename SLV_20 to SLV_NO_MULTIHEAD_REFERENCE * Codechange: rename SLV_21 to SLV_REMOVE_OLD_PBS * Codechange: rename SLV_22 to SLV_SAVE_PATCHES * Codechange: rename SLV_23 to SLV_REMOVE_AUTOSAVE_INTERVAL * Codechange: rename SLV_24 to SLV_ELRAIL * Codechange: rename SLV_25 to SLV_IMPROVE_MULTISTOP * Codechange: rename SLV_26 to SLV_LAST_VEHICLE_TYPE * Codechange: rename SLV_27 to SLV_NEWGRF_STATIONS * Codechange: rename SLV_28 to SLV_YAPF * Codechange: rename SLV_29 to SLV_MORE_UNDER_BRIDGES * Codechange: rename SLV_30 to SLV_TGP * Codechange: rename SLV_31 to SLV_BIG_DATES * Codechange: rename SLV_32 to SLV_LINK_FARM_FIELD_TO_INDUSTRY * Codechange: rename SLV_33 to SLV_SAVE_YAPF_SETTINGS * Codechange: rename SLV_34 to SLV_LIVERIES * Codechange: rename SLV_35 to SLV_LIVERY_REFIT * Codechange: rename SLV_36 to SLV_REFIT_ORDERS * Codechange: rename SLV_37 to SLV_UTF8 * Codechange: rename SLV_38 to SLV_DISABLE_ELRAIL_SETTING * Codechange: rename SLV_39 to SLV_FREIGHT_WEIGHT --- src/saveload/afterload.cpp | 22 +++++----- src/saveload/company_sl.cpp | 12 +++--- src/saveload/compat/order_sl_compat.h | 4 +- src/saveload/compat/settings_sl_compat.h | 8 ++-- src/saveload/compat/station_sl_compat.h | 10 ++--- src/saveload/compat/vehicle_sl_compat.h | 4 +- src/saveload/engine_sl.cpp | 8 ++-- src/saveload/industry_sl.cpp | 4 +- src/saveload/misc_sl.cpp | 10 ++--- src/saveload/order_sl.cpp | 6 +-- src/saveload/saveload.h | 40 +++++++++--------- src/saveload/station_sl.cpp | 20 ++++----- src/saveload/strings_sl.cpp | 2 +- src/saveload/vehicle_sl.cpp | 28 ++++++------- src/saveload/waypoint_sl.cpp | 4 +- src/table/settings/game_settings.ini | 8 ++-- src/table/settings/old_gameopt_settings.ini | 2 +- src/table/settings/pathfinding_settings.ini | 46 ++++++++++----------- src/table/settings/world_settings.ini | 10 ++--- 19 files changed, 124 insertions(+), 124 deletions(-) diff --git a/src/saveload/afterload.cpp b/src/saveload/afterload.cpp index 4633fba867..1d97223dea 100644 --- a/src/saveload/afterload.cpp +++ b/src/saveload/afterload.cpp @@ -761,7 +761,7 @@ bool AfterLoadGame() */ if (IsSavegameVersionBefore(SLV_TOWN_TOLERANCE_PAUSE_MODE, 2)) _settings_game.station.modified_catchment = false; if (IsSavegameVersionBefore(SLV_MULTIPLE_ROAD_STOPS, 1)) _settings_game.pf.forbid_90_deg = false; - if (IsSavegameVersionBefore(SLV_21)) _settings_game.vehicle.train_acceleration_model = AccelerationModel::Original; + if (IsSavegameVersionBefore(SLV_REMOVE_OLD_PBS)) _settings_game.vehicle.train_acceleration_model = AccelerationModel::Original; if (IsSavegameVersionBefore(SLV_90)) _settings_game.vehicle.plane_speed = 4; if (IsSavegameVersionBefore(SLV_95)) _settings_game.vehicle.dynamic_engines = false; if (IsSavegameVersionBefore(SLV_96)) _settings_game.economy.station_noise_level = false; @@ -1334,7 +1334,7 @@ bool AfterLoadGame() } /* Elrails got added in rev 24 */ - if (IsSavegameVersionBefore(SLV_24)) { + if (IsSavegameVersionBefore(SLV_ELRAIL)) { RailType min_rail = RAILTYPE_ELECTRIC; for (Train *v : Train::Iterate()) { @@ -1391,7 +1391,7 @@ bool AfterLoadGame() /* From version 15, we moved a semaphore bit from bit 2 to bit 3 in m4, making * room for PBS. Now in version 21 move it back :P. */ - if (IsSavegameVersionBefore(SLV_21) && !IsSavegameVersionBefore(SLV_MOVE_SEMAPHORE_BITS)) { + if (IsSavegameVersionBefore(SLV_REMOVE_OLD_PBS) && !IsSavegameVersionBefore(SLV_MOVE_SEMAPHORE_BITS)) { for (auto t : Map::Iterate()) { switch (GetTileType(t)) { case TileType::Railway: @@ -1425,7 +1425,7 @@ bool AfterLoadGame() } } - if (IsSavegameVersionBefore(SLV_25)) { + if (IsSavegameVersionBefore(SLV_IMPROVE_MULTISTOP)) { /* Remove obsolete VS_WAIT_FOR_SLOT state from road vehicles. */ static constexpr VehStates OLD_VS_WAIT_FOR_SLOT{0x40}; for (RoadVehicle *rv : RoadVehicle::Iterate()) { @@ -1433,7 +1433,7 @@ bool AfterLoadGame() } } - if (IsSavegameVersionBefore(SLV_26)) { + if (IsSavegameVersionBefore(SLV_LAST_VEHICLE_TYPE)) { for (Station *st : Station::Iterate()) { st->last_vehicle_type = VehicleType::Invalid; } @@ -1441,7 +1441,7 @@ bool AfterLoadGame() YapfNotifyTrackLayoutChange(INVALID_TILE, Track::Invalid); - if (IsSavegameVersionBefore(SLV_34)) { + if (IsSavegameVersionBefore(SLV_LIVERIES)) { for (Company *c : Company::Iterate()) ResetCompanyLivery(c); } @@ -1454,7 +1454,7 @@ bool AfterLoadGame() /* Time starts at 0 instead of 1920. * Account for this in older games by adding an offset */ - if (IsSavegameVersionBefore(SLV_31)) { + if (IsSavegameVersionBefore(SLV_BIG_DATES)) { TimerGameCalendar::date += CalendarTime::DAYS_TILL_ORIGINAL_BASE_YEAR; TimerGameCalendar::year += CalendarTime::ORIGINAL_BASE_YEAR; TimerGameEconomy::date += EconomyTime::DAYS_TILL_ORIGINAL_BASE_YEAR; @@ -1475,7 +1475,7 @@ bool AfterLoadGame() /* From 32 on we save the industry who made the farmland. * To give this prettiness to old savegames, we remove all farmfields and * plant new ones. */ - if (IsSavegameVersionBefore(SLV_32)) { + if (IsSavegameVersionBefore(SLV_LINK_FARM_FIELD_TO_INDUSTRY)) { for (const auto t : Map::Iterate()) { if (IsTileType(t, TileType::Clear) && IsClearGround(t, ClearGround::Fields)) { /* remove fields */ @@ -1493,7 +1493,7 @@ bool AfterLoadGame() } /* Setting no refit flags to all orders in savegames from before refit in orders were added */ - if (IsSavegameVersionBefore(SLV_36)) { + if (IsSavegameVersionBefore(SLV_REFIT_ORDERS)) { for (OrderList *orderlist : OrderList::Iterate()) { for (Order &order : orderlist->GetOrders()) { order.SetRefit(CARGO_NO_REFIT); @@ -1507,7 +1507,7 @@ bool AfterLoadGame() /* from version 38 we have optional elrails, since we cannot know the * preference of a user, let elrails enabled; it can be disabled manually */ - if (IsSavegameVersionBefore(SLV_38)) _settings_game.vehicle.disable_elrails = false; + if (IsSavegameVersionBefore(SLV_DISABLE_ELRAIL_SETTING)) _settings_game.vehicle.disable_elrails = false; /* do the same as when elrails were enabled/disabled manually just now */ UpdateDisableElrailSettingState(_settings_game.vehicle.disable_elrails, false); InitializeSignalGui(); @@ -2907,7 +2907,7 @@ bool AfterLoadGame() _settings_game.game_creation.snow_line_height /= TILE_HEIGHT; } - if (IsSavegameVersionBefore(SLV_164) && !IsSavegameVersionBefore(SLV_32)) { + if (IsSavegameVersionBefore(SLV_164) && !IsSavegameVersionBefore(SLV_LINK_FARM_FIELD_TO_INDUSTRY)) { /* We store 4 fences in the field tiles instead of only SE and SW. */ for (auto t : Map::Iterate()) { if (!IsTileType(t, TileType::Clear) && !IsTileType(t, TileType::Trees)) continue; diff --git a/src/saveload/company_sl.cpp b/src/saveload/company_sl.cpp index c6233dac97..301e7afe2b 100644 --- a/src/saveload/company_sl.cpp +++ b/src/saveload/company_sl.cpp @@ -410,9 +410,9 @@ public: class SlCompanyLiveries : public DefaultSaveLoadHandler { public: static inline const SaveLoad description[] = { - SLE_CONDVAR(Livery, in_use, SLE_UINT8, SLV_34, SL_MAX_VERSION), - SLE_CONDVAR(Livery, colour1, SLE_UINT8, SLV_34, SL_MAX_VERSION), - SLE_CONDVAR(Livery, colour2, SLE_UINT8, SLV_34, SL_MAX_VERSION), + SLE_CONDVAR(Livery, in_use, SLE_UINT8, SLV_LIVERIES, SL_MAX_VERSION), + SLE_CONDVAR(Livery, colour1, SLE_UINT8, SLV_LIVERIES, SL_MAX_VERSION), + SLE_CONDVAR(Livery, colour2, SLE_UINT8, SLV_LIVERIES, SL_MAX_VERSION), }; static inline const SaveLoadCompatTable compat_description = _company_liveries_compat; @@ -521,8 +521,8 @@ static const SaveLoad _company_desc[] = { SLE_CONDVAR(CompanyProperties, location_of_HQ, SLE_UINT32, SLV_MULTIPLE_ROAD_STOPS, SL_MAX_VERSION), SLE_CONDVAR(CompanyProperties, last_build_coordinate, SLE_FILE_U16 | SLE_VAR_U32, SL_MIN_VERSION, SLV_MULTIPLE_ROAD_STOPS), SLE_CONDVAR(CompanyProperties, last_build_coordinate, SLE_UINT32, SLV_MULTIPLE_ROAD_STOPS, SL_MAX_VERSION), - SLE_CONDVAR(CompanyProperties, inaugurated_year, SLE_FILE_U8 | SLE_VAR_I32, SL_MIN_VERSION, SLV_31), - SLE_CONDVAR(CompanyProperties, inaugurated_year, SLE_INT32, SLV_31, SL_MAX_VERSION), + SLE_CONDVAR(CompanyProperties, inaugurated_year, SLE_FILE_U8 | SLE_VAR_I32, SL_MIN_VERSION, SLV_BIG_DATES), + SLE_CONDVAR(CompanyProperties, inaugurated_year, SLE_INT32, SLV_BIG_DATES, SL_MAX_VERSION), SLE_CONDVAR(CompanyProperties, inaugurated_year_calendar, SLE_INT32, SLV_COMPANY_INAUGURATED_PERIOD_V2, SL_MAX_VERSION), SLE_CONDVAR(CompanyProperties, num_valid_stat_ent, SLE_UINT8, SL_MIN_VERSION, SLV_SAVELOAD_LIST_LENGTH), @@ -547,7 +547,7 @@ static const SaveLoad _company_desc[] = { SLEG_CONDSTRUCT("old_ai", SlCompanyOldAI, SL_MIN_VERSION, SLV_107), SLEG_STRUCT("cur_economy", SlCompanyEconomy), SLEG_STRUCTLIST("old_economy", SlCompanyOldEconomy), - SLEG_CONDSTRUCTLIST("liveries", SlCompanyLiveries, SLV_34, SL_MAX_VERSION), + SLEG_CONDSTRUCTLIST("liveries", SlCompanyLiveries, SLV_LIVERIES, SL_MAX_VERSION), }; struct PLYRChunkHandler : ChunkHandler { diff --git a/src/saveload/compat/order_sl_compat.h b/src/saveload/compat/order_sl_compat.h index 16c016284f..0c77333e44 100644 --- a/src/saveload/compat/order_sl_compat.h +++ b/src/saveload/compat/order_sl_compat.h @@ -19,11 +19,11 @@ const SaveLoadCompat _order_sl_compat[] = { SLC_VAR("dest"), SLC_VAR("next"), SLC_VAR("refit_cargo"), - SLC_NULL(1, SLV_36, SLV_182), + SLC_NULL(1, SLV_REFIT_ORDERS, SLV_182), SLC_VAR("wait_time"), SLC_VAR("travel_time"), SLC_VAR("max_speed"), - SLC_NULL(10, SLV_BIG_MAP, SLV_36), + SLC_NULL(10, SLV_BIG_MAP, SLV_REFIT_ORDERS), }; /** Original field order for _orderlist_desc. */ diff --git a/src/saveload/compat/settings_sl_compat.h b/src/saveload/compat/settings_sl_compat.h index 530f1bc62b..e648092620 100644 --- a/src/saveload/compat/settings_sl_compat.h +++ b/src/saveload/compat/settings_sl_compat.h @@ -21,8 +21,8 @@ const SaveLoadCompat _gameopt_sl_compat[] = { SLC_VAR("game_creation.town_name"), SLC_VAR("game_creation.landscape"), SLC_VAR("game_creation.snow_line_height"), - SLC_NULL(1, SLV_22, SLV_165), - SLC_NULL(1, SL_MIN_VERSION, SLV_23), + SLC_NULL(1, SLV_SAVE_PATCHES, SLV_165), + SLC_NULL(1, SL_MIN_VERSION, SLV_REMOVE_AUTOSAVE_INTERVAL), SLC_VAR("vehicle.road_side"), }; @@ -96,7 +96,7 @@ const SaveLoadCompat _settings_sl_compat[] = { SLC_NULL(1, SL_MIN_VERSION, SLV_159), SLC_VAR("pf.roadveh_queue"), SLC_NULL(1, SL_MIN_VERSION, SLV_87), - SLC_NULL(3, SLV_28, SLV_87), + SLC_NULL(3, SLV_YAPF, SLV_87), SLC_NULL(3, SLV_87, SLV_TABLE_CHUNKS), SLC_VAR("vehicle.never_expire_vehicles"), SLC_VAR("vehicle.max_trains"), @@ -185,7 +185,7 @@ const SaveLoadCompat _settings_sl_compat[] = { SLC_NULL(4, SLV_47, SLV_TABLE_CHUNKS), SLC_NULL(8, SLV_130, SLV_TABLE_CHUNKS), SLC_NULL(4, SLV_131, SLV_TABLE_CHUNKS), - SLC_NULL(1, SLV_28, 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"), SLC_VAR("pf.yapf.rail_firstred_penalty"), diff --git a/src/saveload/compat/station_sl_compat.h b/src/saveload/compat/station_sl_compat.h index ce8f492b01..54e69b4f3b 100644 --- a/src/saveload/compat/station_sl_compat.h +++ b/src/saveload/compat/station_sl_compat.h @@ -19,11 +19,11 @@ const SaveLoadCompat _roadstop_sl_compat[] = { SLC_VAR("status"), SLC_NULL(4, SL_MIN_VERSION, SLV_LARGER_TOWN_CARGO_STATISTICS), SLC_NULL(2, SL_MIN_VERSION, SLV_45), - SLC_NULL(1, SL_MIN_VERSION, SLV_26), + SLC_NULL(1, SL_MIN_VERSION, SLV_LAST_VEHICLE_TYPE), SLC_VAR("next"), SLC_NULL(2, SL_MIN_VERSION, SLV_45), - SLC_NULL(4, SL_MIN_VERSION, SLV_25), - SLC_NULL(1, SLV_25, SLV_26), + SLC_NULL(4, SL_MIN_VERSION, SLV_IMPROVE_MULTISTOP), + SLC_NULL(1, SLV_IMPROVE_MULTISTOP, SLV_LAST_VEHICLE_TYPE), }; /** Original field order for SlStationSpecList. */ @@ -162,9 +162,9 @@ const SaveLoadCompat _old_station_sl_compat[] = { SLC_NULL(2, SL_MIN_VERSION, SLV_MULTIPLE_ROAD_STOPS), SLC_NULL(1, SL_MIN_VERSION, SLV_BIG_MAP), SLC_VAR("airport.flags"), - SLC_NULL(2, SL_MIN_VERSION, SLV_26), + SLC_NULL(2, SL_MIN_VERSION, SLV_LAST_VEHICLE_TYPE), SLC_VAR("last_vehicle_type"), - SLC_NULL(2, SLV_BIGGER_STATION_VARIABLES, SLV_26), + SLC_NULL(2, SLV_BIGGER_STATION_VARIABLES, SLV_LAST_VEHICLE_TYPE), SLC_VAR("build_date"), SLC_VAR("bus_stops"), SLC_VAR("truck_stops"), diff --git a/src/saveload/compat/vehicle_sl_compat.h b/src/saveload/compat/vehicle_sl_compat.h index 8ecff23228..e5e1e57010 100644 --- a/src/saveload/compat/vehicle_sl_compat.h +++ b/src/saveload/compat/vehicle_sl_compat.h @@ -59,7 +59,7 @@ const SaveLoadCompat _vehicle_common_sl_compat[] = { SLC_VAR("current_order.flags"), SLC_VAR("current_order.dest"), SLC_VAR("current_order.refit_cargo"), - SLC_NULL(1, SLV_36, SLV_182), + SLC_NULL(1, SLV_REFIT_ORDERS, SLV_182), SLC_VAR("current_order.wait_time"), SLC_VAR("current_order.travel_time"), SLC_VAR("current_order.max_speed"), @@ -105,7 +105,7 @@ const SaveLoadCompat _vehicle_train_sl_compat[] = { SLC_VAR("flags"), SLC_NULL(2, SLV_VEHICLE_CURRENCY_STATION_CHANGES, SLV_60), SLC_VAR("wait_counter"), - SLC_NULL(2, SLV_VEHICLE_CURRENCY_STATION_CHANGES, SLV_20), + 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), }; diff --git a/src/saveload/engine_sl.cpp b/src/saveload/engine_sl.cpp index d5b40051f0..d734c5f26a 100644 --- a/src/saveload/engine_sl.cpp +++ b/src/saveload/engine_sl.cpp @@ -19,10 +19,10 @@ #include "../safeguards.h" static const SaveLoad _engine_desc[] = { - SLE_CONDVAR(Engine, intro_date, SLE_FILE_U16 | SLE_VAR_I32, SL_MIN_VERSION, SLV_31), - SLE_CONDVAR(Engine, intro_date, SLE_INT32, SLV_31, SL_MAX_VERSION), - SLE_CONDVAR(Engine, age, SLE_FILE_U16 | SLE_VAR_I32, SL_MIN_VERSION, SLV_31), - SLE_CONDVAR(Engine, age, SLE_INT32, SLV_31, SL_MAX_VERSION), + SLE_CONDVAR(Engine, intro_date, SLE_FILE_U16 | SLE_VAR_I32, SL_MIN_VERSION, SLV_BIG_DATES), + SLE_CONDVAR(Engine, intro_date, SLE_INT32, SLV_BIG_DATES, SL_MAX_VERSION), + SLE_CONDVAR(Engine, age, SLE_FILE_U16 | SLE_VAR_I32, SL_MIN_VERSION, SLV_BIG_DATES), + SLE_CONDVAR(Engine, age, SLE_INT32, SLV_BIG_DATES, SL_MAX_VERSION), SLE_VAR(Engine, reliability, SLE_UINT16), SLE_VAR(Engine, reliability_spd_dec, SLE_UINT16), SLE_VAR(Engine, reliability_start, SLE_UINT16), diff --git a/src/saveload/industry_sl.cpp b/src/saveload/industry_sl.cpp index 2f09bd7dae..813942ac04 100644 --- a/src/saveload/industry_sl.cpp +++ b/src/saveload/industry_sl.cpp @@ -184,8 +184,8 @@ static const SaveLoad _industry_desc[] = { 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, SL_MIN_VERSION, SLV_31), - SLE_CONDVAR(Industry, last_prod_year, SLE_INT32, SLV_31, SL_MAX_VERSION), + SLE_CONDVAR(Industry, last_prod_year, SLE_FILE_U8 | SLE_VAR_I32, SL_MIN_VERSION, SLV_BIG_DATES), + SLE_CONDVAR(Industry, last_prod_year, SLE_INT32, SLV_BIG_DATES, SL_MAX_VERSION), SLE_VAR(Industry, was_cargo_delivered, SLE_UINT8), SLE_CONDVAR(Industry, ctlflags, SLE_UINT8, SLV_GS_INDUSTRY_CONTROL, SL_MAX_VERSION), diff --git a/src/saveload/misc_sl.cpp b/src/saveload/misc_sl.cpp index 53cf10082b..bbe3bb67d0 100644 --- a/src/saveload/misc_sl.cpp +++ b/src/saveload/misc_sl.cpp @@ -84,8 +84,8 @@ uint8_t _age_cargo_skip_counter; ///< Skip aging of cargo? Used before savegame extern TimeoutTimer _new_competitor_timeout; static const SaveLoad _date_desc[] = { - SLEG_CONDVAR("date", TimerGameCalendar::date, SLE_FILE_U16 | SLE_VAR_I32, SL_MIN_VERSION, SLV_31), - SLEG_CONDVAR("date", TimerGameCalendar::date, SLE_INT32, SLV_31, SL_MAX_VERSION), + SLEG_CONDVAR("date", TimerGameCalendar::date, SLE_FILE_U16 | SLE_VAR_I32, SL_MIN_VERSION, SLV_BIG_DATES), + SLEG_CONDVAR("date", TimerGameCalendar::date, SLE_INT32, SLV_BIG_DATES, SL_MAX_VERSION), SLEG_VAR("date_fract", TimerGameCalendar::date_fract, SLE_UINT16), SLEG_CONDVAR("tick_counter", TimerGameTick::counter, SLE_FILE_U16 | SLE_VAR_U64, SL_MIN_VERSION, SLV_U64_TICK_COUNTER), SLEG_CONDVAR("tick_counter", TimerGameTick::counter, SLE_UINT64, SLV_U64_TICK_COUNTER, SL_MAX_VERSION), @@ -112,8 +112,8 @@ static const SaveLoad _date_desc[] = { }; static const SaveLoad _date_check_desc[] = { - SLEG_CONDVAR("date", _load_check_data.current_date, SLE_FILE_U16 | SLE_VAR_I32, SL_MIN_VERSION, SLV_31), - SLEG_CONDVAR("date", _load_check_data.current_date, SLE_INT32, SLV_31, SL_MAX_VERSION), + SLEG_CONDVAR("date", _load_check_data.current_date, SLE_FILE_U16 | SLE_VAR_I32, SL_MIN_VERSION, SLV_BIG_DATES), + SLEG_CONDVAR("date", _load_check_data.current_date, SLE_INT32, SLV_BIG_DATES, SL_MAX_VERSION), }; /** @@ -150,7 +150,7 @@ struct DATEChunkHandler : ChunkHandler { { this->LoadCommon(_date_check_desc, _date_check_sl_compat); - if (IsSavegameVersionBefore(SLV_31)) { + if (IsSavegameVersionBefore(SLV_BIG_DATES)) { _load_check_data.current_date += CalendarTime::DAYS_TILL_ORIGINAL_BASE_YEAR; } } diff --git a/src/saveload/order_sl.cpp b/src/saveload/order_sl.cpp index 26ea08fa1e..4b0c42a74f 100644 --- a/src/saveload/order_sl.cpp +++ b/src/saveload/order_sl.cpp @@ -29,7 +29,7 @@ void Order::ConvertFromOldSavegame() this->flags = 0; /* First handle non-stop - use value from savegame if possible, else use value from config file */ - if (_settings_client.gui.sg_new_nonstop || (IsSavegameVersionBefore(SLV_22) && _savegame_type != SGT_TTO && _savegame_type != SGT_TTD && _settings_client.gui.new_nonstop)) { + if (_settings_client.gui.sg_new_nonstop || (IsSavegameVersionBefore(SLV_SAVE_PATCHES) && _savegame_type != SGT_TTO && _savegame_type != SGT_TTD && _settings_client.gui.new_nonstop)) { /* OFB_NON_STOP */ this->SetNonStopType((old_flags & 8) ? OrderNonStopFlags{OrderNonStopFlag::NonStop, OrderNonStopFlag::GoVia} : OrderNonStopFlag::NonStop); } else { @@ -50,7 +50,7 @@ void Order::ConvertFromOldSavegame() this->SetLoadType(OrderLoadType::LoadIfPossible); } else { /* old OTTD versions stored full_load_any in config file - assume it was enabled when loading */ - this->SetLoadType(_settings_client.gui.sg_full_load_any || IsSavegameVersionBefore(SLV_22) ? OrderLoadType::FullLoadAny : OrderLoadType::FullLoad); + this->SetLoadType(_settings_client.gui.sg_full_load_any || IsSavegameVersionBefore(SLV_SAVE_PATCHES) ? OrderLoadType::FullLoadAny : OrderLoadType::FullLoad); } if (this->IsType(OT_GOTO_STATION)) this->SetStopLocation(OrderStopLocation::FarEnd); @@ -149,7 +149,7 @@ SaveLoadTable GetOrderDescription() SLE_VARNAME(OldOrderSaveLoadItem, order.dest, "dest", SLE_UINT16), SLE_CONDVARNAME(OldOrderSaveLoadItem, next, "next", SLE_FILE_U16 | SLE_VAR_U32, SL_MIN_VERSION, SLV_69), SLE_CONDVARNAME(OldOrderSaveLoadItem, next, "next", SLE_UINT32, SLV_69, SL_MAX_VERSION), - SLE_CONDVARNAME(OldOrderSaveLoadItem, order.refit_cargo, "refit_cargo", SLE_UINT8, SLV_36, SL_MAX_VERSION), + SLE_CONDVARNAME(OldOrderSaveLoadItem, order.refit_cargo, "refit_cargo", SLE_UINT8, SLV_REFIT_ORDERS, SL_MAX_VERSION), SLE_CONDVARNAME(OldOrderSaveLoadItem, order.wait_time, "wait_time", SLE_UINT16, SLV_67, SL_MAX_VERSION), SLE_CONDVARNAME(OldOrderSaveLoadItem, order.travel_time, "travel_time", SLE_UINT16, SLV_67, SL_MAX_VERSION), SLE_CONDVARNAME(OldOrderSaveLoadItem, order.max_speed, "max_speed", SLE_UINT16, SLV_172, SL_MAX_VERSION), diff --git a/src/saveload/saveload.h b/src/saveload/saveload.h index ff67dd0744..81971c374a 100644 --- a/src/saveload/saveload.h +++ b/src/saveload/saveload.h @@ -65,29 +65,29 @@ enum SaveLoadVersion : uint16_t { SLV_REMOVE_MINOR_VERSION, ///< 18 3227 Remove the minor versions from savegames SLV_ENGINE_RENEW_POOL, ///< 19 3396 Engine renews are now stored in a pool - SLV_20, ///< 20 3403 - SLV_21, ///< 21 3472 0.4.x - SLV_22, ///< 22 3726 - SLV_23, ///< 23 3915 - SLV_24, ///< 24 4150 + SLV_NO_MULTIHEAD_REFERENCE, ///< 20 3403 Remove reference from one multihead to the other one + SLV_REMOVE_OLD_PBS, ///< 21 3472 0.4.x Remove old implementation of path based signals + SLV_SAVE_PATCHES, ///< 22 3726 Save state of patches (precursor of settings) in the savegame + SLV_REMOVE_AUTOSAVE_INTERVAL, ///< 23 3915 Store autosave interval locally, instead of in savegame + SLV_ELRAIL, ///< 24 4150 Electrified railways - SLV_25, ///< 25 4259 - SLV_26, ///< 26 4466 - SLV_27, ///< 27 4757 - SLV_28, ///< 28 4987 - SLV_29, ///< 29 5070 + SLV_IMPROVE_MULTISTOP, ///< 25 4259 Improve the behaviour of RVs going to road stops + SLV_LAST_VEHICLE_TYPE, ///< 26 4466 Store the last vehicle type at stations instead of the vehicle ID + SLV_NEWGRF_STATIONS, ///< 27 4757 NewGRF graphics for stations + SLV_YAPF, ///< 28 4987 Yet another path finder + SLV_MORE_UNDER_BRIDGES, ///< 29 5070 Support crossings, fields and bridge/tunnel heads under bridges - SLV_30, ///< 30 5946 - SLV_31, ///< 31 5999 - SLV_32, ///< 32 6001 - SLV_33, ///< 33 6440 - SLV_34, ///< 34 6455 + SLV_TGP, ///< 30 5946 TerraGenesis Perlin + SLV_BIG_DATES, ///< 31 5999 Change date from 1920 - 2090 to 0 - 5 000 000 + SLV_LINK_FARM_FIELD_TO_INDUSTRY, ///< 32 6001 Link farm fields to the industry, so it gets removed when the industry goes away + SLV_SAVE_YAPF_SETTINGS, ///< 33 6440 Some YAPF settings were not saved properly + SLV_LIVERIES, ///< 34 6455 Liveries and two company colours (2cc) - SLV_35, ///< 35 6602 - SLV_36, ///< 36 6624 - SLV_37, ///< 37 7182 - SLV_38, ///< 38 7195 - SLV_39, ///< 39 7269 + SLV_LIVERY_REFIT, ///< 35 6602 NewGRF livery refits + SLV_REFIT_ORDERS, ///< 36 6624 Vehicles can be refitted as part of an order + SLV_UTF8, ///< 37 7182 UTF-8 strings + 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 diff --git a/src/saveload/station_sl.cpp b/src/saveload/station_sl.cpp index 6805a68fe2..b2b63bc7f5 100644 --- a/src/saveload/station_sl.cpp +++ b/src/saveload/station_sl.cpp @@ -209,8 +209,8 @@ template class SlStationSpecList : public VectorSaveLoadHandler, BaseStation, SpecMapping> { public: static inline const SaveLoad description[] = { - SLE_CONDVAR(SpecMapping, grfid, SLE_UINT32, SLV_27, SL_MAX_VERSION), - SLE_CONDVAR(SpecMapping, localidx, SLE_FILE_U8 | SLE_VAR_U16, SLV_27, SLV_EXTEND_ENTITY_MAPPING), + SLE_CONDVAR(SpecMapping, grfid, SLE_UINT32, SLV_NEWGRF_STATIONS, SL_MAX_VERSION), + SLE_CONDVAR(SpecMapping, localidx, SLE_FILE_U8 | SLE_VAR_U16, SLV_NEWGRF_STATIONS, SLV_EXTEND_ENTITY_MAPPING), SLE_CONDVAR(SpecMapping, localidx, SLE_UINT16, SLV_EXTEND_ENTITY_MAPPING, SL_MAX_VERSION), }; static inline const SaveLoadCompatTable compat_description = _station_spec_list_sl_compat; @@ -511,23 +511,23 @@ static const SaveLoad _old_station_desc[] = { 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_CONDVAR(Station, last_vehicle_type, SLE_UINT8, SLV_26, SL_MAX_VERSION), + SLE_CONDVAR(Station, last_vehicle_type, SLE_UINT8, SLV_LAST_VEHICLE_TYPE, SL_MAX_VERSION), - SLE_CONDVAR(Station, build_date, SLE_FILE_U16 | SLE_VAR_I32, SLV_BIGGER_STATION_VARIABLES, SLV_31), - SLE_CONDVAR(Station, build_date, SLE_INT32, SLV_31, SL_MAX_VERSION), + SLE_CONDVAR(Station, build_date, SLE_FILE_U16 | SLE_VAR_I32, SLV_BIGGER_STATION_VARIABLES, SLV_BIG_DATES), + SLE_CONDVAR(Station, build_date, SLE_INT32, SLV_BIG_DATES, SL_MAX_VERSION), SLE_CONDREF(Station, bus_stops, REF_ROADSTOPS, SLV_MULTIPLE_ROAD_STOPS, SL_MAX_VERSION), SLE_CONDREF(Station, truck_stops, REF_ROADSTOPS, SLV_MULTIPLE_ROAD_STOPS, SL_MAX_VERSION), /* Used by newstations for graphic variations */ - SLE_CONDVAR(Station, random_bits, SLE_UINT16, SLV_27, SL_MAX_VERSION), - SLE_CONDVARNAME(Station, waiting_random_triggers, "waiting_triggers", SLE_UINT8, SLV_27, SL_MAX_VERSION), - SLEG_CONDVAR("num_specs", SlStationSpecList::last_num_specs, SLE_UINT8, SLV_27, SL_MAX_VERSION), + SLE_CONDVAR(Station, random_bits, SLE_UINT16, SLV_NEWGRF_STATIONS, SL_MAX_VERSION), + 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), SLEG_STRUCTLIST("goods", SlStationGoods), - SLEG_CONDSTRUCTLIST("speclist", SlStationSpecList, SLV_27, SL_MAX_VERSION), + SLEG_CONDSTRUCTLIST("speclist", SlStationSpecList, SLV_NEWGRF_STATIONS, SL_MAX_VERSION), }; struct STNSChunkHandler : ChunkHandler { @@ -716,7 +716,7 @@ static const SaveLoad _station_desc[] = { SLE_SAVEBYTE(BaseStation, facilities), SLEG_STRUCT("normal", SlStationNormal), SLEG_STRUCT("waypoint", SlStationWaypoint), - SLEG_CONDSTRUCTLIST("speclist", SlStationSpecList, SLV_27, SL_MAX_VERSION), + SLEG_CONDSTRUCTLIST("speclist", SlStationSpecList, SLV_NEWGRF_STATIONS, SL_MAX_VERSION), SLEG_CONDSTRUCTLIST("roadstopspeclist", SlStationSpecList, SLV_NEWGRF_ROAD_STOPS, SL_MAX_VERSION), SLEG_CONDSTRUCTLIST("roadstoptiledata", SlRoadStopTileData, SLV_ROAD_STOP_TILE_DATA, SL_MAX_VERSION), }; diff --git a/src/saveload/strings_sl.cpp b/src/saveload/strings_sl.cpp index b0cbebc0b8..af6c0cc1ed 100644 --- a/src/saveload/strings_sl.cpp +++ b/src/saveload/strings_sl.cpp @@ -61,7 +61,7 @@ std::string CopyFromOldName(StringID id) /* Is this name an (old) custom name? */ if (GetStringTab(id) != TEXT_TAB_OLD_CUSTOM) return std::string(); - if (IsSavegameVersionBefore(SLV_37)) { + if (IsSavegameVersionBefore(SLV_UTF8)) { const std::string &strfrom = _old_name_array[GB(id, 0, 9)]; std::string result; diff --git a/src/saveload/vehicle_sl.cpp b/src/saveload/vehicle_sl.cpp index 4626be874c..4c0ea689a4 100644 --- a/src/saveload/vehicle_sl.cpp +++ b/src/saveload/vehicle_sl.cpp @@ -689,7 +689,7 @@ public: SLE_CONDVAR(Vehicle, last_loading_station, SLE_UINT16, SLV_182, SL_MAX_VERSION), SLE_VAR(Vehicle, cargo_type, SLE_UINT8), - SLE_CONDVAR(Vehicle, cargo_subtype, SLE_UINT8, SLV_35, SL_MAX_VERSION), + SLE_CONDVAR(Vehicle, cargo_subtype, SLE_UINT8, SLV_LIVERY_REFIT, SL_MAX_VERSION), 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), @@ -720,7 +720,7 @@ public: SLE_CONDVAR(Vehicle, current_order.dest, SLE_UINT16, SLV_BIG_MAP, SL_MAX_VERSION), /* Refit in current order */ - SLE_CONDVAR(Vehicle, current_order.refit_cargo, SLE_UINT8, SLV_36, SL_MAX_VERSION), + SLE_CONDVAR(Vehicle, current_order.refit_cargo, SLE_UINT8, SLV_REFIT_ORDERS, SL_MAX_VERSION), /* Timetable in current order */ SLE_CONDVAR(Vehicle, current_order.wait_time, SLE_UINT16, SLV_67, SL_MAX_VERSION), @@ -733,16 +733,16 @@ public: SLE_CONDVARNAME(Vehicle, old_orders, "orders", SLE_UINT32, SLV_69, SLV_105), SLE_CONDREF(Vehicle, orders, REF_ORDERLIST, SLV_105, SL_MAX_VERSION), - SLE_CONDVAR(Vehicle, age, SLE_FILE_U16 | SLE_VAR_I32, SL_MIN_VERSION, SLV_31), - SLE_CONDVAR(Vehicle, age, SLE_INT32, SLV_31, SL_MAX_VERSION), + SLE_CONDVAR(Vehicle, age, SLE_FILE_U16 | SLE_VAR_I32, SL_MIN_VERSION, SLV_BIG_DATES), + SLE_CONDVAR(Vehicle, age, SLE_INT32, SLV_BIG_DATES, SL_MAX_VERSION), SLE_CONDVAR(Vehicle, economy_age, SLE_INT32, SLV_VEHICLE_ECONOMY_AGE, SL_MAX_VERSION), - SLE_CONDVAR(Vehicle, max_age, SLE_FILE_U16 | SLE_VAR_I32, SL_MIN_VERSION, SLV_31), - SLE_CONDVAR(Vehicle, max_age, SLE_INT32, SLV_31, SL_MAX_VERSION), - SLE_CONDVAR(Vehicle, date_of_last_service, SLE_FILE_U16 | SLE_VAR_I32, SL_MIN_VERSION, SLV_31), - SLE_CONDVAR(Vehicle, date_of_last_service, SLE_INT32, SLV_31, SL_MAX_VERSION), + SLE_CONDVAR(Vehicle, max_age, SLE_FILE_U16 | SLE_VAR_I32, SL_MIN_VERSION, SLV_BIG_DATES), + SLE_CONDVAR(Vehicle, max_age, SLE_INT32, SLV_BIG_DATES, SL_MAX_VERSION), + SLE_CONDVAR(Vehicle, date_of_last_service, SLE_FILE_U16 | SLE_VAR_I32, SL_MIN_VERSION, SLV_BIG_DATES), + SLE_CONDVAR(Vehicle, date_of_last_service, SLE_INT32, SLV_BIG_DATES, SL_MAX_VERSION), SLE_CONDVAR(Vehicle, date_of_last_service_newgrf, SLE_INT32, SLV_NEWGRF_LAST_SERVICE, SL_MAX_VERSION), - SLE_CONDVAR(Vehicle, service_interval, SLE_UINT16, SL_MIN_VERSION, SLV_31), - SLE_CONDVAR(Vehicle, service_interval, SLE_FILE_U32 | SLE_VAR_U16, SLV_31, SLV_180), + SLE_CONDVAR(Vehicle, service_interval, SLE_UINT16, SL_MIN_VERSION, SLV_BIG_DATES), + SLE_CONDVAR(Vehicle, service_interval, SLE_FILE_U32 | SLE_VAR_U16, SLV_BIG_DATES, SLV_180), SLE_CONDVAR(Vehicle, service_interval, SLE_UINT16, SLV_180, SL_MAX_VERSION), SLE_VAR(Vehicle, reliability, SLE_UINT16), SLE_VAR(Vehicle, reliability_spd_dec, SLE_UINT16), @@ -750,8 +750,8 @@ public: 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, SL_MIN_VERSION, SLV_31), - SLE_CONDVAR(Vehicle, build_year, SLE_INT32, SLV_31, SL_MAX_VERSION), + SLE_CONDVAR(Vehicle, build_year, SLE_FILE_U8 | SLE_VAR_I32, SL_MIN_VERSION, SLV_BIG_DATES), + 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), @@ -1071,8 +1071,8 @@ public: SLE_CONDVAR(DisasterVehicle, state, SLE_UINT16, SLV_DISASTER_VEH_STATE, SL_MAX_VERSION), 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, SL_MIN_VERSION, SLV_31), - SLE_CONDVAR(Vehicle, age, SLE_INT32, SLV_31, SL_MAX_VERSION), + SLE_CONDVAR(Vehicle, age, SLE_FILE_U16 | SLE_VAR_I32, SL_MIN_VERSION, SLV_BIG_DATES), + SLE_CONDVAR(Vehicle, age, SLE_INT32, SLV_BIG_DATES, SL_MAX_VERSION), SLE_VAR(Vehicle, tick_counter, SLE_UINT8), SLE_CONDVAR(DisasterVehicle, image_override, SLE_FILE_U16 | SLE_VAR_U32, SL_MIN_VERSION, SLV_191), diff --git a/src/saveload/waypoint_sl.cpp b/src/saveload/waypoint_sl.cpp index 84c3a42c97..a265b6eacb 100644 --- a/src/saveload/waypoint_sl.cpp +++ b/src/saveload/waypoint_sl.cpp @@ -178,8 +178,8 @@ static const SaveLoad _old_waypoint_desc[] = { SLE_CONDSSTR(OldWaypoint, name, SLE_STR, SLV_84, SL_MAX_VERSION), SLE_VAR(OldWaypoint, delete_ctr, SLE_UINT8), - SLE_CONDVAR(OldWaypoint, build_date, SLE_FILE_U16 | SLE_VAR_I32, SLV_BIGGER_STATION_VARIABLES, SLV_31), - SLE_CONDVAR(OldWaypoint, build_date, SLE_INT32, SLV_31, SL_MAX_VERSION), + SLE_CONDVAR(OldWaypoint, build_date, SLE_FILE_U16 | SLE_VAR_I32, SLV_BIGGER_STATION_VARIABLES, SLV_BIG_DATES), + SLE_CONDVAR(OldWaypoint, build_date, SLE_INT32, SLV_BIG_DATES, SL_MAX_VERSION), SLE_CONDVAR(OldWaypoint, localidx, SLE_UINT8, SLV_BIGGER_STATION_VARIABLES, SL_MAX_VERSION), SLE_CONDVAR(OldWaypoint, grfid, SLE_UINT32, SLV_STORE_WAYPOINT_ID_IN_MAP, SL_MAX_VERSION), SLE_CONDVAR(OldWaypoint, owner, SLE_UINT8, SLV_101, SL_MAX_VERSION), diff --git a/src/table/settings/game_settings.ini b/src/table/settings/game_settings.ini index 0141f79cd3..232a1e9183 100644 --- a/src/table/settings/game_settings.ini +++ b/src/table/settings/game_settings.ini @@ -300,7 +300,7 @@ post_cb = UpdateConsists [SDT_BOOL] var = vehicle.disable_elrails -from = SLV_38 +from = SLV_DISABLE_ELRAIL_SETTING flags = SettingFlag::NoNetwork def = false str = STR_CONFIG_SETTING_DISABLE_ELRAILS @@ -311,7 +311,7 @@ cat = SC_EXPERT [SDT_VAR] var = vehicle.freight_trains type = SLE_UINT8 -from = SLV_39 +from = SLV_FREIGHT_WEIGHT flags = SettingFlag::NoNetwork def = 1 min = 1 @@ -426,12 +426,12 @@ to = SLV_120 [SDTC_BOOL] var = gui.sg_full_load_any -from = SLV_22 +from = SLV_SAVE_PATCHES to = SLV_93 def = true [SDTC_BOOL] var = gui.sg_new_nonstop -from = SLV_22 +from = SLV_SAVE_PATCHES to = SLV_93 def = false diff --git a/src/table/settings/old_gameopt_settings.ini b/src/table/settings/old_gameopt_settings.ini index 307e553843..3a14d3fcc6 100644 --- a/src/table/settings/old_gameopt_settings.ini +++ b/src/table/settings/old_gameopt_settings.ini @@ -145,7 +145,7 @@ def = DEF_SNOWLINE_HEIGHT * TILE_HEIGHT min = MIN_SNOWLINE_HEIGHT * TILE_HEIGHT # "max" used to be MAX_SNOWLINE_HEIGHT * TILE_HEIGHT, but this would overflow the storage. max = UINT8_MAX -to = SLV_22 +to = SLV_SAVE_PATCHES [SDT_OMANY] var = vehicle.road_side diff --git a/src/table/settings/pathfinding_settings.ini b/src/table/settings/pathfinding_settings.ini index da613825e7..eff8529cca 100644 --- a/src/table/settings/pathfinding_settings.ini +++ b/src/table/settings/pathfinding_settings.ini @@ -101,7 +101,7 @@ cat = SC_EXPERT [SDT_VAR] var = pf.yapf.max_search_nodes type = SLE_UINT -from = SLV_28 +from = SLV_YAPF def = 10000 min = 500 max = 1000000 @@ -109,14 +109,14 @@ cat = SC_EXPERT [SDT_BOOL] var = pf.yapf.rail_firstred_twoway_eol -from = SLV_28 +from = SLV_YAPF def = true cat = SC_EXPERT [SDT_VAR] var = pf.yapf.rail_firstred_penalty type = SLE_UINT -from = SLV_28 +from = SLV_YAPF def = 10 * YAPF_TILE_LENGTH min = 0 max = 1000000 @@ -125,7 +125,7 @@ cat = SC_EXPERT [SDT_VAR] var = pf.yapf.rail_firstred_exit_penalty type = SLE_UINT -from = SLV_28 +from = SLV_YAPF def = 100 * YAPF_TILE_LENGTH min = 0 max = 1000000 @@ -134,7 +134,7 @@ cat = SC_EXPERT [SDT_VAR] var = pf.yapf.rail_lastred_penalty type = SLE_UINT -from = SLV_28 +from = SLV_YAPF def = 10 * YAPF_TILE_LENGTH min = 0 max = 1000000 @@ -143,7 +143,7 @@ cat = SC_EXPERT [SDT_VAR] var = pf.yapf.rail_lastred_exit_penalty type = SLE_UINT -from = SLV_28 +from = SLV_YAPF def = 100 * YAPF_TILE_LENGTH min = 0 max = 1000000 @@ -152,7 +152,7 @@ cat = SC_EXPERT [SDT_VAR] var = pf.yapf.rail_station_penalty type = SLE_UINT -from = SLV_28 +from = SLV_YAPF def = 10 * YAPF_TILE_LENGTH min = 0 max = 1000000 @@ -161,7 +161,7 @@ cat = SC_EXPERT [SDT_VAR] var = pf.yapf.rail_slope_penalty type = SLE_UINT -from = SLV_28 +from = SLV_YAPF def = 2 * YAPF_TILE_LENGTH min = 0 max = 1000000 @@ -170,7 +170,7 @@ cat = SC_EXPERT [SDT_VAR] var = pf.yapf.rail_curve45_penalty type = SLE_UINT -from = SLV_28 +from = SLV_YAPF def = 1 * YAPF_TILE_LENGTH min = 0 max = 1000000 @@ -179,7 +179,7 @@ cat = SC_EXPERT [SDT_VAR] var = pf.yapf.rail_curve90_penalty type = SLE_UINT -from = SLV_28 +from = SLV_YAPF def = 6 * YAPF_TILE_LENGTH min = 0 max = 1000000 @@ -188,7 +188,7 @@ cat = SC_EXPERT [SDT_VAR] var = pf.yapf.rail_depot_reverse_penalty type = SLE_UINT -from = SLV_28 +from = SLV_YAPF def = 50 * YAPF_TILE_LENGTH min = 0 max = 1000000 @@ -197,7 +197,7 @@ cat = SC_EXPERT [SDT_VAR] var = pf.yapf.rail_crossing_penalty type = SLE_UINT -from = SLV_28 +from = SLV_YAPF def = 3 * YAPF_TILE_LENGTH min = 0 max = 1000000 @@ -206,7 +206,7 @@ cat = SC_EXPERT [SDT_VAR] var = pf.yapf.rail_look_ahead_max_signals type = SLE_UINT -from = SLV_28 +from = SLV_YAPF def = 10 min = 1 max = 100 @@ -215,7 +215,7 @@ cat = SC_EXPERT [SDT_VAR] var = pf.yapf.rail_look_ahead_signal_p0 type = SLE_INT -from = SLV_28 +from = SLV_YAPF def = 500 min = -1000000 max = 1000000 @@ -224,7 +224,7 @@ cat = SC_EXPERT [SDT_VAR] var = pf.yapf.rail_look_ahead_signal_p1 type = SLE_INT -from = SLV_28 +from = SLV_YAPF def = -100 min = -1000000 max = 1000000 @@ -233,7 +233,7 @@ cat = SC_EXPERT [SDT_VAR] var = pf.yapf.rail_look_ahead_signal_p2 type = SLE_INT -from = SLV_28 +from = SLV_YAPF def = 5 min = -1000000 max = 1000000 @@ -278,7 +278,7 @@ cat = SC_EXPERT [SDT_VAR] var = pf.yapf.rail_longer_platform_penalty type = SLE_UINT -from = SLV_33 +from = SLV_SAVE_YAPF_SETTINGS def = 8 * YAPF_TILE_LENGTH min = 0 max = 20000 @@ -287,7 +287,7 @@ cat = SC_EXPERT [SDT_VAR] var = pf.yapf.rail_longer_platform_per_tile_penalty type = SLE_UINT -from = SLV_33 +from = SLV_SAVE_YAPF_SETTINGS def = 0 * YAPF_TILE_LENGTH min = 0 max = 20000 @@ -296,7 +296,7 @@ cat = SC_EXPERT [SDT_VAR] var = pf.yapf.rail_shorter_platform_penalty type = SLE_UINT -from = SLV_33 +from = SLV_SAVE_YAPF_SETTINGS def = 40 * YAPF_TILE_LENGTH min = 0 max = 20000 @@ -305,7 +305,7 @@ cat = SC_EXPERT [SDT_VAR] var = pf.yapf.rail_shorter_platform_per_tile_penalty type = SLE_UINT -from = SLV_33 +from = SLV_SAVE_YAPF_SETTINGS def = 0 * YAPF_TILE_LENGTH min = 0 max = 20000 @@ -314,7 +314,7 @@ cat = SC_EXPERT [SDT_VAR] var = pf.yapf.road_slope_penalty type = SLE_UINT -from = SLV_33 +from = SLV_SAVE_YAPF_SETTINGS def = 2 * YAPF_TILE_LENGTH min = 0 max = 1000000 @@ -323,7 +323,7 @@ cat = SC_EXPERT [SDT_VAR] var = pf.yapf.road_curve_penalty type = SLE_UINT -from = SLV_33 +from = SLV_SAVE_YAPF_SETTINGS def = 1 * YAPF_TILE_LENGTH min = 0 max = 1000000 @@ -332,7 +332,7 @@ cat = SC_EXPERT [SDT_VAR] var = pf.yapf.road_crossing_penalty type = SLE_UINT -from = SLV_33 +from = SLV_SAVE_YAPF_SETTINGS def = 3 * YAPF_TILE_LENGTH min = 0 max = 1000000 diff --git a/src/table/settings/world_settings.ini b/src/table/settings/world_settings.ini index ad81d80a0e..5ed9411eb0 100644 --- a/src/table/settings/world_settings.ini +++ b/src/table/settings/world_settings.ini @@ -152,7 +152,7 @@ cat = SC_ADVANCED [SDT_VAR] var = game_creation.land_generator type = SLE_UINT8 -from = SLV_30 +from = SLV_TGP flags = SettingFlag::GuiDropdown, SettingFlag::NewgameOnly def = 1 min = 0 @@ -164,7 +164,7 @@ strval = STR_CONFIG_SETTING_LAND_GENERATOR_ORIGINAL [SDT_VAR] var = game_creation.oil_refinery_limit type = SLE_UINT8 -from = SLV_30 +from = SLV_TGP def = 32 min = 12 max = 128 @@ -175,7 +175,7 @@ strhelp = STR_CONFIG_SETTING_OIL_REF_EDGE_DISTANCE_HELPTEXT [SDT_VAR] var = game_creation.tgen_smoothness type = SLE_UINT8 -from = SLV_30 +from = SLV_TGP flags = SettingFlag::GuiDropdown, SettingFlag::NewgameOnly def = 1 min = TGEN_SMOOTHNESS_BEGIN @@ -212,7 +212,7 @@ strval = STR_VARIETY_NONE [SDT_VAR] var = game_creation.generation_seed type = SLE_UINT32 -from = SLV_30 +from = SLV_TGP flags = SettingFlag::NotInConfig def = GENERATE_NEW_SEED min = 0 @@ -222,7 +222,7 @@ cat = SC_EXPERT [SDT_VAR] var = game_creation.tree_placer type = SLE_UINT8 -from = SLV_30 +from = SLV_TGP flags = SettingFlag::GuiDropdown, SettingFlag::NewgameOnly, SettingFlag::SceneditToo def = 2 min = 0