From 63812a45bb9bcb3714ff9aa23e30523d8b8ac3f8 Mon Sep 17 00:00:00 2001 From: Peter Nelson Date: Sat, 1 Mar 2025 10:12:43 +0000 Subject: [PATCH] Codechange: Pass single rect to DrawString calls instead of separate parameters. (#13675) --- src/airport_gui.cpp | 2 +- src/company_gui.cpp | 4 ++-- src/intro_gui.cpp | 4 ++-- src/news_gui.cpp | 14 +++++++------- src/timetable_gui.cpp | 8 ++++---- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/airport_gui.cpp b/src/airport_gui.cpp index c365f4ad9c..c0e5aebbbe 100644 --- a/src/airport_gui.cpp +++ b/src/airport_gui.cpp @@ -410,7 +410,7 @@ public: const AirportSpec *as = AirportClass::Get(_selected_airport_class)->GetSpec(_selected_airport_index); StringID string = GetAirportTextCallback(as, _selected_airport_layout, CBID_AIRPORT_ADDITIONAL_TEXT); if (string != STR_UNDEFINED) { - DrawStringMultiLine(r.left, r.right, r.top, r.bottom, string, TC_BLACK); + DrawStringMultiLine(r, string, TC_BLACK); } } break; diff --git a/src/company_gui.cpp b/src/company_gui.cpp index f91f4f4d6a..15c879d3c5 100644 --- a/src/company_gui.cpp +++ b/src/company_gui.cpp @@ -2390,7 +2390,7 @@ struct CompanyWindow : Window case WID_C_FACE_TITLE: SetDParam(0, c->index); - DrawStringMultiLine(r.left, r.right, r.top, r.bottom, STR_COMPANY_VIEW_PRESIDENT_MANAGER_TITLE, TC_FROMSTRING, SA_HOR_CENTER); + DrawStringMultiLine(r, STR_COMPANY_VIEW_PRESIDENT_MANAGER_TITLE, TC_FROMSTRING, SA_HOR_CENTER); break; case WID_C_DESC_COLOUR_SCHEME_EXAMPLE: { @@ -2651,7 +2651,7 @@ struct BuyCompanyWindow : Window { const Company *c = Company::Get(this->window_number); SetDParam(0, c->index); SetDParam(1, this->company_value); - DrawStringMultiLine(r.left, r.right, r.top, r.bottom, this->hostile_takeover ? STR_BUY_COMPANY_HOSTILE_TAKEOVER : STR_BUY_COMPANY_MESSAGE, TC_FROMSTRING, SA_CENTER); + DrawStringMultiLine(r, this->hostile_takeover ? STR_BUY_COMPANY_HOSTILE_TAKEOVER : STR_BUY_COMPANY_MESSAGE, TC_FROMSTRING, SA_CENTER); break; } } diff --git a/src/intro_gui.cpp b/src/intro_gui.cpp index 937e398cd6..e2f2f5fd77 100644 --- a/src/intro_gui.cpp +++ b/src/intro_gui.cpp @@ -282,12 +282,12 @@ struct SelectGameWindow : public Window { switch (widget) { case WID_SGI_BASESET: SetDParam(0, _missing_extra_graphics); - DrawStringMultiLine(r.left, r.right, r.top, r.bottom, STR_INTRO_BASESET, TC_FROMSTRING, SA_CENTER); + DrawStringMultiLine(r, STR_INTRO_BASESET, TC_FROMSTRING, SA_CENTER); break; case WID_SGI_TRANSLATION: SetDParam(0, _current_language->missing); - DrawStringMultiLine(r.left, r.right, r.top, r.bottom, STR_INTRO_TRANSLATION, TC_FROMSTRING, SA_CENTER); + DrawStringMultiLine(r, STR_INTRO_TRANSLATION, TC_FROMSTRING, SA_CENTER); break; } } diff --git a/src/news_gui.cpp b/src/news_gui.cpp index 6e4a87a59d..1bb110caa7 100644 --- a/src/news_gui.cpp +++ b/src/news_gui.cpp @@ -513,42 +513,42 @@ struct NewsWindow : Window { case WID_N_MESSAGE: case WID_N_COMPANY_MSG: - DrawStringMultiLine(r.left, r.right, r.top, r.bottom, this->ni->headline.GetDecodedString(), TC_FROMSTRING, SA_CENTER); + DrawStringMultiLine(r, this->ni->headline.GetDecodedString(), TC_FROMSTRING, SA_CENTER); break; case WID_N_MGR_FACE: { const CompanyNewsInformation *cni = static_cast(this->ni->data.get()); DrawCompanyManagerFace(cni->face, cni->colour, r); - GfxFillRect(r.left, r.top, r.right, r.bottom, PALETTE_NEWSPAPER, FILLRECT_RECOLOUR); + GfxFillRect(r, PALETTE_NEWSPAPER, FILLRECT_RECOLOUR); break; } case WID_N_MGR_NAME: { const CompanyNewsInformation *cni = static_cast(this->ni->data.get()); SetDParamStr(0, cni->president_name); - DrawStringMultiLine(r.left, r.right, r.top, r.bottom, STR_JUST_RAW_STRING, TC_FROMSTRING, SA_CENTER); + DrawStringMultiLine(r, STR_JUST_RAW_STRING, TC_FROMSTRING, SA_CENTER); break; } case WID_N_VEH_BKGND: - GfxFillRect(r.left, r.top, r.right, r.bottom, PC_GREY); + GfxFillRect(r, PC_GREY); break; case WID_N_VEH_NAME: case WID_N_VEH_TITLE: - DrawStringMultiLine(r.left, r.right, r.top, r.bottom, this->GetNewVehicleMessageString(widget), TC_FROMSTRING, SA_CENTER); + DrawStringMultiLine(r, this->GetNewVehicleMessageString(widget), TC_FROMSTRING, SA_CENTER); break; case WID_N_VEH_SPR: { assert(std::holds_alternative(ni->ref1)); EngineID engine = std::get(this->ni->ref1); DrawVehicleEngine(r.left, r.right, CenterBounds(r.left, r.right, 0), CenterBounds(r.top, r.bottom, 0), engine, GetEnginePalette(engine, _local_company), EIT_PREVIEW); - GfxFillRect(r.left, r.top, r.right, r.bottom, PALETTE_NEWSPAPER, FILLRECT_RECOLOUR); + GfxFillRect(r, PALETTE_NEWSPAPER, FILLRECT_RECOLOUR); break; } case WID_N_VEH_INFO: { assert(std::holds_alternative(ni->ref1)); EngineID engine = std::get(this->ni->ref1); - DrawStringMultiLine(r.left, r.right, r.top, r.bottom, GetEngineInfoString(engine), TC_BLACK, SA_CENTER); + DrawStringMultiLine(r, GetEngineInfoString(engine), TC_BLACK, SA_CENTER); break; } } diff --git a/src/timetable_gui.cpp b/src/timetable_gui.cpp index 21729f4e6a..880086cbe8 100644 --- a/src/timetable_gui.cpp +++ b/src/timetable_gui.cpp @@ -530,12 +530,12 @@ struct TimetableWindow : Window { /* Now actually draw the arrival time. */ if (_settings_client.gui.timetable_mode == TimetableMode::Seconds) { /* Display seconds from now. */ - DrawString(tr.left, tr.right, tr.top, + DrawString(tr, GetString(STR_TIMETABLE_ARRIVAL_SECONDS_IN_FUTURE, tc, (arr_dep[i / 2].arrival + offset) / Ticks::TICKS_PER_SECOND), i == selected ? TC_WHITE : TC_BLACK); } else { /* Show a date. */ - DrawString(tr.left, tr.right, tr.top, + DrawString(tr, GetString(STR_TIMETABLE_ARRIVAL_DATE, tc, TimerGameEconomy::date + (arr_dep[i / 2].arrival + this_offset) / Ticks::DAY_TICKS), i == selected ? TC_WHITE : TC_BLACK); } @@ -545,12 +545,12 @@ struct TimetableWindow : Window { if (arr_dep[i / 2].departure != Ticks::INVALID_TICKS) { if (_settings_client.gui.timetable_mode == TimetableMode::Seconds) { /* Display seconds from now. */ - DrawString(tr.left, tr.right, tr.top, + DrawString(tr, GetString(STR_TIMETABLE_DEPARTURE_SECONDS_IN_FUTURE, tc, (arr_dep[i / 2].departure + offset) / Ticks::TICKS_PER_SECOND), i == selected ? TC_WHITE : TC_BLACK); } else { /* Show a date. */ - DrawString(tr.left, tr.right, tr.top, + DrawString(tr, GetString(STR_TIMETABLE_DEPARTURE_DATE, tc, TimerGameEconomy::date + (arr_dep[i / 2].departure + offset) / Ticks::DAY_TICKS), i == selected ? TC_WHITE : TC_BLACK); }