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

Fix #11108, e2f583a: missing argument for SCC_CARGO_SHORT formatting

pull/11117/head
Rubidium 2023-07-06 18:50:27 +02:00 committed by rubidium42
parent 5f2246eabf
commit 968de827d6
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/strings.cpp
View File

@ -1213,15 +1213,17 @@ static void FormatString(StringBuilder &builder, const char *str_arg, StringPara
switch (cargo_str) { switch (cargo_str) {
case STR_TONS: { case STR_TONS: {
assert(_settings_game.locale.units_weight < lengthof(_units_weight)); assert(_settings_game.locale.units_weight < lengthof(_units_weight));
auto tmp_params = MakeParameters(_units_weight[_settings_game.locale.units_weight].c.ToDisplay(args.GetNextParameter<int64_t>())); const auto &x = _units_weight[_settings_game.locale.units_weight];
FormatString(builder, GetStringPtr(_units_weight[_settings_game.locale.units_weight].l), tmp_params); auto tmp_params = MakeParameters(x.c.ToDisplay(args.GetNextParameter<int64_t>()), x.decimal_places);
FormatString(builder, GetStringPtr(x.l), tmp_params);
break; break;
} }
case STR_LITERS: { case STR_LITERS: {
assert(_settings_game.locale.units_volume < lengthof(_units_volume)); assert(_settings_game.locale.units_volume < lengthof(_units_volume));
auto tmp_params = MakeParameters(_units_volume[_settings_game.locale.units_volume].c.ToDisplay(args.GetNextParameter<int64_t>())); const auto &x = _units_volume[_settings_game.locale.units_volume];
FormatString(builder, GetStringPtr(_units_volume[_settings_game.locale.units_volume].l), tmp_params); auto tmp_params = MakeParameters(x.c.ToDisplay(args.GetNextParameter<int64_t>()), x.decimal_places);
FormatString(builder, GetStringPtr(x.l), tmp_params);
break; break;
} }