mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-02-03 18:07:53 +01:00
Code Issues Releases Wiki Activity

Remove common format formatter where possible (#13034)

Browse Source 
* Remove common format formatter where possible

Eventually should have it limited to tooltips, window titles and widget args

* Remove remaining paint functions using common

* Remove misuse of gCommonFormatArgs
This commit is contained in:
Duncan
2020-09-30 22:42:04 +01:00
committed by GitHub
parent e4068b9fa8
commit 2063aea5ef
28 changed files with 341 additions and 277 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/openrct2-ui/windows/Research.cpp
View File

@@ -302,18 +302,25 @@ void window_research_development_page_paint(rct_window* w, rct_drawpixelinfo* dp
if (gResearchProgressStage == RESEARCH_STAGE_FINISHED_ALL)
{
stringId = STR_RESEARCH_UNKNOWN;
gfx_draw_string_left_wrapped(dpi, &stringId, screenCoords, 296, STR_RESEARCH_TYPE_LABEL, COLOUR_BLACK);
screenCoords.y += 25;
{
auto ft = Formatter();
ft.Add<rct_string_id>(STR_RESEARCH_UNKNOWN);
gfx_draw_string_left_wrapped(dpi, ft.Data(), screenCoords, 296, STR_RESEARCH_TYPE_LABEL, COLOUR_BLACK);
screenCoords.y += 25;
}
// Progress
stringId = STR_RESEARCH_COMPLETED_AL;
gfx_draw_string_left_wrapped(dpi, &stringId, screenCoords, 296, STR_RESEARCH_PROGRESS_LABEL, COLOUR_BLACK);
screenCoords.y += 15;
{
auto ft = Formatter();
ft.Add<rct_string_id>(STR_RESEARCH_COMPLETED_AL);
gfx_draw_string_left_wrapped(dpi, ft.Data(), screenCoords, 296, STR_RESEARCH_PROGRESS_LABEL, COLOUR_BLACK);
screenCoords.y += 15;
}
auto ft = Formatter::Common();
ft.Add<rct_string_id>(STR_RESEARCH_STAGE_UNKNOWN);
gfx_draw_string_left(dpi, STR_RESEARCH_EXPECTED_LABEL, gCommonFormatArgs, COLOUR_BLACK, screenCoords);
{
auto ft = Formatter();
ft.Add<rct_string_id>(STR_RESEARCH_STAGE_UNKNOWN);
gfx_draw_string_left(dpi, STR_RESEARCH_EXPECTED_LABEL, ft.Data(), COLOUR_BLACK, screenCoords);
}
}
else
{
@@ -353,7 +360,7 @@ void window_research_development_page_paint(rct_window* w, rct_drawpixelinfo* dp
screenCoords.y += 15;
// Expected
auto ft = Formatter::Common();
auto ft = Formatter();
if (gResearchProgressStage != RESEARCH_STAGE_INITIAL_RESEARCH && gResearchExpectedDay != 255)
{
// TODO: Should probably use game date format setting
@@ -365,7 +372,7 @@ void window_research_development_page_paint(rct_window* w, rct_drawpixelinfo* dp
{
ft.Add<rct_string_id>(STR_RESEARCH_STAGE_UNKNOWN);
}
gfx_draw_string_left(dpi, STR_RESEARCH_EXPECTED_LABEL, gCommonFormatArgs, COLOUR_BLACK, screenCoords);
gfx_draw_string_left(dpi, STR_RESEARCH_EXPECTED_LABEL, ft.Data(), COLOUR_BLACK, screenCoords);
}
// Last development