From d7b23733b39d51b6f87bf30b584ddb775f0ec1dd Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Sun, 11 Apr 2021 23:44:34 +0100 Subject: [PATCH] Bump realistic braking savegame version --- src/saveload/afterload.cpp | 8 ++++++++ src/saveload/extended_ver_sl.cpp | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/saveload/afterload.cpp b/src/saveload/afterload.cpp index 5384b816d9..6302eb7fb1 100644 --- a/src/saveload/afterload.cpp +++ b/src/saveload/afterload.cpp @@ -3873,6 +3873,14 @@ bool AfterLoadGame() if (SlXvIsFeatureMissing(XSLFI_REALISTIC_TRAIN_BRAKING)) { _settings_game.vehicle.train_braking_model = TBM_ORIGINAL; } + if (!SlXvIsFeaturePresent(XSLFI_REALISTIC_TRAIN_BRAKING, 2)) { + for (Train *t : Train::Iterate()) { + if (!(t->vehstatus & VS_CRASHED)) { + t->crash_anim_pos = 0; + } + if (t->lookahead != nullptr) SetBit(t->lookahead->flags, TRLF_APPLY_ADVISORY); + } + } if (SlXvIsFeatureMissing(XSLFI_INFLATION_FIXED_DATES)) { _settings_game.economy.inflation_fixed_dates = !IsSavegameVersionBefore(SLV_GS_INDUSTRY_CONTROL); diff --git a/src/saveload/extended_ver_sl.cpp b/src/saveload/extended_ver_sl.cpp index 3796151744..4ad0f28799 100644 --- a/src/saveload/extended_ver_sl.cpp +++ b/src/saveload/extended_ver_sl.cpp @@ -144,7 +144,7 @@ const SlxiSubChunkInfo _sl_xv_sub_chunk_infos[] = { { XSLFI_ANIMATED_TILE_EXTRA, XSCF_NULL, 1, 1, "animated_tile_extra", nullptr, nullptr, nullptr }, { XSLFI_NEWGRF_INFO_EXTRA, XSCF_NULL, 1, 1, "newgrf_info_extra", nullptr, nullptr, nullptr }, { XSLFI_INDUSTRY_CARGO_ADJ, XSCF_IGNORABLE_UNKNOWN, 1, 1, "industry_cargo_adj", nullptr, nullptr, nullptr }, - { XSLFI_REALISTIC_TRAIN_BRAKING,XSCF_NULL, 1, 1, "realistic_train_braking", nullptr, nullptr, "VLKA" }, + { XSLFI_REALISTIC_TRAIN_BRAKING,XSCF_NULL, 2, 2, "realistic_train_braking", nullptr, nullptr, "VLKA" }, { XSLFI_INFLATION_FIXED_DATES, XSCF_IGNORABLE_ALL, 1, 1, "inflation_fixed_dates", nullptr, nullptr, nullptr }, { XSLFI_WATER_FLOODING, XSCF_NULL, 1, 1, "water_flooding", nullptr, nullptr, nullptr }, { XSLFI_MORE_HOUSES, XSCF_NULL, 1, 1, "more_houses", nullptr, nullptr, nullptr },