From 47ae285c9d40b76f31552f344f950326ecf6365f Mon Sep 17 00:00:00 2001 From: Peter Nelson Date: Wed, 5 Mar 2025 22:50:33 +0000 Subject: [PATCH] Fix 2d7d085e8e: Autorenew failed error string consumed too many parameters. (#13750) --- src/lang/english.txt | 2 +- src/vehicle.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/lang/english.txt b/src/lang/english.txt index 9e0d926e2d..d8f686239d 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -922,7 +922,7 @@ STR_NEWS_VEHICLE_UNPROFITABLE_PERIOD :{WHITE}{VEHICLE STR_NEWS_AIRCRAFT_DEST_TOO_FAR :{WHITE}{VEHICLE} can't get to the next destination because it is out of range STR_NEWS_ORDER_REFIT_FAILED :{WHITE}{VEHICLE} stopped because an ordered refit failed -STR_NEWS_VEHICLE_AUTORENEW_FAILED :{WHITE}Autorenew failed on {VEHICLE}{}{STRING2} +STR_NEWS_VEHICLE_AUTORENEW_FAILED :{WHITE}Autorenew failed on {VEHICLE}{}{STRING1} STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE :{BIG_FONT}{BLACK}New {STRING} now available! STR_NEWS_NEW_VEHICLE_TYPE :{BIG_FONT}{BLACK}{ENGINE} diff --git a/src/vehicle.cpp b/src/vehicle.cpp index 1d3d892620..e6d75cbf16 100644 --- a/src/vehicle.cpp +++ b/src/vehicle.cpp @@ -1098,14 +1098,14 @@ void CallVehicleTicks() if (error_message == STR_ERROR_NOT_ENOUGH_CASH_REQUIRES_CURRENCY) error_message = STR_ERROR_AUTOREPLACE_MONEY_LIMIT; - StringID message; + EncodedString headline; if (error_message == STR_ERROR_TRAIN_TOO_LONG_AFTER_REPLACEMENT) { - message = error_message; + headline = GetEncodedString(error_message, v->index); } else { - message = STR_NEWS_VEHICLE_AUTORENEW_FAILED; + headline = GetEncodedString(STR_NEWS_VEHICLE_AUTORENEW_FAILED, v->index, error_message, std::monostate{}); } - AddVehicleAdviceNewsItem(AdviceType::AutorenewFailed, GetEncodedString(message, v->index, error_message), v->index); + AddVehicleAdviceNewsItem(AdviceType::AutorenewFailed, std::move(headline), v->index); } cur_company.Restore();