mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Fix 2d7d085e8e: Autorenew failed error string consumed too many parameters. (#13750)

pull/13754/head
Peter Nelson 2025-03-05 22:50:33 +00:00 committed by GitHub
parent 72ddac02bd
commit 47ae285c9d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lang/english.txt
View File

@ -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}

8
src/vehicle.cpp
View File

@ -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();