From 4889e4d7f16cdada01b9da4c33232cae4d6e1ec1 Mon Sep 17 00:00:00 2001 From: Peter Nelson Date: Sat, 1 Mar 2025 23:42:34 +0000 Subject: [PATCH] Codechange: Use parameterised GetString() for statusbar. --- src/statusbar_gui.cpp | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/src/statusbar_gui.cpp b/src/statusbar_gui.cpp index a726dec18a..fc6411c6a1 100644 --- a/src/statusbar_gui.cpp +++ b/src/statusbar_gui.cpp @@ -84,15 +84,13 @@ struct StatusBarWindow : Window { Dimension d; switch (widget) { case WID_S_LEFT: - SetDParamMaxValue(0, TimerGameCalendar::DateAtStartOfYear(CalendarTime::MAX_YEAR)); - d = GetStringBoundingBox(STR_JUST_DATE_LONG); + d = GetStringBoundingBox(GetString(STR_JUST_DATE_LONG, GetParamMaxValue(TimerGameCalendar::DateAtStartOfYear(CalendarTime::MAX_YEAR).base()))); break; case WID_S_RIGHT: { int64_t max_money = UINT32_MAX; for (const Company *c : Company::Iterate()) max_money = std::max(c->money, max_money); - SetDParam(0, 100LL * max_money); - d = GetStringBoundingBox(STR_JUST_CURRENCY_LONG); + d = GetStringBoundingBox(GetString(STR_JUST_CURRENCY_LONG, 100LL * max_money)); break; } @@ -112,8 +110,7 @@ struct StatusBarWindow : Window { switch (widget) { case WID_S_LEFT: /* Draw the date */ - SetDParam(0, TimerGameCalendar::date); - DrawString(tr, STR_JUST_DATE_LONG, TC_WHITE, SA_HOR_CENTER); + DrawString(tr, GetString(STR_JUST_DATE_LONG, TimerGameCalendar::date), TC_WHITE, SA_HOR_CENTER); break; case WID_S_RIGHT: { @@ -125,8 +122,7 @@ struct StatusBarWindow : Window { /* Draw company money, if any */ const Company *c = Company::GetIfValid(_local_company); if (c != nullptr) { - SetDParam(0, c->money); - DrawString(tr, STR_JUST_CURRENCY_LONG, TC_WHITE, SA_HOR_CENTER); + DrawString(tr, GetString(STR_JUST_CURRENCY_LONG, c->money), TC_WHITE, SA_HOR_CENTER); } } break; @@ -147,15 +143,13 @@ struct StatusBarWindow : Window { InvalidateWindowData(WC_STATUS_BAR, 0, SBI_NEWS_DELETED); if (Company::IsValidID(_local_company)) { /* This is the default text */ - SetDParam(0, _local_company); - DrawString(tr, STR_STATUSBAR_COMPANY_NAME, TC_FROMSTRING, SA_HOR_CENTER); + DrawString(tr, GetString(STR_STATUSBAR_COMPANY_NAME, _local_company), TC_FROMSTRING, SA_HOR_CENTER); } } } else { if (Company::IsValidID(_local_company)) { /* This is the default text */ - SetDParam(0, _local_company); - DrawString(tr, STR_STATUSBAR_COMPANY_NAME, TC_FROMSTRING, SA_HOR_CENTER); + DrawString(tr, GetString(STR_STATUSBAR_COMPANY_NAME, _local_company), TC_FROMSTRING, SA_HOR_CENTER); } }