From 4e368beacaf03b995383a81798504f2f391a125c Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Wed, 7 Sep 2022 20:43:49 +0100 Subject: [PATCH] Fix #417: Wrong window caption for cargo payment graph in average speed mode --- src/graph_gui.cpp | 14 ++++++++++---- src/lang/english.txt | 1 + 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/graph_gui.cpp b/src/graph_gui.cpp index 617b8d6ad4..e519de2ec6 100644 --- a/src/graph_gui.cpp +++ b/src/graph_gui.cpp @@ -1085,7 +1085,7 @@ struct PaymentRatesGraphWindow : BaseGraphWindow { this->colours[i] = cs->legend_colour; for (int j = 0; j != 20; j++) { const byte ctt = _cargo_payment_x_mode ? static_cast(factor / static_cast((j + 1) * this->x_values_increment)) : (j + 1) * 4; - this->cost[i][j] = GetTransportedGoodsIncome(10, 20, ctt, cs->Index()); + this->cost[i][j] = GetTransportedGoodsIncome(_cargo_payment_x_mode ? 1 : 10, _cargo_payment_x_mode ? 200 : 20, ctt, cs->Index()); } i++; } @@ -1103,6 +1103,14 @@ struct PaymentRatesGraphWindow : BaseGraphWindow { SetDParam(0, STR_GRAPH_CARGO_PAYMENT_RATES_X_LABEL); } break; + + case WID_CPR_HEADER: + if (_cargo_payment_x_mode) { + SetDParam(0, STR_GRAPH_CARGO_PAYMENT_RATES_TITLE_AVG_SPEED); + } else { + SetDParam(0, STR_GRAPH_CARGO_PAYMENT_RATES_TITLE); + } + break; } } }; @@ -1117,9 +1125,7 @@ static const NWidgetPart _nested_cargo_payment_rates_widgets[] = { EndContainer(), NWidget(WWT_PANEL, COLOUR_BROWN, WID_CPR_BACKGROUND), SetMinimalSize(568, 128), NWidget(NWID_HORIZONTAL), - NWidget(NWID_SPACER), SetFill(1, 0), SetResize(1, 0), - NWidget(WWT_TEXT, COLOUR_BROWN, WID_CPR_HEADER), SetMinimalSize(0, 6), SetPadding(2, 0, 2, 0), SetDataTip(STR_GRAPH_CARGO_PAYMENT_RATES_TITLE, STR_NULL), - NWidget(NWID_SPACER), SetFill(1, 0), SetResize(1, 0), + NWidget(WWT_TEXT, COLOUR_BROWN, WID_CPR_HEADER), SetMinimalSize(0, 6), SetAlignment(SA_CENTER), SetPadding(2, 0, 2, 0), SetDataTip(STR_JUST_STRING1, STR_NULL), SetFill(1, 0), SetResize(1, 0), EndContainer(), NWidget(NWID_HORIZONTAL), NWidget(WWT_EMPTY, COLOUR_BROWN, WID_CPR_GRAPH), SetMinimalSize(495, 0), SetFill(1, 1), SetResize(1, 1), diff --git a/src/lang/english.txt b/src/lang/english.txt index 9559bcf493..11a4725808 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -625,6 +625,7 @@ STR_GRAPH_CARGO_PAYMENT_RATES_CAPTION :{WHITE}Cargo Pa STR_GRAPH_CARGO_PAYMENT_RATES_X_LABEL :{TINY_FONT}{BLACK}Days in transit STR_GRAPH_CARGO_PAYMENT_RATES_X_LABEL_SPEED :{TINY_FONT}{BLACK}Average transit speed ({STRING}) STR_GRAPH_CARGO_PAYMENT_RATES_TITLE :{TINY_FONT}{BLACK}Payment for delivering 10 units (or 10,000 litres) of cargo a distance of 20 squares +STR_GRAPH_CARGO_PAYMENT_RATES_TITLE_AVG_SPEED :{TINY_FONT}{BLACK}Payment for delivering 1 unit (or 1,000 litres) of cargo a distance of 200 squares STR_GRAPH_CARGO_ENABLE_ALL :{TINY_FONT}{BLACK}Enable all STR_GRAPH_CARGO_DISABLE_ALL :{TINY_FONT}{BLACK}Disable all STR_GRAPH_CARGO_TOOLTIP_ENABLE_ALL :{BLACK}Display all cargoes on the cargo payment rates graph