From 968de827d63c72c71b8b6f38ec0e19ea3d05b559 Mon Sep 17 00:00:00 2001 From: Rubidium Date: Thu, 6 Jul 2023 18:50:27 +0200 Subject: [PATCH] Fix #11108, e2f583a: missing argument for SCC_CARGO_SHORT formatting --- src/strings.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/strings.cpp b/src/strings.cpp index dab5993328..37e0f6efa4 100644 --- a/src/strings.cpp +++ b/src/strings.cpp @@ -1213,15 +1213,17 @@ static void FormatString(StringBuilder &builder, const char *str_arg, StringPara switch (cargo_str) { case STR_TONS: { assert(_settings_game.locale.units_weight < lengthof(_units_weight)); - auto tmp_params = MakeParameters(_units_weight[_settings_game.locale.units_weight].c.ToDisplay(args.GetNextParameter())); - FormatString(builder, GetStringPtr(_units_weight[_settings_game.locale.units_weight].l), tmp_params); + const auto &x = _units_weight[_settings_game.locale.units_weight]; + auto tmp_params = MakeParameters(x.c.ToDisplay(args.GetNextParameter()), x.decimal_places); + FormatString(builder, GetStringPtr(x.l), tmp_params); break; } case STR_LITERS: { assert(_settings_game.locale.units_volume < lengthof(_units_volume)); - auto tmp_params = MakeParameters(_units_volume[_settings_game.locale.units_volume].c.ToDisplay(args.GetNextParameter())); - FormatString(builder, GetStringPtr(_units_volume[_settings_game.locale.units_volume].l), tmp_params); + const auto &x = _units_volume[_settings_game.locale.units_volume]; + auto tmp_params = MakeParameters(x.c.ToDisplay(args.GetNextParameter()), x.decimal_places); + FormatString(builder, GetStringPtr(x.l), tmp_params); break; }